mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Code Issues Wiki Activity
76301 commits 204 branches 125 tags 10 GiB
Commit graph

87 commits

Author SHA1 Message Date
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
William A. Kennington III 50842f5ec1 curl: 7.44.0 -> 7.45.0 2015-10-17 11:54:13 -07: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 5e3fe3916a.
 2015-06-04 14:54:52 +02:00
Eelco Dolstra 68493cd8dc Revert "curl: propagate inputs instead of patching pkgconfig" 
This reverts commit 206d63edac.
 2015-06-04 14:54:51 +02:00
Eelco Dolstra 3096d03435 Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries" 
This reverts commit 25a148fa19.
 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 26c37ded73.
 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
Vladimír Čunát 062e2567c9 curl: minor update 7.35.0 -> 7.36.0, including CVE fixes 2014-05-03 11:30:53 +02:00
Vladimír Čunát befe6905e2 curl: update 7.33 -> .35, including two security fixes 
CVE-2013-4545
CVE-2014-0015
 2014-02-05 20:45:34 +01:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
 2013-12-04 18:33:52 +01:00
Domen Kožar f770739290 curl: 7.30.0 -> 7.33.0 (CVE-2013-4545) 2013-11-21 16:24:32 +01:00
Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/top-level/all-packages.nix
 2013-10-26 18:28:05 +02:00
Jack Cummings e6f2ac65e2 Gratuitous Space Battles. Needs libcurl.so.3, so put an old version of that in, too 2013-10-19 14:45:03 +02:00
Jason \"Don\" O'Conal 613cf79237 esniper: fix build on darwin 2013-09-16 15:51:15 +02:00
Peter Simons 76244ac2e2 Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
 2013-08-16 22:51:13 +02:00
Jaka Hudoklin 941055dae9 curl: Add support for c-ares, asynchronous dns resolver 2013-08-12 19:53:08 +02:00
James Cook af53fd451f curl: update to version 7.31.0 2013-06-28 07:04:07 +02:00
Vladimír Čunát 2058d95eb4 non-Linux platforms: extend to some important pkgs 2013-06-18 22:03:35 +02:00
Petr Rockai 7abebbad4d curl: Optionally add support for GSSAPI (Kerberos). 
@vcunat also did some configureFlags refactoring
 2013-05-18 13:24:30 +02:00
Eelco Dolstra d44ffc5338 curl: Update to 7.30.0 
CVE-2013-1944
 2013-04-23 14:54:51 +02:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Shea Levy e2abed75ec Revert "Revert "curl: Update to version 7.29.0."" 
This reverts commit ec4f56b347.

With the added patch, the curl segfault seems to be fixed.
 2013-02-10 13:44:00 -05:00
Shea Levy ec4f56b347 Revert "curl: Update to version 7.29.0." 
This reverts commit fd2cff9479.

nix's substituter fails with this curl, so revert it until that's fixed.
 2013-02-10 11:37:14 -05:00
aszlig fd2cff9479 curl: Update to version 7.29.0. 
This version contains a security fix for CVE-2013-0249, for details please have
a look at:

http://curl.haxx.se/docs/adv_20130206.html

Thanks to @roconnor for pointing this out.

I'm pushing this to stdenv-updates because I'm not quite sure if it will break
other things because 7.29.0 is now non-blocking by default. Plus the security
vulnerability only affects IMAP, POP3 and SMTP protocol support.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

Cherry-picked into master, this won't change stdenv.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-02-08 18:27:52 -05:00
aszlig 8e08e9ccf0
curl: Update to version 7.29.0. 
This version contains a security fix for CVE-2013-0249, for details please have
a look at:

http://curl.haxx.se/docs/adv_20130206.html

Thanks to @roconnor for pointing this out.

I'm pushing this to stdenv-updates because I'm not quite sure if it will break
other things because 7.29.0 is now non-blocking by default. Plus the security
vulnerability only affects IMAP, POP3 and SMTP protocol support.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-02-08 09:03:22 +01:00
Eelco Dolstra 88b11196c1 Clean up redundant "if condition then true else false" 2012-12-28 19:57:47 +01:00
Eelco Dolstra 5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv 
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
 2012-12-28 19:08:19 +01:00
Peter Simons c0b393866f curl: update to version 7.28.0 2012-10-26 10:32:04 +02:00
Eelco Dolstra fcb1d64322 curl: Update to 7.27.0 2012-09-13 11:36:34 -04:00