diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2019-11-27 22:57:50 -0800 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2019-11-27 22:57:50 -0800 |
commit | 0c1c18ca4416baa46c940960aa5e619873a2318e (patch) | |
tree | 78d7fd3eb63e91fa99267e2d91a2a891ee29f567 /pkgs/tools/networking | |
parent | 4cc592761db580855b47fb84776e68b1d936521c (diff) | |
parent | f4f816902112778172565baf91c2483186027c3b (diff) | |
download | nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.tar nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.tar.gz nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.tar.bz2 nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.tar.lz nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.tar.xz nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.tar.zst nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/dhcpcd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/mmsd/default.nix | 38 | ||||
-rw-r--r-- | pkgs/tools/networking/ofono/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/tridactyl-native/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/wireguard-tools/default.nix | 4 |
5 files changed, 46 insertions, 8 deletions
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 0827f2eac7ba..d63c63ab1d27 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { # when updating this to >=7, check, see previous reverts: # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix pname = "dhcpcd"; - version = "8.0.6"; + version = "8.1.2"; src = fetchurl { url = "mirror://roy/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0kxxpb79j564m6bjvjb9gsn0yzs13c0arfgsycm51gw3xnch3db6"; + sha256 = "1b9mihp1mf2vng92fgks764a6pwf2gx7ccw6knja79c42nmyglyb"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/mmsd/default.nix b/pkgs/tools/networking/mmsd/default.nix new file mode 100644 index 000000000000..fee347dd2015 --- /dev/null +++ b/pkgs/tools/networking/mmsd/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchgit +, autoreconfHook +, pkgconfig +, glib +, dbus +}: + +stdenv.mkDerivation rec { + pname = "mmsd"; + version = "unstable-2019-07-15"; + + src = fetchgit { + url = "git://git.kernel.org/pub/scm/network/ofono/mmsd.git"; + rev = "f4b8b32477a411180be1823fdc460b4f7e1e3c9c"; + sha256 = "0hcnpyhsi7b5m825dhnwbp65yi0961wi8mipzdvaw5nc693xv15b"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + buildInputs = [ + glib + dbus + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Multimedia Messaging Service Daemon"; + homepage = "https://01.org/ofono"; + license = licenses.gpl2; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index 27f4b9562b38..5cae8a612033 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "ofono"; - version = "1.30"; + version = "1.31"; outputs = [ "out" "dev" ]; src = fetchgit { url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git"; rev = version; - sha256 = "1qzysmzpgbh6zc3x9xh931wxcazka9wwx727c2k66z9gal2n6n66"; + sha256 = "033y3vggjxn1c7mw75j452idp7arrdv51axs727f7l3c5lnxqdjy"; }; patches = [ diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index 665d988f48e4..44daa23cd92d 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "0dpd4jdym644rqm9h83lb8cwfccnwrnqm1g91nl913pj4k5x4hqr"; + sha256 = "197vh3k9nh58djl6ph0lznkdb2schqlksxxr93xjkk4xsc7k6j1g"; }; sourceRoot = "source/native"; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index ad449429f998..e25a2d2cd5d3 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "0.0.20191012"; + version = "0.0.20191127"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0nwcx7m5cpp4h1bclswiqq1jzj08xzpxmq5s4rcfqmrp59cmwgrs"; + sha256 = "1n1x5858c32p0a13rrhn9a491174k5z4wd0gsy8qn546k1a8qj99"; }; sourceRoot = "source/src/tools"; |