jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,646 Commits 266 Branches 122 Tags 5.3 GiB
16cc4dd3a3
Commit Graph

109 Commits

Author SHA1 Message Date
Tuomas Tynkkynen
2a73de6e6c treewide: Make explicit that 'dev' output of openssl is used 2016-05-19 10:02:23 +02:00
Tuomas Tynkkynen
d7071caba5 treewide: Make explicit that 'dev' output of libssh2 is used 2016-05-19 10:00:45 +02:00
Tuomas Tynkkynen
62479404ea treewide: Make explicit that 'dev' output of libidn is used 2016-05-19 10:00:42 +02:00
Eelco Dolstra
b4bf432709 nghttp2: 1.8.0 -> 1.9.2, unify with libnghttp2, and use multiple outputs 
Note: I ignored the C++ libraries, but it appears we're not currently
using them. Once we do, we'll probably want to put them in a separate
output as well (to prevent non-C++ users from depending on Boost).
 2016-04-18 21:13:18 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Domen Kožar
b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
Joachim Fasting
1f78d14028 curl3: mark as broken 
This is an ancient version of curl, that currently has 19 known vulnerabilities.
It is used by and was added to support only one package.
 2016-03-26 13:18:48 +01:00
Vladimír Čunát
09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Vladimír Čunát
a458a9f78f curl: use an official download link 
It works now that we have e6f61b4cf33.
 2016-03-06 11:12:23 +01:00
Eelco Dolstra
389d04cbe7 curl: 7.47.0 -> 7.47.1 2016-02-22 11:41:34 +01:00
zimbatm
6908e75441 curl: fixes installation of 7.15 
It was trying to install /etc/ssl/cert/ca-certificates.pem

See https://hydra.nixos.org/build/32167398/nixlog/1
 2016-02-21 23:57:20 +00:00
Vladimír Čunát
ee994dfae6 bootstrap tools: have curl without http2 support 
I assume there's not much use for it during bootstrapping.
This fixes them as well, as curl was compiled against libnghttp2 but the
lib wasn't copied to the bootstrap tools.
 2016-02-17 10:04:32 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Vladimír Čunát
a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00
Tony White
98ffc61e2f curl: Change default src url (close #12851) 
- Changes the default src url away from http://curl.haxx.se
to an official mirror because haxx.se resolves to https and
bootstrap curl doesn't have https support.
Please see https://github.com/NixOS/nixpkgs/issues/12816
for more info.
 2016-02-07 13:39:45 +01:00
Guillaume Maudoux
9f358f809d Configure a default trust store for openssl 2016-02-03 12:42:01 +01:00
Robin Gloster
0876a44169 curl: 7.45 -> 7.47 and enable HTTP/2 (close #12723) 
This fixes CVE-2016-0755:
https://curl.haxx.se/docs/adv_20160127A.html

vcunat removed *propagation* of pkgconfig and perl.
 2016-02-03 10:50:24 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Luca Bruno
e289717414 rename moveToOutput and propagatedBuildInputs 2015-12-02 10:05:36 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
Danny Wilson
e9d6da77cd Fix non-chrooted (stdenv-native) builds that have man on path enabling 
building of built-in manual, while chrooted builds (hydra) will not…
 2015-11-16 17:20:13 +01:00
Vladimír Čunát
787f322540 $docdev fixups: mostly to avoid empty output 
... after auto-removing some kinds of files by default.
In some cases I let them be removed and in others I let them be put into
$docdev. That was more due to general indecisiveness on this question
than any reasons in the particular cases.
 2015-10-28 18:58:06 +01:00
William A. Kennington III
50842f5ec1 curl: 7.44.0 -> 7.45.0 2015-10-17 11:54:13 -07:00
Vladimír Čunát
99e4371526 curl: split into multiple outputs 
Also use pkgconfig to be safer and fix (some) referrers.
 2015-10-13 20:18:48 +02:00
William A. Kennington III
86e53bdff3 curl: 7.43.0 -> 7.44.0 2015-08-28 17:57:13 -07:00
William A. Kennington III
3d9be37df7 curl: 7.42.1 -> 7.43.0 2015-06-18 20:55:19 -07:00
Eelco Dolstra
cde5053d9a Revert "curl: Modernize build" 
This reverts commit 5e3fe3916a1aef6c2b441d9009f8a8d7f14030d6.
 2015-06-04 14:54:52 +02:00
Eelco Dolstra
68493cd8dc Revert "curl: propagate inputs instead of patching pkgconfig" 
This reverts commit 206d63edaccfccaeedbc5d7fb8828fe8fb6d8305.
 2015-06-04 14:54:51 +02:00
Eelco Dolstra
3096d03435 Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries" 
This reverts commit 25a148fa196b944b3f134527da87e43d88c066f9.
 2015-06-04 14:54:48 +02:00
William A. Kennington III
25a148fa19 Refactor mkFlag / shouldUsePkg into the nixpkgs libraries 2015-05-22 13:26:55 -07:00
Spencer Whitt
4c76dda4dd curl 7.15: Disable on Darwin 
Build is failing and this version of curl is not used for anything
useful on Darwin, so it's not worth fixing.
 2015-05-15 11:58:21 -04:00
Shea Levy
206d63edac curl: propagate inputs instead of patching pkgconfig 2015-05-12 13:07:58 -04:00
Shea Levy
f168973bfd Revert "curl: Improve .pc and .la patching" 
This breaks on darwin with:

> sed: -e: No such file or directory

This reverts commit 26c37ded73ce084275d748be26887cf4023c91d6.
 2015-05-12 12:49:36 -04:00
William A. Kennington III
26c37ded73 curl: Improve .pc and .la patching 2015-05-11 15:12:38 -07:00
William A. Kennington III
5e3fe3916a curl: Modernize build 2015-05-01 15:57:14 -07:00
William A. Kennington III
00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
William A. Kennington III
9d5a3e62cf curl: 7.42.0 -> 7.42.1 2015-05-01 15:06:39 -07:00
Vladimír Čunát
30f31c9afc Merge 'master' into staging 
(relatively simple conflicts)
 2015-04-26 22:52:08 +02:00
John Chee
5717d5e09e curl: ldap and libidn support as curlFull 2015-04-25 14:01:36 -07:00
William A. Kennington III
dc3f962f64 curl: 7.41.0 -> 7.42.0 2015-04-22 14:37:53 -07:00
koral
2c1041acc7 curl: 7.40.0 -> 7.41.0 (close #6844) 2015-03-17 12:38:05 +01:00
koral
7fc94dd3bb curl: 7.39.0 -> 7.40.0 2015-02-09 17:34:03 +01:00
Thomas Tuegel
02157ab123 libcurl: honor $SSL_CERT_FILE (fixed) 
The previous attempt to patch libcurl used

getenv("CURL_CA_BUNDLE") || getenv("SSL_CERT_FILE")

to get the second environment variable if the first is unset.
Unfortunately, this broke libcurl because the (||) operator is C returns
only 0 or 1, so it is inappropriate for pointer comparisons! Now we use

getenv("CURL_CA_BUNDLE") ? getenv("CURL_CA_BUNDLE") : getenv("SSL_CERT_FILE")

instead. This has one downside: it always calls getenv twice! But,
that's a small price to pay for actually being correct.
 2014-12-02 10:41:24 -06:00
Wout Mertens
cacf3f6c1e Merge branch 'curl-ssl-cert-file' of https://github.com/the-kenny/nixpkgs into staging 
Standardize NixOS on using only SSL_CERT_FILE for the trusted SSL certificate store.
 2014-11-27 13:29:50 +01:00
Moritz Ulrich
f4ab3dc223 libcurl: Honor $SSL_CERT_FILE 2014-11-19 23:50:48 +01:00
Eelco Dolstra
a0f3faf34e Merge remote-tracking branch 'origin/glibc-2.20' into staging 2014-11-16 22:17:36 +01:00
Vladimír Čunát
4849e32abe curl: update to fix CVE-2014-3707 2014-11-10 21:34:03 +01:00
Eelco Dolstra
dc0d68ffc3 curl: Remove static link support 
We only needed this for the stdenv bootstrap, but not anymore.
 2014-10-29 13:43:00 +01:00
Eelco Dolstra
5cc92eb0d8 Remove obsolete useDietLibC stdenv adapter 2014-10-29 13:43:00 +01:00
James Cook
4d8d902e0c curl: update to 7.38.0, including security (#4161) 
Fixes CVE-2014-3620 and CVE-2014-3613.
 2014-09-19 11:53:08 +02:00