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
..
activation	Merge pull request #115927 from input-output-hk/fix-deleted-sockets-restart	2021-08-20 08:33:42 -06:00
boot	Merge branch 'staging-next' into staging	2021-08-22 01:13:41 +02:00
etc	nixos/etc: use runCommandLocal (#133037)	2021-08-07 14:56:21 -04:00