From 915a21762b1aaf9af1e0ff24a00464232a06447c Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Tue, 15 Jan 2019 18:07:15 +0100
Subject: [PATCH 1/3] ephemeralpg: add getopt to wrapped path
fixes script on darwin
---
pkgs/applications/misc/ephemeralpg/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/ephemeralpg/default.nix b/pkgs/applications/misc/ephemeralpg/default.nix
index 0ade32d99899..6848a14dd6f5 100644
--- a/pkgs/applications/misc/ephemeralpg/default.nix
+++ b/pkgs/applications/misc/ephemeralpg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, postgresql, makeWrapper }:
+{ stdenv, fetchurl, postgresql, getopt, makeWrapper }:
stdenv.mkDerivation rec {
name = "ephemeralpg-${version}";
version = "2.5";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
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 = {
description = ''Run tests on an isolated, temporary PostgreSQL database.'';
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 2/3] 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 6848a14dd6f5..e136b180d78c 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 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 ];
- };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f5c172cdb73..162d2c87c638 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 {};
From eec46991e209cb70bcd551d1c7507010ee1d68e5 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Wed, 16 Jan 2019 13:21:06 +0100
Subject: [PATCH 3/3] pkgs/top-level: move pg_tmp to aliases.nix
---
pkgs/top-level/aliases.nix | 1 +
pkgs/top-level/all-packages.nix | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 90136f86acaf..186260c0f688 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -223,6 +223,7 @@ mapAliases ({
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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 162d2c87c638..92294bb2f749 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11993,8 +11993,6 @@ in
pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {};
- pg_tmp = ephemeralpg;
-
pgroonga = callPackage ../servers/sql/postgresql/pgroonga {};
plv8 = callPackage ../servers/sql/postgresql/plv8 {