Linus Heckemann c762b1eaab Merge pull request #90065 from wizeman/u/fix-config-merge ... linux: make sure all config options have the same value		2021-03-08 21:34:59 +01:00
..
bsd	*-wrapper; Switch from infixSalt to suffixSalt	2020-05-12 00:44:44 -04:00
darwin	Merge master into staging-next	2021-02-12 00:36:19 +00:00
linux	Merge pull request #90065 from wizeman/u/fix-config-merge	2021-03-08 21:34:59 +01:00
solo5	solo5: 0.6.7 -> 0.6.8	2021-02-06 22:07:22 +01:00
windows	pkgs/os-specific/windows: fix evaluation after stdenv.lib -> lib	2021-01-19 21:34:45 -05:00