nixpkgs/pkgs
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
..
applications Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00
build-support Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00
data Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00
desktops Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00
development Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00
games Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00
misc Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00
os-specific Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00
servers Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00
shells Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00
stdenv Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00
test
tools Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00
top-level Merge recent 'staging' into closure-size 2016-02-03 16:57:19 +01:00