nixpkgs/pkgs/applications
Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
..
audio clementine: version bump 1.2.1 -> 1.2.3 (close #3570) 2014-08-14 20:35:40 +02:00
display-managers freetype: major update, including some CVE security 2014-06-17 09:00:29 +02:00
editors merge #3428: nano: bump and add system-wide config 2014-08-14 23:51:29 +02:00
graphics kipi_plugins: mark as broken; should come from digikam 2014-08-14 15:43:35 +02:00
ike ike: use stdenv.lib.licenses.sleepycat 2014-03-24 19:58:36 -05:00
inferno Add missing 's' in remaining meta.maintainer(s) attrs 2014-07-22 23:49:21 +02:00
misc merge #3340: bitcoin: minor update 2014-08-15 00:15:22 +02:00
networking Merge remote-tracking branch 'origin/master' into staging 2014-08-15 02:15:14 +02:00
office zotero: add check to detect xul version breakages 2014-08-15 02:03:52 +02:00
science merge 'staging' into modular-stdenv 2014-09-08 18:16:54 +02:00
search Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
taxes Add aangifte-2013 2014-03-01 16:54:16 +01:00
version-management Don't build broken Haskell packages on Hydra. 2014-08-12 12:37:44 +02:00
video Aegisub: update to 3.2.0 2014-08-12 19:43:16 +02:00
virtualization gobject-introspection: refer to shlibs with absolute paths in typelibs 2014-08-14 23:16:51 +02:00
window-managers Add the bspwm window manager to Nix. 2014-08-12 18:22:15 +02:00