Compare commits

..

9 commits

Author SHA1 Message Date
DGNum [bot]
cc2f1ce245
lon: update nixos-unstable
Some checks failed
Build all the nodes / netcore02 (pull_request) Successful in 39s
Build all the nodes / Jaccess04 (pull_request) Successful in 1m22s
Build all the nodes / netcore01 (pull_request) Successful in 45s
Build all the nodes / Jaccess01 (pull_request) Successful in 1m26s
Build all the nodes / ap01 (pull_request) Successful in 1m30s
Build all the nodes / zulip01 (pull_request) Failing after 3m55s
Build all the nodes / web02 (pull_request) Failing after 3m58s
Build all the nodes / hypervisor03 (pull_request) Failing after 4m24s
Build all the nodes / bridge01 (pull_request) Successful in 4m43s
Build all the nodes / hypervisor01 (pull_request) Successful in 4m34s
Build all the nodes / web03 (pull_request) Successful in 4m8s
Build all the nodes / hypervisor02 (pull_request) Successful in 4m36s
Build all the nodes / vault01 (pull_request) Successful in 4m9s
Build all the nodes / geo01 (pull_request) Successful in 2m51s
Build all the nodes / web01 (pull_request) Successful in 4m10s
Build all the nodes / geo02 (pull_request) Successful in 4m41s
Build all the nodes / cof02 (pull_request) Successful in 4m47s
Build all the nodes / krz01 (pull_request) Successful in 2m32s
Build all the nodes / rescue01 (pull_request) Successful in 4m13s
Build all the nodes / storage01 (pull_request) Successful in 4m11s
Build all the nodes / compute01 (pull_request) Successful in 4m46s
Build all the nodes / lab-router01 (pull_request) Successful in 4m27s
Build all the nodes / build01 (pull_request) Successful in 5m6s
Build all the nodes / tower01 (pull_request) Successful in 2m32s
Check workflows / check_workflows (push) Successful in 41s
Check workflows / check_workflows (pull_request) Successful in 39s
Run pre-commit on all files / pre-commit (pull_request) Successful in 52s
Run pre-commit on all files / pre-commit (push) Successful in 54s
Build all the nodes / iso (pull_request) Successful in 5m15s
Build the shell / build-shell (pull_request) Failing after 23s
d89fc19e405c
→ 3e3afe5174c561dee0df6f2c2b2236990146329f

Last 50 commits:
  bd1c971 dbeaver-bin: 25.0.5 -> 25.1.0 (#414411)
  d311c0e doc: call out 'src' should ideally point to sources
  cf85d81 shh: 2025.6.4 -> 2025.6.5
  db5c622 Merge: matrix-synapse: 1.130.0 -> 1.131.0 (#413629)
  9756867 firefox-devedition-bin-unwrapped: 140.0b4 -> 140.0b5
  ca726ed copilot-language-server: 1.322.0 -> 1.330.0 (#411058)
  8339848 lightning-loop: 0.28.8 -> 0.31.1 (#414283)
  90f36a1 framework-tool: 0.4.2 -> 0.4.3
  1619e5a framework-tool: add johnazoidberg as maintainer
  1a58b25 python3Packages.py-machineid: 0.7.0 -> 0.8.0 (#414416)
  bd22d19 vimPlugins: update on 2025-06-05 (#414296)
  a1ea6c9 python3Packages.ipyvuetify: 1.11.1 -> 1.11.2
  6e25d98 nixos/filesystems: chore replace 'with' statements
  ebd3748 attic-client: 0-unstable-2025-02-02 -> 0-unstable-2025-05-29 (#414408)
  e95626e mastodon: allow specifying missingHashes when overriding src
  27c294b geteduroam: 0.11 -> 0.12
  08d3857 pywal16: 3.8.6 -> 3.8.9 (#414451)
  72e9f57 mobilizon: use lib.getExe
  458b3d1 python3Packages.replicate: 1.0.4 -> 1.0.7
  78aa5d7 kew: 3.3.2 -> 3.3.3
  1019651 nixos/dnscrypt-proxy2: add `package` option
  8b4e41e homebank: 5.9.1 -> 5.9.2 (#414144)
  e2443f7 python3Packages.markitdown: 0.1.1 -> 0.1.2
  2e50149 mobilizon: 5.1.2 -> 5.1.4
  65c2df8 python3Packages.craft-grammar: move pydantic to dependencies
  1ec5ab7 snapcraft: pin Python 3.12
  925fd2a python3Packages.craft-grammar: move pydantic to dependencies (#414488)
  4e238e4 elmPackages.elm: Fix runtime TLS connection to package.elm-lang.org
  45a2f12 doc: call out 'src' should ideally point to sources (#413559)
  fffc35b apacheHttpdPackages.php: 8.4.7 -> 8.4.8
  dfa2b38 dorion: 5.0.1 → 6.7.1; dorion: build from source (#265771)
  559987a shh: 2025.6.4 -> 2025.6.5 (#414457)
  68b1422 geteduroam: 0.11 -> 0.12 (#414479)
  d0a93ec radicle-{explorer,httpd}: 0.18.2 → 0.19.1
  585e6f6 labelife-label-printer: 1.2.1 -> 2.0.0
  94bb902 firefox-devedition-bin-unwrapped: 140.0b4 -> 140.0b5 (#414460)
  20eb58b snapcraft: pin Python 3.12 (#414493)
  92e1950 elmPackages.elm: Fix runtime TLS connection to package.elm-lang.org (#414495)
  af0a73d ecapture: 1.0.2 -> 1.1.0 (#413011)
  a4ff0e3 nixos/kanidm: Fix bind paths (#409310)
  69407aa maintainers: add yethal
  cc43028 nushellPlugins.hcl: init at 0.104.1
  b0afabc zipline: 4.1.0 -> 4.1.1
  1edd461 mobilizon: 5.1.2 -> 5.1.4 (#414487)
  c31d074 azure-cli: 2.73.0 -> 2.74.0 (#413503)
  c7a62d3 exploitdb: 2025-05-30 -> 2025-06-06
  56353fd python313Packages.tencentcloud-sdk-python: 3.0.1393 -> 3.0.1394
  24b3e36 python313Packages.publicsuffixlist: 1.0.2.20250603 -> 1.0.2.20250606
  cf0749d checkov: 3.2.436 -> 3.2.437
  144b478 python312Packages.mypy-boto3-cloudformation: 1.38.0 -> 1.38.31
2025-06-12 16:16:48 +02:00
8e407daa0b
fix(patch): pr 403844 has conflict now 2025-06-12 16:16:48 +02:00
124d9b72b0 feat(workflows/eval-nodes): Print evaluation statistics
All checks were successful
Build all the nodes / web03 (pull_request) Successful in 1m22s
Build all the nodes / storage01 (pull_request) Successful in 1m49s
Check workflows / check_workflows (push) Successful in 24s
Build all the nodes / Jaccess01 (push) Successful in 32s
Build all the nodes / Jaccess04 (push) Successful in 32s
Run pre-commit on all files / pre-commit (push) Successful in 39s
Build all the nodes / netcore01 (push) Successful in 28s
Build all the nodes / netcore02 (push) Successful in 28s
Build all the nodes / ap01 (push) Successful in 1m4s
Build all the nodes / geo02 (push) Successful in 1m37s
Build all the nodes / geo01 (push) Successful in 1m39s
Build all the nodes / hypervisor01 (push) Successful in 1m33s
Build all the nodes / compute01 (push) Successful in 1m42s
Build all the nodes / hypervisor02 (push) Successful in 1m31s
Build all the nodes / build01 (push) Successful in 1m48s
Build all the nodes / cof02 (push) Successful in 1m50s
Build all the nodes / hypervisor03 (push) Successful in 1m45s
Build the shell / build-shell (push) Successful in 1m1s
Build all the nodes / lab-router01 (push) Successful in 1m37s
Build all the nodes / web03 (push) Successful in 1m29s
Build all the nodes / tower01 (push) Successful in 1m35s
Build all the nodes / krz01 (push) Successful in 1m54s
Build all the nodes / web02 (push) Successful in 1m38s
Build all the nodes / zulip01 (push) Successful in 1m22s
Build all the nodes / vault01 (push) Successful in 1m40s
Build all the nodes / bridge01 (push) Successful in 2m22s
Build all the nodes / iso (push) Successful in 1m59s
Build all the nodes / rescue01 (push) Successful in 1m44s
Build all the nodes / web01 (push) Successful in 1m42s
Build all the nodes / storage01 (push) Successful in 1m47s
2025-06-12 16:14:13 +02:00
DGNum [bot]
fc6c88543e lon: update lix-module
All checks were successful
Build all the nodes / web01 (pull_request) Successful in 1m20s
Build all the nodes / krz01 (pull_request) Successful in 1m41s
Build all the nodes / storage01 (pull_request) Successful in 1m47s
Build all the nodes / Jaccess01 (push) Successful in 26s
Build all the nodes / netcore01 (push) Successful in 31s
Build all the nodes / Jaccess04 (push) Successful in 33s
Build all the nodes / netcore02 (push) Successful in 30s
Build the shell / build-shell (push) Successful in 27s
Run pre-commit on all files / pre-commit (push) Successful in 38s
Build all the nodes / ap01 (push) Successful in 45s
Build all the nodes / lab-router01 (push) Successful in 1m10s
Build all the nodes / geo02 (push) Successful in 1m11s
Build all the nodes / hypervisor01 (push) Successful in 1m11s
Build all the nodes / hypervisor03 (push) Successful in 1m11s
Build all the nodes / hypervisor02 (push) Successful in 1m22s
Build all the nodes / geo01 (push) Successful in 1m23s
Build all the nodes / bridge01 (push) Successful in 1m27s
Build all the nodes / iso (push) Successful in 1m30s
Build all the nodes / cof02 (push) Successful in 1m30s
Build all the nodes / build01 (push) Successful in 1m30s
Build all the nodes / zulip01 (push) Successful in 1m29s
Build all the nodes / tower01 (push) Successful in 1m36s
Build all the nodes / web02 (push) Successful in 1m33s
Build all the nodes / web03 (push) Successful in 1m35s
Build all the nodes / compute01 (push) Successful in 1m45s
Build all the nodes / rescue01 (push) Successful in 1m46s
Build all the nodes / vault01 (push) Successful in 1m46s
Build all the nodes / web01 (push) Successful in 1m44s
Build all the nodes / krz01 (push) Successful in 1m51s
Build all the nodes / storage01 (push) Successful in 1m55s
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
2025-06-12 16:05:24 +02:00
8c09de1529
fix(build01/nix-builder): Remove impure-derivations from experimental-features
All checks were successful
Build all the nodes / web01 (pull_request) Successful in 1m29s
Run pre-commit on all files / pre-commit (push) Successful in 38s
Build all the nodes / krz01 (pull_request) Successful in 2m0s
Build all the nodes / Jaccess01 (push) Successful in 31s
Build all the nodes / Jaccess04 (push) Successful in 29s
Build all the nodes / netcore01 (push) Successful in 28s
Build all the nodes / netcore02 (push) Successful in 29s
Build all the nodes / ap01 (push) Successful in 58s
Build all the nodes / bridge01 (push) Successful in 1m13s
Build all the nodes / storage01 (pull_request) Successful in 2m33s
Build all the nodes / cof02 (push) Successful in 1m21s
Build all the nodes / hypervisor01 (push) Successful in 1m18s
Build all the nodes / build01 (push) Successful in 1m34s
Build all the nodes / geo01 (push) Successful in 1m34s
Build the shell / build-shell (push) Successful in 43s
Build all the nodes / geo02 (push) Successful in 1m37s
Build all the nodes / compute01 (push) Successful in 1m48s
Build all the nodes / hypervisor02 (push) Successful in 1m37s
Build all the nodes / lab-router01 (push) Successful in 1m31s
Build all the nodes / hypervisor03 (push) Successful in 1m35s
Build all the nodes / iso (push) Successful in 1m40s
Build all the nodes / vault01 (push) Successful in 1m30s
Build all the nodes / tower01 (push) Successful in 1m33s
Build all the nodes / rescue01 (push) Successful in 1m40s
Build all the nodes / zulip01 (push) Successful in 1m12s
Build all the nodes / krz01 (push) Successful in 1m52s
Build all the nodes / web02 (push) Successful in 1m25s
Build all the nodes / web03 (push) Successful in 1m23s
Build all the nodes / web01 (push) Successful in 1m28s
Build all the nodes / storage01 (push) Successful in 2m0s
Lix no longer supports it
2025-06-12 16:00:42 +02:00
05a7477a8e
fix(lix): Drop fetchGit-locked patch as it is included upstream
Some checks failed
Build all the nodes / ap01 (pull_request) Successful in 1m2s
Build all the nodes / netcore01 (pull_request) Successful in 33s
Build all the nodes / netcore02 (pull_request) Successful in 43s
Build the shell / build-shell (pull_request) Successful in 40s
Build all the nodes / build01 (pull_request) Failing after 3m11s
Build all the nodes / bridge01 (pull_request) Successful in 4m59s
Build all the nodes / cof02 (pull_request) Successful in 4m57s
Build all the nodes / vault01 (pull_request) Successful in 4m5s
Build all the nodes / web02 (pull_request) Successful in 4m11s
Build all the nodes / hypervisor03 (pull_request) Successful in 4m52s
Build all the nodes / hypervisor01 (pull_request) Successful in 4m59s
Build all the nodes / rescue01 (pull_request) Successful in 4m29s
Build all the nodes / geo02 (pull_request) Successful in 5m1s
Build all the nodes / geo01 (pull_request) Successful in 5m8s
Build all the nodes / compute01 (pull_request) Successful in 5m11s
Build all the nodes / hypervisor02 (pull_request) Successful in 4m59s
Build all the nodes / web03 (pull_request) Successful in 4m10s
Build all the nodes / web01 (pull_request) Successful in 4m17s
Check workflows / check_workflows (pull_request) Successful in 26s
Build all the nodes / tower01 (pull_request) Successful in 4m18s
Check meta / check_meta (pull_request) Successful in 28s
Build all the nodes / storage01 (pull_request) Successful in 4m22s
Build all the nodes / zulip01 (pull_request) Successful in 4m10s
Build all the nodes / iso (pull_request) Successful in 4m44s
Build all the nodes / Jaccess01 (pull_request) Successful in 35s
Build all the nodes / lab-router01 (pull_request) Successful in 4m41s
Run pre-commit on all files / pre-commit (push) Successful in 40s
Build all the nodes / Jaccess04 (pull_request) Successful in 32s
Build all the nodes / krz01 (pull_request) Successful in 4m45s
Run pre-commit on all files / pre-commit (pull_request) Successful in 44s
2025-06-12 15:55:42 +02:00
DGNum [bot]
07a3435f90
lon: update lix
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
2025-06-12 15:55:42 +02:00
DGNum [bot]
ff1920acf6 lon: update nixos-24.05
All checks were successful
Build all the nodes / web01 (pull_request) Successful in 1m23s
Build all the nodes / zulip01 (pull_request) Successful in 1m19s
Build all the nodes / storage01 (pull_request) Successful in 1m47s
Build all the nodes / Jaccess04 (push) Successful in 25s
Build all the nodes / netcore01 (push) Successful in 31s
Build all the nodes / Jaccess01 (push) Successful in 34s
Build all the nodes / netcore02 (push) Successful in 32s
Run pre-commit on all files / pre-commit (push) Successful in 43s
Build the shell / build-shell (push) Successful in 36s
Build all the nodes / ap01 (push) Successful in 52s
Build all the nodes / geo01 (push) Successful in 57s
Build all the nodes / bridge01 (push) Successful in 1m10s
Build all the nodes / cof02 (push) Successful in 1m11s
Build all the nodes / hypervisor02 (push) Successful in 1m12s
Build all the nodes / hypervisor01 (push) Successful in 1m15s
Build all the nodes / lab-router01 (push) Successful in 1m21s
Build all the nodes / hypervisor03 (push) Successful in 1m22s
Build all the nodes / web02 (push) Successful in 1m26s
Build all the nodes / geo02 (push) Successful in 1m34s
Build all the nodes / build01 (push) Successful in 1m36s
Build all the nodes / tower01 (push) Successful in 1m36s
Build all the nodes / iso (push) Successful in 1m42s
Build all the nodes / vault01 (push) Successful in 1m41s
Build all the nodes / web03 (push) Successful in 1m41s
Build all the nodes / zulip01 (push) Successful in 1m30s
Build all the nodes / compute01 (push) Successful in 1m47s
Build all the nodes / rescue01 (push) Successful in 1m47s
Build all the nodes / web01 (push) Successful in 1m50s
Build all the nodes / krz01 (push) Successful in 1m58s
Build all the nodes / storage01 (push) Successful in 2m49s
b134951a4c9f
→ b134951a4c9f3c995fd7be05f3243f8ecd65d798

Last 0 commits:
2025-06-12 15:53:25 +02:00
DGNum [bot]
3962ada269 lon: update nix-modules
All checks were successful
Build all the nodes / rescue01 (pull_request) Successful in 1m41s
Build all the nodes / web01 (pull_request) Successful in 1m43s
Build all the nodes / storage01 (pull_request) Successful in 2m31s
Build all the nodes / Jaccess04 (push) Successful in 25s
Build all the nodes / Jaccess01 (push) Successful in 29s
Build all the nodes / netcore02 (push) Successful in 27s
Build all the nodes / netcore01 (push) Successful in 30s
Run pre-commit on all files / pre-commit (push) Successful in 34s
Build all the nodes / ap01 (push) Successful in 51s
Build all the nodes / geo02 (push) Successful in 57s
Build the shell / build-shell (push) Successful in 35s
Build all the nodes / hypervisor02 (push) Successful in 1m9s
Build all the nodes / hypervisor03 (push) Successful in 1m16s
Build all the nodes / bridge01 (push) Successful in 1m32s
Build all the nodes / build01 (push) Successful in 1m32s
Build all the nodes / geo01 (push) Successful in 1m33s
Build all the nodes / cof02 (push) Successful in 1m33s
Build all the nodes / hypervisor01 (push) Successful in 1m33s
Build all the nodes / lab-router01 (push) Successful in 1m32s
Build all the nodes / tower01 (push) Successful in 1m33s
Build all the nodes / compute01 (push) Successful in 1m41s
Build all the nodes / vault01 (push) Successful in 1m39s
Build all the nodes / iso (push) Successful in 1m43s
Build all the nodes / zulip01 (push) Successful in 1m20s
Build all the nodes / rescue01 (push) Successful in 1m56s
Build all the nodes / web01 (push) Successful in 1m58s
Build all the nodes / web02 (push) Successful in 1m36s
Build all the nodes / web03 (push) Successful in 1m34s
Build all the nodes / krz01 (push) Successful in 2m8s
Build all the nodes / storage01 (push) Successful in 2m11s
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
2025-06-12 12:58:26 +00:00
9 changed files with 78 additions and 102 deletions

View file

@ -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'"

2
REUSE.toml generated
View file

@ -38,7 +38,7 @@ precedence = "closest"
[[annotations]]
SPDX-FileCopyrightText = "2024 Lubin Bailly <lubin.bailly@dgnum.eu>"
SPDX-License-Identifier = "EUPL-1.2"
path = ["modules/nixos/extranix/0001-revert-don-t-parse-md-in-js.patch", "modules/nixos/extranix/0002-chore-remove-useless-dependencies.patch", "modules/nixos/extranix/0003-feat-separate-HTML-description-of-MD-description.patch", "modules/nixos/extranix/0004-fix-indentation-of-ul.patch", "modules/nixos/extranix/0005-feat-match-all-substring-by-default.patch", "patches/nixpkgs/02-action-validator.patch", "machines/nixos/vault01/k-radius/packages/04-request-dgsi-vlan.patch"]
path = ["modules/nixos/extranix/0001-revert-don-t-parse-md-in-js.patch", "modules/nixos/extranix/0002-chore-remove-useless-dependencies.patch", "modules/nixos/extranix/0003-feat-separate-HTML-description-of-MD-description.patch", "modules/nixos/extranix/0004-fix-indentation-of-ul.patch", "modules/nixos/extranix/0005-feat-match-all-substring-by-default.patch", "patches/nixpkgs/02-action-validator.patch", "machines/nixos/vault01/k-radius/packages/04-request-dgsi-vlan.patch", "patches/nixpkgs/06-netbird-dashboard.patch"]
precedence = "closest"
[[annotations]]

View file

@ -154,6 +154,7 @@ let
"modules/nixos/extranix/0005-feat-match-all-substring-by-default.patch"
"patches/nixpkgs/02-action-validator.patch"
"machines/nixos/vault01/k-radius/packages/04-request-dgsi-vlan.patch"
"patches/nixpkgs/06-netbird-dashboard.patch"
];
copyright = "2024 Lubin Bailly <lubin.bailly@dgnum.eu>";
}

22
lon.lock generated
View file

@ -135,20 +135,20 @@
"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": {
"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": {
@ -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": {
@ -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": {

View file

@ -69,7 +69,6 @@
# "ca-derivations" this feature is really extremely broken.
"cgroups"
"fetch-closure"
"impure-derivations"
];
};
};

View file

@ -18,7 +18,6 @@ with {
lix = [
(local ./lix/01-disable-installChecks.patch)
(local ./lix/02-fetchGit-locked.patch)
];
lon = [
@ -54,7 +53,7 @@ with {
(local ./nixpkgs/05-netbird-relay.patch)
# netbird-dashboard: 2.9.0 -> 2.12.0
(npr 403844 "sha256-oQUc/UEvWOdZ5IyemnZeFS5dVysblqdV9fm6t790Kms=")
(local ./nixpkgs/06-netbird-dashboard.patch)
];
"agenix" = [

View file

@ -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' isnt 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<InputScheme> makePathInputScheme();
std::unique_ptr<InputScheme> makeFileInputScheme();
std::unique_ptr<InputScheme> makeTarballInputScheme();
std::unique_ptr<InputScheme> makeGitInputScheme();
+std::unique_ptr<InputScheme> makeGitLockedInputScheme();
std::unique_ptr<InputScheme> makeMercurialInputScheme();
std::unique_ptr<InputScheme> makeGitHubInputScheme();
std::unique_ptr<InputScheme> 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<InputScheme> makeGitInputScheme()
return std::make_unique<GitInputScheme>();
}
+struct GitLockedInputScheme : GitInputScheme {
+
+ std::optional<Input> 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<InputScheme> makeGitLockedInputScheme()
+{
+ return std::make_unique<GitLockedInputScheme>();
+}
+
}

View file

@ -0,0 +1,35 @@
diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix
index 0670d3333e6bce..fcd2f4df65fce9 100644
--- a/pkgs/by-name/ne/netbird-dashboard/package.nix
+++ b/pkgs/by-name/ne/netbird-dashboard/package.nix
@@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "netbird-dashboard";
- version = "2.9.0";
+ version = "2.12.0";
src = fetchFromGitHub {
owner = "netbirdio";
repo = "dashboard";
rev = "v${version}";
- hash = "sha256-PY/jK96FK6Y0++Ie4Yg/7GrGoLtLcgCSzXIkqySxe2M=";
+ hash = "sha256-AZ8vrDtpVADW8NMq/MBpYd6VSMcuFzk67UXoXdPeiPk=";
};
- npmDepsHash = "sha256-TELyc62l/8IaX9eL2lxRFth0AAZ4LXsV2WNzXSHRnTw=";
+ npmDepsHash = "sha256-XNAphh1zNi4enf0Mz9TUgWyZHezTuctMPTBswKO4eW8=";
npmFlags = [ "--legacy-peer-deps" ];
installPhase = ''
@@ -30,6 +30,9 @@ buildNpmPackage rec {
description = "NetBird Management Service Web UI Panel";
homepage = "https://github.com/netbirdio/dashboard";
license = licenses.bsd3;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [
+ vrifox
+ patrickdag
+ ];
};
}

View file

@ -30,7 +30,10 @@ in
'';
shell = "eval-nodes";
};
env.BUILD_NODE = node;
env = {
BUILD_NODE = node;
NIX_SHOW_STATS = 1;
};
}
{
name = "Build ${node}";