diff options
Diffstat (limited to 'pkgs/applications/version-management')
17 files changed, 25 insertions, 20 deletions
diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index ae1929565b6..af2b5cdc9a3 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -12,7 +12,7 @@ python2Packages.buildPythonApplication rec { sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; checkInputs = [ subversion git breezy ]; diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index 1ffc0653675..036eef1c9c3 100644 --- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -15,7 +15,8 @@ in sha256 = "1kn84rsvms1v5l1j2xgrk7dc7mnsmxkc6sqd94mnim22vnwvl8mz"; }; - buildInputs = [ jre makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; phases = "installPhase"; diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index 5aea15769c0..565fe180ba1 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0hzyh66rlawxip4n2pvz7pbs0cq82clqv1d6c7hf60v1drjxw287"; }; - buildInputs = [mercurial.python mercurial makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [mercurial.python mercurial]; installPhase = '' binPath=$out/bin diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index 08875dabd0f..f0184c66377 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { sha256 = "13m9y0m6gc3mlw3pqv9x4i0him2ycbysizigdvdanhh514kga602"; }; - nativeBuildInputs = [ libxslt ]; + nativeBuildInputs = [ libxslt makeWrapper ]; - buildInputs = [ openssl makeWrapper ]; + buildInputs = [ openssl ]; patchPhase = '' substituteInPlace commands.cpp \ diff --git a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix index 942a12e239b..7b8b5fed90f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=$(out)" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # perl provides shasum postInstall = '' diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix index 5e5bba3df72..c67a575172c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "11n46bngvca5wbdbfcxzjhjbfdbad7sgf7h9gf956cb1q8swsdm0"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildPhase = null; diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix index 2ecc5d872b8..1a1811b2f43 100644 --- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1g8i6vpjnnfh7vc1269c91bap267w4bxdqqwnzb8x18vqgn2fx8i"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildPhase = null; diff --git a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix index 037de14658d..ec1c44b9613 100644 --- a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0v0yxydpw6r4awy0hb7sbnh520zsk86ibzh1xjf3983yhsvkfk5v"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index eea7bed011b..3143d7ef9c3 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation { sha256 = "0hc7yavcp8jmn6b7wngjqhy8kl7f4191sfpik8ycvqghkvvimxj4"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -D git-secret $out/bin/git-secret diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index 87cb7452c75..add7bfc5526 100644 --- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 8761fc9fbca..c955c04d779 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -67,10 +67,10 @@ stdenv.mkDerivation { --subst-var-by gettext ${gettext} ''; - nativeBuildInputs = [ gettext perlPackages.perl ] + nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ] ++ lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x docbook_xsl docbook_xsl_ns docbook_xml_dtd_45 libxslt ]; - buildInputs = [curl openssl zlib expat cpio makeWrapper libiconv] + buildInputs = [curl openssl zlib expat cpio libiconv] ++ lib.optionals perlSupport [ perlPackages.perl ] ++ lib.optionals guiSupport [tcl tk] ++ lib.optionals withpcre2 [ pcre2 ] diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index 08bf5eb6ba0..6572b9b7fc8 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-kHirHG/bfsU6tKyQ0khNSTyChhzHfzib+HyA3LOtBI8="; }; - buildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; preBuild = '' makeFlagsArray+=(prefix="$out") diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index 69742b6d760..74f10a14288 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0ly2vrv6q31n0xhciwb7a1ilr5c6ndyi3bg81yfp4axiypps7l41"; }; - buildInputs = [ ruby makeWrapper ]; + nativeBuildInputs = [ ruby makeWrapper ]; dontBuild = true; diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index aebd488fe30..3225744abc5 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam"; }; - buildInputs = [ makeWrapper git openssl coreutils util-linux gnugrep gnused gawk ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ git openssl coreutils util-linux gnugrep gnused gawk ]; patches = [ ./helper-scripts_depspathprefix.patch ]; diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/pkgs/applications/version-management/mercurial/4.9.nix index 29440724274..f499be17f7c 100644 --- a/pkgs/applications/version-management/mercurial/4.9.nix +++ b/pkgs/applications/version-management/mercurial/4.9.nix @@ -21,7 +21,8 @@ in python2Packages.buildPythonApplication { inherit python; # pass it so that the same version can be used in hg2git - buildInputs = [ makeWrapper docutils unzip ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ docutils unzip ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ hg-git dulwich ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index c841482126a..7c0a96583e7 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -19,7 +19,8 @@ in python3Packages.buildPythonApplication rec { passthru = { inherit python; }; # pass it so that the same version can be used in hg2git - buildInputs = [ makeWrapper docutils unzip ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ docutils unzip ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index d6d55eaa4eb..56cc2a4ea5a 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { version = "1.0.2"; pname = "monotone-viz"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 camlp4]; src = fetchurl { url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz"; sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk"; |