From e28f5a1c20764c609df6f9ae47d06992e0dd91ce Mon Sep 17 00:00:00 2001 From: Lisanna Dettwyler Date: Sat, 7 Mar 2026 13:01:31 -0500 Subject: [PATCH 1/4] runit: enable parallel building Signed-off-by: Lisanna Dettwyler --- pkgs/by-name/ru/runit/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ru/runit/package.nix b/pkgs/by-name/ru/runit/package.nix index b9523760a021..4b7cd61ea04a 100644 --- a/pkgs/by-name/ru/runit/package.nix +++ b/pkgs/by-name/ru/runit/package.nix @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { sed -i 's,-static,,g' src/Makefile ''; + enableParallelBuilding = true; + preBuild = '' cd src From f23fa1f2b9ea51949416def81209f9087be611ac Mon Sep 17 00:00:00 2001 From: Lisanna Dettwyler Date: Sat, 7 Mar 2026 13:00:52 -0500 Subject: [PATCH 2/4] runit: fix patch Signed-off-by: Lisanna Dettwyler --- pkgs/by-name/ru/runit/fix-ar-ranlib.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ru/runit/fix-ar-ranlib.patch b/pkgs/by-name/ru/runit/fix-ar-ranlib.patch index c65a037d5242..02d070c06673 100644 --- a/pkgs/by-name/ru/runit/fix-ar-ranlib.patch +++ b/pkgs/by-name/ru/runit/fix-ar-ranlib.patch @@ -1,5 +1,5 @@ ---- runit-2.1.2/src/print-ar.sh -+++ runit-2.1.2/src/print-ar.sh +--- a/src/print-ar.sh ++++ b/src/print-ar.sh @@ -1,7 +1,7 @@ cat warn-auto.sh echo 'main="$1"; shift' From 22c804c6ad177ca309199a6513cfcc4ad29f7eb7 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 24 May 2026 02:18:58 +0200 Subject: [PATCH 3/4] runit: add meta.mainProgram --- pkgs/by-name/ru/runit/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ru/runit/package.nix b/pkgs/by-name/ru/runit/package.nix index 4b7cd61ea04a..94e5346abcd7 100644 --- a/pkgs/by-name/ru/runit/package.nix +++ b/pkgs/by-name/ru/runit/package.nix @@ -68,5 +68,6 @@ stdenv.mkDerivation rec { homepage = "http://smarden.org/runit"; maintainers = [ ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; + mainProgram = "runit"; }; } From 5d8485d610aed6288d2b1292a3adc2a61267dd74 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 24 May 2026 02:20:54 +0200 Subject: [PATCH 4/4] runit: use finalAttrs --- pkgs/by-name/ru/runit/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ru/runit/package.nix b/pkgs/by-name/ru/runit/package.nix index 94e5346abcd7..1bd3067e90ea 100644 --- a/pkgs/by-name/ru/runit/package.nix +++ b/pkgs/by-name/ru/runit/package.nix @@ -7,13 +7,13 @@ static ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "runit"; version = "2.3.1"; src = fetchurl { - url = "https://smarden.org/runit/${pname}-${version}.tar.gz"; - sha256 = "sha256-Y08jyMTR1EAEO+D+ko3fkEYmKJ6Xv+fFgm6TqvLMb+k="; + url = "https://smarden.org/runit/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + hash = "sha256-Y08jyMTR1EAEO+D+ko3fkEYmKJ6Xv+fFgm6TqvLMb+k="; }; patches = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "man" ]; - sourceRoot = "admin/${pname}-${version}"; + sourceRoot = "admin/${finalAttrs.pname}-${finalAttrs.version}"; doCheck = true; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "runit"; }; -} +})