mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
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 |
||
---|---|---|
.. | ||
3.4 | ||
3.5 | ||
3.7 | ||
3.8 | ||
3.9 | ||
4 | ||
5 | ||
6 | ||
aarch64.patch | ||
fix-llvm-config.patch | ||
libcxx-0001-musl-hacks.patch | ||
multi.nix | ||
TLI-musl.patch |