diff options
| author | xrelkd <46590321+xrelkd@users.noreply.github.com> | 2021-02-09 00:59:38 +0800 |
|---|---|---|
| committer | xrelkd <46590321+xrelkd@users.noreply.github.com> | 2021-02-09 10:02:20 +0800 |
| commit | df8229bb4c3b80900985f50c6ac9d7156a6237cb (patch) | |
| tree | b2c99f9af1a2b249071172b738fa89f477cc62b5 | |
| parent | 785017da36a2b6def0b8850359d4ce625e3be677 (diff) | |
| download | nixpkgs-df8229bb4c3b80900985f50c6ac9d7156a6237cb.tar nixpkgs-df8229bb4c3b80900985f50c6ac9d7156a6237cb.tar.gz nixpkgs-df8229bb4c3b80900985f50c6ac9d7156a6237cb.tar.bz2 nixpkgs-df8229bb4c3b80900985f50c6ac9d7156a6237cb.tar.lz nixpkgs-df8229bb4c3b80900985f50c6ac9d7156a6237cb.tar.xz nixpkgs-df8229bb4c3b80900985f50c6ac9d7156a6237cb.tar.zst nixpkgs-df8229bb4c3b80900985f50c6ac9d7156a6237cb.zip | |
sccache: 0.2.14 -> 0.2.15
| -rw-r--r-- | pkgs/development/tools/misc/sccache/default.nix | 33 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 14 insertions, 23 deletions
diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index c68a1c1547c..c41ab92fb97 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,37 +1,26 @@ -{ stdenv -, lib -, fetchFromGitHub -, cargo -, rustc -, rustPlatform -, pkg-config -, glib -, openssl -, darwin -}: +{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security }: rustPlatform.buildRustPackage rec { - version = "0.2.14"; + version = "0.2.15"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; - rev = version; - sha256 = "1ahg3cpb9pbgpdjglnfxm5c8r8qrgwaxwz5s394478ix7f9dxind"; + rev = "v${version}"; + sha256 = "1kygk7ilv7la36kv4jdn1ird7f3896wgr88kyqf0iagfqkzb2vsb"; }; - cargoSha256 = "0jphs0frr399iywi9ch8g271igayzv1vi3wa4v3yx19xdxawlgda"; + + cargoSha256 = "1cfdwf00jgwsv0f72427asid1xr57s56jk5xj489dgppvgy7wdbj"; cargoBuildFlags = [ "--features=all" ]; - nativeBuildInputs = [ - pkg-config cargo rustc - ]; - buildInputs = [ - openssl - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + # Tests fail because of client server setup which is not possible inside the pure environment, # see https://github.com/mozilla/sccache/issues/460 - checkPhase = null; + doCheck = false; meta = with lib; { description = "Ccache with Cloud Storage"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72fe7735860..3eb9d9c2fc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29677,7 +29677,9 @@ in imatix_gsl = callPackage ../development/tools/imatix_gsl {}; - sccache = callPackage ../development/tools/misc/sccache { }; + sccache = callPackage ../development/tools/misc/sccache { + inherit (darwin.apple_sdk.frameworks) Security; + }; sequeler = callPackage ../applications/misc/sequeler { }; |