diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix index 3a5b44a20d5b..7b33d810f3c1 100644 --- a/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -1,32 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform -, pkg-config, curl, libgit2, openssl, Security }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, curl +, libgit2 +, openssl +, Security +}: rustPlatform.buildRustPackage rec { pname = "cargo-raze"; - version = "0.12.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "161m4y6i4sgqi9mg3f3348f5cr0m45vhix4a4bcw54wnmhiklnnl"; + hash = "sha256-ip0WuBn1b7uN/pAhOl5tfmToK73ZSHK7rucdtufsbCQ="; }; sourceRoot = "source/impl"; - cargoSha256 = "1vlywdq0bx6b1k3w1grisca0hvv2s4s88yxq7bil8nhm5ghjgxdr"; + cargoHash = "sha256-hNZgQwhm4UPqmANplZGxG0DYHa31tu06nmqYaCA7Vdg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgit2 openssl - (curl.override { inherit openssl; }) + curl ] ++ lib.optional stdenv.isDarwin Security; - # thread 'main' panicked at 'Cannot ping mock server.: "cannot send request to mock server: cannot send request to mock server: failed to resolve host name"' - # __darwinAllowLocalNetworking does not fix the panic - doCheck = !stdenv.isDarwin; - meta = with lib; { description = "Generate Bazel BUILD files from Cargo dependencies"; homepage = "https://github.com/google/cargo-raze"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 501816e95cf3..46d83b70e905 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15142,7 +15142,6 @@ with pkgs; cargo-profiler = callPackage ../development/tools/rust/cargo-profiler {}; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; cargo-readme = callPackage ../development/tools/rust/cargo-readme {}; cargo-semver-checks = callPackage ../development/tools/rust/cargo-semver-checks {