Merge #182521: perlPackages.LWP: 6.49 -> 6.67, fix cross build

...into staging-22.05
This commit is contained in:
Vladimír Čunát
2022-08-01 10:25:57 +02:00

View File

@@ -12853,12 +12853,15 @@ let
LWP = buildPerlPackage {
pname = "libwww-perl";
version = "6.49";
version = "6.67";
src = fetchurl {
url = "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.49.tar.gz";
sha256 = "19k0cg4j4qz005a4ngy48z4r8dc99dxlpq8kvj7qnk15mvgd1r63";
url = "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.67.tar.gz";
sha256 = "sha256-lu7ECj/QqhvYNBF75eshxDj3MJTYYaGn5XdPCxImtyM=";
};
propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ];
propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]
# [22.05]: Propagate HTTPDaemon for non-cross builds
# to avoid changing behaviour from version 6.49
++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ HTTPDaemon ];
# support cross-compilation by avoiding using `has_module` which does not work in miniperl (it requires B native module)
postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
substituteInPlace Makefile.PL --replace 'if has_module' 'if 0; #'
@@ -12868,7 +12871,7 @@ let
description = "The World-Wide Web library for Perl";
license = with licenses; [ artistic1 gpl1Plus ];
};
buildInputs = [ TestFatal TestNeeds TestRequiresInternet ];
checkInputs = [ HTTPDaemon TestFatal TestNeeds TestRequiresInternet ];
};
LWPAuthenOAuth = buildPerlPackage {