mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-20 21:17:46 +00: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 |
||
---|---|---|
.. | ||
2.0-immodules.cache.patch | ||
2.x.nix | ||
3.0-immodules.cache.patch | ||
3.x.nix | ||
gtk2-theme-paths.patch | ||
setup-hook.sh |