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
..
arduino	ino: set six as dep	2014-08-27 19:02:05 +02:00
compilers	Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging	2014-09-23 11:27:53 +02:00
eclipse
guile-modules
interpreters	Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging	2014-09-23 11:27:53 +02:00
libraries	Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging	2014-09-23 11:27:53 +02:00
lisp-modules	Merge branch 'staging' into modular-stdenv	2014-09-08 18:24:58 +02:00
misc
mobile	Make emulator script run without tools in path	2014-09-17 20:58:09 +02:00
ocaml-modules	Merge remote-tracking branch 'origin/master' into staging	2014-09-18 22:28:35 +02:00
perl-modules
pharo/vm	pharo-vm: 2014.06.25 -> 2014.08.14	2014-09-13 08:43:45 +02:00
python-modules	setuptools: 2.1 -> 5.8	2014-09-18 14:03:16 +02:00
qtcreator
r-modules	Added missing curl dependency to RCurl package	2014-09-03 15:48:33 +10:00
ruby-modules
tools	Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging	2014-09-23 11:27:53 +02:00
web	Merge remote-tracking branch 'origin/master' into staging	2014-09-18 22:28:35 +02:00