jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8f50f1ce10
nixpkgs/pkgs
History
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
..
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