diff options
Diffstat (limited to 'pkgs/development/tools')
9 files changed, 23 insertions, 23 deletions
diff --git a/pkgs/development/tools/continuous-integration/hci/default.nix b/pkgs/development/tools/continuous-integration/hci/default.nix index dfca0c4d388..5c0c59845ce 100644 --- a/pkgs/development/tools/continuous-integration/hci/default.nix +++ b/pkgs/development/tools/continuous-integration/hci/default.nix @@ -1,13 +1,12 @@ { haskell, haskellPackages, lib, makeWrapper, runc, stdenv }: let - inherit (haskell.lib) overrideCabal addBuildDepends; + inherit (haskell.lib.compose) overrideCabal addBuildDepends justStaticExecutables; inherit (lib) makeBinPath; bundledBins = lib.optional stdenv.isLinux runc; pkg = # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 overrideCabal - (addBuildDepends (haskell.lib.justStaticExecutables haskellPackages.hercules-ci-cli) [ makeWrapper ]) (o: { postInstall = '' ${o.postInstall or ""} @@ -15,7 +14,8 @@ let mv $out/bin/hci $out/libexec makeWrapper $out/libexec/hci $out/bin/hci --prefix PATH : ${makeBinPath bundledBins} ''; - }); + }) + (addBuildDepends [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-cli)); in pkg // { meta = pkg.meta // { position = toString ./default.nix + ":1"; diff --git a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix index bc464c2024e..00ae501e534 100644 --- a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix @@ -1,13 +1,12 @@ { gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, nixos, runc, stdenv }: let - inherit (haskell.lib) overrideCabal addBuildDepends; + inherit (haskell.lib.compose) overrideCabal addBuildDepends justStaticExecutables; inherit (lib) makeBinPath; bundledBins = [ gnutar gzip git ] ++ lib.optional stdenv.isLinux runc; pkg = # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 overrideCabal - (addBuildDepends (haskell.lib.justStaticExecutables haskellPackages.hercules-ci-agent) [ makeWrapper ]) (o: { postInstall = '' ${o.postInstall or ""} @@ -15,7 +14,8 @@ let mv $out/bin/hercules-ci-agent $out/libexec makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${makeBinPath bundledBins} ''; - }); + }) + (addBuildDepends [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-agent)); in pkg.overrideAttrs (o: { meta = o.meta // { position = toString ./default.nix + ":1"; 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 diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix index 7c286218d8e..475fa6a93e4 100644 --- a/pkgs/development/tools/pandoc/default.nix +++ b/pkgs/development/tools/pandoc/default.nix @@ -1,10 +1,10 @@ { haskellPackages, fetchpatch, haskell, removeReferencesTo }: let - static = haskell.lib.justStaticExecutables haskellPackages.pandoc; + static = haskell.lib.compose.justStaticExecutables haskellPackages.pandoc; in - (haskell.lib.overrideCabal static (drv: { + (haskell.lib.compose.overrideCabal (drv: { configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ]; @@ -16,7 +16,7 @@ in sha256 = "gOtrWVylzwgu0YLD4SztqlXxtaXXGOf8nTqLwUBS7qs="; }) ]; - })).overrideAttrs (drv: { + }) static).overrideAttrs (drv: { # These libraries are still referenced, because they generate # a `Paths_*` module for figuring out their version. diff --git a/pkgs/development/tools/pretty-simple/default.nix b/pkgs/development/tools/pretty-simple/default.nix index c55e176176d..0a33b6e6b2e 100644 --- a/pkgs/development/tools/pretty-simple/default.nix +++ b/pkgs/development/tools/pretty-simple/default.nix @@ -1,6 +1,6 @@ { haskell, haskellPackages, lib }: -haskell.lib.justStaticExecutables (haskell.lib.overrideCabal haskellPackages.pretty-simple (oldAttrs: { +haskell.lib.compose.justStaticExecutables (haskell.lib.compose.overrideCabal (oldAttrs: { maintainers = (oldAttrs.maintainers or []) ++ [ lib.maintainers.cdepillabout ]; @@ -8,5 +8,5 @@ haskell.lib.justStaticExecutables (haskell.lib.overrideCabal haskellPackages.pre configureFlags = (oldAttrs.configureFlags or []) ++ ["-fbuildexe"]; buildDepends = (oldAttrs.buildDepends or []) ++ [haskellPackages.optparse-applicative]; -})) +}) haskellPackages.pretty-simple) diff --git a/pkgs/development/tools/purescript/spago/default.nix b/pkgs/development/tools/purescript/spago/default.nix index 980bca0fa2d..51516ed5b25 100644 --- a/pkgs/development/tools/purescript/spago/default.nix +++ b/pkgs/development/tools/purescript/spago/default.nix @@ -12,14 +12,14 @@ let spago = - haskell.lib.justStaticExecutables - (haskell.lib.overrideCabal haskellPackages.spago (oldAttrs: { + haskell.lib.compose.justStaticExecutables + (haskell.lib.compose.overrideCabal (oldAttrs: { maintainers = (oldAttrs.maintainers or []) ++ [ lib.maintainers.cdepillabout ]; changelog = "https://github.com/purescript/spago/releases/tag/${oldAttrs.version}"; - })); + }) haskellPackages.spago); in spago.overrideAttrs (oldAttrs: { diff --git a/pkgs/development/tools/shellcheck/default.nix b/pkgs/development/tools/shellcheck/default.nix index 284ce6d817a..cf767515082 100644 --- a/pkgs/development/tools/shellcheck/default.nix +++ b/pkgs/development/tools/shellcheck/default.nix @@ -15,7 +15,7 @@ let }; in drv' // { meta = meta' // overrideFn meta'; }; - bin = haskell.lib.justStaticExecutables haskellPackages.ShellCheck; + bin = haskell.lib.compose.justStaticExecutables haskellPackages.ShellCheck; shellcheck = stdenv.mkDerivation { pname = "shellcheck"; |