diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-07-27 21:36:00 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-27 21:36:00 +0700 |
commit | 006b0b6a67a21a9e3a410dcc7d8b1f84b6fb79e6 (patch) | |
tree | df511b37821bfc5c27bef32c90bbfcce227378c2 /pkgs | |
parent | 21889a973bcfaa78842beedbf0834d5da90280fa (diff) | |
parent | 02b4d1c91a9507fcd42eb4433ab1d4c1e2805fa5 (diff) |
Merge pull request #131682 from Stunkymonkey/development-phases
development/tools: deprecate phases
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/ammonite/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/jsduck/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/metals/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/misc/chruby/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/misc/distcc/masq.nix | 3 | ||||
-rw-r--r-- | pkgs/development/tools/misc/watson-ruby/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/node-webkit/nw12.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/nwjs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/utop/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/parse-cli-bin/default.nix | 2 |
10 files changed, 8 insertions, 13 deletions
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 680217acfbb8b..ffd3b78cedd75 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -17,7 +17,7 @@ let inherit sha256; }; - phases = "installPhase"; + dontUnpack = true; installPhase = '' install -Dm755 $src $out/bin/amm diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix index 15a3a68340348..5c11b87f76ff2 100644 --- a/pkgs/development/tools/jsduck/default.nix +++ b/pkgs/development/tools/jsduck/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { gemset = ./gemset.nix; }; - phases = [ "installPhase" ]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ env ]; diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index b85ca99a9e60a..617f981ee2f45 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jdk deps ]; - phases = [ "installPhase" ]; + dontUnpack = true; extraJavaOpts = "-XX:+UseG1GC -XX:+UseStringDeduplication -Xss4m -Xms100m"; diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix index bcc0687f55b60..1aef6d52075fe 100644 --- a/pkgs/development/tools/misc/chruby/default.nix +++ b/pkgs/development/tools/misc/chruby/default.nix @@ -19,8 +19,6 @@ in stdenv.mkDerivation rec { sha256 = "1894g6fymr8kra9vwhbmnrcr58l022mcd7g9ans4zd3izla2j3gx"; }; - phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ]; - patches = lib.optionalString (rubies != null) [ ./env.patch ]; diff --git a/pkgs/development/tools/misc/distcc/masq.nix b/pkgs/development/tools/misc/distcc/masq.nix index 2387ab1bd4186..27840481a1091 100644 --- a/pkgs/development/tools/misc/distcc/masq.nix +++ b/pkgs/development/tools/misc/distcc/masq.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation { name = "distcc-masq-${gccRaw.name}"; - phases = [ "installPhase" ]; + dontUnpack = true; + installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix index 23ec0643d77d7..4d17680471d27 100644 --- a/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "watson-ruby"; version = (import ./gemset.nix).watson-ruby.version; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = let env = bundlerEnv { diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index f5276510e6123..da85be9267155 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -30,8 +30,6 @@ in stdenv.mkDerivation rec { "117gx6yjbcya64yg2vybcfyp591sid209pg8a33k9afbsmgz684c"; }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/share/nwjs cp -R * $out/share/nwjs diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 7d0175ac912a6..2ca79410b85ba 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -47,8 +47,6 @@ in stdenv.mkDerivation rec { "0nlpdz76k1p1pq4xygfr2an91m0d7p5fjyg2xhiggyy8b7sp4964"; }; - phases = [ "unpackPhase" "installPhase" ]; - # we have runtime deps like sqlite3 that should remain dontPatchELF = true; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 361f64046cebe..913871314cfef 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -34,7 +34,7 @@ buildDunePackage rec { buildInputs = [ findlib ] ++ propagatedBuildInputs; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p "$out"/${path} diff --git a/pkgs/development/tools/parse-cli-bin/default.nix b/pkgs/development/tools/parse-cli-bin/default.nix index 7cda74db5ef63..33dbd0fec1816 100644 --- a/pkgs/development/tools/parse-cli-bin/default.nix +++ b/pkgs/development/tools/parse-cli-bin/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { license = licenses.bsd3; }; - phases = "installPhase"; + dontUnpack = true; installPhase = '' mkdir -p "$out/bin" |