Vladimír Čunát 09af15654f Merge master into closure-size ... The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.		2016-03-08 09:58:19 +01:00
..
cygwin
darwin	stdenv-darwin: fix to work with multiple outputs	2016-02-13 15:48:22 -05:00
freebsd	FreeBSD: improve bootstrapping, re-enable bdb for heimdal	2016-01-01 17:01:13 +00:00
generic	Merge master into closure-size	2016-03-08 09:58:19 +01:00
linux	Merge master into closure-size	2016-03-08 09:58:19 +01:00
native	FreeBSD: undo removal of Solaris and remove changes to native stdenv now that FreeBSD has its own	2016-01-01 17:01:13 +00:00
nix	Fix "nix" stdenv (close #13554)	2016-02-28 19:49:35 +01:00
adapters.nix
common-path.nix
default.nix	Merge branch 'master' into staging	2016-01-05 10:28:58 +01:00