aszlig cc28e819e4 nixos/cupsd: Ignore collisions in cups-progs. ... There currently are collisions between the main CUPS package and the filters package, which are: * $storepath/share/cups/banners/classified * $storepath/share/cups/banners/confidential * $storepath/share/cups/banners/secret * $storepath/share/cups/banners/standard * $storepath/share/cups/banners/topsecret * $storepath/share/cups/banners/unclassified * $storepath/share/cups/data/testprint And they actually have different content, so let's ignore those for now until we have a better fix. Signed-off-by: aszlig <aszlig@redmoonstudios.org>		2014-11-24 17:40:03 +01:00
..
amqp	nixos/rabbitmq: wait for start	2014-09-13 02:16:53 +02:00
audio	initial liquidsoap service expression	2014-11-20 17:41:15 -05:00
backup	Use lib instead of pkgs.lib	2014-11-17 20:30:37 +03:00
computing/torque	Merge recent master into staging	2014-09-13 21:48:29 +02:00
continuous-integration/jenkins	Merge recent master into staging	2014-09-13 21:48:29 +02:00
databases	opentsdb: Enable chunked API requests by default	2014-11-24 14:40:48 +00:00
desktops	Move at_spi2_core and at_spi2_atk outside of the gnome3 attrset	2014-07-10 11:39:16 +02:00
games
hardware	Merge branch 'master' into staging	2014-11-08 15:56:40 +01:00
logging	Revert "Revert "syslog-ng: Update from 3.5.6 to 3.6.1""	2014-11-06 21:59:04 +01:00
mail	Add mlmmj package and nixos module.	2014-08-23 12:30:45 +04:00
misc	nixos/etcd: fix postStart check and make tests deterministic	2014-11-23 12:16:50 +01:00
monitoring	scollector: Allow users to specify external collectors	2014-11-24 14:40:48 +00:00
network-filesystems	fix eval	2014-10-15 12:00:20 +02:00
networking	Merge pull request #5080 from joachifm/dnscrypt-refactor	2014-11-24 15:48:47 +03:00
printing	nixos/cupsd: Ignore collisions in cups-progs.	2014-11-24 17:40:03 +01:00
scheduling	nixos: Add option services.cron.cronFiles	2014-10-01 17:33:38 +02:00
search	nixos/elasticsearch: wait for start	2014-09-13 02:21:31 +02:00
security	nixos/haveged: Fix incorrect unit configuration (documentation -> Documentation)	2014-11-19 12:56:42 +01:00
system	Enable systemd's mymachines NSS module	2014-08-24 17:10:19 +02:00
torrent	nixos/transmission: Start after local-fs.target	2014-11-04 18:40:13 +01:00
ttys	Make console-getty only used inside container by default	2014-09-02 01:36:10 +04:00
web-servers	apache-httpd: add mod_access_compat for compatibility with old httpd-22 configurations	2014-11-12 13:18:02 +01:00
x11	KDE4: fix sound using the old gstreamer approach; the correct way would be to wrap each and every phonon client, or patch phonon's search path	2014-11-15 21:40:13 +02:00