William A. Kennington III
6602f49495
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
...
This reverts commit 741bf840da
.
This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
William A. Kennington III
9579c9ec7f
Merge commit 'cb21b77' into master.upstream
...
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Tomasz Kontusz
6681c66db8
networkmanager service: add unmanaged option
2015-11-10 12:20:55 +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
William A. Kennington III
dd2de66d61
Merge branch 'master.upstream' into staging.upstream
2015-10-30 17:16:07 -07:00
Domen Kožar
01b0355140
nm-openvpn: add user/group, closes #10689
...
(cherry picked from commit 551dad3ffd055d5df5de6878a74432d85ecbd114)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-10-29 09:59:08 +01:00
Domen Kožar
6fb7b9b664
networkmanager: don't check if subject is active (false in my X session)
...
(cherry picked from commit 4c2bbb248cf22ad3c3541ba7d38bbc3abb40c706)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-10-23 20:16:49 +02:00
Eelco Dolstra
741bf840da
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
...
This reverts commit f61176c539
, reversing
changes made to a27ca029ee
.
Conflicts:
pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Nikita Mikhailov
89b306a7ff
Enable setting extended NetworkManager hooks
2015-09-26 23:59:31 +06: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
Eelco Dolstra
6e6a96d42c
Some more type cleanup
2015-06-15 18:18:46 +02:00
Luca Bruno
db3b86560f
GNOME 3.16.1, closes #7357
2015-04-25 12:02:33 +02:00
Nikolay Amiantov
16f047a60f
nixos/networkmanager: support l2tp
2015-03-29 13:09:02 +03:00
Nikita Mikhailov
579159c72b
Add dispatcher configuration options to NetworkManager module
2015-03-08 20:24:53 +01:00
Domen Kožar
ec5fcfa82c
network-manager: specify full path to sytemctl binary
...
(cherry picked from commit af8f76c2568ae9d842716d98673b3639292a920e)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-27 11:53:07 +01:00
Sebastián Bernardo Galkin
aba0d8a73d
Fix networkmanager resumeCommands
...
Small typo prevented the post resume script to restart network manager
2014-12-14 03:46:54 -08:00
William A. Kennington III
bcfe7b2200
Merge pull request #5043 from wkennington/master.networkd
...
nixos/networking: Revamp networking configuration and add an experimental networkd option.
2014-11-29 19:59:31 -08:00
Domen Kožar
91bdca38a0
NetworkManager.service -> network-manager.service
2014-11-27 12:10:20 +01:00
William A. Kennington III
2057d9087f
nixos: Support network-online target in addition to ip-up
2014-11-26 11:22:03 -08:00
Shea Levy
b3cfb9084b
Get all lib functions from lib, not pkgs.lib, in modules
2014-07-02 12:28:18 -04:00
Eelco Dolstra
29027fd1e1
Rewrite ‘with pkgs.lib’ -> ‘with lib’
...
Using pkgs.lib on the spine of module evaluation is problematic
because the pkgs argument depends on the result of module
evaluation. To prevent an infinite recursion, pkgs and some of the
modules are evaluated twice, which is inefficient. Using ‘with lib’
prevents this problem.
2014-04-14 16:26:48 +02:00
Rickard Nilsson
fc90a739ba
networkmanager module: No need to start ModemManager explicitly, done by NM
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
b17edbac57
ModemManager: 0.5.4.0 -> 0.7.991
2014-02-08 20:17:00 +01:00
Thomas Tuegel
7b743fcaab
networkmanager: load modules required for PPTP
2014-01-24 09:22:59 -06:00
Thomas Tuegel
6f768bf47c
networkmanager: register PPTP service
2014-01-02 11:02:29 -06:00
Rickard Nilsson
26d7598d46
networkmanager NixOS service: Make it possible to append or insert name servers in /etc/resolv.conf
2013-11-13 01:52:57 +01:00
Vladimír Čunát
8d14c7baa6
polkit: major update 0.105 -> 0.112
...
- It now uses JavaScript for configuration (only),
so I had to "convert" config for NetworkManager.
- I tested suspend/restart/(un)mount on KDE/Xfce,
Phreedom tested NetworkManager config conversion.
2013-11-09 16:29:18 +01:00
Eelco Dolstra
d5047faede
Remove uses of the "merge" option attribute
...
It's redundant because you can (and should) specify an option type, or
an apply function.
2013-10-28 22:45:56 +01:00
Eelco Dolstra
5c1f8cbc70
Move all of NixOS to nixos/ in preparation of the repository merge
2013-10-10 13:28:20 +02:00