diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-05-28 12:01:53 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-28 12:01:53 +0000 |
commit | 572e24048b632f892ed51a32d35f8720a0af0616 (patch) | |
tree | 75839b422c06a1c1e5d0050950fb3ea812f90b02 /pkgs/tools | |
parent | 883e2ff04ce2e3952d3be23925ae801554c16fbb (diff) | |
parent | b83c196e2cbf187458e40a0098003c4c026f76d0 (diff) | |
download | nixpkgs-572e24048b632f892ed51a32d35f8720a0af0616.tar nixpkgs-572e24048b632f892ed51a32d35f8720a0af0616.tar.gz nixpkgs-572e24048b632f892ed51a32d35f8720a0af0616.tar.bz2 nixpkgs-572e24048b632f892ed51a32d35f8720a0af0616.tar.lz nixpkgs-572e24048b632f892ed51a32d35f8720a0af0616.tar.xz nixpkgs-572e24048b632f892ed51a32d35f8720a0af0616.tar.zst nixpkgs-572e24048b632f892ed51a32d35f8720a0af0616.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/networking/cjdns/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/networking/nexttrace/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/security/b3sum/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/security/exploitdb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/mitmproxy2swagger/default.nix | 4 |
5 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index ccb0bf46e76..85705a27231 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -70,5 +70,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; + broken = stdenv.isAarch64; }; } diff --git a/pkgs/tools/networking/nexttrace/default.nix b/pkgs/tools/networking/nexttrace/default.nix index 931c229ae3a..0a221772e19 100644 --- a/pkgs/tools/networking/nexttrace/default.nix +++ b/pkgs/tools/networking/nexttrace/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "nexttrace"; - version = "1.1.3"; + version = "1.1.5"; src = fetchFromGitHub { owner = "sjlleo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sOTQBh6j8od24s36J0e2aKW1mWmAD/ThfY6pd1SsSlY="; + sha256 = "sha256-9JLJ6v8eDVgqB4mdbHtBCZ1Wm5gjk7ywjGGgYOFZFAQ="; }; - vendorHash = "sha256-ckGoDV4GNp0mG+bkCKoLBO+ap53R5zrq/ZSKiFmVf9U="; + vendorHash = "sha256-1geVqj4W9HoMCM1OkGqpYqHj2jGoGEU9Zv6fkaHBzpk="; doCheck = false; # Tests require a network connection. diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/tools/security/b3sum/default.nix index 9279ec1d23b..fa7b9e4e5c9 100644 --- a/pkgs/tools/security/b3sum/default.nix +++ b/pkgs/tools/security/b3sum/default.nix @@ -16,5 +16,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/BLAKE3-team/BLAKE3/"; maintainers = with lib.maintainers; [ fpletz ivan ]; license = with lib.licenses; [ cc0 asl20 ]; + changelog = "https://github.com/BLAKE3-team/BLAKE3/releases/tag/${version}"; }; } diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 46b2f34a4d6..edb8fec3144 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-05-25"; + version = "2023-05-27"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-W2+54iIg2msExr9SxR8EEnsF0a0nfAgHfXI0wZN8lIw="; + hash = "sha256-7C4lihyGt8jiCtHXzE1iik0vsVRlsoKgvFgiV9iqtoQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/mitmproxy2swagger/default.nix b/pkgs/tools/security/mitmproxy2swagger/default.nix index b9f992cbb8a..64c2f3abbc7 100644 --- a/pkgs/tools/security/mitmproxy2swagger/default.nix +++ b/pkgs/tools/security/mitmproxy2swagger/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mitmproxy2swagger"; - version = "0.9.0"; + version = "0.10.0"; format = "pyproject"; src = fetchFromGitHub { owner = "alufers"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-P+Gw4D+G76gifYY2OghXRzrlPiYk4KggoVMgzJbm6Is="; + hash = "sha256-tvlxQrZzY2r+zipNm8XFTvYgLZAbg2xzoFL6VDt+/fk="; }; nativeBuildInputs = with python3.pkgs; [ |