Merge remote-tracking branch 'prism/master'

3 files changed, 26 insertions, 11 deletions

diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index bd17c3765..5dde50ea4 100644
--- a/krebs/3modules/buildbot/master.nix
+++ b/krebs/3modules/buildbot/master.nix
@@ -3,15 +3,8 @@
 with config.krebs.lib;
 let
 
-  # https://github.com/NixOS/nixpkgs/issues/14026
-  nixpkgs-fix = import (pkgs.fetchgit {
-    url = https://github.com/nixos/nixpkgs;
-    rev = "e026b5c243ea39810826e68362718f5d703fb5d0";
-    sha256 = "87e0724910a6df0371f883f99a8cf42e366fb4119f676f6f74ffb404beca2632";
-  }) {};
-
-  buildbot = nixpkgs-fix.buildbot;
-  buildbot-master-config = pkgs.writeText "buildbot-master.cfg" ''
+  buildbot = pkgs.buildbot;
+  buildbot-master-config = pkgs.writePython2 "buildbot-master.cfg" ''
     # -*- python -*-
     from buildbot.plugins import *
     import re
diff --git a/krebs/5pkgs/apt-cacher-ng/default.nix b/krebs/5pkgs/apt-cacher-ng/default.nix
index abf8d677a..53736dcfb 100644
--- a/krebs/5pkgs/apt-cacher-ng/default.nix
+++ b/krebs/5pkgs/apt-cacher-ng/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "apt-cacher-ng-${version}";
-  version = "0.9.3";
+  version = "0.9.3.2";
 
   src = fetchurl {
     url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz";
-    sha256 = "1bd7l1wg0q1p9pg0v6lqflf2znydx8mrh2jxbvv6xsrp1473nfwg";
+    sha256 = "1bvng9mwrggvc93q2alj0x72i56wifnjs2dsycr17mapsv0f2gnc";
   };
 
   NIX_LDFLAGS = "-lpthread";
diff --git a/krebs/5pkgs/builders.nix b/krebs/5pkgs/builders.nix
index 4c087bc44..841543819 100644
--- a/krebs/5pkgs/builders.nix
+++ b/krebs/5pkgs/builders.nix
@@ -253,5 +253,27 @@ rec {
       ${pkgs.cabal2nix}/bin/cabal2nix ${path} > $out
     '');
 
+  writePython2 = name: src: pkgs.runCommand name {} /* sh */ ''
+    name=${assert types.filename.check name; name}
+    src=${shell.escape src}
+
+    # syntax check
+    printf '%s' "$src" > src.py
+    ${pkgs.python2}/bin/python -m py_compile src.py
+
+    cp src.py "$out"
+  '';
+
+  writePython3 = name: src: pkgs.runCommand name {} /* sh */ ''
+    name=${assert types.filename.check name; name}
+    src=${shell.escape src}
+
+    # syntax check
+    printf '%s' "$src" > src.py
+    ${pkgs.python3}/bin/python -m py_compile src.py
+
+    cp src.py "$out"
+  '';
+
   writeSed = makeScriptWriter "${pkgs.gnused}/bin/sed -f";
 }