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

Merge branch 'master' into staging-next

Browse Source 
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
This commit is contained in:
Vladimír Čunát
2019-08-24 08:19:05 +02:00
parent 84a91208a9 8943fb5f24
commit 2e6bf42a22
865 changed files with 29587 additions and 14316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/servers/sql/postgresql/default.nix
View File

@@ -3,7 +3,7 @@ let
generic =
# dependencies
{ stdenv, lib, fetchurl, makeWrapper
, glibc, zlib, readline, openssl, icu, systemd, libossp_uuid
, glibc, zlib, readline, openssl, openssl_1_0_2, icu, systemd, libossp_uuid
, pkgconfig, libxml2, tzdata
# This is important to obtain a version of `libpq` that does not depend on systemd.
@@ -32,9 +32,10 @@ let
setOutputFlags = false; # $out retains configureFlags :-/
buildInputs =
[ zlib readline openssl libxml2 makeWrapper ]
[ zlib readline libxml2 makeWrapper ]
++ lib.optionals icuEnabled [ icu ]
++ lib.optionals enableSystemd [ systemd ]
++ [ (if atLeast "9.5" then openssl else openssl_1_0_2) ]
++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ];
nativeBuildInputs = lib.optionals icuEnabled [ pkgconfig ];
@@ -133,7 +134,7 @@ let
homepage = https://www.postgresql.org;
description = "A powerful, open source object-relational database system";
license = licenses.postgresql;
maintainers = with maintainers; [ ocharles thoughtpolice danbst ];
maintainers = with maintainers; [ ocharles thoughtpolice danbst globin ];
platforms = platforms.unix;
knownVulnerabilities = optional (!atLeast "9.4")
"PostgreSQL versions older than 9.4 are not maintained anymore!";

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

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
installPhase = ''
mkdir -p $out/{lib,share/extension}
mkdir -p $out/{lib,share/postgresql/extension}
cp *.so $out/lib
cp *.sql $out/share/postgresql/extension

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

@@ -1,8 +1,5 @@
{ stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }:
if stdenv.lib.versionOlder postgresql.version "10"
then throw "pg_auto_failover not supported for PostgreSQL ${postgresql.version}"
else
stdenv.mkDerivation rec {
pname = "pg_auto_failover";
version = "1.0.3";
@@ -29,5 +26,6 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.marsam ];
platforms = postgresql.meta.platforms;
license = licenses.postgresql;
broken = versionOlder postgresql.version "10";
};
}

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

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653
mkdir -p $out/{lib,share/extension}
mkdir -p $out/{lib,share/postgresql/extension}
cp *.so $out/lib
cp *.sql $out/share/postgresql/extension

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

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
installPhase = ''
mkdir -p $out/{lib,share/extension}
mkdir -p $out/{lib,share/postgresql/extension}
cp *.so $out/lib
cp *.sql $out/share/postgresql/extension

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

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
installPhase = ''
mkdir -p $out/{lib,share/extension}
mkdir -p $out/{lib,share/postgresql/extension}
cp *.so $out/lib
cp *.sql $out/share/postgresql/extension

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

@@ -14,8 +14,7 @@ stdenv.mkDerivation rec {
};
installPhase = ''
mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653
mkdir -p $out/{lib,share/extension}
mkdir -p $out/{lib,share/postgresql/extension}
cp src/*.so $out/lib
cp updates/* $out/share/postgresql/extension

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

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
installPhase = ''
mkdir -p $out/{lib,share/extension}
mkdir -p $out/{lib,share/postgresql/extension}
cp *.so $out/lib
cp *.sql $out/share/postgresql/extension

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

@@ -1,8 +1,5 @@
{ stdenv, fetchFromGitHub, postgresql, zeromq, openssl }:
if stdenv.lib.versionOlder postgresql.version "10"
then throw "PipelineDB not supported for PostgreSQL ${postgresql.version}"
else
stdenv.mkDerivation rec {
pname = "pipelinedb";
version = "1.0.0-13";
@@ -35,5 +32,6 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
platforms = postgresql.meta.platforms;
maintainers = [ maintainers.marsam ];
broken = versionOlder postgresql.version "10";
};
}

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

@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.steve-chavez ];
platforms = postgresql.meta.platforms;
license = licenses.postgresql;
broken = versionAtLeast postgresql.version "11.0";
};
}

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

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
installPhase = ''
mkdir -p $out/{bin,lib,share/extension}
mkdir -p $out/{lib,share/postgresql/extension}
cp *.so $out/lib
cp *.sql $out/share/postgresql/extension