diff options
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/network-manager-applet/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/networking/snabb/default.nix (renamed from pkgs/tools/networking/snabbswitch/default.nix) | 18 |
3 files changed, 23 insertions, 13 deletions
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 93ab1266c6ba..d2e2215831b7 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -6,7 +6,9 @@ let pn = "network-manager-applet"; major = "1.0"; - version = networkmanager.version; + # With version 1.0.12 of NM, we are no longer in sync + # version = "${networkmanager.version}.10"; + version = "${major}.10"; in stdenv.mkDerivation rec { @@ -14,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "1yj0m6fb9v12d0di0rfmk3hx1vmygjkiff2c476rf792sbh56kax"; + sha256 = "1szh5jyijxm6z55irkp5s44pwah0nikss40mx7pvpk38m8zaqidh"; }; configureFlags = [ "--sysconfdir=/etc" ]; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index c23b818e048f..7403490e58f8 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -2,20 +2,24 @@ , udev, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup -, ethtool, gnused }: +, ethtool, gnused, coreutils, file, inetutils }: stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "1.0.6"; + version = "1.0.12"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/1.0/NetworkManager-${version}.tar.xz"; - sha256 = "38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd"; + sha256 = "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs"; }; preConfigure = '' - substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl + substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname + substituteInPlace configure --replace /usr/bin/file ${file}/bin/file + substituteInPlace src/devices/nm-device.c --replace /usr/bin/ping ${inetutils}/bin/ping substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe + substituteInPlace data/84-nm-drivers.rules \ + --replace /bin/sh ${stdenv.shell} substituteInPlace data/85-nm-unmanaged.rules \ --replace /bin/sh ${stdenv.shell} \ --replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \ diff --git a/pkgs/tools/networking/snabbswitch/default.nix b/pkgs/tools/networking/snabb/default.nix index f7cd1a4300ac..8ba9cfa6dad8 100644 --- a/pkgs/tools/networking/snabbswitch/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -1,12 +1,14 @@ -{ stdenv, lib, fetchurl, bash, makeWrapper, git, mariadb, diffutils }: +{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mariadb, diffutils, which, coreutils, procps, nettools }: stdenv.mkDerivation rec { name = "snabb-${version}"; - version = "2015.12"; + version = "2016.04"; - src = fetchurl { - url = "https://github.com/SnabbCo/snabbswitch/archive/v${version}.tar.gz"; - sha256 = "1949a6d3hqdr2hdfmrr1na9gvjdwdahadbhmvz2pg7azmpq6ssmr"; + src = fetchFromGitHub { + owner = "snabbco"; + repo = "snabb"; + rev = "v${version}"; + sha256 = "1b5g477zy6cr5d9171xf8zrhhq6wxshg4cn78i5bki572q86kwlx"; }; buildInputs = [ makeWrapper ]; @@ -18,13 +20,15 @@ stdenv.mkDerivation rec { for f in $(find src/program/snabbnfv/ -type f); do substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash" done + + # We need a way to pass $PATH to the scripts + sed -i '2iexport PATH=${git}/bin:${mariadb}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc + sed -i '2iexport PATH=${git}/bin:${coreutils}/bin:${diffutils}/bin:${nettools}/bin' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc ''; installPhase = '' mkdir -p $out/bin cp src/snabb $out/bin - - wrapProgram $out/bin/snabb --prefix PATH : "${ lib.makeBinPath [ git mariadb diffutils ]}" ''; meta = with stdenv.lib; { |