nixpkgs/pkgs
Jan Tojnar 01a4d350c7
Merge branch 'master' into staging-next
Reverted https://github.com/NixOS/nixpkgs/pull/115228 for kodi to avoid conflict.

It does not look like unzip would be used but not investigating now to speed up merge conflict resolution.
2021-03-13 19:16:43 +01:00
..
applications Merge branch 'master' into staging-next 2021-03-13 19:16:43 +01:00
build-support Merge master into staging-next 2021-03-12 00:39:51 +00:00
common-updater
data Merge branch 'master' into staging-next 2021-03-13 19:16:43 +01:00
desktops Merge master into staging-next 2021-03-11 18:23:54 +00:00
development Merge branch 'master' into staging-next 2021-03-13 19:16:43 +01:00
games Merge branch 'master' into staging-next 2021-03-12 19:58:39 +01:00
misc Merge master into staging-next 2021-03-12 12:25:52 +00:00
os-specific Merge master into staging-next 2021-03-12 00:39:51 +00:00
pkgs-lib
servers Merge branch 'master' into staging-next 2021-03-13 19:16:43 +01:00
shells Merge pull request #116027 from r-ryantm/auto-update/nushell 2021-03-12 09:31:02 +00:00
stdenv stdenv/darwin: allow brotli reference from curl 2021-03-09 18:24:01 +09:00
test
tools Merge branch 'master' into staging-next 2021-03-13 19:16:43 +01:00
top-level Merge branch 'master' into staging-next 2021-03-13 19:16:43 +01:00