CCCHH/nix-infra
CCCHH/nix-infra
2
3
Fork 3
Code Issues Pull requests 2 Projects Wiki Activity

Switch to pkgs from stable

Browse source 
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.
This commit is contained in:
June 2023-12-05 17:51:52 +01:00
parent 8889db28a3
commit df9b76528d
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/hosts/public-web-static/spaceapid.nix
View file

@ -1,4 +1,4 @@
{ pkgs-unstable, ... }: { pkgs, ... }:
let let
spaceapidSrc = builtins.fetchGit { spaceapidSrc = builtins.fetchGit {
@ -6,7 +6,7 @@ let
ref = "main"; ref = "main";
rev = "baf73f33e7e8ef763869a1677ebf5cd2f334d897"; rev = "baf73f33e7e8ef763869a1677ebf5cd2f334d897";
}; };
spaceapid = pkgs-unstable.buildGoModule { spaceapid = pkgs.buildGoModule {
pname = "spaceapid"; pname = "spaceapid";
version = "main"; version = "main";

4
flake.nix
View file

@ -18,7 +18,6 @@
outputs = { nixpkgs, nixpkgs-unstable, nixos-generators, ... }: outputs = { nixpkgs, nixpkgs-unstable, nixos-generators, ... }:
let 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. # Shairport Sync 4.3.1 (with nqptp 1.2.4) with metadata, MQTT and AirPlay 2 support.
shairportSync431ExtendedNixpkgsUnstableOverlay = final: prev: { shairportSync431ExtendedNixpkgsUnstableOverlay = final: prev: {
shairport-sync = (prev.shairport-sync.override { enableMetadata = true; enableAirplay2 = true; }).overrideAttrs (finalAttr: previousAttr: { 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-kueche = nixpkgs-unstable.legacyPackages."x86_64-linux".extend shairportSync431ExtendedNixpkgsUnstableOverlay;
audio-hauptraum-tafel = 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 = { audio-hauptraum-kueche = {