Fix eval of hydra jobset

This commit is contained in:
Rodney Lorrimar 2019-04-02 13:08:25 +10:00
parent 96bfd9bb2b
commit 6e41c11489
No known key found for this signature in database
GPG Key ID: 2CCD588917A9A868
2 changed files with 15 additions and 17 deletions

View File

@ -1,7 +1,6 @@
with (import ./default.nix {});
{
inherit nix-tools;
tests = callPackage ./test {};
let
haskell = import ./default.nix {};
in {
inherit (haskell) nix-tools;
tests = import ./test { inherit haskell; };
}

View File

@ -9,20 +9,19 @@ let
util = callPackage ./util.nix {};
in {
cabal-simple = callPackage ./cabal-simple { inherit (haskell) mkPkgSet; inherit util; };
cabal-sublib = callPackage ./cabal-sublib { inherit (haskell) mkPkgSet; inherit util; };
cabal-22 = callPackage ./cabal-22 { inherit (haskell) mkPkgSet; };
with-packages = callPackage ./with-packages { inherit (haskell) mkPkgSet; inherit util; };
builder-haddock = callPackage ./builder-haddock { inherit (haskell) mkPkgSet; };
stack-simple = callPackage ./stack-simple { inherit (haskell) mkStackPkgSet; };
cabal-simple = haskell.callPackage ./cabal-simple { inherit util; };
cabal-sublib = haskell.callPackage ./cabal-sublib { inherit util; };
cabal-22 = haskell.callPackage ./cabal-22 {};
with-packages = haskell.callPackage ./with-packages { inherit util; };
builder-haddock = haskell.callPackage ./builder-haddock {};
stack-simple = haskell.callPackage ./stack-simple {};
# Run unit tests with: nix-instantiate --eval --strict -A unit
# An empty list means success.
unit = callPackage ./unit.nix { inherit (haskell) haskellLib; };
unit = haskell.callPackage ./unit.nix {};
}
## possible test cases
## more possible test cases
# 1. fully static linking
# 2. presence of haddock
# 3. cabal 2.4 stuff
# 4. multiple libraries in a cabal project
# 2. cabal 2.4 stuff
# 3. cross-compiling