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
..
default.nix	Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging	2014-09-23 11:27:53 +02:00