swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #222172: curl: 7.88.1 -> 8.0.1

Browse source 
...into staging-next
This commit is contained in:
Vladimír Čunát 2023-03-20 17:15:36 +01:00
parent f18e6d2e95 603cae0768
commit 1b3ad28ae9
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/networking/curl/default.nix
View file

@ -48,14 +48,14 @@ assert !(opensslSupport && wolfsslSupport);
stdenv.mkDerivation (finalAttrs: {
pname = "curl";
version = "7.88.1";
version = "8.0.1";
src = fetchurl {
urls = [
"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"
];
hash = "sha256-giS0XM4Sq94DnBLcBxG36oWxBLmtU01uTFtOGIphyQc=";
hash = "sha256-m2selrdI0EuWh4a2vfQHqlx1q1Oj03wcjIHNtzZVXM8=";
};
patches = [
@ -168,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit opensslSupport openssl;
tests = {
withCheck = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; });
fetchpatch = tests.fetchpatch.simple.override { fetchpatch = fetchpatch.override { fetchurl = useThisCurl fetchurl; }; };
fetchpatch = tests.fetchpatch.simple.override { fetchpatch = (fetchpatch.override { fetchurl = useThisCurl fetchurl; }) // { version = 1; }; };
curlpp = useThisCurl curlpp;
coeurl = useThisCurl coeurl;
haskell-curl = useThisCurl haskellPackages.curl;