Skip to content

Commit

Permalink
nix-shell updated to be compatible with LTS14.4 (#254)
Browse files Browse the repository at this point in the history
  • Loading branch information
SaeedHK authored Feb 16, 2020
1 parent 8cde4d6 commit f07c7f2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
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": "dbb9f8818af7cf2ea91b89f7d80a8fb1800cbfb5",
"sha256": "1i8lsiscjzq066p02a5c7azjrvqxqkz6dipzkkyhh9rmhgs1aca3"
"rev": "8731aaaf8b30888bc24994096db830993090d7c4",
"sha256": "1hcc89rxi47nb0mpk05nl9rbbb04kfw97xfydhpmmgh57yrp3zqa"
}
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-18.04
branch=release-19.09

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.6.4 (which we need for LTS 13.13)
ghc = if isNull ghc then pkgs.haskell.compiler.ghc864 else ghc;
# Either use specified GHC or use GHC 8.6.5 (which we need for LTS 14.4)
ghc = if isNull ghc then pkgs.haskell.compiler.ghc865 else ghc;
extraArgs = "--system-ghc";
name = "tf-env";
buildInputs = with pkgs; [ snappy zlib protobuf libtensorflow ];
Expand Down

0 comments on commit f07c7f2

Please sign in to comment.