From dd2c53cb2cdc8723617f61c3134235faa1bd7cc8 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <bas@dfinity.org>
Date: Sat, 27 May 2023 12:16:28 +0000
Subject: [PATCH 1/2] pgmanage: 11.0.1 -> 11.0.1-git-a028604

The last release 11.0.1 from 2018 fails the NixOS test
probably because of PostgreSQL-12 incompatibility.
Fortunately the latest master does succeed the test.
---
 pkgs/applications/misc/pgmanage/default.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
index b892ebb2a9e0..ba996181c011 100644
--- a/pkgs/applications/misc/pgmanage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -1,14 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, postgresql, openssl } :
-
+{ lib, stdenv, fetchFromGitHub, postgresql, openssl, nixosTests } :
+let
+  # The last release 11.0.1 from 2018 fails the NixOS test
+  # probably because of PostgreSQL-12 incompatibility.
+  # Fortunately the latest master does succeed the test.
+  rev = "a028604416be382d6d310bc68b4e7c3cd16020fb";
+in
 stdenv.mkDerivation rec {
   pname = "pgmanage";
-  version = "11.0.1";
+  version = "11.0.1-git-${builtins.substring 0 7 rev}";
 
   src = fetchFromGitHub {
     owner  = "pgManage";
     repo   = "pgManage";
-    rev    = "v${version}";
-    sha256 = "1a1dbc32b3y0ph8ydf800h6pz7dg6g1gxgid4gffk7k58xj0c5yf";
+    inherit rev;
+    sha256 = "sha256-ibCzZrqfbio1wBVFKB6S/wdRxnCc7s3IQdtI9txxhaM=";
   };
 
   patchPhase = ''
@@ -21,6 +26,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ postgresql openssl ];
 
+  passthru.tests.sign-in = nixosTests.pgmanage;
+
   meta = with lib; {
     description = "A fast replacement for PGAdmin";
     longDescription = ''

From 8195adcf53b2fd4cb4b0eeb439ec8ce2a6ec2770 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <bas@dfinity.org>
Date: Sat, 27 May 2023 14:39:24 +0000
Subject: [PATCH 2/2] pgmanage: use a valid version number

---
 pkgs/applications/misc/pgmanage/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
index ba996181c011..eac927ad3b2c 100644
--- a/pkgs/applications/misc/pgmanage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -1,18 +1,15 @@
 { lib, stdenv, fetchFromGitHub, postgresql, openssl, nixosTests } :
-let
+stdenv.mkDerivation rec {
+  pname = "pgmanage";
   # The last release 11.0.1 from 2018 fails the NixOS test
   # probably because of PostgreSQL-12 incompatibility.
   # Fortunately the latest master does succeed the test.
-  rev = "a028604416be382d6d310bc68b4e7c3cd16020fb";
-in
-stdenv.mkDerivation rec {
-  pname = "pgmanage";
-  version = "11.0.1-git-${builtins.substring 0 7 rev}";
+  version = "unstable-2022-05-11";
 
   src = fetchFromGitHub {
     owner  = "pgManage";
     repo   = "pgManage";
-    inherit rev;
+    rev    = "a028604416be382d6d310bc68b4e7c3cd16020fb";
     sha256 = "sha256-ibCzZrqfbio1wBVFKB6S/wdRxnCc7s3IQdtI9txxhaM=";
   };