m 2 default:use stable branch
This commit is contained in:
parent
29cdc9994c
commit
e89a899c1a
|
@ -22,7 +22,7 @@ with config.krebs.lib;
|
||||||
source = mapAttrs (_: mkDefault) {
|
source = mapAttrs (_: mkDefault) {
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
url = https://github.com/nixos/nixpkgs;
|
url = https://github.com/nixos/nixpkgs;
|
||||||
rev = "40c586b7ce2c559374df435f46d673baf711c543"; # unstable @ 2016-02-27, tested on wry
|
rev = "63b9785"; # stable @ 2016-06-01
|
||||||
};
|
};
|
||||||
secrets = "/home/makefu/secrets/${config.krebs.build.host.name}/";
|
secrets = "/home/makefu/secrets/${config.krebs.build.host.name}/";
|
||||||
stockholm = "/home/makefu/stockholm";
|
stockholm = "/home/makefu/stockholm";
|
||||||
|
@ -75,7 +75,7 @@ with config.krebs.lib;
|
||||||
systemd.tmpfiles.rules = [
|
systemd.tmpfiles.rules = [
|
||||||
"d /tmp 1777 root root - -"
|
"d /tmp 1777 root root - -"
|
||||||
];
|
];
|
||||||
|
nix.nixPath = [ "/var/src" ];
|
||||||
environment.variables = {
|
environment.variables = {
|
||||||
NIX_PATH = mkForce "/var/src";
|
NIX_PATH = mkForce "/var/src";
|
||||||
EDITOR = mkForce "vim";
|
EDITOR = mkForce "vim";
|
||||||
|
@ -126,6 +126,7 @@ with config.krebs.lib;
|
||||||
nixpkgs.config.packageOverrides = pkgs: {
|
nixpkgs.config.packageOverrides = pkgs: {
|
||||||
nano = pkgs.runCommand "empty" {} "mkdir -p $out";
|
nano = pkgs.runCommand "empty" {} "mkdir -p $out";
|
||||||
tinc = pkgs.tinc_pre;
|
tinc = pkgs.tinc_pre;
|
||||||
|
gnupg1compat = super.gnupg1compat.override { gnupg = self.gnupg21; };
|
||||||
};
|
};
|
||||||
|
|
||||||
services.cron.enable = false;
|
services.cron.enable = false;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user