From 185c5644dcdd33d24ce7fe41fdf704e8e66a8784 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 19 Oct 2016 15:40:46 +0200 Subject: [PATCH 1/4] m 5 default: remove cups fallback --- makefu/5pkgs/default.nix | 7 ------- 1 file changed, 7 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";}; From 8fe9262b5f56052c8376f601ae1fd0bef9c079e3 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 19 Oct 2016 18:33:42 +0200 Subject: [PATCH 2/4] s 2: fix obsolete option --- shared/2configs/default.nix | 4 ++-- shared/2configs/graphite.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/shared/2configs/default.nix b/shared/2configs/default.nix index 31f786d1d..f5377db94 100644 --- a/shared/2configs/default.nix +++ b/shared/2configs/default.nix @@ -11,7 +11,7 @@ with config.krebs.lib; nixos-config.symlink = "stockholm/${user.name}/1systems/${host.name}.nix"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "9cb194cfa449c43f63185a25c8d10307aea3b358"; # nixos-16.03 @ 2016-08-05 + ref = "b8ede35d2efa96490857c22c751e75d600bea44f"; # nixos-16.09 @ 2016-10-19 }; secrets.file = if getEnv "dummy_secrets" == "true" @@ -28,7 +28,7 @@ with config.krebs.lib; "http://cache.nixos.org" "http://hydra.nixos.org" ]; - nix.useChroot = true; + nix.useSandbox = true; nixpkgs.config.packageOverrides = pkgs: { nano = pkgs.vim; diff --git a/shared/2configs/graphite.nix b/shared/2configs/graphite.nix index 37c6b09fd..bfa2b2966 100644 --- a/shared/2configs/graphite.nix +++ b/shared/2configs/graphite.nix @@ -12,7 +12,7 @@ with config.krebs.lib; services.graphite = { web = { enable = true; - host = "0.0.0.0"; + listenAddress = "0.0.0.0"; }; carbon = { enableCache = true; From 6cdb8d86893679a6eb32669f796f2cab9acb8bba Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 19 Oct 2016 20:46:54 +0200 Subject: [PATCH 3/4] m 5 devpi: bump --- makefu/5pkgs/devpi/default.nix | 72 ++++++++++++++++------- makefu/5pkgs/devpi/py3-fix-encoding.patch | 11 ++++ 2 files changed, 62 insertions(+), 21 deletions(-) create mode 100644 makefu/5pkgs/devpi/py3-fix-encoding.patch 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 {} }: 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"; + url = "mirror://pypi/r/readme_renderer/readme_renderer-${version}.tar.gz"; + 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 { 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()] From b6fc3af1430e318f781a417e0d7366e1013c0c44 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 19 Oct 2016 21:53:18 +0200 Subject: [PATCH 4/4] m 2 default: bump ref to stable --- makefu/2configs/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index a7c2a983e..56a87d7af 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -21,10 +21,13 @@ with config.krebs.lib; search-domain = "retiolum"; build = { 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 - { # stable @ 2016-07-20 - git = { url = https://github.com/nixos/nixpkgs; ref = "125ffff"; }; + { + git = { url = https://github.com/nixos/nixpkgs; inherit ref; }; } else # 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: ## 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 = if getEnv "dummy_secrets" == "true" then toString