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/tools/haskell | |
| parent | 518f09f2d0e8829c3ef77c0f535df309f49ed6d9 (diff) | |
| download | nixpkgs-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/tools/haskell')
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/tools/haskell/dconf2nix/default.nix b/pkgs/development/tools/haskell/dconf2nix/default.nix index cfd391866ee..4cc137b54f7 100644 --- a/pkgs/development/tools/haskell/dconf2nix/default.nix +++ b/pkgs/development/tools/haskell/dconf2nix/default.nix @@ -2,12 +2,12 @@ let dconf2nix = - haskell.lib.justStaticExecutables - (haskell.lib.overrideCabal haskellPackages.dconf2nix (oldAttrs: { + haskell.lib.compose.justStaticExecutables + (haskell.lib.compose.overrideCabal (oldAttrs: { maintainers = (oldAttrs.maintainers or []) ++ [ lib.maintainers.gvolpe ]; - })); + }) haskellPackages.dconf2nix); in dconf2nix.overrideAttrs (oldAttrs: { diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 7e8839b2e72..9f67317d71f 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -11,8 +11,8 @@ let inherit (lib) concatStringsSep concatMapStringsSep take splitString; getPackages = version: haskell.packages."ghc${version}"; tunedHls = hsPkgs: - haskell.lib.justStaticExecutables - (haskell.lib.overrideCabal hsPkgs.haskell-language-server (old: { + haskell.lib.compose.justStaticExecutables + (haskell.lib.compose.overrideCabal (old: { postInstall = '' remove-references-to -t ${hsPkgs.ghc} $out/bin/haskell-language-server remove-references-to -t ${hsPkgs.shake.data} $out/bin/haskell-language-server @@ -20,7 +20,7 @@ let remove-references-to -t ${hsPkgs.js-dgtable.data} $out/bin/haskell-language-server remove-references-to -t ${hsPkgs.js-flot.data} $out/bin/haskell-language-server ''; - })); + }) hsPkgs.haskell-language-server); targets = version: let packages = getPackages version; in [ diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix index 5e372b4f387..0b0a9778c36 100644 --- a/pkgs/development/tools/haskell/lambdabot/default.nix +++ b/pkgs/development/tools/haskell/lambdabot/default.nix @@ -23,7 +23,7 @@ let allPkgs = pkgs: mueval.defaultPkgs pkgs ++ [ pkgs.lambdabot-trusted ] ++ pac modulesStr = lib.replaceChars ["\n"] [" "] modules; configStr = lib.replaceChars ["\n"] [" "] configuration; -in haskellLib.overrideCabal haskellPackages.lambdabot (self: { +in haskellLib.overrideCabal (self: { patches = (self.patches or []) ++ [ ./custom-config.patch ]; postPatch = (self.postPatch or "") + '' substituteInPlace src/Main.hs \ @@ -38,4 +38,4 @@ in haskellLib.overrideCabal haskellPackages.lambdabot (self: { wrapProgram $out/bin/lambdabot \ --prefix PATH ":" '${bins}' ''; -}) +}) haskellPackages.lambdabot |