William A. Kennington III 453f7c7218 Merge branch 'master.upstream' into staging.upstream

2015-11-14 12:39:32 -08:00

..

applications

Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""

2015-11-14 12:32:51 -08:00

build-support

Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""

2015-11-14 12:32:51 -08:00

data

Merge branch 'master.upstream' into staging.upstream

2015-11-05 10:07:28 -08:00

desktops

cheese: libgudev

2015-11-14 16:50:23 +01:00

development

Merge branch 'master.upstream' into staging.upstream

2015-11-14 12:39:32 -08:00

games

macopix: init at 1.7.4

2015-11-12 20:54:48 +00:00

misc

Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""

2015-11-14 12:32:51 -08:00

os-specific

Merge branch 'master.upstream' into staging.upstream

2015-11-14 12:39:32 -08:00

servers

Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""

2015-11-14 12:32:51 -08:00

shells

fish: fix use hostname from the store instead of from the environment

2015-11-06 09:55:55 +01:00

stdenv

Don't fail if env-vars cannot be written to

2015-11-04 16:32:59 +01:00

test

…

tools

Merge branch 'master.upstream' into staging.upstream

2015-11-14 12:39:32 -08:00

top-level

Merge branch 'master.upstream' into staging.upstream

2015-11-14 12:39:32 -08:00