Fixes for GHC HEAD

Author: hamishmack

lib/load-cabal-plan.nix

@@ -92,7 +92,8 @@ in {
               } // pkgs.lib.optionalAttrs (p.pkg-src.type or "" == "source-repo") {
                 # Replace the source repository packages with versions created when
                 # parsing the `cabal.project` file.
-                src = pkgs.lib.lists.elemAt callProjectResults.sourceRepos (pkgs.lib.strings.toInt p.pkg-src.source-repo.location) + "/${p.pkg-src.source-repo.subdir}";
+                src = pkgs.lib.lists.elemAt callProjectResults.sourceRepos (pkgs.lib.strings.toInt p.pkg-src.source-repo.location)
+                  + pkgs.lib.optionalString (p.pkg-src.source-repo.subdir != ".") "/${p.pkg-src.source-repo.subdir}";
               } // pkgs.lib.optionalAttrs (cabal2nix ? package-description-override && p.pkg-version == cabal2nix.package.identifier.version) {
                 # Use the `.cabal` file from the `Cabal2Nix` if it for the matching
                 # version of the package (the one in the plan).

test/cabal.project.local

@@ -14,6 +14,13 @@ allow-newer: hsc2hs:*
 if impl(ghc >=9.10.1)
   extra-packages: process
 
+if impl(ghc >=9.11)
+  source-repository-package
+    type: git
+    location: https://github.com/hamishmack/extra.git
+    tag: 3cced868b7f270acb90b7064d34e2d4c5952ca48
+    --sha256: sha256-e2JHNRvkpws18dWmc+RUPWEESX+LV9W0u25dCG2e8ws=
+
 repository head.hackage.ghc.haskell.org
   url: https://ghc.gitlab.haskell.org/head.hackage/
   secure: True
@@ -22,7 +29,7 @@ repository head.hackage.ghc.haskell.org
      f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
      26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
      7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-  --sha256: sha256-yyYXGnFwUr6MaUEXz6odRv+IJMCmAZioN5dz3LbY1n4=
+  --sha256: sha256-Z4NrYC11bsuJp4IPy6cRoFQ03wLAPEaejM9Y52n4EHk=
 
 repository ghcjs-overlay
   url: https://raw.githubusercontent.com/input-output-hk/hackage-overlay-ghcjs/d37efd733666d090bf1c83bf7d5f9cb71b1dacc1

test/call-cabal-project-to-nix/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPackages, mkCabalProjectPkgSet, callCabalProjectToNix, importAndFilterProject, recurseIntoAttrs, haskellLib, testSrc, compiler-nix-name, evalPackages }:
+{ stdenv, lib, buildPackages, mkCabalProjectPkgSet, callCabalProjectToNix, loadCabalPlan, recurseIntoAttrs, haskellLib, testSrc, compiler-nix-name, evalPackages }:
 
 with lib;
 
@@ -15,11 +15,16 @@ let
     '';
   };
   pkgSet = mkCabalProjectPkgSet {
-    plan-pkgs = importAndFilterProject {
-      inherit (callProjectResults) projectNix sourceRepos src;
+    plan-pkgs = loadCabalPlan {
+      inherit callProjectResults;
+      selectedCompiler = buildPackages.haskell-nix.compiler.${compiler-nix-name};
     };
+    inherit compiler-nix-name;
     inherit (callProjectResults) extra-hackages;
-    modules = [{ inherit evalPackages; }];
+    modules = [{
+      inherit evalPackages;
+      compiler.nix-name = compiler-nix-name;
+    }];
   };
   packages = pkgSet.config.hsPkgs;