3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs
Vladimír Čunát 3e387c3e00 Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
2016-05-13 10:14:53 +02:00
..
applications Merge branch 'staging' 2016-05-13 10:14:53 +02:00
build-support Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
data Merge branch 'staging' 2016-05-13 10:14:53 +02:00
desktops kdewebkit: removed 2016-05-10 20:09:55 -05:00
development Merge branch 'staging' 2016-05-13 10:14:53 +02:00
games Merge branch 'staging' 2016-05-13 10:14:53 +02:00
misc Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
os-specific Merge branch 'staging' 2016-05-13 10:14:53 +02:00
servers Merge branch 'staging' 2016-05-13 10:14:53 +02:00
shells Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
stdenv stdenv setup.sh: revert most of changes around #14907 2016-05-12 04:53:37 +02:00
test Remove cruft 2016-04-26 17:31:54 +02:00
tools Merge branch 'staging' 2016-05-13 10:14:53 +02:00
top-level Merge branch 'staging' 2016-05-13 10:14:53 +02:00