Add more packages

Author: hamishmack

lib/call-cabal-project-to-nix.nix

@@ -359,14 +359,19 @@ let
               else
                 grep '^version:' ${ghcSrc}/libraries/${name}/${name}.cabal.in
               fi
-            '') (["base" "ghc-prim" "template-haskell"]
-              ++ pkgs.lib.optional (builtins.compareVersions ghc.version "9.0" < 0) "integer-gmp"
+            '') (["base" "ghc-prim" "template-haskell" "integer-gmp"]
               ++ pkgs.lib.optional (builtins.compareVersions ghc.version "9.0" >= 0) "ghc-bignum"))}
           ${pkgs.lib.optionalString (builtins.compareVersions ghc.version "9.2" >= 0) ''
             echo '---'
             echo "name: ghc"
             echo "version: ${ghc.version}"
             echo '---'
+            echo "name: ghc-boot"
+            echo "version: ${ghc.version}"
+            echo '---'
+            echo "name: ghc-boot-th"
+            echo "version: ${ghc.version}"
+            echo '---'
             echo "name: ghci"
             echo "version: ${ghc.version}"
             echo '---'

overlays/ghc-packages.nix

@@ -181,7 +181,7 @@ in rec {
               inherit subDir;
               includeSiblings = true;
             }
-            else if builtins.elem subDir ["libraries/ghc-heap" "utils/remote-iserv" "libraries/ghci" "libraries/template-haskell" "utils/iserv" "libraries/ghc-prim"]
+            else if builtins.elem subDir ["libraries/ghc-heap" "utils/remote-iserv" "libraries/ghci" "libraries/template-haskell" "utils/iserv" "libraries/ghc-prim" "libraries/libiserv"]
               then "${ghc.passthru.configured-src}/${subDir}"
             else "${ghc.passthru.raw-src}/${subDir}";
         nix = callCabal2Nix ghcName "${ghcName}-${pkgName}" src;