diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-08-01 09:57:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-01 09:57:12 +0200 |
commit | 8f9326ffd8a75b0b807d62723f895e38b2e663bd (patch) | |
tree | 03bc67cecfdd425ce436c10d41afed4662dab14e /pkgs/top-level | |
parent | dbd856d7240b992fc45aedf6e2227f4028b72a5b (diff) | |
parent | c8f2d8dae0f3a7511c708e4896502654361f4a67 (diff) | |
download | nixlib-8f9326ffd8a75b0b807d62723f895e38b2e663bd.tar nixlib-8f9326ffd8a75b0b807d62723f895e38b2e663bd.tar.gz nixlib-8f9326ffd8a75b0b807d62723f895e38b2e663bd.tar.bz2 nixlib-8f9326ffd8a75b0b807d62723f895e38b2e663bd.tar.lz nixlib-8f9326ffd8a75b0b807d62723f895e38b2e663bd.tar.xz nixlib-8f9326ffd8a75b0b807d62723f895e38b2e663bd.tar.zst nixlib-8f9326ffd8a75b0b807d62723f895e38b2e663bd.zip |
Merge pull request #17323 from arpa2/hashslinger
Hash-slinger: init at 2.7.0
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 240a53181f5e..1907f1ffd66e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1964,6 +1964,8 @@ in hashcat = callPackage ../tools/security/hashcat { }; + hash-slinger = callPackage ../tools/security/hash-slinger { }; + hal-flash = callPackage ../os-specific/linux/hal-flash { }; halibut = callPackage ../tools/typesetting/halibut { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e06c1c6765dc..46859333a841 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -327,6 +327,8 @@ in modules // { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; + pyunbound = callPackage ../tools/networking/unbound/python.nix { }; + # packages defined here aafigure = buildPythonPackage rec { |