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/lon.lock b/lon.lock index cc7a60c..7f07965 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", 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..4f46e8c --- /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,8 @@ 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 ++ ]; + }; + }