diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-14 08:14:07 +0100 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-14 08:14:26 +0100 |
commit | 6b67186fe9a8c05ba3dca00cd7f3434e97c5c0f3 (patch) | |
tree | c40727f67b4ac1f249ee61aee61db419b1b27341 /pkgs/development/tools/rust | |
parent | 08d2b1131869e00946d351050f1b92f259f25cff (diff) | |
parent | db8d5902ad3666208236a685c82e50bc8bc47706 (diff) |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/python-modules/crownstone-cloud/default.nix - pkgs/development/python-modules/exrex/default.nix - pkgs/development/python-modules/mkdocs-minify/default.nix - pkgs/development/python-modules/myjwt/default.nix - pkgs/development/tools/analysis/checkov/default.nix
Diffstat (limited to 'pkgs/development/tools/rust')
-rw-r--r-- | pkgs/development/tools/rust/cargo-nextest/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/rust/cargo-release/default.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 4d8e76b59e9af..81f1c7e1cb68e 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.49"; + version = "0.9.50"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - sha256 = "sha256-QonjtUw9CAEcGkjyq5Iv5CTo4gGUuFXSS2QVi/Ub2j4="; + sha256 = "sha256-xV2kDi/9gJ6sCQChy4eUowWSttrrp5yrcBucsJ6GcKc="; }; - cargoSha256 = "sha256-+L6+hRCnYqWmO5G1nctT0Ly74DhvUYhMvQroSDFMREg="; + cargoSha256 = "sha256-G5nEQ12mU7Hug4BqSaD24z3q2pZnQzvHoFVGDgw+xcU="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix index fc4fd46caa183..e0fd373fab996 100644 --- a/pkgs/development/tools/rust/cargo-release/default.nix +++ b/pkgs/development/tools/rust/cargo-release/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.24.5"; + version = "0.24.6"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "refs/tags/v${version}"; - hash = "sha256-6+Ej5hpwnoeE8WlrYeaddDZP/j8a5cn+2qqMQmFjIBU="; + hash = "sha256-IB+p2pxS+ycPlHgURujBDPppkgF8SjTBa+j1qvzFbjc="; }; - cargoHash = "sha256-mYrnATxRHYqWr0EgU7U3t2WUm72Lj8roX4WvGEMqZx8="; + cargoHash = "sha256-L2UnwFc5h/txMRIDCYCnsE+y2PQdt95XRsz2LupsXho="; nativeBuildInputs = [ pkg-config |