summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-06-08 11:11:41 +0200
committertv <tv@krebsco.de>2016-06-08 11:11:41 +0200
commit276bbe725f5d0321b8f4557917a6913b5945df7a (patch)
tree3dc1266f587c0f01172924fed89cdce8a810607a
parentb419d6cd365cda3202dcce5925bd99e973ba535e (diff)
parent49ac020be07a85bf27fd78160a5b265b131e126e (diff)
Merge remote-tracking branch 'gum/master'
-rw-r--r--krebs/5pkgs/apt-cacher-ng/default.nix4
-rw-r--r--makefu/2configs/hw/rtl8812au.nix5
-rw-r--r--shared/2configs/base.nix2
-rw-r--r--shared/2configs/shared-buildbot.nix47
4 files changed, 35 insertions, 23 deletions
diff --git a/krebs/5pkgs/apt-cacher-ng/default.nix b/krebs/5pkgs/apt-cacher-ng/default.nix
index f71d17c54..abf8d677a 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.8.8";
+ version = "0.9.3";
src = fetchurl {
url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz";
- sha256 = "0n7yy4h8g7j0g94xngbywmfhrkg9xl3j2c4wzrjknfwvxmqgjivq";
+ sha256 = "1bd7l1wg0q1p9pg0v6lqflf2znydx8mrh2jxbvv6xsrp1473nfwg";
};
NIX_LDFLAGS = "-lpthread";
diff --git a/makefu/2configs/hw/rtl8812au.nix b/makefu/2configs/hw/rtl8812au.nix
new file mode 100644
index 000000000..0c10f2555
--- /dev/null
+++ b/makefu/2configs/hw/rtl8812au.nix
@@ -0,0 +1,5 @@
+{pkgs, config, ... }:
+{
+ boot.extraModulePackages = [ config.boot.kernelPackages.rtl8812au ];
+ boot.kernelModules = [ "rtl8812au" ];
+}
diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index 7cabbd347..bbb089c2c 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -10,7 +10,7 @@ with config.krebs.lib;
krebs.build.source = {
nixpkgs = mkDefault {
url = https://github.com/NixOS/nixpkgs;
- rev = "40c586b7ce2c559374df435f46d673baf711c543";
+ rev = "63b9785"; # stable @ 2016-06-01
};
secrets = mkDefault "${getEnv "HOME"}/secrets/krebs/${config.krebs.build.host.name}";
stockholm = mkDefault "${getEnv "HOME"}/stockholm";
diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix
index 9804580db..5f3b35304 100644
--- a/shared/2configs/shared-buildbot.nix
+++ b/shared/2configs/shared-buildbot.nix
@@ -32,7 +32,11 @@
force-scheduler = ''
sched.append(schedulers.ForceScheduler(
name="force",
- builderNames=["full-tests","fast-tests","build-local"]))
+ builderNames=[
+ # "full-tests",
+ "fast-tests",
+ "build-local"
+ ]))
'';
fast-tests-scheduler = ''
# test everything real quick
@@ -57,7 +61,10 @@
fileIsImportant=shared_files,
treeStableTimer=60*60, # master was stable for the last hour
name="full-master",
- builderNames=["full-tests","build-local"]))
+ builderNames=[
+ # "full-tests",
+ "build-local"
+ ]))
'';
};
builder_pre = ''
@@ -135,24 +142,24 @@
slavenames=slavenames,
factory=f))
'';
- slow-tests = ''
- s = util.BuildFactory()
- s.addStep(grab_repo)
-
- # slave needs 2 files:
- # * cac.json
- # * retiolum
- s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/cac.json", slavedest="cac.json"))
- s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/retiolum-ci.rsa_key.priv", slavedest="retiolum.rsa_key.priv"))
- addShell(s, name="infest-cac-centos7",env=env,
- sigtermTime=60, # SIGTERM 1 minute before SIGKILL
- timeout=10800, # 3h
- command=nixshell + ["infest-cac-centos7"])
-
- bu.append(util.BuilderConfig(name="full-tests",
- slavenames=slavenames,
- factory=s))
- '';
+# slow-tests = ''
+# s = util.BuildFactory()
+# s.addStep(grab_repo)
+#
+# # slave needs 2 files:
+# # * cac.json
+# # * retiolum
+# s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/cac.json", slavedest="cac.json"))
+# s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/retiolum-ci.rsa_key.priv", slavedest="retiolum.rsa_key.priv"))
+# addShell(s, name="infest-cac-centos7",env=env,
+# sigtermTime=60, # SIGTERM 1 minute before SIGKILL
+# timeout=10800, # 3h
+# command=nixshell + ["infest-cac-centos7"])
+#
+# bu.append(util.BuilderConfig(name="full-tests",
+# slavenames=slavenames,
+# factory=s))
+# '';
};
enable = true;
web = {