eeva/tensorflow-haskell
1
0
Fork 0
mirror of https://github.com/tensorflow/haskell.git synced 2024-11-23 03:19:44 +01:00
Code Issues Releases Wiki Activity

Upgraded Stackage resolver to LTS-12 (GHC 8.4.4) and Nix channel to 18.04 (#231)

Browse source
This commit is contained in:
Rik 2019-02-06 04:32:15 +01:00 committed by Greg Steuck
parent e4acd69574
commit c7426a3f00
5 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nix/src.json
View file

@ -1,6 +1,6 @@
{ {
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7098bcac278a2d028036bb3a23508fd1c52155ac", "rev": "dbb9f8818af7cf2ea91b89f7d80a8fb1800cbfb5",
"sha256": "04m7z7334mjma0ci3vp4js6rbz4s2jxy864s1v4dkdm7860zjc28" "sha256": "1i8lsiscjzq066p02a5c7azjrvqxqkz6dipzkkyhh9rmhgs1aca3"
} }

2
nix/update
View file

@ -7,7 +7,7 @@ set -euo pipefail
cd "$(dirname "$0")" || exit 1 cd "$(dirname "$0")" || exit 1
branch=release-17.09 branch=release-18.04
owner=NixOS owner=NixOS
repo=nixpkgs repo=nixpkgs

4
shell.nix
View file

@ -11,8 +11,8 @@ let
pkgs = import nixpkgs {}; pkgs = import nixpkgs {};
in in
pkgs.haskell.lib.buildStackProject { pkgs.haskell.lib.buildStackProject {
# Either use specified GHC or use GHC 8.2.2 (which we need for LTS 11.9) # Either use specified GHC or use GHC 8.4.4 (which we need for LTS 12.26)
ghc = if isNull ghc then pkgs.haskell.compiler.ghc822 else ghc; ghc = if isNull ghc then pkgs.haskell.compiler.ghc844 else ghc;
extraArgs = "--system-ghc"; extraArgs = "--system-ghc";
name = "tf-env"; name = "tf-env";
buildInputs = with pkgs; [ snappy zlib protobuf libtensorflow ]; buildInputs = with pkgs; [ snappy zlib protobuf libtensorflow ];

9
stack.yaml
View file

@ -1,4 +1,4 @@
resolver: lts-11.9 resolver: lts-12.26
packages: packages:
- tensorflow - tensorflow
@ -14,12 +14,7 @@ packages:
- tensorflow-test - tensorflow-test
extra-deps: extra-deps:
- snappy-framing-0.1.1 - snappy-framing-0.1.2
- snappy-0.2.0.2
- proto-lens-protobuf-types-0.3.0.1
- proto-lens-protoc-0.3.1.0
- proto-lens-0.3.1.0
- lens-labels-0.2.0.1
# For Mac OS X, whose linker doesn't use this path by default # For Mac OS X, whose linker doesn't use this path by default
# unless you run `xcode-select --install`. # unless you run `xcode-select --install`.

2
tensorflow-opgen/src/TensorFlow/OpGen.hs
View file

@ -71,9 +71,9 @@ import Proto.Tensorflow.Core.Framework.OpDef_Fields
import Proto.Tensorflow.Core.Framework.Types (DataType(..)) import Proto.Tensorflow.Core.Framework.Types (DataType(..))
import System.FilePath (takeBaseName) import System.FilePath (takeBaseName)
import TensorFlow.OpGen.ParsedOp import TensorFlow.OpGen.ParsedOp
import Data.Semigroup ((<>))
import Text.PrettyPrint.Mainland import Text.PrettyPrint.Mainland
( Doc ( Doc
, (<>)
, (<+>) , (<+>)
, (</>) , (</>)
, (<+/>) , (<+/>)