diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-07-06 13:40:38 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-07-06 13:44:40 +0200 |
| commit | 0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4 (patch) | |
| tree | 146620da711f1221bbc226b5ffa36407b50a3fc3 /pkgs/development/tools/misc | |
| parent | 8e97d0be6bf0b381935e3b8429430d645dc2e226 (diff) | |
| parent | d567c486ca5ac5f0c83bb0264c325204a479a5bb (diff) | |
| download | nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.gz nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.bz2 nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.lz nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.xz nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.zst nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.zip | |
Merge branch 'master' into staging-next
There are several thousand rebuilds from master already. Hydra nixpkgs: ?compare=1528940
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/sccache/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 52bf5e9a8539..0d2e813071e6 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,17 +1,21 @@ { stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }: rustPlatform.buildRustPackage rec { - version = "0.2.8"; + version = "0.2.9"; name = "sccache-${version}"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = version; - sha256 = "08v8s24q6246mdjzl5lirqg0csxcmd17szmw4lw373hvq4xvf0yk"; + sha256 = "0glaaan6fh19a2d8grgsgnbgw5w53vjl0qmvvnq0ldp3hax90v46"; }; - cargoSha256 = "1lafzin92h1hb1hqmbrsxja44nj8mpbsxhwcjr6rf5yrclgwmcxj"; + cargoSha256 = "0chfdyhj9lyxydbnmldc8rh2v9dda46sxhv35g34a5137sjrizfh"; cargoBuildFlags = [ "--features=all" ]; + # see https://github.com/mozilla/sccache/issues/467 + postPatch = '' + sed -i 's/\(version = "0.2.9\)-alpha.0"/\1"/g' Cargo.lock + ''; nativeBuildInputs = [ pkgconfig cargo rustc ]; |