diff options
| author | Herwig Hochleitner <herwig@bendlas.net> | 2016-12-03 20:38:18 +0100 |
|---|---|---|
| committer | Herwig Hochleitner <herwig@bendlas.net> | 2017-01-02 13:14:42 +0100 |
| commit | 86a6083498d581e78d09d862127ac46eba86feac (patch) | |
| tree | 276c69e6765a5d1a88886866706a83d2ed78fea0 /pkgs/tools/networking | |
| parent | 1fa75a5bb7cdb9f2413d8b20726ce69523bfe4c6 (diff) | |
| download | nixpkgs-86a6083498d581e78d09d862127ac46eba86feac.tar nixpkgs-86a6083498d581e78d09d862127ac46eba86feac.tar.gz nixpkgs-86a6083498d581e78d09d862127ac46eba86feac.tar.bz2 nixpkgs-86a6083498d581e78d09d862127ac46eba86feac.tar.lz nixpkgs-86a6083498d581e78d09d862127ac46eba86feac.tar.xz nixpkgs-86a6083498d581e78d09d862127ac46eba86feac.tar.zst nixpkgs-86a6083498d581e78d09d862127ac46eba86feac.zip | |
i2p: 0.9.26 -> 0.9.28
update patch
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/i2p/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/i2p/i2p.patch | 34 |
2 files changed, 21 insertions, 17 deletions
diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index fb2f4358694..d5b9ff665d4 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -1,10 +1,10 @@ { stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: stdenv.mkDerivation rec { - name = "i2p-0.9.26"; + name = "i2p-0.9.28"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "0h672w69a5xzgcrls64bpss3ga9hgpnrq90dr5lb5912pwwq9pa1"; + sha256 = "1xagyywnck2c5xalr7bc7cv5ikk4igf7avmc0n28nz9pkais1y1y"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; diff --git a/pkgs/tools/networking/i2p/i2p.patch b/pkgs/tools/networking/i2p/i2p.patch index 2ae6446ed28..74031eb7aef 100644 --- a/pkgs/tools/networking/i2p/i2p.patch +++ b/pkgs/tools/networking/i2p/i2p.patch @@ -1,6 +1,21 @@ +diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter +index 365737d89..2ea14db3e 100644 +--- a/installer/resources/i2prouter ++++ b/installer/resources/i2prouter +@@ -49,7 +49,7 @@ APP_LONG_NAME="I2P Service" + + # gettext - we look for it in the path + # fallback to echo is below, we can't set it to echo here. +-GETTEXT=$(which gettext > /dev/null 2>&1) ++GETTEXT=%gettext% + + # Where to install the systemd service + SYSTEMD_SERVICE="/etc/systemd/system/${APP_NAME}.service" +diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh +index eb4995dfe..0186cede3 100644 --- a/installer/resources/runplain.sh +++ b/installer/resources/runplain.sh -@@ -21,7 +21,7 @@ +@@ -25,7 +25,7 @@ CP= # Try using the Java binary that I2P was installed with. # If it's not found, try looking in the system PATH. @@ -9,10 +24,10 @@ if [ -z $JAVA ] || [ ! -x $JAVA ]; then echo "Error: Cannot find java." >&2 -@@ -40,15 +40,4 @@ +@@ -44,15 +44,4 @@ if [ $(uname -s) = "Darwin" ]; then export JAVA_TOOL_OPTIONS="-Djava.awt.headless=true" fi - JAVAOPTS="-Djava.net.preferIPv4Stack=${PREFERv4} -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt" + JAVAOPTS="${MAXMEMOPT} -Djava.net.preferIPv4Stack=${PREFERv4} -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt" -( - nohup ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch > /dev/null 2>&1 -) & @@ -25,15 +40,4 @@ - echo "I2P failed to start." >&2 - exit 1 -fi -+${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch ---- a/installer/resources/i2prouter -+++ b/installer/resources/i2prouter -@@ -49,7 +49,7 @@ - - # gettext - we look for it in the path - # fallback to echo is below, we can't set it to echo here. --GETTEXT=$(which gettext > /dev/null 2>&1) -+GETTEXT=%gettext% - - # Where to install the systemd service - SYSTEMD_SERVICE="/etc/systemd/system/${APP_NAME}.service" ++exec ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch |