From 0a41c801135940bb5f07a3cf4cefc8646803641e Mon Sep 17 00:00:00 2001 From: sinavir Date: Fri, 28 Mar 2025 09:55:09 +0100 Subject: [PATCH] feat(netbox): use nixpkgs-stable package Co-authored-by: catvayor --- machines/nixos/compute01/netbox.nix | 4 ++-- machines/nixos/web01/netbox.nix | 4 ++-- patches/default.nix | 6 ------ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/machines/nixos/compute01/netbox.nix b/machines/nixos/compute01/netbox.nix index 50b358d..7057ed4 100644 --- a/machines/nixos/compute01/netbox.nix +++ b/machines/nixos/compute01/netbox.nix @@ -5,7 +5,7 @@ { config, lib, - nixpkgs, + pkgs, ... }: @@ -17,7 +17,7 @@ in services = { netbox = { enable = true; - package = nixpkgs.nixos.unstable.netbox_4_1; + package = pkgs.netbox_4_1; secretKeyFile = "/dev/null"; listenAddress = "127.0.0.1"; plugins = p: [ p.netbox-qrcode ]; diff --git a/machines/nixos/web01/netbox.nix b/machines/nixos/web01/netbox.nix index 4c9b4a1..7f0f54c 100644 --- a/machines/nixos/web01/netbox.nix +++ b/machines/nixos/web01/netbox.nix @@ -5,7 +5,7 @@ { config, lib, - nixpkgs, + pkgs, ... }: @@ -17,7 +17,7 @@ in services = { netbox = { enable = true; - package = nixpkgs.nixos.unstable.netbox_4_1; + package = pkgs.netbox_4_1; secretKeyFile = "/dev/null"; listenAddress = "127.0.0.1"; plugins = p: [ p.netbox-qrcode ]; diff --git a/patches/default.nix b/patches/default.nix index 73cc702..9939955 100644 --- a/patches/default.nix +++ b/patches/default.nix @@ -38,12 +38,6 @@ in "nixos-unstable" = [ # Build netbird-relay (local ./nixpkgs/05-netbird-relay.patch) - { - _type = "commit"; - sha = "87c3740ba46d1486f0b1133980e5c152006f2ee3"; - hash = "sha256-0lzC7Ks0KPG8fDnPrnSh7z+NOVHNN5G5XByvmNGWr5M="; - revert = true; - } ]; "agenix" = [