mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 06:31:02 +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 |
||
---|---|---|
.. | ||
advancecomp | ||
brotli | ||
bsc | ||
bsdiff | ||
bzip2 | ||
dejsonlz4 | ||
dtrx | ||
gzip | ||
gzrt | ||
kzipmix | ||
lbzip2 | ||
lhasa | ||
lrzip | ||
lz4 | ||
lzbench | ||
lzfse | ||
lzham | ||
lzip | ||
lzop | ||
mozlz4a | ||
ncompress | ||
pbzip2 | ||
pbzx | ||
pigz | ||
pixz | ||
pxz | ||
rzip | ||
upx | ||
xar | ||
xdelta | ||
xz | ||
zdelta | ||
zopfli | ||
zstd | ||
zsync |