From f9a7b5d22eb4b1ec94b54992fd6bb013f76b00cb Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Tue, 15 Jan 2019 18:17:12 +0100
Subject: [PATCH] pg_tmp, ephemeralpg: merge packages

---
 .../tools/database}/ephemeralpg/default.nix   |  6 +++--
 .../tools/database/pg_tmp/default.nix         | 25 -------------------
 pkgs/top-level/all-packages.nix               |  4 +--
 3 files changed, 6 insertions(+), 29 deletions(-)
 rename pkgs/{applications/misc => development/tools/database}/ephemeralpg/default.nix (81%)
 delete mode 100644 pkgs/development/tools/database/pg_tmp/default.nix

diff --git a/pkgs/applications/misc/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix
similarity index 81%
rename from pkgs/applications/misc/ephemeralpg/default.nix
rename to pkgs/development/tools/database/ephemeralpg/default.nix
index 6848a14dd6f..e136b180d78 100644
--- a/pkgs/applications/misc/ephemeralpg/default.nix
+++ b/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 ];
   };
 }
diff --git a/pkgs/development/tools/database/pg_tmp/default.nix b/pkgs/development/tools/database/pg_tmp/default.nix
deleted file mode 100644
index b7d960d5af4..00000000000
--- a/pkgs/development/tools/database/pg_tmp/default.nix
+++ /dev/null
@@ -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 ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f5c172cdb7..162d2c87c63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/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 {};