diff options
| author | Kranium Gikos Mendoza <kranium@gikos.net> | 2016-08-21 00:17:13 +0800 |
|---|---|---|
| committer | Kranium Gikos Mendoza <kranium@gikos.net> | 2016-08-21 08:32:13 +0800 |
| commit | 01fa27a84c494b3ef571289ca7b553d2b1ebf8a5 (patch) | |
| tree | cac3a7216583acb48d496ccddbe759f91f8024bf /pkgs/applications/networking/p2p/freenet | |
| parent | 52a875fb2329c55070e86e3f85f1d788df10c2c5 (diff) | |
| download | nixpkgs-01fa27a84c494b3ef571289ca7b553d2b1ebf8a5.tar nixpkgs-01fa27a84c494b3ef571289ca7b553d2b1ebf8a5.tar.gz nixpkgs-01fa27a84c494b3ef571289ca7b553d2b1ebf8a5.tar.bz2 nixpkgs-01fa27a84c494b3ef571289ca7b553d2b1ebf8a5.tar.lz nixpkgs-01fa27a84c494b3ef571289ca7b553d2b1ebf8a5.tar.xz nixpkgs-01fa27a84c494b3ef571289ca7b553d2b1ebf8a5.tar.zst nixpkgs-01fa27a84c494b3ef571289ca7b553d2b1ebf8a5.zip | |
freenet: 1470 -> 1475
Diffstat (limited to 'pkgs/applications/networking/p2p/freenet')
| -rw-r--r-- | pkgs/applications/networking/p2p/freenet/default.nix | 26 | ||||
| -rwxr-xr-x | pkgs/applications/networking/p2p/freenet/freenetWrapper | 2 |
2 files changed, 15 insertions, 13 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; }; diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/applications/networking/p2p/freenet/freenetWrapper index 6df7f492458..f3106265801 100755 --- a/pkgs/applications/networking/p2p/freenet/freenetWrapper +++ b/pkgs/applications/networking/p2p/freenet/freenetWrapper @@ -15,4 +15,4 @@ cp -u @seednodes@ $FREENET_HOME/seednodes.fref chmod u+rw $FREENET_HOME/seednodes.fref cd $FREENET_HOME -@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 +@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 |