alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

erlang: pin to openssl 1.0.2 for < R20

Browse source
This commit is contained in:
Robin Gloster 2019-08-21 21:45:16 +02:00
parent dfd64de89b
commit 353323e055
No known key found for this signature in database
GPG key ID: D5C458DF6DD97EDF
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/servers/dns/powerdns/default.nix
View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "powerdns-${version}"; name = "powerdns-${version}";
version = "4.1.10"; version = "4.1.13";
src = fetchurl { src = fetchurl {
url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
sha256 = "1iqmrg0dhf39gr2mq9d8r3s5c6yqkb5mm8grbbla5anajbgcyijs"; sha256 = "09az5yp5d9wvzw8faifyzsljhmmc8ifm4j70m4n2sr83i9i9rsp7";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

4
pkgs/top-level/beam-packages.nix
View file

@ -1,4 +1,4 @@
{ callPackage, wxGTK30 }: { callPackage, wxGTK30, openssl_1_0_2 }:
rec { rec {
lib = callPackage ../development/beam-modules/lib.nix {}; lib = callPackage ../development/beam-modules/lib.nix {};
@ -16,6 +16,7 @@ rec {
# These are standard Erlang versions, using the generic builder. # These are standard Erlang versions, using the generic builder.
erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix {
wxGTK = wxGTK30; wxGTK = wxGTK30;
openssl = openssl_1_0_2;
}; };
erlangR18_odbc = erlangR18.override { odbcSupport = true; }; erlangR18_odbc = erlangR18.override { odbcSupport = true; };
erlangR18_javac = erlangR18.override { javacSupport = true; }; erlangR18_javac = erlangR18.override { javacSupport = true; };
@ -25,6 +26,7 @@ rec {
erlangR18_nox = erlangR18.override { wxSupport = false; }; erlangR18_nox = erlangR18.override { wxSupport = false; };
erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix {
wxGTK = wxGTK30; wxGTK = wxGTK30;
openssl = openssl_1_0_2;
}; };
erlangR19_odbc = erlangR19.override { odbcSupport = true; }; erlangR19_odbc = erlangR19.override { odbcSupport = true; };
erlangR19_javac = erlangR19.override { javacSupport = true; }; erlangR19_javac = erlangR19.override { javacSupport = true; };