summaryrefslogtreecommitdiffstats
path: root/makefu/5pkgs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-10-20 20:22:29 +0200
committertv <tv@krebsco.de>2016-10-20 20:22:29 +0200
commit9329c1e47ddda0653d7e9824a01632ce3766e8f0 (patch)
tree2bfb70737a757d0bd61ca0aa895c77d740b21e73 /makefu/5pkgs
parent844d347ce7cf0b7646e9ecba3fbdc0b90e608501 (diff)
parent0f2a9778315c3126794c0f1ad63710d38e7a67f7 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/5pkgs')
-rw-r--r--makefu/5pkgs/default.nix7
-rw-r--r--makefu/5pkgs/devpi/default.nix70
-rw-r--r--makefu/5pkgs/devpi/py3-fix-encoding.patch11
-rw-r--r--makefu/5pkgs/mergerfs/default.nix4
4 files changed, 63 insertions, 29 deletions
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 6d020406d..0d375a510 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -2,16 +2,9 @@
let
inherit (pkgs) callPackage;
- nixpkgs-1509 = import (pkgs.fetchFromGitHub {
- owner = "NixOS"; repo = "nixpkgs-channels";
- rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda";
- sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73";
- }) {};
-
in
{
nixpkgs.config.packageOverrides = rec {
- cups = nixpkgs-1509.cups;
alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
diff --git a/makefu/5pkgs/devpi/default.nix b/makefu/5pkgs/devpi/default.nix
index 3ccc35c79..020b2fdc2 100644
--- a/makefu/5pkgs/devpi/default.nix
+++ b/makefu/5pkgs/devpi/default.nix
@@ -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 ];
};
diff --git a/makefu/5pkgs/devpi/py3-fix-encoding.patch b/makefu/5pkgs/devpi/py3-fix-encoding.patch
new file mode 100644
index 000000000..e5f940699
--- /dev/null
+++ b/makefu/5pkgs/devpi/py3-fix-encoding.patch
@@ -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()]
diff --git a/makefu/5pkgs/mergerfs/default.nix b/makefu/5pkgs/mergerfs/default.nix
index 64e8fc671..cfb7b0ae7 100644
--- a/makefu/5pkgs/mergerfs/default.nix
+++ b/makefu/5pkgs/mergerfs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "mergerfs-${version}";
- version = "2.14.0";
+ version = "2.16.1";
# not using fetchFromGitHub because of changelog being built with git log
src = fetchgit {
url = "https://github.com/trapexit/mergerfs";
rev = "refs/tags/${version}";
- sha256 = "0j5r96xddlj5gp3n1xhfwjmr6yf861xg3hgby4p078c8zfriq5rm";
+ sha256 = "12fqgk54fnnibqiq82p4g2k6qnw3iy6dd64csmlf73yi67za5iwf";
deepClone = true;
};