freenet: 1470 -> 1475

+15 -13
+14 -12
pkgs/applications/networking/p2p/freenet/default.nix
··· 1 - { stdenv, fetchurl, fetchgit, ant, jdk, bash, coreutils, substituteAll }: 2 3 let 4 freenet_ext = fetchurl { ··· 6 sha256 = "17ypljdvazgx2z6hhswny1lxfrknysz3x6igx8vl3xgdpvbb7wij"; 7 }; 8 9 bcprov = fetchurl { 10 - url = https://downloads.freenetproject.org/latest/bcprov-jdk15on-152.jar; 11 - sha256 = "0wqpdcvcfh939fk8yr033ijzr1vjbp6ydlnv5ly8jiykwj0x3i0d"; 12 }; 13 seednodes = fetchurl { 14 url = https://downloads.freenetproject.org/alpha/opennet/seednodes.fref; 15 - sha256 = "109zn9w8axdkjwhkkcm2s8dvib0mq0n8imjgs3r8hvi128cjsmg9"; 16 }; 17 - version = "build01470"; 18 19 freenet-jars = stdenv.mkDerivation { 20 name = "freenet-jars-${version}"; 21 22 - src = fetchgit { 23 - url = https://github.com/freenet/fred; 24 - rev = "refs/tags/${version}"; 25 - sha256 = "1b6e6fec2b9a729d4a25605fa142df9ea42e59b379ff665f580e32c6178c9746"; 26 }; 27 28 patchPhase = '' 29 cp ${freenet_ext} lib/freenet/freenet-ext.jar 30 - cp ${bcprov} lib/bcprov-jdk15on-152.jar 31 32 sed '/antcall.*-ext/d' -i build.xml 33 sed 's/@unknown@/${version}/g' -i build-clean.xml ··· 39 40 installPhase = '' 41 mkdir -p $out/share/freenet 42 - cp lib/bcprov-jdk15on-152.jar $out/share/freenet 43 cp lib/freenet/freenet-ext.jar $out/share/freenet 44 cp dist/freenet.jar $out/share/freenet 45 ''; ··· 51 52 src = substituteAll { 53 src = ./freenetWrapper; 54 - inherit bash coreutils seednodes; 55 freenet = freenet-jars; 56 jre = jdk.jre; 57 };
··· 1 + { stdenv, fetchurl, fetchFromGitHub, ant, jdk, bash, coreutils, substituteAll }: 2 3 let 4 freenet_ext = fetchurl { ··· 6 sha256 = "17ypljdvazgx2z6hhswny1lxfrknysz3x6igx8vl3xgdpvbb7wij"; 7 }; 8 9 + bcprov_version = "jdk15on-154"; 10 bcprov = fetchurl { 11 + url = "https://www.bouncycastle.org/download/bcprov-ext-${bcprov_version}.jar"; 12 + sha256 = "0abmhg2h44g8c5p7skzqwfxj8xwcjh9vs84mc0hr78k1am0633jk"; 13 }; 14 seednodes = fetchurl { 15 url = https://downloads.freenetproject.org/alpha/opennet/seednodes.fref; 16 + sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv"; 17 }; 18 + version = "build01475"; 19 20 freenet-jars = stdenv.mkDerivation { 21 name = "freenet-jars-${version}"; 22 23 + src = fetchFromGitHub { 24 + owner = "freenet"; 25 + repo = "fred"; 26 + rev = version; 27 + sha256 = "0k02fna9x219j7dhginbnf27i36bibb0rmm4qdwr5xm28hy1nd08"; 28 }; 29 30 patchPhase = '' 31 cp ${freenet_ext} lib/freenet/freenet-ext.jar 32 + cp ${bcprov} lib/bcprov-${bcprov_version}.jar 33 34 sed '/antcall.*-ext/d' -i build.xml 35 sed 's/@unknown@/${version}/g' -i build-clean.xml ··· 41 42 installPhase = '' 43 mkdir -p $out/share/freenet 44 + cp lib/bcprov-${bcprov_version}.jar $out/share/freenet 45 cp lib/freenet/freenet-ext.jar $out/share/freenet 46 cp dist/freenet.jar $out/share/freenet 47 ''; ··· 53 54 src = substituteAll { 55 src = ./freenetWrapper; 56 + inherit bash coreutils seednodes bcprov_version; 57 freenet = freenet-jars; 58 jre = jdk.jre; 59 };
+1 -1
pkgs/applications/networking/p2p/freenet/freenetWrapper
··· 15 chmod u+rw $FREENET_HOME/seednodes.fref 16 17 cd $FREENET_HOME 18 - @jre@/bin/java -cp @freenet@/share/freenet/bcprov-jdk15on-152.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/freenet.jar -Xmx1024M freenet.node.NodeStarter
··· 15 chmod u+rw $FREENET_HOME/seednodes.fref 16 17 cd $FREENET_HOME 18 + @jre@/bin/java -cp @freenet@/share/freenet/bcprov-@bcprov_version@.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/freenet.jar -Xmx1024M freenet.node.NodeStarter