ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-19 02:44:17 +03:00
Code Issues Projects Releases Wiki Activity

pg_tmp, ephemeralpg: merge packages

Browse Source
This commit is contained in:
Yorick van Pelt 2019-01-15 18:17:12 +01:00
parent 915a21762b
commit f9a7b5d22e
No known key found for this signature in database
GPG Key ID: D8D3CC6D951384DE
3 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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