Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

pg_tmp, ephemeralpg: merge packages

+6 -29
+4 -2
pkgs/applications/misc/ephemeralpg/default.nix pkgs/development/tools/database/ephemeralpg/default.nix
··· 12 12 PREFIX=$out make install 13 13 wrapProgram $out/bin/pg_tmp --prefix PATH : ${stdenv.lib.makeBinPath [ postgresql getopt ]} 14 14 ''; 15 - meta = { 15 + meta = with stdenv.lib; { 16 16 description = ''Run tests on an isolated, temporary PostgreSQL database.''; 17 - license = stdenv.lib.licenses.isc; 17 + license = licenses.isc; 18 18 homepage = http://ephemeralpg.org/; 19 + platforms = platforms.all; 20 + maintainers = with maintainers; [ hrdinka ]; 19 21 }; 20 22 }
-25
pkgs/development/tools/database/pg_tmp/default.nix
··· 1 - { fetchFromBitbucket, stdenv }: 2 - 3 - stdenv.mkDerivation rec { 4 - name = "pg_tmp-${version}"; 5 - version = "2.3"; 6 - 7 - src = fetchFromBitbucket { 8 - owner = "eradman"; 9 - repo = "ephemeralpg"; 10 - rev = "ephemeralpg-${version}"; 11 - sha256 = "0j0va9pch2xhwwx4li3qx3lkgrd79c0hcy5w5y1cqax571hv89wa"; 12 - }; 13 - 14 - installPhase = '' 15 - PREFIX=$out make install 16 - ''; 17 - 18 - meta = with stdenv.lib; { 19 - homepage = http://ephemeralpg.org; 20 - description = "Run tests on an isolated, temporary PostgreSQL database"; 21 - license = licenses.isc; 22 - platforms = platforms.all; 23 - maintainers = with maintainers; [ hrdinka ]; 24 - }; 25 - }
+2 -2
pkgs/top-level/all-packages.nix
··· 1382 1382 1383 1383 esptool-ck = callPackage ../tools/misc/esptool-ck { }; 1384 1384 1385 - ephemeralpg = callPackage ../applications/misc/ephemeralpg {}; 1385 + ephemeralpg = callPackage ../development/tools/database/ephemeralpg {}; 1386 1386 1387 1387 et = callPackage ../applications/misc/et {}; 1388 1388 ··· 11993 11993 11994 11994 pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {}; 11995 11995 11996 - pg_tmp = callPackage ../development/tools/database/pg_tmp { }; 11996 + pg_tmp = ephemeralpg; 11997 11997 11998 11998 pgroonga = callPackage ../servers/sql/postgresql/pgroonga {}; 11999 11999