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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-07-03 08:59:42 +02:00
parent d41bc0ff56 3ad01beda7
commit 25a77b7210
411 changed files with 4314 additions and 2253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
View File

@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/{lib,share/extension}
cp *.so $out/lib
cp *.sql $out/share/extension
cp *.control $out/share/extension
cp *.sql $out/share/postgresql/extension
cp *.control $out/share/postgresql/extension
'';
meta = with stdenv.lib; {

4
pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
View File

@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
installPhase = ''
install -D -t $out/bin src/bin/pg_autoctl/pg_autoctl
install -D -t $out/lib src/monitor/pgautofailover.so
install -D -t $out/share/extension src/monitor/*.sql
install -D -t $out/share/extension src/monitor/pgautofailover.control
install -D -t $out/share/postgresql/extension src/monitor/*.sql
install -D -t $out/share/postgresql/extension src/monitor/pgautofailover.control
'';
meta = with stdenv.lib; {

4
pkgs/servers/sql/postgresql/ext/pg_bigm.nix
View File

@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/{lib,share/extension}
cp *.so $out/lib
cp *.sql $out/share/extension
cp *.control $out/share/extension
cp *.sql $out/share/postgresql/extension
cp *.control $out/share/postgresql/extension
'';
meta = with stdenv.lib; {

4
pkgs/servers/sql/postgresql/ext/pg_cron.nix
View File

@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/{lib,share/extension}
cp *.so $out/lib
cp *.sql $out/share/extension
cp *.control $out/share/extension
cp *.sql $out/share/postgresql/extension
cp *.control $out/share/postgresql/extension
'';
meta = with stdenv.lib; {

4
pkgs/servers/sql/postgresql/ext/pg_hll.nix
View File

@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/{lib,share/extension}
cp *.so $out/lib
cp *.sql $out/share/extension
cp *.control $out/share/extension
cp *.sql $out/share/postgresql/extension
cp *.control $out/share/postgresql/extension
'';
meta = with stdenv.lib; {

6
pkgs/servers/sql/postgresql/ext/pg_partman.nix
View File

@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
mkdir -p $out/{lib,share/extension}
cp src/*.so $out/lib
cp updates/* $out/share/extension
cp -r sql/* $out/share/extension
cp *.control $out/share/extension
cp updates/* $out/share/postgresql/extension
cp -r sql/* $out/share/postgresql/extension
cp *.control $out/share/postgresql/extension
'';
meta = with stdenv.lib; {

2
pkgs/servers/sql/postgresql/ext/pg_repack.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
installPhase = ''
install -D bin/pg_repack -t $out/bin/
install -D lib/pg_repack.so -t $out/lib/
install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/extension
install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/postgresql/extension
'';
meta = with stdenv.lib; {

2
pkgs/servers/sql/postgresql/ext/pg_similarity.nix
View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out/bin # for buildEnv to setup proper symlinks
install -D pg_similarity.so -t $out/lib/
install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/extension
install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/postgresql/extension
'';
meta = {

4
pkgs/servers/sql/postgresql/ext/pg_topn.nix
View File

@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/{lib,share/extension}
cp *.so $out/lib
cp *.sql $out/share/extension
cp *.control $out/share/extension
cp *.sql $out/share/postgresql/extension
cp *.control $out/share/postgresql/extension
'';
meta = with stdenv.lib; {

4
pkgs/servers/sql/postgresql/ext/pgjwt.nix
View File

@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
buildPhase = ":";
installPhase = ''
mkdir -p $out/bin # current postgresql extension mechanism in nixos requires bin directory
mkdir -p $out/share/extension
cp pg*sql *.control $out/share/extension
mkdir -p $out/share/postgresql/extension
cp pg*sql *.control $out/share/postgresql/extension
'';
meta = with stdenv.lib; {

2
pkgs/servers/sql/postgresql/ext/pgroonga.nix
View File

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
install -D pgroonga.so -t $out/lib/
install -D ./{pgroonga-*.sql,pgroonga.control} -t $out/share/extension
install -D ./{pgroonga-*.sql,pgroonga.control} -t $out/share/postgresql/extension
'';
meta = with stdenv.lib; {

4
pkgs/servers/sql/postgresql/ext/pgrouting.nix
View File

@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin # for buildEnv, see https://github.com/NixOS/nixpkgs/issues/22653
install -D lib/*.so -t $out/lib
install -D sql/pgrouting--${version}.sql -t $out/share/extension
install -D sql/common/pgrouting.control -t $out/share/extension
install -D sql/pgrouting--${version}.sql -t $out/share/postgresql/extension
install -D sql/common/pgrouting.control -t $out/share/postgresql/extension
'';
meta = with stdenv.lib; {

2
pkgs/servers/sql/postgresql/ext/pgtap.nix
View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ];
installPhase = ''
install -D {sql/pgtap--${version}.sql,pgtap.control} -t $out/share/extension
install -D {sql/pgtap--${version}.sql,pgtap.control} -t $out/share/postgresql/extension
'';
meta = with stdenv.lib; {

2
pkgs/servers/sql/postgresql/ext/pipelinedb.nix
View File

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
install -D -t $out/lib/ pipelinedb.so
install -D -t $out/share/extension {pipelinedb-*.sql,pipelinedb.control}
install -D -t $out/share/postgresql/extension {pipelinedb-*.sql,pipelinedb.control}
'';
meta = with stdenv.lib; {

2
pkgs/servers/sql/postgresql/ext/plv8.nix
View File

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
install -D plv8*.so -t $out/lib
install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/extension
install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/postgresql/extension
'';
meta = with stdenv.lib; {

4
pkgs/servers/sql/postgresql/ext/postgis.nix
View File

@@ -31,9 +31,9 @@ stdenv.mkDerivation rec {
preConfigure = ''
sed -i 's@/usr/bin/file@${file}/bin/file@' configure
configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}"
configureFlags="--datadir=$out/share/postgresql --datarootdir=$out/share/postgresql --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}"
makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin"
makeFlags="PERL=${perl}/bin/perl datadir=$out/share/postgresql pkglibdir=$out/lib bindir=$out/bin"
'';
postConfigure = ''
sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ;

4
pkgs/servers/sql/postgresql/ext/tds_fdw.nix
View File

@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
installPhase = ''
install -D tds_fdw.so -t $out/lib
install -D sql/tds_fdw--${version}.sql -t $out/share/extension
install -D tds_fdw.control -t $out/share/extension
install -D sql/tds_fdw--${version}.sql -t $out/share/postgresql/extension
install -D tds_fdw.control -t $out/share/postgresql/extension
'';
meta = with stdenv.lib; {

4
pkgs/servers/sql/postgresql/ext/temporal_tables.nix
View File

@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/{bin,lib,share/extension}
cp *.so $out/lib
cp *.sql $out/share/extension
cp *.control $out/share/extension
cp *.sql $out/share/postgresql/extension
cp *.control $out/share/postgresql/extension
'';
meta = with stdenv.lib; {

6
pkgs/servers/sql/postgresql/ext/timescaledb.nix
View File

@@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
name = "timescaledb-${version}";
version = "1.3.1";
version = "1.3.2";
nativeBuildInputs = [ cmake ];
buildInputs = [ postgresql openssl ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "timescale";
repo = "timescaledb";
rev = "refs/tags/${version}";
sha256 = "1q3c4qsy4vb00a4p15km4w5d5xcppigf7rp4mqr3wln7i4d4lvnx";
sha256 = "117az52h8isi15p47r5d6k5y80ng9vj3x8ljq39iavgr364q716c";
};
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
patchPhase = ''
for x in CMakeLists.txt sql/CMakeLists.txt; do
substituteInPlace "$x" \
--replace 'DESTINATION "''${PG_SHAREDIR}/extension"' "DESTINATION \"$out/share/extension\""
--replace 'DESTINATION "''${PG_SHAREDIR}/extension"' "DESTINATION \"$out/share/postgresql/extension\""
done
for x in src/CMakeLists.txt src/loader/CMakeLists.txt tsl/src/CMakeLists.txt; do

2
pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
View File

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
install -D tsearch_extras.so -t $out/lib/
install -D ./{tsearch_extras--1.0.sql,tsearch_extras.control} -t $out/share/extension
install -D ./{tsearch_extras--1.0.sql,tsearch_extras.control} -t $out/share/postgresql/extension
'';
meta = with stdenv.lib; {