Export an overlay that does not override the package set

Author: lf-

flake.nix

@@ -150,7 +150,10 @@
             with haskell.lib; {
               # Patches don't apply
               github = overrideCabal hsuper.github (drv: { patches = []; });
-              hiedb = hsuper.callCabal2nix "hiedb" inputs.hiedb {};
+              # Tests are broken on 9.2 and 9.4, and we wind up bypassing the
+              # nixpkgs fixes to the test suite by doing this override. So just
+              # turn it off.
+              hiedb = haskell.lib.dontCheck (hsuper.callCabal2nix "hiedb" inputs.hiedb {});
               hw-prim = hsuper.callCabal2nix "hw-prim" inputs.hw-prim {};
               retrie = hsuper.callCabal2nix "retrie" inputs.retrie {};
               retrie_1_1_0_0 = hsuper.callCabal2nix "retrie" inputs.retrie-1100 {};
@@ -182,21 +185,28 @@
             builtins.mapAttrs (_: haskell.lib.dontCheck)
               (overlay hself hsuper);
 
-          extended = hpkgs: hpkgs.override (old: {
+          applyHaskellOverlays = overlays: hpkgs: hpkgs.override (old: {
             overrides =
               lib.fold
                 lib.composeExtensions
                 (old.overrides or (_: _: { }))
-                [ haskellOverrides
-                  (dontCheck (haskell.lib.packageSourceOverrides hlsSources))
-                  tweaks
-                ];
+                overlays;
           });
+
+          extended = forHlsCI:
+            applyHaskellOverlays
+              (prev.lib.optional forHlsCI haskellOverrides
+               ++ [ (dontCheck (haskell.lib.packageSourceOverrides hlsSources))
+                    tweaks
+                  ]
+              );
         in {
           inherit hlsSources;
 
           # Haskell packages extended with our packages
-          hlsHpkgs = compiler: extended haskell.packages.${compiler};
+          hlsHpkgs = compiler: extended true haskell.packages.${compiler};
+          # Haskell packages extended with our packages; reusing the nixpkgs set as much as possible
+          hlsHpkgsNixpkgs = compiler: extended false haskell.packages.${compiler};
 
           # Support of GenChangelogs.hs
           gen-hls-changelogs = hpkgs: