1
0
Fork 0

Less fucked up haskell overrides

This commit is contained in:
Malte Brandy 2021-07-02 03:25:36 +02:00
parent ee71c9fd51
commit 0719dc8707
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
2 changed files with 9 additions and 7 deletions

View file

@ -3,5 +3,7 @@ let
unstable = import super.sources.nixos-unstable { };
in
{
inherit (unstable) haskellPackages ghc cachix nix-output-monitor cabal2nix;
inherit (unstable) cachix nix-output-monitor cabal2nix;
unstableHaskellPackages = unstable.haskellPackages;
unstableGhc = unstable.ghc;
}

View file

@ -1,6 +1,7 @@
final: prev:
let
inherit (prev) ghc haskellPackages;
ghc = prev.unstableGhc;
haskellPackages = prev.unstableHaskellPackages;
inherit (prev.haskell.lib) overrideCabal unmarkBroken doJailbreak dontCheck;
makeHaskellScriptPackages = p: {
inherit (p)
@ -12,11 +13,10 @@ let
{
inherit (p)
brittany ormolu releaser cabal-fmt stack ghcid ghcide arbtt iCalendar
pretty-simple tz stm-containers streamly
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 req
pretty-simple tz stm-containers streamly 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 req
;
} // makeHaskellScriptPackages p;
in