diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2017-11-08 10:33:11 +0100 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2017-11-08 21:38:06 +0100 |
commit | 161e80e3fd3cec5a3a56fa3a36b94720cd1b7dc2 (patch) | |
tree | f06fffa1b20a1dbf6efe532b99ed18b6fd68f94c | |
parent | 27f7999280c1f48885ea886edd4d8355b6f06ac1 (diff) | |
download | nixpkgs-161e80e3fd3cec5a3a56fa3a36b94720cd1b7dc2.tar nixpkgs-161e80e3fd3cec5a3a56fa3a36b94720cd1b7dc2.tar.gz nixpkgs-161e80e3fd3cec5a3a56fa3a36b94720cd1b7dc2.tar.bz2 nixpkgs-161e80e3fd3cec5a3a56fa3a36b94720cd1b7dc2.tar.lz nixpkgs-161e80e3fd3cec5a3a56fa3a36b94720cd1b7dc2.tar.xz nixpkgs-161e80e3fd3cec5a3a56fa3a36b94720cd1b7dc2.tar.zst nixpkgs-161e80e3fd3cec5a3a56fa3a36b94720cd1b7dc2.zip |
treewide: get rid of invalid `buildPhases` argument
I don't know where this comes from (I accidentally did that as well once), but some derivations seem to use `buildPhases` rather than `phases` in their derivations. This kills all improper usages as the lack of a `phases` argument didn't break the build, so this can be safely removed.
-rw-r--r-- | nixos/modules/services/search/solr.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/screensavers/i3lock-pixeled/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/tt-rss/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/web-apps/selfoss/default.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/lambda-mod-zsh-theme/default.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/zsh-autosuggestions/default.nix | 2 |
6 files changed, 0 insertions, 11 deletions
diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix index 33d74e89723..90140a337ed 100644 --- a/nixos/modules/services/search/solr.nix +++ b/nixos/modules/services/search/solr.nix @@ -15,8 +15,6 @@ let sha256 = "01mzvh53wrs1p2ym765jwd00gl6kn8f9k3nhdrnhdqr8dhimfb2p"; }; - buildPhases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/lib cp common/lib/*.jar $out/lib/ diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix index 6c8b722fce9..67cb0a4ca6d 100644 --- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { playerctl ]; - buildPhases = [ "unpackPhase" "patchPhase" "installPhase" ]; makeFlags = [ "PREFIX=$(out)/bin" ]; diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index 2cc0cac8a60..8724adfdad6 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { sha256 = "07ng21n4pva56cxnxkzd6vzs381zn67psqpm51ym5wnl644jqh08"; }; - buildPhases = ["unpackPhase" "installPhase"]; - installPhase = '' mkdir $out cp -ra * $out/ diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix index 1606cc9e76b..14f1dffee64 100644 --- a/pkgs/servers/web-apps/selfoss/default.nix +++ b/pkgs/servers/web-apps/selfoss/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { sha256 = "00vrpw7sb95x6lwpaxrlzxyj98k98xblqcrjr236ykv0ha97xv30"; }; - buildPhases = ["unpackPhase" "installPhase"]; - installPhase = '' mkdir $out cp -ra * $out/ diff --git a/pkgs/shells/lambda-mod-zsh-theme/default.nix b/pkgs/shells/lambda-mod-zsh-theme/default.nix index bef8915dd64..6dea51a487e 100644 --- a/pkgs/shells/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/lambda-mod-zsh-theme/default.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation { rev = "61c373c8aa5556d51522290b82ad44e7166bced1"; }; - buildPhases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/share/themes cp lambda-mod.zsh-theme $out/share/themes diff --git a/pkgs/shells/zsh-autosuggestions/default.nix b/pkgs/shells/zsh-autosuggestions/default.nix index 22ea5414251..4723a6abeb6 100644 --- a/pkgs/shells/zsh-autosuggestions/default.nix +++ b/pkgs/shells/zsh-autosuggestions/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ zsh ]; - buildPhases = [ "unpackPhase" "installPhase" ]; - installPhase = '' install -D zsh-autosuggestions.zsh \ $out/share/zsh-autosuggestions/zsh-autosuggestions.zsh |