mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-23 12:00:35 -04: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 :-/ |
||
---|---|---|
.. | ||
builder.sh | ||
default-builder.sh | ||
default.nix | ||
setup.sh |