mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-20 03:43:45 +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 |
||
|---|---|---|
| .. | ||
| adementary | ||
| ant-theme | ||
| greybird | ||
| matcha | ||
| materia-theme | ||
| mojave | ||
| nordic | ||
| nordic-polar | ||
| plano | ||
| plata | ||
| qogir | ||
| shades-of-gray | ||
| sierra | ||
| stilo | ||
| zuki | ||