public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #53995 from serokell/fix-pgtmp

Browse Source 
pg_tmp, ephemeralpg: fix on darwin and merge
This commit is contained in:
Christoph Hrdinka 2019-01-16 13:45:48 +01:00 committed by GitHub
commit def5124ec8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/misc/ephemeralpg/default.nix → pkgs/development/tools/database/ephemeralpg/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, postgresql, makeWrapper }: { stdenv, fetchurl, postgresql, getopt, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ephemeralpg-${version}"; name = "ephemeralpg-${version}";
version = "2.5"; version = "2.5";
@ -10,11 +10,13 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out
PREFIX=$out make install 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.''; description = ''Run tests on an isolated, temporary PostgreSQL database.'';
license = stdenv.lib.licenses.isc; license = licenses.isc;
homepage = http://ephemeralpg.org/; homepage = http://ephemeralpg.org/;
platforms = platforms.all;
maintainers = with maintainers; [ hrdinka ];
}; };
} }

25
pkgs/development/tools/database/pg_tmp/default.nix
View File

@ -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 ];
};
}

1
pkgs/top-level/aliases.nix
View File

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

4
pkgs/top-level/all-packages.nix
View File

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