mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 18:33:00 +00:00
2e6bf42a22
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 |
||
---|---|---|
.. | ||
arc-icon-theme | ||
bibata-cursors | ||
capitaine-cursors | ||
elementary-xfce-icon-theme | ||
faba-icon-theme | ||
faba-mono-icons | ||
hicolor-icon-theme | ||
iconpack-obsidian | ||
maia-icon-theme | ||
moka-icon-theme | ||
numix-cursor-theme | ||
numix-icon-theme | ||
numix-icon-theme-circle | ||
numix-icon-theme-square | ||
paper-icon-theme | ||
papirus-icon-theme | ||
tango-icon-theme | ||
vanilla-dmz | ||
zafiro-icons |