From b030b100559c68d414aee71405bdf6bedc014444 Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 1 Dec 2023 21:53:58 +0100 Subject: [PATCH] Update netbox host to NixOS 23.11 and netbox to v3.6.3 --- config/hosts/netbox/netbox.nix | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 4 +++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/config/hosts/netbox/netbox.nix b/config/hosts/netbox/netbox.nix index 152cf92..9c07233 100644 --- a/config/hosts/netbox/netbox.nix +++ b/config/hosts/netbox/netbox.nix @@ -9,6 +9,7 @@ { services.netbox = { enable = true; + package = pkgs.netbox; secretKeyFile = "/secrets/netbox-secret-key.secret"; settings = { ALLOWED_HOSTS = [ "netbox.hamburg.ccc.de" ]; diff --git a/flake.lock b/flake.lock index a691519..c3336e5 100644 --- a/flake.lock +++ b/flake.lock @@ -52,6 +52,22 @@ "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1701374686, + "narHash": "sha256-xaJPtgvTuUGSPba8p3+ezCJjKnVij77ai8OE2bnTC0E=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1bce6a1791a513af2727e5b668b3cd9ba76cb0bf", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.11-small", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1699354722, @@ -72,6 +88,7 @@ "inputs": { "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs", + "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-unstable": "nixpkgs-unstable" } } diff --git a/flake.nix b/flake.nix index 4409302..2ddf5a4 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ # https://nixos.org/manual/nixos/stable/#sec-upgrading # https://github.com/NixOS/nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05-small"; + nixpkgs-23-11.url = "github:nixos/nixpkgs/nixos-23.11-small"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small"; # Add nixos-generators as an input. @@ -16,7 +17,7 @@ }; }; - outputs = { nixpkgs, nixpkgs-unstable, nixos-generators, ... }: + outputs = { nixpkgs, nixpkgs-23-11, nixpkgs-unstable, nixos-generators, ... }: let pkgs-unstable = nixpkgs-unstable.legacyPackages."x86_64-linux"; # Shairport Sync 4.3.1 (with nqptp 1.2.4) with metadata, MQTT and AirPlay 2 support. @@ -65,6 +66,7 @@ nodeNixpkgs = { audio-hauptraum-kueche = nixpkgs-unstable.legacyPackages."x86_64-linux".extend shairportSync431ExtendedNixpkgsUnstableOverlay; audio-hauptraum-tafel = nixpkgs-unstable.legacyPackages."x86_64-linux".extend shairportSync431ExtendedNixpkgsUnstableOverlay; + netbox = nixpkgs-23-11.legacyPackages."x86_64-linux"; }; nodeSpecialArgs = { public-web-static = { inherit pkgs-unstable; };