diff options
author | Shea Levy <shea@shealevy.com> | 2018-03-20 08:38:28 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2018-03-20 08:38:28 -0400 |
commit | 4250dd5de4a73c8aeca227adb31ca298b851b6fb (patch) | |
tree | 28483308c24cda14731f05312532c01f2d84220d /pkgs/tools/networking | |
parent | 35ebf5bfd963a77c1276658bd7dee3d923039010 (diff) | |
parent | 47bbd819c78b6966165b5a35050191e5700e8460 (diff) | |
download | nixlib-4250dd5de4a73c8aeca227adb31ca298b851b6fb.tar nixlib-4250dd5de4a73c8aeca227adb31ca298b851b6fb.tar.gz nixlib-4250dd5de4a73c8aeca227adb31ca298b851b6fb.tar.bz2 nixlib-4250dd5de4a73c8aeca227adb31ca298b851b6fb.tar.lz nixlib-4250dd5de4a73c8aeca227adb31ca298b851b6fb.tar.xz nixlib-4250dd5de4a73c8aeca227adb31ca298b851b6fb.tar.zst nixlib-4250dd5de4a73c8aeca227adb31ca298b851b6fb.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/altermime/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/openvpn/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/uget/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/xnbd/default.nix | 31 |
4 files changed, 40 insertions, 5 deletions
diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index f05669a4e502..f1e85487d8fc 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -10,7 +10,11 @@ stdenv.mkDerivation rec { sha256 = "15zxg6spcmd35r6xbidq2fgcg2nzyv1sbbqds08lzll70mqx4pj7"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=format"; + NIX_CFLAGS_COMPILE = [ "-Wno-error=format" + "-Wno-error=format-truncation" + "-Wno-error=pointer-compare" + "-Wno-error=memset-elt-size" + ]; postPatch = '' sed -i Makefile -e "s@/usr/local@$out@" diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 272900e0e5b0..31fccbffa790 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "openvpn-${version}"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { url = "http://swupdate.openvpn.net/community/releases/${name}.tar.xz"; - sha256 = "102an395nv8l7qfx3syydzhmd9xfbycd6gvwy0h2kjz8w67ipkcn"; + sha256 = "17njq59hsraqyxrbhkrxr7dvx0p066s3pn8w1mi0yd9jldis7h23"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index 620584ab1df1..6779d864ce24 100644 --- a/pkgs/tools/networking/uget/default.nix +++ b/pkgs/tools/networking/uget/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "uget-${version}"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { url = "mirror://sourceforge/urlget/${name}.tar.gz"; - sha256 = "0rg2mr2cndxvnjib8zm5dp7y2hgbvnqkz2j2jmg0xlzfh9d34b2m"; + sha256 = "0dlrjhnm1pg2vwmp7nl2xv1aia5hyirb3021rl46x859k63zap24"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/tools/networking/xnbd/default.nix new file mode 100644 index 000000000000..e898904c6d4b --- /dev/null +++ b/pkgs/tools/networking/xnbd/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, jansson }: + +stdenv.mkDerivation rec { + name = "xnbd-0.4.0"; + + src = fetchurl { + url = "https://bitbucket.org/hirofuchi/xnbd/downloads/${name}.tgz"; + sha256 = "00wkvsa0yaq4mabczcbfpj6rjvp02yahw8vdrq8hgb3wpm80x913"; + }; + + sourceRoot = "${name}/trunk"; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ glib jansson ]; + + # do not build docs, it is slow and it fails on Hydra + prePatch = '' + rm -rf doc + substituteInPlace configure.ac --replace "doc/Makefile" "" + substituteInPlace Makefile.am --replace "lib doc ." "lib ." + ''; + + meta = { + homepage = https://bitbucket.org/hirofuchi/xnbd; + description = "Yet another NBD (Network Block Device) server program"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.volth ]; + platforms = stdenv.lib.platforms.linux; + }; +} |