Commit Graph

156 Commits

Author SHA1 Message Date
Markus Kowalewski
17702d0416
curl: add license 2018-08-16 21:38:59 +02:00
John Ericson
c99de14e60 curl: Get rid of crossAttrs 2018-07-24 18:36:59 -04:00
Frederik Rietdijk
099c13da1b Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.

* libffi: simplify using `checkInputs`

* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix

* utillinux: 2.32 -> 2.32.1

https://lkml.org/lkml/2018/7/16/532

* busybox: 1.29.0 -> 1.29.1

* bind: 9.12.1-P2 -> 9.12.2

https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html

* curl: 7.60.0 -> 7.61.0

* gvfs: make tests run, but disable

* ilmbase: disable tests on i686. Spooky!

* mdds: fix tests

* git: disable checks as tests are run in installcheck

* ruby: disable tests

* libcommuni: disable checks as tests are run in installcheck

* librdf: make tests run, but disable

* neon, neon_0_29: make tests run, but disable

* pciutils: 3.6.0 -> 3.6.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.

* mesa: more include fixes

mostly from void-linux (thanks!)

* npth: 1.5 -> 1.6

minor bump

* boost167: Add lockfree next_prior patch

* stdenv: cleanup darwin bootstrapping

Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.

* Revert "pciutils: use standardized equivalent for canonicalize_file_name"

This reverts commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7.
Patching should no longer be needed with 3.6.1.

* binutils-wrapper: Try to avoid adding unnecessary -L flags

(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>

* libffi: don't check on darwin

libffi usages in stdenv broken darwin. We need to disable doCheck for that case.

* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook

* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273

When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.

* parity-ui: fix after merge

* python.pkgs.pytest-flake8: disable test, fix build

* Revert "meson: 0.46.1 -> 0.47.0"

With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.

When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.

Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.

I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)

This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.

--

Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).

Fixes #43650.

This reverts commit 305ac4dade5758c58e8ab1666ad0197fd305828d.

(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
Vladimír Čunát
c1ffc65d1a
Merge branch 'master' into staging
This apparently fixes some broken src fetches (gnuradio, twisted).
2018-07-02 11:10:26 +02:00
Will Dietz
81c9f7125f curl: fix configure flag for random device.
Fixes #42778.

Thanks for reporting, @dingxiangfei2009!
2018-07-01 12:47:24 -05:00
Daiderd Jordan
288939ce22
curl: disable default CA bundle
Without this curl might detect /etc/ssl/cert.pem at build time on macOS,
causing curl to ignore NIX_SSL_CERT_FILE.

Fixes #42317
2018-06-23 12:16:42 +02:00
Tim Steinbach
5574df3549 nix: point at curl 7.59.0 (#41452) 2018-06-04 22:25:23 +00:00
Tim Steinbach
44101ee9d6
curl: 7.59.0 -> 7.60.0 2018-05-16 07:27:35 -04:00
Ben Gamari
d23f71deaa curl: Enable cross-compilation
By fixing toolchain paths
2018-05-03 17:06:00 -04:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Tim Steinbach
837ecc2f6a
curl: 7.58.0 -> 7.59.0 2018-03-15 19:08:12 -04:00
SLNOS
40bceae84e curl: fetchurl more securely 2018-02-10 00:25:37 +00:00
Franz Pletz
60331e6e90
curl: 7.57.0 -> 7.58.0 (security)
Fixes: CVE-2018-1000005, CVE-2018-1000007
2018-01-29 14:15:56 +01:00
Vladimír Čunát
9b54a00160
Merge #29785: curl: enable kerberos 2017-12-19 15:18:24 +01:00
Vladimír Čunát
13e6a5c561
kerberos: split headers into $dev 2017-12-19 15:18:01 +01:00
adisbladis
8d479c0397
curl: Add brotli support 2017-11-29 19:47:41 +08:00
adisbladis
b7e6fd3b3a curl: 7.56.1 -> 7.57.0
Fixes CVEs:
CVE-2017-8816
CVE-2017-8817
CVE-2017-8818
2017-11-29 11:19:37 +00:00
Tim Steinbach
9bd9305602
curl: 7.56.0 -> 7.56.1 2017-10-23 08:33:11 -04:00
Spencer Baugh
75353853fc curl: use the "kerberos" package rather than specifically GNU gss
This allows a policy decision about which Kerberos to use.
2017-10-08 20:45:58 +00:00
Daiderd Jordan
514593ea31
curl: fix clang build 2017-10-04 23:08:30 +02:00
Franz Pletz
a98b96824d
curl: 7.55.1 -> 7.56.0 for CVE-2017-1000254
https://curl.haxx.se/docs/adv_20171004.html
2017-10-04 08:17:46 +02:00
Tim Steinbach
135a841d91
curl: 7.55.0 -> 7.55.1 2017-08-14 19:21:47 +02:00
Frederik Rietdijk
13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https
Update homepage attributes: http -> https
2017-08-13 21:53:20 +02:00
Franz Pletz
b44bed5568
curl: 7.54.1 -> 7.55.0
Fixes #28073.

Fixes CVE-2017-1000101, CVE-2017-1000100, CVE-2017-1000099.
2017-08-10 16:22:56 +02:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
Eelco Dolstra
c23dcd72a0
Enable some more debug info 2017-07-05 16:04:54 +02:00
Tim Steinbach
9560fcbadf
curl: 7.54.0 -> 7.54.1 2017-06-16 08:16:30 -04:00
Tim Steinbach
55e334e62a
curl: 7.53.1 -> 7.54.0 2017-04-19 11:31:09 -04:00
Guillaume Maudoux
8ecb94bb97 curl: Use default trust store of TLS backend
Having curl fall back to openssl's CA means that we need not patch curl
to respect NIX_SSL_CERT_FILE. It will work in all the cases.

This reverts commit fb4c43dd8adbd7a10d1c52539b36e2da269f3f7f "curl: Use CA bundle in nix default profile by default"
If we want to reintroduce that feature, this needs to go inside openssl
2017-03-22 11:54:20 +01:00
Guillaume Maudoux
525a663174 curl, git: Fix curl default CA, let git use it
Improve patching of curl to use NIX_SSL_CERT_FILE as default CA
Remove patches from git, as git uses curl and passes its environment
variables to curl.
2017-03-22 11:22:53 +01:00
Domen Kožar
c3c9412c7d
git, openssl, curl: Respect $NIX_SSL_CERT_FILE
Slightly modified version of 942dbf89c6120cb5b52fb2ab456855d1fbf2994e
2017-03-20 14:11:20 +01:00
Shea Levy
fb4c43dd8a curl: Use CA bundle in nix default profile by default 2017-03-10 14:56:22 -05:00
Tim Steinbach
6988d2d456
curl: 7.53.0 -> 7.53.1 2017-02-25 09:03:22 -05:00
Tim Steinbach
b1c6a9bfcc
curl: 7.52.1 -> 7.53.0 2017-02-21 18:47:33 -05:00
Lengyel Balázs
372cb3760e
Merge #17694: curl: add gnutlsSupport ? false
(incl. a nitpick change from vcunat)
2017-02-05 13:37:16 +01:00
Eelco Dolstra
7bc801e282
curl: Apply upstream patch to fix https hangs
https://github.com/curl/curl/issues/1174

Fixes https://github.com/NixOS/nix/issues/1181.
2017-01-24 13:51:30 +01:00
Tim Steinbach
125fa1520d
curl: 7.51.1 -> 7.52.1 2017-01-03 08:42:59 -05:00
Franz Pletz
9007303001
curl: add upstream patch to fix HTTP2 performance issues
See #20639. Patch has to be in nixpkgs because fetchurl depends on curl.
2016-11-26 14:48:05 +01:00
Eelco Dolstra
1e1609da6a curl: 7.50.3 -> 7.51.0
Fixes 11 CVEs:

https://curl.haxx.se/changes.html#7_51_0
2016-11-02 10:38:17 +01:00
Eelco Dolstra
811b876fab Revert "openssl, curl, git: Respect $NIX_SSL_CERT_FILE"
This reverts commit 942dbf89c6120cb5b52fb2ab456855d1fbf2994e. Sorry,
this was supposed to go to staging instead of master...
2016-10-14 16:01:54 +02:00
Eelco Dolstra
942dbf89c6 openssl, curl, git: Respect $NIX_SSL_CERT_FILE
$NIX_SSL_CERT_FILE overrides $SSL_CERT_FILE, which in turn overrides
the default CA path (/etc/ssl/certs/ca-certificates.crt). This allows
Nix to set a CA path without interfering with other packages (such as
Homebrew).

See https://github.com/NixOS/nix/issues/921.
2016-10-14 12:06:10 +02:00
Tim Steinbach
cda53e434e
curl: 7.50.1 -> 7.50.3 2016-09-23 09:59:14 -04:00
Franz Pletz
ee4c4768a4
curl3: remove vulnerable curl version 2016-09-14 09:03:23 +02:00
Eelco Dolstra
8172cd734c docdev -> devdoc
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Kranium Gikos Mendoza
3c1b7efaa8 curl: 7.50.0 -> 7.50.1 (#17486) (#17527) 2016-08-05 15:52:58 +02:00
Miguel Madrid
fa03b541b2 curl: 7.47.1 -> 7.50.0 (#17152) 2016-07-30 21:38:06 +01:00
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