diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-07 03:00:45 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-07 03:00:45 +0300 |
| commit | 1f79dc2d6a066ee02324a4e901b3ddf9ed1623fa (patch) | |
| tree | d2a8f45200d067d345e934a4d4ed0dd476d18c92 | |
| parent | 53302449580256ea0dc3373cb258eb9792c8b309 (diff) | |
| parent | 64a9bd37e65cc7856a5ef4d74be395682699e1e8 (diff) | |
| download | nixlib-1f79dc2d6a066ee02324a4e901b3ddf9ed1623fa.tar nixlib-1f79dc2d6a066ee02324a4e901b3ddf9ed1623fa.tar.gz nixlib-1f79dc2d6a066ee02324a4e901b3ddf9ed1623fa.tar.bz2 nixlib-1f79dc2d6a066ee02324a4e901b3ddf9ed1623fa.tar.lz nixlib-1f79dc2d6a066ee02324a4e901b3ddf9ed1623fa.tar.xz nixlib-1f79dc2d6a066ee02324a4e901b3ddf9ed1623fa.tar.zst nixlib-1f79dc2d6a066ee02324a4e901b3ddf9ed1623fa.zip | |
Merge commit 'refs/pull/14421/head' of git://github.com/NixOS/nixpkgs
| -rw-r--r-- | pkgs/tools/networking/network-manager-applet/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 6 |
2 files changed, 8 insertions, 4 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 6c5a91fd4ded..7403490e58f8 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -6,11 +6,11 @@ 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 = '' @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { 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 \ |