From 92eda65330c64e4fb9a477210a60486e9cc64278 Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Wed, 22 Apr 2026 18:56:11 +0000 Subject: [PATCH] dracut: 059 -> 111 --- pkgs/by-name/dr/dracut/package.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/dr/dracut/package.nix b/pkgs/by-name/dr/dracut/package.nix index 2dcac697dc05..bc901a594a59 100644 --- a/pkgs/by-name/dr/dracut/package.nix +++ b/pkgs/by-name/dr/dracut/package.nix @@ -5,7 +5,7 @@ gitUpdater, makeBinaryWrapper, pkg-config, - asciidoc, + asciidoctor, libxslt, docbook_xsl, bash, @@ -29,16 +29,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "dracut"; - version = "059"; + version = "111"; src = fetchFromGitHub { - owner = "dracutdevs"; - repo = "dracut"; - rev = finalAttrs.version; - hash = "sha256-zSyC2SnSQkmS/mDpBXG2DtVVanRRI9COKQJqYZZCPJM="; + owner = "dracut-ng"; + repo = "dracut-ng"; + tag = finalAttrs.version; + hash = "sha256-2jdS7/LGuLSBBXv1R/o8yjgwdXl2l2wNbZWxq01wSb0"; }; strictDeps = true; + __structuredAttrs = true; buildInputs = [ bash @@ -48,16 +49,17 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeBinaryWrapper pkg-config - asciidoc + asciidoctor libxslt docbook_xsl ]; postPatch = '' substituteInPlace dracut.sh \ - --replace 'dracutbasedir="$dracutsysrootdir"/usr/lib/dracut' 'dracutbasedir="$dracutsysrootdir"'"$out/lib/dracut" + --replace-fail "dracutbasedir=\"$""{dracutsysrootdir-}\"/usr/lib/dracut" \ + "if [ -n \"$""{dracutsysrootdir:-}\" ]; then dracutbasedir=\"$""{dracutsysrootdir}/usr/lib/dracut\" ; else dracutbasedir=\"$out/lib/dracut\" ; fi" substituteInPlace lsinitrd.sh \ - --replace 'dracutbasedir=/usr/lib/dracut' "dracutbasedir=$out/lib/dracut" + --replace-fail 'dracutbasedir=/usr/lib/dracut' "dracutbasedir=$out/lib/dracut" echo 'DRACUT_VERSION=${finalAttrs.version}' >dracut-version.sh ''; @@ -110,10 +112,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = gitUpdater { }; meta = { - homepage = "https://github.com/dracutdevs/dracut/wiki"; + homepage = "https://dracut-ng.github.io/"; + changelog = "https://github.com/dracut-ng/dracut/blob/${finalAttrs.src.tag}/NEWS.md"; description = "Event driven initramfs infrastructure"; license = lib.licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ tbutter ]; platforms = lib.platforms.linux; }; })