From df9b76528dfdb28b5688fdcd1ca488a255227a1a Mon Sep 17 00:00:00 2001 From: June Date: Tue, 5 Dec 2023 17:51:52 +0100 Subject: [PATCH] Switch to pkgs from stable I think we used pkgs from unstable (as pkgs-unstable), because the Go version in NixOS 23.05 was too old. But now that we're on 23.11, which has a newer Go version, we can use pkgs from stable. --- config/hosts/public-web-static/spaceapid.nix | 4 ++-- flake.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/config/hosts/public-web-static/spaceapid.nix b/config/hosts/public-web-static/spaceapid.nix index cb752c7..a2eaa4a 100644 --- a/config/hosts/public-web-static/spaceapid.nix +++ b/config/hosts/public-web-static/spaceapid.nix @@ -1,4 +1,4 @@ -{ pkgs-unstable, ... }: +{ pkgs, ... }: let spaceapidSrc = builtins.fetchGit { @@ -6,7 +6,7 @@ let ref = "main"; rev = "baf73f33e7e8ef763869a1677ebf5cd2f334d897"; }; - spaceapid = pkgs-unstable.buildGoModule { + spaceapid = pkgs.buildGoModule { pname = "spaceapid"; version = "main"; diff --git a/flake.nix b/flake.nix index 5f75b90..6e7ea64 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,6 @@ 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. shairportSync431ExtendedNixpkgsUnstableOverlay = final: prev: { shairport-sync = (prev.shairport-sync.override { enableMetadata = true; enableAirplay2 = true; }).overrideAttrs (finalAttr: previousAttr: { @@ -66,9 +65,6 @@ audio-hauptraum-kueche = nixpkgs-unstable.legacyPackages."x86_64-linux".extend shairportSync431ExtendedNixpkgsUnstableOverlay; audio-hauptraum-tafel = nixpkgs-unstable.legacyPackages."x86_64-linux".extend shairportSync431ExtendedNixpkgsUnstableOverlay; }; - nodeSpecialArgs = { - public-web-static = { inherit pkgs-unstable; }; - }; }; audio-hauptraum-kueche = {