6e41c11 · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Fix eval of hydra jobset

6e41c11Rodney Lorrimar8 years ago

release.nix+5−6

@@ -1,7 +1,6 @@

1+let

1−with (import ./default.nix {});

2+ haskell = import ./default.nix {};

2−

3+in {

3−{

4− inherit nix-tools;

4+ inherit (haskell) nix-tools;

5−

5+ tests = import ./test { inherit haskell; };

6− tests = callPackage ./test {};

test/default.nix+10−11

@@ -9,20 +9,19 @@ let

9 util = callPackage ./util.nix {};

11in {

12− cabal-simple = callPackage ./cabal-simple { inherit (haskell) mkPkgSet; inherit util; };

12+ cabal-simple = haskell.callPackage ./cabal-simple { inherit util; };

13− cabal-sublib = callPackage ./cabal-sublib { inherit (haskell) mkPkgSet; inherit util; };

13+ cabal-sublib = haskell.callPackage ./cabal-sublib { inherit util; };

14− cabal-22 = callPackage ./cabal-22 { inherit (haskell) mkPkgSet; };

14+ cabal-22 = haskell.callPackage ./cabal-22 {};

15− with-packages = callPackage ./with-packages { inherit (haskell) mkPkgSet; inherit util; };

15+ with-packages = haskell.callPackage ./with-packages { inherit util; };

16− builder-haddock = callPackage ./builder-haddock { inherit (haskell) mkPkgSet; };

16+ builder-haddock = haskell.callPackage ./builder-haddock {};

17− stack-simple = callPackage ./stack-simple { inherit (haskell) mkStackPkgSet; };

17+ stack-simple = haskell.callPackage ./stack-simple {};

19 # Run unit tests with: nix-instantiate --eval --strict -A unit

20 # An empty list means success.

21− unit = callPackage ./unit.nix { inherit (haskell) haskellLib; };

21+ unit = haskell.callPackage ./unit.nix {};

22}

24−## possible test cases

24+## more possible test cases

25# 1. fully static linking

26−# 2. presence of haddock

26+# 2. cabal 2.4 stuff

27−# 3. cabal 2.4 stuff

27+# 3. cross-compiling

28−# 4. multiple libraries in a cabal project