Commit Graph

58 Commits

Author SHA1 Message Date
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Nikolay Amiantov
1f79dc2d6a Merge commit 'refs/pull/14421/head' of git://github.com/NixOS/nixpkgs 2016-04-07 03:00:45 +03:00
Peter Hoeg
64a9bd37e6 networkmanager: 1.0.6 -> 1.0.12
Also pulls in networkmanager-applet at 1.0.10 as it is no longer in sync with the NM version.
2016-04-03 18:40:51 +08:00
Peter Hoeg
8857774f91 network-manager: use ping/ping6 from the nix store
NM upstream has a hardcoded path to /usr/bin/ping.

This patch changes:

 - ping/ping6 are now from the nix store
 - we no longer try to make substitutions on a missing file
 - we use file from the nix store
2016-03-27 15:15:16 +08:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Profpatsch
70c02402c8 networkmanager: fix link-local ip addresses
NetworkManager needs an additional avahi-user to use link-local
IPv4 (and probably IPv6) addresses. avahi-autoipd also needs to be
patched to the right path.
2016-02-26 03:28:56 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Fabian Schmitthenner
28b3ecac07 networkmanager: fix path /sbin/modprobe 2016-01-02 18:23:59 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Nikolay Amiantov
13548530a6 networkmanager: fix udev rules file, fixes #11744 2015-12-16 22:55:03 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
William A. Kennington III
a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
Domen Kožar
07405ee187 Merge pull request #9463 from khumba/nm-connection-sharing
Fix NetworkManager connection sharing
2015-11-06 11:16:50 +01:00
Eelco Dolstra
81f6c62004 Merge remote-tracking branch 'origin/master' into systemd-219 2015-10-30 15:47:37 +01:00
Vladimír Čunát
551cce01ff network-manager: fix build after udev changes
It's missing libsystemd-login but only `udev` was in inputs...
2015-10-04 13:13:46 +02:00
Lengyel Balázs
ee70a5654d network-manager 1.0.2 -> 1.0.6
Updated everything except network-manager-openconnect, as there is no newer version
2015-09-28 14:04:42 +02:00
Eelco Dolstra
4b422b9dea More libgudev dependencies 2015-09-11 12:22:27 +02:00
Bryan Gardiner
f4de446573
NetworkManager: fix dnsmasq interaction for ad-hoc networks
Fixes #7593 (NM can't find the dnsmasq binary); the NM expression is missing
dnsmasq in its buildInputs, so configure can't find it.

Also creates /var/lib/misc which dnsmasq expects to exist, because it puts
dnsmasq.leases there.
2015-09-07 14:04:32 -07:00
Carter Charbonneau
ffc679460f networkmanager: build with dnsmasq
Networkmanager requires dnsmasq for network sharing
2015-08-30 02:55:56 +02:00
Damien Cassou
3a50708958 network-manager 1.0.0 -> 1.0.2 2015-05-22 10:17:01 +02:00
Charles Strahan
1677b33162 networkmanager: enable nmtui, the curses interface 2015-05-11 20:54:17 -04:00
Luca Bruno
38d6aec3f6 network-manager: update to 1.0 2015-04-25 11:51:57 +02:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Domen Kožar
34ca304f58 network-manager: 0.9.8.8 -> 0.9.8.10 2014-11-27 12:10:20 +01:00
Domen Kožar
91bdca38a0 NetworkManager.service -> network-manager.service 2014-11-27 12:10:20 +01:00
Thomas Tuegel
c2740b5017 network-manager: patch for libnl-3.2.25 2014-11-21 21:15:18 -06:00
Thomas Tuegel
f3e23d60ef NetworkManager: correct resolvconf executable name 2014-02-28 23:30:19 +01:00
Domen Kožar
7f01311f53 networkmanager: add opensresolv 2014-02-28 23:30:19 +01:00
Rickard Nilsson
0d506296f0 networkmanager: Build with ModemManager support 2014-02-13 18:05:04 +01:00
Oliver Charles
625b42838a NetworkManager: Fix aliases and dependencies
There are two fixes in this commit.

Firstly, I am creating proper symlinks for the Alias= definitions in the
.service files. This achieves the same result as `systemctl enable`, and
I think is preferred over `mv`.

Secondly, `networkmanager-init` now wants `NetworkManager.service`,
along with `ModemManager.service`. ModemManager does not depend on
NetworkManager (according to `systemctl list-dependencies ModemManager`),
thus NetworkManager never got started on boot.
2014-02-12 11:32:49 +00:00
Domen Kožar
b4d1d88e42 enable gobjectintrospection for some libs 2014-01-21 14:11:20 +01:00
Domen Kožar
986db66d12 NetworkManager(applet): 0.9.8.4 -> 0.9.8.8 (bluez5 support) 2014-01-03 13:39:40 +01:00
Rickard Nilsson
6d247f81b4 network-manager: Rename dispatcher service
Rename NetworkManager-dispatcher.service to
dbus-org.freedesktop.nm-dispatcher.service so it is found by systemd (NixOS
doesn't handle the Alias directive in the unit file)
2013-10-03 14:46:49 +02:00
Domen Kožar
a68128ab8c NetworkManager: 0.9.8.0 -> 0.9.8.4 2013-09-29 17:00:41 +02:00
Domen Kozar
0f98ddf8fd Revert "networkmanager: we dont need networkmanager group anymore, just use at_console policy"
This reverts commit 52fe694360.
2013-07-26 23:09:50 +02:00
Domen Kozar
52fe694360 networkmanager: we dont need networkmanager group anymore, just use at_console policy 2013-07-23 18:51:20 +02:00
Vladimír Čunát
22967c71f8 network-manager: update all to 0.9.8.0
This should fix compilation with newer glib versions.
2013-06-04 16:36:21 +02:00
Eelco Dolstra
0a47a28f1d Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-22 23:23:53 +01:00
Peter Simons
9e9cd7b529 Merge branch 'master' into stdenv-updates. 2013-01-04 21:00:53 +01:00
Rickard Nilsson
38a14fac65 NetworkManager: cooperate better with systemd 2013-01-03 18:14:38 +01:00
Rickard Nilsson
db292a74c0 Merge remote-tracking branch 'upstream/master' into systemd
Conflicts:
	pkgs/tools/networking/network-manager/default.nix
2013-01-03 13:44:47 +01:00
Rickard Nilsson
ed226c9496 NetworkManager: Update to 0.9.6.4 2013-01-03 13:06:59 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
6a0288d14b network-manager: Fix building against systemd
http://hydra.nixos.org/build/3473319
2012-12-12 16:26:03 +01:00
Mathijs Kwik
c1c9c9d2a1 network-manager: use libnl3, as libnl1 is no longer maintained 2012-09-09 13:04:13 +02:00
Rickard Nilsson
b530c8c22f networkmanager: Add me as maintainer 2012-08-01 11:49:56 +02:00
Rickard Nilsson
a126bf9ae4 networkmanager: Update to 0.9.4.0 2012-07-13 01:53:07 +02:00
Yury G. Kudryashov
d7e089e820 Add myself to etworkmanager.meta.maintainers
svn path=/nixpkgs/trunk/; revision=32985
2012-03-11 14:07:34 +00:00
Yury G. Kudryashov
1fef26d8f7 NM purity patch: substitute before build, fix typos
svn path=/nixpkgs/trunk/; revision=32978
2012-03-10 23:13:32 +00:00
Evgeny Egorochkin
cff68ececb network-manager: version bump
svn path=/nixpkgs/trunk/; revision=32691
2012-02-29 13:29:59 +00:00