diff options
| author | Rickard Nilsson <rickynils@gmail.com> | 2013-01-03 13:44:47 +0100 |
|---|---|---|
| committer | Rickard Nilsson <rickynils@gmail.com> | 2013-01-03 13:44:47 +0100 |
| commit | db292a74c018385e6b7f9d6b4ac31cdc526cbc43 (patch) | |
| tree | 3848a2fad6c66c6c22972ac45ae7b6acd0b58ef8 /pkgs/tools/networking/network-manager | |
| parent | bafdf87367798b481fc19eb9e2397ef78c60c267 (diff) | |
| parent | 869a222062c51fd54f1fc877395103d051dcf91d (diff) | |
| download | nixlib-db292a74c018385e6b7f9d6b4ac31cdc526cbc43.tar nixlib-db292a74c018385e6b7f9d6b4ac31cdc526cbc43.tar.gz nixlib-db292a74c018385e6b7f9d6b4ac31cdc526cbc43.tar.bz2 nixlib-db292a74c018385e6b7f9d6b4ac31cdc526cbc43.tar.lz nixlib-db292a74c018385e6b7f9d6b4ac31cdc526cbc43.tar.xz nixlib-db292a74c018385e6b7f9d6b4ac31cdc526cbc43.tar.zst nixlib-db292a74c018385e6b7f9d6b4ac31cdc526cbc43.zip | |
Merge remote-tracking branch 'upstream/master' into systemd
Conflicts: pkgs/tools/networking/network-manager/default.nix
Diffstat (limited to 'pkgs/tools/networking/network-manager')
| -rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index ea0095c66848..316598809f1c 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "0.9.4.0"; + version = "0.9.6.4"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz"; - sha256 = "eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f"; + sha256 = "1sx7h29j9h13qszcppja1p27zq2m7vdrylbcyb47n62x0lg426si"; }; preConfigure = '' @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d" "--with-crypto=gnutls" "--disable-more-warnings" - "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" ]; + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-kernel-firmware-dir=/run/current-system/firmware" ]; buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz ]; |