diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-29 18:39:36 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-29 18:39:36 +0100 |
| commit | a1a3e54ac91d087e27da6b95a83ac375bb7c0603 (patch) | |
| tree | edc64167f315a48faa4e96e04232f7606d603301 /pkgs/top-level | |
| parent | 0ac589246a7020d6ed024353b8b39ef1c363e50e (diff) | |
| parent | 805e25988f779476f8aed7d13d9fcfaa47010dab (diff) | |
| download | nixlib-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.tar nixlib-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.tar.gz nixlib-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.tar.bz2 nixlib-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.tar.lz nixlib-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.tar.xz nixlib-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.tar.zst nixlib-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.zip | |
Merge branch 'master' into staging
Haskell rebuild :-) Hydra: ?compare=1421865
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 9da0d78d4b73..7bc88e6ae9e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5030,6 +5030,8 @@ with pkgs; whois = callPackage ../tools/networking/whois { }; + woff2 = callPackage ../development/web/woff2 { }; + wsmancli = callPackage ../tools/system/wsmancli {}; wolfebin = callPackage ../tools/networking/wolfebin { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d1d9d1c55466..6010cc84a0e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6646,6 +6646,8 @@ in { }; }; + pythonix = callPackage ../development/python-modules/pythonix { }; + pypolicyd-spf = buildPythonPackage rec { name = "pypolicyd-spf-${version}"; majorVersion = "2.0"; |