From 4eb1d51edbad1bb74a353f559436d8d4cc1ab51c Mon Sep 17 00:00:00 2001 From: ZHANG Yuntian Date: Tue, 2 Sep 2025 11:37:02 +0800 Subject: [PATCH 1/2] irqbalance: 1.9.4 -> 1.9.4-unstable-2025-06-10 Fixes NixOS/nixpkgs#371415 --- pkgs/by-name/ir/irqbalance/package.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ir/irqbalance/package.nix b/pkgs/by-name/ir/irqbalance/package.nix index ff9f4cd655fc..926001b76e8c 100644 --- a/pkgs/by-name/ir/irqbalance/package.nix +++ b/pkgs/by-name/ir/irqbalance/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "irqbalance"; - version = "1.9.4"; + version = "1.9.4-unstable-2025-06-10"; src = fetchFromGitHub { - owner = "irqbalance"; + owner = "Irqbalance"; repo = "irqbalance"; - rev = "v${version}"; - sha256 = "sha256-7es7wwsPnDSF37uL5SCgAQB+u+qGWmWDHOh3JkHuXMs="; + rev = "8e8945e5092caf45605dfb1e66165e2eb9ec1f56"; + sha256 = "sha256-DSXFJZ0MyI10ZVFcGY0Sx1kye1ALMeG41nmyqbfO8vQ="; }; nativeBuildInputs = [ @@ -37,12 +37,12 @@ stdenv.mkDerivation rec { configureFlags = lib.optionals enableSystemd [ "--with-systemd" + "systemdsystemunitdir=$$out/lib/systemd/system" ]; postInstall = '' # Systemd service - mkdir -p "$out/lib/systemd/system" - grep -vi "EnvironmentFile" misc/irqbalance.service >"$out/lib/systemd/system/irqbalance.service" + sed -i "/^EnvironmentFile=/d" "$out/lib/systemd/system/irqbalance.service" substituteInPlace "$out/lib/systemd/system/irqbalance.service" \ --replace-fail /usr/sbin/irqbalance "$out/bin/irqbalance --journal" \ --replace-fail ' $IRQBALANCE_ARGS' "" @@ -50,7 +50,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/Irqbalance/irqbalance"; - changelog = "https://github.com/Irqbalance/irqbalance/releases/tag/v${version}"; + changelog = lib.strings.optionalString ( + !lib.strings.hasInfix "-unstable-" version + ) "https://github.com/Irqbalance/irqbalance/releases/tag/v${version}"; description = "Daemon to help balance the cpu load generated by interrupts across all of a systems cpus"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; From 1f0dfd6c7019d8e9aea47bd4d9b161de850958ea Mon Sep 17 00:00:00 2001 From: ZHANG Yuntian Date: Tue, 2 Sep 2025 11:38:09 +0800 Subject: [PATCH 2/2] nixos/irqbalance: add package option This makes it easier to override packages. --- nixos/modules/services/hardware/irqbalance.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/hardware/irqbalance.nix b/nixos/modules/services/hardware/irqbalance.nix index 56a5db930d06..1235f72cce9c 100644 --- a/nixos/modules/services/hardware/irqbalance.nix +++ b/nixos/modules/services/hardware/irqbalance.nix @@ -11,15 +11,21 @@ let in { - options.services.irqbalance.enable = lib.mkEnableOption "irqbalance daemon"; + options.services.irqbalance = { + + enable = lib.mkEnableOption "irqbalance daemon"; + + package = lib.mkPackageOption pkgs "irqbalance" { }; + + }; config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.irqbalance ]; + environment.systemPackages = [ cfg.package ]; systemd.services.irqbalance.wantedBy = [ "multi-user.target" ]; - systemd.packages = [ pkgs.irqbalance ]; + systemd.packages = [ cfg.package ]; };