gistfile1.txt

diff --git a/hydra-module.nix b/hydra-module.nix
index 37fb951f..7f294c98 100644
--- a/hydra-module.nix
+++ b/hydra-module.nix
@@ -433,8 +433,8 @@ in
         hydra-users hydra-queue-runner hydra
         hydra-users hydra-www hydra
         hydra-users root hydra
-        # The postgres user is used to create the pg_trgm extension for the hydra database
-        hydra-users postgres postgres
+        # The postgres super user is used to create the pg_trgm extension for the hydra database
+        hydra-users ${config.services.postgresql.superUser} ${config.services.postgresql.superUser}
       '';
 
     services.postgresql.authentication = optionalString haveLocalDB
diff --git a/release.nix b/release.nix
index 408e3f69..9bde8670 100644
--- a/release.nix
+++ b/release.nix
@@ -1,5 +1,5 @@
 { hydraSrc ? builtins.fetchGit ./.
-, nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-19.09-small"; }
+, nixpkgs ? builtins.fetchTarball "https://github.com/nixos/nixpkgs-channels/archive/nixos-19.09.tar.gz"
 , officialRelease ? false
 , shell ? false
 }:
@@ -80,8 +80,8 @@ rec {
             CatalystViewDownload
             CatalystViewJSON
             CatalystViewTT
-            CatalystXScriptServerStarman
             CatalystXRoleApplicator
+            CatalystXScriptServerStarman
             CryptRandPasswd
             DBDPg
             DBDSQLite