From 2653355a9ca9a405fd07ae5ced363c97a322b170 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 1 Mar 2018 14:44:25 +0100 Subject: [PATCH 1/2] pgmanage: fix build The configure script uses the `command` builtin command which is bash specific while having a "#!/bin/sh" head. This forces the use nix default shell (bash) (cherry picked from commit 159a021bd83bc3e1bd385fe89522aea877eea29c) --- pkgs/applications/misc/pgmanage/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index e08035aef57..aa6555a89f2 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0kzdq3xl6wyclngq307544yk57vpm10wyklkbgzx649z3pls3kyw"; }; + patchPhase = '' + patchShebangs src/configure + ''; + buildInputs = [ postgresql openssl ]; meta = with stdenv.lib; { From 65b1c735de262d7d618a0fa03a12a6f0ef9e8bc3 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Wed, 7 Mar 2018 22:28:58 +0100 Subject: [PATCH 2/2] pgmanage: 10.1.0 -> 10.1.1 --- pkgs/applications/misc/pgmanage/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index aa6555a89f2..7da71df7814 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -2,19 +2,23 @@ stdenv.mkDerivation rec { name = "pgmanage-${version}"; - version = "10.1.0"; + version = "10.1.1"; src = fetchFromGitHub { owner = "pgManage"; repo = "pgManage"; rev = "v${version}"; - sha256 = "0kzdq3xl6wyclngq307544yk57vpm10wyklkbgzx649z3pls3kyw"; + sha256 = "1gv96an1ff9amh16lf71wknshmxl3l4hsl3ga7wb106c10i14zzc"; }; patchPhase = '' patchShebangs src/configure ''; + configurePhase = '' + ./configure --prefix $out + ''; + buildInputs = [ postgresql openssl ]; meta = with stdenv.lib; {