Skip to content

Commit 4e10661

Browse files
author
Bart Schuurmans
committed
Simplify Stack Nix integration
Let Stack generate the nix-shell internally instead of writing it manually.
1 parent d088e30 commit 4e10661

File tree

5 files changed

+4
-61
lines changed

5 files changed

+4
-61
lines changed

README.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,19 +126,11 @@ After running the script to install system dependencies, build the project with
126126

127127
## Build on NixOS
128128

129-
The `shell.nix` provides an environment containing the necessary
129+
The `stack.yaml` file describes a NixOS environment containing the necessary
130130
dependencies. To build, run:
131131

132132
$ stack --nix build
133133

134-
or alternatively you can run
135-
136-
$ nix-shell
137-
138-
to enter the environment and build the project. Note, that it is an emulation
139-
of common Linux environment rather than full-featured Nix package expression.
140-
No exportable Nix package will appear, but local development is possible.
141-
142134
## Installation on CentOS
143135

144136
[Xiaokui Shu (@subbyte)](https://github.com/subbyte) maintains [separate instructions for installation on CentOS](https://github.com/subbyte/haskell-learn/blob/master/tensorflow_setup.md).

nix/src.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

nix/update

Lines changed: 0 additions & 26 deletions
This file was deleted.

shell.nix

Lines changed: 0 additions & 19 deletions
This file was deleted.

stack.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,6 @@ extra-include-dirs:
2727

2828
nix:
2929
enable: false
30-
shell-file: shell.nix
30+
# release-19.09 with libtensorflow 1.14.0
31+
path: ["nixpkgs=https://github.com/NixOS/nixpkgs/archive/8731aaaf8b30888bc24994096db830993090d7c4.tar.gz"]
32+
packages: [snappy, zlib, protobuf, libtensorflow]

0 commit comments

Comments
 (0)