|
13 | 13 | flake-utils.lib.eachDefaultSystem (system: |
14 | 14 | let pkgs = import nixpkgs { |
15 | 15 | inherit system; |
16 | | - overlays = [ self.nixOverlays.default ]; |
| 16 | + overlays = [ self.overlays.default ]; |
17 | 17 | }; |
18 | 18 | in { |
19 | 19 | packages = rec { |
|
47 | 47 | }; |
48 | 48 | } |
49 | 49 | ) // { |
50 | | - nixOverlays.default = self2: super2: |
51 | | - let hsPkgs = self2.haskell.packages.ghc96; |
| 50 | + overlays.default = final: super2: |
| 51 | + let hsPkgs = final.haskell.packages.ghc96; |
52 | 52 | in { |
53 | 53 | hackage-server = inputs.hackage-server.packages.x86_64-linux.hackage-server; |
54 | 54 | inherit (self.packages.x86_64-linux) run-hackage-build; |
55 | 55 |
|
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; }; |
59 | 59 | Cabal-syntax = hsPkgs.callCabal2nix "Cabal-syntax" "${inputs.cabal}/Cabal-syntax" { }; |
60 | 60 | Cabal-described = hsPkgs.callCabal2nix "Cabal-described" "${inputs.cabal}/Cabal-described" { }; |
61 | 61 | Cabal-QuickCheck = hsPkgs.callCabal2nix "Cabal-QuickCheck" "${inputs.cabal}/Cabal-QuickCheck" { }; |
62 | 62 | Cabal-tests = hsPkgs.callCabal2nix "Cabal-tests" "${inputs.cabal}/Cabal-tests" { }; |
63 | 63 | 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; }; |
65 | 65 | }; |
66 | 66 |
|
67 | 67 | nixosModules.doc-builder = {pkgs, ...}: { |
68 | 68 | imports = [ |
69 | 69 | ./deploy.nix |
70 | 70 | ]; |
71 | 71 |
|
72 | | - nixpkgs.overlays = [ self.nixOverlays.default ]; |
| 72 | + nixpkgs.overlays = [ self.overlays.default ]; |
73 | 73 | }; |
74 | 74 | }; |
75 | 75 | } |
0 commit comments