diff options
author | Shea Levy <shea@shealevy.com> | 2018-03-24 01:34:53 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2018-03-24 01:34:53 -0400 |
commit | 0f854cd2d1125456ca638c0145be946bbeb9e6a9 (patch) | |
tree | d3720644a906e575b353a6ce713551c4ad288b6b /pkgs/tools/networking | |
parent | 5d116251dbb8d15d13a0e09a56968036f49bf21f (diff) | |
parent | 34087d0dec1d9d4bda83af10d165fbbd30d177f7 (diff) | |
download | nixlib-0f854cd2d1125456ca638c0145be946bbeb9e6a9.tar nixlib-0f854cd2d1125456ca638c0145be946bbeb9e6a9.tar.gz nixlib-0f854cd2d1125456ca638c0145be946bbeb9e6a9.tar.bz2 nixlib-0f854cd2d1125456ca638c0145be946bbeb9e6a9.tar.lz nixlib-0f854cd2d1125456ca638c0145be946bbeb9e6a9.tar.xz nixlib-0f854cd2d1125456ca638c0145be946bbeb9e6a9.tar.zst nixlib-0f854cd2d1125456ca638c0145be946bbeb9e6a9.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/gupnp-tools/default.nix | 38 | ||||
-rw-r--r-- | pkgs/tools/networking/minissdpd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/miniupnpd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/modem-manager/default.nix (renamed from pkgs/tools/networking/modemmanager/default.nix) | 20 | ||||
-rw-r--r-- | pkgs/tools/networking/network-manager/pptp.nix | 43 | ||||
-rw-r--r-- | pkgs/tools/networking/wrk2/default.nix | 42 |
6 files changed, 82 insertions, 69 deletions
diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index e008c9183c98..1b306bc5e363 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -1,26 +1,30 @@ -{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp-av, gnome3, gnome2, makeWrapper}: +{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp-av, gnome3, wrapGAppsHook}: + +let + pname = "gupnp-tools"; + version = "0.8.13"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; -stdenv.mkDerivation rec { - name = "gupnp-tools-${version}"; - majorVersion = "0.8"; - version = "${majorVersion}.13"; src = fetchurl { - url = "mirror://gnome/sources/gupnp-tools/${majorVersion}/gupnp-tools-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1vbr4iqi7nl7kq982agd3liw10gx67s95idd0pjy5h1jsnwyqgda"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [gupnp libuuid gssdp gtk3 intltool gupnp-av - gnome2.gnome_icon_theme makeWrapper]; + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gnome3.defaultIconTheme ]; - postInstall = '' - for program in gupnp-av-cp gupnp-universal-cp; do - wrapProgram "$out/bin/$program" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share:${gnome2.gnome_icon_theme}/share:$out/share" - done - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Set of utilities and demos to work with UPnP"; + homepage = https://wiki.gnome.org/Projects/GUPnP; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix index a451750503ab..9809b330faba 100644 --- a/pkgs/tools/networking/minissdpd/default.nix +++ b/pkgs/tools/networking/minissdpd/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "minissdpd-${version}"; - version = "1.5.20180203"; + version = "1.5.20180223"; src = fetchurl { - sha256 = "1yiri887s8wxh4zrjc5dw19gyypqg63962aimcgd19blvpbwnfcv"; + sha256 = "1c47h1zil04jnbxiaaci2rm8jij47zp5156v48hb6m87nh4l5adv"; url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; name = "${name}.tar.gz"; }; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 1e0200794305..a9e67701eb03 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-2.0.20180203"; + name = "miniupnpd-2.0.20180222"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1djb0w76yd5jyqm5mzmxlxikxzzwqzjgy75h8saxc3rlz3r1a346"; + sha256 = "1hdpyvz1z6crpa7as3srmbl64fx0k4wjra57jw7qaysdsb1b2kqr"; name = "${name}.tar.gz"; }; diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index 064364e37ac3..e9af9dc980e7 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, udev, libgudev, polkit, dbus-glib, ppp, gettext, pkgconfig -, libmbim, libqmi, systemd }: +, libmbim, libqmi, systemd, fetchpatch }: stdenv.mkDerivation rec { - name = "ModemManager-${version}"; + name = "modem-manager-${version}"; + pname = "ModemManager"; version = "1.7.990"; src = fetchurl { - url = "http://www.freedesktop.org/software/ModemManager/${name}.tar.xz"; + url = "http://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; sha256 = "1v4hixmghlrw7w4ajq2x4k62js0594h223d0yma365zwqr7hjrfl"; }; @@ -14,6 +15,14 @@ stdenv.mkDerivation rec { buildInputs = [ udev libgudev polkit dbus-glib ppp libmbim libqmi systemd ]; + patches = [ + # Patch dependency on glib headers, this breaks packages using core headers (networkmanager-qt) + (fetchpatch { + url = "https://cgit.freedesktop.org/ModemManager/ModemManager/patch/?id=0f377f943eeb81472fd73189f2c3d8fc65b8c609"; + sha256 = "0av0sqdvbhwjnhqqylkc7rmqcj6awqmz5693l9x93nlwp7zya95j"; + }) + ]; + configureFlags = [ "--with-polkit" "--with-udev-base-dir=$(out)/lib/udev" @@ -30,7 +39,8 @@ stdenv.mkDerivation rec { ''; postInstall = '' - mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system + # rename to modem-manager to be in style + mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system/modem-manager.service rm -rf $out/$out/etc mv $out/$out/* $out DIR=$out/$out @@ -40,7 +50,7 @@ stdenv.mkDerivation rec { # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. - ln -s $out/etc/systemd/system/ModemManager.service \ + ln -s $out/etc/systemd/system/modem-manager.service \ $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service ''; diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix deleted file mode 100644 index 6844ca53456f..000000000000 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig -, libsecret, withGnome ? true, gnome3 }: - -let - pname = "NetworkManager-pptp"; - version = "1.2.4"; -in stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "bd97ce768c34cce6d5b5d43681149a8300bec754397a3f46a0d8d0aea7030c5e"; - }; - - buildInputs = [ networkmanager pptp ppp libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring - gnome3.networkmanagerapplet ]; - - nativeBuildInputs = [ intltool pkgconfig ]; - - postPatch = '' - sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-pptp-service.c - - substituteInPlace ./src/nm-pptp-service.c \ - --replace /sbin/pptp ${pptp}/bin/pptp \ - --replace /sbin/pppd ${ppp}/bin/pppd - ''; - - configureFlags = - if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "networkmanager-pptp"; - }; - }; - - meta = { - description = "PPtP plugin for NetworkManager"; - inherit (networkmanager.meta) maintainers platforms; - }; -} diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/tools/networking/wrk2/default.nix new file mode 100644 index 000000000000..5caad0874f7c --- /dev/null +++ b/pkgs/tools/networking/wrk2/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, luajit, openssl, zlib }: + +stdenv.mkDerivation rec { + name = "wrk2-${version}"; + version = "4.0.0-${builtins.substring 0 7 src.rev}"; + + src = fetchFromGitHub { + owner = "giltene"; + repo = "wrk2"; + rev = "e0109df5b9de09251adb5f5848f223fbee2aa9f5"; + sha256 = "1aqdwmgdd74wq73f1zp28yqj91gd6p6nf9nbdfibl7mlklbzvak8"; + }; + + buildInputs = [ luajit openssl zlib ]; + + patchPhase = '' + rm -rf deps/luajit && mkdir deps/luajit + + substituteInPlace ./Makefile \ + --replace '-lluajit' '-lluajit-5.1' \ + --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' \ + --replace 'cd $(LDIR) && ./luajit' '${luajit}/bin/luajit' \ + --replace 'config.h Makefile $(LDIR)/libluajit.a' 'config.h Makefile' + + substituteInPlace ./src/script.c \ + --replace 'struct luaL_reg ' 'struct luaL_Reg ' + ''; + + configurePhase = ":"; + installPhase = '' + mkdir -p $out/bin + mv ./wrk $out/bin/wrk2 + ''; + + meta = { + description = "Constant throughput, correct latency recording variant of wrk"; + homepage = https://github.com/giltene/wrk2; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + }; +} |