1 files changed, 14 insertions, 12 deletions
diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix
index 51d7a49cac7..d674c70e4c2 100644
--- a/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/pkgs/applications/networking/p2p/freenet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, ant, jdk, bash, coreutils, substituteAll }:
+{ stdenv, fetchurl, fetchFromGitHub, ant, jdk, bash, coreutils, substituteAll }:
 
 let
   freenet_ext = fetchurl {
@@ -6,28 +6,30 @@ let
     sha256 = "17ypljdvazgx2z6hhswny1lxfrknysz3x6igx8vl3xgdpvbb7wij";
   };
 
+  bcprov_version = "jdk15on-154";
   bcprov = fetchurl {
-    url = https://downloads.freenetproject.org/latest/bcprov-jdk15on-152.jar;
-    sha256 = "0wqpdcvcfh939fk8yr033ijzr1vjbp6ydlnv5ly8jiykwj0x3i0d";
+    url = "https://www.bouncycastle.org/download/bcprov-ext-${bcprov_version}.jar";
+    sha256 = "0abmhg2h44g8c5p7skzqwfxj8xwcjh9vs84mc0hr78k1am0633jk";
   };
   seednodes = fetchurl {
     url = https://downloads.freenetproject.org/alpha/opennet/seednodes.fref;
-    sha256 = "109zn9w8axdkjwhkkcm2s8dvib0mq0n8imjgs3r8hvi128cjsmg9";
+    sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv";
   };
-  version = "build01470";
+  version = "build01475";
 
   freenet-jars = stdenv.mkDerivation {
     name = "freenet-jars-${version}";
 
-    src = fetchgit {
-      url = https://github.com/freenet/fred;
-      rev = "refs/tags/${version}";
-      sha256 = "1b6e6fec2b9a729d4a25605fa142df9ea42e59b379ff665f580e32c6178c9746";
+    src = fetchFromGitHub {
+      owner = "freenet";
+      repo = "fred";
+      rev = version;
+      sha256 = "0k02fna9x219j7dhginbnf27i36bibb0rmm4qdwr5xm28hy1nd08";
     };
 
     patchPhase = ''
       cp ${freenet_ext} lib/freenet/freenet-ext.jar
-      cp ${bcprov} lib/bcprov-jdk15on-152.jar
+      cp ${bcprov} lib/bcprov-${bcprov_version}.jar
 
       sed '/antcall.*-ext/d' -i build.xml
       sed 's/@unknown@/${version}/g' -i build-clean.xml
@@ -39,7 +41,7 @@ let
 
     installPhase = ''
       mkdir -p $out/share/freenet
-      cp lib/bcprov-jdk15on-152.jar $out/share/freenet
+      cp lib/bcprov-${bcprov_version}.jar $out/share/freenet
       cp lib/freenet/freenet-ext.jar $out/share/freenet
       cp dist/freenet.jar $out/share/freenet
     '';
@@ -51,7 +53,7 @@ in stdenv.mkDerivation {
 
   src = substituteAll {
     src = ./freenetWrapper;
-    inherit bash coreutils seednodes;
+    inherit bash coreutils seednodes bcprov_version;
     freenet = freenet-jars;
     jre = jdk.jre;
   };