Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m 5 devpi: bump

Browse Source
This commit is contained in:
makefu 2016-10-19 20:46:54 +02:00
parent 8fe9262b5f
commit 6cdb8d8689
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 62 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
makefu/5pkgs/devpi/default.nix
View File

@ -1,33 +1,43 @@
{ pkgs ? import <nixpkgs> {} }:
with pkgs.stdenv.lib;
let
execnet14 = pkgs.python3Packages.buildPythonPackage rec {
name = "execnet-1.4.1";
readme-renderer = pkgs.python3Packages.buildPythonPackage rec {
name = "readme_renderer";
version = "0.7.0";
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/e/execnet/${name}.tar.gz";
sha256 = "1rpk1vyclhg911p3hql0m0nrpq7q7mysxnaaw6vs29cpa6kx8vgn";
};
doCheck = false; # http://prism:8010/builders/build-all/builds/177/steps/build-vbob/logs/stdio
propagatedBuildInputs = with pkgs.python3Packages;
[ setuptools_scm apipkg ];
meta = {
description = "rapid multi-Python deployment";
license = licenses.gpl2;
};
url = "mirror://pypi/r/readme_renderer/readme_renderer-${version}.tar.gz";
sha256 = "1kh9ggff8m9sdgr631vf2n4k97h4z1871vay6qgk3ydy3rd856ak";
};
buildInputs = with pkgs.python3Packages; [ pytest ];
propagatedBuildInputs = with pkgs.python3Packages; [ docutils bleach pygments ];
};
devpi-client = pkgs.python3Packages.buildPythonPackage rec {
name = "devpi-client";
version = "2.7.0";
src = pkgs.fetchurl {
url = "mirror://pypi/d/devpi-client/devpi-client-${version}.tar.gz";
sha256 = "0z7vaf0a66n82mz0vx122pbynjvkhp2mjf9lskgyv09y3bxzzpj3";
};
patches = [ ./py3-fix-encoding.patch ];
buildInputs = with pkgs.python3Packages; [ tox check-manifest pkginfo ];
propagatedBuildInputs = with pkgs.python3Packages; [ devpi-common py ];
};
devpi-web = pkgs.python3Packages.buildPythonPackage rec {
name = "devpi-web";
version = "3.0.0";
version = "3.1.1";
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/d/devpi-web/devpi-web-${version}.tar.gz";
sha256 = "156abxyhj17a8cg38hpyr31qkjb61mb2kggsxij4p4xvy9jwkbwi";
url = "mirror://pypi/d/devpi-web/devpi-web-${version}.tar.gz";
sha256 = "0bvqv52jmasfm4sdyccwsgvk9a663d3grj7zjw8r9x7xm7l3svqv";
};
propagatedBuildInputs = with pkgs.python3Packages;
[ devpi-server pyramid_chameleon beautifulsoup4 Whoosh defusedxml ];
[ devpi-server pyramid_chameleon beautifulsoup4 defusedxml readme-renderer ];
meta = {
homepage = https://bitbucket.org/hpk42/devpi;
@ -36,9 +46,29 @@ let
maintainers = with maintainers; [ makefu ];
};
};
devpi-common-3 = pkgs.python3Packages.buildPythonPackage rec {
name = "devpi-common";
version = "3.0.1";
src = pkgs.fetchurl {
url = "mirror://pypi/d/devpi-common/devpi-common-${version}.tar.gz";
sha256 = "0l3a7iyk596x6pvzg7604lzzi012qszr804fqn6f517zcy1xz23j";
};
propagatedBuildInputs = with pkgs.python3Packages; [ requests2 py ];
meta = {
homepage = https://bitbucket.org/hpk42/devpi;
description = "Utilities jointly used by devpi-server and devpi-client";
license = licenses.mit;
maintainers = with maintainers; [ lewo makefu ];
};
};
devpi-server = pkgs.python3Packages.buildPythonPackage rec {
name = "devpi-server";
version = "3.0.2";
version = "4.1.1";
# original postFixup adds "import sys; sys.argv[0] = 'devpi-server'" to
# `.devpi-server-wrapped` which
@ -46,12 +76,12 @@ let
postFixup = "";
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/d/devpi-server/devpi-server-${version}.tar.gz";
sha256 = "14r1024i3x2pb72khyzvi56sh9smpdswmrbc88xvjxnalmzfn99d";
url = "mirror://pypi/d/devpi-server/devpi-server-${version}.tar.gz";
sha256 = "1icbn1nw6w0sc5150fr69rlhs0j5ldnnxfzl2qabq2wi0dbar8hf";
};
propagatedBuildInputs = with pkgs.python3Packages;
[ devpi-common execnet14 itsdangerous pluggy waitress pyramid ];
[ devpi-common-3 execnet itsdangerous pluggy waitress pyramid ];
buildInputs = with pkgs.python3Packages; [ pytest beautifulsoup4 webtest ];
meta = {
@ -63,7 +93,7 @@ let
};
in {
inherit devpi-server;
inherit devpi-server devpi-client;
devpi-web = pkgs.python3.buildEnv.override {
extraLibs = [ devpi-web devpi-server ];
};

11
makefu/5pkgs/devpi/py3-fix-encoding.patch Normal file
View File

@ -0,0 +1,11 @@
+++ a/setup.py
--- b/setup.py
@@ -26,7 +26,7 @@
def get_changelog():
- text = open(os.path.join(here, 'CHANGELOG')).read()
+ text = open(os.path.join(here, 'CHANGELOG'),encoding='utf-8').read()
header_matches = list(re.finditer('^-+$', text, re.MULTILINE))
# until fifth header
text = text[:header_matches[5].start()]