public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'refs/pull/14421/head' of git://github.com/NixOS/nixpkgs

This commit is contained in:
Nikolay Amiantov 2016-04-07 03:00:45 +03:00
parent 5330244958 64a9bd37e6
commit 1f79dc2d6a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/networking/network-manager-applet/default.nix
View File

@ -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" ];

6
pkgs/tools/networking/network-manager/default.nix
View File

@ -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 \