Jan Tojnar e3dfa79441 Merge branch 'staging-next' into staging ... Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.		2021-06-16 19:59:05 +02:00
..
7.4.nix	php: Simplify generic.nix	2021-06-06 08:40:43 +02:00
8.0.nix	php: Simplify generic.nix	2021-06-06 08:40:43 +02:00
fix-paths-php7.patch
generic.nix	Merge branch 'staging-next' into staging	2021-06-16 19:59:05 +02:00
zlib-darwin-tests.patch