From 1f7cf9629180506f6f651d835c9ed3e428b3811f Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont (@ardumont)" Date: Tue, 6 Oct 2020 21:30:11 +0200 Subject: [PATCH] amule: 2.3.2 -> unstable-20201006 There has been no new release since 2.3.2 for some years now (around 2016) [1] The most recent master branch for the amule project includes a commit [2] which fixes compilation breakage with the next libupnp version [3]. So this bumps the amule version to the latest commit of that repository. [1] https://github.com/amule-project/amule/issues/219 [2] https://github.com/amule-project/amule/commit/8784480c79680df5c224d6886a8b4cd3dc1d1801 [3] #93048 --- pkgs/tools/networking/p2p/amule/default.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index 264c6fd4e165..6ecc9f7ba12b 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -10,28 +10,15 @@ assert client -> libX11 != null; stdenv.mkDerivation rec { pname = "amule"; - version = "2.3.2"; + version = "unstable-20201006"; src = fetchFromGitHub { owner = "amule-project"; repo = "amule"; - rev = version; - sha256 = "010wxm6g9f92x6fympj501zbnjka32rzbx0sk3a2y4zpih5d2nsn"; + rev = "6f8951527eda670c7266984ce476061bfe8867fc"; + sha256 = "12b44b6hz3mb7nsn6xhzvm726xs06xcim013i1appif4dr8njbx1"; }; - patches = [ - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/amule-project/amule/pull/135.patch"; - sha256 = "1n24r1j28083b8ipbnh1nf6i4j6vx59pdkfl1c0g6bb4psx9wvvi"; - name = "libupnp_18.patch"; - }) - (fetchpatch { - name = "amule-cryptopp_6.patch"; - url = "https://github.com/amule-project/amule/commit/27c13f3e622b8a3eaaa05bb62b0149604bdcc9e8.patch"; - sha256 = "0kq095gi3xl665wr864zlhp5f3blk75pr725yany8ilzcwrzdrnm"; - }) - ]; - postPatch = '' substituteInPlace src/libs/ec/file_generator.pl \ --replace /usr/bin/perl ${perl}/bin/perl