diff --git a/nixos/modules/services/networking/pihole-ftl-setup-script.nix b/nixos/modules/services/networking/pihole-ftl-setup-script.nix index 50236a9a49e2..e5d0644c2f82 100644 --- a/nixos/modules/services/networking/pihole-ftl-setup-script.nix +++ b/nixos/modules/services/networking/pihole-ftl-setup-script.nix @@ -26,7 +26,7 @@ in if [ ! -f '${cfg.stateDirectory}'/gravity.db ]; then $pihole -g # Send SIGRTMIN to FTL, which makes it reload the database, opening the newly created one - ${pkgs.procps}/bin/kill -s SIGRTMIN $(systemctl show --property MainPID --value ${config.systemd.services.pihole-ftl.name}) + ${lib.getExe' pkgs.procps "kill"} -s SIGRTMIN $(systemctl show --property MainPID --value ${config.systemd.services.pihole-ftl.name}) fi source ${pihole}/usr/share/pihole/advanced/Scripts/api.sh @@ -61,7 +61,7 @@ in for i in 1 2 3; do (TestAPIAvailability) && break echo "Retrying API shortly..." - ${pkgs.coreutils}/bin/sleep .5s + ${lib.getExe' pkgs.coreutils "sleep"} .5s done; LoginAPI diff --git a/pkgs/by-name/pi/pihole-ftl/package.nix b/pkgs/by-name/pi/pihole-ftl/package.nix index 281d5231fbf0..1f9d054cfb7f 100644 --- a/pkgs/by-name/pi/pihole-ftl/package.nix +++ b/pkgs/by-name/pi/pihole-ftl/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pihole-ftl"; - version = "6.1"; + version = "6.2.2"; src = fetchFromGitHub { owner = "pi-hole"; repo = "FTL"; tag = "v${finalAttrs.version}"; - hash = "sha256-b3/kyDQa6qDK2avvDObWLvwUpAn6TFr1ZBdQC9AZWa4="; + hash = "sha256-VFoltLlzKJCeJWQ2SzbvQxcYNBhZtWqFjzO3rjuBAdE="; }; nativeBuildInputs = [ @@ -60,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "execv" "execvp" substituteInPlace src/database/network-table.c \ - --replace-fail "ip neigh show" "${iproute2}/bin/ip neigh show" \ - --replace-fail "ip address show" "${iproute2}/bin/ip address show" + --replace-fail "ip neigh show" "${lib.getExe' iproute2 "ip"} neigh show" \ + --replace-fail "ip address show" "${lib.getExe' iproute2 "ip"} address show" ''; installPhase = '' @@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Pi-hole FTL engine"; homepage = "https://github.com/pi-hole/FTL"; + changelog = "https://github.com/pi-hole/FTL/releases/tag/v${finalAttrs.version}"; license = lib.licenses.eupl12; maintainers = with lib.maintainers; [ averyvigolo ]; platforms = lib.platforms.linux;