diff options
author | Ellie Hermaszewska <git@monoid.al> | 2021-10-26 18:20:34 +0800 |
---|---|---|
committer | Ellie Hermaszewska <git@monoid.al> | 2021-11-07 20:18:45 +0800 |
commit | 15ae25f36ce057c1750f02e30bcd7b6dc38d523b (patch) | |
tree | b185f546a252ee953c0902803bb9fd8a692b33c7 /pkgs/development/haskell-modules/make-package-set.nix | |
parent | 518f09f2d0e8829c3ef77c0f535df309f49ed6d9 (diff) | |
download | nixlib-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar nixlib-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.gz nixlib-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.bz2 nixlib-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.lz nixlib-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.xz nixlib-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.zst nixlib-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.zip |
haskell: switch from haskell.lib to haskell.lib.compose
Diffstat (limited to 'pkgs/development/haskell-modules/make-package-set.nix')
-rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index d272f7375a82..5d86a685e1bf 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -49,23 +49,23 @@ let nodejs = buildPackages.nodejs-slim; inherit (self) buildHaskellPackages ghc ghcWithHoogle ghcWithPackages; inherit (self.buildHaskellPackages) jailbreak-cabal; - hscolour = overrideCabal self.buildHaskellPackages.hscolour (drv: { + hscolour = overrideCabal (drv: { isLibrary = false; doHaddock = false; hyperlinkSource = false; # Avoid depending on hscolour for this build. postFixup = "rm -rf $out/lib $out/share $out/nix-support"; - }); - cpphs = overrideCabal (self.cpphs.overrideScope (self: super: { + }) self.buildHaskellPackages.hscolour; + cpphs = overrideCabal (drv: { + isLibrary = false; + postFixup = "rm -rf $out/lib $out/share $out/nix-support"; + }) (self.cpphs.overrideScope (self: super: { mkDerivation = drv: super.mkDerivation (drv // { enableSharedExecutables = false; enableSharedLibraries = false; doHaddock = false; useCpphs = false; }); - })) (drv: { - isLibrary = false; - postFixup = "rm -rf $out/lib $out/share $out/nix-support"; - }); + })); }; mkDerivation = makeOverridable mkDerivationImpl; @@ -294,7 +294,7 @@ in package-set { inherit pkgs lib callPackage; } self // { # # # default.nix # with import <nixpkgs> {}; - # haskellPackages.extend (haskell.lib.packageSourceOverrides { + # haskellPackages.extend (haskell.lib.compose.packageSourceOverrides { # frontend = ./frontend; # backend = ./backend; # common = ./common; |