From 492b3f330f647c1c6db23996cd80dfd79adc7986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 7 Apr 2025 13:51:20 +0200 Subject: [PATCH] networkd-dispatcher: remove unused configparser, use installManPage and --replace-fail --- pkgs/by-name/ne/networkd-dispatcher/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ne/networkd-dispatcher/package.nix b/pkgs/by-name/ne/networkd-dispatcher/package.nix index e0892968d7ca..486551ce0f6a 100644 --- a/pkgs/by-name/ne/networkd-dispatcher/package.nix +++ b/pkgs/by-name/ne/networkd-dispatcher/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitLab, fetchpatch, + installShellFiles, python3Packages, asciidoc, wrapGAppsNoGuiHook, @@ -36,13 +37,14 @@ stdenv.mkDerivation rec { postPatch = '' # Fix paths in systemd unit file substituteInPlace networkd-dispatcher.service \ - --replace "/usr/bin/networkd-dispatcher" "$out/bin/networkd-dispatcher" + --replace-fail "/usr/bin/networkd-dispatcher" "$out/bin/networkd-dispatcher" # Remove conditions on existing rules path sed -i '/ConditionPathExistsGlob/g' networkd-dispatcher.service ''; nativeBuildInputs = [ - asciidoc + asciidoc # for a2x + installShellFiles wrapGAppsNoGuiHook python3Packages.wrapPython ]; @@ -58,7 +60,6 @@ stdenv.mkDerivation rec { ]; pythonPath = with python3Packages; [ - configparser dbus-python pygobject3 ]; @@ -68,7 +69,7 @@ stdenv.mkDerivation rec { install -D -m755 -t $out/bin networkd-dispatcher install -Dm644 networkd-dispatcher.service $out/lib/systemd/system/networkd-dispatcher.service install -Dm644 networkd-dispatcher.conf $out/etc/conf.d/networkd-dispatcher.conf - install -D networkd-dispatcher.8 -t $out/share/man/man8/ + installManPage networkd-dispatcher.8 runHook postInstall '';