From 9ce87bd9118e49fb167699e3837a3293818f660e Mon Sep 17 00:00:00 2001
From: Willy <jemand771@gmx.net>
Date: Fri, 2 May 2025 21:07:20 +0200
Subject: [PATCH 1/2] nixos/graphite: fix django-admin executable name

---
 nixos/modules/services/monitoring/graphite.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 162d9ce679be..dcdb473efb27 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -397,7 +397,7 @@ in
             mkdir -p ${dataDir}/{whisper/,log/webapp/}
             chmod 0700 ${dataDir}/{whisper/,log/webapp/}
 
-            ${pkgs.python3Packages.django}/bin/django-admin.py migrate --noinput
+            ${pkgs.python3Packages.django}/bin/django-admin migrate --noinput
 
             chown -R graphite:graphite ${dataDir}
 
@@ -407,7 +407,7 @@ in
           # Only collect static files when graphite_web changes.
           if ! [ "${dataDir}/current_graphite_web" -ef "${pkgs.python3Packages.graphite-web}" ]; then
             mkdir -p ${staticDir}
-            ${pkgs.python3Packages.django}/bin/django-admin.py collectstatic  --noinput --clear
+            ${pkgs.python3Packages.django}/bin/django-admin collectstatic  --noinput --clear
             chown -R graphite:graphite ${staticDir}
             ln -sfT "${pkgs.python3Packages.graphite-web}" "${dataDir}/current_graphite_web"
           fi

From 67a22705e746ca7026561a950f925d8f98d98929 Mon Sep 17 00:00:00 2001
From: Willy <jemand771@gmx.net>
Date: Fri, 2 May 2025 21:13:48 +0200
Subject: [PATCH 2/2] nixos/graphite: use lib.getExe

---
 nixos/modules/services/monitoring/graphite.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index dcdb473efb27..fc65c07e5dfa 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -292,7 +292,7 @@ in
           serviceConfig = {
             Slice = "system-graphite.slice";
             RuntimeDirectory = name;
-            ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}";
+            ExecStart = "${lib.getExe' pkgs.python3Packages.twisted "twistd"} ${carbonOpts name}";
             User = "graphite";
             Group = "graphite";
             PermissionsStartOnly = true;
@@ -319,7 +319,7 @@ in
           serviceConfig = {
             Slice = "system-graphite.slice";
             RuntimeDirectory = name;
-            ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}";
+            ExecStart = "${lib.getExe' pkgs.python3Packages.twisted "twistd"} ${carbonOpts name}";
             User = "graphite";
             Group = "graphite";
             PIDFile = "/run/${name}/${name}.pid";
@@ -340,7 +340,7 @@ in
           serviceConfig = {
             Slice = "system-graphite.slice";
             RuntimeDirectory = name;
-            ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}";
+            ExecStart = "${lib.getExe' pkgs.python3Packages.twisted "twistd"} ${carbonOpts name}";
             User = "graphite";
             Group = "graphite";
             PIDFile = "/run/${name}/${name}.pid";
@@ -384,7 +384,7 @@ in
         };
         serviceConfig = {
           ExecStart = ''
-            ${pkgs.python3Packages.waitress-django}/bin/waitress-serve-django \
+            ${lib.getExe pkgs.python3Packages.waitress-django} \
               --host=${cfg.web.listenAddress} --port=${toString cfg.web.port}
           '';
           User = "graphite";
@@ -397,7 +397,7 @@ in
             mkdir -p ${dataDir}/{whisper/,log/webapp/}
             chmod 0700 ${dataDir}/{whisper/,log/webapp/}
 
-            ${pkgs.python3Packages.django}/bin/django-admin migrate --noinput
+            ${lib.getExe' pkgs.python3Packages.django "django-admin"} migrate --noinput
 
             chown -R graphite:graphite ${dataDir}
 
@@ -407,7 +407,7 @@ in
           # Only collect static files when graphite_web changes.
           if ! [ "${dataDir}/current_graphite_web" -ef "${pkgs.python3Packages.graphite-web}" ]; then
             mkdir -p ${staticDir}
-            ${pkgs.python3Packages.django}/bin/django-admin collectstatic  --noinput --clear
+            ${lib.getExe' pkgs.python3Packages.django "django-admin"} collectstatic  --noinput --clear
             chown -R graphite:graphite ${staticDir}
             ln -sfT "${pkgs.python3Packages.graphite-web}" "${dataDir}/current_graphite_web"
           fi
@@ -427,7 +427,7 @@ in
         ];
         environment = seyrenConfig;
         serviceConfig = {
-          ExecStart = "${pkgs.seyren}/bin/seyren -httpPort ${toString cfg.seyren.port}";
+          ExecStart = "${lib.getExe pkgs.seyren} -httpPort ${toString cfg.seyren.port}";
           WorkingDirectory = dataDir;
           User = "graphite";
           Group = "graphite";