@@ -9,20 +9,19 @@ let
99 util = callPackage ./util.nix {};
1010
1111in {
12− cabal-simple = callPackage ./cabal-simple { inherit (haskell) mkPkgSet; inherit util; };
13− cabal-sublib = callPackage ./cabal-sublib { inherit (haskell) mkPkgSet; inherit util; };
14− cabal-22 = callPackage ./cabal-22 { inherit (haskell) mkPkgSet; };
15− with-packages = callPackage ./with-packages { inherit (haskell) mkPkgSet; inherit util; };
16− builder-haddock = callPackage ./builder-haddock { inherit (haskell) mkPkgSet; };
17− stack-simple = callPackage ./stack-simple { inherit (haskell) mkStackPkgSet; };
12+ cabal-simple = haskell.callPackage ./cabal-simple { inherit util; };
13+ cabal-sublib = haskell.callPackage ./cabal-sublib { inherit util; };
14+ cabal-22 = haskell.callPackage ./cabal-22 {};
15+ with-packages = haskell.callPackage ./with-packages { inherit util; };
16+ builder-haddock = haskell.callPackage ./builder-haddock {};
17+ stack-simple = haskell.callPackage ./stack-simple {};
1818
1919 # Run unit tests with: nix-instantiate --eval --strict -A unit
2020 # An empty list means success.
21− unit = callPackage ./unit.nix { inherit (haskell) haskellLib; };
21+ unit = haskell.callPackage ./unit.nix {};
2222}
2323
24−## possible test cases
24+## more possible test cases
2525# 1. fully static linking
26−# 2. presence of haddock
27−# 3. cabal 2.4 stuff
28−# 4. multiple libraries in a cabal project
26+# 2. cabal 2.4 stuff
27+# 3. cross-compiling