Skip to content

Upgraded Stackage resolver to LTS-12 (GHC 8.4.4) #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nix/src.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7098bcac278a2d028036bb3a23508fd1c52155ac",
"sha256": "04m7z7334mjma0ci3vp4js6rbz4s2jxy864s1v4dkdm7860zjc28"
"rev": "dbb9f8818af7cf2ea91b89f7d80a8fb1800cbfb5",
"sha256": "1i8lsiscjzq066p02a5c7azjrvqxqkz6dipzkkyhh9rmhgs1aca3"
}
2 changes: 1 addition & 1 deletion nix/update
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -euo pipefail

cd "$(dirname "$0")" || exit 1

branch=release-17.09
branch=release-18.04

owner=NixOS
repo=nixpkgs
Expand Down
4 changes: 2 additions & 2 deletions shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ let
pkgs = import nixpkgs {};
in
pkgs.haskell.lib.buildStackProject {
# Either use specified GHC or use GHC 8.2.2 (which we need for LTS 11.9)
ghc = if isNull ghc then pkgs.haskell.compiler.ghc822 else ghc;
# 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.ghc844 else ghc;
extraArgs = "--system-ghc";
name = "tf-env";
buildInputs = with pkgs; [ snappy zlib protobuf libtensorflow ];
Expand Down
9 changes: 2 additions & 7 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-11.9
resolver: lts-12.26

packages:
- tensorflow
Expand All @@ -14,12 +14,7 @@ packages:
- tensorflow-test

extra-deps:
- snappy-framing-0.1.1
- 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
- snappy-framing-0.1.2

# For Mac OS X, whose linker doesn't use this path by default
# unless you run `xcode-select --install`.
Expand Down
2 changes: 1 addition & 1 deletion tensorflow-opgen/src/TensorFlow/OpGen.hs
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ import Proto.Tensorflow.Core.Framework.OpDef_Fields
import Proto.Tensorflow.Core.Framework.Types (DataType(..))
import System.FilePath (takeBaseName)
import TensorFlow.OpGen.ParsedOp
import Data.Semigroup ((<>))
import Text.PrettyPrint.Mainland
( Doc
, (<>)
, (<+>)
, (</>)
, (<+/>)
Expand Down