Merge remote-tracking branch 'gum/master'
This commit is contained in:
commit
3db3f9df43
@ -21,10 +21,13 @@ with config.krebs.lib;
|
|||||||
search-domain = "retiolum";
|
search-domain = "retiolum";
|
||||||
build = {
|
build = {
|
||||||
user = config.krebs.users.makefu;
|
user = config.krebs.users.makefu;
|
||||||
source = let inherit (config.krebs.build) host user; in {
|
source = let
|
||||||
|
inherit (config.krebs.build) host user;
|
||||||
|
ref = "b8ede35"; # stable @ 2016-10-19
|
||||||
|
in {
|
||||||
nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
|
nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
|
||||||
{ # stable @ 2016-07-20
|
{
|
||||||
git = { url = https://github.com/nixos/nixpkgs; ref = "125ffff"; };
|
git = { url = https://github.com/nixos/nixpkgs; inherit ref; };
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
# TODO use http, once it is implemented
|
# TODO use http, once it is implemented
|
||||||
@ -32,7 +35,7 @@ with config.krebs.lib;
|
|||||||
|
|
||||||
## prepare so we do not have to wait for rsync:
|
## prepare so we do not have to wait for rsync:
|
||||||
## cd /var/src; curl https://github.com/nixos/nixpkgs/tarball/125ffff -L | tar zx && mv NixOS-nixpkgs-125ffff nixpkgs
|
## cd /var/src; curl https://github.com/nixos/nixpkgs/tarball/125ffff -L | tar zx && mv NixOS-nixpkgs-125ffff nixpkgs
|
||||||
{ file = "/home/makefu/store/125ffff";};
|
{ file = "/home/makefu/store/${ref}";};
|
||||||
secrets.file =
|
secrets.file =
|
||||||
if getEnv "dummy_secrets" == "true"
|
if getEnv "dummy_secrets" == "true"
|
||||||
then toString <stockholm/makefu/6tests/data/secrets>
|
then toString <stockholm/makefu/6tests/data/secrets>
|
||||||
|
@ -2,16 +2,9 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
inherit (pkgs) callPackage;
|
inherit (pkgs) callPackage;
|
||||||
nixpkgs-1509 = import (pkgs.fetchFromGitHub {
|
|
||||||
owner = "NixOS"; repo = "nixpkgs-channels";
|
|
||||||
rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda";
|
|
||||||
sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73";
|
|
||||||
}) {};
|
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixpkgs.config.packageOverrides = rec {
|
nixpkgs.config.packageOverrides = rec {
|
||||||
cups = nixpkgs-1509.cups;
|
|
||||||
alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
|
alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
|
||||||
alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
|
alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
|
||||||
alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
|
alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
|
||||||
|
@ -1,33 +1,43 @@
|
|||||||
{ pkgs ? import <nixpkgs> {} }:
|
{ pkgs ? import <nixpkgs> {} }:
|
||||||
with pkgs.stdenv.lib;
|
with pkgs.stdenv.lib;
|
||||||
let
|
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 {
|
src = pkgs.fetchurl {
|
||||||
url = "https://pypi.python.org/packages/source/e/execnet/${name}.tar.gz";
|
url = "mirror://pypi/r/readme_renderer/readme_renderer-${version}.tar.gz";
|
||||||
sha256 = "1rpk1vyclhg911p3hql0m0nrpq7q7mysxnaaw6vs29cpa6kx8vgn";
|
sha256 = "1kh9ggff8m9sdgr631vf2n4k97h4z1871vay6qgk3ydy3rd856ak";
|
||||||
};
|
|
||||||
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;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
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 {
|
devpi-web = pkgs.python3Packages.buildPythonPackage rec {
|
||||||
name = "devpi-web";
|
name = "devpi-web";
|
||||||
version = "3.0.0";
|
version = "3.1.1";
|
||||||
|
|
||||||
|
|
||||||
src = pkgs.fetchurl {
|
src = pkgs.fetchurl {
|
||||||
url = "https://pypi.python.org/packages/source/d/devpi-web/devpi-web-${version}.tar.gz";
|
url = "mirror://pypi/d/devpi-web/devpi-web-${version}.tar.gz";
|
||||||
sha256 = "156abxyhj17a8cg38hpyr31qkjb61mb2kggsxij4p4xvy9jwkbwi";
|
sha256 = "0bvqv52jmasfm4sdyccwsgvk9a663d3grj7zjw8r9x7xm7l3svqv";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with pkgs.python3Packages;
|
propagatedBuildInputs = with pkgs.python3Packages;
|
||||||
[ devpi-server pyramid_chameleon beautifulsoup4 Whoosh defusedxml ];
|
[ devpi-server pyramid_chameleon beautifulsoup4 defusedxml readme-renderer ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = https://bitbucket.org/hpk42/devpi;
|
homepage = https://bitbucket.org/hpk42/devpi;
|
||||||
@ -36,9 +46,29 @@ let
|
|||||||
maintainers = with maintainers; [ makefu ];
|
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 {
|
devpi-server = pkgs.python3Packages.buildPythonPackage rec {
|
||||||
name = "devpi-server";
|
name = "devpi-server";
|
||||||
version = "3.0.2";
|
version = "4.1.1";
|
||||||
|
|
||||||
# original postFixup adds "import sys; sys.argv[0] = 'devpi-server'" to
|
# original postFixup adds "import sys; sys.argv[0] = 'devpi-server'" to
|
||||||
# `.devpi-server-wrapped` which
|
# `.devpi-server-wrapped` which
|
||||||
@ -46,12 +76,12 @@ let
|
|||||||
postFixup = "";
|
postFixup = "";
|
||||||
|
|
||||||
src = pkgs.fetchurl {
|
src = pkgs.fetchurl {
|
||||||
url = "https://pypi.python.org/packages/source/d/devpi-server/devpi-server-${version}.tar.gz";
|
url = "mirror://pypi/d/devpi-server/devpi-server-${version}.tar.gz";
|
||||||
sha256 = "14r1024i3x2pb72khyzvi56sh9smpdswmrbc88xvjxnalmzfn99d";
|
sha256 = "1icbn1nw6w0sc5150fr69rlhs0j5ldnnxfzl2qabq2wi0dbar8hf";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with pkgs.python3Packages;
|
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 ];
|
buildInputs = with pkgs.python3Packages; [ pytest beautifulsoup4 webtest ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
@ -63,7 +93,7 @@ let
|
|||||||
};
|
};
|
||||||
|
|
||||||
in {
|
in {
|
||||||
inherit devpi-server;
|
inherit devpi-server devpi-client;
|
||||||
devpi-web = pkgs.python3.buildEnv.override {
|
devpi-web = pkgs.python3.buildEnv.override {
|
||||||
extraLibs = [ devpi-web devpi-server ];
|
extraLibs = [ devpi-web devpi-server ];
|
||||||
};
|
};
|
||||||
|
11
makefu/5pkgs/devpi/py3-fix-encoding.patch
Normal file
11
makefu/5pkgs/devpi/py3-fix-encoding.patch
Normal 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()]
|
@ -11,7 +11,7 @@ with config.krebs.lib;
|
|||||||
nixos-config.symlink = "stockholm/${user.name}/1systems/${host.name}.nix";
|
nixos-config.symlink = "stockholm/${user.name}/1systems/${host.name}.nix";
|
||||||
nixpkgs.git = {
|
nixpkgs.git = {
|
||||||
url = https://github.com/NixOS/nixpkgs;
|
url = https://github.com/NixOS/nixpkgs;
|
||||||
ref = "9cb194cfa449c43f63185a25c8d10307aea3b358"; # nixos-16.03 @ 2016-08-05
|
ref = "b8ede35d2efa96490857c22c751e75d600bea44f"; # nixos-16.09 @ 2016-10-19
|
||||||
};
|
};
|
||||||
secrets.file =
|
secrets.file =
|
||||||
if getEnv "dummy_secrets" == "true"
|
if getEnv "dummy_secrets" == "true"
|
||||||
@ -28,7 +28,7 @@ with config.krebs.lib;
|
|||||||
"http://cache.nixos.org"
|
"http://cache.nixos.org"
|
||||||
"http://hydra.nixos.org"
|
"http://hydra.nixos.org"
|
||||||
];
|
];
|
||||||
nix.useChroot = true;
|
nix.useSandbox = true;
|
||||||
|
|
||||||
nixpkgs.config.packageOverrides = pkgs: {
|
nixpkgs.config.packageOverrides = pkgs: {
|
||||||
nano = pkgs.vim;
|
nano = pkgs.vim;
|
||||||
|
@ -12,7 +12,7 @@ with config.krebs.lib;
|
|||||||
services.graphite = {
|
services.graphite = {
|
||||||
web = {
|
web = {
|
||||||
enable = true;
|
enable = true;
|
||||||
host = "0.0.0.0";
|
listenAddress = "0.0.0.0";
|
||||||
};
|
};
|
||||||
carbon = {
|
carbon = {
|
||||||
enableCache = true;
|
enableCache = true;
|
||||||
|
Loading…
Reference in New Issue
Block a user