From b3d8fb59e150268295741f458b50a4ff8fd29e93 Mon Sep 17 00:00:00 2001 From: kat witch Date: Sun, 21 Nov 2021 22:51:08 +0000 Subject: [PATCH] Flake lock updates, flake-cron exclude two hosts --- ci/flake-cron.nix | 3 ++- flake.lock | 20 ++++++++++---------- trusted/flake.lock | 6 +++--- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ci/flake-cron.nix b/ci/flake-cron.nix index 30d0cb63..62f7e89b 100644 --- a/ci/flake-cron.nix +++ b/ci/flake-cron.nix @@ -98,7 +98,8 @@ with lib; { targets = main.deploy.targets; enabledTargets = filterAttrs (_: v: v.enable) main.deploy.targets; enabledHosts = concatLists (mapAttrsToList (targetName: target: target.nodeNames) enabledTargets); - hostBuildString = concatMapStringsSep " && " (host: "nix build -Lf . network.nodes.${host}.deploy.system -o result-${host} && nix-collect-garbage -d") enabledHosts; + filteredHosts = subtractLists enabledHosts [ "daiyousei" "shinmyoumaru" ]; + hostBuildString = concatMapStringsSep " && " (host: "nix build -Lf . network.nodes.${host}.deploy.system -o result-${host} && nix-collect-garbage -d") filteredHosts; in '' # ${toString builtins.currentTime} diff --git a/flake.lock b/flake.lock index 526eda29..ba702ffc 100644 --- a/flake.lock +++ b/flake.lock @@ -262,11 +262,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1637481586, - "narHash": "sha256-cvgegmCRfNFuA/vPseMcSptmlNqD2nC0lLI9BQWU46A=", + "lastModified": 1637516270, + "narHash": "sha256-qTffAQ0kWA2qXMJUVMDsgXVbzMNI0BfR78vB/4QFA+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "1abd311eef125e7b64dff723f198d15e5aca2dd4", + "rev": "15ae861e1bfad90e0d14106551544e9e07cbcb10", "type": "github" }, "original": { @@ -385,11 +385,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1637523980, - "narHash": "sha256-nBbVQHJtR7a+Ctyo67aGc1lwUsoeMhK9PVTh6pB+aYk=", + "lastModified": 1637534296, + "narHash": "sha256-Z/kBY/Ckcl7ZKao/1RUrSGBCokCZVnB8aQPrzo8FMhs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4f871e232b8827b0b1d22bc40bc1b0dfa4473156", + "rev": "25e036ff5d2c9cd9382bbb1bbe0d929950c1449f", "type": "github" }, "original": { @@ -461,11 +461,11 @@ }, "nur": { "locked": { - "lastModified": 1637520800, - "narHash": "sha256-GjX0uYY/xQcPM8YBDVJgYNNp1plFWwzAQbzBwJ0HX5g=", + "lastModified": 1637526496, + "narHash": "sha256-kutOuCotz6YJlFJKbkLD22Z8eHjvVh0Z4llnBBMZbQE=", "owner": "nix-community", "repo": "nur", - "rev": "fc0758e2f8aa4dac7c4ab42860f07487b1dcadea", + "rev": "801de698dcd0f84a4498683254294562c1a5d5cb", "type": "github" }, "original": { @@ -642,7 +642,7 @@ "trusted": { "flake": false, "locked": { - "narHash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=", + "narHash": "sha256-Q3QXOoy+iN4VK2CflvRulYvPZXYgF0dO7FoF7CvWFTA=", "path": "./empty/.", "type": "path" }, diff --git a/trusted/flake.lock b/trusted/flake.lock index fff4f389..8dbc1640 100644 --- a/trusted/flake.lock +++ b/trusted/flake.lock @@ -404,12 +404,12 @@ ] }, "locked": { - "narHash": "sha256-Z68NMWdO7K2nPjE5bibyB6WNDtLsiSsJXq8KiHCrTdg=", - "path": "/nix/store/7vz35n7kdr2fidzxjywdp7k70g8agn7j-source", + "narHash": "sha256-9GUQrhglle3iQO1BqL3yp8Hkvl/ID51G5cpNDfd+VJM=", + "path": "/nix/store/6rbym2i4whsjcxnxcdc7srxym4a27kxa-source", "type": "path" }, "original": { - "path": "/nix/store/7vz35n7kdr2fidzxjywdp7k70g8agn7j-source", + "path": "/nix/store/6rbym2i4whsjcxnxcdc7srxym4a27kxa-source", "type": "path" } },