Dmitry Kalinkin 889227a048 Merge branch 'master' into staging-next ... Conflicts: pkgs/development/python-modules/pdftotext/default.nix		2021-12-16 16:55:25 -05:00
..
documentation	s6-man-pages: 2.11.0.0.2 -> 2.11.0.0.5	2021-12-16 17:36:44 +01:00
fonts	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-12-09 01:43:58 +00:00
icons	nordzy-cursor-theme: init at 0.1.0	2021-12-11 23:38:40 +01:00
machine-learning/mnist	mnist: deprecate phases	2021-07-17 22:45:19 +02:00
misc	Merge branch 'master' into staging-next	2021-12-16 16:55:25 -05: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 #141992 from fufexan/orchis-theme	2021-12-13 13:52:56 -03:00