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

..

applications

Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging

2014-09-23 11:27:53 +02:00

build-support

Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging

2014-09-23 11:27:53 +02:00

data

Merge pull request #4151 from lostdj/ltp/master/tzdata2014g

2014-09-18 18:37:37 +02:00

desktops

Merge remote-tracking branch 'origin/master' into staging

2014-09-18 22:28:35 +02:00

development

Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging

2014-09-23 11:27:53 +02:00

games

dwarf-fortress: Bump to 0.40.13.

2014-09-18 20:41:54 +02:00

misc

added alock package

2014-09-16 09:25:47 +02:00

os-specific

Merge remote-tracking branch 'origin/master' into staging

2014-09-18 22:28:35 +02:00

servers

Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging

2014-09-23 11:27:53 +02:00

shells

fishshell builds on unix platforms

2014-09-16 09:04:55 +02:00

stdenv

Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging

2014-09-23 11:27:53 +02:00

test

Merge recent master into staging

2014-09-13 21:48:29 +02:00

tools

Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging

2014-09-23 11:27:53 +02:00

top-level

Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging

2014-09-23 11:27:53 +02:00