Skip to content

Commit 52e3bca

Browse files
committed
Use lazy-inputs instead of fetch-source overlay
1 parent ec3e51b commit 52e3bca

File tree

3 files changed

+4
-50
lines changed

3 files changed

+4
-50
lines changed

lazy-inputs/default.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ let
33
callFlake = import prev.haskell-nix.sources.flake-compat;
44
in {
55
haskell-nix = prev.haskell-nix // {
6-
sources = prev.haskell-nix.sources // {
6+
sources = {
77
inherit ((callFlake { pkgs = final; src = ./ghc8107; }).defaultNix) ghc8107;
88
inherit ((callFlake { pkgs = final; src = ./ghc901; }).defaultNix) ghc901;
99
inherit ((callFlake { pkgs = final; src = ./ghc902; }).defaultNix) ghc902;
@@ -32,6 +32,8 @@ in {
3232
inherit ((callFlake { pkgs = final; src = ./ghc981; }).defaultNix) ghc981;
3333
inherit ((callFlake { pkgs = final; src = ./ghc982; }).defaultNix) ghc982;
3434
inherit ((callFlake { pkgs = final; src = ./ghc9101; }).defaultNix) ghc9101;
35-
};
35+
inherit ((callFlake { pkgs = final; src = ./ghc912X; }).defaultNix) ghc912X;
36+
inherit ((callFlake { pkgs = final; src = ./ghc913; }).defaultNix) ghc913;
37+
} // prev.haskell-nix.sources;
3638
};
3739
}

overlays/default.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ let
9191
ghcjs = import ./ghcjs.nix;
9292
cabalPkgConfig = import ./cabal-pkg-config.nix;
9393
cacheCompilerDeps = import ./cache-compiler-deps.nix;
94-
fetch-source = import ./fetch-source.nix;
9594
lazy-inputs = import ../lazy-inputs;
9695
rcodesign = import ./rcodesign.nix;
9796
};
@@ -132,7 +131,6 @@ let
132131
# Restore nixpkgs haskell and haskellPackages
133132
(_: prev: { inherit (prev.haskell-nix-prev) haskell haskellPackages; })
134133
cacheCompilerDeps
135-
fetch-source
136134
lazy-inputs
137135
rcodesign
138136
];

overlays/fetch-source.nix

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)