From f07c7f237a66b5276052cd13a5a7dbeee9ef172b Mon Sep 17 00:00:00 2001 From: Saeed Hadikhanloo <31389931+saeedhadikhanloo@users.noreply.github.com> Date: Sun, 16 Feb 2020 06:45:40 +0100 Subject: [PATCH] nix-shell updated to be compatible with LTS14.4 (#254) --- nix/src.json | 4 ++-- nix/update | 2 +- shell.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nix/src.json b/nix/src.json index 2585822..d677276 100644 --- a/nix/src.json +++ b/nix/src.json @@ -1,6 +1,6 @@ { "owner": "NixOS", "repo": "nixpkgs", - "rev": "dbb9f8818af7cf2ea91b89f7d80a8fb1800cbfb5", - "sha256": "1i8lsiscjzq066p02a5c7azjrvqxqkz6dipzkkyhh9rmhgs1aca3" + "rev": "8731aaaf8b30888bc24994096db830993090d7c4", + "sha256": "1hcc89rxi47nb0mpk05nl9rbbb04kfw97xfydhpmmgh57yrp3zqa" } diff --git a/nix/update b/nix/update index 30ad138..3e70253 100755 --- a/nix/update +++ b/nix/update @@ -7,7 +7,7 @@ set -euo pipefail cd "$(dirname "$0")" || exit 1 -branch=release-18.04 +branch=release-19.09 owner=NixOS repo=nixpkgs diff --git a/shell.nix b/shell.nix index ca4f58e..61a3e9c 100644 --- a/shell.nix +++ b/shell.nix @@ -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 ];