on iko/ghcjs-patch-master help sign in
Regenerate nix for test/stack-simple
commit0e02f1fb6809e6c223b670bad7e3b09144e816f2 authorRodney Lorrimar <rodney.lorrimar@iohk.io> dateTue 7 May 2019, 12:51 (7 years ago) parent1eebaa0
4 files changed+14−9
test/stack-simple/default.nix+3−3 test/stack-simple/pkgs.nix+10 test/stack-simple/stack-pkgs.nix−5 test/stack-simple/.stack.nix/stack-simple.nix → test/stack-simple/stack-simple.nix+1−1
test/stack-simple/default.nix+3−3
@@ -3,10 +3,10 @@
33with stdenv.lib;
44
55let
6− # ./stack-pkgs.nix and ./.stack.nix/stack-simple are
7− # generated by running hpack then stack-to-nix.
6+ # ./pkgs.nix and ./stack-simple.nix are generated by running
7+ # stack-to-nix -o .
88 pkgSet = mkStackPkgSet {
9− stack-pkgs = import ./stack-pkgs.nix;
9+ stack-pkgs = import ./pkgs.nix;
1010 pkg-def-extras = [];
1111 modules = [];
1212 };
test/stack-simple/pkgs.nixnew file+10
@@ -0,0 +1,10 @@
1+{
2+ extras = hackage:
3+ {
4+ packages = {
5+ "transformers" = (((hackage.transformers)."0.5.6.2").revisions).default;
6+ "process" = (((hackage.process)."1.6.5.0").revisions).default;
7+ } // { stack-simple = ./stack-simple.nix; };
8+ };
9+ resolver = "lts-13.18";
10+ }
test/stack-simple/stack-pkgs.nixdeleted−5
@@ -1,5 +0,0 @@
1−{
2− extras = hackage:
3− { packages = {} // { stack-simple = ./.stack.nix/stack-simple.nix; }; };
4− resolver = "lts-13.6";
5−}
test/stack-simple/.stack.nix/stack-simple.nix → test/stack-simple/stack-simple.nixrenamed+1−1
@@ -27,6 +27,6 @@
2727 };
2828 };
2929 };
30− } // rec { src = (pkgs.lib).mkDefault ../.; }) // {
30+ } // rec { src = (pkgs.lib).mkDefault ./.; }) // {
3131 cabal-generator = "hpack";
3232 }