mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
1575bc652e
Conflicts (simple): pkgs/os-specific/linux/util-linux/default.nix It seems this merge creates a new stdenv hash, because we had changes on both branches :-/ |
||
---|---|---|
.. | ||
default.nix | ||
rtcwake-search-PATH-for-shutdown.patch |