Commit graph

4463 commits

Author SHA1 Message Date
lethalman
7d246d569a Merge pull request #3497 from madjar/nox
Nox: added expression
2014-08-09 12:33:17 +02:00
Luca Bruno
b331ae33d7 Make platforms.allBut accept a list rather than a single platform 2014-08-09 12:31:33 +02:00
Georges Dubus
8de8d5a639 nox: Added expression 2014-08-09 12:30:38 +02:00
Luca Bruno
ba2da1fa6c cadaver: mark as unsupported on darwin 2014-08-09 12:29:26 +02:00
Mateusz Kowalczyk
44d65c6582 youtube-dl: update to 2014.08.05 2014-08-09 02:57:18 +02:00
Peter Simons
48fb5d73a6 cabal-install: don't build old versions of this package with a recent GHC 2014-08-09 00:39:53 +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
Pascal Wittmann
7bd3921cf9 multitail: update from 5.2.13 to 6.2.1 2014-08-08 14:51:11 +02:00
Pascal Wittmann
f3fd2bf9b2 xclip: fixed broken homepage link 2014-08-08 11:20:32 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Joel Taylor
d8cca3d624 fail2ban: systemd support
- upgrade fail2ban to 0.9
- override systemd to enable python support and include sqlite3 module
- make fail2ban enablable
2014-08-08 00:10:19 +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
taku0
74ce1a016f add peco: Simplistic interactive filtering tool 2014-08-07 01:34:28 +02:00
Jason \"Don\" O'Conal
297599a299 bindfs: add expression 2014-08-07 01:07:34 +02:00
Rickard Nilsson
c59a602465 chrony: Update from 1.29.1 to 1.30 2014-08-06 14:08:08 +02:00
Rickard Nilsson
0dd1551806 syslog-ng: Update from 3.5.4.1 to 3.5.6 2014-08-06 12:10:07 +02:00
Rickard Nilsson
f4cd161e9b syslog-ng-incubator: Update from 0.3.1 to 0.3.3 2014-08-06 12:09:08 +02:00
Rickard Nilsson
d958692420 riemann-c-client: Update from 1.1.1 to 1.2.0 2014-08-06 12:08:41 +02:00
Rickard Nilsson
55e6d092ca ec2-ami-tools: Update from 1.4.0.9 to 1.5.3 2014-08-05 01:25:16 +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
Moritz Ulrich
166fbcaf28 pngcrush: update from 1.7.73 to 1.7.76 2014-08-04 15:56:11 +02:00
Moritz Ulrich
7af9134293 pass: update from 1.6.2 to 1.6.3 2014-08-04 15:54:05 +02:00
Pascal Wittmann
19fb472d5a Merge pull request #3458 from svenkeidel/paperkey
added paperkey package
2014-08-04 15:10:09 +02:00
Eelco Dolstra
a9a4cdd3d0 nixUnstable: Update to 1.8pre3718_51485dc 2014-08-04 14:00:41 +02:00
Sven Keidel
36d339b74e added paperkey package 2014-08-04 13:11:29 +02:00
Peter Simons
ea448e90c3 povray: update to version 3.7
Committed on behalf of Thomas Strobel <ts468@cam.ac.uk>.
2014-08-04 13:03:36 +02:00
Michael Raskin
1fa783f55a Update glusterfs 2014-08-03 22:29:41 +04:00
Michael Raskin
20028936ab Update ZPAQ 2014-08-03 22:29:41 +04:00
Cillian de Róiste
928f293e6e dcraw: fix build, now requires lcms2 2014-08-03 15:02:20 +02:00
Cillian de Róiste
a9df9c702d dcraw: update from 9.20 to 9.22 2014-08-03 15:02:20 +02:00
John Wiegley
141b69415c Merge pull request #3422 from jbedo/master
Updated texlive to latest release
2014-08-02 18:55:05 -04:00
Mateusz Kowalczyk
a54b012fe9 youtube-dl: update to 2014.08.02.1 2014-08-02 18:57:54 +02:00
Victor van Poppelen
45fbcadd3b Merge branch 'master' of ssh://github.com/vvanpo/nixpkgs into plan9port 2014-08-01 10:58:32 -04:00
aszlig
57781346d7
Merge branch 'i3-tests'.
The reason I went through this whole journey of gathering dependencies
and debugging just in order to get i3 tests working was because I wanted
to supply test cases to a small patch I wrote for the upstream project.

This adds/updates quite a few Perl packages and a X dummy helper, which
are all needed in order to successfully run the test suite.
2014-08-01 05:51:57 +02:00
aszlig
feeb5bae23
Add new package xdummy, a dummy X server.
This is actually a small script which just starts an X server without
any real display. Right now only needed for running the test suite of
the i3 window manager within the Nix chroot, but might be useful for
running other tests needing a DISPLAY.

Usage is just like a regular X server, so in order to start an instance
for display :666, you just run it like this:

xdummy :666

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 05:49:14 +02:00
Austin Seipp
06d1d2d4df Merge pull request #3417 from madjar/master
Ansible: updated to 1.6.10
2014-07-31 21:28:31 -05:00
Justin Bedo
befd1289ac Updated texlive to latest release 2014-08-01 10:19:00 +10:00
Victor van Poppelen
f4c851f854 plan9port: builder.sh called install script twice, meaning a redundant recompile. 2014-07-31 14:00:28 -04:00
Pascal Wittmann
ba273e41c2 Merge pull request #3405 from wavewave/cadaver
added cadaver: a command-line WebDAV client for Unix
2014-07-31 13:57:10 +02:00
Ian-Woo Kim
676daf6529 cadaver: change to platform.unix and specify licence (gpl2) 2014-07-31 13:51:31 +02:00
Evgeny Egorochkin
ecefc22d76 tor: update from 0.2.4.22 to 0.2.4.23 2014-07-31 14:36:06 +03:00
Bjørn Forsman
62d0a320b3 Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00
Georges Dubus
e698312c03 Ansible: updated to 1.6.10 2014-07-31 12:24:30 +02:00
Victor van Poppelen
d2efe7785e plan9port:
- Update to 20140306
	- Fixed libXt dependency.  The compiler could not find X11/IntrinsicP.h, even though it is available through the nix store.  I think there must be some issue with the 9c compiler being used and not obeying the CFLAGS that nix is supposed to pass.  There are probably other dependencies I'm missing, but 9c found in my /usr/include.
2014-07-31 00:38:00 -04:00
Ian-Woo Kim
ea43305368 added cadaver: a command-line WebDAV client for Unix 2014-07-30 16:55:44 +02:00
tv@shackspace.de
2f53665c08 sec: update to version 2.7.6 2014-07-30 16:11:52 +02:00
Eelco Dolstra
6a5b365689 nixUnstable: Update to 1.8pre3711_45f9a91 2014-07-30 13:18:33 +02:00
Peter Simons
5cc55e9523 Partially revert 7a45996 some more.
Removing more references to the non-existent license "stdenv.lib.licenses.perl5".
Thanks to @FlashKorten for catching those.
2014-07-28 20:52:47 +02:00
Peter Simons
bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Peter Simons
d0ca8c237e Fix broken license references. 2014-07-28 11:43:20 +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
Sebastian Korten
e57249ab20 at: upgrade to 3.1.14 - seems to solve problem with kernel 3.6 2014-07-27 22:57:54 +02:00
Charles Strahan
5668ac61e9 bud: new package
This adds `bud`, a TLS terminating proxy.
2014-07-27 14:23:43 +02:00
Luke Clifton
dcb226deb7 Changed to correct license from licenses.* 2014-07-26 08:39:14 +08:00
Jaka Hudoklin
598d0460cd Merge pull request #3355 from ttuegel/gnuplot
Update gnuplot and add optional Qt dependency
2014-07-26 02:14:56 +02:00
Eelco Dolstra
7acfec9e47 nixUnstable: Update to 1.8pre3705_71a20d4 2014-07-25 14:51:50 +02:00
lethalman
9188444027 Merge pull request #3367 from FlashKorten/emv
Emv
2014-07-25 10:32:49 +02:00
Sebastian Korten
d03905dbf3 emv: perl isn't needed after all 2014-07-25 10:26:44 +02:00
Sebastian Korten
8da1291928 emv: Initial install script 2014-07-25 09:20:17 +02:00
John Wiegley
78a42931e5 socat: allow 2.x to build on darwin 2014-07-24 15:48:07 -05:00
Joel Taylor
4273d38b3b tmux 1.9a 2014-07-23 16:06:22 -07:00
Thomas Tuegel
ac01b79c73 gnuplot: add optional Qt terminal 2014-07-23 18:01:31 -05:00
Thomas Tuegel
760cad296d gnuplot: version bump 4.6.3 -> 4.6.5 2014-07-23 18:01:17 -05:00
Bjørn Forsman
49c9ba81a5 kalibrate-rtl: new package
kalibrate-rtl calculates the local oscillator frequency offset in
RTL-SDR devices.

kalibrate-rtl has no tags/releases, so I'm using the latest commit from
git master (dated 2013-12-14). I made an upstream issue about making a
release back in May[1], but I've gotten no response yet.

[1] https://github.com/steve-m/kalibrate-rtl/issues/7
2014-07-23 22:47:41 +02:00
William A. Kennington III
0031a036ca picocom: Add dependency on lrzsz so that we can transfer files 2014-07-23 20:28:18 +02:00
William A. Kennington III
9e767db818 lrzsz: Add derivation
[Bjørn Forsman: remove "a unix" from beginning of meta.description and
capitalize first word]
2014-07-23 20:27:12 +02:00
Bjørn Forsman
f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Eelco Dolstra
5c5f115603 firefox: Build without xulrunner
Fixes #2950.
2014-07-23 17:28:36 +02:00
Luke Clifton
50c63f9b32 Added abduco 2014-07-23 21:52:22 +08:00
Eelco Dolstra
4c2c0499f3 enscript: Build with the default GCC 2014-07-23 11:25:38 +02:00
Bjørn Forsman
3a060bbcc6 Add missing 's' in remaining meta.maintainer(s) attrs 2014-07-22 23:49:21 +02:00
Andrew Morsillo
0f8df0b6f2 Add evemu tool to emulate and record input device event data
[Bjørn Forsman:
 * wrap some long lines
 * tweak meta attrs (don't repeat package name, s/meta.maintainer/meta.maintainers/)
 * provide a version number (v2.0) for 'evemu' (for nix-env)
]
2014-07-22 23:35:38 +02:00
Eelco Dolstra
4f7289eec9 Don't use ensureDir 2014-07-22 11:01:32 +02: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
Pascal Wittmann
261ecebfaf Merge pull request #3323 from wjlroe/logstash-1.4.2
Logstash 1.4.2
2014-07-21 20:02:11 +02:00
Pascal Wittmann
5156b5d11d Merge pull request #3260 from linquize/gbdfed
gbdfed: add package 1.6
2014-07-21 19:49:26 +02:00
Bjørn Forsman
f8778ed82c openopc: new package
"OPC (OLE for Process Control) toolkit designed for use with Python"

This package contains a python module (OpenOPC) and a command line
client (opc). The OpenOPC Gateway Service for Windows is also copied to
$out, for reference.

It only works with python2.7 (not python3.x), so I'm not adding it to
python-packages.nix.

Also add needed dependency, python-pyro3, a distributed object
middleware for Python (IPC/RPC).

http://openopc.sourceforge.net/
2014-07-21 18:43:33 +02:00
Bjørn Forsman
cd3ba19ec0 asciidoc: add enableExtraPlugins expression argument
'enableExtraPlugins = true' enables all the extra plugins (filters and
backends) that are available in the expression. This simplifies the
configuration for users who want to have the fullest possible asciidoc
configuration (not needing to enable each individual plugin).
2014-07-20 23:03:27 +02:00
Bjørn Forsman
0ab24ad8c8 Revert "asciidoc: properly differentiate the "-full" variant in meta.description"
I changed my mind about this, I no longer think that meta.description
should differ depending on the package configuration. A package
configuration can be very fine grained, and I don't think it's
possible/preferable to describe this in meta.description.

This reverts commit 9033821c34.
2014-07-20 23:03:27 +02:00
William Roe
b6c2dc4e4f License, platforms and maintainer for Logstash 2014-07-20 16:09:19 +01:00
Pascal Wittmann
52cf78ef22 added cv: Tool that shows the progress of coreutils programs 2014-07-20 15:45:19 +02:00
Peter Simons
920f6007fa Merge pull request #3308 from matejc/connman124
connman: upgrade to version 1.24
2014-07-18 11:42:49 +02:00
Eelco Dolstra
2b2ba8bdf4 nixUnstable: Update to 1.8pre3679_f609eec 2014-07-18 00:22:08 +02:00
Matej Cotman
42f6d01bc2 connman: upgrade to version 1.24 2014-07-17 22:30:27 +02:00
William A. Kennington III
58485aa2c7 efibootmgr: Update 0.5.4 -> 0.7.0 2014-07-17 11:40:37 +02:00
William A. Kennington III
830f3b6b55 efivar: Add derivation 2014-07-17 11:40:37 +02:00
Pascal Wittmann
d518ef91c0 cpuminer: update from 2.3.3 to 2.4 and build with -O3 as described in the installation instructions 2014-07-17 00:15:44 +02:00
Pascal Wittmann
96f5affca9 bgs: update from 0.5 to 0.6 2014-07-15 19:50:29 +02:00
Eelco Dolstra
1dc5e5fb8c dhcpcd: Update to 6.4.2 2014-07-15 16:23:47 +02:00
Bjørn Forsman
4da81ca4f6 collectd: update meta attributes
Don't repeat package name in description, add maintainer, ...
2014-07-15 14:07:29 +02:00
Bjørn Forsman
3ba150db2f collectd: enable a bunch of plugins (by adding more deps)
These are plugins that are internal to collectd; they are bundled in the
source archive. Without this, many of the collectd plugins advertised on
their homepage don't actually work, so I think we should add this.

This change increases the closure size from 129 MiB to 621 MiB. The size
of the collectd store path itself goes from 2 MiB to 2.9 MiB.

Users wanting a smaller closure size can set some (or all) of the
optional inputs to "null" using ".override".

List of new plugins:

  amqp
  apache
  ascent
  bind
  curl
  curl_json
  curl_xml
  dbi
  dns
  iptables
  libvirt
  lvm
  memcachec
  modbus
  mysql
  nginx
  notify_desktop
  pinba
  ping
  postgresql
  redis
  rrdcached
  rrdtool
  sensors
  sigrok
  varnish
  write_http
  write_redis
  write_riemann
2014-07-15 14:07:29 +02:00
Eelco Dolstra
b9d19af3e6 Merge remote-tracking branch 'origin/master' into staging 2014-07-15 12:14:35 +02:00
Eelco Dolstra
45d327a346 jdiskreport: Update to 1.4.1 2014-07-15 11:52:20 +02:00
William Roe
a5783a977e Install all dirs for logstash
Also only patch shebangs in bin/ directory
2014-07-14 17:54:20 +01:00
Eelco Dolstra
c49afcc84a nixUnstable: Update to 1.8pre3666_5bcb982 2014-07-14 17:34:40 +02:00
Eelco Dolstra
78b5dea799 Revert "nixUnstable: Update to 1.8pre3666_5bcb982"
This reverts commit 3fff7cf9a2.
2014-07-14 17:34:13 +02:00
Eelco Dolstra
3fff7cf9a2 nixUnstable: Update to 1.8pre3666_5bcb982 2014-07-14 17:33:53 +02:00
Peter Simons
5bfb58a8a2 Re-generate Haskell packages with cabal2nix. 2014-07-14 17:33:52 +02:00
Eelco Dolstra
ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Pascal Wittmann
8c94b943de dvtm: update from 0.11 to 0.12 2014-07-14 15:40:09 +02:00
Peter Simons
d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Linquize
73028ef161 gbdfed: add package 1.6 2014-07-13 19:22:10 +08:00
John Wiegley
842fcdb4b4 texlive: update package paths, old versions no longer exist 2014-07-13 05:05:36 +00:00
John Wiegley
8983cb0917 httrack: upgrade 3.48.3 -> 3.48.17 2014-07-13 05:05:36 +00:00
Wout Mertens
cfe7441729 Add maintainer and platforms 2014-07-12 15:44:48 +02:00
tv
3fa1735b92 sec: add version 2.7.5 2014-07-12 13:19:08 +02:00
Christoph Hrdinka
a608a6f52a enblend-enfuse: update to version 4.1.3 2014-07-12 13:17:53 +02:00
Oliver Charles
7c90aab92a siege: Build with OpenSSL 2014-07-12 12:07:24 +01:00
Wout Mertens
ce81993a6b glmark2: Add glmark2 2014.03 2014-07-12 10:04:28 +02:00
William Roe
d79a58e392 Bump Logstash to 1.4.2 2014-07-11 17:50:02 +01:00
Bjørn Forsman
1ad2f843e2 volatility: fix indentation 2014-07-11 17:10:26 +02:00
Austin Seipp
e75d92791e Merge pull request #3236 from bosu/volatility
Add volatility: memory forensics framework
2014-07-11 03:35:45 -05:00
Boris Sukholitko
0ef036f48a Add volatility: memory forensics framework 2014-07-10 21:34:23 +03:00
Pascal Wittmann
c713d163c0 Update opkg to latest version, adpot it and add meta-information. 2014-07-10 10:57:28 +02:00
Luca Bruno
c4ad4b8802 wmctrl: apply patch from debian to fix listing windows 2014-07-09 21:54:02 +02:00
Cillian de Róiste
26e36dcc80 Add Mark Lord's symlinks utility 2014-07-08 19:19:43 +02:00
Eelco Dolstra
8aacdfee7c gawk: Remove unnecessary ‘gawk-<version>’ copy
This saves > 600 KiB.
2014-07-08 15:43:05 +02:00
zimbatm
a05ae93c66 Update direnv to v2.4.0 2014-07-08 00:20:21 +02:00
Rickard Nilsson
233825760c New pkg: syslog-ng-incubator
A collection of tools and modules for syslog-ng
2014-07-07 23:58:24 +02:00
Rickard Nilsson
0ee69ef529 New pkg: riemann-c-client version 1.1.1
A C client library for the Riemann monitoring system
2014-07-07 23:58:24 +02:00
Rob Vermaas
83e1ff846c Upgrade rsyslog to latest (v7) stable release. Added liblogging (new dependency of rsyslog). 2014-07-07 16:23:54 +02: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
94e11b2f91 Update autocutsel 2014-07-04 21:51:43 +04: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
Austin Seipp
67d992c100 ceph: fix libatomic_ops dependency
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-30 12:03:08 -05:00
Peter Simons
6d068be1bf cabal-install: update to version 1.20.0.3 2014-06-30 17:03:07 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Michael Raskin
127175d27f Update gummiboot to the latest 2014-06-30 11:05:40 +04:00
Michael Raskin
dcf5e85c2f Merge pull request #2595 from wkennington/master.ecryptfs
ecryptfs: Update from 82 -> 104
2014-06-30 09:26:24 +04:00
John Wiegley
af5f5ec84d ceph: default atomicops dependency to null
I have no such dependency on my system, so this prevent nix-env from
working.
2014-06-28 21:38:16 -07:00
Alexander Kjeldaas
d80ded0e7d Added the ceph filesystem. 2014-06-28 20:43:58 -05:00
Alexander Kjeldaas
f1b7cb7ceb Added lib output to xfsprogs.
This only contains static archives since xfsprogs is compiled
with dynamic libraries disabled.
2014-06-28 20:43:51 -05:00
Benno Fünfstück
e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
2014-06-28 21:06:10 +02:00
Shea Levy
662ecd277a nix: propagate boehmgc 2014-06-27 18:15:05 -04: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
Jos van den Oever
a6f11f262e Update povray.
Current master version has 404 on tar.gz.
2014-06-26 11:31:59 +02:00
Vladimír Čunát
99da7b85cb gnupg: security update 2.0.22 -> .24, CVE-2014-4617
Close #3091.
2014-06-26 11:04:30 +02:00