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