From 0197c05786be1ce37c694abb3f9f150bfbf818a5 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 19 Jun 2019 09:00:14 -0400 Subject: [PATCH 1/6] setup.sh: add dontConfigure There's already 21 occurences of this and I've expected this to exist without knowing it had no affect for a while. --- pkgs/stdenv/generic/setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index dcccdaa50ae..38453aa61bb 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1283,6 +1283,7 @@ genericBuild() { fi for curPhase in $phases; do + if [[ "$curPhase" = configurePhase && -n "${dontConfigure:-}" ]]; then continue; fi if [[ "$curPhase" = buildPhase && -n "${dontBuild:-}" ]]; then continue; fi if [[ "$curPhase" = checkPhase && -z "${doCheck:-}" ]]; then continue; fi if [[ "$curPhase" = installPhase && -n "${dontInstall:-}" ]]; then continue; fi From c79ec3323e9eee544217742df1e032bb5b601296 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 19 Jun 2019 09:00:39 -0400 Subject: [PATCH 2/6] doc/stdenv: describe dontConfigure --- doc/stdenv.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index dbffdad9fde..9de912274dc 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1109,6 +1109,16 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] + + + dontConfigure + + + + Set to true to skip the configure phase. + + + configureFlagsArray From cab7c6cbd964a99db55ba55960c8ddbaf294bc67 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 19 Jun 2019 11:36:06 -0400 Subject: [PATCH 3/6] treewide: use dontConfigure --- .../hardware/sane_extra_backends/brscan4_etc_files.nix | 4 ++-- nixos/modules/services/web-servers/lighttpd/collectd.nix | 2 +- .../editors/emacs-modes/emacs-libvterm/default.nix | 2 +- pkgs/applications/editors/emacs-modes/quack/default.nix | 2 +- pkgs/applications/misc/batti/default.nix | 4 ++-- pkgs/applications/misc/cdrtools/default.nix | 2 +- pkgs/applications/networking/cluster/hadoop/default.nix | 4 ++-- pkgs/applications/networking/sync/rsync/rrsync.nix | 2 +- pkgs/applications/video/dvb-apps/default.nix | 2 +- pkgs/development/libraries/zlib/default.nix | 2 +- pkgs/development/ocaml-modules/cryptgps/default.nix | 2 +- pkgs/development/ocaml-modules/expat/0.9.nix | 2 +- pkgs/development/ocaml-modules/extlib/default.nix | 2 +- pkgs/development/ocaml-modules/http/default.nix | 2 +- pkgs/development/ocaml-modules/pcre/default.nix | 2 +- pkgs/development/tools/java/jhiccup/default.nix | 2 +- pkgs/development/tools/misc/ycmd/default.nix | 2 +- pkgs/misc/apulse/pressureaudio.nix | 8 ++++---- pkgs/os-specific/linux/trace-cmd/default.nix | 2 +- pkgs/servers/foundationdb/vsmake.nix | 2 +- pkgs/tools/archivers/unp/default.nix | 2 +- pkgs/tools/graphics/glxinfo/default.nix | 2 +- pkgs/tools/graphics/rocket/default.nix | 2 +- pkgs/tools/misc/hdfjava/default.nix | 2 +- pkgs/tools/networking/wrk2/default.nix | 2 +- pkgs/top-level/emacs-packages.nix | 2 +- 26 files changed, 32 insertions(+), 32 deletions(-) diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix index bd114f0d2cc..fd19d8020fb 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix @@ -19,7 +19,7 @@ nix-shell -E 'with import { }; brscan4-etc-files.override{netDevices=[ */ -with lib; +with lib; let @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ brscan4 ]; - configurePhase = ":"; + dontConfigure = true; buildPhase = '' TARGET_DIR="$out/etc/opt/brother/scanner/brscan4" diff --git a/nixos/modules/services/web-servers/lighttpd/collectd.nix b/nixos/modules/services/web-servers/lighttpd/collectd.nix index e70c980d524..3f262451c2c 100644 --- a/nixos/modules/services/web-servers/lighttpd/collectd.nix +++ b/nixos/modules/services/web-servers/lighttpd/collectd.nix @@ -12,7 +12,7 @@ let defaultCollectionCgi = config.services.collectd.package.overrideDerivation(old: { name = "collection.cgi"; - configurePhase = "true"; + dontConfigure = true; buildPhase = "true"; installPhase = '' substituteInPlace contrib/collection.cgi --replace '"/etc/collection.conf"' '$ENV{COLLECTION_CONF}' diff --git a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix index 8980dc1f0a9..8b3a0476e48 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix @@ -5,7 +5,7 @@ let name = emacs.name + "-sources"; src = emacs.src; - configurePhase = ":"; + dontConfigure = true; dontBuild = true; doCheck = false; fixupPhase = ":"; diff --git a/pkgs/applications/editors/emacs-modes/quack/default.nix b/pkgs/applications/editors/emacs-modes/quack/default.nix index 95634a24ded..29b3a72e9f0 100644 --- a/pkgs/applications/editors/emacs-modes/quack/default.nix +++ b/pkgs/applications/editors/emacs-modes/quack/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ emacs ]; unpackPhase = "true"; - configurePhase = "true"; + dontConfigure = true; installPhase = "true"; buildPhase = '' diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix index 283e7f19907..9322aefb2d6 100644 --- a/pkgs/applications/misc/batti/default.nix +++ b/pkgs/applications/misc/batti/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ pkgconfig gettext python gtk2 pygtk dbus-python gdk_pixbuf upower makeWrapper ]; - configurePhase = "true"; + dontConfigure = true; buildPhase = '' python setup.py build @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; - broken = true; # see https://github.com/NixOS/nixpkgs/pull/4031#issuecomment-56283520 + broken = true; # see https://github.com/NixOS/nixpkgs/pull/4031#issuecomment-56283520 }; } diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix index a46565eb76b..3738fb83c70 100644 --- a/pkgs/applications/misc/cdrtools/default.nix +++ b/pkgs/applications/misc/cdrtools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { substituteInPlace man/Makefile --replace "man4" "" ''; - configurePhase = "true"; + dontConfigure = true; GMAKE_NOWARN = true; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index dfe6513bf0c..42c043d0007 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -19,7 +19,7 @@ let # perform fake build to make a fixed-output derivation of dependencies downloaded from maven central (~100Mb in ~3000 files) fetched-maven-deps = stdenv.mkDerivation { name = "hadoop-${version}-maven-deps"; - inherit src postUnpack nativeBuildInputs buildInputs configurePhase; + inherit src postUnpack nativeBuildInputs buildInputs; buildPhase = '' while mvn package -Dmaven.repo.local=$out/.m2 ${mavenFlags} -Dmaven.wagon.rto=5000; [ $? = 1 ]; do echo "timeout, restart maven to continue downloading" @@ -51,7 +51,7 @@ let fi done ''; - configurePhase = "true"; # do not trigger cmake hook + dontConfigure = true; # do not trigger cmake hook mavenFlags = "-Drequire.snappy -Drequire.bzip2 -DskipTests -Pdist,native -e"; buildPhase = '' # 'maven.repo.local' must be writable diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index 7563b0ea195..12f992d44a5 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # Skip configure and build phases. # We just want something from the support directory - configurePhase = "true"; + dontConfigure = true; dontBuild = true; postPatch = '' diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix index 6281c788401..a032ef654aa 100644 --- a/pkgs/applications/video/dvb-apps/default.nix +++ b/pkgs/applications/video/dvb-apps/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ perl ]; - configurePhase = "true"; # skip configure + dontConfigure = true; # skip configure installPhase = "make prefix=$out install"; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 3a5638b2281..7fb5be1c343 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -86,5 +86,5 @@ stdenv.mkDerivation (rec { export CHOST=${stdenv.hostPlatform.config} ''; } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.libc == "msvcrt") { - configurePhase = ":"; + dontConfigure = true; }) diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index f8eb80837a3..7720650ddfc 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ocaml findlib]; - configurePhase = "true"; # Skip configure phase + dontConfigure = true; # Skip configure phase createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/expat/0.9.nix b/pkgs/development/ocaml-modules/expat/0.9.nix index 5fcc317d940..98ab04beb57 100644 --- a/pkgs/development/ocaml-modules/expat/0.9.nix +++ b/pkgs/development/ocaml-modules/expat/0.9.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { --replace "gcc" "\$(CC)" ''; - configurePhase = "true"; # Skip configure + dontConfigure = true; # Skip configure buildPhase = '' make all allopt diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index dba3e256957..df0bd9133d3 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; - configurePhase = "true"; # Skip configure + dontConfigure = true; # Skip configure # De facto, option minimal=1 seems to be the default. See the README. buildPhase = "make ${if minimal then "minimal=1" else ""} build"; installPhase = "make ${if minimal then "minimal=1" else ""} install"; diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index b9b530ac599..4a8b3906336 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH" ''; - configurePhase = "true"; # Skip configure phase + dontConfigure = true; # Skip configure phase buildPhase = '' make all opt diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index fb3b67b03b7..6428670ebb2 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - configurePhase = "true"; # Skip configure phase + dontConfigure = true; # Skip configure phase meta = with stdenv.lib; { homepage = https://bitbucket.org/mmottl/pcre-ocaml; diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix index 6fb34588cd0..4577de0cde4 100644 --- a/pkgs/development/tools/java/jhiccup/default.nix +++ b/pkgs/development/tools/java/jhiccup/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1hsvi8wjh615fnjf75h7b5afp04chqcgvini30vfcn3m9a5icbgy"; }; - configurePhase = ":"; + dontConfigure = true; buildPhase = ":"; installPhase = '' mkdir -p $out/bin $out/share/java diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 062f90e3389..2e67da18ae9 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ${python.interpreter} build.py --system-libclang --clang-completer --system-boost ''; - configurePhase = ":"; + dontConfigure = true; # remove the tests # diff --git a/pkgs/misc/apulse/pressureaudio.nix b/pkgs/misc/apulse/pressureaudio.nix index 142b7278457..710712fe508 100644 --- a/pkgs/misc/apulse/pressureaudio.nix +++ b/pkgs/misc/apulse/pressureaudio.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; - configurePhase = ":"; + dontConfigure = true; buildPhase = ":"; @@ -36,7 +36,7 @@ stdenv.mkDerivation { Name: libpulse Description: PulseAudio Client Interface Version: ${libpulseaudio.version}-rebootstrapped - Libs: -L$out/lib -lpulse + Libs: -L$out/lib -lpulse Cflags: -I$out/include -D_REENTRANT EOF @@ -44,7 +44,7 @@ stdenv.mkDerivation { Name: libpulse-simple Description: PulseAudio Simplified Synchronous Client Interface Version: ${libpulseaudio.version}-rebootstrapped - Libs: -L$out/lib -lpulse-simple + Libs: -L$out/lib -lpulse-simple Cflags: -I$out/include -D_REENTRANT Requires: libpulse EOF @@ -53,7 +53,7 @@ stdenv.mkDerivation { Name: libpulse-mainloop-glib Description: PulseAudio GLib 2.0 Main Loop Wrapper Version: ${libpulseaudio.version}-rebootstrapped - Libs: -L$out/lib -lpulse-mainloop-glib + Libs: -L$out/lib -lpulse-mainloop-glib Cflags: -I$out/include -D_REENTRANT Requires: libpulse glib-2.0 EOF diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 1d1712f6b47..33dbfe5bf0a 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ asciidoc libxslt ]; - configurePhase = "true"; + dontConfigure = true; buildPhase = "make prefix=$out MANPAGE_DOCBOOK_XSL=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl all doc"; installPhase = "make prefix=$out install install_doc"; diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix index 9871afb0de6..0eb71492be3 100644 --- a/pkgs/servers/foundationdb/vsmake.nix +++ b/pkgs/servers/foundationdb/vsmake.nix @@ -20,7 +20,7 @@ let sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; }; - configurePhase = ":"; + dontConfigure = true; buildPhase = ":"; installPhase = "mkdir -p $out/include && cp -R boost $out/include/"; }; diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix index 6880a49b4db..b9c549d670b 100644 --- a/pkgs/tools/archivers/unp/default.nix +++ b/pkgs/tools/archivers/unp/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { name = "unp_2.0_pre7+nmu1.tar.bz2"; }; - configurePhase = "true"; + dontConfigure = true; buildPhase = "true"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index 6a2a3a5a46e..1f8a98e0296 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libGL ]; - configurePhase = "true"; + dontConfigure = true; buildPhase = " $CC src/xdemos/{glxinfo.c,glinfo_common.c} -o glxinfo -lGL -lX11 diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix index 51343998950..c27eacaec8a 100644 --- a/pkgs/tools/graphics/rocket/default.nix +++ b/pkgs/tools/graphics/rocket/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase ]; - configurePhase = ":"; + dontConfigure = true; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/hdfjava/default.nix b/pkgs/tools/misc/hdfjava/default.nix index 553e78c58a7..0fe72425d79 100644 --- a/pkgs/tools/misc/hdfjava/default.nix +++ b/pkgs/tools/misc/hdfjava/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake javac ]; - configurePhase = "true"; + dontConfigure = true; buildPhase = "./build-hdfjava-unix.sh"; installPhase = '' mkdir -p $out diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/tools/networking/wrk2/default.nix index 5caad0874f7..e2e638ad485 100644 --- a/pkgs/tools/networking/wrk2/default.nix +++ b/pkgs/tools/networking/wrk2/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --replace 'struct luaL_reg ' 'struct luaL_Reg ' ''; - configurePhase = ":"; + dontConfigure = true; installPhase = '' mkdir -p $out/bin mv ./wrk $out/bin/wrk2 diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 953c25de0e8..6df20d926d7 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -334,7 +334,7 @@ let version = "2.12"; src = external.rtags.src; - configurePhase = ":"; + dontConfigure = true; propagatedUserEnvPkgs = [ external.rtags ]; recipe = writeText "recipe" '' From 4a88f4ebfcfb7bf8c5df473e5a77f64d9c93b91e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 19 Jun 2019 11:37:51 -0400 Subject: [PATCH 4/6] setup.sh: add dontUnpack --- pkgs/stdenv/generic/setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 38453aa61bb..ebcedce60b8 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1283,6 +1283,7 @@ genericBuild() { fi for curPhase in $phases; do + if [[ "$curPhase" = unpackPhase && -n "${dontUnpack:-}" ]]; then continue; fi if [[ "$curPhase" = configurePhase && -n "${dontConfigure:-}" ]]; then continue; fi if [[ "$curPhase" = buildPhase && -n "${dontBuild:-}" ]]; then continue; fi if [[ "$curPhase" = checkPhase && -z "${doCheck:-}" ]]; then continue; fi From b10e4624041cbbc824c034ee91bdca90d1132958 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 19 Jun 2019 11:39:33 -0400 Subject: [PATCH 5/6] doc/stdenv: describe dontUnpack --- doc/stdenv.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 9de912274dc..1dd8ea8caba 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -987,6 +987,17 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] + + + dontUnpack + + + + Set to true to skip the unpack phase. + + + + dontMakeSourcesWritable From 3f4a353737f165d4935c0404404c0de6eea92093 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 19 Jun 2019 11:45:34 -0400 Subject: [PATCH 6/6] treewide: use dontUnpack --- maintainers/scripts/nixpkgs-lint.nix | 2 +- nixos/lib/testing.nix | 2 +- nixos/lib/testing/jquery.nix | 2 +- nixos/modules/services/misc/gitlab.nix | 4 ++-- nixos/modules/virtualisation/openvswitch.nix | 2 +- nixos/tests/hydra/default.nix | 2 +- .../applications/editors/emacs-modes/graphviz-dot/default.nix | 2 +- pkgs/applications/editors/emacs-modes/quack/default.nix | 2 +- pkgs/applications/editors/emacs-modes/stgit/default.nix | 2 +- pkgs/applications/editors/emacs-modes/zeitgeist/default.nix | 2 +- pkgs/applications/editors/standardnotes/default.nix | 2 +- pkgs/applications/editors/yi/wrapper.nix | 2 +- pkgs/applications/graphics/graphicsmagick/compat.nix | 2 +- pkgs/applications/misc/jbidwatcher/default.nix | 2 +- pkgs/applications/misc/vcal/default.nix | 2 +- .../networking/browsers/tor-browser-bundle/default.nix | 2 +- .../networking/browsers/tor-browser-bundle/extensions.nix | 2 +- .../networking/instant-messengers/rambox/default.nix | 2 +- .../networking/instant-messengers/rambox/sencha/default.nix | 2 +- .../networking/instant-messengers/skypeforlinux/default.nix | 2 +- .../networking/instant-messengers/slack/dark-theme.nix | 2 +- .../networking/instant-messengers/slack/default.nix | 2 +- .../networking/instant-messengers/viber/default.nix | 2 +- pkgs/applications/networking/jnetmap/default.nix | 4 ++-- pkgs/applications/office/jabref/default.nix | 2 +- pkgs/applications/office/mendeley/default.nix | 2 +- pkgs/applications/science/math/sage/sage-tests.nix | 2 +- pkgs/applications/science/math/sage/sage.nix | 4 ++-- pkgs/build-support/docker/nix-prefetch-docker.nix | 2 +- pkgs/build-support/rust/fetchcargo.nix | 2 +- pkgs/common-updater/scripts.nix | 2 +- pkgs/data/fonts/migmix/default.nix | 2 +- pkgs/data/fonts/migu/default.nix | 2 +- pkgs/data/fonts/poly/default.nix | 2 +- pkgs/data/misc/nixos-artwork/wallpapers.nix | 2 +- pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix | 2 +- pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix | 2 +- pkgs/development/compilers/scala/dotty.nix | 2 +- pkgs/development/interpreters/jython/default.nix | 2 +- pkgs/development/interpreters/rascal/default.nix | 2 +- pkgs/development/libraries/elf-header/default.nix | 2 +- pkgs/development/pharo/vm/share.nix | 2 +- pkgs/development/python-modules/distutils-cfg/default.nix | 2 +- .../python-modules/recursive-pth-loader/default.nix | 2 +- pkgs/development/tools/analysis/checkstyle/default.nix | 2 +- pkgs/development/tools/build-managers/leiningen/default.nix | 2 +- pkgs/development/tools/build-managers/mill/default.nix | 2 +- pkgs/development/tools/clang-tools/default.nix | 2 +- pkgs/development/tools/database/schemaspy/default.nix | 2 +- pkgs/development/tools/misc/bossa/default.nix | 2 +- pkgs/development/tools/misc/checkbashisms/default.nix | 2 +- pkgs/development/tools/parsing/antlr/3.4.nix | 2 +- pkgs/development/tools/parsing/antlr/3.5.nix | 2 +- pkgs/development/tools/parsing/antlr/4.7.nix | 2 +- pkgs/development/tools/selenium/htmlunit-driver/default.nix | 2 +- pkgs/development/tools/selenium/selendroid/default.nix | 2 +- pkgs/development/tools/selenium/server/default.nix | 2 +- pkgs/games/runelite/default.nix | 2 +- pkgs/games/simutrans/default.nix | 2 +- pkgs/misc/cups/drivers/hll2390dw-cups/default.nix | 2 +- pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix | 2 +- pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix | 2 +- pkgs/misc/emulators/ccemux/default.nix | 2 +- pkgs/os-specific/linux/nmon/default.nix | 2 +- pkgs/os-specific/linux/rfkill/udev.nix | 2 +- pkgs/servers/jetbrains/youtrack.nix | 2 +- pkgs/servers/metabase/default.nix | 2 +- pkgs/servers/search/elasticsearch/plugins.nix | 2 +- pkgs/test/patch-shebangs/default.nix | 4 ++-- pkgs/test/stdenv-inputs/default.nix | 4 ++-- pkgs/tools/compression/mozlz4a/default.nix | 2 +- pkgs/tools/graphics/eplot/default.nix | 2 +- pkgs/tools/graphics/zxing/default.nix | 2 +- pkgs/tools/inputmethods/ibus/default.nix | 4 ++-- pkgs/tools/misc/graylog/plugins.nix | 2 +- pkgs/tools/misc/mongodb-compass/default.nix | 2 +- pkgs/tools/misc/woof/default.nix | 4 ++-- pkgs/tools/misc/x11idle/default.nix | 2 +- pkgs/tools/networking/nuttcp/default.nix | 2 +- pkgs/tools/networking/quickserve/default.nix | 2 +- .../tools/package-management/nix-prefetch-scripts/default.nix | 2 +- pkgs/tools/virtualization/amazon-ecs-cli/default.nix | 2 +- pkgs/tools/virtualization/aws/default.nix | 4 ++-- pkgs/top-level/php-packages.nix | 2 +- 84 files changed, 92 insertions(+), 92 deletions(-) diff --git a/maintainers/scripts/nixpkgs-lint.nix b/maintainers/scripts/nixpkgs-lint.nix index be2a92509f8..6d99c94bf33 100644 --- a/maintainers/scripts/nixpkgs-lint.nix +++ b/maintainers/scripts/nixpkgs-lint.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { buildInputs = [ makeWrapper perl perlPackages.XMLSimple ]; - unpackPhase = "true"; + dontUnpack = true; buildPhase = "true"; installPhase = diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index a13e76a6956..76706877103 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -24,7 +24,7 @@ in rec { buildInputs = [ makeWrapper perl ]; - unpackPhase = "true"; + dontUnpack = true; preferLocalBuild = true; diff --git a/nixos/lib/testing/jquery.nix b/nixos/lib/testing/jquery.nix index 103721cadc3..e272f66a576 100644 --- a/nixos/lib/testing/jquery.nix +++ b/nixos/lib/testing/jquery.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1v956yf5spw0156rni5z77hzqwmby7ajwdcd6mkhb6zvl36awr90"; }; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 71277b48ecd..576ca7bfc05 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -149,7 +149,7 @@ let name = "gitlab-rake"; buildInputs = [ pkgs.makeWrapper ]; dontBuild = true; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rake $out/bin/gitlab-rake \ @@ -164,7 +164,7 @@ let name = "gitlab-rails"; buildInputs = [ pkgs.makeWrapper ]; dontBuild = true; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rails $out/bin/gitlab-rails \ diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index 47e07e7432c..edec3740230 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -54,7 +54,7 @@ in { # The path to the an initialized version of the database db = pkgs.stdenv.mkDerivation { name = "vswitch.db"; - unpackPhase = "true"; + dontUnpack = true; buildPhase = "true"; buildInputs = with pkgs; [ cfg.package diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index 882bced86d3..f99b367ac9b 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -17,7 +17,7 @@ let createTrivialProject = pkgs.stdenv.mkDerivation { name = "create-trivial-project"; - unpackPhase = ":"; + dontUnpack = true; buildInputs = [ pkgs.makeWrapper ]; installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh"; postFixup = '' diff --git a/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix b/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix index ce552257133..a08f138bed9 100644 --- a/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix +++ b/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ emacs ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p "$out/share/emacs/site-lisp" diff --git a/pkgs/applications/editors/emacs-modes/quack/default.nix b/pkgs/applications/editors/emacs-modes/quack/default.nix index 29b3a72e9f0..94cb3104ecc 100644 --- a/pkgs/applications/editors/emacs-modes/quack/default.nix +++ b/pkgs/applications/editors/emacs-modes/quack/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ emacs ]; - unpackPhase = "true"; + dontUnpack = true; dontConfigure = true; installPhase = "true"; diff --git a/pkgs/applications/editors/emacs-modes/stgit/default.nix b/pkgs/applications/editors/emacs-modes/stgit/default.nix index 6460ee53abd..b615accd721 100644 --- a/pkgs/applications/editors/emacs-modes/stgit/default.nix +++ b/pkgs/applications/editors/emacs-modes/stgit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "stgit"; name = "${pname}-2009-10-28"; - unpackPhase = "true"; + dontUnpack = true; src = fetchurl { url = "https://raw.githubusercontent.com/miracle2k/stgit/master/contrib/stgit.el"; diff --git a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix b/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix index 3461787ab59..9403a51df53 100644 --- a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix +++ b/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "zeitgeist-20120221"; - unpackPhase = "true"; + dontUnpack = true; src = fetchurl { url = "https://raw.githubusercontent.com/alexmurray/dotfiles/master/.emacs.d/vendor/zeitgeist.el"; diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 454b7ad554b..d20f413700e 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ appimage-run ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/{bin,share} diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix index e20c0a3cbca..a90275638dc 100644 --- a/pkgs/applications/editors/yi/wrapper.nix +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { name = "yi-custom-${version}"; version = "0.0.0.1"; - unpackPhase = "true"; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; buildCommand = '' diff --git a/pkgs/applications/graphics/graphicsmagick/compat.nix b/pkgs/applications/graphics/graphicsmagick/compat.nix index bd1ce2ed893..fedcafc5978 100644 --- a/pkgs/applications/graphics/graphicsmagick/compat.nix +++ b/pkgs/applications/graphics/graphicsmagick/compat.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "graphicsmagick-imagemagick-compat-${version}"; inherit (graphicsmagick) version; - unpackPhase = "true"; + dontUnpack = true; buildPhase = "true"; utils = [ diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index 72a24026a89..5939d7789b4 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { jarfile = "$out/share/java/${pname}/JBidwatcher.jar"; - unpackPhase = "true"; + dontUnpack = true; dontBuild = true; diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix index 7649785524f..5cd8de43729 100644 --- a/pkgs/applications/misc/vcal/default.nix +++ b/pkgs/applications/misc/vcal/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; # for pod2man - unpackPhase = ":"; + dontUnpack = true; dontBuild = true; installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index b5ceae82ac0..dbe4ddca10f 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { buildInputs = [ tor-browser-unwrapped tor ]; - unpackPhase = ":"; + dontUnpack = true; buildPhase = ":"; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix index 86c2f53b9ad..bddac77d1d6 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix @@ -56,7 +56,7 @@ sha256 = "1fzspdiwhjabwz1yxb3gzj7giz9jbc1xxm65i93rvhzcp537cs42"; }; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' install -m 444 -D $src "$out/$extid.xpi" diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index db488c2f670..eeab5e32c0f 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - unpackPhase = ":"; + dontUnpack = true; dontWrapGApps = true; # we only want $gappsWrapperArgs here diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix index 1ca04a9e168..4be8edaf9b8 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' makeWrapper ${sencha-bare}/sencha $out/bin/sencha diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 8f15c08cfc6..7ef42f8ddfd 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation { buildInputs = [ dpkg ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p $out dpkg -x $src $out diff --git a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix index 11e2e5baed8..76987d08ff4 100644 --- a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix +++ b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { inherit sha256; }; - unpackPhase = "true"; + dontUnpack = true; buildCommand = '' mkdir $out diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index bd1a3956559..6ce33d4f047 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - unpackPhase = "true"; + dontUnpack = true; buildCommand = '' mkdir -p $out dpkg -x $src $out diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index d7c70232b0a..a4bf26a0b1a 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ dpkg makeWrapper ]; - unpackPhase = "true"; + dontUnpack = true; libPath = stdenv.lib.makeLibraryPath [ alsaLib diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/applications/networking/jnetmap/default.nix index af94db23c0a..8967a5d824a 100644 --- a/pkgs/applications/networking/jnetmap/default.nix +++ b/pkgs/applications/networking/jnetmap/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "jnetmap-${version}"; version = "0.5.4"; - + src = fetchurl { url = "mirror://sourceforge/project/jnetmap/jNetMap%20${version}/jNetMap-${version}.jar"; sha256 = "0nxsfa600jhazwbabxmr9j37mhwysp0fyrvczhv3f1smiy8rjanl"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ jre makeWrapper ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 5dfd0357012..ebd5a14ad04 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings-desktop-schemas ]; - unpackPhase = "#"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin $out/share/java $out/share/icons diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 7ead0fe7348..3c4434f0098 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation { propagatedUserEnvPkgs = [ gconf ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' dpkg-deb -x $src $out diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix index 12433e12fe9..591fa192d56 100644 --- a/pkgs/applications/science/math/sage/sage-tests.nix +++ b/pkgs/applications/science/math/sage/sage-tests.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { sage-with-env ]; - unpackPhase = "#do nothing"; + dontUnpack = true; configurePhase = "#do nothing"; buildPhase = "#do nothing"; diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index 541b9cb36dc..f6dc21d0018 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -11,7 +11,7 @@ # A wrapper that makes sure sage finds its docs (if they were build) and the # jupyter kernel spec. -let +let # generate kernel spec + default kernels kernel-specs = jupyter-kernel.create { definitions = jupyter-kernel.default // { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sage-tests ]; - unpackPhase = "#do nothing"; + dontUnpack = true; configurePhase = "#do nothing"; buildPhase = "#do nothing"; diff --git a/pkgs/build-support/docker/nix-prefetch-docker.nix b/pkgs/build-support/docker/nix-prefetch-docker.nix index 03a936e08e0..c1d86adc6d8 100644 --- a/pkgs/build-support/docker/nix-prefetch-docker.nix +++ b/pkgs/build-support/docker/nix-prefetch-docker.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' install -vD ${./nix-prefetch-docker} $out/bin/$name; diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index e8465ba6162..4e6058383d4 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -3,7 +3,7 @@ let cargo-vendor-normalise = stdenv.mkDerivation { name = "cargo-vendor-normalise"; src = ./cargo-vendor-normalise.py; nativeBuildInputs = [ python3.pkgs.wrapPython ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = "install -D $src $out/bin/cargo-vendor-normalise"; pythonPath = [ python3.pkgs.toml ]; postFixup = "wrapPythonPrograms"; diff --git a/pkgs/common-updater/scripts.nix b/pkgs/common-updater/scripts.nix index 8a122b74b23..1bec4a73996 100644 --- a/pkgs/common-updater/scripts.nix +++ b/pkgs/common-updater/scripts.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { buildInputs = [ makeWrapper ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/data/fonts/migmix/default.nix index 9507819fe49..228952aaa56 100644 --- a/pkgs/data/fonts/migmix/default.nix +++ b/pkgs/data/fonts/migmix/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }) ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' find $srcs -name '*.ttf' -exec install -m644 -Dt $out/share/fonts/truetype/migmix {} \; diff --git a/pkgs/data/fonts/migu/default.nix b/pkgs/data/fonts/migu/default.nix index 57fbf1a830f..193e98d01a4 100644 --- a/pkgs/data/fonts/migu/default.nix +++ b/pkgs/data/fonts/migu/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }) ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' find $srcs -name '*.ttf' | xargs install -m644 --target $out/share/fonts/truetype/migu -D diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix index d291d50e836..24155f2ea54 100644 --- a/pkgs/data/fonts/poly/default.nix +++ b/pkgs/data/fonts/poly/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p $out/share/fonts/opentype diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix index 50f874baa4a..3983869a452 100644 --- a/pkgs/data/misc/nixos-artwork/wallpapers.nix +++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -6,7 +6,7 @@ let stdenv.mkDerivation { inherit name src; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p $out/share/artwork/gnome diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix index cc71e002632..9728b2f96c4 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation { name = "docbook-sgml-3.1"; - unpackPhase = "true"; + dontUnpack = true; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix index dc7ebf5959d..78b99081504 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation { name = "docbook-sgml-4.1"; - unpackPhase = "true"; + dontUnpack = true; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/compilers/scala/dotty.nix b/pkgs/development/compilers/scala/dotty.nix index a999bd422e6..7bc7fa3d4c2 100644 --- a/pkgs/development/compilers/scala/dotty.nix +++ b/pkgs/development/compilers/scala/dotty.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { name = "dotty-${dotty-bare.version}"; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix index 3d82535d29a..f822fdd9c8f 100644 --- a/pkgs/development/interpreters/jython/default.nix +++ b/pkgs/development/interpreters/jython/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -pv $out/bin diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index 25e125b9af6..22eee0f6ead 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper jdk ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/development/libraries/elf-header/default.nix index 47b39eeb7e9..c1764e83c30 100644 --- a/pkgs/development/libraries/elf-header/default.nix +++ b/pkgs/development/libraries/elf-header/default.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation { src = null; - unpackPhase = "true"; + dontUnpack = true; dontBuild = true; diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix index 75ce2ff771c..3bd72434eb3 100644 --- a/pkgs/development/pharo/vm/share.nix +++ b/pkgs/development/pharo/vm/share.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.0"; name = "pharo-share-${version}"; - unpackPhase = "true"; + dontUnpack = true; sources10Zip = fetchurl { url = http://files.pharo.org/sources/PharoV10.sources.zip; diff --git a/pkgs/development/python-modules/distutils-cfg/default.nix b/pkgs/development/python-modules/distutils-cfg/default.nix index 204f4de5456..cbf12c17582 100644 --- a/pkgs/development/python-modules/distutils-cfg/default.nix +++ b/pkgs/development/python-modules/distutils-cfg/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { buildInputs = [ python ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' dest="$out/lib/${python.libPrefix}/site-packages/distutils" diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix index 359b482a168..aaa095c5398 100644 --- a/pkgs/development/python-modules/recursive-pth-loader/default.nix +++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0"; name = pname + "-" + version; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ python ]; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 5b80a5079b6..6ad7ca84a72 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' runHook preInstall diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 99692d1ef50..d73683287a1 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { JARNAME = "${name}-standalone.jar"; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ jdk ]; diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 7b472c1c4e3..ff49bea526a 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - unpackPhase = "true"; + dontUnpack = true; dontConfigure = true; dontBuild = true; diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix index bd8401ac80d..0fcaee57468 100644 --- a/pkgs/development/tools/clang-tools/default.nix +++ b/pkgs/development/tools/clang-tools/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation { name = "clang-tools-${version}"; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin for tool in \ diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix index ab62fdf3d52..128921a67d7 100644 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ b/pkgs/development/tools/database/schemaspy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ph1l62hy163m2hgybhkccqbcj6brna1vdbr7536zc37lzjxq9rn"; }; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ jre diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix index bb81a461188..0d78cfbbab8 100644 --- a/pkgs/development/tools/misc/bossa/default.nix +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -7,7 +7,7 @@ let bin2c = stdenv.mkDerivation { name = "bossa-bin2c"; src = ./bin2c.c; - unpackPhase = "true"; + dontUnpack = true; buildPhase = ''cc $src -o bin2c''; installPhase = ''mkdir -p $out/bin; cp bin2c $out/bin/''; }; diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 2564b42731b..5f98df54c0a 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; # The link returns directly the script. No need for unpacking - unpackPhase = "true"; + dontUnpack = true; installPhase = '' install -D -m755 $src $out/bin/checkbashisms diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix index ad0ebbdebba..b53116b888e 100644 --- a/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/pkgs/development/tools/parsing/antlr/3.4.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1xqbam8vf04q5fasb0m2n1pn5dbp2yw763sj492ncq04c5mqcglx"; }; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p "$out"/{lib/antlr,bin} diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix index cf37287beff..4c213ed1c4c 100644 --- a/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/pkgs/development/tools/parsing/antlr/3.5.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0srjwxipwsfzmpi0v32d1l5lzk9gi5in8ayg33sq8wyp8ygnbji6"; }; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p "$out"/{lib/antlr,bin} diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix index 40f9bf74ac4..e6e54f8dab9 100644 --- a/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -41,7 +41,7 @@ let sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl"; }; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p "$out"/{share/java,bin} diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix index 03c3c23c755..a8085399b3d 100644 --- a/pkgs/development/tools/selenium/htmlunit-driver/default.nix +++ b/pkgs/development/tools/selenium/htmlunit-driver/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1sd3cwpamcbq9pv0mvcm8x6minqrlb4i0r12q3jg91girqswm2dp"; }; - unpackPhase = "true"; + dontUnpack = true; installPhase = "install -D $src $out/share/lib/${name}/${name}.jar"; diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index dcc3893ee0d..82b6d7e1161 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inherit name; inherit version; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ jdk makeWrapper ]; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 48bfbdd689b..61b74ce108d 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { sha256 = "11v340nm8vzqc2bkmbjfm9a7j4dj0bi9bfk8wdpfan0fb8prf772"; }; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index 4c06926ed50..a56365778fb 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -30,7 +30,7 @@ buildInputs = [ makeWrapper ]; # colon is bash form of no-op (do nothing) - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/share/runelite diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index a97338f6f20..5cbb3c1796f 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -70,7 +70,7 @@ let }: stdenv.mkDerivation { name = "simutrans-${pakName}"; - unpackPhase = "true"; + dontUnpack = true; preferLocalBuild = true; installPhase = let src = fetchurl { inherit url sha256; }; in '' diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix index 8357a452a2b..55b0deea971 100644 --- a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix +++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ cups ghostscript dpkg a2ps ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' dpkg-deb -x $src $out diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix index f69c972c999..f31dd9061ec 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ cups ghostscript dpkg a2ps ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' dpkg-deb -x $src $out diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index e22a159c428..9d9535ce37b 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ cups ghostscript dpkg a2ps ]; - unpackPhase = "true"; + dontUnpack = true; brprintconf_mfcj6510dw_script = '' #!${runtimeShell} diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix index f3ec6421339..a560ecd0a21 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/misc/emulators/ccemux/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { name = "ccemux-${version}"; src = jar; - unpackPhase = "true"; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix index bb00db9868e..a80252d6412 100644 --- a/pkgs/os-specific/linux/nmon/default.nix +++ b/pkgs/os-specific/linux/nmon/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses ]; - unpackPhase = ":"; + dontUnpack = true; buildPhase = "cc -o nmon ${src} -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -lm -g -D X86"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/os-specific/linux/rfkill/udev.nix index f9d6dc99db8..41dd3da9d31 100644 --- a/pkgs/os-specific/linux/rfkill/udev.nix +++ b/pkgs/os-specific/linux/rfkill/udev.nix @@ -34,7 +34,7 @@ let in stdenv.mkDerivation { name = "rfkill-udev"; - unpackPhase = "true"; + dontUnpack = true; dontBuild = true; installPhase = '' diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index 0518a78f9d6..bbf39e5be46 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' runHook preInstall diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index f8a5ae31ffe..dde0a547693 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' makeWrapper ${jre}/bin/java $out/bin/metabase --add-flags "-jar $src" diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index e76d0806114..3a480bd7467 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -16,7 +16,7 @@ let }: stdenv.mkDerivation (a // { inherit installPhase; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ unzip ]; meta = a.meta // { platforms = elasticsearch.meta.platforms; diff --git a/pkgs/test/patch-shebangs/default.nix b/pkgs/test/patch-shebangs/default.nix index a82e5e1e198..3e68d96004f 100644 --- a/pkgs/test/patch-shebangs/default.nix +++ b/pkgs/test/patch-shebangs/default.nix @@ -3,7 +3,7 @@ let bad-shebang = stdenv.mkDerivation { name = "bad-shebang"; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin echo "#!/bin/sh" > $out/bin/test @@ -23,4 +23,4 @@ in runCommand "patch-shebangs-test" { echo "no" >&2 exit 1 fi -'' \ No newline at end of file +'' diff --git a/pkgs/test/stdenv-inputs/default.nix b/pkgs/test/stdenv-inputs/default.nix index 13fa985839d..4db10e75086 100644 --- a/pkgs/test/stdenv-inputs/default.nix +++ b/pkgs/test/stdenv-inputs/default.nix @@ -4,7 +4,7 @@ let foo = stdenv.mkDerivation { name = "foo-test"; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin $out/include $out/lib @@ -22,7 +22,7 @@ let name = "bar-test"; outputs = [ "out" "dev" ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin $dev/include $dev/lib diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index 19c160c62f5..9b9de8d8302 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1d1ai062kdms34bya9dlykkx011rj8d8nh5l7d76xj8k9kv4ssq6"; }; - unpackPhase = "true;"; + dontUnpack = true; installPhase = '' mkdir -p "$out/bin" "$out/${python3.sitePackages}/" diff --git a/pkgs/tools/graphics/eplot/default.nix b/pkgs/tools/graphics/eplot/default.nix index a98a5e0aaec..ad8d9ebc6a2 100644 --- a/pkgs/tools/graphics/eplot/default.nix +++ b/pkgs/tools/graphics/eplot/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ ruby ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix index a760336cfa3..3efb68e60d2 100644 --- a/pkgs/tools/graphics/zxing/default.nix +++ b/pkgs/tools/graphics/zxing/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0fzxvvf5dqyrs5m9rqw4ffm9h1s27bi7q3jb1dam34s80q2rp2zq"; }; inherit jre; - unpackPhase = ''true''; + dontUnpack = true; installPhase = '' mkdir -p "$out/lib/java" "$out/bin" cp "${core_jar}" "${javase_jar}" "$out/lib/java" diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 31ac23b395c..d2090d77676 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -33,7 +33,7 @@ let }; emojiData = stdenv.mkDerivation { name = "emoji-data-5.0"; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir $out ${builtins.toString (flip mapAttrsToList emojiSrcs (k: v: "cp ${v} $out/emoji-${k}.txt;"))} @@ -62,7 +62,7 @@ let }; ucd = stdenv.mkDerivation rec { name = "ucd-12.0.0"; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir $out ${builtins.toString (flip mapAttrsToList ucdSrcs (k: v: "cp ${v} $out/${k}.txt;"))} diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index dea71d146ed..a8d571da7eb 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -14,7 +14,7 @@ let }: stdenv.mkDerivation (a // { inherit installPhase; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ unzip ]; meta = a.meta // { platforms = graylog.meta.platforms; diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 840d4eacd37..f03b536c615 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation { inherit src; buildInputs = [ dpkg ]; - unpackPhase = "true"; + dontUnpack = true; buildCommand = '' IFS=$'\n' diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/tools/misc/woof/default.nix index 1fd9f456705..35da2e0a4e9 100644 --- a/pkgs/tools/misc/woof/default.nix +++ b/pkgs/tools/misc/woof/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "2012-05-31"; name = "woof-${version}"; - + src = fetchurl { url = "http://www.home.unix-ag.org/simon/woof-${version}.py"; sha256 = "d84353d07f768321a1921a67193510bf292cf0213295e8c7689176f32e945572"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ python ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/tools/misc/x11idle/default.nix index c8adff788c7..f4a397ed9dd 100644 --- a/pkgs/tools/misc/x11idle/default.nix +++ b/pkgs/tools/misc/x11idle/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ libXScrnSaver libX11 ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix index 34a34ef903d..2ed9c330181 100644 --- a/pkgs/tools/networking/nuttcp/default.nix +++ b/pkgs/tools/networking/nuttcp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1yang94mcdqg362qbi85b63746hk6gczxrk619hyj91v5763n4vx"; }; - unpackPhase = ":"; + dontUnpack = true; buildPhase = '' cc -O2 -o nuttcp $src diff --git a/pkgs/tools/networking/quickserve/default.nix b/pkgs/tools/networking/quickserve/default.nix index d83784f9989..22589582e3b 100644 --- a/pkgs/tools/networking/quickserve/default.nix +++ b/pkgs/tools/networking/quickserve/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation { pname = "quickserve"; version = "2018"; - unpackPhase = ":"; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index ba47847f28b..c23db106ea1 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -8,7 +8,7 @@ let mkPrefetchScript = tool: src: deps: nativeBuildInputs = [ makeWrapper ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' install -vD ${src} $out/bin/$name; diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index 1578a759ec7..f62fdd2f78f 100644 --- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "12q167pbpxw38p1bzcy9z4ix7yh9giwkyrc4vq2qln3pjn9d31rj"; }; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix index 893d4f2aec2..618a45075c9 100644 --- a/pkgs/tools/virtualization/aws/default.nix +++ b/pkgs/tools/virtualization/aws/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "aws-1.75"; - + src = fetchurl { url = https://raw.github.com/timkay/aws/2f2ff99f9f5111ea708ae6cd14d20e264748e72b/aws; sha256 = "0d5asv73a58yb1bb1jpsw3c7asd62y86z5fwpg4llhjzkx79maj6"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ perl ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 114b107418d..eb389587c03 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -81,7 +81,7 @@ let sha256 = "0hnm7njab9nsifpb1qbwx54yfpsi00g8mzny11s13ibjvd9rnvxn"; }; - unpackPhase = ":"; + dontUnpack = true; nativeBuildInputs = [ pkgs.makeWrapper ];