From d637a70c5a4551c6d7147ad2829b342811e3edb6 Mon Sep 17 00:00:00 2001 From: "DGNum [bot]" Date: Thu, 12 Jun 2025 12:57:58 +0000 Subject: [PATCH 01/12] lon: update dns.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit a3196708a56dee76186a9415c187473b94e6cbae → 96e548ae8bd44883afc5bddb9dacd0502542276d Last 17 commits: 3fa62df Add DANE-Related RRs d86ffdc zone#toString relative to $ORIGIN b2c6c9d useOrigin option in zone to switch toString e13b516 merge writeRecord{,Rel} b0a5a0f remove writeRecordDel 2307af0 fix subdomain case 0d4694f Update dns/types/record.nix e3ad889 Update dns/types/record.nix 3b4d4b3 Update dns/types/record.nix f084caf doc: adds useOrigin example 025996a Merge pull request #33 from pigam/unqualified-domain-names 7d62cee fix syntax error a23f43f Merge pull request #36 from griffi-gh/patch-1 51e3deb Apply suggestions from code review 1ad7b72 Apply suggestions from code review 17e7f9b Merge pull request #27 from DarkKirb/dnssec-rr 96e548a fix: Make the example work --- lon.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lon.lock b/lon.lock index 9e7b203..4b4912a 100644 --- a/lon.lock +++ b/lon.lock @@ -77,9 +77,9 @@ "owner": "nix-community", "repo": "dns.nix", "branch": "master", - "revision": "a3196708a56dee76186a9415c187473b94e6cbae", - "url": "https://github.com/nix-community/dns.nix/archive/a3196708a56dee76186a9415c187473b94e6cbae.tar.gz", - "hash": "sha256-IK3r16N9pizf53AipOmrcrcyjVsPJwC4PI5hIqEyKwQ=" + "revision": "96e548ae8bd44883afc5bddb9dacd0502542276d", + "url": "https://github.com/nix-community/dns.nix/archive/96e548ae8bd44883afc5bddb9dacd0502542276d.tar.gz", + "hash": "sha256-qTbv8Pm9WWF63M5Fj0Od9E54/lsbMSQUBHw/s30eFok=" }, "git-hooks": { "type": "GitHub", From 3962ada269879927fdcda80a62fe806726e375f2 Mon Sep 17 00:00:00 2001 From: "DGNum [bot]" Date: Thu, 12 Jun 2025 12:58:26 +0000 Subject: [PATCH 02/12] lon: update nix-modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 0cdf222c07b9cbd49857ae046fb41ae9f651cc3f → 44ccf96bd73c1bbbbcc849cb0f2e0d1f5f75f934 Last 3 commits: 44ccf96 feat(ntfy-sh): allow to manage hashed password directly 5612e8f chore: Remove substituteAll usage 1c4a60c fix(ntfy-sh): Write correct nix --- lon.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lon.lock b/lon.lock index 9e7b203..8466f0b 100644 --- a/lon.lock +++ b/lon.lock @@ -195,10 +195,10 @@ "type": "Git", "fetchType": "git", "branch": "dgnum", - "revision": "0cdf222c07b9cbd49857ae046fb41ae9f651cc3f", + "revision": "44ccf96bd73c1bbbbcc849cb0f2e0d1f5f75f934", "url": "https://git.hubrecht.ovh/hubrecht/nix-modules", - "hash": "sha256-VHlkJny+t1AhZ61JOeyYM1rLa4cPEoEt/5+vqAqAJgA=", - "lastModified": 1746016692, + "hash": "sha256-mkrCWowrCje3/TuAG0eAJplrtlz1hYmusSFn93/Ccok=", + "lastModified": 1749629064, "submodules": false }, "nix-pkgs": { From ff1920acf67fe72c2d0dc973ead97cb4fa771dcf Mon Sep 17 00:00:00 2001 From: "DGNum [bot]" Date: Thu, 12 Jun 2025 12:59:02 +0000 Subject: [PATCH 03/12] lon: update nixos-24.05 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit b134951a4c9f → b134951a4c9f3c995fd7be05f3243f8ecd65d798 Last 0 commits: --- lon.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lon.lock b/lon.lock index 8466f0b..f2b0841 100644 --- a/lon.lock +++ b/lon.lock @@ -227,8 +227,8 @@ "owner": "NixOS", "repo": "nixpkgs", "branch": "nixos-24.05", - "revision": "b134951a4c9f", - "url": "https://github.com/NixOS/nixpkgs/archive/b134951a4c9f.tar.gz", + "revision": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", + "url": "https://github.com/NixOS/nixpkgs/archive/b134951a4c9f3c995fd7be05f3243f8ecd65d798.tar.gz", "hash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=" }, "nixos-24.11": { From 07a3435f9055b4ef9b59c229ff90c78f494058bc Mon Sep 17 00:00:00 2001 From: "DGNum [bot]" Date: Thu, 12 Jun 2025 12:58:14 +0000 Subject: [PATCH 04/12] lon: update lix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit d169c092fc28838a253be136d17fe7de1292c728 → ee0655240270480d7f6063dcf12ec47f04d2ded6 Last 50 commits: ee06552 libstore: asyncify RemoteStore::Connection::processStderr 7a10df6 libstore: asyncify RemoteStore connection setup cc04a43 libstore: remove flushing from processStderr 8b3fdbc libstore: add framed data support to sendCommand 1a22475 libstore: encapsulate reading simple command results 2128a2d libstore: encapsulate sending of simple commands ec374bc libstore: deserialize findRoots data as vector-of-tuples ab8f4ae libstore: add CommonProto code for bool/unsigned/uint64_t 87fbc15 libutil: make the pool element factory a promise 56847dc libutil: make Buffered{Sink,Source} io buffer shareable 7d681a5 libutil: add io buffer abstraction cc56070 libstore: have SSH use a socketpair, not two pipes 9c4fd3d libstore: remove unused RemoteStore::Connection::closeWrite bea24c8 libutil/cgroup: destroy state record at destroy time 7bd8271 libstore/platform/linux: destroy cgroup before we release user locks 797c6d4 libutil/file-system: make `AutoDelete` not copyable and movable 9f9fced libstore/build/worker: clean up cgroup error messages typos a527bb2 libstore/build: cgroup delegation to sandbox 1783d5b libstore/build: drop cgroups experimental feature 21dbd77 libstore/binary-cache-store: skip NAR listings if it's not possible to serialize it 1e71df3 doc/manual/rl-next: mention symbol value reuse ebc8f56 libexpr/primops: pass the underlying `Value` of symbols if possible 5e98a21 libexpr/symbol-table: introduce `InternedSymbol` 364e94f libexpr/value: do not depend on `Symbol` 95ea358 libexpr/print: drop redundant constructor in emplace_back call ac3b742 libexpr/symbol-table: remove unused field from `SymbolTable::symbols` 5db71cf libutil: `add` should emplace inside a `ChunkedVector` d8b1bb5 build: fix Meson warning about lix-clang-tidy not having meson_version b70bbbe misc/pre-commit: add automatic `clang-format` of changed lines c19a0fe devshell: add `git-clang-format` 004a505 tests/functional2/nix: fix config serialization 0625e69 tests/functional2: fix bad error message when merging files afa5b92 tests/functional2: improve type checking util 60830ca libstore: add derivation wire generator 4ebf79b libstore: associate wire connection states with stores ce9acd5 libstore: use proper connection handle for narFromPath 2cd44d2 libstore: don't wrap&unwrap connection handles b33669b libutil: remove withFramedSink c135710 libstore: send worker options packet as one blob cf93814 libutil: remove unused FdSource::read 8c30a16 libutil: remove long-dead create_coro_gc_hook dd31a23 libstore: add worker serializer for SubstitutablePathInfo fca0a30 libstore: remove pre-2.18 protocols 019b17f tests/functional2/lang: Migrate trivial `eval-okay` tests 9673c64 tests/functional2/lang: Migrate trivial `parse-okay` tests 0219434 tests/functional2/lang: Migrate trivial `parse-fail` tests 63edb9c tests/functional2/lang: Migrate trivial `eval-fail` tests a7e5ff0 tests/functional2: Make symlink handling less confusing e753fcb gc: delay throwing error until cleanup is complete 530b40a tests/functional2: fix overly broad xfail test passing --- lon.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lon.lock b/lon.lock index f2b0841..bd0eb58 100644 --- a/lon.lock +++ b/lon.lock @@ -135,10 +135,10 @@ "type": "Git", "fetchType": "git", "branch": "main", - "revision": "d169c092fc28838a253be136d17fe7de1292c728", + "revision": "ee0655240270480d7f6063dcf12ec47f04d2ded6", "url": "https://git.lix.systems/lix-project/lix.git", - "hash": "sha256-gsPA3AAGi3pucRpzJbhWWyyOBv2/2OjAjU/SlcSE8Vc=", - "lastModified": 1743274305, + "hash": "sha256-DDhns3NS6L5OlYR0mSX03I5D7uGLyyd3MZegd1wTCyc=", + "lastModified": 1749682763, "submodules": false }, "lix-module": { From 05a7477a8e2feda8adc2a82f0a6880d58f1456a6 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Thu, 12 Jun 2025 15:55:27 +0200 Subject: [PATCH 05/12] fix(lix): Drop fetchGit-locked patch as it is included upstream --- patches/default.nix | 1 - patches/lix/02-fetchGit-locked.patch | 86 ---------------------------- 2 files changed, 87 deletions(-) delete mode 100644 patches/lix/02-fetchGit-locked.patch diff --git a/patches/default.nix b/patches/default.nix index 0aeb365..d352deb 100644 --- a/patches/default.nix +++ b/patches/default.nix @@ -18,7 +18,6 @@ with { lix = [ (local ./lix/01-disable-installChecks.patch) - (local ./lix/02-fetchGit-locked.patch) ]; lon = [ diff --git a/patches/lix/02-fetchGit-locked.patch b/patches/lix/02-fetchGit-locked.patch deleted file mode 100644 index 9f97117..0000000 --- a/patches/lix/02-fetchGit-locked.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git i/lix/libexpr/primops/fetchTree.cc w/lix/libexpr/primops/fetchTree.cc -index 93b08ecc9..6d04ce24b 100644 ---- i/lix/libexpr/primops/fetchTree.cc -+++ w/lix/libexpr/primops/fetchTree.cc -@@ -168,6 +168,11 @@ static void fetchTree( - "attribute 'name' isn’t supported in call to 'fetchTree'" - ).atPos(pos).debugThrow(); - -+ // HACK: When using `fetchGit`, locking with only the hash should happen -+ // as we don't care about flake hallucinations about `lastModified` -+ if (type == "git" && attrs.contains("narHash")) -+ attrs["type"] = "git-locked"; -+ - input = fetchers::Input::fromAttrs(std::move(attrs)); - } else { - auto url = state.coerceToString(pos, *args[0], context, -diff --git i/lix/libfetchers/builtin-fetchers.hh w/lix/libfetchers/builtin-fetchers.hh -index d3be7f7f2..d1389b8ba 100644 ---- i/lix/libfetchers/builtin-fetchers.hh -+++ w/lix/libfetchers/builtin-fetchers.hh -@@ -10,6 +10,7 @@ std::unique_ptr makePathInputScheme(); - std::unique_ptr makeFileInputScheme(); - std::unique_ptr makeTarballInputScheme(); - std::unique_ptr makeGitInputScheme(); -+std::unique_ptr makeGitLockedInputScheme(); - std::unique_ptr makeMercurialInputScheme(); - std::unique_ptr makeGitHubInputScheme(); - std::unique_ptr makeGitLabInputScheme(); -diff --git i/lix/libfetchers/fetchers.cc w/lix/libfetchers/fetchers.cc -index 0dc9f5e0c..91cd9332d 100644 ---- i/lix/libfetchers/fetchers.cc -+++ w/lix/libfetchers/fetchers.cc -@@ -22,6 +22,7 @@ void initLibFetchers() - registerInputScheme(makeTarballInputScheme()); - registerInputScheme(makeFileInputScheme()); - registerInputScheme(makeGitInputScheme()); -+ registerInputScheme(makeGitLockedInputScheme()); - registerInputScheme(makeMercurialInputScheme()); - registerInputScheme(makeGitHubInputScheme()); - registerInputScheme(makeGitLabInputScheme()); -diff --git i/lix/libfetchers/git.cc w/lix/libfetchers/git.cc -index 21fa1904d..f9573eacd 100644 ---- i/lix/libfetchers/git.cc -+++ w/lix/libfetchers/git.cc -@@ -812,4 +812,40 @@ std::unique_ptr makeGitInputScheme() - return std::make_unique(); - } - -+struct GitLockedInputScheme : GitInputScheme { -+ -+ std::optional inputFromAttrs(const Attrs & attrs) const override -+ { -+ if (maybeGetStrAttr(attrs, "type") != "git-locked") return {}; -+ -+ for (auto & [name, value] : attrs) -+ if (name != "type" && name != "url" && name != "ref" && name != "rev" && name != "shallow" && name != "submodules" && name != "lastModified" && name != "revCount" && name != "narHash" && name != "allRefs" && name != "name" && name != "dirtyRev" && name != "dirtyShortRev") -+ throw Error("unsupported Git input attribute '%s'", name); -+ -+ parseURL(getStrAttr(attrs, "url")); -+ maybeGetBoolAttr(attrs, "shallow"); -+ maybeGetBoolAttr(attrs, "submodules"); -+ maybeGetBoolAttr(attrs, "allRefs"); -+ -+ if (auto ref = maybeGetStrAttr(attrs, "ref")) { -+ if (std::regex_search(*ref, badGitRefRegex)) -+ throw BadURL("invalid Git branch/tag name '%s'", *ref); -+ } -+ -+ Input input; -+ input.attrs = attrs; -+ return input; -+ } -+ -+ bool hasAllInfo(const Input & input) const override { -+ return true; -+ } -+ -+}; -+ -+std::unique_ptr makeGitLockedInputScheme() -+{ -+ return std::make_unique(); -+} -+ - } - From 8c09de15293b6766418a5bad1bca82536d289394 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Thu, 12 Jun 2025 16:00:42 +0200 Subject: [PATCH 06/12] fix(build01/nix-builder): Remove impure-derivations from experimental-features Lix no longer supports it --- machines/nixos/build01/nix-builder.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/machines/nixos/build01/nix-builder.nix b/machines/nixos/build01/nix-builder.nix index 53dce67..79ff63e 100644 --- a/machines/nixos/build01/nix-builder.nix +++ b/machines/nixos/build01/nix-builder.nix @@ -69,7 +69,6 @@ # "ca-derivations" this feature is really extremely broken. "cgroups" "fetch-closure" - "impure-derivations" ]; }; }; From fc6c88543e4236769d10e72fc634be87c515749d Mon Sep 17 00:00:00 2001 From: "DGNum [bot]" Date: Thu, 12 Jun 2025 12:58:21 +0000 Subject: [PATCH 07/12] lon: update lix-module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fa69ae26cc32dda178117b46487c2165c0e08316 → 3c23c6ae2aecc1f76ae7993efe1a78b5316f0700 Last 6 commits: 3c23c6a Merge pull request 'nix-eval-jobs: add `__intentionallyOverridingVersion`' (#65) from isabelroses/nixos-module:eval-jobs-fix into main aaedf4e nix-eval-jobs: add `__intentionallyOverridingVersion` 58baedd Begin 2.94.x 4ca269a Merge tag '2.93.0' cd2a9c0 Module 2.93.0 ad0a6a9 flake.lock: Update --- lon.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lon.lock b/lon.lock index bd0eb58..041bd9d 100644 --- a/lon.lock +++ b/lon.lock @@ -145,10 +145,10 @@ "type": "Git", "fetchType": "git", "branch": "main", - "revision": "fa69ae26cc32dda178117b46487c2165c0e08316", + "revision": "3c23c6ae2aecc1f76ae7993efe1a78b5316f0700", "url": "https://git.lix.systems/lix-project/nixos-module.git", - "hash": "sha256-MB/b/xcDKqaVBxJIIxwb81r8ZiGLeKEcqokATRRroo8=", - "lastModified": 1742945498, + "hash": "sha256-7EICjbmG6lApWKhFtwvZovdcdORY1CEe6/K7JwtpYfs=", + "lastModified": 1747667424, "submodules": false }, "lon": { From 124d9b72b01a1b9688fc3356d71a46f033324214 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Thu, 12 Jun 2025 16:09:42 +0200 Subject: [PATCH 08/12] feat(workflows/eval-nodes): Print evaluation statistics --- .forgejo/workflows/eval-nodes.yaml | 25 +++++++++++++++++++++++++ workflows/eval-nodes.nix | 5 ++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/eval-nodes.yaml b/.forgejo/workflows/eval-nodes.yaml index 87ed659..6fad666 100644 --- a/.forgejo/workflows/eval-nodes.yaml +++ b/.forgejo/workflows/eval-nodes.yaml @@ -7,6 +7,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: Jaccess01 + NIX_SHOW_STATS: 1 name: Eval Jaccess01 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -26,6 +27,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: Jaccess04 + NIX_SHOW_STATS: 1 name: Eval Jaccess04 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -45,6 +47,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: ap01 + NIX_SHOW_STATS: 1 name: Eval ap01 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -64,6 +67,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: bridge01 + NIX_SHOW_STATS: 1 name: Eval bridge01 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -83,6 +87,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: build01 + NIX_SHOW_STATS: 1 name: Eval build01 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -102,6 +107,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: cof02 + NIX_SHOW_STATS: 1 name: Eval cof02 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -121,6 +127,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: compute01 + NIX_SHOW_STATS: 1 name: Eval compute01 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -140,6 +147,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: geo01 + NIX_SHOW_STATS: 1 name: Eval geo01 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -159,6 +167,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: geo02 + NIX_SHOW_STATS: 1 name: Eval geo02 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -178,6 +187,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: hypervisor01 + NIX_SHOW_STATS: 1 name: Eval hypervisor01 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -197,6 +207,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: hypervisor02 + NIX_SHOW_STATS: 1 name: Eval hypervisor02 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -216,6 +227,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: hypervisor03 + NIX_SHOW_STATS: 1 name: Eval hypervisor03 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -235,6 +247,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: iso + NIX_SHOW_STATS: 1 name: Eval iso run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -254,6 +267,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: krz01 + NIX_SHOW_STATS: 1 name: Eval krz01 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -273,6 +287,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: lab-router01 + NIX_SHOW_STATS: 1 name: Eval lab-router01 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -292,6 +307,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: netcore01 + NIX_SHOW_STATS: 1 name: Eval netcore01 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -311,6 +327,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: netcore02 + NIX_SHOW_STATS: 1 name: Eval netcore02 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -330,6 +347,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: rescue01 + NIX_SHOW_STATS: 1 name: Eval rescue01 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -349,6 +367,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: storage01 + NIX_SHOW_STATS: 1 name: Eval storage01 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -368,6 +387,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: tower01 + NIX_SHOW_STATS: 1 name: Eval tower01 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -387,6 +407,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: vault01 + NIX_SHOW_STATS: 1 name: Eval vault01 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -406,6 +427,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: web01 + NIX_SHOW_STATS: 1 name: Eval web01 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -425,6 +447,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: web02 + NIX_SHOW_STATS: 1 name: Eval web02 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -444,6 +467,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: web03 + NIX_SHOW_STATS: 1 name: Eval web03 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" @@ -463,6 +487,7 @@ jobs: - uses: actions/checkout@v3 - env: BUILD_NODE: zulip01 + NIX_SHOW_STATS: 1 name: Eval zulip01 run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'" diff --git a/workflows/eval-nodes.nix b/workflows/eval-nodes.nix index acbe3f4..94f585f 100644 --- a/workflows/eval-nodes.nix +++ b/workflows/eval-nodes.nix @@ -30,7 +30,10 @@ in ''; shell = "eval-nodes"; }; - env.BUILD_NODE = node; + env = { + BUILD_NODE = node; + NIX_SHOW_STATS = 1; + }; } { name = "Build ${node}"; From a389fb26def53fb27461705a0c2f2158cefe4a48 Mon Sep 17 00:00:00 2001 From: "DGNum [bot]" Date: Thu, 12 Jun 2025 12:58:01 +0000 Subject: [PATCH 09/12] lon: update git-hooks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fa466640195d38ec97cf0493d6d6882bc4d14969 → 623c56286de5a3193aa38891a6991b28f9bab056 Last 3 commits: d1deac1 fix(govet): change to dir before running 80479b6 Merge pull request #590 from yurrriq/govet-change-directory 623c562 show an example for devenv --- lon.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lon.lock b/lon.lock index 041bd9d..d6d48be 100644 --- a/lon.lock +++ b/lon.lock @@ -87,9 +87,9 @@ "owner": "cachix", "repo": "git-hooks.nix", "branch": "master", - "revision": "fa466640195d38ec97cf0493d6d6882bc4d14969", - "url": "https://github.com/cachix/git-hooks.nix/archive/fa466640195d38ec97cf0493d6d6882bc4d14969.tar.gz", - "hash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=" + "revision": "623c56286de5a3193aa38891a6991b28f9bab056", + "url": "https://github.com/cachix/git-hooks.nix/archive/623c56286de5a3193aa38891a6991b28f9bab056.tar.gz", + "hash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=" }, "kadenios": { "type": "Git", From 1c7f174987f53cf3af0be77249122fd4c33d676e Mon Sep 17 00:00:00 2001 From: catvayor Date: Thu, 12 Jun 2025 16:20:55 +0200 Subject: [PATCH 10/12] fix(patch): commit has been rebased --- patches/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/default.nix b/patches/default.nix index d352deb..6eb7fff 100644 --- a/patches/default.nix +++ b/patches/default.nix @@ -59,8 +59,8 @@ with { "agenix" = [ { _type = "url"; - url = "https://github.com/ryantm/agenix/commit/48b60f7c1c7023af52212555bdb6d07472402863.patch"; - hash = "sha256-e45hiHF0HbCYb+3RRhy+8nNIFvefb6SZSN3xcl1mpvI="; + url = "https://github.com/ryantm/agenix/commit/0a2bcfb77b1d89764b1c654b44b781b110038d0f.patch"; + hash = "sha256-dO7Lvf2mdCIN6MjNcE+OS7ibaSunJ84Krqlk8ywMtwo="; } ]; } From eb6b00fce2d64759a843c66a33439703ee7334c4 Mon Sep 17 00:00:00 2001 From: "DGNum [bot]" Date: Thu, 12 Jun 2025 12:57:54 +0000 Subject: [PATCH 11/12] lon: update agenix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 564595d0ad4be7277e07fa63b5a991b3c645655d → 4835b1dc898959d8547a871ef484930675cb47f1 Last 50 commits: 344f985 dev: remove i686 support; simplify flake 097aa18 contrib: add direct tests for agenix 17090d1 Merge pull request #163 from ryantm/rtm-2-21-recursive-nix 08dc506 Revert "contrib: add direct tests for agenix " d0d4ad5 Merge pull request #231 from ryantm/revert-163-rtm-2-21-recursive-nix 9bc80dc Merge pull request #229 from ryantm/rtm-12-20-flake 5c1198a feat: switch from rage to age eb3b5cf update nixpkgs bd86c06 fix doc build 58017c0 update inputs b6aa618 test removing installer 23d4d5d maybe this fixes darwin checks? 6ce42cc Fix CI for darwin 457669d Merge pull request #230 from ryantm/rtm-12-20-age bc24f2e Revert "Revert "contrib: add direct tests for agenix "" a23aa27 dev: reland add direct tests for agenix 417caa8 Merge pull request #232 from ryantm/rtm-12-23-test 1746e4f agenix: fix installCheckPhase with Nix 2.3 1f62cef fix: update docs for 5c1198a 8cb01a0 Merge pull request #244 from kraem/fix/rage_to_age_docs 3fd98a2 doc: fix wrong ssh-keyscan usage 1381a75 Merge pull request #254 from oluceps/fix-doc 2c1d1fb fix: allow for newlines in keys 24a7ea3 Merge pull request #256 from spectre256/main 07479c2 update link to nixos wiki (#258) 63a57d8 Fix typo 8d37c5b Merge pull request #259 from hansemschnokeloch/patch-1 08ed896 fix: always treat link destinations as files to ensure error when destination is a directory. c2fc076 Merge pull request #241 from sternenseemann/nix-2.3-install-check 3a56735 Merge pull request #187 from oddlama/main 760751b README: Add warning about HNDL and PQS in theat model de96bd9 Merge pull request #265 from Kreyren/patch-1 40012e5 Remove import for NixOS/HM modules 3f1dae0 Merge pull request #277 from fzakaria/import-module-remove e341399 age-home: Use curly-brackets for XDG_RUNTIME_DIR f6291c5 Merge pull request #280 from Kreyren/patch-3 cce0ff4 fix: bad age.identityPaths default value on darwin 302ab0c fix: bump to macOS-15 in CI 989ade2 feat: dynamically determine architecture in ci 96b7e4f contrib: improve readability of age.identityPaths default value 4d0d81e fix: bad indentation in ci e600439 Merge pull request #307 from codgician/fix-darwin-module cccd5af docs: add home-manager module documentation 58c5544 fix: use replaceVars instead of substituteAll 96e078c Merge pull request #324 from K900/replace-vars af991e8 Separate flags from positional args with `--` 72f7f68 Merge pull request #327 from n8henrie/leading-hyphen-filename 8a4516a Merge pull request #318 from bcl1713/main bd33a9b doc: strip trailing whitespace 6697e8b Merge pull request #328 from ryantm/doc-strip-whitespace --- lon.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lon.lock b/lon.lock index d6d48be..3bed73c 100644 --- a/lon.lock +++ b/lon.lock @@ -7,9 +7,9 @@ "owner": "ryantm", "repo": "agenix", "branch": "main", - "revision": "564595d0ad4be7277e07fa63b5a991b3c645655d", - "url": "https://github.com/ryantm/agenix/archive/564595d0ad4be7277e07fa63b5a991b3c645655d.tar.gz", - "hash": "sha256-ipqShkBmHKC9ft1ZAsA6aeKps32k7+XZSPwfxeHLsAU=" + "revision": "4835b1dc898959d8547a871ef484930675cb47f1", + "url": "https://github.com/ryantm/agenix/archive/4835b1dc898959d8547a871ef484930675cb47f1.tar.gz", + "hash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=" }, "arkheon": { "type": "GitHub", From 8324717c8eed6988efdacc1e80948c04afb1f1f5 Mon Sep 17 00:00:00 2001 From: "DGNum [bot]" Date: Thu, 12 Jun 2025 12:57:58 +0000 Subject: [PATCH 12/12] lon: update dns.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit a3196708a56dee76186a9415c187473b94e6cbae → 96e548ae8bd44883afc5bddb9dacd0502542276d Last 17 commits: 3fa62df Add DANE-Related RRs d86ffdc zone#toString relative to $ORIGIN b2c6c9d useOrigin option in zone to switch toString e13b516 merge writeRecord{,Rel} b0a5a0f remove writeRecordDel 2307af0 fix subdomain case 0d4694f Update dns/types/record.nix e3ad889 Update dns/types/record.nix 3b4d4b3 Update dns/types/record.nix f084caf doc: adds useOrigin example 025996a Merge pull request #33 from pigam/unqualified-domain-names 7d62cee fix syntax error a23f43f Merge pull request #36 from griffi-gh/patch-1 51e3deb Apply suggestions from code review 1ad7b72 Apply suggestions from code review 17e7f9b Merge pull request #27 from DarkKirb/dnssec-rr 96e548a fix: Make the example work --- lon.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lon.lock b/lon.lock index 3bed73c..7522c96 100644 --- a/lon.lock +++ b/lon.lock @@ -77,9 +77,9 @@ "owner": "nix-community", "repo": "dns.nix", "branch": "master", - "revision": "a3196708a56dee76186a9415c187473b94e6cbae", - "url": "https://github.com/nix-community/dns.nix/archive/a3196708a56dee76186a9415c187473b94e6cbae.tar.gz", - "hash": "sha256-IK3r16N9pizf53AipOmrcrcyjVsPJwC4PI5hIqEyKwQ=" + "revision": "96e548ae8bd44883afc5bddb9dacd0502542276d", + "url": "https://github.com/nix-community/dns.nix/archive/96e548ae8bd44883afc5bddb9dacd0502542276d.tar.gz", + "hash": "sha256-qTbv8Pm9WWF63M5Fj0Od9E54/lsbMSQUBHw/s30eFok=" }, "git-hooks": { "type": "GitHub",