From 71a720db2c79c3e9b7aeacb12274b3a9533c6f1a Mon Sep 17 00:00:00 2001 From: Peter Esselius Date: Sun, 14 Jul 2024 22:56:15 +0200 Subject: [PATCH 01/12] magic nix cache --- .github/workflows/ci.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/workflows/ci.yaml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 0000000..cb98abd --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,15 @@ +name: CI +on: + pull_request: + push: + branches: + - main +jobs: + gen-matrix: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: DeterminateSystems/nix-installer-action@main + - uses: DeterminateSystems/magic-nix-cache-action@main + + - run: nix --extra-experimental-features 'flakes nix-command' path-info --derivation .#nixosConfigurations.adama.config.system.build.toplevel From 16434de5f61453f8a6690ec3c07033631ac912fe Mon Sep 17 00:00:00 2001 From: Peter Esselius Date: Sun, 14 Jul 2024 23:07:50 +0200 Subject: [PATCH 02/12] cache-nix-action --- .github/workflows/ci.yaml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index cb98abd..4c811f2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,6 +10,15 @@ jobs: steps: - uses: actions/checkout@v4 - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main - - run: nix --extra-experimental-features 'flakes nix-command' path-info --derivation .#nixosConfigurations.adama.config.system.build.toplevel + - uses: nix-community/cache-nix-action@v5 + with: + primary-key: nix-${{ runner.os }}-${{ hashFiles('**/*.nix') }} + restore-prefixes-first-match: nix-${{ runner.os }}- + nix: true + paths: | + /nix/store + ~/.cache/nix + ~root/.cache/nix + + - run: nix --accept-flake-config --extra-experimental-features 'flakes nix-command' path-info --derivation .#nixosConfigurations.adama.config.system.build.toplevel From 6386b273223b65b5ba8a4e24704633ef0a9869b8 Mon Sep 17 00:00:00 2001 From: Peter Esselius Date: Sun, 14 Jul 2024 23:15:13 +0200 Subject: [PATCH 03/12] cache-nix-action2 --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4c811f2..0777136 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,7 +15,6 @@ jobs: with: primary-key: nix-${{ runner.os }}-${{ hashFiles('**/*.nix') }} restore-prefixes-first-match: nix-${{ runner.os }}- - nix: true paths: | /nix/store ~/.cache/nix From 5c0209c8f86e49809c513fb99b11f2e8fb30d944 Mon Sep 17 00:00:00 2001 From: Peter Esselius Date: Sun, 14 Jul 2024 23:21:52 +0200 Subject: [PATCH 04/12] nix-quick-install-action --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0777136..6330472 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: DeterminateSystems/nix-installer-action@main + - uses: nixbuild/nix-quick-install-action@v28 - uses: nix-community/cache-nix-action@v5 with: From de4ed6a3c0e5f246e0aa2fae8ba15f32b920dae5 Mon Sep 17 00:00:00 2001 From: Peter Esselius Date: Sun, 14 Jul 2024 23:53:10 +0200 Subject: [PATCH 05/12] cain --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6330472..4d05441 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,11 +13,11 @@ jobs: - uses: nix-community/cache-nix-action@v5 with: - primary-key: nix-${{ runner.os }}-${{ hashFiles('**/*.nix') }} - restore-prefixes-first-match: nix-${{ runner.os }}- + primary-key: nix-cain-${{ runner.os }}-${{ hashFiles('**/*.nix') }} + restore-prefixes-first-match: nix-cain-${{ runner.os }}- paths: | /nix/store ~/.cache/nix ~root/.cache/nix - - run: nix --accept-flake-config --extra-experimental-features 'flakes nix-command' path-info --derivation .#nixosConfigurations.adama.config.system.build.toplevel + - run: nix --accept-flake-config --extra-experimental-features 'flakes nix-command' path-info --derivation .#nixosConfigurations.cain.config.system.build.toplevel From 3f6b74256920c4c59af539bc1583fa69640999f5 Mon Sep 17 00:00:00 2001 From: Peter Esselius Date: Mon, 15 Jul 2024 10:54:49 +0200 Subject: [PATCH 06/12] adama --- .github/workflows/ci.yaml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4d05441..40462f3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -5,7 +5,24 @@ on: branches: - main jobs: - gen-matrix: + adama: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: nixbuild/nix-quick-install-action@v28 + + - uses: nix-community/cache-nix-action@v5 + with: + primary-key: nix-adama-${{ runner.os }}-${{ hashFiles('**/*.nix') }} + restore-prefixes-first-match: nix-adama-${{ runner.os }}- + paths: | + /nix/store + ~/.cache/nix + ~root/.cache/nix + + - run: nix --accept-flake-config --extra-experimental-features 'flakes nix-command' path-info --derivation .#nixosConfigurations.adama.config.system.build.toplevel + + cain: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From 02559e892a8d4f9d56bdc6fc88804be61908cc84 Mon Sep 17 00:00:00 2001 From: Peter Esselius Date: Mon, 15 Jul 2024 12:11:24 +0200 Subject: [PATCH 07/12] merge-input-nixpkgs-etc --- flake.lock | 318 +++++++---------------------------------------------- flake.nix | 14 ++- 2 files changed, 55 insertions(+), 277 deletions(-) diff --git a/flake.lock b/flake.lock index 30ad734..8d9e16a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,9 +2,15 @@ "nodes": { "agenix": { "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "darwin": [ + "nix-darwin" + ], + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems" }, "locked": { @@ -25,10 +31,14 @@ "inputs": { "authentik-src": "authentik-src", "flake-compat": "flake-compat", - "flake-parts": "flake-parts", + "flake-parts": [ + "flake-parts" + ], "flake-utils": "flake-utils", "napalm": "napalm", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "poetry2nix": "poetry2nix" }, "locked": { @@ -80,44 +90,25 @@ "type": "github" } }, - "darwin": { + "ez-configs": { "inputs": { + "flake-parts": [ + "flake-parts" + ], "nixpkgs": [ - "agenix", "nixpkgs" ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, - "ez-configs": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1720792356, + "lastModified": 1720994547, "narHash": "sha256-5WmTdtALYr8zSTBEeyKWos08pqNwRJ2SiT/vAnw19TU=", - "owner": "esselius", + "owner": "ehllie", "repo": "ez-configs", - "rev": "97badf2de027f0c8e1c4d89187aafd3e248214a0", + "rev": "563000e533a1b1aa957a4b788bf505cd243e5154", "type": "github" }, "original": { - "owner": "esselius", - "ref": "patch-1", + "owner": "ehllie", "repo": "ez-configs", "type": "github" } @@ -142,45 +133,6 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "ez-configs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, "locked": { "lastModified": 1719994518, "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", @@ -195,24 +147,6 @@ "type": "github" } }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" - }, - "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -252,28 +186,9 @@ "home-manager": { "inputs": { "nixpkgs": [ - "agenix", "nixpkgs" ] }, - "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, "locked": { "lastModified": 1720042825, "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", @@ -385,24 +300,6 @@ "type": "github" } }, - "nix-darwin_2": { - "inputs": { - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1716329735, - "narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c", - "type": "github" - }, - "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -429,8 +326,12 @@ "inputs": { "brew-src": "brew-src", "flake-utils": "flake-utils_2", - "nix-darwin": "nix-darwin_2", - "nixpkgs": "nixpkgs_6" + "nix-darwin": [ + "nix-darwin" + ], + "nixpkgs": [ + "nixpkgs-darwin" + ] }, "locked": { "lastModified": 1719720211, @@ -468,7 +369,9 @@ }, "nixos-tests": { "inputs": { - "flake-parts": "flake-parts_4" + "flake-parts": [ + "flake-parts" + ] }, "locked": { "lastModified": 1720452198, @@ -486,16 +389,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -517,24 +420,6 @@ } }, "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib_2": { "locked": { "lastModified": 1719876945, "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", @@ -546,18 +431,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, - "nixpkgs-lib_3": { - "locked": { - "lastModified": 1717284937, - "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1720440425, @@ -574,115 +447,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1714076141, - "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1699963925, - "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bf744fe90419885eefced41b3e5ae442d732712d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1716542732, - "narHash": "sha256-0Y9fRr0CUqWT4KgBITmaGwlnNIGMYuydu2L8iLTfHU4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d12251ef6e8e6a46e05689eeccd595bdbd3c9e60", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1687274257, - "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", - "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source", - "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1715218190, - "narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9a9960b98418f8c385f52de3b09a63f9c561427a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9a9960b98418f8c385f52de3b09a63f9c561427a", - "type": "github" - } - }, "poetry2nix": { "inputs": { "flake-utils": [ @@ -716,7 +480,9 @@ "libcamera-apps-src": "libcamera-apps-src", "libcamera-src": "libcamera-src", "libpisp-src": "libpisp-src", - "nixpkgs": "nixpkgs_8", + "nixpkgs": [ + "nixpkgs" + ], "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", @@ -742,13 +508,13 @@ "agenix": "agenix", "authentik-nix": "authentik-nix", "ez-configs": "ez-configs", - "flake-parts": "flake-parts_3", - "home-manager": "home-manager_2", + "flake-parts": "flake-parts", + "home-manager": "home-manager", "nix-darwin": "nix-darwin", "nix-homebrew": "nix-homebrew", "nix-index-database": "nix-index-database", "nixos-tests": "nixos-tests", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-unstable": "nixpkgs-unstable", "raspberry-pi-nix": "raspberry-pi-nix" diff --git a/flake.nix b/flake.nix index 25b47a8..2c0a912 100644 --- a/flake.nix +++ b/flake.nix @@ -10,19 +10,31 @@ nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-24.05-darwin"; raspberry-pi-nix.url = "github:tstat/raspberry-pi-nix"; + raspberry-pi-nix.inputs.nixpkgs.follows = "nixpkgs"; authentik-nix.url = "github:nix-community/authentik-nix/node-22"; + authentik-nix.inputs.nixpkgs.follows = "nixpkgs"; + authentik-nix.inputs.flake-parts.follows = "flake-parts"; nix-darwin.url = "github:lnl7/nix-darwin"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs-darwin"; home-manager.url = "github:nix-community/home-manager/release-24.05"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; nix-homebrew.url = "github:zhaofengli/nix-homebrew"; + nix-homebrew.inputs.nix-darwin.follows = "nix-darwin"; + nix-homebrew.inputs.nixpkgs.follows = "nixpkgs-darwin"; flake-parts.url = "github:hercules-ci/flake-parts"; # https://github.com/ehllie/ez-configs/pull/9 - ez-configs.url = "github:esselius/ez-configs/patch-1"; + ez-configs.url = "github:ehllie/ez-configs"; + ez-configs.inputs.nixpkgs.follows = "nixpkgs"; + ez-configs.inputs.flake-parts.follows = "flake-parts"; nixos-tests.url = "github:esselius/nixos-tests"; + nixos-tests.inputs.flake-parts.follows = "flake-parts"; agenix.url = "github:ryantm/agenix"; + agenix.inputs.nixpkgs.follows = "nixpkgs"; + agenix.inputs.home-manager.follows = "home-manager"; + agenix.inputs.darwin.follows = "nix-darwin"; nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; From 1f3ea5d8a220072d160db4ad1bd8797068750c3d Mon Sep 17 00:00:00 2001 From: Peter Esselius Date: Mon, 15 Jul 2024 12:14:10 +0200 Subject: [PATCH 08/12] invalidate cache --- .github/workflows/ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 40462f3..d675571 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,8 +13,8 @@ jobs: - uses: nix-community/cache-nix-action@v5 with: - primary-key: nix-adama-${{ runner.os }}-${{ hashFiles('**/*.nix') }} - restore-prefixes-first-match: nix-adama-${{ runner.os }}- + primary-key: nix-v2-adama-${{ runner.os }}-${{ hashFiles('**/*.nix') }} + restore-prefixes-first-match: nix-v2-adama-${{ runner.os }}- paths: | /nix/store ~/.cache/nix @@ -30,8 +30,8 @@ jobs: - uses: nix-community/cache-nix-action@v5 with: - primary-key: nix-cain-${{ runner.os }}-${{ hashFiles('**/*.nix') }} - restore-prefixes-first-match: nix-cain-${{ runner.os }}- + primary-key: nix-v2-cain-${{ runner.os }}-${{ hashFiles('**/*.nix') }} + restore-prefixes-first-match: nix-v2-cain-${{ runner.os }}- paths: | /nix/store ~/.cache/nix From 0cff54e52532fc48084d91d847aa2569eea6d62f Mon Sep 17 00:00:00 2001 From: Peter Esselius Date: Mon, 15 Jul 2024 12:40:15 +0200 Subject: [PATCH 09/12] no eval cache --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d675571..5d43e8a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,7 +20,7 @@ jobs: ~/.cache/nix ~root/.cache/nix - - run: nix --accept-flake-config --extra-experimental-features 'flakes nix-command' path-info --derivation .#nixosConfigurations.adama.config.system.build.toplevel + - run: nix --accept-flake-config --extra-experimental-features 'flakes nix-command' path-info --derivation .#nixosConfigurations.adama.config.system.build.toplevel --no-eval-cache cain: runs-on: ubuntu-latest @@ -37,4 +37,4 @@ jobs: ~/.cache/nix ~root/.cache/nix - - run: nix --accept-flake-config --extra-experimental-features 'flakes nix-command' path-info --derivation .#nixosConfigurations.cain.config.system.build.toplevel + - run: nix --accept-flake-config --extra-experimental-features 'flakes nix-command' path-info --derivation .#nixosConfigurations.cain.config.system.build.toplevel --no-eval-cache From 66b6e08b83baab593b87067d78f2d4049d4daf8a Mon Sep 17 00:00:00 2001 From: Peter Esselius Date: Mon, 15 Jul 2024 15:26:12 +0200 Subject: [PATCH 10/12] Update ci.yaml --- .github/workflows/ci.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5d43e8a..e47746c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,11 +10,13 @@ jobs: steps: - uses: actions/checkout@v4 - uses: nixbuild/nix-quick-install-action@v28 + with: + nix_conf: auto-optimise-store = true - uses: nix-community/cache-nix-action@v5 with: - primary-key: nix-v2-adama-${{ runner.os }}-${{ hashFiles('**/*.nix') }} - restore-prefixes-first-match: nix-v2-adama-${{ runner.os }}- + primary-key: nix-v3-adama-${{ runner.os }}-${{ hashFiles('**/*.nix') }} + restore-prefixes-first-match: nix-v3-adama-${{ runner.os }}- paths: | /nix/store ~/.cache/nix @@ -27,11 +29,13 @@ jobs: steps: - uses: actions/checkout@v4 - uses: nixbuild/nix-quick-install-action@v28 + with: + nix_conf: auto-optimise-store = true - uses: nix-community/cache-nix-action@v5 with: - primary-key: nix-v2-cain-${{ runner.os }}-${{ hashFiles('**/*.nix') }} - restore-prefixes-first-match: nix-v2-cain-${{ runner.os }}- + primary-key: nix-v3-cain-${{ runner.os }}-${{ hashFiles('**/*.nix') }} + restore-prefixes-first-match: nix-v3-cain-${{ runner.os }}- paths: | /nix/store ~/.cache/nix From d61d913dab828b2180e2a95c53c5184df6ca244c Mon Sep 17 00:00:00 2001 From: Peter Esselius Date: Mon, 15 Jul 2024 15:30:41 +0200 Subject: [PATCH 11/12] Update ci.yaml --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e47746c..dff65a9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,7 +22,7 @@ jobs: ~/.cache/nix ~root/.cache/nix - - run: nix --accept-flake-config --extra-experimental-features 'flakes nix-command' path-info --derivation .#nixosConfigurations.adama.config.system.build.toplevel --no-eval-cache + - run: nix --accept-flake-config --extra-experimental-features 'flakes nix-command' path-info --derivation .#nixosConfigurations.adama.config.system.build.toplevel cain: runs-on: ubuntu-latest @@ -41,4 +41,4 @@ jobs: ~/.cache/nix ~root/.cache/nix - - run: nix --accept-flake-config --extra-experimental-features 'flakes nix-command' path-info --derivation .#nixosConfigurations.cain.config.system.build.toplevel --no-eval-cache + - run: nix --accept-flake-config --extra-experimental-features 'flakes nix-command' path-info --derivation .#nixosConfigurations.cain.config.system.build.toplevel From 5d60cc77fc8c39dcf3aa2584e1000c3adc08bce1 Mon Sep 17 00:00:00 2001 From: Peter Esselius Date: Mon, 15 Jul 2024 15:44:35 +0200 Subject: [PATCH 12/12] Update ci.yaml --- .github/workflows/ci.yaml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index dff65a9..883b164 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,17 +10,13 @@ jobs: steps: - uses: actions/checkout@v4 - uses: nixbuild/nix-quick-install-action@v28 - with: - nix_conf: auto-optimise-store = true - uses: nix-community/cache-nix-action@v5 with: - primary-key: nix-v3-adama-${{ runner.os }}-${{ hashFiles('**/*.nix') }} + primary-key: nix-v4-adama-${{ runner.os }}-${{ hashFiles('**/*.nix') }} restore-prefixes-first-match: nix-v3-adama-${{ runner.os }}- paths: | /nix/store - ~/.cache/nix - ~root/.cache/nix - run: nix --accept-flake-config --extra-experimental-features 'flakes nix-command' path-info --derivation .#nixosConfigurations.adama.config.system.build.toplevel @@ -29,16 +25,12 @@ jobs: steps: - uses: actions/checkout@v4 - uses: nixbuild/nix-quick-install-action@v28 - with: - nix_conf: auto-optimise-store = true - uses: nix-community/cache-nix-action@v5 with: - primary-key: nix-v3-cain-${{ runner.os }}-${{ hashFiles('**/*.nix') }} + primary-key: nix-v4-cain-${{ runner.os }}-${{ hashFiles('**/*.nix') }} restore-prefixes-first-match: nix-v3-cain-${{ runner.os }}- paths: | /nix/store - ~/.cache/nix - ~root/.cache/nix - run: nix --accept-flake-config --extra-experimental-features 'flakes nix-command' path-info --derivation .#nixosConfigurations.cain.config.system.build.toplevel