about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorTimo Kaufmann <timokau@zoho.com>2020-10-07 10:03:07 +0200
committerGitHub <noreply@github.com>2020-10-07 10:03:07 +0200
commit8722718311b60cf2f24893c957cf287f03c2c59a (patch)
tree8a470d14ac887ecf6b72898fd70396b3ad998e09 /pkgs
parentb3af4a43f2419c55b0e0155d87d66e274cf942b3 (diff)
parent1f7cf9629180506f6f651d835c9ed3e428b3811f (diff)
Merge pull request #99893 from ardumont/bump-amule
amule: 2.3.2 -> unstable-20201006
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/networking/p2p/amule/default.nix19
1 files changed, 3 insertions, 16 deletions
diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix
index 264c6fd4e165a..6ecc9f7ba12b7 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