mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-12 15:47:28 +00:00
2e6bf42a22
There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299 |
||
---|---|---|
.. | ||
blocks-gaps.nix | ||
blocks.nix | ||
default.nix | ||
easyfocus.nix | ||
gaps.nix | ||
i3ipc-glib.nix | ||
layout-manager.nix | ||
lock-color.nix | ||
lock-fancy.nix | ||
lock.nix | ||
pystatus.nix | ||
status-rust.nix | ||
status.nix | ||
wk-switch.nix | ||
wmfocus.nix |