diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-05-03 19:03:51 +0200 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-05-03 19:03:51 +0200 |
commit | b4617eb071811bfcab3f5f0d640fc9cd633d754b (patch) | |
tree | 1e63d85a38569abd4b2dc7e8bac320752719ef82 /pkgs/tools | |
parent | f3ff1f7e2b03b4af2874924d267fc1038c5f1dac (diff) | |
parent | 7c4cc6476bd485d2e62418dc3cde25e1c579d7d2 (diff) |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/kics/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/admin/pgadmin/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/graphics/sanjuuni/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/misc/phrase-cli/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/bgpq4/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/dnsproxy/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/aws-iam-authenticator/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/security/kubescape/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/security/quark-engine/default.nix | 34 | ||||
-rw-r--r-- | pkgs/tools/security/tpm2-tools/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/security/vals/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/vale/styles.nix | 8 |
12 files changed, 47 insertions, 54 deletions
diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index ba8818c7f415b..6db54ce509494 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kics"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - hash = "sha256-OdX3ipfPj+rope5oT5ND9MEaefW36X6XDV5F7PaQOuw="; + hash = "sha256-4WYrKWkcf7AJjogWQcNsIZiCfxf4CmhLW/GJFUWfQzw="; }; - vendorHash = "sha256-vYAMzXBQIt8F9DTGLkWNXx6e08MPo12W2ogiTZ8gcjw="; + vendorHash = "sha256-N3MJhuzMJW40aMrAyuBsNciwZaNq0K4IUd+0re17AOI="; subPackages = [ "cmd/console" ]; diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 95b8963afb7c6..3c8c362a41428 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -222,6 +222,9 @@ pythonPackages.buildPythonApplication rec { pythonPackages.selenium ]; + # sandboxing issues on aarch64-darwin, see https://github.com/NixOS/nixpkgs/issues/198495 + doCheck = postgresql.doCheck; + checkPhase = '' runHook preCheck diff --git a/pkgs/tools/graphics/sanjuuni/default.nix b/pkgs/tools/graphics/sanjuuni/default.nix index 70bc59f3eb400..41cfd6f7ee575 100644 --- a/pkgs/tools/graphics/sanjuuni/default.nix +++ b/pkgs/tools/graphics/sanjuuni/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchpatch , pkg-config +, autoreconfHook , ffmpeg , poco , ocl-icd @@ -24,12 +25,14 @@ stdenv.mkDerivation rec { (fetchpatch { name = "build-with-cxx17.patch"; url = "https://github.com/MCJack123/sanjuuni/commit/f2164bc18935bcf63ee5b0a82087bc91f7fd258d.patch"; - hash = "sha256-ZmP+AmUV7fcIFqSA6e56Nt6u03leE9PX36g2z0nLswo="; + hash = "sha256-MjDeAiB3WkemCRYzgOHzHlbPUoI4DHEYe28xIIC+c7I="; + excludes = [ "configure" ]; # conflicts with release tarball; we manually regenerate this }) ]; nativeBuildInputs = [ pkg-config + autoreconfHook ]; buildInputs = [ diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index 70b08aa96a928..fc00c5936b06b 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.25.0"; + version = "2.27.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-JVelz5I6HWgoqqkfNzb0DlAA4DsydBzdcxEIdKs24i4="; + sha256 = "sha256-PStbkJbSGCN92eAk4TZaIzbkG1C25PKI6R6LJgaQuxQ="; }; - vendorHash = "sha256-8lqiseOJ8eDvY4J/MimKVvh5euHfOgQLjhKf7sPS6AE="; + vendorHash = "sha256-5EgttRimT+TTL9QhT36AO9rx2DdZBmnQrllBfRpdhg0="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/pkgs/tools/networking/bgpq4/default.nix b/pkgs/tools/networking/bgpq4/default.nix index 22e17a205c207..006bfbf595dde 100644 --- a/pkgs/tools/networking/bgpq4/default.nix +++ b/pkgs/tools/networking/bgpq4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bgpq4"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "bgp"; repo = pname; rev = version; - sha256 = "sha256-Irv91M5g21id0QfsnpDA7n5IhP8Qe9QHMh/KizD74qw="; + sha256 = "sha256-Kw1Y9g2ItclDYYoZC2FTdBTec7zoM/N3Vk4zM8EVBR0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index aca0907785449..6036d6658d021 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.71.0"; + version = "0.71.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "dnsproxy"; rev = "v${version}"; - hash = "sha256-2Qn5lYam4bMA7JS/rovHTUGXovCUOhikpv8pcWzyO24="; + hash = "sha256-g+QjGU+9//Ms7s61IzkxLTffmu1XIhzUX841e86JqE4="; }; vendorHash = "sha256-8t1/XIjDXRHumHkRNxQBeexL2qN94AHModk8ioLpMNY="; diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index 5af095ae15560..801d364c60269 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.6.19"; + version = "0.6.20"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wgMMa1PFKNArI4pk7gA2o8HHgF84Q+rga4j+UC1/Js8="; + hash = "sha256-72l+EgqWy8+7wdTKwXnebZ+wm5VCgYODw4D6lkL4NBA="; }; - vendorHash = "sha256-wJqtIuLiidO3XFkvhSXRZcFR/31rR4U9BXjFilsr5a0="; + vendorHash = "sha256-7FYR8c1Q9SS3prt8yrTzbOqgqG1tGuvzjH42MkY0tAo="; ldflags = let PKG = "sigs.k8s.io/aws-iam-authenticator"; in [ "-s" diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 2c74013c3ad19..501c6dc1435b1 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -10,17 +10,17 @@ buildGoModule rec { pname = "kubescape"; - version = "3.0.8"; + version = "3.0.9"; src = fetchFromGitHub { owner = "kubescape"; repo = "kubescape"; rev = "refs/tags/v${version}"; - hash = "sha256-ZGDE9go8BmaXE1YFT/z5Nob90MhsKZ6oKrodDMu2npY="; + hash = "sha256-pAe289XwKq/PO39/Wt60uipt4Z0ZD5f73pDaOTXXwi0="; fetchSubmodules = true; }; - vendorHash = "sha256-qFJVoWzU9rqpYbb8gzdK33rq///zizxVkWhsNV8OXOM="; + vendorHash = "sha256-UWmsS79N8ooFr4qpKqOVC14cgf5ckAQwzROHGl1smD8="; subPackages = [ "." @@ -49,7 +49,6 @@ buildGoModule rec { rm core/cautils/getter/downloadreleasedpolicy_test.go rm core/core/initutils_test.go rm core/core/list_test.go - rm core/pkg/resourcehandler/remotegitutils_test.go # Remove tests that use networking substituteInPlace core/pkg/resourcehandler/repositoryscanner_test.go \ diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/tools/security/quark-engine/default.nix index 43e9413d125cd..58236cc8b30ab 100644 --- a/pkgs/tools/security/quark-engine/default.nix +++ b/pkgs/tools/security/quark-engine/default.nix @@ -1,27 +1,27 @@ -{ lib -, fetchFromGitHub -, gitMinimal -, python3 +{ + lib, + fetchFromGitHub, + gitMinimal, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "quark-engine"; - version = "24.4.1"; + version = "24.5.1"; pyproject = true; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "quark-engine"; + repo = "quark-engine"; rev = "refs/tags/v${version}"; - sha256 = "sha256-cWO/avMz9nT9yo10b1ugC0C8NsEp2jAlcR0/+86gFKc="; + hash = "sha256-W1UeTiyyYZzxu3XQ/6VkTvEyqPWl1Du6QutuoPhaSfs="; }; - nativeBuildInputs = with python3.pkgs; [ - setuptools - pythonRelaxDepsHook - ]; + build-system = with python3.pkgs; [ setuptools ]; + + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ androguard click colorama @@ -37,16 +37,12 @@ python3.pkgs.buildPythonApplication rec { tqdm ]; - pythonRelaxDeps = [ - "r2pipe" - ]; + pythonRelaxDeps = [ "r2pipe" ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ - "quark" - ]; + pythonImportsCheck = [ "quark" ]; meta = with lib; { description = "Android malware (analysis and scoring) system"; diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix index b664eb6f01a3e..1cf4d40091389 100644 --- a/pkgs/tools/security/tpm2-tools/default.nix +++ b/pkgs/tools/security/tpm2-tools/default.nix @@ -4,21 +4,13 @@ stdenv.mkDerivation rec { pname = "tpm2-tools"; - version = "5.6"; + version = "5.7"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-Usi8uq3KCCq/5et+5JZ9LWMthLFndnXy8HG20uwizsM="; + sha256 = "sha256-OBDTa1B5JW9PL3zlUuIiE9Q7EDHBMVON+KLbw8VwmDo="; }; - patches = [ - # https://github.com/tpm2-software/tpm2-tools/pull/3271 - (fetchpatch { - url = "https://github.com/tpm2-software/tpm2-tools/commit/b98be08f6f88b0cca9e0667760c4e1e5eb417fbd.patch"; - sha256 = "sha256-2sEam9i4gwscJhLwraX2EAjVM8Dh1vmNnG3zYsOF0fc="; - }) - ]; - nativeBuildInputs = [ pandoc pkg-config makeWrapper ]; buildInputs = [ curl openssl tpm2-tss libuuid diff --git a/pkgs/tools/security/vals/default.nix b/pkgs/tools/security/vals/default.nix index e734893d527ff..b7b1012ad2772 100644 --- a/pkgs/tools/security/vals/default.nix +++ b/pkgs/tools/security/vals/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vals"; - version = "0.37.0"; + version = "0.37.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "helmfile"; repo = pname; - sha256 = "sha256-R/nTlB8VM41Yah+3sH/J3Y3m9KUFsIZQNQ9kFddo+Mo="; + sha256 = "sha256-POFxoGUbcasEvFdovZ1RER+yxLzg9owyKjWcr1zI+nc="; }; - vendorHash = "sha256-VKJIbsVIIEEGqo+LXfYzhIJLtcj0jbbq/UXVpykgcz8="; + vendorHash = "sha256-Yzab4Y6ETOZM5zL/5fQSzqNFi51YOgDjsL53efW1vvk="; ldflags = [ "-s" diff --git a/pkgs/tools/text/vale/styles.nix b/pkgs/tools/text/vale/styles.nix index f2513289a5488..54764f77ff471 100644 --- a/pkgs/tools/text/vale/styles.nix +++ b/pkgs/tools/text/vale/styles.nix @@ -48,12 +48,12 @@ in google = buildStyle rec { name = "Google"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "errata-ai"; repo = "Google"; rev = "v${version}"; - hash = "sha256-TQS/hgS6tEWPSuZpEbX65MdYSE/+HJVcnzIuQbhIG2M="; + hash = "sha256-jSmfUgzlIbDVh2zLtnTNpM/z6dHMp358F9adLZ5+qcw="; }; meta = { description = "A Vale-compatible implementation of the Google Developer Documentation Style Guide"; @@ -80,12 +80,12 @@ in microsoft = buildStyle rec { name = "Microsoft"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "errata-ai"; repo = "Microsoft"; rev = "v${version}"; - hash = "sha256-22rGNLZOsWYQ+H3CcM2b1zOXV3kNPcgYqDpaCg1iv9o="; + hash = "sha256-4j05bIGAVEy6untUqtrUxdLKlhyOcJsbcsow8OxRp1A="; }; meta = { description = "A Vale-compatible implementation of the Microsoft Writing Style Guide"; |