pg_tmp, ephemeralpg: merge packages

2 files changed, 22 insertions, 25 deletions

diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix
new file mode 100644
index 000000000000..e136b180d78c
--- /dev/null
+++ b/pkgs/development/tools/database/ephemeralpg/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, postgresql, getopt, makeWrapper }:
+stdenv.mkDerivation rec {
+  name = "ephemeralpg-${version}";
+  version = "2.5";
+  src = fetchurl {
+    url = "http://ephemeralpg.org/code/${name}.tar.gz";
+    sha256 = "004fcll7248h73adkqawn9bhkqj9wsxyi3w99x64f7s37r2518wk";
+  };
+  buildInputs = [ makeWrapper ];
+  installPhase = ''
+    mkdir -p $out
+    PREFIX=$out make install
+    wrapProgram $out/bin/pg_tmp --prefix PATH : ${stdenv.lib.makeBinPath [ postgresql getopt ]}
+  '';
+  meta = with stdenv.lib; {
+    description = ''Run tests on an isolated, temporary PostgreSQL database.'';
+    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 b7d960d5af48..000000000000
--- 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 ];
-  };
-}