git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Fix name of shellFor derivation for a single package. (#155)
commit3fb220334f1b1bd9d01263d10dfeea42ec2991fa authorJean-Baptiste Giraudeau <jb@giraudeau.info> dateThu 30 May 2019, 22:46 (7 years ago) parentbc01ebc
4 files changed+19−3
compare with iko/ghcjs-patch-master
unifiedsplit
builder/shell-for.nix+1−1 test/shell-for/default.nix+9−1 test/shell-for/single.project+1 test/tests.sh+8−1
builder/shell-for.nix+1−1
@@ -7,7 +7,7 @@ let
77 selectedConfigs = map (p: p.components.all.config) selected;
88
99 name = if lib.length selected == 1
10− then "ghc-shell-for-${(lib.head selected).name}"
10+ then "ghc-shell-for-${(lib.head selected).identifier.name}"
1111 else "ghc-shell-for-packages";
1212
1313 # If `packages = [ a b ]` and `a` depends on `b`, don't build `b`,
test/shell-for/default.nix+9−1
@@ -25,6 +25,14 @@ let
2525 buildInputs = [ cabal-install ];
2626 };
2727
28+ envPkga = pkgSet.config.hsPkgs.shellFor {
29+ # Shell will provide the dependencies of pkga
30+ packages = ps: with ps; [ pkga ];
31+ # This adds cabal-install to the shell, which helps tests because
32+ # they use a nix-shell --pure. Normally you would BYO cabal-install.
33+ buildInputs = [ cabal-install ];
34+ };
35+
2836in
2937 stdenv.mkDerivation {
3038 name = "shell-for-test";
@@ -47,6 +55,6 @@ in
4755 inherit pkgSet;
4856
4957 # Used for testing externally with nix-shell (../tests.sh).
50− inherit env;
58+ inherit env envPkga;
5159 };
5260}
test/shell-for/single.projectnew file+1
@@ -0,0 +1 @@
1+packages: pkga
test/tests.sh+8−1
@@ -54,13 +54,20 @@ nix-shell $NIX_BUILD_ARGS \
5454 --run 'cd cabal-simple && cabal new-build'
5555echo >& 2
5656
57−printf "*** Checking shellFor works for a cabal project...\n" >& 2
57+printf "*** Checking shellFor works for a cabal project, multiple packages...\n" >& 2
5858nix-shell $NIX_BUILD_ARGS \
5959 --pure ./default.nix \
6060 -A shell-for.env \
6161 --run 'cd shell-for && cabal new-build all'
6262echo >& 2
6363
64+printf "*** Checking shellFor works for a cabal project, single package...\n" >& 2
65+nix-shell $NIX_BUILD_ARGS \
66+ --pure ./default.nix \
67+ -A shell-for.envPkga \
68+ --run 'cd shell-for && cabal new-build --project=single.project all'
69+echo >& 2
70+
6471printf "*** Checking shellFor has a working hoogle index...\n" >& 2
6572nix-shell $NIX_BUILD_ARGS \
6673 --pure ./default.nix \