bgpwtf: edge01: bump nixpkgs, use networkd
Change-Id: I038f9518e090aecc90f464475f29c5b3c1570eff
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1339
Reviewed-by: implr <implr@hackerspace.pl>
diff --git a/ops/machines.nix b/ops/machines.nix
index 5d09d74..bc808a6 100644
--- a/ops/machines.nix
+++ b/ops/machines.nix
@@ -42,24 +42,6 @@
];
};
- # edge01 still lives on an old nixpkgs checkout.
- #
- # TODO(b/3): unpin and deploy.
- nixpkgsBgpwtf = import (pkgs.fetchFromGitHub {
- owner = "nixos";
- repo = "nixpkgs-channels";
- rev = "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38";
- sha256 = "1ak7jqx94fjhc68xh1lh35kh3w3ndbadprrb762qgvcfb8351x8v";
- }) {};
-
- # customs.hackerspace.pl migration temporary checkout
- nixpkgsCustoms = import (pkgs.fetchFromGitHub {
- owner = "nixos";
- repo = "nixpkgs";
- rev = "d12178b1c4a6ef1232c8c677573ba9db204e66ff";
- sha256 = "0p7df7yzi35kblxr5ks0rxxp9cfh269g88xpj60sdhdjvfnn6cp7";
- }) {};
-
# mkMachine builds NixOS modules into a NixOS derivation.
# It:
# 1) injects passthru.hscloud.provision which deploys that configuration
@@ -144,7 +126,7 @@
"dcr01s22.hswaw.net" = mkClusterMachine self ../cluster/machines/dcr01s22.hswaw.net.nix;
"dcr01s24.hswaw.net" = mkClusterMachine self ../cluster/machines/dcr01s24.hswaw.net.nix;
- "edge01.waw.bgp.wtf" = mkMachine self nixpkgsBgpwtf [
+ "edge01.waw.bgp.wtf" = mkMachine self pkgs [
../bgpwtf/machines/edge01.waw.bgp.wtf.nix
../bgpwtf/machines/edge01.waw.bgp.wtf-hardware.nix
];