pg_tmp, ephemeralpg: merge packages

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

@@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
     PREFIX=$out make install
     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

@@ -1,25 +0,0 @@
-{ 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/all-packages.nix

@@ -1382,7 +1382,7 @@ in
 
   esptool-ck = callPackage ../tools/misc/esptool-ck { };
 
-  ephemeralpg = callPackage ../applications/misc/ephemeralpg {};
+  ephemeralpg = callPackage ../development/tools/database/ephemeralpg {};
 
   et = callPackage ../applications/misc/et {};
 
@@ -11993,7 +11993,7 @@ in
 
   pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {};
 
-  pg_tmp = callPackage ../development/tools/database/pg_tmp { };
+  pg_tmp = ephemeralpg;
 
   pgroonga = callPackage ../servers/sql/postgresql/pgroonga {};