Dmitry Kalinkin 262fd63a72 Merge branch 'master' into staging-next ... Conflicts: pkgs/tools/networking/inetutils/default.nix		2021-08-26 00:57:08 -04:00
..
applications	Merge branch 'master' into staging-next	2021-08-26 00:57:08 -04:00
build-support	Merge branch 'master' into staging-next	2021-08-26 00:57:08 -04:00
common-updater
data	Merge master into staging-next	2021-08-26 00:01:37 +00:00
desktops	Merge branch 'staging-next' into staging	2021-08-23 14:19:54 +02:00
development	Merge branch 'master' into staging-next	2021-08-26 00:57:08 -04:00
games	Merge branch 'staging-next' into staging	2021-08-23 14:19:54 +02:00
misc	Merge pull request #135452 from figsoda/editorconfig.nvim	2021-08-26 01:31:13 +02:00
os-specific	Merge branch 'master' into staging-next	2021-08-25 19:42:15 +02:00
pkgs-lib	formats: Fix yaml test	2021-08-26 01:57:43 +02:00
servers	Merge branch 'master' into staging-next	2021-08-26 00:57:08 -04:00
shells	Merge pull request #135654 from r-ryantm/auto-update/nushell	2021-08-25 22:54:20 -05:00
stdenv	stdenv: add isMachO helper function (#133808)	2021-08-21 15:33:03 -04:00
test
tools	Merge branch 'master' into staging-next	2021-08-26 00:57:08 -04:00
top-level	Merge branch 'master' into staging-next	2021-08-26 00:57:08 -04:00