mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-11-20 15:42:51 +01:00
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 |
||
|---|---|---|
| .. | ||
| lightdm-greeters | ||
| auto.nix | ||
| default.nix | ||
| gdm.nix | ||
| lightdm.nix | ||
| sddm.nix | ||
| slim.nix | ||
| xpra.nix | ||