2018-03-16 00:08:12 +01:00
|
|
|
{ stdenv, lib, fetchurl, pkgconfig, perl
|
2016-04-18 20:42:50 +02:00
|
|
|
, http2Support ? true, nghttp2
|
2015-06-02 11:32:28 +02:00
|
|
|
, idnSupport ? false, libidn ? null
|
|
|
|
, ldapSupport ? false, openldap ? null
|
|
|
|
, zlibSupport ? false, zlib ? null
|
|
|
|
, sslSupport ? false, openssl ? null
|
2017-02-05 13:37:16 +01:00
|
|
|
, gnutlsSupport ? false, gnutls ? null
|
2015-06-02 11:32:28 +02:00
|
|
|
, scpSupport ? false, libssh2 ? null
|
2017-09-25 21:53:52 +02:00
|
|
|
, gssSupport ? false, kerberos ? null
|
2015-06-02 11:32:28 +02:00
|
|
|
, c-aresSupport ? false, c-ares ? null
|
2017-11-29 11:55:11 +01:00
|
|
|
, brotliSupport ? false, brotli ? null
|
2010-07-18 23:01:17 +02:00
|
|
|
}:
|
2005-06-17 12:30:13 +02:00
|
|
|
|
2016-04-18 20:42:50 +02:00
|
|
|
assert http2Support -> nghttp2 != null;
|
2015-06-02 11:32:28 +02:00
|
|
|
assert idnSupport -> libidn != null;
|
|
|
|
assert ldapSupport -> openldap != null;
|
|
|
|
assert zlibSupport -> zlib != null;
|
|
|
|
assert sslSupport -> openssl != null;
|
2017-02-05 13:37:16 +01:00
|
|
|
assert !(gnutlsSupport && sslSupport);
|
|
|
|
assert gnutlsSupport -> gnutls != null;
|
2015-06-02 11:32:28 +02:00
|
|
|
assert scpSupport -> libssh2 != null;
|
|
|
|
assert c-aresSupport -> c-ares != null;
|
2017-11-29 11:55:11 +01:00
|
|
|
assert brotliSupport -> brotli != null;
|
2017-09-25 21:53:52 +02:00
|
|
|
assert gssSupport -> kerberos != null;
|
2015-06-01 20:52:03 +02:00
|
|
|
|
2009-03-11 16:16:17 +01:00
|
|
|
stdenv.mkDerivation rec {
|
2018-09-08 16:44:02 +02:00
|
|
|
name = "curl-7.61.1";
|
2010-08-06 14:45:39 +02:00
|
|
|
|
* The stdenv setup script now defines a generic builder that allows
builders for typical Autoconf-style to be much shorten, e.g.,
. $stdenv/setup
genericBuild
The generic builder does lots of stuff automatically:
- Unpacks source archives specified by $src or $srcs (it knows about
gzip, bzip2, tar, zip, and unpacked source trees).
- Determines the source tree.
- Applies patches specified by $patches.
- Fixes libtool not to search for libraries in /lib etc.
- Runs `configure'.
- Runs `make'.
- Runs `make install'.
- Strips debug information from static libraries.
- Writes nested log information (in the format accepted by
`log2xml').
There are also lots of hooks and variables to customise the generic
builder. See `stdenv/generic/docs.txt'.
* Adapted the base packages (i.e., the ones used by stdenv) to use the
generic builder.
* We now use `curl' instead of `wget' to download files in `fetchurl'.
* Neither `curl' nor `wget' are part of stdenv. We shouldn't
encourage people to download stuff in builders (impure!).
* Updated some packages.
* `buildinputs' is now `buildInputs' (but the old name also works).
* `findInputs' in the setup script now prevents inputs from being
processed multiple times (which could happen, e.g., if an input was
a propagated input of several other inputs; this caused the size
variables like $PATH to blow up exponentially in the worst case).
* Patched GNU Make to write nested log information in the format
accepted by `log2xml'. Also, prior to writing the build command,
Make now writes a line `building X' to indicate what is being
built. This is unfortunately often obscured by the gigantic tool
invocations in many Makefiles. The actual build commands are marked
`unimportant' so that they don't clutter pages generated by
`log2html'.
svn path=/nixpkgs/trunk/; revision=845
2004-03-19 17:53:04 +01:00
|
|
|
src = fetchurl {
|
2018-03-16 00:08:12 +01:00
|
|
|
urls = [
|
|
|
|
"https://curl.haxx.se/download/${name}.tar.bz2"
|
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 16:04:48 +02:00
|
|
|
"https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2"
|
2018-03-16 00:08:12 +01:00
|
|
|
];
|
2018-09-08 16:44:02 +02:00
|
|
|
sha256 = "1f8rljpa98g7ry7qyvv6657cmvgrwmam9mdbjklv45lspiykf253";
|
* The stdenv setup script now defines a generic builder that allows
builders for typical Autoconf-style to be much shorten, e.g.,
. $stdenv/setup
genericBuild
The generic builder does lots of stuff automatically:
- Unpacks source archives specified by $src or $srcs (it knows about
gzip, bzip2, tar, zip, and unpacked source trees).
- Determines the source tree.
- Applies patches specified by $patches.
- Fixes libtool not to search for libraries in /lib etc.
- Runs `configure'.
- Runs `make'.
- Runs `make install'.
- Strips debug information from static libraries.
- Writes nested log information (in the format accepted by
`log2xml').
There are also lots of hooks and variables to customise the generic
builder. See `stdenv/generic/docs.txt'.
* Adapted the base packages (i.e., the ones used by stdenv) to use the
generic builder.
* We now use `curl' instead of `wget' to download files in `fetchurl'.
* Neither `curl' nor `wget' are part of stdenv. We shouldn't
encourage people to download stuff in builders (impure!).
* Updated some packages.
* `buildinputs' is now `buildInputs' (but the old name also works).
* `findInputs' in the setup script now prevents inputs from being
processed multiple times (which could happen, e.g., if an input was
a propagated input of several other inputs; this caused the size
variables like $PATH to blow up exponentially in the worst case).
* Patched GNU Make to write nested log information in the format
accepted by `log2xml'. Also, prior to writing the build command,
Make now writes a line `building X' to indicate what is being
built. This is unfortunately often obscured by the gigantic tool
invocations in many Makefiles. The actual build commands are marked
`unimportant' so that they don't clutter pages generated by
`log2html'.
svn path=/nixpkgs/trunk/; revision=845
2004-03-19 17:53:04 +01:00
|
|
|
};
|
2010-08-06 14:45:39 +02:00
|
|
|
|
2016-09-01 11:07:23 +02:00
|
|
|
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
|
2017-07-05 16:04:54 +02:00
|
|
|
separateDebugInfo = stdenv.isLinux;
|
2015-10-06 15:32:17 +02:00
|
|
|
|
2017-01-24 13:51:30 +01:00
|
|
|
enableParallelBuilding = true;
|
|
|
|
|
2016-01-31 15:30:40 +01:00
|
|
|
nativeBuildInputs = [ pkgconfig perl ];
|
|
|
|
|
2015-06-02 11:32:28 +02:00
|
|
|
# Zlib and OpenSSL must be propagated because `libcurl.la' contains
|
|
|
|
# "-lz -lssl", which aren't necessary direct build inputs of
|
|
|
|
# applications that use Curl.
|
|
|
|
propagatedBuildInputs = with stdenv.lib;
|
2016-04-18 20:42:50 +02:00
|
|
|
optional http2Support nghttp2 ++
|
2015-06-02 11:32:28 +02:00
|
|
|
optional idnSupport libidn ++
|
|
|
|
optional ldapSupport openldap ++
|
|
|
|
optional zlibSupport zlib ++
|
2017-09-25 21:53:52 +02:00
|
|
|
optional gssSupport kerberos ++
|
2015-06-02 11:32:28 +02:00
|
|
|
optional c-aresSupport c-ares ++
|
|
|
|
optional sslSupport openssl ++
|
2017-02-05 13:37:16 +01:00
|
|
|
optional gnutlsSupport gnutls ++
|
2017-11-29 11:55:11 +01:00
|
|
|
optional scpSupport libssh2 ++
|
|
|
|
optional brotliSupport brotli;
|
2015-06-02 11:32:28 +02:00
|
|
|
|
2017-08-02 23:50:51 +02:00
|
|
|
# for the second line see https://curl.haxx.se/mail/tracker-2014-03/0087.html
|
2015-06-02 11:32:28 +02:00
|
|
|
preConfigure = ''
|
|
|
|
sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
|
|
|
|
rm src/tool_hugehelp.c
|
|
|
|
'';
|
2013-09-07 02:38:36 +02:00
|
|
|
|
2012-10-27 19:28:08 +02:00
|
|
|
configureFlags = [
|
2018-06-23 12:13:23 +02:00
|
|
|
# Disable default CA bundle, use NIX_SSL_CERT_FILE or fallback
|
|
|
|
# to nss-cacert from the default profile.
|
|
|
|
"--without-ca-bundle"
|
|
|
|
"--without-ca-path"
|
2017-03-22 11:48:06 +01:00
|
|
|
"--with-ca-fallback"
|
2014-08-23 04:26:04 +02:00
|
|
|
"--disable-manual"
|
2016-04-16 19:44:32 +02:00
|
|
|
( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" )
|
2017-02-05 13:37:16 +01:00
|
|
|
( if gnutlsSupport then "--with-gnutls=${gnutls.dev}" else "--without-gnutls" )
|
2016-04-16 19:39:09 +02:00
|
|
|
( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" )
|
2015-06-02 11:32:28 +02:00
|
|
|
( if ldapSupport then "--enable-ldap" else "--disable-ldap" )
|
|
|
|
( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" )
|
2016-04-16 19:36:27 +02:00
|
|
|
( if idnSupport then "--with-libidn=${libidn.dev}" else "--without-libidn" )
|
2017-11-29 11:55:11 +01:00
|
|
|
( if brotliSupport then "--with-brotli" else "--without-brotli" )
|
2015-06-02 11:32:28 +02:00
|
|
|
]
|
|
|
|
++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
|
2018-07-23 21:51:18 +02:00
|
|
|
++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}"
|
|
|
|
# For the 'urandom', maybe it should be a cross-system option
|
|
|
|
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
|
|
|
|
"--with-random=/dev/urandom";
|
2010-03-06 16:17:43 +01:00
|
|
|
|
2017-10-28 05:17:55 +02:00
|
|
|
CXX = "${stdenv.cc.targetPrefix}c++";
|
|
|
|
CXXCPP = "${stdenv.cc.targetPrefix}c++ -E";
|
2015-06-02 11:32:28 +02:00
|
|
|
|
2018-04-25 05:20:18 +02:00
|
|
|
doCheck = false; # expensive, fails
|
|
|
|
|
2015-10-06 15:32:17 +02:00
|
|
|
postInstall = ''
|
2015-12-02 10:03:23 +01:00
|
|
|
moveToOutput bin/curl-config "$dev"
|
2015-10-06 15:32:17 +02:00
|
|
|
sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
|
2017-02-05 13:37:16 +01:00
|
|
|
'' + stdenv.lib.optionalString gnutlsSupport ''
|
|
|
|
ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so
|
|
|
|
ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4
|
|
|
|
ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4.4.0
|
2015-10-06 15:32:17 +02:00
|
|
|
'';
|
|
|
|
|
2015-06-02 11:32:28 +02:00
|
|
|
passthru = {
|
|
|
|
inherit sslSupport openssl;
|
|
|
|
};
|
2015-06-02 11:32:16 +02:00
|
|
|
|
2015-06-02 11:32:28 +02:00
|
|
|
meta = with stdenv.lib; {
|
2008-04-23 11:30:09 +02:00
|
|
|
description = "A command line tool for transferring files with URL syntax";
|
2017-08-02 23:50:51 +02:00
|
|
|
homepage = https://curl.haxx.se/;
|
2015-06-02 11:32:28 +02:00
|
|
|
maintainers = with maintainers; [ lovek323 ];
|
2018-08-16 21:36:36 +02:00
|
|
|
license = licenses.curl;
|
|
|
|
platforms = platforms.all;
|
2008-04-23 11:30:09 +02:00
|
|
|
};
|
2007-05-24 15:34:34 +02:00
|
|
|
}
|