nixpkgs/pkgs/os-specific
Jan Tojnar 8f50f1ce10
Merge branch 'staging-next' into staging
Resolved the following conflicts:

- kernel flags between 09176d28a0 and 2b28822d8d
- clojure-lsp between 3fa00685ce and e03c068af5
2021-02-19 17:15:31 +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 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