Vladimír Čunát 2e6bf42a22 Merge branch 'master' into staging-next ... There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299		2019-08-24 08:55:37 +02:00
..
arc-icon-theme
bibata-cursors	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
capitaine-cursors
elementary-xfce-icon-theme	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
faba-icon-theme
faba-mono-icons	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
hicolor-icon-theme
iconpack-obsidian	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
maia-icon-theme	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
moka-icon-theme	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
numix-cursor-theme
numix-icon-theme	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
numix-icon-theme-circle
numix-icon-theme-square
paper-icon-theme	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
papirus-icon-theme	papirus-icon-theme: 20190615 -> 20190802	2019-08-04 21:30:21 -07:00
tango-icon-theme
vanilla-dmz	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
zafiro-icons