diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/stripe-cli/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/rrdtool/default.nix | 31 | ||||
-rw-r--r-- | pkgs/tools/security/cnspec/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/security/exploitdb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/graphw00f/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/nitrokey-app2/default.nix | 43 | ||||
-rw-r--r-- | pkgs/tools/security/sn0int/default.nix | 13 |
7 files changed, 58 insertions, 47 deletions
diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 3dcf7d855715..9adb2d326e0b 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.19.1"; + version = "1.19.2"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - hash = "sha256-4xyJZKFkijgemNwGC8pi7zF9MgtwgSKIvDRZ8jJ2h8o="; + hash = "sha256-ohxTEHm5qGFQ1mJNL/Fh5qNc/De1TUtsEcuOIaJvGLc="; }; vendorHash = "sha256-DYA6cu2KzEBZ4wsT7wjcdY1endQQOZlj2aOwu6iGLew="; diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 58070c3b1b1c..e852374e2a88 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,16 +1,33 @@ -{ fetchurl, lib, stdenv, gettext, perl, pkg-config, libxml2, pango, cairo, groff -, tcl, darwin }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, gettext +, perl +, pkg-config +, libxml2 +, pango +, cairo +, groff +, tcl +, darwin +}: perl.pkgs.toPerlModule (stdenv.mkDerivation rec { pname = "rrdtool"; - version = "1.7.2"; + version = "1.8.0"; - src = fetchurl { - url = "https://oss.oetiker.ch/rrdtool/pub/rrdtool-${version}.tar.gz"; - sha256 = "1nsqra0g2nja19akmf9x5y9hhgc35ml3w9dcdz2ayz7zgvmzm6d1"; + src = fetchFromGitHub { + owner = "oetiker"; + repo = "rrdtool-1.x"; + rev = "v${version}"; + hash = "sha256-a+AxU1+YpkGoFs1Iu/CHAEZ4XIkWs7Vsnr6RcfXzsBE="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; buildInputs = [ gettext perl libxml2 pango cairo groff ] ++ lib.optionals stdenv.isDarwin [ tcl darwin.apple_sdk.frameworks.ApplicationServices ]; diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 2eee5568fea4..0a8426c38a72 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "9.14.0"; + version = "10.0.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-9MIIxWfETi2DX1DYPALL+JoC4r3yKJpeSFIx+hrGKiM="; + hash = "sha256-CzTHEOQ6QTL5M6lS8BgRhf3OXBC/Pa+HabsRrlxQGcU="; }; proxyVendor = true; - vendorHash = "sha256-Yii2sDfYqIzQAUaMotT87Wa5g3skxWllq6yGlkPDbLg="; + vendorHash = "sha256-7Ro2qRU+ULLLrVT0VpJkwBOQ6EQSgMLiJRRK9IMuXZs="; subPackages = [ "apps/cnspec" diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 0e2e74d0787f..a1dbd2ada9ed 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-12-22"; + version = "2024-01-24"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-NuukzG+l83YhIgVASLKCkE3FrS6+z8uURTxZyhT/RuA="; + hash = "sha256-3nwF/3xospyxxH6BvOU9DYBi8Fkw4oERGDZJPKMgSXM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/graphw00f/default.nix b/pkgs/tools/security/graphw00f/default.nix index caa7586d37f6..7f1d5ede3e71 100644 --- a/pkgs/tools/security/graphw00f/default.nix +++ b/pkgs/tools/security/graphw00f/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "graphw00f"; - version = "1.1.8"; + version = "1.1.15"; format = "other"; src = fetchFromGitHub { owner = "dolevf"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-stTCUHt9UCu1QuxDPB8a26LsrHNttyoVd0tmS7e2t2Y="; + hash = "sha256-wAymwT2PRyX7m/yh6BAa8YNkH7pE69bKHKZ15phuUJo="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/nitrokey-app2/default.nix b/pkgs/tools/security/nitrokey-app2/default.nix index 15e756a7053b..d56e882cb09e 100644 --- a/pkgs/tools/security/nitrokey-app2/default.nix +++ b/pkgs/tools/security/nitrokey-app2/default.nix @@ -1,21 +1,26 @@ { lib -, python3 +, buildPythonApplication , fetchFromGitHub -, wrapQtAppsHook +, pythonOlder +, pyside6 +, poetry-core +, pynitrokey +, pyudev +, qt-material }: -python3.pkgs.buildPythonApplication rec { +buildPythonApplication rec { pname = "nitrokey-app2"; - version = "2.1.4"; + version = "2.1.5"; pyproject = true; - disabled = python3.pythonOlder "3.9"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Nitrokey"; repo = "nitrokey-app2"; rev = "v${version}"; - hash = "sha256-loOCa6XlLx1YEfqR0SUUalVIEPCoYsNEHFo2MIKexeA="; + hash = "sha256-mR13zUgCdNS09EnpGLrnOnoIn3p6ZM/0fHKg0OUMWj4="; }; # https://github.com/Nitrokey/nitrokey-app2/issues/152 @@ -23,36 +28,20 @@ python3.pkgs.buildPythonApplication rec { # pythonRelaxDepsHook does not work here, because it runs in postBuild and # only modifies the dependencies in the built distribution. postPatch = '' - substituteInPlace pyproject.toml --replace "pynitrokey ==" "pynitrokey >=" + substituteInPlace pyproject.toml --replace 'pynitrokey = "' 'pynitrokey = ">=' ''; - # The pyproject.toml file seems to be incomplete and does not generate - # resources (i.e. run pyrcc5 and pyuic5) but the Makefile does. - preBuild = '' - make build-ui - ''; - - nativeBuildInputs = with python3.pkgs; [ - flit-core - pyqt5 - wrapQtAppsHook + nativeBuildInputs = [ + poetry-core ]; - dontWrapQtApps = true; - - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ pynitrokey pyudev - pyqt5 - pyqt5-stubs + pyside6 qt-material ]; - preFixup = '' - wrapQtApp "$out/bin/nitrokeyapp" \ - --set-default CRYPTOGRAPHY_OPENSSL_NO_LEGACY 1 - ''; - pythonImportsCheck = [ "nitrokeyapp" ]; diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix index 397f7eb832e7..66f89f77e8ea 100644 --- a/pkgs/tools/security/sn0int/default.nix +++ b/pkgs/tools/security/sn0int/default.nix @@ -1,10 +1,12 @@ { lib , fetchFromGitHub , rustPlatform -, libsodium , libseccomp -, sqlite +, libsodium , pkg-config +, pkgs +, sqlite +, stdenv }: rustPlatform.buildRustPackage rec { @@ -26,8 +28,11 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libsodium - libseccomp sqlite + ] ++ lib.optionals stdenv.isLinux [ + libseccomp + ] ++ lib.optionals stdenv.isDarwin [ + pkgs.darwin.apple_sdk.frameworks.Security ]; # One of the dependencies (chrootable-https) tries to read "/etc/resolv.conf" @@ -40,6 +45,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/kpcyrd/sn0int/releases/tag/v${version}"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab xrelkd ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } |