diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-11-06 20:43:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-06 20:43:22 +0100 |
| commit | 4fc2fd6d26cadd9695bd2c5fec809ef31992dc0c (patch) | |
| tree | 1541d98e874889a341846f4a6e023e7c1e69eb1f | |
| parent | 13cc4f513ed8ca0f572f89296efa11d1ac368676 (diff) | |
| parent | 632a1807db13f0176f1374788cd15070eebed8e5 (diff) | |
| download | nixlib-4fc2fd6d26cadd9695bd2c5fec809ef31992dc0c.tar nixlib-4fc2fd6d26cadd9695bd2c5fec809ef31992dc0c.tar.gz nixlib-4fc2fd6d26cadd9695bd2c5fec809ef31992dc0c.tar.bz2 nixlib-4fc2fd6d26cadd9695bd2c5fec809ef31992dc0c.tar.lz nixlib-4fc2fd6d26cadd9695bd2c5fec809ef31992dc0c.tar.xz nixlib-4fc2fd6d26cadd9695bd2c5fec809ef31992dc0c.tar.zst nixlib-4fc2fd6d26cadd9695bd2c5fec809ef31992dc0c.zip | |
Merge pull request #31242 from rnhmjoj/python
hyp: move expression out python-packages.nix
| -rw-r--r-- | pkgs/servers/http/hyp/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 19 |
3 files changed, 21 insertions, 19 deletions
diff --git a/pkgs/servers/http/hyp/default.nix b/pkgs/servers/http/hyp/default.nix new file mode 100644 index 000000000000..3a1eb50f05be --- /dev/null +++ b/pkgs/servers/http/hyp/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, python3Packages }: + +python3Packages.buildPythonPackage rec { + name = "hyp-server-${version}"; + version = "1.2.0"; + + src = fetchurl { + url = "mirror://pypi/h/hyp-server/${name}.tar.gz"; + sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15"; + }; + + meta = with stdenv.lib; { + description = "Hyperminimal https server"; + homepage = https://github.com/rnhmjoj/hyp; + license = with licenses; [gpl3Plus mit]; + maintainers = with maintainers; [ rnhmjoj ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 983dacda0449..82ca5a10ffc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11493,6 +11493,8 @@ with pkgs; exhibitor = callPackage ../servers/exhibitor { }; + hyp = callPackage ../servers/http/hyp/default.nix { }; + prosody = callPackage ../servers/xmpp/prosody { lua5 = lua5_1; inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 12aafc7e25ff..426e263cc63d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7478,25 +7478,6 @@ in { subliminal = callPackage ../development/python-modules/subliminal {}; - hyp = buildPythonPackage rec { - name = "hyp-server-${version}"; - version = "1.2.0"; - disabled = !isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/h/hyp-server/${name}.tar.gz"; - sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15"; - }; - - meta = { - description = "Hyperminimal https server"; - homepage = https://github.com/rnhmjoj/hyp; - license = with licenses; [gpl3Plus mit]; - maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.unix; - }; - }; - hyperlink = callPackage ../development/python-modules/hyperlink {}; zope_copy = buildPythonPackage rec { |