d2eb7a7887
A few conflicts but relatively clear ones (I think). |
||
---|---|---|
.. | ||
builder.sh | ||
check-meta.nix | ||
default-builder.sh | ||
default.nix | ||
make-derivation.nix | ||
setup.sh |
d2eb7a7887
A few conflicts but relatively clear ones (I think). |
||
---|---|---|
.. | ||
builder.sh | ||
check-meta.nix | ||
default-builder.sh | ||
default.nix | ||
make-derivation.nix | ||
setup.sh |