DGNum/infrastructure
9
5
Fork 3
Code Issues 31 Pull requests 30 Projects 1 Releases Packages Wiki Activity Actions

fix(patch): pr 403844 has conflict now

Browse source
This commit is contained in:
catvayor 2025-06-06 16:04:23 +02:00
parent eb6b00fce2
commit 0991ae91e7
4 changed files with 38 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
REUSE.toml generated
View file

@ -38,7 +38,7 @@ precedence = "closest"
[[annotations]] [[annotations]]
SPDX-FileCopyrightText = "2024 Lubin Bailly <lubin.bailly@dgnum.eu>" SPDX-FileCopyrightText = "2024 Lubin Bailly <lubin.bailly@dgnum.eu>"
SPDX-License-Identifier = "EUPL-1.2" 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" precedence = "closest"
[[annotations]] [[annotations]]

1
default.nix
View file

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

2
patches/default.nix
View file

@ -53,7 +53,7 @@ with {
(local ./nixpkgs/05-netbird-relay.patch) (local ./nixpkgs/05-netbird-relay.patch)
# netbird-dashboard: 2.9.0 -> 2.12.0 # netbird-dashboard: 2.9.0 -> 2.12.0
(npr 403844 "sha256-oQUc/UEvWOdZ5IyemnZeFS5dVysblqdV9fm6t790Kms=") (local ./nixpkgs/06-netbird-dashboard.patch)
]; ];
"agenix" = [ "agenix" = [

35
patches/nixpkgs/06-netbird-dashboard.patch Normal file
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
+ ];
};
}