From 0991ae91e73d7dd74d7f9c18fd94ce716f97ce7e Mon Sep 17 00:00:00 2001 From: catvayor Date: Fri, 6 Jun 2025 16:04:23 +0200 Subject: [PATCH 1/4] fix(patch): pr 403844 has conflict now --- REUSE.toml | 2 +- default.nix | 1 + patches/default.nix | 2 +- patches/nixpkgs/06-netbird-dashboard.patch | 35 ++++++++++++++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 patches/nixpkgs/06-netbird-dashboard.patch diff --git a/REUSE.toml b/REUSE.toml index c25eb47..bd72fbd 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -38,7 +38,7 @@ precedence = "closest" [[annotations]] SPDX-FileCopyrightText = "2024 Lubin Bailly " 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]] diff --git a/default.nix b/default.nix index 8e71ffc..9ffad4c 100644 --- a/default.nix +++ b/default.nix @@ -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 "; } diff --git a/patches/default.nix b/patches/default.nix index 6eb7fff..b2cc27a 100644 --- a/patches/default.nix +++ b/patches/default.nix @@ -53,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" = [ diff --git a/patches/nixpkgs/06-netbird-dashboard.patch b/patches/nixpkgs/06-netbird-dashboard.patch new file mode 100644 index 0000000..35ede48 --- /dev/null +++ b/patches/nixpkgs/06-netbird-dashboard.patch @@ -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 ++ ]; + }; + } From a232a81f2993ce80e7a2e0851f11c5c469325fa3 Mon Sep 17 00:00:00 2001 From: "DGNum [bot]" Date: Thu, 12 Jun 2025 13:01:10 +0000 Subject: [PATCH 2/4] lon: update nixos-unstable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- lon.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lon.lock b/lon.lock index 3bed73c..823757e 100644 --- a/lon.lock +++ b/lon.lock @@ -257,9 +257,9 @@ "owner": "NixOS", "repo": "nixpkgs", "branch": "nixos-unstable", - "revision": "d89fc19e405c", - "url": "https://github.com/NixOS/nixpkgs/archive/d89fc19e405c.tar.gz", - "hash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=" + "revision": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "url": "https://github.com/NixOS/nixpkgs/archive/3e3afe5174c561dee0df6f2c2b2236990146329f.tar.gz", + "hash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=" }, "proxmox-nixos": { "type": "Git", From 4bcbc0f99a5833eb5e3f5019a4186e656aad7ac8 Mon Sep 17 00:00:00 2001 From: catvayor Date: Fri, 6 Jun 2025 16:04:23 +0200 Subject: [PATCH 3/4] fix(patch): pr 403844 has conflict now --- REUSE.toml | 2 +- default.nix | 1 + patches/default.nix | 2 +- patches/nixpkgs/06-netbird-dashboard.patch | 34 ++++++++++++++++++++++ 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 patches/nixpkgs/06-netbird-dashboard.patch diff --git a/REUSE.toml b/REUSE.toml index c25eb47..bd72fbd 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -38,7 +38,7 @@ precedence = "closest" [[annotations]] SPDX-FileCopyrightText = "2024 Lubin Bailly " 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]] diff --git a/default.nix b/default.nix index 8e71ffc..9ffad4c 100644 --- a/default.nix +++ b/default.nix @@ -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 "; } diff --git a/patches/default.nix b/patches/default.nix index 6eb7fff..b2cc27a 100644 --- a/patches/default.nix +++ b/patches/default.nix @@ -53,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" = [ diff --git a/patches/nixpkgs/06-netbird-dashboard.patch b/patches/nixpkgs/06-netbird-dashboard.patch new file mode 100644 index 0000000..53ecc61 --- /dev/null +++ b/patches/nixpkgs/06-netbird-dashboard.patch @@ -0,0 +1,34 @@ +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; [ ++ patrickdag ++ ]; + }; + } From bc0a6be8e5bbf26b611dea9385b7d434df3e38d5 Mon Sep 17 00:00:00 2001 From: "DGNum [bot]" Date: Thu, 12 Jun 2025 13:01:10 +0000 Subject: [PATCH 4/4] lon: update nixos-unstable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- lon.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lon.lock b/lon.lock index 3bed73c..823757e 100644 --- a/lon.lock +++ b/lon.lock @@ -257,9 +257,9 @@ "owner": "NixOS", "repo": "nixpkgs", "branch": "nixos-unstable", - "revision": "d89fc19e405c", - "url": "https://github.com/NixOS/nixpkgs/archive/d89fc19e405c.tar.gz", - "hash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=" + "revision": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "url": "https://github.com/NixOS/nixpkgs/archive/3e3afe5174c561dee0df6f2c2b2236990146329f.tar.gz", + "hash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=" }, "proxmox-nixos": { "type": "Git",