Jan Tojnar 7a04c2ad68 Merge branch 'staging-next' into staging ... - boost 171 removed on staging-next - re-generated node-packages.nix ; Conflicts: ; pkgs/development/java-modules/m2install.nix ; pkgs/development/node-packages/node-packages.nix ; pkgs/top-level/all-packages.nix		2021-08-22 01:13:41 +02:00
..
manual	Merge branch 'staging-next' into staging	2021-08-22 01:13:41 +02:00
varlistentry-fixer.rb	nixos/doc/*: fix indentation	2020-11-12 14:24:00 +10:00
xmlformat.conf	doc: Disable wrapping source	2019-09-18 21:17:52 +02:00