diff options
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/fail2ban/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/gnupg/21.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/hashcat/hashcat3/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/security/pcsclite/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/security/vulnix/requirements.nix | 96 |
5 files changed, 28 insertions, 92 deletions
diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index e7a052c90f1c..31f2262cd9ff 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python, pythonPackages, gamin }: -let version = "0.9.6"; in +let version = "0.9.7"; in pythonPackages.buildPythonApplication { name = "fail2ban-${version}"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication { owner = "fail2ban"; repo = "fail2ban"; rev = version; - sha256 = "1a75xjjqhn98zd9i51k15vjvcy0ql0gmcv9xf8pbd0bpvblgdah8"; + sha256 = "07l5pz93mz1r3g59xiyyznlpjfpv2zgvh3h9w0cbn79v7njim8kb"; }; propagatedBuildInputs = [ gamin ] diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index e74b0920f4a2..9590ee746b8b 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.1.21"; + version = "2.1.22"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1p97limv29p01y79mgnzpwixa50lv53wgdl3ymk9idkmpaldisks"; + sha256 = "1msazgy1q1pp7y2xr46z0il4pfzmzgzkp7v0hv5cz4hvkspnywa6"; }; buildInputs = [ diff --git a/pkgs/tools/security/hashcat/hashcat3/default.nix b/pkgs/tools/security/hashcat/hashcat3/default.nix index c8a8acf907d3..1cb028a1a333 100644 --- a/pkgs/tools/security/hashcat/hashcat3/default.nix +++ b/pkgs/tools/security/hashcat/hashcat3/default.nix @@ -4,15 +4,15 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { name = "hashcat-${version}"; - version = "3.10"; + version = "3.6.0"; src = fetchurl { - name = "${name}.tar.gz"; - url = "https://hashcat.net/files_legacy/hashcat-${version}.tar.gz"; - sha256 = "1sg30d9as6xsl7b0i7mz26igachbv0l0yimwb12nmarmgdgmwm9v"; + url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; + sha256 = "127hdvq6ikah7r5vch63jnnkcsj7y61f9h8x79c3w25x9w55bxry"; }; - buildInputs = [ opencl-headers makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ opencl-headers ]; makeFlags = [ "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include" ]; diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index e3aaca2e5b22..74bb5cc58197 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "pcsclite-${version}"; - version = "1.8.21"; + version = "1.8.22"; src = fetchurl { # This URL changes in unpredictable ways, so it is not sensible # to put a version variable in there. - url = "https://alioth.debian.org/frs/download.php/file/4216/pcsc-lite-1.8.21.tar.bz2"; - sha256 = "1b8kwl81f6s3y7qh68ahr8sp8a0w6m464v9b3s4zxq2cgpmnaczy"; + url = "https://alioth.debian.org/frs/download.php/file/4225/pcsc-lite-1.8.22.tar.bz2"; + sha256 = "01flkdyqs7kr6c63dv2qg8dwir3v9jlr9rzlw7vafrivxmhqydba"; }; patches = [ ./no-dropdir-literals.patch ]; diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix index 11faca44ef93..d44d49f12a92 100644 --- a/pkgs/tools/security/vulnix/requirements.nix +++ b/pkgs/tools/security/vulnix/requirements.nix @@ -1,38 +1,6 @@ { pythonPackages, fetchurl, stdenv }: rec { - BTrees = pythonPackages.buildPythonPackage { - name = "BTrees-4.3.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/24/76/cd6f225f2180c22af5cdb6656f51aec5fca45e45bdc4fa75c0a32f161a61/BTrees-4.3.1.tar.gz"; - sha256 = "2565b7d35260dfc6b1e2934470fd0a2f9326c58c535a2b4cb396289d1c195a95"; - }; - propagatedBuildInputs = [ - persistent - transaction - ] ++ (with pythonPackages; [ zope_interface coverage ]); - - meta = with stdenv.lib; { - homepage = ""; - license = licenses.zpt21; - description = "Scalable persistent object containers"; - }; - }; - - ZConfig = pythonPackages.buildPythonPackage { - name = "ZConfig-3.1.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/52/b3/a96d62711a26d8cfbe546519975dc9ed54d2eb50b3238d2e6de045764796/ZConfig-3.1.0.tar.gz"; - sha256 = "c21fa3a073a56925a8098036d46717392994a92cffea1b3cda3176b70c0a842e"; - }; - propagatedBuildInputs = with pythonPackages; [ zope_testrunner ]; - meta = with stdenv.lib; { - homepage = ""; - license = licenses.zpt21; - description = "Structured Configuration Library"; - }; - }; - zodb = pythonPackages.buildPythonPackage { name = "ZODB-5.2.0"; src = fetchurl { @@ -41,31 +9,22 @@ rec { }; doCheck = false; propagatedBuildInputs = [ - BTrees - persistent transaction - ZConfig - zc.lockfile + ] ++ (with pythonPackages; [ + six + wheel + zope_interface zodbpickle - ] ++ (with pythonPackages; [ six wheel zope_interface ]); - meta = with stdenv.lib; { - homepage = ""; - license = licenses.zpt21; - description = "Zope Object Database: object database and persistence"; - }; - }; + zconfig + persistent + zc_lockfile + BTrees + ]); - persistent = pythonPackages.buildPythonPackage { - name = "persistent-4.2.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/3d/71/3302512282b606ec4d054e09be24c065915518903b29380b6573bff79c24/persistent-4.2.2.tar.gz"; - sha256 = "52ececc6dbba5ef572d3435189318b4dff07675bafa9620e32f785e147c6563c"; - }; - propagatedBuildInputs = with pythonPackages; [ zope_interface six wheel ]; meta = with stdenv.lib; { homepage = ""; license = licenses.zpt21; - description = "Translucent persistent objects"; + description = "Zope Object Database: object database and persistence"; }; }; @@ -75,39 +34,16 @@ rec { url = "https://pypi.python.org/packages/8c/af/3ffafe85bcc93ecb09459f3f2bd8fbe142e9ab34048f9e2774543b470cbd/transaction-2.0.3.tar.gz"; sha256 = "67bfb81309ba9717edbb2ca2e5717c325b78beec0bf19f44e5b4b9410f82df7f"; }; - propagatedBuildInputs = with pythonPackages; [ zope_interface six wheel ]; + propagatedBuildInputs = with pythonPackages; [ + zope_interface + six + wheel + mock + ]; meta = with stdenv.lib; { homepage = ""; license = licenses.zpt21; description = "Transaction management for Python"; }; }; - - zc.lockfile = pythonPackages.buildPythonPackage { - name = "zc.lockfile-1.2.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/bd/84/0299bbabbc9d3f84f718ba1039cc068030d3ad723c08f82a64337edf901e/zc.lockfile-1.2.1.tar.gz"; - sha256 = "11db91ada7f22fe8aae268d4bfdeae012c4fe655f66bbb315b00822ec00d043e"; - }; - meta = with stdenv.lib; { - homepage = ""; - license = licenses.zpt21; - description = "Basic inter-process locks"; - }; - }; - - zodbpickle = pythonPackages.buildPythonPackage { - name = "zodbpickle-0.6.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/7a/fc/f6f437a5222b330735eaf8f1e67a6845bd1b600e9a9455e552d3c13c4902/zodbpickle-0.6.0.tar.gz"; - sha256 = "ea3248be966159e7791e3db0e35ea992b9235d52e7d39835438686741d196665"; - }; - doCheck = false; - - meta = with stdenv.lib; { - homepage = ""; - license = licenses.zpt21; - description = "Fork of Python 3 pickle module."; - }; - }; } |