diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-01 07:04:39 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-01 07:04:39 +0000 |
commit | 0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc (patch) | |
tree | c1c7f6ea999ae4f455500ba2599c58e41aa581ad /pkgs/tools/networking/network-manager | |
parent | b14a737a4d86608bd61acf08cfc479bf262e9d99 (diff) | |
parent | 57b612cb050778c4ded12fe8e45de26b91eeef70 (diff) | |
download | nixlib-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.tar nixlib-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.tar.gz nixlib-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.tar.bz2 nixlib-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.tar.lz nixlib-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.tar.xz nixlib-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.tar.zst nixlib-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.zip |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
Diffstat (limited to 'pkgs/tools/networking/network-manager')
-rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 8ca0be990397..49aacaa4ef9a 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib +{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz , udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , libgcrypt, dnsmasq, avahi }: stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "0.9.0"; + version = "0.9.2.0"; src = fetchurl { - url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.bz2"; - sha256 = "0kvi767c224zlja65r8gixmhj57292k0gsxa0217lw5i99l2incq"; + url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz"; + sha256 = "1pvd49ji7mh8ww2rfbvq6hmmjms5mb7w10fr7ihgzqbg589zjyj3"; }; # Right now we hardcode quite a few paths at build time. Probably we should @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d" "--with-crypto=gnutls" "--disable-more-warnings" ]; - buildInputs = [ wirelesstools udev libnl1 libuuid polkit ppp ]; + buildInputs = [ wirelesstools udev libnl1 libuuid polkit ppp xz ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; |