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
..
audio	Merge remote-tracking branch 'origin/master' into staging	2014-09-18 22:28:35 +02:00
display-managers	freetype: major update, including some CVE security	2014-06-17 09:00:29 +02:00
editors	Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging	2014-09-23 11:27:53 +02:00
graphics	New package: Solvespace.	2014-09-15 16:29:08 +02:00
inferno	Add missing 's' in remaining meta.maintainer(s) attrs	2014-07-22 23:49:21 +02:00
misc	update camlistore to 0.8	2014-09-16 00:22:55 -04:00
networking	Merge pull request #4104 from ts468/chromium	2014-09-16 08:12:10 +02:00
office	Revert "keepnote: add myself as a maintainer"	2014-09-18 10:44:01 +02:00
science	Merge remote-tracking branch 'origin/master' into staging	2014-09-18 22:28:35 +02:00
search	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
taxes
version-management	Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging	2014-09-23 11:27:53 +02:00
video	add xvidcap to the channel for linux	2014-09-17 13:35:59 +02:00
virtualization	VirtualBox: Fix ALSA audio.	2014-09-14 11:28:34 +02:00
window-managers	openbox window manager: add tool to set desktop layout	2014-09-15 08:40:41 -03:00