Add cabal new-build tests for shellFor

Author: rvl

test/regen.nix

@@ -57,4 +57,9 @@ writeScript "regen-tests.sh" ''
   cd stack-simple
   stack-to-nix -o .
   cd ..
+
+  cd shell-for
+  cabal_configure
+  plan-to-nix -o . --plan-json dist-newstyle/cache/plan.json --cabal-project cabal.project
+  cd ..
 ''

test/shell-for/default.nix

@@ -1,27 +1,43 @@
-{ stdenv, cabal-install, mkStackSnapshotPkgSet }:
+{ stdenv, cabal-install, mkStackSnapshotPkgSet, mkCabalProjectPkgSet }:
 
 with stdenv.lib;
 
 let
-  pkgSet = mkStackSnapshotPkgSet {
-    resolver = "lts-12.21";
-    # Work around a mismatch between stackage metadata and the
-    # libraries shipped with GHC.
-    # https://github.com/commercialhaskell/stackage/issues/4466
-    pkg-def-extras = [(hackage: {
-      packages = {
-        "transformers" = (((hackage.transformers)."0.5.6.2").revisions).default;
-        "process" = (((hackage.process)."1.6.5.0").revisions).default;
-      };
-    })];
+  pkgSet = {
+    stack = mkStackSnapshotPkgSet {
+      resolver = "lts-12.21";
+      # Work around a mismatch between stackage metadata and the
+      # libraries shipped with GHC.
+      # https://github.com/commercialhaskell/stackage/issues/4466
+      pkg-def-extras = [(hackage: {
+        packages = {
+          "transformers" = (((hackage.transformers)."0.5.6.2").revisions).default;
+          "process" = (((hackage.process)."1.6.5.0").revisions).default;
+        };
+      })];
+    };
+
+    cabal = mkCabalProjectPkgSet {
+      plan-pkgs = import ./pkgs.nix;
+      pkg-def-extras = [{
+        pkga = ./.plan.nix/pkga.nix;
+        pkgb = ./.plan.nix/pkgb.nix;
+      }];
+    };
   };
 
-  env = pkgSet.config.hsPkgs.shellFor {
-    packages = ps: with ps; [ conduit conduit-extra resourcet ];
-    withHoogle = true;
-    # This adds cabal-install to the shell, which helps tests because
-    # they use a nix-shell --pure. Normally you would BYO cabal-install.
-    buildInputs = [ cabal-install ];
+  env = {
+    stack = pkgSet.stack.config.hsPkgs.shellFor {
+      packages = ps: with ps; [ conduit conduit-extra resourcet ];
+      withHoogle = true;
+      # This adds cabal-install to the shell, which helps tests because
+      # they use a nix-shell --pure. Normally you would BYO cabal-install.
+      buildInputs = [ cabal-install ];
+    };
+
+    cabal = pkgSet.cabal.config.hsPkgs.shellFor {
+      packages = ps: with ps; [ pkga pkgb ];
+    };
   };
 
 in
@@ -33,7 +49,7 @@ in
       # test shell-for with an example program
 
       printf "checking that the shell env has the dependencies...\n" >& 2
-      ${env.ghc}/bin/runghc ${./conduit.hs}
+      ${env.stack.ghc}/bin/runghc ${./pkgb/src/conduit.hs}
 
       touch $out
     '';

test/tests.sh

@@ -57,7 +57,7 @@ echo >& 2
 printf "*** Checking shellFor works with a Stackage snapshot...\n" >& 2
 nix-shell $NIX_BUILD_ARGS \
     --pure ./default.nix \
-    -A shell-for.env \
+    -A shell-for.env.stack \
     --run 'cd shell-for && runghc conduit.hs'
 echo >& 2