mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-11 15:27:20 +03: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 |
||
---|---|---|
.. | ||
bootstrap-files | ||
bootstrap-tools | ||
bootstrap-tools-musl | ||
default.nix | ||
make-bootstrap-tools-cross.nix | ||
make-bootstrap-tools.nix |