Skip to content

Commit d2ef72b

Browse files
committed
flake: Rename nixOverlays -> overlays
1 parent 417405d commit d2ef72b

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

flake.nix

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
flake-utils.lib.eachDefaultSystem (system:
1414
let pkgs = import nixpkgs {
1515
inherit system;
16-
overlays = [ self.nixOverlays.default ];
16+
overlays = [ self.overlays.default ];
1717
};
1818
in {
1919
packages = rec {
@@ -47,29 +47,29 @@
4747
};
4848
}
4949
) // {
50-
nixOverlays.default = self2: super2:
51-
let hsPkgs = self2.haskell.packages.ghc96;
50+
overlays.default = final: super2:
51+
let hsPkgs = final.haskell.packages.ghc96;
5252
in {
5353
hackage-server = inputs.hackage-server.packages.x86_64-linux.hackage-server;
5454
inherit (self.packages.x86_64-linux) run-hackage-build;
5555

56-
cabal-install = hsPkgs.callCabal2nix "cabal-install" "${inputs.cabal}/cabal-install" { inherit (self2) Cabal cabal-install-solver hackage-security; };
57-
cabal-install-solver = hsPkgs.callCabal2nix "cabal-install-solver" "${inputs.cabal}/cabal-install-solver" { inherit (self2) Cabal; };
58-
Cabal = hsPkgs.callCabal2nix "Cabal" "${inputs.cabal}/Cabal" { inherit (self2) Cabal-syntax; };
56+
cabal-install = hsPkgs.callCabal2nix "cabal-install" "${inputs.cabal}/cabal-install" { inherit (final) Cabal cabal-install-solver hackage-security; };
57+
cabal-install-solver = hsPkgs.callCabal2nix "cabal-install-solver" "${inputs.cabal}/cabal-install-solver" { inherit (final) Cabal; };
58+
Cabal = hsPkgs.callCabal2nix "Cabal" "${inputs.cabal}/Cabal" { inherit (final) Cabal-syntax; };
5959
Cabal-syntax = hsPkgs.callCabal2nix "Cabal-syntax" "${inputs.cabal}/Cabal-syntax" { };
6060
Cabal-described = hsPkgs.callCabal2nix "Cabal-described" "${inputs.cabal}/Cabal-described" { };
6161
Cabal-QuickCheck = hsPkgs.callCabal2nix "Cabal-QuickCheck" "${inputs.cabal}/Cabal-QuickCheck" { };
6262
Cabal-tests = hsPkgs.callCabal2nix "Cabal-tests" "${inputs.cabal}/Cabal-tests" { };
6363
Cabal-tree-diff = hsPkgs.callCabal2nix "Cabal-tree-diff" "${inputs.cabal}/Cabal-tree-diff" { };
64-
hackage-security = hsPkgs.callCabal2nix "hackage-security" "${inputs.hackage-security}/hackage-security" { inherit (self2) Cabal Cabal-syntax; };
64+
hackage-security = hsPkgs.callCabal2nix "hackage-security" "${inputs.hackage-security}/hackage-security" { inherit (final) Cabal Cabal-syntax; };
6565
};
6666

6767
nixosModules.doc-builder = {pkgs, ...}: {
6868
imports = [
6969
./deploy.nix
7070
];
7171

72-
nixpkgs.overlays = [ self.nixOverlays.default ];
72+
nixpkgs.overlays = [ self.overlays.default ];
7373
};
7474
};
7575
}

0 commit comments

Comments
 (0)