diff options
author | Artturin <Artturin@artturin.com> | 2022-06-24 16:58:17 +0300 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2022-06-24 18:59:13 +0300 |
commit | 6bce3fc64efd39e7e6b6cc2917eb533afbe33719 (patch) | |
tree | 6e60501469863609cc94be23a96173e931be4661 | |
parent | 67d19f473ccd3e89c7af3d547e21cb2ba800a5bb (diff) |
curl: use finalAttrs
allows using the correct package in passthru remove unneeded replaceStrings in urls
-rw-r--r-- | pkgs/tools/networking/curl/default.nix | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index d0e3e7a61a640..f07789cd730f3 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -61,14 +61,14 @@ assert wolfsslSupport -> wolfssl != null; assert zlibSupport -> zlib != null; assert zstdSupport -> zstd != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "curl"; version = "7.83.1"; src = fetchurl { urls = [ - "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" - "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" + "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.bz2" + "https://github.com/curl/curl/releases/download/curl-${finalAttrs.version}/curl-${finalAttrs.version}.tar.bz2" ]; sha256 = "sha256-9Tmjb7RKgmDsXZd+Tg290u7intkPztqpvDyfeKETv/A="; }; @@ -177,16 +177,21 @@ stdenv.mkDerivation rec { ln $out/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcurl-gnutls${stdenv.hostPlatform.extensions.sharedLibrary}.4.4.0 ''; - passthru = { + passthru = let + useThisCurl = attr: attr.override { curl = finalAttrs.finalPackage; }; + in { inherit opensslSupport openssl; tests = { - inherit curlpp coeurl; - haskell-curl = haskellPackages.curl; - ocaml-curly = ocamlPackages.curly; - php-curl = phpExtensions.curl; - pycurl = python3.pkgs.pycurl; + curlpp = useThisCurl curlpp; + coeurl = useThisCurl coeurl; + haskell-curl = useThisCurl haskellPackages.curl; + ocaml-curly = useThisCurl ocamlPackages.curly; + pycurl = useThisCurl python3.pkgs.pycurl; + php-curl = useThisCurl phpExtensions.curl; + # error: attribute 'override' missing # Additional checking with support http3 protocol. - inherit (nixosTests) nginx-http3; + # nginx-http3 = useThisCurl nixosTests.nginx-http3; + nginx-http3 = nixosTests.nginx-http3; }; }; @@ -199,4 +204,4 @@ stdenv.mkDerivation rec { # Fails to link against static brotli or gss broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport); }; -} +}) |