Merge branch 'master' of gum.krebsco.de:stockholm

This commit is contained in:
makefu 2016-02-11 17:07:20 +01:00
commit 46e2a3d94e

View File

@ -18,8 +18,8 @@
tinc = pkgs.tinc_pre; tinc = pkgs.tinc_pre;
}; };
krebs.build.source.nixpkgs = { krebs.build.source.upstream-nixpkgs = {
# url = https://github.com/nixos/nixpkgs; url = https://github.com/makefu/nixpkgs;
# HTTP Everywhere + libredir # HTTP Everywhere + libredir
rev = "8239ac6"; rev = "8239ac6";
}; };
@ -39,7 +39,6 @@
buildbot buildbot
buildbot-slave buildbot-slave
get get
genid
logstash logstash
]; ];