maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Fix generic-optics build

Browse source
This commit is contained in:
Malte Brandy 2021-04-25 15:45:49 +02:00
parent 17bb8c3607
commit 4c97755915
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
overlays/30-ghc.nix
View file

@ -2,7 +2,7 @@ self: super:
let let
inherit (super) fetchFromGitHub; inherit (super) fetchFromGitHub;
master = import super.sources.nixpkgs-master {}; master = import super.sources.nixpkgs-master {};
inherit (master.haskell.lib) overrideCabal unmarkBroken doJailbreak; inherit (master.haskell.lib) overrideCabal unmarkBroken doJailbreak dontCheck;
makeHaskellScriptPackages = p: { makeHaskellScriptPackages = p: {
inherit (p) inherit (p)
aeson shh string-interpolate relude replace-megaparsec async say aeson shh string-interpolate relude replace-megaparsec async say
@ -20,7 +20,9 @@ let
hedgehog nix-derivation hedgehog nix-derivation
; ;
} // makeHaskellScriptPackages p; } // makeHaskellScriptPackages p;
overrides = self: super: {}; overrides = self: super: {
generic-optics = dontCheck super.generic-optics;
};
haskellPackages = master.haskellPackages.extend overrides; haskellPackages = master.haskellPackages.extend overrides;
ghc = haskellPackages.ghc; ghc = haskellPackages.ghc;
in in

5
overlays/kassandra2/default.nix
View file

@ -1,7 +1,6 @@
final: prev: let final: prev: let
master = import prev.sources.nixpkgs-master {}; kassandra = prev.haskellPackages.callCabal2nix "kassandra" (prev.sources.kassandra2 + "/kassandra") {};
kassandra = master.haskellPackages.callCabal2nix "kassandra" (prev.sources.kassandra2 + "/kassandra") {}; standalone = prev.haskellPackages.callCabal2nix "standalone" (prev.sources.kassandra2 + "/standalone") { inherit kassandra; };
standalone = master.haskellPackages.callCabal2nix "standalone" (prev.sources.kassandra2 + "/standalone") { inherit kassandra; };
in { in {
kassandra2 = standalone; kassandra2 = standalone;
} }