git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #67641 from suhr/i2p

i2p: 0.9.41 -> 0.9.42

commit6091d14c586a1b32f2e90c5ee482d82d42628575 authorMario Rodas <marsam@users.noreply.github.com> dateSun 15 Sep 2019, 16:33 (7 years ago) parent27c93277f2b73d
1 file changed+16−7
pkgs/tools/networking/i2p/default.nix+16−7
pkgs/tools/networking/i2p/default.nix+16−7
@@ -3,11 +3,14 @@
33let wrapper = stdenv.mkDerivation rec {
44 pname = "wrapper";
55 version = "3.5.35";
6+
67 src = fetchurl {
78 url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
89 sha256 = "0mjyw9ays9v6lnj21pmfd3qdvd9b6rwxfmw3pg6z0kyf2jadixw2";
910 };
11+
1012 buildInputs = [ jdk ];
13+
1114 buildPhase = ''
1215 export ANT_HOME=${ant}
1316 export JAVA_HOME=${jdk}/lib/openjdk/jre/
@@ -16,6 +19,7 @@ let wrapper = stdenv.mkDerivation rec {
1619 sed 's/ testsuite$//' -i src/c/Makefile-linux-x86-64.make
1720 ${if stdenv.isi686 then "./build32.sh" else "./build64.sh"}
1821 '';
22+
1923 installPhase = ''
2024 mkdir -p $out/{bin,lib}
2125 cp bin/wrapper $out/bin/wrapper
@@ -27,17 +31,22 @@ let wrapper = stdenv.mkDerivation rec {
2731in
2832
2933stdenv.mkDerivation rec {
30− name = "i2p-0.9.41";
34+ pname = "i2p";
35+ version = "0.9.42";
36+
3137 src = fetchurl {
32− url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
33− sha256 = "0adrj56i3pcc9ainj22akjrrvy73carz5jk29qa1h2b9q03di73b";
38+ url = "https://download.i2p2.de/releases/${version}/i2psource_${version}.tar.bz2";
39+ sha256 = "04y71hzkdpjzbac569rhyg1zfx37j0alggbl9gnkaqfbprb2nj1h";
3440 };
41+
3542 buildInputs = [ jdk ant gettext which ];
3643 patches = [ ./i2p.patch ];
44+
3745 buildPhase = ''
3846 export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
3947 ant preppkg-linux-only
40− '';
48+ '';
49+
4150 installPhase = ''
4251 set -B
4352 mkdir -p $out/{bin,share}
@@ -61,13 +70,13 @@ stdenv.mkDerivation rec {
6170 mv $out/man $out/share/
6271 chmod +x $out/bin/* $out/i2psvc
6372 rm $out/{osid,postinstall.sh,INSTALL-headless.txt}
64− '';
73+ '';
6574
6675 meta = with stdenv.lib; {
67− homepage = https://geti2p.net;
6876 description = "Applications and router for I2P, anonymity over the Internet";
69− maintainers = [ maintainers.joelmo ];
77+ homepage = "https://geti2p.net";
7078 license = licenses.gpl2;
7179 platforms = [ "x86_64-linux" "i686-linux" ];
80+ maintainers = [ maintainers.joelmo ];
7281 };
7382}