Vladimír Čunát 09f5763784 Merge branch 'master' into staging-next ... Conflicts: - pkgs/development/python-modules/pathspec/default.nix The hashes are equivalent, so it's not a real conflict. - pkgs/top-level/static.nix I can't see a solution, deffered redoing this to the later PR: https://github.com/NixOS/nixpkgs/pull/136849		2021-09-07 08:43:26 +02:00
..
manual	Merge branch 'master' into staging-next	2021-09-07 08:43:26 +02:00
varlistentry-fixer.rb	nixos/doc/*: fix indentation	2020-11-12 14:24:00 +10:00
xmlformat.conf