diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-27 18:01:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 18:01:01 +0000 |
| commit | db6a26db02044f51f34029f43f4a585ff555e669 (patch) | |
| tree | 8947fad04b6bb1794606e14813ed9307764d7422 /pkgs/development/tools/misc | |
| parent | 2692c2e4277b0b1b3b01299462f238efccba91e2 (diff) | |
| parent | 407ef1dc6f91f9ecf7f61e4dfaedcde052f2bd17 (diff) | |
| download | nixpkgs-db6a26db02044f51f34029f43f4a585ff555e669.tar nixpkgs-db6a26db02044f51f34029f43f4a585ff555e669.tar.gz nixpkgs-db6a26db02044f51f34029f43f4a585ff555e669.tar.bz2 nixpkgs-db6a26db02044f51f34029f43f4a585ff555e669.tar.lz nixpkgs-db6a26db02044f51f34029f43f4a585ff555e669.tar.xz nixpkgs-db6a26db02044f51f34029f43f4a585ff555e669.tar.zst nixpkgs-db6a26db02044f51f34029f43f4a585ff555e669.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools/misc')
| -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 |
3 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix index bcc0687f55b..1aef6d52075 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 2387ab1bd41..27840481a10 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 23ec0643d77..4d17680471d 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 { |