0e02f1f · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Regenerate nix for test/stack-simple

0e02f1fRodney Lorrimar7 years ago

test/stack-simple/default.nix+3−3

@@ -3,10 +3,10 @@

3with stdenv.lib;

5let

6− # ./stack-pkgs.nix and ./.stack.nix/stack-simple are

6+ # ./pkgs.nix and ./stack-simple.nix are generated by running

7− # generated by running hpack then stack-to-nix.

7+ # stack-to-nix -o .

8 pkgSet = mkStackPkgSet {

9− stack-pkgs = import ./stack-pkgs.nix;

9+ stack-pkgs = import ./pkgs.nix;

10 pkg-def-extras = [];

11 modules = [];

12 };

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 @@

27 };

28 };

29 };

30− } // rec { src = (pkgs.lib).mkDefault ../.; }) // {

30+ } // rec { src = (pkgs.lib).mkDefault ./.; }) // {

31 cabal-generator = "hpack";

32 }