commit 83d3cc8a988df486df73d83c0585970508affe93 · pyrox.dev/nixpkgs

+2 -2

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

···

       29
       29
        
           ${lib.getExe' pkgs.procps "kill"} -s SIGRTMIN $(systemctl show --property MainPID --value ${config.systemd.services.pihole-ftl.name})

     

       30
       30
        
         fi

     

       31
       31
        
       

     

       32
       32
       -
         source ${pihole}/usr/share/pihole/advanced/Scripts/api.sh

     

       33
       33
       -
         source ${pihole}/usr/share/pihole/advanced/Scripts/utils.sh

     

       32
       32
       +
         source ${pihole}/share/pihole/advanced/Scripts/api.sh

     

       33
       33
       +
         source ${pihole}/share/pihole/advanced/Scripts/utils.sh

     

       34
       34
        
       

     

       35
       35
        
         any_failed=0

     

       36
       36

+8 -8

pkgs/by-name/pi/pihole/0001-Remove-sudo.patch

···

       1
       1
       -
       From a2b3aa45d6e073272608506b1d27e4f43f2b0032 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: williamvds <william@williamvds.me>

     

       3
       3
       -
       Date: Sun, 6 Apr 2025 23:00:41 +0100

     

       4
       4
       -
       Subject: [PATCH 1/3] Remove sudo

     

       1
       1
       +
       From 833856bd77dc6ea77557ab0659c1459bee393653 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: averyv <avery@averyv.me>

     

       3
       3
       +
       Date: Sat, 6 Sep 2025 17:51:48 +0100

     

       4
       4
       +
       Subject: [PATCH 1/2] Remove sudo

     

       5
       5
        
       

     

       6
       6
        
       Rely on polkit and sensible permissions

     

       7
       7
        
       ---

     
···

       9
       9
        
        1 file changed, 8 deletions(-)

     

       10
       10
        
       

     

       11
       11
        
       diff --git a/pihole b/pihole

     

       12
       12
       -
       index 1d5093c..6afc48a 100755

     

       12
       12
       +
       index 7b5e3eb..b00617e 100755

     

       13
       13
        
       --- a/pihole

     

       14
       14
        
       +++ b/pihole

     

       15
       15
        
       @@ -570,14 +570,6 @@ if [[ -z ${USER} ]]; then

     

       16
       16
        
          USER=$(whoami)

     

       17
       17
        
        fi

     

       18
       18
        
        

     

       19
       19
       -
       -# Check if the current user is neither root nor pihole and if the command

     

       19
       19
       +
       -# Check if the current user is not root and if the command

     

       20
       20
        
       -# requires root. If so, exit with an error message.

     

       21
       21
       -
       -if [[ $EUID -ne 0 && ${USER} != "pihole" && need_root -eq 1 ]];then

     

       21
       21
       +
       -if [[ $EUID -ne 0 && need_root -eq 1 ]];then

     

       22
       22
        
       -  echo -e "  ${CROSS} The Pi-hole command requires root privileges, try:"

     

       23
       23
        
       -  echo -e "      ${COL_GREEN}sudo pihole $*${COL_NC}"

     

       24
       24
        
       -  exit 1

     
···

       28
       28
        
        case "${1}" in

     

       29
       29
        
          "allow" | "allowlist"           ) listFunc "$@";;

     

       30
       30
        
       -- 

     

       31
       31
       -
       2.48.1

     

       31
       31
       +
       2.50.1

     

       32
       32

+6 -6

pkgs/by-name/pi/pihole/0002-Remove-unsupported-commands.patch

···

       1
       1
       -
       From ab0650484cdd89afb5b60a0a046509ec5ae14375 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: williamvds <william@williamvds.me>

     

       3
       3
       -
       Date: Sun, 6 Apr 2025 23:01:30 +0100

     

       4
       4
       -
       Subject: [PATCH 2/3] Remove unsupported commands

     

       1
       1
       +
       From d72475d713a8eecd1476bc5bb4acfb0448d5abad Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: averyv <avery@averyv.me>

     

       3
       3
       +
       Date: Sat, 6 Sep 2025 18:04:11 +0100

     

       4
       4
       +
       Subject: [PATCH 2/2] Remove unsupported commands

     

       5
       5
        
       

     

       6
       6
        
       Remove some unsupported maintenance commands, particularly the ones which

     

       7
       7
        
       reinstall, update, and uninstall pihole. This is managed by NixOS, after all.

     
···

       10
       10
        
        1 file changed, 7 insertions(+), 2 deletions(-)

     

       11
       11
        
       

     

       12
       12
        
       diff --git a/pihole b/pihole

     

       13
       13
       -
       index 6afc48a..cce7c97 100755

     

       13
       13
       +
       index b00617e..a3c2e20 100755

     

       14
       14
        
       --- a/pihole

     

       15
       15
        
       +++ b/pihole

     

       16
       16
        
       @@ -92,6 +92,7 @@ debugFunc() {

     
···

       63
       63
        
        

     

       64
       64
        
        helpFunc() {

     

       65
       65
        
       -- 

     

       66
       66
       -
       2.48.1

     

       66
       66
       +
       2.50.1

     

       67
       67

-52

pkgs/by-name/pi/pihole/0003-Fix-redefinition-of-readonly-variable-utilsfile.patch

···

       1
       1
       -
       From cca2f6437e3ba09019b8fcb1986b4558d7c6db4e Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: williamvds <william@williamvds.me>

     

       3
       3
       -
       Date: Sat, 31 May 2025 13:43:42 +0100

     

       4
       4
       -
       Subject: [PATCH 3/3] Fix redefinition of readonly variable utilsfile

     

       5
       5
       -
       

     

       6
       6
       -
       ---

     

       7
       7
       -
        advanced/Scripts/api.sh |  2 +-

     

       8
       8
       -
        pihole                  | 10 +++-------

     

       9
       9
       -
        2 files changed, 4 insertions(+), 8 deletions(-)

     

       10
       10
       -
       

     

       11
       11
       -
       diff --git a/advanced/Scripts/api.sh b/advanced/Scripts/api.sh

     

       12
       12
       -
       index 613a8d8..8720043 100755

     

       13
       13
       -
       --- a/advanced/Scripts/api.sh

     

       14
       14
       -
       +++ b/advanced/Scripts/api.sh

     

       15
       15
       -
       @@ -19,7 +19,7 @@

     

       16
       16
       -
        

     

       17
       17
       -
        TestAPIAvailability() {

     

       18
       18
       -
        

     

       19
       19
       -
       -    local chaos_api_list authResponse authStatus authData apiAvailable DNSport

     

       20
       20
       -
       +    local chaos_api_list authResponse authStatus authData apiAvailable DNSport utilsfile

     

       21
       21
       -
        

     

       22
       22
       -
            # as we are running locally, we can get the port value from FTL directly

     

       23
       23
       -
            readonly utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh"

     

       24
       24
       -
       diff --git a/pihole b/pihole

     

       25
       25
       -
       index cce7c97..d63d064 100755

     

       26
       26
       -
       --- a/pihole

     

       27
       27
       -
       +++ b/pihole

     

       28
       28
       -
       @@ -16,18 +16,14 @@ readonly PI_HOLE_SCRIPT_DIR="/opt/pihole"

     

       29
       29
       -
        # error due to modifying a readonly variable.

     

       30
       30
       -
        PI_HOLE_BIN_DIR="/usr/local/bin"

     

       31
       31
       -
        

     

       32
       32
       -
       -readonly colfile="${PI_HOLE_SCRIPT_DIR}/COL_TABLE"

     

       33
       33
       -
        # shellcheck source=./advanced/Scripts/COL_TABLE

     

       34
       34
       -
       -source "${colfile}"

     

       35
       35
       -
       +source "${PI_HOLE_SCRIPT_DIR}/COL_TABLE"

     

       36
       36
       -
        

     

       37
       37
       -
       -readonly utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh"

     

       38
       38
       -
        # shellcheck source=./advanced/Scripts/utils.sh

     

       39
       39
       -
       -source "${utilsfile}"

     

       40
       40
       -
       +source "${PI_HOLE_SCRIPT_DIR}/utils.sh"

     

       41
       41
       -
        

     

       42
       42
       -
       -# Source api functions

     

       43
       43
       -
       -readonly apifile="${PI_HOLE_SCRIPT_DIR}/api.sh"

     

       44
       44
       -
        # shellcheck source=./advanced/Scripts/api.sh

     

       45
       45
       -
       -source "${apifile}"

     

       46
       46
       -
       +source "${PI_HOLE_SCRIPT_DIR}/api.sh"

     

       47
       47
       -
        

     

       48
       48
       -
        versionsfile="/etc/pihole/versions"

     

       49
       49
       -
        if [ -f "${versionsfile}" ]; then

     

       50
       50
       -
       -- 

     

       51
       51
       -
       2.48.1

     

       52
       52
       -

+16 -16

pkgs/by-name/pi/pihole/package.nix

···

       31
       31
        
       

     

       32
       32
        
       (resholve.mkDerivation rec {

     

       33
       33
        
         pname = "pihole";

     

       34
       34
       -
         version = "6.1";

     

       34
       34
       +
         version = "6.1.4";

     

       35
       35
        
       

     

       36
       36
        
         src = fetchFromGitHub {

     

       37
       37
        
           owner = "pi-hole";

     

       38
       38
        
           repo = "pi-hole";

     

       39
       39
        
           tag = "v${version}";

     

       40
       40
       -
           hash = "sha256-aEnv8Lhb5vf0yDyuriVTaUY1wcdVmTdqoK+KDHvT/Lw=";

     

       40
       40
       +
           hash = "sha256-2B2GUJKt4jHEjQLBx96FRuHpnLCTzE4UPDaeQvnDONc=";

     

       41
       41
        
         };

     

       42
       42
        
       

     

       43
       43
        
         patches = [

     
···

       45
       45
        
           ./0001-Remove-sudo.patch

     

       46
       46
        
           # Disable unsupported subcommands, particularly those for imperatively installing/upgrading Pi-hole

     

       47
       47
        
           ./0002-Remove-unsupported-commands.patch

     

       48
       48
       -
           # Fix a readonly variable error caused by defining a shadowing local variable

     

       49
       49
       -
           ./0003-Fix-redefinition-of-readonly-variable-utilsfile.patch

     

       50
       48
        
         ];

     

       51
       49
        
       

     

       52
       50
        
         nativeBuildInputs = [

     
···

       57
       55
        
         installPhase = ''

     

       58
       56
        
           runHook preInstall

     

       59
       57
        
       

     

       60
       60
       -
           readonly scriptsDir=$out/usr/share/pihole

     

       58
       58
       +
           readonly scriptsDir=$out/share/pihole

     

       61
       59
        
       

     

       62
       60
        
           install -Dm 555 -t $out/bin pihole

     

       63
       61
        
           install -Dm 555 -t $scriptsDir/advanced/Scripts gravity.sh

     
···

       74
       72
        
         solutions.default =

     

       75
       73
        
           let

     

       76
       74
        
             out = builtins.placeholder "out";

     

       77
       77
       -
             scriptsDir = "${out}/usr/share/pihole/advanced/Scripts";

     

       75
       75
       +
             scriptsDir = "${out}/share/pihole/advanced/Scripts";

     

       78
       76
        
           in

     

       79
       77
        
           {

     

       80
       78
        
             scripts =

     

       81
       79
        
               let

     

       82
       82
       -
                 relativeScripts = "usr/share/pihole/advanced/Scripts";

     

       80
       80
       +
                 relativeScripts = "share/pihole/advanced/Scripts";

     

       83
       81
        
               in

     

       84
       82
        
               [

     

       85
       83
        
                 "bin/pihole"

     
···

       101
       99
        
             inputs = [

     

       102
       100
        
               # TODO: see if these inputs can help resholving

     

       103
       101
        
               "bin"

     

       104
       104
       -
               "usr/share/pihole/advanced/Scripts"

     

       102
       102
       +
               "share/pihole/advanced/Scripts"

     

       105
       103
        
       

     

       106
       104
        
               bash

     

       107
       105
        
               coreutils

     
···

       150
       148
        
             };

     

       151
       149
        
             fix = {

     

       152
       150
        
               "$PI_HOLE_BIN_DIR" = [ "${out}/bin" ];

     

       153
       153
       -
               "$PI_HOLE_FILES_DIR" = [ "${out}/usr/share/pihole" ];

     

       151
       151
       +
               "$PI_HOLE_FILES_DIR" = [ "${out}/share/pihole" ];

     

       154
       152
        
               "$PI_HOLE_INSTALL_DIR" = [ scriptsDir ];

     

       155
       155
       -
               "$PI_HOLE_LOCAL_REPO" = [ "${out}/usr/share/pihole" ];

     

       153
       153
       +
               "$PI_HOLE_LOCAL_REPO" = [ "${out}/share/pihole" ];

     

       156
       154
        
               "$PI_HOLE_SCRIPT_DIR" = [ scriptsDir ];

     

       157
       155
        
               "$colfile" = [ "${scriptsDir}/COL_TABLE" ];

     

       158
       156
        
               "$coltable" = [ "${scriptsDir}/COL_TABLE" ];

     

       159
       157
        
               "$PIHOLE_COLTABLE_FILE" = [ "${scriptsDir}/COL_TABLE" ];

     

       160
       158
        
               "$utilsfile" = [ "${scriptsDir}/utils.sh" ];

     

       161
       159
        
               "$apifile" = [ "${scriptsDir}/api.sh" ];

     

       162
       162
       -
               "$piholeGitDir" = [ "${out}/usr/share/pihole" ];

     

       160
       160
       +
               "$piholeGitDir" = [ "${out}/share/pihole" ];

     

       163
       161
        
               "$PIHOLE_COMMAND" = [ "pihole" ];

     

       164
       162
        
             };

     

       165
       163
        
             keep = {

     
···

       168
       166
        
                 "$setupVars" # Global config file

     

       169
       167
        
                 "$PIHOLE_SETUP_VARS_FILE"

     

       170
       168
        
                 "$versionsfile" # configuration file, doesn't exist on NixOS

     

       171
       171
       -
                 "${out}/usr/share/pihole/automated install/basic-install.sh"

     

       169
       169
       +
                 "${out}/share/pihole/automated install/basic-install.sh"

     

       172
       170
        
                 "${scriptsDir}/COL_TABLE"

     

       173
       171
        
                 "${scriptsDir}/database_migration/gravity-db.sh"

     

       174
       172
        
                 "${scriptsDir}/gravity.sh"

     
···

       213
       211
        
               # both quoted and escaped. Resholve apparently requires matching the

     

       214
       212
        
               # literal path, so we need to provide a version with and without the

     

       215
       213
        
               # backslash.

     

       216
       216
       -
               "'${out}/usr/share/pihole/automated\\ install/basic-install.sh'" = true;

     

       217
       217
       -
               "'${out}/usr/share/pihole/automated install/basic-install.sh'" = true;

     

       214
       214
       +
               "'${out}/share/pihole/automated\\ install/basic-install.sh'" = true;

     

       215
       215
       +
               "'${out}/share/pihole/automated install/basic-install.sh'" = true;

     

       218
       216
        
       

     

       219
       217
        
               "/etc/.pihole" = true; # Patched with an override

     

       220
       218
        
               "/etc/os-release" = true;

     
···

       232
       230
        
       

     

       233
       231
        
         meta = {

     

       234
       232
        
           description = "Black hole for Internet advertisements";

     

       233
       233
       +
           homepage = "https://pi-hole.net";

     

       234
       234
       +
           changelog = "https://github.com/pi-hole/pi-hole/releases/tag/v${version}";

     

       235
       235
        
           license = lib.licenses.eupl12;

     

       236
       236
        
           maintainers = with lib.maintainers; [ averyvigolo ];

     

       237
       237
        
           platforms = lib.platforms.linux;

     
···

       239
       239
        
         };

     

       240
       240
        
       

     

       241
       241
        
         passthru = {

     

       242
       242
       -
           stateDir = stateDir;

     

       242
       242
       +
           inherit stateDir;

     

       243
       243
        
         };

     

       244
       244
        
       }).overrideAttrs

     

       245
       245
        
         (old: {

     

       246
       246
        
           # Resholve can't fix the hardcoded absolute paths, so substitute them before resholving

     

       247
       247
        
           preFixup = ''

     

       248
       248
       -
             scriptsDir=$out/usr/share/pihole

     

       248
       248
       +
             scriptsDir=$out/share/pihole

     

       249
       249
        
       

     

       250
       250
        
             substituteInPlace $out/bin/pihole $scriptsDir/advanced/Scripts/*.sh \

     

       251
       251
        
               --replace-quiet /etc/.pihole $scriptsDir \