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 |
||
|---|---|---|
| .. | ||
| 0.7.nix | ||
| 1.0.nix | ||
| 0001.1-use-system-utf8proc.patch | ||
| 1.1.nix | ||
| allow_nix_mtime.patch | ||
| shared.nix | ||