Use lazy-inputs instead of fetch-source overlay

input-output-hk · Oct 24, 2024 · 52e3bca · 52e3bca
1 parent ec3e51b
commit 52e3bca
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 50 deletions.
diff --git a/lazy-inputs/default.nix b/lazy-inputs/default.nix
@@ -3,7 +3,7 @@ let
   callFlake = import prev.haskell-nix.sources.flake-compat;
 in {
   haskell-nix = prev.haskell-nix // {
-    sources = prev.haskell-nix.sources // {
+    sources = {
       inherit ((callFlake { pkgs = final; src = ./ghc8107; }).defaultNix) ghc8107;
       inherit ((callFlake { pkgs = final; src = ./ghc901; }).defaultNix) ghc901;
       inherit ((callFlake { pkgs = final; src = ./ghc902; }).defaultNix) ghc902;
@@ -32,6 +32,8 @@ in {
       inherit ((callFlake { pkgs = final; src = ./ghc981; }).defaultNix) ghc981;
       inherit ((callFlake { pkgs = final; src = ./ghc982; }).defaultNix) ghc982;
       inherit ((callFlake { pkgs = final; src = ./ghc9101; }).defaultNix) ghc9101;
-    };
+      inherit ((callFlake { pkgs = final; src = ./ghc912X; }).defaultNix) ghc912X;
+      inherit ((callFlake { pkgs = final; src = ./ghc913; }).defaultNix) ghc913;
+    } // prev.haskell-nix.sources;
   };
 }
diff --git a/overlays/default.nix b/overlays/default.nix
@@ -91,7 +91,6 @@ let
     ghcjs = import ./ghcjs.nix;
     cabalPkgConfig = import ./cabal-pkg-config.nix;
     cacheCompilerDeps = import ./cache-compiler-deps.nix;
-    fetch-source = import ./fetch-source.nix;
     lazy-inputs = import ../lazy-inputs;
     rcodesign = import ./rcodesign.nix;
   };
@@ -132,7 +131,6 @@ let
     # Restore nixpkgs haskell and haskellPackages
     (_: prev: { inherit (prev.haskell-nix-prev) haskell haskellPackages; })
     cacheCompilerDeps
-    fetch-source
     lazy-inputs
     rcodesign
   ];

diff --git a/overlays/fetch-source.nix b/overlays/fetch-source.nix