nixpkgs/pkgs
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
..
applications Merge master into closure-size 2016-03-08 09:58:19 +01:00
build-support Merge master into closure-size 2016-03-08 09:58:19 +01:00
data Merge master into closure-size 2016-03-08 09:58:19 +01:00
desktops Merge master into closure-size 2016-03-08 09:58:19 +01:00
development Merge master into closure-size 2016-03-08 09:58:19 +01:00
games Merge master into closure-size 2016-03-08 09:58:19 +01:00
misc Merge master into closure-size 2016-03-08 09:58:19 +01:00
os-specific Merge master into closure-size 2016-03-08 09:58:19 +01:00
servers Merge master into closure-size 2016-03-08 09:58:19 +01:00
shells Merge master into closure-size 2016-03-08 09:58:19 +01:00
stdenv Merge master into closure-size 2016-03-08 09:58:19 +01:00
test
tools Merge master into closure-size 2016-03-08 09:58:19 +01:00
top-level Merge master into closure-size 2016-03-08 09:58:19 +01:00