Merge pull request #53995 from serokell/fix-pgtmp

pg_tmp, ephemeralpg: fix on darwin and merge

pkgs/applications/misc/ephemeralpg/default.nix pkgs/development/tools/database/ephemeralpg/default.nix

···
-{ stdenv, fetchurl, postgresql, makeWrapper }:
+{ stdenv, fetchurl, postgresql, getopt, makeWrapper }:
 stdenv.mkDerivation rec {
   name = "ephemeralpg-${version}";
   version = "2.5";
···
   installPhase = ''
     mkdir -p $out
     PREFIX=$out make install
-    wrapProgram $out/bin/pg_tmp --prefix PATH : ${postgresql}/bin
+    wrapProgram $out/bin/pg_tmp --prefix PATH : ${stdenv.lib.makeBinPath [ postgresql getopt ]}
   '';
-  meta = {
+  meta = with stdenv.lib; {
     description = ''Run tests on an isolated, temporary PostgreSQL database.'';
-    license = stdenv.lib.licenses.isc;
+    license = licenses.isc;
     homepage = http://ephemeralpg.org/;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ hrdinka ];
   };
 }

pkgs/development/tools/database/pg_tmp/default.nix

···
-{ fetchFromBitbucket, stdenv }:
-
-stdenv.mkDerivation rec {
-  name = "pg_tmp-${version}";
-  version = "2.3";
-
-  src = fetchFromBitbucket {
-    owner = "eradman";
-    repo = "ephemeralpg";
-    rev = "ephemeralpg-${version}";
-    sha256 = "0j0va9pch2xhwwx4li3qx3lkgrd79c0hcy5w5y1cqax571hv89wa";
-  };
-
-  installPhase = ''
-    PREFIX=$out make install
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://ephemeralpg.org;
-    description = "Run tests on an isolated, temporary PostgreSQL database";
-    license = licenses.isc;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ hrdinka ];
-  };
-}

pkgs/top-level/aliases.nix

···
   perlXMLParser = perlPackages.XMLParser; # added 2018-10-12
   perlArchiveCpio = perlPackages.ArchiveCpio; # added 2018-10-12
   pgp-tools = signing-party; # added 2017-03-26
+  pg_tmp = ephemeralpg; # added 2018-01-16
   pidgin-with-plugins = pidgin; # added 2016-06
   pidginlatex = pidgin-latex; # added 2018-01-08
   pidginlatexSF = pidgin-latex; # added 2014-11-02

pkgs/top-level/all-packages.nix

···
 
   esptool-ck = callPackage ../tools/misc/esptool-ck { };
 
-  ephemeralpg = callPackage ../applications/misc/ephemeralpg {};
+  ephemeralpg = callPackage ../development/tools/database/ephemeralpg {};
 
   et = callPackage ../applications/misc/et {};
 
···
   pg_repack = callPackage ../servers/sql/postgresql/pg_repack {};
 
   pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {};
-
-  pg_tmp = callPackage ../development/tools/database/pg_tmp { };
 
   pgroonga = callPackage ../servers/sql/postgresql/pgroonga {};