Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'gum/master'

Browse Source
This commit is contained in:
lassulus 2017-10-03 23:56:46 +02:00
commit a560d85999
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
makefu/1systems/cake/config.nix
View File

@ -1,20 +1,33 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ imports = [
<stockholm/makefu> <stockholm/makefu>
# configure your hw: # configure your hw:
# <stockholm/makefu/2configs/hw/CAC.nix> # <stockholm/makefu/2configs/save-diskspace.nix>
# <stockholm/makefu/2configs/fs/CAC-CentOS-7-64bit.nix> ];
# <stockholm/makefu/2configs/save-diskspace.nix krebs = {
]; enable = true;
krebs = { tinc.retiolum.enable = true;
enable = true; build.host = config.krebs.hosts.cake;
tinc.retiolum.enable = true; };
build.host = config.krebs.hosts.cake; boot.loader.grub.enable = false;
boot.loader.generic-extlinux-compatible.enable = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=tty0" ];
programs.info.enable = false;
programs.man.enable = false;
services.nixosManual.enable = false;
# File systems configuration for using the installer's partition layout
fileSystems = {
"/boot" = {
device = "/dev/disk/by-label/NIXOS_BOOT";
fsType = "vfat";
}; };
# You want to change these :) "/" = {
boot.loader.grub.device = "/dev/sda"; device = "/dev/disk/by-label/NIXOS_SD";
fileSystems."/" = { fsType = "ext4";
device = "/dev/sda1";
}; };
} };
}

3
makefu/source.nix
View File

@ -11,13 +11,14 @@ let
then "buildbot" then "buildbot"
else "makefu"; else "makefu";
_file = <stockholm> + "/makefu/1systems/${name}/source.nix"; _file = <stockholm> + "/makefu/1systems/${name}/source.nix";
ref = "46cfb36"; # unstable @ 2017-09-04 ref = "59e7765"; # unstable @ 2017-09-04
# + graceful requests2 (a772c3a) # + graceful requests2 (a772c3a)
# + mitmproxy fix (eee2d17) # + mitmproxy fix (eee2d17)
# + tpm-tools fix (5cb9987) # + tpm-tools fix (5cb9987)
# + dnscrypt-wrapper (25703c3) # + dnscrypt-wrapper (25703c3)
# + lass wvstream fix (76f4910,37cc2bc,0d48837) # + lass wvstream fix (76f4910,37cc2bc,0d48837)
# + ruby stuff (2f0b17e4be9,55a952be5b5) # + ruby stuff (2f0b17e4be9,55a952be5b5)
# + proot aarch64 fix (05d2603173d)
in in
evalSource (toString _file) [ evalSource (toString _file) [