summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
diff options
context:
space:
mode:
authorEllie Hermaszewska <git@monoid.al>2021-10-26 18:20:34 +0800
committerEllie Hermaszewska <git@monoid.al>2021-11-07 20:18:45 +0800
commit15ae25f36ce057c1750f02e30bcd7b6dc38d523b (patch)
treeb185f546a252ee953c0902803bb9fd8a692b33c7 /pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
parent518f09f2d0e8829c3ef77c0f535df309f49ed6d9 (diff)
downloadnixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar
nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.gz
nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.bz2
nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.lz
nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.xz
nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.zst
nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.zip
haskell: switch from haskell.lib to haskell.lib.compose
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 4d0c3320894..d5523fd07cf 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -72,20 +72,20 @@ self: super: {
   shower = doJailbreak super.shower;
 
   # The shipped Setup.hs file is broken.
-  csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; });
+  csv = overrideCabal (drv: { preCompileBuildDriver = "rm Setup.hs"; }) super.csv;
 
   # Apply patch from https://github.com/finnsson/template-helper/issues/12#issuecomment-611795375 to fix the build.
-  language-haskell-extract = appendPatch (doJailbreak super.language-haskell-extract) (pkgs.fetchpatch {
+  language-haskell-extract = appendPatch (pkgs.fetchpatch {
     name = "language-haskell-extract-0.2.4.patch";
     url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/e48738ee1be774507887a90a0d67ad1319456afc/patches/language-haskell-extract-0.2.4.patch?inline=false";
     sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
-  });
+  }) (doJailbreak super.language-haskell-extract);
 
   # hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now.
   hnix = generateOptparseApplicativeCompletion "hnix"
-    (overrideCabal super.hnix (drv: {
+    (overrideCabal (drv: {
       # executable is allowed for ghc >= 8.10 and needs repline
       executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ];
-    }));
+    }) super.hnix);
 
 }