Jan Tojnar 8f50f1ce10 Merge branch 'staging-next' into staging ... Resolved the following conflicts: - kernel flags between 09176d28a0ebbd8bae35f92406a48cded78ac9f7 and 2b28822d8dec38fd62ef17643ec71da3bb488619 - clojure-lsp between 3fa00685ce21fb1a4218d444d0862ebcb2b99706 and e03c068af5c9ca950214cd6c3b5cfe67f595da88		2021-02-19 17:15:31 +01:00
..
bsd
darwin	Merge master into staging-next	2021-02-12 00:36:19 +00:00
linux	Merge branch 'staging-next' into staging	2021-02-19 17:15:31 +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