Merge pull request #63520 from worldofpeace/dontConfigure

setup.sh: add dontConfigure
2019-07-02 20:05:37 -04:00 · 2019-07-02 20:05:37 -04:00 · cb278f70d0
commit cb278f70d0
parent 0eb4838191 3f4a353737
111 changed files with 147 additions and 124 deletions
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@ -987,6 +987,17 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </para>
     </listitem>
    </varlistentry>
+    <varlistentry>
+     <term>
+      <varname>dontUnpack</varname>
+     </term>
+     <listitem>
+      <para>
+       Set to true to skip the unpack phase.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
    <varlistentry>
     <term>
      <varname>dontMakeSourcesWritable</varname>
@ -1109,6 +1120,16 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]
      </para>
     </listitem>
    </varlistentry>
+    <varlistentry>
+     <term>
+      <varname>dontConfigure</varname>
+     </term>
+     <listitem>
+      <para>
+       Set to true to skip the configure phase.
+      </para>
+     </listitem>
+    </varlistentry>
    <varlistentry>
     <term>
      <varname>configureFlagsArray</varname>
--- 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 =
--- 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;

--- 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 =
    ''
--- a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
+++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ brscan4 ];

-  configurePhase = ":";
+  dontConfigure = true;

  buildPhase = ''
    TARGET_DIR="$out/etc/opt/brother/scanner/brscan4"
--- 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 \
--- 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}'
--- 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
--- 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 = ''
--- 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 = ":";
--- 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"
--- a/pkgs/applications/editors/emacs-modes/quack/default.nix
+++ b/pkgs/applications/editors/emacs-modes/quack/default.nix
@ -11,8 +11,8 @@ stdenv.mkDerivation {

  buildInputs = [ emacs ];

-  unpackPhase = "true";
-  configurePhase = "true";
+  dontUnpack = true;
+  dontConfigure = true;
  installPhase = "true";

  buildPhase = ''
--- 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";
--- 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";
--- 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}
--- 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 = ''
--- 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 = [
--- 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
--- 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;

--- 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;

--- 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
--- 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 = ":";

--- 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"
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- a/pkgs/applications/networking/jnetmap/default.nix
+++ b/pkgs/applications/networking/jnetmap/default.nix
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

  buildInputs = [ jre makeWrapper ];

-  unpackPhase = ":";
+  dontUnpack = true;

  installPhase = ''
    mkdir -p "$out/bin"
--- 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 = ''
--- 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
--- 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
--- 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";

--- a/pkgs/applications/science/math/sage/sage.nix
+++ b/pkgs/applications/science/math/sage/sage.nix
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
    sage-tests
  ];

-  unpackPhase = "#do nothing";
+  dontUnpack = true;
  configurePhase = "#do nothing";
  buildPhase = "#do nothing";

--- 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";

--- 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;
--- 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";
--- 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
--- 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 {} \;
--- 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
--- 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
--- 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
--- 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 ];

--- 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 ];

--- 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
--- 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
--- 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 =
    ''
--- 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;

--- 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;
 })
--- 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;

--- 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
--- 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";
--- 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
--- 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;
--- 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;
--- 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"
--- 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 ];

--- 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
--- 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 ];
--- 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;

--- 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 \
--- 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
--- 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
--- 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/'';
  };
--- 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
--- 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
  #
--- 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}
--- 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}
--- 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}
--- 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";

--- 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 ];

--- 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 ];

--- 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
--- 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 ''
--- 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 = ":";

--- 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
--- 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
--- 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}
--- 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 ];
--- 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
--- 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 = ''
--- 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";

--- 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/";
  };
--- 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
--- 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"
--- 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;
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@ -1283,6 +1283,8 @@ 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
        if [[ "$curPhase" = installPhase && -n "${dontInstall:-}" ]]; then continue; fi
--- 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
--- 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
--- 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
--- 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}/"
--- 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"
--- 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
--- 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
--- 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"
--- 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;"))}
--- 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;
--- 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
--- a/Show More
+++ b/Show More