From a60aef0112db6081ac0230e38f512f0d10ae3e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Tue, 6 Jun 2023 06:39:48 +0100 Subject: [PATCH 1/8] update flake --- flake.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 2e2bea64..b3020886 100644 --- a/flake.lock +++ b/flake.lock @@ -868,11 +868,11 @@ ] }, "locked": { - "lastModified": 1685721552, - "narHash": "sha256-ifvq/zlO7lck8q+YkC5uom/h8/MVdMcQEldOL3cDQW0=", + "lastModified": 1685999310, + "narHash": "sha256-gaRMZhc7z4KeU/xS3IWv3kC+WhVcAXOLXXGKLe5zn1Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "29519461834c08395b35f840811faf8c23e3b61c", + "rev": "28614ed7a1e3ace824c122237bdc0e5e0b62c5c3", "type": "github" }, "original": { @@ -905,11 +905,11 @@ "hosts-list": { "flake": false, "locked": { - "lastModified": 1685762521, - "narHash": "sha256-MPBSGZes2bqjSi26cKjzZBs19QaPzroccW6PGVguuNE=", + "lastModified": 1685807388, + "narHash": "sha256-C1MO/kisCbAz7vN3uF1nW1v1PcmyyxxVgSi8/kghs24=", "owner": "StevenBlack", "repo": "hosts", - "rev": "cbadab339ba40f6da9b1638cd6789b81269ec291", + "rev": "7b45134c8d9e7104a200739e030aa5d8a467c6cb", "type": "github" }, "original": { @@ -1229,11 +1229,11 @@ ] }, "locked": { - "lastModified": 1685790655, - "narHash": "sha256-l42Iltftfg2OVEiP91BT4jVdbXDbO0OXddENlglCrrU=", + "lastModified": 1686029826, + "narHash": "sha256-y9M7LLERCxAj+O0ny+CxKOWxn7R2yGhWowvsdfu0sC4=", "ref": "main", - "rev": "b10293efa3a072e768bce5868368c9122f1a72ef", - "revCount": 886, + "rev": "8b0b0cdcdb1464b1efa9823f3157b0ceb2861917", + "revCount": 888, "type": "git", "url": "https://git.chir.rs/darkkirb/nix-packages.git" }, @@ -1556,11 +1556,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1685790686, - "narHash": "sha256-dpKdQ6L/86Kp5oq1NcjhSRGGzwATns1GiGZOf9mtwHE=", + "lastModified": 1686025136, + "narHash": "sha256-yd/Lr6RjjeyF7PpA+TpFT4E5LZeDyiMLVJUXIWxB4Rs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "182977d19e6817fcfbdae3cd9735085d5d5407f9", + "rev": "22467e240f390f029d6c745ce031f0ffbdc40916", "type": "github" }, "original": { @@ -1586,11 +1586,11 @@ }, "nur_2": { "locked": { - "lastModified": 1685791145, - "narHash": "sha256-QXxyI9k34ZhhpWpURwzq0Yum+KTXY1q+843DPJ0gS/0=", + "lastModified": 1686024569, + "narHash": "sha256-06lw0/zUjrFzS8O2OFrqnIJdY/VzpVIArZZagWOIWPA=", "owner": "nix-community", "repo": "NUR", - "rev": "eec5e7defd8ea2013dab8622e38d9e7b5d176bb7", + "rev": "2f7e5fb3fd20e4c17ea5a1a5a2710ca600c937e5", "type": "github" }, "original": { @@ -1661,11 +1661,11 @@ ] }, "locked": { - "lastModified": 1685759304, - "narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=", + "lastModified": 1686018793, + "narHash": "sha256-3w+6dmVbFg4wJqDMjGmy4Ki5GclJx4AhzSEfAwtu6Aw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c535b4f3327910c96dcf21851bbdd074d0760290", + "rev": "32b17eeafe550935bd5ca1afd1717dcefcb97653", "type": "github" }, "original": { @@ -1709,11 +1709,11 @@ ] }, "locked": { - "lastModified": 1685434555, - "narHash": "sha256-aZl0yeaYX3T2L3W3yXOd3S9OfpS+8YUOT2b1KwrSf6E=", + "lastModified": 1685848844, + "narHash": "sha256-Iury+/SVbAwLES76QJSiKFiQDzmf/8Hsq8j54WF2qyw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "876846cde9762ae563f018c17993354875e2538e", + "rev": "a522e12ee35e50fa7d902a164a9796e420e6e75b", "type": "github" }, "original": { From 73190d0502d5705928115612ef687ab6a9e36d7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Tue, 6 Jun 2023 08:04:06 +0100 Subject: [PATCH 2/8] slim win11 setup dir --- config/services/router.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/services/router.nix b/config/services/router.nix index d52569ce..90dfc234 100644 --- a/config/services/router.nix +++ b/config/services/router.nix @@ -38,7 +38,7 @@ installPhase = '' mkdir $out cd $out - 7z x ${win11Iso} boot efi sources/boot.wim + 7z x ${win11Iso} efi/microsoft/boot/bcd boot/fonts/segmono_boot.ttf boot/fonts/segoe_slboot.ttf boot/fonts/segoen_slboot.ttf boot/fonts/wgl4_boot.ttf boot/boot.sdi sources/boot.wim ln -sv ${installBat} install.bat ln -sv ${winpeshlIni} winpeshl.ini ''; From a81e3b1ab4b4b75d57068b5c6e6b64f019544761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Tue, 6 Jun 2023 09:58:12 +0100 Subject: [PATCH 3/8] downgrade nixpkgs for now --- config/nas.nix | 1 - flake.lock | 13 +++++++------ flake.nix | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/nas.nix b/config/nas.nix index 6c2571ab..3be6d2c3 100644 --- a/config/nas.nix +++ b/config/nas.nix @@ -60,7 +60,6 @@ extraOptions = ["--loadavg-target" "5.0"]; }; - boot.kernelPackages = lib.mkForce pkgs.linuxPackages_testing_bcachefs; boot.supportedFilesystems = lib.mkForce ["btrfs" "vfat"]; fileSystems."/" = { diff --git a/flake.lock b/flake.lock index b3020886..09ffbc22 100644 --- a/flake.lock +++ b/flake.lock @@ -1556,16 +1556,17 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1686025136, - "narHash": "sha256-yd/Lr6RjjeyF7PpA+TpFT4E5LZeDyiMLVJUXIWxB4Rs=", + "lastModified": 1684456152, + "narHash": "sha256-JePhOYXwG4yJJx6j6CyIAgkMY/A78RfS3JSplIDriAQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "22467e240f390f029d6c745ce031f0ffbdc40916", + "rev": "27dd33c02cd37d60384c6cddcc27509bd238443d", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", + "rev": "27dd33c02cd37d60384c6cddcc27509bd238443d", "type": "github" } }, @@ -1586,11 +1587,11 @@ }, "nur_2": { "locked": { - "lastModified": 1686024569, - "narHash": "sha256-06lw0/zUjrFzS8O2OFrqnIJdY/VzpVIArZZagWOIWPA=", + "lastModified": 1686041132, + "narHash": "sha256-VXNJIJ84Cekh8vq3VMbFEi+klxtmxKZZhRrOD+ArVL4=", "owner": "nix-community", "repo": "NUR", - "rev": "2f7e5fb3fd20e4c17ea5a1a5a2710ca600c937e5", + "rev": "a3725d8d93d7cd090351528c1fbd57ef624ae722", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 525e276c..4c3f24a1 100644 --- a/flake.nix +++ b/flake.nix @@ -80,7 +80,7 @@ rec { inputs.nixos-config-for-netboot.follows = "nixos-config-for-netboot"; }; nixos-hardware.url = "github:NixOS/nixos-hardware"; - nixpkgs.url = "github:NixOS/nixpkgs"; + nixpkgs.url = "github:NixOS/nixpkgs/27dd33c02cd37d60384c6cddcc27509bd238443d"; nixpkgs-for-crane.url = "github:NixOS/nixpkgs/3ae365afb80773c3bb67e52294a82e329a9e5be0"; nur.url = "github:nix-community/NUR"; rust-overlay = { From 790e62b55829ea46c0440d27b7013327652e6615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Tue, 6 Jun 2023 16:03:05 +0100 Subject: [PATCH 4/8] add util-linux patches to nas --- config/nas.nix | 21 +++++++++++++++++++++ flake.lock | 7 +++---- flake.nix | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/config/nas.nix b/config/nas.nix index 3be6d2c3..ac4f66e5 100644 --- a/config/nas.nix +++ b/config/nas.nix @@ -177,4 +177,25 @@ "/ip4/0.0.0.0/tcp/5001" "/ip6/::/tcp/5001" ]; # Only exposed over the tailed scale + + # Remove when https://nixpk.gs/pr-tracker.html?pr=235815 hits + nixpkgs.overlays = [ + (self: super: { + util-linux = super.util-linux.overrideAttrs (super: { + patches = + super.patches + ++ [ + # FIXME: backport bcache detection fixes, remove in next release + (fetchpatch { + url = "https://github.com/util-linux/util-linux/commit/158639a2a4c6e646fd4fa0acb5f4743e65daa415.diff"; + hash = "sha256-9F1OQFxKuI383u6MVy/UM15B6B+tkZFRwuDbgoZrWME="; + }) + (fetchpatch { + url = "https://github.com/util-linux/util-linux/commit/00a19fb8cdfeeae30a6688ac6b490e80371b2257.diff"; + hash = "sha256-w1S6IKSoL6JhVew9t6EemNRc/nrJQ5oMqFekcx0kno8="; + }) + ]; + }); + }) + ]; } diff --git a/flake.lock b/flake.lock index 09ffbc22..90e25fd6 100644 --- a/flake.lock +++ b/flake.lock @@ -1556,17 +1556,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1684456152, - "narHash": "sha256-JePhOYXwG4yJJx6j6CyIAgkMY/A78RfS3JSplIDriAQ=", + "lastModified": 1686060919, + "narHash": "sha256-qU21wGaaiDQYZ1Ya+oqaM+eavk9+QFdzUmPz2bZ8WSc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27dd33c02cd37d60384c6cddcc27509bd238443d", + "rev": "5c31944c1d468476f7827943dd636b34478db22b", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "27dd33c02cd37d60384c6cddcc27509bd238443d", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 4c3f24a1..525e276c 100644 --- a/flake.nix +++ b/flake.nix @@ -80,7 +80,7 @@ rec { inputs.nixos-config-for-netboot.follows = "nixos-config-for-netboot"; }; nixos-hardware.url = "github:NixOS/nixos-hardware"; - nixpkgs.url = "github:NixOS/nixpkgs/27dd33c02cd37d60384c6cddcc27509bd238443d"; + nixpkgs.url = "github:NixOS/nixpkgs"; nixpkgs-for-crane.url = "github:NixOS/nixpkgs/3ae365afb80773c3bb67e52294a82e329a9e5be0"; nur.url = "github:nix-community/NUR"; rust-overlay = { From da6dc9b8e2345b1f1ac9929471a481b5ee7d0d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Tue, 6 Jun 2023 19:27:51 +0100 Subject: [PATCH 5/8] update --- config/nas.nix | 4 ++-- config/programs/builders.nix | 7 +++++++ config/services/backup.nix | 4 ---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/config/nas.nix b/config/nas.nix index ac4f66e5..a830ded3 100644 --- a/config/nas.nix +++ b/config/nas.nix @@ -186,11 +186,11 @@ super.patches ++ [ # FIXME: backport bcache detection fixes, remove in next release - (fetchpatch { + (self.fetchpatch { url = "https://github.com/util-linux/util-linux/commit/158639a2a4c6e646fd4fa0acb5f4743e65daa415.diff"; hash = "sha256-9F1OQFxKuI383u6MVy/UM15B6B+tkZFRwuDbgoZrWME="; }) - (fetchpatch { + (self.fetchpatch { url = "https://github.com/util-linux/util-linux/commit/00a19fb8cdfeeae30a6688ac6b490e80371b2257.diff"; hash = "sha256-w1S6IKSoL6JhVew9t6EemNRc/nrJQ5oMqFekcx0kno8="; }) diff --git a/config/programs/builders.nix b/config/programs/builders.nix index 06d55f9a..a760b6ac 100644 --- a/config/programs/builders.nix +++ b/config/programs/builders.nix @@ -23,6 +23,13 @@ port = 22; user = "remote-build"; }; + "backup" = { + hostname = "backup.int.chir.rs"; + identitiesOnly = true; + identityFile = "${config.home.homeDirectory}/.ssh/builder_id_ed25519"; + port = 22; + user = "backup"; + }; }; }; } diff --git a/config/services/backup.nix b/config/services/backup.nix index d95de5cc..9ccffd44 100644 --- a/config/services/backup.nix +++ b/config/services/backup.nix @@ -75,10 +75,6 @@ in { home = "/backup"; isSystemUser = true; openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAN/rVZJuwiO44LwOqimpH4zyGehYUMF2ZhYFXUCkupP hydra-queue-runner@nas" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFuWXwZAQYnC2oso7In6BNNM3H+Ek7s6ygIuEvqE3YUf root@nutty-noon" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDpO0Lh7eOE/EBttb/XWZ6ISiJ0RkmBYfruq3U6linEz root@nixos-8gb-fsn1-1" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKB8oH1XbuGrKn/SeguXz96sw4AjJQQvZyAdpptotzOr root@thinkrac" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINN5Q/L2FyB3DIgdJRYnTGHW3naw5VQ9coOdwHYmv0aZ darkkirb@thinkrac" ]; group = "backup"; From faab66d514912a2968d32c50fe626efbbc437c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Wed, 7 Jun 2023 05:48:37 +0100 Subject: [PATCH 6/8] use some standard libraries --- config/nas.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/nas.nix b/config/nas.nix index a830ded3..0a8ecb73 100644 --- a/config/nas.nix +++ b/config/nas.nix @@ -1,9 +1,10 @@ { config, - pkgs, modulesPath, lib, nixos-hardware, + nixpkgs, + nix-packages, ... } @ args: { networking.hostName = "nas"; @@ -196,6 +197,8 @@ }) ]; }); + inherit (nixpkgs.legacyPackages.x86_64-linux) e2fsprogs openldap; + inherit (nix-packages.packages.x86_64-linux) hydra hydra-unstable; }) ]; } From 625754c72e9ea3c86bcdd24a06f8e670ab8396fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Thu, 8 Jun 2023 20:32:24 +0100 Subject: [PATCH 7/8] update --- config/services/hydra.nix | 1 - flake.lock | 56 +++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/config/services/hydra.nix b/config/services/hydra.nix index 153cbe03..14d34426 100644 --- a/config/services/hydra.nix +++ b/config/services/hydra.nix @@ -49,7 +49,6 @@ in { ]; services.hydra = { enable = true; - package = pkgs.hydra-unstable; hydraURL = "https://hydra.chir.rs/"; notificationSender = "hydra@chir.rs"; useSubstitutes = true; diff --git a/flake.lock b/flake.lock index 90e25fd6..2adf0bde 100644 --- a/flake.lock +++ b/flake.lock @@ -243,11 +243,11 @@ ] }, "locked": { - "lastModified": 1682020898, - "narHash": "sha256-XYSSFmqIjsvmgusWaOSD/WeaTyH8o83i+qma1BQgARU=", + "lastModified": 1686221213, + "narHash": "sha256-9Uc1jBc5a3EaOH80P6YPILL+GXlul7lEJIKAZ/BXELw=", "owner": "AgathaSorceress", "repo": "colorpickle", - "rev": "2574b83cb0454a146a0346bf0d6a134d62241e60", + "rev": "d1c210c494c0eaf69426ec411c2cf74c79b0129d", "type": "github" }, "original": { @@ -833,11 +833,11 @@ }, "haskell-flake": { "locked": { - "lastModified": 1685727978, - "narHash": "sha256-kSDetNgDoaIFO11vAyJXaO9Eh3iGhpZbve6AKib7ctw=", + "lastModified": 1686160859, + "narHash": "sha256-UE+0TQHyPxF8jhbLEeqvNQAy7B79bBix/rpFrf5nsn0=", "owner": "srid", "repo": "haskell-flake", - "rev": "1f0a5ee4f69b0740ad6eb93cd0b4fb4265f7f6b6", + "rev": "908a59167f78035a123ab71ed77af79bed519771", "type": "github" }, "original": { @@ -868,11 +868,11 @@ ] }, "locked": { - "lastModified": 1685999310, - "narHash": "sha256-gaRMZhc7z4KeU/xS3IWv3kC+WhVcAXOLXXGKLe5zn1Y=", + "lastModified": 1686241374, + "narHash": "sha256-fxlUjZx3VtQvNPTp/YX9uY//1UPbR3CBvUL3ajDRCyE=", "owner": "nix-community", "repo": "home-manager", - "rev": "28614ed7a1e3ace824c122237bdc0e5e0b62c5c3", + "rev": "f889ec0ec366e3ad8fb94e3afa7a31f3ee1da3b9", "type": "github" }, "original": { @@ -905,11 +905,11 @@ "hosts-list": { "flake": false, "locked": { - "lastModified": 1685807388, - "narHash": "sha256-C1MO/kisCbAz7vN3uF1nW1v1PcmyyxxVgSi8/kghs24=", + "lastModified": 1686096228, + "narHash": "sha256-DKj2lxgdfkrWR/hNuP4kzqdcSEsqOKP9Mo7hEBxHp/o=", "owner": "StevenBlack", "repo": "hosts", - "rev": "7b45134c8d9e7104a200739e030aa5d8a467c6cb", + "rev": "a7d1521e95aecc47fd807d7163858a94ef53327f", "type": "github" }, "original": { @@ -1229,11 +1229,11 @@ ] }, "locked": { - "lastModified": 1686029826, - "narHash": "sha256-y9M7LLERCxAj+O0ny+CxKOWxn7R2yGhWowvsdfu0sC4=", + "lastModified": 1686252637, + "narHash": "sha256-rEUPsD+vLN6BIlGjP7ExPe/p4yLQmv+Qqyb7g07hurQ=", "ref": "main", - "rev": "8b0b0cdcdb1464b1efa9823f3157b0ceb2861917", - "revCount": 888, + "rev": "ee940d333b34fff8a8d607c44f2ed5a4f2f77733", + "revCount": 890, "type": "git", "url": "https://git.chir.rs/darkkirb/nix-packages.git" }, @@ -1381,11 +1381,11 @@ }, "nixos-hardware_2": { "locked": { - "lastModified": 1684899633, - "narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=", + "lastModified": 1686217350, + "narHash": "sha256-Nb9b3m/GEK8jyFsYfUkXGsqj6rH05GgJ2QWcNNbK7dw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4cc688ee711159b9bcb5a367be44007934e1a49d", + "rev": "e4b34b90f27696ec3965fa15dcbacc351293dc67", "type": "github" }, "original": { @@ -1556,11 +1556,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1686060919, - "narHash": "sha256-qU21wGaaiDQYZ1Ya+oqaM+eavk9+QFdzUmPz2bZ8WSc=", + "lastModified": 1686250461, + "narHash": "sha256-ouMNBN3q4kk3lyP110mh4xmEgV2eq2dx29UL180QeLI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c31944c1d468476f7827943dd636b34478db22b", + "rev": "3a1e7765172c444c348dde552ab4fa549ef59b27", "type": "github" }, "original": { @@ -1586,11 +1586,11 @@ }, "nur_2": { "locked": { - "lastModified": 1686041132, - "narHash": "sha256-VXNJIJ84Cekh8vq3VMbFEi+klxtmxKZZhRrOD+ArVL4=", + "lastModified": 1686244012, + "narHash": "sha256-HZkIAxi2fEAB6yyBQ68Z704QW6dOXIFSgzL3JjL5qEE=", "owner": "nix-community", "repo": "NUR", - "rev": "a3725d8d93d7cd090351528c1fbd57ef624ae722", + "rev": "6b325c5e50e53d9e9dcfde08caee143cde7940b2", "type": "github" }, "original": { @@ -1661,11 +1661,11 @@ ] }, "locked": { - "lastModified": 1686018793, - "narHash": "sha256-3w+6dmVbFg4wJqDMjGmy4Ki5GclJx4AhzSEfAwtu6Aw=", + "lastModified": 1686191569, + "narHash": "sha256-8ey5FOXNms9piFGTn6vJeAQmSKk+NL7GTMSoVttsNTs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "32b17eeafe550935bd5ca1afd1717dcefcb97653", + "rev": "b4b71458b92294e8f1c3a112d972e3cff8a2ab71", "type": "github" }, "original": { From 6666713f29f4ef9f1b8853779e08a68b8460e7e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Fri, 9 Jun 2023 06:51:39 +0100 Subject: [PATCH 8/8] =?UTF-8?q?fix=20hydra=E2=80=A6=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/nas.nix | 8 +++++++- config/services/hydra.nix | 1 + flake.lock | 8 ++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/config/nas.nix b/config/nas.nix index 0a8ecb73..c7c1d2ca 100644 --- a/config/nas.nix +++ b/config/nas.nix @@ -198,7 +198,13 @@ ]; }); inherit (nixpkgs.legacyPackages.x86_64-linux) e2fsprogs openldap; - inherit (nix-packages.packages.x86_64-linux) hydra hydra-unstable; + hydra-unstable = nix-packages.packages.x86_64-linux.hydra-unstable.overrideAttrs (super: { + doCheck = false; + doInstallCheck = false; + checkPhase = "true"; + installCheckPhase = "true"; + }); + hydra = self.hydra-unstable; }) ]; } diff --git a/config/services/hydra.nix b/config/services/hydra.nix index 14d34426..153cbe03 100644 --- a/config/services/hydra.nix +++ b/config/services/hydra.nix @@ -49,6 +49,7 @@ in { ]; services.hydra = { enable = true; + package = pkgs.hydra-unstable; hydraURL = "https://hydra.chir.rs/"; notificationSender = "hydra@chir.rs"; useSubstitutes = true; diff --git a/flake.lock b/flake.lock index 2adf0bde..39652f20 100644 --- a/flake.lock +++ b/flake.lock @@ -1229,11 +1229,11 @@ ] }, "locked": { - "lastModified": 1686252637, - "narHash": "sha256-rEUPsD+vLN6BIlGjP7ExPe/p4yLQmv+Qqyb7g07hurQ=", + "lastModified": 1686293339, + "narHash": "sha256-E3A9WXX8MLBLzk3bAmUK8uDSr9ctcOEaMMoKtBWMxpc=", "ref": "main", - "rev": "ee940d333b34fff8a8d607c44f2ed5a4f2f77733", - "revCount": 890, + "rev": "0a59fc8f2942bb2909781a5396336485b4ba6e70", + "revCount": 892, "type": "git", "url": "https://git.chir.rs/darkkirb/nix-packages.git" },