Merge master into staging-next

Changed files
+71 -7
maintainers
nixos
modules
hardware
pkgs
by-name
ca
capslock
fi
filebeat8
ku
kurve
+5
maintainers/maintainer-list.nix
···
githubId = 399718;
name = "Chris Martin";
};
+
chrisheib = {
+
github = "chrisheib";
+
githubId = 6112968;
+
name = "Christoph Heibutzki";
+
};
chrisjefferson = {
email = "chris@bubblescope.net";
github = "ChrisJefferson";
+6 -1
nixos/modules/hardware/cpu/amd-microcode.nix
···
pkgs,
...
}:
+
+
let
+
cfg = config.hardware.cpu.amd;
+
in
{
###### interface
options = {
···
'';
};
+
hardware.cpu.amd.microcodePackage = lib.mkPackageOption pkgs "microcode-amd" { };
};
###### implementation
config = lib.mkIf config.hardware.cpu.amd.updateMicrocode {
# Microcode updates must be the first item prepended in the initrd
-
boot.initrd.prepend = lib.mkOrder 1 [ "${pkgs.microcode-amd}/amd-ucode.img" ];
+
boot.initrd.prepend = lib.mkOrder 1 [ "${cfg.microcodePackage}/amd-ucode.img" ];
};
}
+3 -3
pkgs/by-name/ca/capslock/package.nix
···
buildGoModule (finalAttrs: {
pname = "capslock";
-
version = "0.2.7";
+
version = "0.2.8";
src = fetchFromGitHub {
owner = "google";
repo = "capslock";
rev = "v${finalAttrs.version}";
-
hash = "sha256-kRuEcrx9LBzCpXFWlc9bSsgZt84T8R8VFdbAWAseSPQ=";
+
hash = "sha256-7FMsW51LYEjEXcil6e64tAHaBeDAYRnBBX4E1PjSXtU=";
};
-
vendorHash = "sha256-CUw4ukSAs12dprgcQRfdoKzY7gbzUCHk0t2SrUMtrxo=";
+
vendorHash = "sha256-UOpreQceWgwbQ+Qup4iEStQqJA77uiiupfTUFxNBIcM=";
subPackages = [ "cmd/capslock" ];
+3 -3
pkgs/by-name/fi/filebeat8/package.nix
···
buildGoModule rec {
pname = "filebeat";
-
version = "8.18.4";
+
version = "8.19.2";
src = fetchFromGitHub {
owner = "elastic";
repo = "beats";
tag = "v${version}";
-
hash = "sha256-H7UKYp+REz7d9wKrP+AhIJp4ydCVS8NGKfBFvDFZWiA=";
+
hash = "sha256-3SW4SHUbEhdsKh3zd9VlVC8ZAxaR52Mfm1K/btjtB/4=";
};
proxyVendor = true; # darwin/linux hash mismatch
-
vendorHash = "sha256-G4+FsmmPDyssD+n1N1BnCElYv/bW7kY2tF60r49ZhN8=";
+
vendorHash = "sha256-y8oAeH6RBD45+NEhl9EF4tPL1Ox4qHlLi+jSetjgKRE=";
subPackages = [ "filebeat" ];
+54
pkgs/by-name/ku/kurve/package.nix
···
+
{
+
stdenv,
+
lib,
+
fetchFromGitHub,
+
nix-update-script,
+
kdePackages,
+
cava,
+
python3,
+
qt6,
+
}:
+
let
+
pythonEnv = python3.withPackages (ps: [ ps.websockets ]);
+
in
+
stdenv.mkDerivation (finalAttrs: {
+
pname = "kurve";
+
version = "0.4.0";
+
dontWrapQtApps = true;
+
+
src = fetchFromGitHub {
+
owner = "luisbocanegra";
+
repo = "kurve";
+
tag = "v${finalAttrs.version}";
+
hash = "sha256-Ra+ySuvBqmVOTD8TlWDJklXYuwXPb/2a3BSY+gQMiiA=";
+
};
+
+
installPhase = ''
+
runHook preInstall
+
+
# Substitute Qt Websocket paths in QML files to ensure they work with Nix
+
substituteInPlace package/contents/ui/components/ProcessMonitorFallback.qml --replace-fail "import QtWebSockets 1.9" "import \"file:${qt6.qtwebsockets}/lib/qt-6/qml/QtWebSockets\""
+
+
# Set cava path so it gets discovered by nix as runtime dependency
+
substituteInPlace package/contents/ui/Cava.qml --replace-fail "cava" "${cava}/bin/cava"
+
substituteInPlace package/contents/ui/FullRepresentation.qml --replace-fail "cava -v" "${cava}/bin/cava -v"
+
+
# Set python path so it gets discovered by nix as runtime dependency
+
substituteInPlace package/contents/ui/tools/commandMonitor --replace-fail "#!/usr/bin/env python3" "#!${pythonEnv}/bin/python3"
+
+
mkdir -p $out/share/plasma/plasmoids/luisbocanegra.audio.visualizer
+
cp -r package/* $out/share/plasma/plasmoids/luisbocanegra.audio.visualizer
+
runHook postInstall
+
'';
+
+
passthru.updateScript = nix-update-script { };
+
+
meta = {
+
description = "KDE Plasma widget displaying CAVA audio visualizations.";
+
homepage = "https://github.com/luisbocanegra/kurve";
+
changelog = "https://github.com/luisbocanegra/kurve/releases/tag/v${finalAttrs.version}";
+
license = lib.licenses.gpl3Only;
+
maintainers = with lib.maintainers; [ chrisheib ];
+
inherit (kdePackages.kwindowsystem.meta) platforms;
+
};
+
})