pin some packages to openssl 1.0.2 for now

This commit is contained in:
Robin Gloster 2017-02-13 14:25:12 +01:00
parent c1d336dfce
commit a22429bf05
No known key found for this signature in database
GPG key ID: D5C458DF6DD97EDF
5 changed files with 182 additions and 63 deletions

View file

@ -81,7 +81,9 @@ let
git-cola = callPackage ./git-cola { };
git-crypt = callPackage ./git-crypt { };
git-crypt = callPackage ./git-crypt {
openssl = openssl_1_0_2;
};
git-dit = callPackage ./git-dit {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;

View file

@ -1,7 +1,10 @@
{ callPackage, pkgs }:
rec {
#### CORE EFL
efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; };
efl = callPackage ./efl.nix {
openjpeg = pkgs.openjpeg_1;
openssl = pkgs.openssl_1_0_2;
};
#### WINDOW MANAGER
enlightenment = callPackage ./enlightenment.nix { };

View file

@ -37,7 +37,9 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { };
gnome_vfs = callPackage ./platform/gnome-vfs { };
gnome_vfs = callPackage ./platform/gnome-vfs {
openssl = pkgs.openssl_1_0_2;
};
libgnome = callPackage ./platform/libgnome { };

View file

@ -512,7 +512,9 @@ in
aide = callPackage ../tools/security/aide { };
aircrack-ng = callPackage ../tools/networking/aircrack-ng { };
aircrack-ng = callPackage ../tools/networking/aircrack-ng {
openssl = openssl_1_0_2;
};
airfield = callPackage ../tools/networking/airfield { };
@ -573,7 +575,9 @@ in
arandr = callPackage ../tools/X11/arandr { };
arangodb = callPackage ../servers/nosql/arangodb { };
arangodb = callPackage ../servers/nosql/arangodb {
openssl = openssl_1_0_2;
};
arcanist = callPackage ../development/tools/misc/arcanist {};
@ -1151,7 +1155,9 @@ in
brltty = callPackage ../tools/misc/brltty { };
bro = callPackage ../applications/networking/ids/bro { };
bro = callPackage ../applications/networking/ids/bro {
openssl = openssl_1_0_2;
};
brook = callPackage ../tools/networking/brook { };
@ -1538,7 +1544,9 @@ in
facedetect = callPackage ../tools/graphics/facedetect { };
facter = callPackage ../tools/system/facter { };
facter = callPackage ../tools/system/facter {
openssl = openssl_1_0_2;
};
fasd = callPackage ../tools/misc/fasd { };
@ -2056,7 +2064,9 @@ in
cabextract = callPackage ../tools/archivers/cabextract { };
cadaver = callPackage ../tools/networking/cadaver { };
cadaver = callPackage ../tools/networking/cadaver {
openssl = openssl_1_0_2;
};
davix = callPackage ../tools/networking/davix { };
@ -2111,7 +2121,9 @@ in
chunkfs = callPackage ../tools/filesystems/chunkfs { };
chunksync = callPackage ../tools/backup/chunksync { };
chunksync = callPackage ../tools/backup/chunksync {
openssl = openssl_1_0_2;
};
cipherscan = callPackage ../tools/security/cipherscan {
openssl = if stdenv.hostPlatform.system == "x86_64-linux"
@ -2327,7 +2339,9 @@ in
ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { };
clamav = callPackage ../tools/security/clamav { };
clamav = callPackage ../tools/security/clamav {
openssl = openssl_1_0_2;
};
clex = callPackage ../tools/misc/clex { };
@ -2572,7 +2586,9 @@ in
dmd = callPackage ../development/compilers/dmd { };
dmg2img = callPackage ../tools/misc/dmg2img { };
dmg2img = callPackage ../tools/misc/dmg2img {
openssl = openssl_1_0_2;
};
docbook2odf = callPackage ../tools/typesetting/docbook2odf { };
@ -2635,7 +2651,9 @@ in
dumptorrent = callPackage ../tools/misc/dumptorrent { };
duo-unix = callPackage ../tools/security/duo-unix { };
duo-unix = callPackage ../tools/security/duo-unix {
openssl = openssl_1_0_2;
};
duplicacy = callPackage ../tools/backup/duplicacy { };
@ -2835,6 +2853,7 @@ in
encfs = callPackage ../tools/filesystems/encfs {
tinyxml2 = tinyxml-2;
openssl = openssl_1_0_2;
};
enscript = callPackage ../tools/text/enscript { };
@ -2859,7 +2878,9 @@ in
ethtool = callPackage ../tools/misc/ethtool { };
ettercap = callPackage ../applications/networking/sniffers/ettercap { };
ettercap = callPackage ../applications/networking/sniffers/ettercap {
openssl = openssl_1_0_2;
};
euca2ools = callPackage ../tools/virtualization/euca2ools { };
@ -3547,7 +3568,9 @@ in
gtk-vnc = callPackage ../tools/admin/gtk-vnc {};
gtmess = callPackage ../applications/networking/instant-messengers/gtmess { };
gtmess = callPackage ../applications/networking/instant-messengers/gtmess {
openssl = openssl_1_0_2;
};
gup = callPackage ../development/tools/build-managers/gup {};
@ -3561,7 +3584,9 @@ in
gupnp-tools = callPackage ../tools/networking/gupnp-tools {};
gvpe = callPackage ../tools/networking/gvpe { };
gvpe = callPackage ../tools/networking/gvpe {
openssl = openssl_1_0_2;
};
gvolicon = callPackage ../tools/audio/gvolicon {};
@ -3825,7 +3850,9 @@ in
packages = config.ihaskell.packages or (self: []);
};
imapproxy = callPackage ../tools/networking/imapproxy { };
imapproxy = callPackage ../tools/networking/imapproxy {
openssl = openssl_1_0_2;
};
imapsync = callPackage ../tools/networking/imapsync { };
@ -3891,7 +3918,10 @@ in
buildGoPackage = buildGo110Package;
};
ipmitool = callPackage ../tools/system/ipmitool { };
ipmitool = callPackage ../tools/system/ipmitool {
static = false;
openssl = openssl_1_0_2;
};
ipmiutil = callPackage ../tools/system/ipmiutil {};
@ -3964,7 +3994,9 @@ in
go-jira = callPackage ../applications/misc/go-jira { };
john = callPackage ../tools/security/john { };
john = callPackage ../tools/security/john {
openssl = openssl_1_0_2;
};
joplin = nodePackages.joplin;
@ -4438,7 +4470,7 @@ in
libmongo-client = callPackage ../development/libraries/libmongo-client { };
libmesode = callPackage ../development/libraries/libmesode { };
libmesode = callPackage ../development/libraries/libmesode {};
libnabo = callPackage ../development/libraries/libnabo { };
@ -5072,7 +5104,9 @@ in
opendht = callPackage ../development/libraries/opendht {};
opendkim = callPackage ../development/libraries/opendkim { };
opendkim = callPackage ../development/libraries/opendkim {
openssl = openssl_1_0_2;
};
opendylan = callPackage ../development/compilers/opendylan {
opendylan-bootstrap = opendylan_bin;
@ -5124,7 +5158,7 @@ in
opentsdb = callPackage ../tools/misc/opentsdb {};
openvpn = callPackage ../tools/networking/openvpn { };
openvpn = callPackage ../tools/networking/openvpn {};
openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { };
@ -5247,7 +5281,28 @@ in
pngout = callPackage ../tools/graphics/pngout { };
ipsecTools = callPackage ../os-specific/linux/ipsec-tools { flex = flex_2_5_35; };
hurdPartedCross =
if targetPlatform != buildPlatform && targetPlatform.config == "i586-pc-gnu"
then (makeOverridable
({ hurd }:
(parted.override {
# Needs the Hurd's libstore.
inherit hurd;
# The Hurd wants a libparted.a.
enableStatic = true;
gettext = null;
readline = null;
devicemapper = null;
}).crossDrv)
{ hurd = gnu.hurdCrossIntermediate; })
else null;
ipsecTools = callPackage ../os-specific/linux/ipsec-tools {
flex = flex_2_5_35;
openssl = openssl_1_0_2;
};
patch = gnupatch;
@ -5308,7 +5363,9 @@ in
libusb = libusb1;
};
bully = callPackage ../tools/networking/bully { };
bully = callPackage ../tools/networking/bully {
openssl = openssl_1_0_2;
};
pcapc = callPackage ../tools/networking/pcapc { };
@ -5479,7 +5536,9 @@ in
proxychains = callPackage ../tools/networking/proxychains { };
proxytunnel = callPackage ../tools/misc/proxytunnel { };
proxytunnel = callPackage ../tools/misc/proxytunnel {
openssl = openssl_1_0_2;
};
pws = callPackage ../tools/misc/pws { };
@ -5653,7 +5712,9 @@ in
rt = callPackage ../servers/rt { };
rtmpdump = callPackage ../tools/video/rtmpdump { };
rtmpdump = callPackage ../tools/video/rtmpdump {
openssl = openssl_1_0_2;
};
rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; };
reaverwps = callPackage ../tools/networking/reaver-wps {};
@ -6242,7 +6303,9 @@ in
tcpdump = callPackage ../tools/networking/tcpdump { };
tcpflow = callPackage ../tools/networking/tcpflow { };
tcpflow = callPackage ../tools/networking/tcpflow {
openssl = openssl_1_0_2;
};
tcpkali = callPackage ../applications/networking/tcpkali { };
@ -6316,7 +6379,7 @@ in
tilix = callPackage ../applications/misc/tilix { };
tinc_pre = callPackage ../tools/networking/tinc/pre.nix { };
tinc_pre = callPackage ../tools/networking/tinc/pre.nix {};
tiny8086 = callPackage ../applications/virtualization/8086tiny { };
@ -6425,7 +6488,9 @@ in
trilium = callPackage ../applications/office/trilium { };
trousers = callPackage ../tools/security/trousers { };
trousers = callPackage ../tools/security/trousers {
openssl = openssl_1_0_2;
};
trx = callPackage ../tools/audio/trx { };
@ -6540,9 +6605,11 @@ in
vbetool = callPackage ../tools/system/vbetool { };
vde2 = callPackage ../tools/networking/vde2 { };
vde2 = callPackage ../tools/networking/vde2 {
openssl = openssl_1_0_2;
};
vboot_reference = callPackage ../tools/system/vboot_reference { };
vboot_reference = callPackage ../tools/system/vboot_reference {};
vcftools = callPackage ../applications/science/biology/vcftools { };
@ -6628,7 +6695,9 @@ in
inherit (python27Packages) ldap;
};
vtun = callPackage ../tools/networking/vtun { };
vtun = callPackage ../tools/networking/vtun {
openssl = openssl_1_0_2;
};
waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp { };
@ -6747,7 +6816,7 @@ in
uemacs = callPackage ../applications/editors/uemacs { };
uftp = callPackage ../servers/uftp { };
uftp = callPackage ../servers/uftp {};
uhttpmock = callPackage ../development/libraries/uhttpmock { };
@ -10138,7 +10207,7 @@ in
boost_process = callPackage ../development/libraries/boost-process { };
botan = callPackage ../development/libraries/botan { };
botan = callPackage ../development/libraries/botan { openssl = openssl_1_0_2; };
botan2 = callPackage ../development/libraries/botan/2.0.nix { };
box2d = callPackage ../development/libraries/box2d { };
@ -10268,7 +10337,9 @@ in
cpp-ipfs-api = callPackage ../development/libraries/cpp-ipfs-api { };
cpp-netlib = callPackage ../development/libraries/cpp-netlib { };
cpp-netlib = callPackage ../development/libraries/cpp-netlib {
openssl = openssl_1_0_2;
};
uri = callPackage ../development/libraries/uri { };
cppcms = callPackage ../development/libraries/cppcms { };
@ -11561,7 +11632,9 @@ in
libgadu = callPackage ../development/libraries/libgadu { };
libgda = callPackage ../development/libraries/libgda { };
libgda = callPackage ../development/libraries/libgda {
openssl = openssl_1_1;
};
libgdamm = callPackage ../development/libraries/libgdamm { };
@ -11632,7 +11705,9 @@ in
libexif = callPackage ../development/libraries/libexif { };
libexosip = callPackage ../development/libraries/exosip {};
libexosip = callPackage ../development/libraries/exosip {
openssl = openssl_1_0_2;
};
libextractor = callPackage ../development/libraries/libextractor {
libmpeg2 = mpeg2dec;
@ -11888,7 +11963,9 @@ in
libksba = callPackage ../development/libraries/libksba { };
libksi = callPackage ../development/libraries/libksi { };
libksi = callPackage ../development/libraries/libksi {
openssl = openssl_1_0_2;
};
liblinear = callPackage ../development/libraries/liblinear { };
@ -12478,7 +12555,9 @@ in
ogre = ogre1_9;
};
mysocketw = callPackage ../development/libraries/mysocketw { };
mysocketw = callPackage ../development/libraries/mysocketw {
openssl = openssl_1_0_2;
};
mythes = callPackage ../development/libraries/mythes { };
@ -12507,7 +12586,9 @@ in
neon = callPackage ../development/libraries/neon { };
neon_0_29 = callPackage ../development/libraries/neon/0.29.nix { };
neon_0_29 = callPackage ../development/libraries/neon/0.29.nix {
openssl = openssl_1_0_2;
};
nettle = callPackage ../development/libraries/nettle { };
@ -13034,7 +13115,9 @@ in
suffix = "qt5";
};
qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
qca-qt5 = callPackage ../development/libraries/qca-qt5 {
openssl = openssl_1_0_2;
};
qmltermwidget = callPackage ../development/libraries/qmltermwidget {
inherit (darwin.apple_sdk.libs) utmp;
@ -13453,6 +13536,7 @@ in
sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher {
readline = null;
ncurses = null;
openssl = openssl_1_0_2;
});
standardnotes = callPackage ../applications/editors/standardnotes { };
@ -13522,7 +13606,9 @@ in
tcllib = callPackage ../development/libraries/tcllib { };
tcltls = callPackage ../development/libraries/tcltls { };
tcltls = callPackage ../development/libraries/tcltls {
openssl = openssl_1_0_2;
};
tclx = callPackage ../development/libraries/tclx { };
@ -13643,6 +13729,7 @@ in
ucommon_openssl = callPackage ../development/libraries/ucommon {
gnutls = null;
openssl = openssl_1_0_2;
};
ucommon_gnutls = lowPrio (ucommon.override {
@ -13892,7 +13979,9 @@ in
xmlsec = callPackage ../development/libraries/xmlsec { };
xml-security-c = callPackage ../development/libraries/xml-security-c { };
xml-security-c = callPackage ../development/libraries/xml-security-c {
openssl = openssl_1_0_2;
};
xml-tooling-c = callPackage ../development/libraries/xml-tooling-c { };
@ -14274,7 +14363,9 @@ in
bftpd = callPackage ../servers/ftp/bftpd {};
bind = callPackage ../servers/dns/bind { };
bind = callPackage ../servers/dns/bind {
openssl = openssl_1_0_2;
};
dnsutils = bind.dnsutils;
inherit (callPackages ../servers/bird { })
@ -14317,7 +14408,7 @@ in
dico = callPackage ../servers/dico { };
dict = callPackage ../servers/dict {
libmaa = callPackage ../servers/dict/libmaa.nix {};
libmaa = callPackage ../servers/dict/libmaa.nix {};
};
dictdDBs = recurseIntoAttrs (callPackages ../servers/dict/dictd-db.nix {});
@ -14376,10 +14467,11 @@ in
freepops = callPackage ../servers/mail/freepops { };
freeradius = callPackage ../servers/freeradius { };
freeradius = callPackage ../servers/freeradius {
openssl = openssl_1_0_2;
};
freeswitch = callPackage ../servers/sip/freeswitch {
openssl = openssl_1_0_2;
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
};
@ -14637,6 +14729,7 @@ in
mongodb = callPackage ../servers/nosql/mongodb {
sasl = cyrus_sasl;
boost = boost160;
openssl = openssl_1_0_2;
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -14705,7 +14798,7 @@ in
oracleXE = callPackage ../servers/sql/oracle-xe { };
softether_4_25 = callPackage ../servers/softether/4.25.nix { };
softether_4_25 = callPackage ../servers/softether/4.25.nix { openssl = openssl_1_0_2; };
softether_4_29 = callPackage ../servers/softether/4.29.nix { };
softether = softether_4_29;
@ -14988,9 +15081,13 @@ in
virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { };
virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { };
virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix {
openssl = openssl_1_0_2;
};
virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { };
virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix {
openssl = openssl_1_0_2;
};
virtuoso = virtuoso6;
@ -15930,7 +16027,9 @@ in
quicktemplate = callPackage ../development/tools/quicktemplate { };
gogoclient = callPackage ../os-specific/linux/gogoclient { };
gogoclient = callPackage ../os-specific/linux/gogoclient {
openssl = openssl_1_0_2;
};
linux-pam = callPackage ../os-specific/linux/pam { };
@ -15962,7 +16061,9 @@ in
pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { };
pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { };
pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth {
openssl = openssl_1_0_2;
};
pam_u2f = callPackage ../os-specific/linux/pam_u2f { };
@ -16979,6 +17080,7 @@ in
alpine = callPackage ../applications/networking/mailreaders/alpine {
tcl = tcl-8_5;
openssl = openssl_1_0_2;
};
msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { };
@ -17631,7 +17733,9 @@ in
electrum-ltc = callPackage ../applications/misc/electrum/ltc.nix { };
elinks = callPackage ../applications/networking/browsers/elinks { };
elinks = callPackage ../applications/networking/browsers/elinks {
openssl = openssl_1_0_2;
};
elvis = callPackage ../applications/editors/elvis { };
@ -17938,7 +18042,9 @@ in
fehlstart = callPackage ../applications/misc/fehlstart { };
fetchmail = callPackage ../applications/misc/fetchmail { };
fetchmail = callPackage ../applications/misc/fetchmail {
openssl = openssl_1_0_2;
};
fff = callPackage ../applications/misc/fff { };
@ -17986,7 +18092,9 @@ in
freewheeling = callPackage ../applications/audio/freewheeling { };
fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { };
fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid {
openssl = openssl_1_0_2;
};
fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { };
@ -18270,7 +18378,9 @@ in
get_iplayer = callPackage ../applications/misc/get_iplayer {};
getxbook = callPackage ../applications/misc/getxbook {};
getxbook = callPackage ../applications/misc/getxbook {
openssl = openssl_1_0_2;
};
ghq = gitAndTools.ghq;
@ -24195,7 +24305,9 @@ in
wordpress = callPackage ../servers/web-apps/wordpress { };
wraith = callPackage ../applications/networking/irc/wraith { };
wraith = callPackage ../applications/networking/irc/wraith {
openssl = openssl_1_0_2;
};
wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { };

View file

@ -3298,8 +3298,8 @@ let
url = mirror://cpan/authors/id/T/TT/TTAR/Crypt-OpenSSL-AES-0.02.tar.gz;
sha256 = "b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908";
};
NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_0_2.dev}/include";
NIX_CFLAGS_LINK = "-L${pkgs.openssl_1_0_2.out}/lib -lcrypto";
meta = with stdenv.lib; {
description = "Perl wrapper around OpenSSL's AES library";
license = with licenses; [ artistic1 gpl1Plus ];
@ -3313,8 +3313,8 @@ let
url = mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-Bignum-0.09.tar.gz;
sha256 = "1p22znbajq91lbk2k3yg12ig7hy5b4vy8igxwqkmbm4nhgxp4ki3";
};
NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_0_2.dev}/include";
NIX_CFLAGS_LINK = "-L${pkgs.openssl_1_0_2.out}/lib -lcrypto";
};
CryptOpenSSLGuess = buildPerlPackage {
@ -3351,8 +3351,8 @@ let
sha256 = "4173403ad4cf76732192099f833fbfbf3cd8104e0246b3844187ae384d2c5436";
};
propagatedBuildInputs = [ CryptOpenSSLRandom ];
NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_0_2.dev}/include";
NIX_CFLAGS_LINK = "-L${pkgs.openssl_1_0_2.out}/lib -lcrypto";
buildInputs = [ CryptOpenSSLGuess ];
};
@ -3381,7 +3381,7 @@ let
url = mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.72.tar.gz;
sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm";
};
makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl.dev}/include";
makeMakerFlags = "--libpath=${pkgs.openssl_1_0_2.out}/lib --incpath=${pkgs.openssl_1_0_2.dev}/include";
buildInputs = [ PathClass ];
propagatedBuildInputs = [ LWPProtocolHttps ];
};