From 80e510ab58f98f5ce0f224612557ceaecd251dd7 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 31 May 2022 18:43:50 +0200
Subject: [PATCH] Fix supervisor package reference

---
 services-agnostic/constructors.nix             | 4 ++--
 services-agnostic/hydra/hydra-queue-runner.nix | 2 +-
 tests/supervisord/default.nix                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/services-agnostic/constructors.nix b/services-agnostic/constructors.nix
index 1081e6e..9112ea5 100644
--- a/services-agnostic/constructors.nix
+++ b/services-agnostic/constructors.nix
@@ -169,13 +169,13 @@ in
 
   supervisord = import ./supervisord {
     inherit createManagedProcess runtimeDir logDir;
-    inherit (pkgs.pythonPackages) supervisor;
+    inherit (pkgs.python3Packages) supervisor;
   };
 
   extendableSupervisord = import ./supervisord/extendable.nix {
     inherit createManagedProcess libDir runtimeDir logDir;
     inherit (pkgs) writeTextFile;
-    inherit (pkgs.pythonPackages) supervisor;
+    inherit (pkgs.python3Packages) supervisor;
   };
 
   svnserve = import ./svnserve {
diff --git a/services-agnostic/hydra/hydra-queue-runner.nix b/services-agnostic/hydra/hydra-queue-runner.nix
index a6cef94..997dbea 100644
--- a/services-agnostic/hydra/hydra-queue-runner.nix
+++ b/services-agnostic/hydra/hydra-queue-runner.nix
@@ -44,7 +44,7 @@ createManagedProcess {
 
     if [ "$found" != "1" ]
     then
-        echo "ERRORDatabase was still not created!" >&2
+        echo "ERROR: Database was still not created!" >&2
         exit 1
     fi
   '';
diff --git a/tests/supervisord/default.nix b/tests/supervisord/default.nix
index 44f2a4d..595f9a3 100644
--- a/tests/supervisord/default.nix
+++ b/tests/supervisord/default.nix
@@ -30,7 +30,7 @@ testService {
   extraParams = {
     inherit nix-processmgmt;
   };
-  systemPackages = [ pkgs.pythonPackages.supervisor ];
+  systemPackages = [ pkgs.python3Packages.supervisor ];
 
   readiness = {instanceName, instance, ...}:
     ''