From 8889db28a35c786380062ab1cd9a1b6bda4b156b Mon Sep 17 00:00:00 2001 From: June Date: Tue, 5 Dec 2023 17:33:49 +0100 Subject: [PATCH] Upgrade to NixOS 23.11 Also see the release notes for more information: https://nixos.org/manual/nixos/stable/release-notes#sec-release-23.11 --- flake.lock | 23 +++-------------------- flake.nix | 6 ++---- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index c3336e5..2747a0b 100644 --- a/flake.lock +++ b/flake.lock @@ -38,27 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699351105, - "narHash": "sha256-jNgFflP+Z7PzQav2TtuLBGEXF9GsBq2s8aBH18vmldM=", + "lastModified": 1701641412, + "narHash": "sha256-8tIujWeoxRnkTjaQK4uzBxvhm0MxHilAi2VjlenQoBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "33e938c7823e47a787ad4f76003d14ff92ad96dd", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-23.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-23-11": { - "locked": { - "lastModified": 1701374686, - "narHash": "sha256-xaJPtgvTuUGSPba8p3+ezCJjKnVij77ai8OE2bnTC0E=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1bce6a1791a513af2727e5b668b3cd9ba76cb0bf", + "rev": "71bb3aaf2222f5ac691edb7de046d74c6cfe466b", "type": "github" }, "original": { @@ -88,7 +72,6 @@ "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 2ddf5a4..5f75b90 100644 --- a/flake.nix +++ b/flake.nix @@ -5,8 +5,7 @@ # Use the NixOS small channels for nixpkgs. # 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.url = "github:nixos/nixpkgs/nixos-23.11-small"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small"; # Add nixos-generators as an input. @@ -17,7 +16,7 @@ }; }; - outputs = { nixpkgs, nixpkgs-23-11, nixpkgs-unstable, nixos-generators, ... }: + outputs = { nixpkgs, 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. @@ -66,7 +65,6 @@ 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; };