public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31242 from rnhmjoj/python

Browse Source 
hyp: move expression out python-packages.nix
This commit is contained in:
Frederik Rietdijk 2017-11-06 20:43:22 +01:00 committed by GitHub
commit 4fc2fd6d26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/servers/http/hyp/default.nix Normal file
View File

@ -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;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -11493,6 +11493,8 @@ with pkgs;
exhibitor = callPackage ../servers/exhibitor { }; exhibitor = callPackage ../servers/exhibitor { };
hyp = callPackage ../servers/http/hyp/default.nix { };
prosody = callPackage ../servers/xmpp/prosody { prosody = callPackage ../servers/xmpp/prosody {
lua5 = lua5_1; lua5 = lua5_1;
inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib; inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib;

19
pkgs/top-level/python-packages.nix
View File

@ -7478,25 +7478,6 @@ in {
subliminal = callPackage ../development/python-modules/subliminal {}; 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 {}; hyperlink = callPackage ../development/python-modules/hyperlink {};
zope_copy = buildPythonPackage rec { zope_copy = buildPythonPackage rec {