ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

Revert "postgresql: build < 9.5 with openssl 1.0.2" (#80481)

Browse Source 
This reverts commit 2d6f0cb176.

postgresql versions < 9.5 have been removed from nixpkgs.
This commit is contained in:
zowoq 2020-02-19 16:59:50 +10:00 committed by GitHub
parent 0030d391d2
commit 711617f5e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@ let
generic =
# dependencies
{ stdenv, lib, fetchurl, makeWrapper
, glibc, zlib, readline, openssl, openssl_1_0_2, icu, systemd, libossp_uuid
, glibc, zlib, readline, openssl, icu, systemd, libossp_uuid
, pkgconfig, libxml2, tzdata
# This is important to obtain a version of `libpq` that does not depend on systemd.
@ -32,10 +32,9 @@ let
setOutputFlags = false; # $out retains configureFlags :-/
buildInputs =
[ zlib readline libxml2 makeWrapper ]
[ zlib readline openssl 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 ];