zimbatm 5ff35fab0f fixup! nss: make reproducible (#102156) ... Fixes a precedence issue from fe9f55907e `lib.optionalString <cond> 'text' + 'text2'` will always have 'text2' as part of the result.		2020-11-02 11:55:11 +01:00
..
applications	rsync: disable the bundled zlib explicitly	2020-11-01 12:51:02 +01:00
build-support	Merge branch 'master' into staging-next	2020-10-31 14:30:44 +01:00
common-updater	scripts/mark-broken: improve	2020-10-30 23:11:36 -07:00
data	Merge staging-next into staging	2020-11-01 11:06:35 +01:00
desktops	Merge staging-next into staging	2020-11-01 11:06:35 +01:00
development	fixup! nss: make reproducible (#102156)	2020-11-02 11:55:11 +01:00
games	Merge pull request #101384 from eyJhb/among-sus	2020-10-30 16:45:53 -04:00
misc	Merge staging-next into staging	2020-11-01 10:11:12 +01:00
os-specific	Merge pull request #101886 from flokli/systemd-more-optional	2020-11-01 14:29:45 +01:00
pkgs-lib
servers	Merge staging-next into staging	2020-11-01 10:11:12 +01:00
shells	Merge master into staging-next	2020-11-01 10:10:47 +01:00
stdenv	Merge branch 'master' into staging-next	2020-10-31 14:30:44 +01:00
test	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
tools	groff: set "operating system" for mdoc pages	2020-11-01 10:58:48 +01:00
top-level	Merge pull request #101886 from flokli/systemd-more-optional	2020-11-01 14:29:45 +01:00