nixpkgs/pkgs
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
..
applications Merge branch 'staging-next' into staging 2021-02-19 17:15:31 +01:00
build-support Merge branch 'staging-next' into staging 2021-02-19 17:15:31 +01:00
common-updater treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
data Merge branch 'staging-next' into staging 2021-02-19 17:15:31 +01:00
desktops Merge branch 'staging-next' into staging 2021-02-19 17:15:31 +01:00
development Merge branch 'staging-next' into staging 2021-02-19 17:15:31 +01:00
games treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
misc treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
os-specific Merge branch 'staging-next' into staging 2021-02-19 17:15:31 +01:00
pkgs-lib
servers Merge branch 'staging-next' into staging 2021-02-19 17:15:31 +01:00
shells Merge staging-next into staging 2021-02-19 10:47:46 +10:00
stdenv
test
tools Merge branch 'staging-next' into staging 2021-02-19 17:15:31 +01:00
top-level Merge branch 'staging-next' into staging 2021-02-19 17:15:31 +01:00