movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

pihole-ftl: update 6.1 -> 6.2.2

Browse source 
Apply some review suggestions by @dotlambda
This commit is contained in:
williamvds 2025-06-07 17:33:29 +01:00
parent f98ba0c331
commit e8b98ec709
No known key found for this signature in database
GPG key ID: 7A4DF5A8CDBD49C7
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/networking/pihole-ftl-setup-script.nix
View file

@ -26,7 +26,7 @@ in
if [ ! -f '${cfg.stateDirectory}'/gravity.db ]; then if [ ! -f '${cfg.stateDirectory}'/gravity.db ]; then
$pihole -g $pihole -g
# Send SIGRTMIN to FTL, which makes it reload the database, opening the newly created one # 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 fi
source ${pihole}/usr/share/pihole/advanced/Scripts/api.sh source ${pihole}/usr/share/pihole/advanced/Scripts/api.sh
@ -61,7 +61,7 @@ in
for i in 1 2 3; do for i in 1 2 3; do
(TestAPIAvailability) && break (TestAPIAvailability) && break
echo "Retrying API shortly..." echo "Retrying API shortly..."
${pkgs.coreutils}/bin/sleep .5s ${lib.getExe' pkgs.coreutils "sleep"} .5s
done; done;
LoginAPI LoginAPI

9
pkgs/by-name/pi/pihole-ftl/package.nix
View file

@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "pihole-ftl"; pname = "pihole-ftl";
version = "6.1"; version = "6.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pi-hole"; owner = "pi-hole";
repo = "FTL"; repo = "FTL";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-b3/kyDQa6qDK2avvDObWLvwUpAn6TFr1ZBdQC9AZWa4="; hash = "sha256-VFoltLlzKJCeJWQ2SzbvQxcYNBhZtWqFjzO3rjuBAdE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -60,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail "execv" "execvp" --replace-fail "execv" "execvp"
substituteInPlace src/database/network-table.c \ substituteInPlace src/database/network-table.c \
--replace-fail "ip neigh show" "${iproute2}/bin/ip neigh show" \ --replace-fail "ip neigh show" "${lib.getExe' iproute2 "ip"} neigh show" \
--replace-fail "ip address show" "${iproute2}/bin/ip address show" --replace-fail "ip address show" "${lib.getExe' iproute2 "ip"} address show"
''; '';
installPhase = '' installPhase = ''
@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = { meta = {
description = "Pi-hole FTL engine"; description = "Pi-hole FTL engine";
homepage = "https://github.com/pi-hole/FTL"; homepage = "https://github.com/pi-hole/FTL";
changelog = "https://github.com/pi-hole/FTL/releases/tag/v${finalAttrs.version}";
license = lib.licenses.eupl12; license = lib.licenses.eupl12;
maintainers = with lib.maintainers; [ averyvigolo ]; maintainers = with lib.maintainers; [ averyvigolo ];
platforms = lib.platforms.linux; platforms = lib.platforms.linux;