forked from CCCHH/nix-infra
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.
This commit is contained in:
parent
8889db28a3
commit
df9b76528d
|
@ -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";
|
||||||
|
|
||||||
|
|
|
@ -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 = {
|
||||||
|
|
Loading…
Reference in a new issue