Merge remote-tracking branch 'gum/master'
This commit is contained in:
commit
2d5faaa693
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "apt-cacher-ng-${version}";
|
name = "apt-cacher-ng-${version}";
|
||||||
version = "0.8.8";
|
version = "0.9.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz";
|
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";
|
NIX_LDFLAGS = "-lpthread";
|
||||||
|
5
makefu/2configs/hw/rtl8812au.nix
Normal file
5
makefu/2configs/hw/rtl8812au.nix
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{pkgs, config, ... }:
|
||||||
|
{
|
||||||
|
boot.extraModulePackages = [ config.boot.kernelPackages.rtl8812au ];
|
||||||
|
boot.kernelModules = [ "rtl8812au" ];
|
||||||
|
}
|
@ -10,7 +10,7 @@ with config.krebs.lib;
|
|||||||
krebs.build.source = {
|
krebs.build.source = {
|
||||||
nixpkgs = mkDefault {
|
nixpkgs = mkDefault {
|
||||||
url = https://github.com/NixOS/nixpkgs;
|
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}";
|
secrets = mkDefault "${getEnv "HOME"}/secrets/krebs/${config.krebs.build.host.name}";
|
||||||
stockholm = mkDefault "${getEnv "HOME"}/stockholm";
|
stockholm = mkDefault "${getEnv "HOME"}/stockholm";
|
||||||
|
@ -32,7 +32,11 @@
|
|||||||
force-scheduler = ''
|
force-scheduler = ''
|
||||||
sched.append(schedulers.ForceScheduler(
|
sched.append(schedulers.ForceScheduler(
|
||||||
name="force",
|
name="force",
|
||||||
builderNames=["full-tests","fast-tests","build-local"]))
|
builderNames=[
|
||||||
|
# "full-tests",
|
||||||
|
"fast-tests",
|
||||||
|
"build-local"
|
||||||
|
]))
|
||||||
'';
|
'';
|
||||||
fast-tests-scheduler = ''
|
fast-tests-scheduler = ''
|
||||||
# test everything real quick
|
# test everything real quick
|
||||||
@ -57,7 +61,10 @@
|
|||||||
fileIsImportant=shared_files,
|
fileIsImportant=shared_files,
|
||||||
treeStableTimer=60*60, # master was stable for the last hour
|
treeStableTimer=60*60, # master was stable for the last hour
|
||||||
name="full-master",
|
name="full-master",
|
||||||
builderNames=["full-tests","build-local"]))
|
builderNames=[
|
||||||
|
# "full-tests",
|
||||||
|
"build-local"
|
||||||
|
]))
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
builder_pre = ''
|
builder_pre = ''
|
||||||
@ -135,24 +142,24 @@
|
|||||||
slavenames=slavenames,
|
slavenames=slavenames,
|
||||||
factory=f))
|
factory=f))
|
||||||
'';
|
'';
|
||||||
slow-tests = ''
|
# slow-tests = ''
|
||||||
s = util.BuildFactory()
|
# s = util.BuildFactory()
|
||||||
s.addStep(grab_repo)
|
# s.addStep(grab_repo)
|
||||||
|
#
|
||||||
# slave needs 2 files:
|
# # slave needs 2 files:
|
||||||
# * cac.json
|
# # * cac.json
|
||||||
# * retiolum
|
# # * 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}/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"))
|
# 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,
|
# addShell(s, name="infest-cac-centos7",env=env,
|
||||||
sigtermTime=60, # SIGTERM 1 minute before SIGKILL
|
# sigtermTime=60, # SIGTERM 1 minute before SIGKILL
|
||||||
timeout=10800, # 3h
|
# timeout=10800, # 3h
|
||||||
command=nixshell + ["infest-cac-centos7"])
|
# command=nixshell + ["infest-cac-centos7"])
|
||||||
|
#
|
||||||
bu.append(util.BuilderConfig(name="full-tests",
|
# bu.append(util.BuilderConfig(name="full-tests",
|
||||||
slavenames=slavenames,
|
# slavenames=slavenames,
|
||||||
factory=s))
|
# factory=s))
|
||||||
'';
|
# '';
|
||||||
};
|
};
|
||||||
enable = true;
|
enable = true;
|
||||||
web = {
|
web = {
|
||||||
|
Loading…
Reference in New Issue
Block a user