diff --git a/config/nas.nix b/config/nas.nix index 4d8d6cb3..e206f10d 100644 --- a/config/nas.nix +++ b/config/nas.nix @@ -114,8 +114,6 @@ "powerpc-linux" "powerpc64-linux" "powerpc64le-linux" - "riscv32-linux" - "riscv64-linux" "wasm32-wasi" ]; hardware.enableRedistributableFirmware = true; diff --git a/config/nix.nix b/config/nix.nix index 82218728..ff1743ec 100644 --- a/config/nix.nix +++ b/config/nix.nix @@ -68,8 +68,6 @@ in { "powerpc-linux" "powerpc64-linux" "powerpc64le-linux" - "riscv32-linux" - "riscv64-linux" "wasm32-wasi" "x86_64-linux" "i686-linux" @@ -87,8 +85,6 @@ in { "powerpc-linux" "powerpc64-linux" "powerpc64le-linux" - "riscv32-linux" - "riscv64-linux" "wasm32-wasi" "x86_64-linux" "i686-linux" diff --git a/config/nutty-noon.nix b/config/nutty-noon.nix index 0d1d1ad2..6860736f 100644 --- a/config/nutty-noon.nix +++ b/config/nutty-noon.nix @@ -65,12 +65,9 @@ nix.settings.cores = 16; boot.binfmt.emulatedSystems = [ "armv7l-linux" - "aarch64-linux" "powerpc-linux" "powerpc64-linux" "powerpc64le-linux" - "riscv32-linux" - "riscv64-linux" "wasm32-wasi" ]; hardware.enableRedistributableFirmware = true; diff --git a/config/services/hydra.nix b/config/services/hydra.nix index 5b6d8373..d424c957 100644 --- a/config/services/hydra.nix +++ b/config/services/hydra.nix @@ -7,7 +7,7 @@ ... }: let machines = pkgs.writeText "machines" '' - localhost armv7l-linux,powerpc-linux,powerpc64-linux,powerpc64le-linux,riscv32-linux,riscv64-linux,wasm32-wasi,x86_64-linux,i686-linux - 12 1 kvm,nixos-test,big-parallel,benchmark,gccarch-znver1,gccarch-skylake,ca-derivations - + localhost armv7l-linux,powerpc-linux,powerpc64-linux,powerpc64le-linux,wasm32-wasi,x86_64-linux,i686-linux - 12 1 kvm,nixos-test,big-parallel,benchmark,gccarch-znver1,gccarch-skylake,ca-derivations - build-aarch64 aarch64-linux - 4 1 nixos-test,benchmark,ca-derivations,gccarch-armv8-a,gccarch-armv8.1-a,gccarch-armv8.2-a,big-parallel - build-riscv riscv-linux - 4 1 nixos-test,benchmark,ca-derivations,big-parallel - ''; @@ -120,7 +120,7 @@ in { }; script = '' if ${pkgs.iputils}/bin/ping -c 1 nutty-noon.int.chir.rs; then - echo "build-pc armv7l-linux,powerpc-linux,powerpc64-linux,powerpc64le-linux,riscv32-linux,riscv64-linux,wasm32-wasi,x86_64-linux,i686-linux - 16 2 kvm,nixos-test,big-parallel,benchmark,gccarch-znver2,gccarch-znver1,gccarch-skylake,ca-derivations -" > /run/hydra-machines + echo "build-pc armv7l-linux,powerpc-linux,powerpc64-linux,powerpc64le-linux,wasm32-wasi,x86_64-linux,i686-linux - 16 2 kvm,nixos-test,big-parallel,benchmark,gccarch-znver2,gccarch-znver1,gccarch-skylake,ca-derivations -" > /run/hydra-machines else rm -f /run/hydra-machines fi diff --git a/zones/int.chir.rs.nix b/zones/int.chir.rs.nix index 978f4e97..5b1db0e4 100644 --- a/zones/int.chir.rs.nix +++ b/zones/int.chir.rs.nix @@ -15,7 +15,7 @@ in { SOA = { nameServer = "ns1.chir.rs."; adminEmail = "lotte@chir.rs"; - serial = 24; + serial = 25; }; NS = [ "ns1.chir.rs." @@ -277,6 +277,12 @@ in { (ttl zoneTTL (aaaa "fd7a:115c:a1e0:ab12:4843:cd96:6263:ad6b")) ]; }; + vf2 = { + A = [(ttl zoneTTL (a "100.90.87.132"))]; + AAAA = [ + (ttl zoneTTL (aaaa "fd7a:115c:a1e0:ab12:4843:cd96:625a:5784")) + ]; + }; grafana.CNAME = [(ttl zoneTTL (cname "nixos-8gb-fsn1-1"))]; minio.CNAME = [(ttl zoneTTL (cname "nixos-8gb-fsn1-1"))];