diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-24 14:17:49 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-24 14:17:49 +0100 |
| commit | 769342b37b6aef3b4d947fd1ebc7cf6c856bf948 (patch) | |
| tree | bd7713697b9d39e969409911adaf24d72641a6f5 /pkgs/tools/networking | |
| parent | 9f22de722766c5e164936c1ecfbb602214c9c302 (diff) | |
| parent | 9ffaa69da4673c12d730a6a9c2ab0eb1b0dab559 (diff) | |
| download | nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.tar nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.tar.gz nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.tar.bz2 nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.tar.lz nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.tar.xz nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.tar.zst nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/i2pd/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/tools/networking/siege/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/wget/default.nix | 4 |
3 files changed, 20 insertions, 7 deletions
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 251268b6f304..bd98eca53543 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -1,4 +1,11 @@ -{ stdenv, fetchFromGitHub, fetchpatch, boost, zlib, openssl }: +{ stdenv, fetchFromGitHub, fetchpatch +, boost, zlib, openssl +, upnpSupport ? true, miniupnpc ? null +, aesniSupport ? false +, avxSupport ? false +}: + +assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { @@ -13,8 +20,14 @@ stdenv.mkDerivation rec { sha256 = "1yl5h7mls50vkg7x5510mljmgsm02arqhcanwkrqw4ilwvcp1mgz"; }; - buildInputs = [ boost zlib openssl ]; - makeFlags = [ "USE_AESNI=no" "USE_AVX=no" ]; + buildInputs = with stdenv.lib; [ boost zlib openssl ] + ++ optional upnpSupport miniupnpc; + makeFlags = + let ynf = a: b: a + "=" + (if b then "yes" else "no"); in + [ (ynf "USE_AESNI" aesniSupport) + (ynf "USE_AVX" avxSupport) + (ynf "USE_UPNP" upnpSupport) + ]; installPhase = '' install -D i2pd $out/bin/i2pd diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index c188dd477fe1..93fc28b48bf2 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { - name = "siege-4.0.2"; + name = "siege-4.0.4"; src = fetchurl { url = "http://download.joedog.org/siege/${name}.tar.gz"; - sha256 = "0ivc6ah9n2888qgh8dicszhr3mjs42538lfx7dlhxvvvakwq3yvy"; + sha256 = "0vzaj5nzb0fir2a4l7ghv3wa5d1nk2ss8gmwjb6bjavjplccyzcg"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index b6bbae65e695..b31ae93066ef 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -5,11 +5,11 @@ , openssl ? null }: stdenv.mkDerivation rec { - name = "wget-1.19.2"; + name = "wget-1.19.4"; src = fetchurl { url = "mirror://gnu/wget/${name}.tar.lz"; - sha256 = "01yzal7xm85543x02bij3capnigr063d6c5vc039f8n5s9d796nm"; + sha256 = "16jmcqcasx3q9k4azssryli9qyxfq0sfijw998g8zp58cnwzzh1g"; }; patches = [ |