7079e744d4
Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix |
||
|---|---|---|
| .. | ||
| advancecomp | ||
| brotli | ||
| bsc | ||
| bsdiff | ||
| bzip2 | ||
| dtrx | ||
| gzip | ||
| gzrt | ||
| kzipmix | ||
| lbzip2 | ||
| lhasa | ||
| lrzip | ||
| lz4 | ||
| lzbench | ||
| lzfse | ||
| lzham | ||
| lzip | ||
| lzop | ||
| mozlz4a | ||
| ncompress | ||
| pbzip2 | ||
| pigz | ||
| pixz | ||
| pxz | ||
| rzip | ||
| upx | ||
| xar | ||
| xdelta | ||
| xz | ||
| zdelta | ||
| zopfli | ||
| zstd | ||
| zstdmt | ||
| zsync | ||