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

Fix build

Browse source
This commit is contained in:
Malte Brandy 2021-03-20 13:49:42 +01:00
parent ad411a85ef
commit 07cda13680
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nix/sources.json
View file

@ -93,10 +93,10 @@
"homepage": null, "homepage": null,
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cedf914352bee8c2ee2fb48c1bf7310eab44c3d6", "rev": "6f54d970ddb43d237ff0645500818875bf61388e",
"sha256": "17ad5l29bdf8p7zlm0bfyrkwf8k93fh60v8vc1r7y4r4bm1hfikn", "sha256": "08gsjz8alrkby3lrlkyz2fqwncsy781qd0qlardmgji1q54qrbyc",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cedf914352bee8c2ee2fb48c1bf7310eab44c3d6.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/6f54d970ddb43d237ff0645500818875bf61388e.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"obelisk": { "obelisk": {

20
overlays/30-ghc.nix
View file

@ -12,22 +12,26 @@ let
makeHaskellPackages = p: makeHaskellPackages = p:
{ {
inherit (p) inherit (p)
brittany ormolu releaser cabal-fmt stack ghcid ghcide brittany ormolu releaser cabal-fmt stack ghcid ghcide arbtt cabal-edit iCalendar
haskell-language-server cabal-install dhall taskwarrior pandoc hlint haskell-language-server cabal-install dhall taskwarrior pandoc hlint
cabal2nix weeder reflex-dom password optics shh-extras neuron cabal2nix weeder reflex-dom password optics shh-extras neuron
hspec-discover paths hmatrix postgresql-simple snap hspec-discover paths hmatrix postgresql-simple snap
hedgehog nix-derivation hedgehog nix-derivation
; ;
iCalendar = overrideCabal (doJailbreak (unmarkBroken p.iCalendar)) {
preConfigure = ''substituteInPlace iCalendar.cabal --replace "network >=2.6 && <2.7" "network -any"'';
};
arbtt = doJailbreak p.arbtt;
cabal-edit = doJailbreak p.cabal-edit;
} // makeHaskellScriptPackages p; } // makeHaskellScriptPackages p;
inherit (master) ghc haskellPackages; overrides = self: super: {
iCalendar = overrideCabal (doJailbreak (unmarkBroken super.iCalendar)) {
preConfigure = ''substituteInPlace iCalendar.cabal --replace "network >=2.6 && <2.7" "network -any"'';
#configureFlags = [ "--allow-newer=network" ]; # try this on ghc 9.0
};
arbtt = doJailbreak super.arbtt;
cabal-edit = doJailbreak super.cabal-edit;
};
haskellPackages = master.haskellPackages.extend overrides;
ghc = haskellPackages.ghc;
in in
{ {
inherit ghc; # haskellPackages; inherit ghc haskellPackages;
nix-output-monitor = master.nix-output-monitor; nix-output-monitor = master.nix-output-monitor;
myHaskellPackages = makeHaskellPackages haskellPackages; myHaskellPackages = makeHaskellPackages haskellPackages;
myHaskellScriptPackages = makeHaskellScriptPackages haskellPackages; myHaskellScriptPackages = makeHaskellScriptPackages haskellPackages;