From a43d20b8b4b5f7e2a1ea29bfb8539c58214cd1be Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 18 Feb 2020 23:06:46 +0100 Subject: [PATCH] perlPackages.{CryptCurve25519,MathGMP}: fixed build failures ZHF: #80379 https://hydra.nixos.org/build/112817446 https://hydra.nixos.org/build/112813918 https://hydra.nixos.org/build/112814931 https://hydra.nixos.org/build/112833536 https://hydra.nixos.org/build/112804942 https://hydra.nixos.org/build/112809869 perlPackages.CryptCurve25519: apply patch from gentoo to fix fmul conflicting types build breakage. https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-perl/Crypt-Curve25519?id=e07299f804a8376bb5bf85d28916e0a360199f3e perlPackages.MathGMP: 2.19 -> 2.20 Updated to latest upstream, which passes tests. This is a dependency of perlPackages.NetSSH --- pkgs/top-level/perl-packages.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 562e96246bf..da505b1a81c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3437,6 +3437,12 @@ let url = mirror://cpan/authors/id/A/AJ/AJGB/Crypt-Curve25519-0.06.tar.gz; sha256 = "1ir0gfxm8i7r9zyfs2zvil5jgwirl7j6cb9cm1p2kjpfnhyp0j4z"; }; + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-perl/Crypt-Curve25519/files/Crypt-Curve25519-0.60.0-fmul-fixedvar.patch?id=cec727ad614986ca1e6b9468eea7f1a5a9183382"; + sha256 = "0l005jzxp6q6vyl3p43ji47if0v9inscnjl0vxaqzf6c17akgbhf"; + }) + ]; meta = { description = "Generate shared secret using elliptic-curve Diffie-Hellman function"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -11113,10 +11119,10 @@ let MathGMP = buildPerlPackage { pname = "Math-GMP"; - version = "2.19"; + version = "2.20"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.19.tar.gz; - sha256 = "1c07521m4d38hy2yx21hkwz22n2672bvrc4i21ldc68h85qy1q8i"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.20.tar.gz; + sha256 = "0psmpj3j8cw02b5bzb7qnkd4rcpxm82891rwpdi2hx2jxy0mznhn"; }; buildInputs = [ pkgs.gmp AlienGMP ]; NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include";