From 711617f5e3e9087c9b193a5573d33b2063611b55 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 19 Feb 2020 16:59:50 +1000 Subject: [PATCH] Revert "postgresql: build < 9.5 with openssl 1.0.2" (#80481) This reverts commit 2d6f0cb1764e24f186ff52002aedf230b6496af5. postgresql versions < 9.5 have been removed from nixpkgs. --- pkgs/servers/sql/postgresql/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index b9cd50aa5fe..129292e8890 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -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 ];