Fix build
This commit is contained in:
parent
ad411a85ef
commit
07cda13680
|
@ -93,10 +93,10 @@
|
|||
"homepage": null,
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "cedf914352bee8c2ee2fb48c1bf7310eab44c3d6",
|
||||
"sha256": "17ad5l29bdf8p7zlm0bfyrkwf8k93fh60v8vc1r7y4r4bm1hfikn",
|
||||
"rev": "6f54d970ddb43d237ff0645500818875bf61388e",
|
||||
"sha256": "08gsjz8alrkby3lrlkyz2fqwncsy781qd0qlardmgji1q54qrbyc",
|
||||
"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"
|
||||
},
|
||||
"obelisk": {
|
||||
|
|
|
@ -12,22 +12,26 @@ let
|
|||
makeHaskellPackages = 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
|
||||
cabal2nix weeder reflex-dom password optics shh-extras neuron
|
||||
hspec-discover paths hmatrix postgresql-simple snap
|
||||
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;
|
||||
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
|
||||
{
|
||||
inherit ghc; # haskellPackages;
|
||||
inherit ghc haskellPackages;
|
||||
nix-output-monitor = master.nix-output-monitor;
|
||||
myHaskellPackages = makeHaskellPackages haskellPackages;
|
||||
myHaskellScriptPackages = makeHaskellScriptPackages haskellPackages;
|
||||
|
|
Loading…
Reference in a new issue