cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
55873 commits 1 branch 0 tags 3.7 GiB
Commit graph

1337 commits

Author SHA1 Message Date
ambrop7@gmail.com
4664321cd3 badvpn: Add debug flag to enable assertions. 2014-11-01 15:16:28 +01:00
Franz Pletz
e630ee2fdd wget: Update to 1.16 (fix CVE-2014-4877) 
This patch updates wget to the current version, 1.16. This release fixes a
remotely exploitable security issue: CVE-2014-4877.

A dependency on libidn was added and the testsuite now depends on
python3. A patch that disables a test was removed because it is not needed
anymore.

As I intend to take care of wget in the future, I added myself to the
maintainers.
 2014-10-30 10:30:08 +01:00
Eelco Dolstra
dc0d68ffc3 curl: Remove static link support 
We only needed this for the stdenv bootstrap, but not anymore.
 2014-10-29 13:43:00 +01:00
Eelco Dolstra
5cc92eb0d8 Remove obsolete useDietLibC stdenv adapter 2014-10-29 13:43:00 +01:00
Nikolay Amiantov
1f101efa88 update-resolv-conf: add package 2014-10-28 03:04:14 -07:00
Bjørn Forsman
d12da7007c fping: set meta.platforms 2014-10-27 18:20:46 +01:00
Lluís Batlle i Rossell
f3d978be65 cjdns: installing contrib scripts 
I made the nodejs and python scripts have the proper shebang. A lot more
of them could be updated to reference store paths (calls to "python",
etc.)

(cherry picked from commit 2fb382afb6319065f20af22d86774df190beb0d5)
 2014-10-25 15:52:54 +02:00
viric
f75e5330f3 Merge pull request #4658 from ehmry/cjdns 
cjdns: update 20140928 to 20141023
 2014-10-24 23:20:52 +02:00
Emery Hemingway
957602c40c cjdns: update 20140928 to 20141023 2014-10-24 17:15:13 -04:00
Lluís Batlle i Rossell
7da0fecf32 Adding an extra url for nc6. The previous was failing. 2014-10-24 23:14:35 +02:00
Edward Tjörnhammar
a5af1c228e Adding fetchurl mirrors for roy marples projects(dhcpcd, openresolv) 2014-10-23 19:45:33 +02:00
Domen Kožar
efea92de19 fixes #1933 2014-10-23 00:14:09 +02:00
Emery Hemingway
70e0577886 update cjdns from 20140922 to 20140928 2014-10-21 13:08:54 -04:00
Eelco Dolstra
d316346d42 Merge pull request #4588 from edwtjo/dhcpcd-update 
dhcpcd: 6.4.7 -> 6.5.1
 2014-10-20 10:52:17 +02:00
Edward Tjörnhammar
3b08861278 dhcpcd: 6.4.7 -> 6.5.1 2014-10-19 08:22:17 +02:00
Michael Raskin
a32e534262 SSL support for cadaver DAV client 2014-10-18 21:47:49 +04:00
William A. Kennington III
061cbc40f6 radvd: 2.7 -> 2.8 2014-10-17 16:56:35 -07:00
Shea Levy
b5fe0d32b6 Merge branch 'strongswan-charon-cmd' of github.com:ftrvxmtrx/nixpkgs 
strongswan: enable charon-cmd
 2014-10-14 09:54:28 -04:00
Jascha Geerds
e6ec404b0b Update plasma-nm 2014-10-14 13:17:55 +02:00
Siarhei Zirukin
8799219f1e strongswan: enable charon-cmd 2014-10-14 10:02:02 +02:00
Mateusz Kowalczyk
b9c2fe5fd8 Merge pull request #4400 from matejc/seeksservice 
seeks: update and write nixos module
 2014-10-13 21:37:11 +01:00
Michael Raskin
53a5b67d5e Adding mailsend tool 2014-10-13 18:18:34 +04:00
Matej Cotman
76a7b0ba68 seeks: upgrade and add optional seeks_confDir 2014-10-13 13:10:49 +02:00
Longrin Wischnewski
6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Eelco Dolstra
79d0d7b437 Unify gcc-wrapper and clang-wrapper 2014-10-11 22:26:39 +02:00
Aristid Breitkreuz
4d1fdb9380 stunnel 5.05 2014-10-11 14:16:37 +02:00
Lluís Batlle i Rossell
82b6d7ff9a Updating inadyn to 1.99.10. 
(I wnated the cache-dir option)
 2014-10-10 17:07:17 +02:00
Austin Seipp
2241ce448e stunnel: 5.03 -> 5.04 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-10-09 17:09:31 -05:00
codyopel
2986ca34d6 rtorrent-git: new package 2014-10-09 20:47:27 +02:00
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 
Conflicts:
	pkgs/tools/security/gnupg/default.nix
 2014-10-09 10:57:57 +02:00
Aristid Breitkreuz
5bde8818bd tcpdump: update from 4.5.1 to 4.6.2 2014-10-08 20:23:25 +02:00
Aristid Breitkreuz
3ddb27d607 autossh: update from 1.4c to 1.4d 2014-10-08 19:02:38 +02:00
Aristid Breitkreuz
1a3b7a58db lftp: update from 4.5.2 to 4.5.5 2014-10-07 21:50:40 +02:00
Domen Kožar
efe71df2dc Merge pull request #4405 from k0ral/traceroute 
traceroute: depends on linux headers.
 2014-10-07 14:44:39 +02:00
Michael Raskin
5d584c5109 Update gvpe 2014-10-07 16:23:28 +04:00
koral
d19a244182 traceroute: depends on linux headers. 2014-10-07 00:04:51 +02:00
Aristid Breitkreuz
68c15230c6 dnsmasq: update from 2.71 to 2.72 2014-10-06 22:31:43 +02:00
William A. Kennington III
9e5825ba8e iperf: Add major version 3 2014-10-04 17:23:06 -07:00
Michael Raskin
6bbeeb46a3 One more mirror 2014-10-04 16:37:17 +04:00
Eelco Dolstra
74f7f56439 Merge pull request #4331 from Fuuzetsu/dhcpcd 
dhcpcd: update from 6.4.3 to 6.4.7
 2014-10-03 20:05:56 +02:00
Michael Raskin
561e4211b7 Merge pull request #4110 from cstrahan/update-bud 
update bud to 0.32.0 (WIP)
 2014-10-02 23:32:34 +04:00
Shea Levy
961d444762 Remove hard-coded /etc from strongswan 2014-09-30 21:28:04 -04:00
Mateusz Kowalczyk
e177da1cb6 dhcpcd: update from 6.4.3 to 6.4.7 2014-09-30 11:22:02 +01:00
Mateusz Kowalczyk
74ec0b53e1 babeld: update from 1.5.0 to 1.5.1 2014-09-30 10:28:31 +01:00
koral
7fca2693f5 New package: traceroute-2.0.20 
Closes #4322
 2014-09-30 07:53:08 +01:00
Bjørn Forsman
a6c7c1db7f ntopng: update from 1.2.0 to 1.2.1 
Successfully tested with the NixOS ntopng service.
 2014-09-27 15:42:18 +02:00
Bjørn Forsman
273aa589d2 ntopng: update hashes and url 
All geoip data files have changed, update hashes. The ntopng source url
itself has changed, the source is now located in an "old/" directory
(hash unchanged).

Build tested.
 2014-09-27 13:52:19 +02:00
Moritz Ulrich
1c20eba035 Mu: Update to 0.9.10. 2014-09-25 13:54:01 +02:00
Emery Hemingway
61f0d9b251 cjdns: update from 20140919 20140922 
package installs to .../bin
fix service module to look in .../bin

Closes #4240
 2014-09-23 22:30:53 +01:00
Eelco Dolstra
91fa55e702 Remove references to <nixpkgs> 
Nixpkgs should not use <nixpkgs> to refer to itself, because $NIX_PATH
might not be set or not point to the same Nixpkgs. It's also
unnecessary.
 2014-09-23 15:48:15 +02:00
Eelco Dolstra
cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging 
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
 2014-09-23 11:27:53 +02:00
Nathaniel Baxter
3cbe41cbae aria2: Bump version to 1.18.8 2014-09-22 19:41:41 +10:00
Jaka Hudoklin
be42f49499 add airfield, a web-interface for hipache-proxy 2014-09-21 01:42:15 +02:00
Emery Hemingway
95c72a5f60 cjdns: update 20140829 to 20140919 
Closes #4186
 2014-09-20 23:27:24 +01:00
Austin Seipp
49a5832805 spiped: 1.3.0 -> 1.4.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-09-20 07:39:44 -05:00
Shea Levy
e4cf05a3a0 strongswan: Properly handle sysconfdir, build swanctl 2014-09-19 15:12:20 -04:00
James Cook
4d8d902e0c curl: update to 7.38.0, including security (#4161) 
Fixes CVE-2014-3620 and CVE-2014-3613.
 2014-09-19 11:53:08 +02:00
Shea Levy
e0cd3ac03c strongswan: Fix some hard-coding 2014-09-19 01:09:00 -04:00
William A. Kennington III
194419244d radvd: 2.6 -> 2.7 2014-09-18 11:26:01 -07:00
Luca Bruno
d9bd04b90c Revert "spiped: 1.3.1 -> 1.4.0" 
This reverts commit 792afca113.

Version 1.4.0 failed to build.
 2014-09-18 17:07:15 +02:00
Pascal Wittmann
180b9939d7 Merge pull request #4130 from k0ral/httptunnel 
Added httptunnel package.
 2014-09-18 10:13:46 +02:00
Shea Levy
a70ecf4797 strongswan: build with clang 
Fixes https://lists.strongswan.org/pipermail/users/2014-September/006597.html
 2014-09-17 22:08:18 -04:00
Aristid Breitkreuz
d7124e8c34 wicd: add urwid and curses to PYTHONPATH of wicd-curses 2014-09-17 20:28:32 +02:00
koral
719b910eb3 Added httptunnel package. 2014-09-17 19:55:45 +02:00
Shea Levy
d8f80630f7 Add strongswan IPsec manager 2014-09-16 14:10:37 -04:00
Rickard Nilsson
8dd1abe3fa chrony: Update from 1.30 to 1.31 2014-09-16 13:53:18 +02:00
Charles Strahan
dd9550bca0 update bud to 0.32.0 (WIP) 2014-09-16 00:31:56 -04:00
Michael Raskin
d05684be21 Merge pull request #3694 from matejc/cmst 
new package: cmst - qt gui for connman
 2014-09-15 23:12:01 +04:00
William A. Kennington III
5c80997ebd radvd: 2.5 -> 2.6 2014-09-15 01:30:42 -07:00
Pascal Wittmann
4c4d4c78e9 atftp: transformed meta.maintainers into a list and fixed indentation 2014-09-13 17:40:01 +02:00
Pascal Wittmann
8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Matej Cotman
7f76092ffc new package: cmst - qt gui for connman 2014-09-12 14:10:26 +02:00
JB Giraudeau
04163fcc81 update hpn patch version to match openssh version 
so that hpn_openssh is not boken anymore
 2014-09-11 22:29:00 +02:00
Georges Dubus
f7fe08ec4e sshpass: Added expression 2014-09-10 16:01:39 +02:00
Eric Seidel
0577499d74 fix some packages on darwin 2014-09-09 13:54:26 -07:00
Domen Kožar
ed706113a8 sproxy-web: mark as broken 2014-09-06 15:23:22 +02:00
Domen Kožar
b420eeba44 remove bittorrent package since it's obsolete 2014-09-05 22:49:31 +02:00
Moritz Ulrich
f54f5539aa dhcpcd: update from 6.4.2 to 6.4.3 2014-09-04 19:31:32 +02:00
Moritz Ulrich
332395b262 Add myself as a maintainer to a bunch of packages. 2014-09-04 17:05:21 +02:00
Moritz Ulrich
ff3ba48294 fping: update from 3.8 to 3.10 2014-09-04 17:05:20 +02:00
Jaka Hudoklin
3ccd8af29d Add curl-unix-socket, Run HTTP requests over UNIX socket 2014-09-04 12:08:59 +02:00
Michael Raskin
2b7e30b674 Merge pull request #3741 from wkennington/master.tinc 
tinc_pre: Add derivation
 2014-09-03 11:18:25 +04:00
Michael Raskin
0ede64bfcb Override postFixup for urlwatch so it works somehwo 2014-09-02 21:17:52 +04:00
William A. Kennington III
d13423c74f tinc_pre: Experimental Patches 2014-09-02 09:16:15 -07:00
William A. Kennington III
ac502d28ff tinc_pre: Add derivation 
The tinc developer has made significant developments to the next version
of tinc including many protocol security fixes. This patch adds the
prerelease of the next major tinc release.
 2014-09-02 09:16:15 -07:00
Michael Raskin
0d8c76057f Update Wavemon 2014-09-02 14:25:17 +04:00
Michael Raskin
9668a7a63b Update getmail 2014-09-02 14:25:16 +04:00
Michael Raskin
d33a20ef4a Merge pull request #3869 from pmahoney/skarnet 
skarnet.org UNIX utilities
 2014-09-02 02:15:22 +04:00
tv@shackspace.de
f87c516a91 urlwatch: add version 1.16 2014-09-02 01:29:30 +04:00
Michael Raskin
a6dfb4dc28 Merge pull request #3241 from ehmry/cjdns 
cjdns declarative configuration
 2014-09-02 00:53:18 +04:00
Michael Raskin
5b9110233d Update atftp 2014-09-02 00:56:07 +04:00
aszlig
3fbb9f0502
Add new openntpd package in version 20080406p-10. 
It's actually a fork from Debian who are providing cross-platform
compatibility fixes for it. A big advantage is that it is far more
minimal than the ntpd reference implementation and especially useful if
you don't want to run an NTP service.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-09-01 16:07:27 +02:00
Emery Hemingway
fc6ccd1080 cjdns: package update from 20140303 to 20140829 2014-08-31 18:14:16 -04:00
Patrick Mahoney
7fc369cfca dnsmasq: Replace deprecated ensureDir with mkdir. 2014-08-30 09:19:23 -05:00
Patrick Mahoney
9247013255 s6-networking: new package 
s6-networking is a suite of small networking utilities for Unix systems
including UCSPI Unix and TCP tools, access control tools, and network
time management utilities.
 2014-08-30 00:07:45 -05:00
Patrick Mahoney
1030ca0550 s6-dns: new package 
s6-dns is a suite of DNS client programs and libraries for Unix systems,
as an alternative to the BIND, djbdns or other DNS clients.
 2014-08-30 00:06:42 -05:00
Michael Raskin
844fd2553e Merge pull request #3745 from wkennington/master.dnsmasq 
dnsmasq: Update and enable dbus support
 2014-08-29 01:43:41 +04:00
Austin Seipp
792afca113 spiped: 1.3.1 -> 1.4.0 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-28 15:26:39 -05:00
William A. Kennington III
9194f69e73 dnsmasq: Meta Update 2014-08-28 11:39:03 -07:00
Paul Colomiets
adbb9ff796 dnsmasq: upgrade to 2.71, fixed dnsmasq module 
* The module now has systemd config

* Add resolveLocalQueries option which sets up it as a dns server for
  local host (including reasonable setup of resolvconf)

* Add "dnsmasq" user for running daemon

* Enabled dbus and dnssec support for the package

Conflicts:
	nixos/modules/misc/ids.nix
 2014-08-28 11:39:03 -07:00
Domen Kožar
7573763e89 netboot: simplify, build only on 64bit 2014-08-26 12:11:31 +02:00
Rob Vermaas
8fc3bedb5a Fix ntopng build 2014-08-26 11:22:23 +02:00
Thomas Tuegel
6bda0b00e0 atftp: new expression for version 0.7.1 2014-08-25 14:01:19 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions 
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
 2014-08-24 22:31:37 +02:00
William A. Kennington III
4da69cb7da radvd: Upsate 1.8.1 -> 2.5 2014-08-24 03:12:55 -07:00
Austin Seipp
32183417fa stunnel: 5.01 -> 5.03 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-20 01:56:23 -05:00
William A. Kennington III
5f64a6ffe0 speedtest-cli: 0.2.7 -> 0.3.1 2014-08-17 11:19:41 -07:00
Nathan Bijnens
23da6f9ca4 mailutils: fix for sendmail path 2014-08-15 21:16:33 +02:00
Petar Bogdanovic
133fb0c6e0 rtorrent: compile with xmlrpc-c for 3rd party UIs 2014-08-14 22:06:59 +01:00
William A. Kennington III
5337b16435 dhcp: Update meta information and add maintainership 2014-08-13 15:10:04 -05:00
William A. Kennington III
05976a2b5a dhcpd: Update 4.1-ESV-R6 -> 4.3.0 
Additionally add the ability to run as a non-root user / group by including
paranoia patches in the build.
 2014-08-13 15:08:08 -05:00
Moritz Ulrich
2486f89aed isync: Bump to 1.1.1 2014-08-12 13:34:37 +02:00
Bjørn Forsman
b9bd655b16 ucspi-tcp: new package 
ucspi-tcp is command-line tools for building TCP client-server
applications.

http://cr.yp.to/ucspi-tcp.html
 2014-08-10 23:00:42 +02:00
Luca Bruno
0b038724c5 chrony: fails to build on darwin 2014-08-10 11:50:43 +02:00
Eelco Dolstra
a1a96d8744 Merge pull request #3507 from jochu/nix-update-nzbget 
Update nzbget (13.0) and libpar2 (0.4)
 2014-08-09 19:19:52 +02:00
Jeff Chu
2a59e573b2 nzbget: Update to 13.0 2014-08-09 09:36:56 -07:00
Michael Raskin
fa907fce31 Use a still-available Debian patch... 2014-08-09 16:09:22 +04:00
Luca Bruno
ba2da1fa6c cadaver: mark as unsupported on darwin 2014-08-09 12:29:26 +02:00
lethalman
86ed47efbf Merge pull request #3489 from frerich/dnsmasq 
Update dnsmasq to new version and enable for OS X
 2014-08-08 22:32:42 +02:00
Vladimír Čunát
52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Frerich Raabe
965237a6ee Use .tar.xz instead of .tar.gz for dnsmasq 
To save precious bandwidth.
 2014-08-07 21:40:45 +02:00
Frerich Raabe
dee49fa1b2 Update dnsmasq to version 2.71 2014-08-07 21:40:45 +02:00
Frerich Raabe
1ff81347ec Enable dnsmasq on OS X 
It seems to work alright.
 2014-08-07 21:40:45 +02:00
Rickard Nilsson
c59a602465 chrony: Update from 1.29.1 to 1.30 2014-08-06 14:08:08 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Ian-Woo Kim
676daf6529 cadaver: change to platform.unix and specify licence (gpl2) 2014-07-31 13:51:31 +02:00
Ian-Woo Kim
ea43305368 added cadaver: a command-line WebDAV client for Unix 2014-07-30 16:55:44 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-07-28 11:30:49 +02:00
Charles Strahan
5668ac61e9 bud: new package 
This adds `bud`, a TLS terminating proxy.
 2014-07-27 14:23:43 +02:00
John Wiegley
78a42931e5 socat: allow 2.x to build on darwin 2014-07-24 15:48:07 -05:00
Eelco Dolstra
7f410ef923 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/misc/vim-plugins/default.nix
 2014-07-22 11:00:00 +02:00
Matej Cotman
42f6d01bc2 connman: upgrade to version 1.24 2014-07-17 22:30:27 +02:00
Eelco Dolstra
1dc5e5fb8c dhcpcd: Update to 6.4.2 2014-07-15 16:23:47 +02:00
Eelco Dolstra
ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Oliver Charles
7c90aab92a siege: Build with OpenSSL 2014-07-12 12:07:24 +01:00
Eelco Dolstra
95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Jascha Geerds
28322c8d58 Packaging plasma-nm and its dependencies 2014-07-05 13:54:01 +02:00
Michael Raskin
cb84c4d6a4 babeld: update from 1.4.3 to 1.5.0 2014-07-04 21:45:07 +04:00
Michael Raskin
3329d68199 aria2: update from 1.18.1 to 1.18.5 2014-07-04 21:42:31 +04:00
Michael Raskin
0b9a382fc8 Apparently nobody ever noticed that aria was already packaged when packaging it once more; merging expressions 2014-07-04 21:42:14 +04:00
Eelco Dolstra
e443fcb37f openresolv: Update to 3.5.7 2014-07-03 12:18:44 +02:00
Eelco Dolstra
993e8da496 dhcpcd: Update to 6.4.0 
The lxc_ro_promote_secondaries patch no longer applies so I disabled
it for now (@offlinehacker).
 2014-07-03 12:18:44 +02:00
Moritz Ulrich
27515430ca mu: Bump to 0.9.9.6. 2014-07-03 11:15:55 +02:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/servers/serfdom/default.nix
 2014-07-01 11:25:41 +02:00
Michael Raskin
040c0e8d7d Allow autoupdates for altermime 2014-07-01 12:47:15 +04:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir 
See c556a6ea46.
 2014-06-30 14:56:10 +02:00
Moritz Maxeiner
a229294c13 Fix network-manager-applet startup issue 'GLib-GIO-Message: Using the 'memory' GSettings backend. Your settings will not be saved or shared with other applications.' 
(cherry picked from commit 51dc1ddb7c6e974e36c1a2d8701fbc7c254cbc72)

Conflicts:
	pkgs/tools/networking/network-manager-applet/default.nix
 2014-06-27 10:25:30 +02:00