diff options
| author | lassulus <lassulus@lassul.us> | 2017-11-10 22:34:50 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-11-10 22:34:50 +0100 |
| commit | 4c083777ddf71f7cbd12a1b094aa50e18ab89d2d (patch) | |
| tree | 7595238893e6dddb68b32f14ddda7c823a576945 /makefu | |
| parent | bc1dbd6d0ab121682c67dae85711ccab027401ae (diff) | |
| parent | 886bd92d8b7620454ab2e701e1c1c1d20cf73b6d (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/1systems/gum/config.nix | 15 | ||||
| -rw-r--r-- | makefu/5pkgs/default.nix | 5 | ||||
| -rw-r--r-- | makefu/source.nix | 9 |
3 files changed, 21 insertions, 8 deletions
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index e769b1e22..667804bf0 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -2,16 +2,22 @@ with import <stockholm/lib>; let - external-mac = "3a:66:48:8e:82:b2"; + # hw-specific + external-mac = "2a:c5:6e:d2:fc:7f"; + main-disk = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-0"; + external-gw = "185.194.140.1"; + # single partition, label "nixos" + # cd /var/src; curl https://github.com/nixos/nixpkgs/tarball/809cf38 -L | tar zx ; mv * nixpkgs && touch .populate + + + # static external-ip = config.krebs.build.host.nets.internet.ip4.addr; external-ip6 = config.krebs.build.host.nets.internet.ip6.addr; - external-gw = "188.68.40.1"; external-gw6 = "fe80::1"; external-netmask = 22; external-netmask6 = 64; - ext-if = "et0"; # gets renamed on the fly internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr; - main-disk = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-0"; + ext-if = "et0"; # gets renamed on the fly in { imports = [ <stockholm/makefu> @@ -19,6 +25,7 @@ in { <stockholm/makefu/2configs/headless.nix> <stockholm/makefu/2configs/fs/single-partition-ext4.nix> # <stockholm/makefu/2configs/smart-monitor.nix> + <stockholm/makefu/2configs/git/cgit-retiolum.nix> <stockholm/makefu/2configs/backup.nix> # <stockholm/makefu/2configs/mattermost-docker.nix> diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index e99aa696b..80a453ddc 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -31,7 +31,10 @@ in { }); pwqgen-ger = callPackage <stockholm/krebs/5pkgs/simple/passwdqc-utils> { wordset-file = super.pkgs.fetchurl { - url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ; + urls = [ + https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c + https://archive.org/download/nixos-stockholm-tarballs/pviar5j1gxiqcf3l34b4n2pil06xc8zf-wordset_4k.c + ]; sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb"; }; }; diff --git a/makefu/source.nix b/makefu/source.nix index 8c880a8e2..992e4070b 100644 --- a/makefu/source.nix +++ b/makefu/source.nix @@ -11,9 +11,12 @@ let then "buildbot" else "makefu"; _file = <stockholm> + "/makefu/1systems/${name}/source.nix"; - ref = "809cf38"; # unstable @ 2017-10-07 - # + ruby stuff (2f0b17e4be9,55a952be5b5) - # + mitmproxy fix (360a5efd,ef52c95b) + ref = "e3d14bb"; # unstable @ 2017-11-02 + # + ruby stuff: 2f0b17e4be9 55a952be5b5 + # + jsbeautifier: c60bee3 + # + mitmproxy fix: a0f7cedfae31 + # + synergy fix: 5e6c76bc1 + # + snapraid fix: e3d14bb1 in evalSource (toString _file) [ |