Alyssa Ross 926765c5e3 Merge remote-tracking branch 'nixpkgs/staging-next' into staging ... Conflicts: pkgs/servers/http/apache-httpd/2.4.nix		2021-06-11 02:05:00 +00:00
..
documentation	gnome: rename from gnome3	2021-05-08 09:47:42 +02:00
fonts	Merge pull request #125091 from fortuneteller2k/edwin	2021-06-06 01:09:32 +02:00
icons	Merge pull request #124360 from frogamic/124352-quintom-cursor-theme	2021-06-04 11:15:23 +02:00
machine-learning/mnist	pkgs/data, pkgs/games: [sS]tdenv.*lib -> lib	2021-01-17 20:59:16 +07:00
misc	Merge branch 'staging-next' into staging	2021-06-10 14:07:45 +02:00
sgml+xml	treewide: editorconfig fixes	2021-01-21 13:29:54 +10:00
soundfonts/fluid	treewide: with stdenv.lib; in meta -> with lib;	2021-01-11 10:38:22 +01:00
themes	Merge pull request #126377 from fufexan/orchis-theme	2021-06-10 20:23:13 +02:00