Merge pull request #280211 from r-ryantm/auto-update/sccache

sccache: 0.7.4 -> 0.7.5
This commit is contained in:
Doron Behar 2024-01-11 16:45:00 +02:00 committed by GitHub
commit 24a9963337
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 11 deletions

View File

@ -1,23 +1,37 @@
{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }:
{ lib
, fetchFromGitHub
, rustPlatform
, pkg-config
, openssl
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
version = "0.7.4";
version = "0.7.5";
pname = "sccache";
src = fetchFromGitHub {
owner = "mozilla";
repo = "sccache";
rev = "v${version}";
sha256 = "sha256-r5Gev6tnaq8KY26Zl5aDxTomAFw3SPK3szrS4Kc14cI=";
sha256 = "sha256-rql5Nj/w7cNaO6UKK96vYYE2E19RIiCHYHTnbW+U4n8=";
};
cargoSha256 = "sha256-4YeD4UxqhLRg2d2INbMAHrJBTlvuafrKEcjohBDx6CQ=";
cargoHash = "sha256-VdI39DgQrUZhoawMqBC6ngTvldW+QbDjMjxjjbH9G1A=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
];
# Tests fail because of client server setup which is not possible inside the pure environment,
# see https://github.com/mozilla/sccache/issues/460
# Tests fail because of client server setup which is not possible inside the
# pure environment, see https://github.com/mozilla/sccache/issues/460
doCheck = false;
meta = with lib; {

View File

@ -41543,9 +41543,7 @@ with pkgs;
tomb = callPackage ../os-specific/linux/tomb { };
sccache = callPackage ../development/tools/misc/sccache {
inherit (darwin.apple_sdk.frameworks) Security;
};
sccache = callPackage ../development/tools/misc/sccache { };
scip = callPackage ../development/tools/misc/scip { };