3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/development
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
..
androidndk-pkgs
arduino
beam-modules
bower-modules/generic
chez-modules
compilers treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
coq-modules
dhall-modules
dotnet-modules
em-modules/generic
go-modules
go-packages
guile-modules
haskell-modules
idris-modules
interpreters Merge branch 'staging-next' into staging 2021-02-19 17:15:31 +01:00
java-modules
libraries Merge branch 'staging-next' into staging 2021-02-19 17:15:31 +01:00
lisp-modules
lua-modules
misc
mobile treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
node-packages
ocaml-modules treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
perl-modules treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
pharo
php-packages
pure-modules
python-modules Merge branch 'staging-next' into staging 2021-02-19 17:15:31 +01:00
r-modules
ruby-modules
tools Merge branch 'staging-next' into staging 2021-02-19 17:15:31 +01:00
web