diff options
author | Milan Pässler (work) <mil@nyantec.com> | 2019-09-02 23:39:57 +0200 |
---|---|---|
committer | Milan Pässler (work) <mil@nyantec.com> | 2019-09-02 23:42:12 +0200 |
commit | 185fd61631e1521225bdcf10da112450424db56c (patch) | |
tree | 79e87a635b720e12cc342ae1a1f35167a2ded334 | |
parent | ea3bae4f4d23b35458957884c7b1aba0d88b0cee (diff) |
treewide: remove uses of doBuild and doConfigure
doBuild and doConfigure are not actually used by any builders, they were probably added by mistake and just confuse people.
-rw-r--r-- | pkgs/applications/audio/spotify/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/kubectl/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/electronics/eagle/eagle.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/virtualization/virtualbox/guest-additions/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/unifi/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/xmpp/pyIRCt/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/xmpp/pyMAILt/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/admin/google-cloud-sdk/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/shab/default.nix | 1 |
9 files changed, 0 insertions, 16 deletions
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 403075f91352d..3f99e22a4cbdb 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -78,8 +78,6 @@ stdenv.mkDerivation { buildInputs = [ squashfsTools makeWrapper ]; - doConfigure = false; - doBuild = false; dontStrip = true; dontPatchELF = true; diff --git a/pkgs/applications/networking/cluster/kubectl/default.nix b/pkgs/applications/networking/cluster/kubectl/default.nix index 40d42408679eb..fed40523a9b7d 100644 --- a/pkgs/applications/networking/cluster/kubectl/default.nix +++ b/pkgs/applications/networking/cluster/kubectl/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation { outputs = [ "out" "man" ]; - doBuild = false; - installPhase = '' mkdir -p \ "$out/bin" \ diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 3168fc19d055b..2b28f2c06db54 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -36,9 +36,6 @@ let qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine ]; - doConfigure = false; - doBuild = false; - installPhase = '' # Extract eagle tarball mkdir "$out" diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 5ff8a1650babf..c092f1be006d8 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -56,8 +56,6 @@ stdenv.mkDerivation { } ''; - doConfigure = false; - buildPhase = '' # Build kernel modules. cd src diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index eb7a072799dcc..660a7050e9c90 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -19,8 +19,6 @@ let runHook postUnpack ''; - doConfigure = false; - installPhase = '' runHook preInstall diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index f5bdfd9fe8530..7db8ec3b60499 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { xmpppy pythonIRClib ]; - /* doConfigure should be removed if not needed */ # phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)]; installPhase = '' diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index 719acfd3a66e6..0c85f322f4873 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { pythonPath = [ xmpppy ]; buildInputs = [ pythonPackages.wrapPython ]; - /* doConfigure should be removed if not needed */ installPhase = '' cd mail-transport mkdir -p $out/bin $out/share/${pname}-${version} diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index b35fe709f95a6..7c81e861ddbcb 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -36,8 +36,6 @@ in stdenv.mkDerivation rec { buildInputs = [ python makeWrapper ]; - doBuild = false; - patches = [ ./gcloud-path.patch ]; diff --git a/pkgs/tools/text/shab/default.nix b/pkgs/tools/text/shab/default.nix index 73323c784fd72..02d2d545122af 100644 --- a/pkgs/tools/text/shab/default.nix +++ b/pkgs/tools/text/shab/default.nix @@ -19,7 +19,6 @@ let done ''; - doBuild = false; doCheck = true; doInstallCheck = true; |