From c4269e49a680b375e6bf613f6d3b646502afb719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Feb 2023 14:03:27 -0800 Subject: [PATCH 1/2] iptsd: correctly install udev rule and systemd service file This allows using services.udev.packages and systemd.packages. --- pkgs/applications/misc/iptsd/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix index 52872f3fbdb0..7f28f5029bbc 100644 --- a/pkgs/applications/misc/iptsd/default.nix +++ b/pkgs/applications/misc/iptsd/default.nix @@ -45,8 +45,10 @@ stdenv.mkDerivation rec { # Original installs udev rules and service config into global paths postPatch = '' substituteInPlace etc/meson.build \ - --replace "install_dir: unitdir" "install_dir: datadir" \ - --replace "install_dir: rulesdir" "install_dir: datadir" \ + --replace "install_dir: unitdir" "install_dir: '$out/etc/systemd/system'" \ + --replace "install_dir: rulesdir" "install_dir: '$out/etc/udev/rules.d'" + substituteInPlace etc/udev/50-ipts.rules \ + --replace "/bin/systemd-escape" "${systemd}/bin/systemd-escape" ''; mesonFlags = [ From 96b055cbe734e2b99bb40adc42cbb3aefb444a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Feb 2023 14:05:19 -0800 Subject: [PATCH 2/2] iptsd: 1.0.0 -> 1.0.1 Diff: https://github.com/linux-surface/iptsd/compare/v1.0.0...v1.0.1 Changelog: https://github.com/linux-surface/iptsd/releases/tag/v1.0.1 --- pkgs/applications/misc/iptsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix index 7f28f5029bbc..8241c3e98cfc 100644 --- a/pkgs/applications/misc/iptsd/default.nix +++ b/pkgs/applications/misc/iptsd/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "iptsd"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "linux-surface"; repo = pname; rev = "v${version}"; - hash = "sha256-fd/WZXRvJb6XCATNmPj2xi1UseoZqBT9IN21iwxHGLs="; + hash = "sha256-B5d1OjrRB164BYtFzZoZ3I4elZSKpHg0PCBiwXPnqLs="; }; nativeBuildInputs = [