about summary refs log tree commit diff
path: root/Makefile
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-03-09T12·36+0100
committerEelco Dolstra <edolstra@gmail.com>2017-03-09T12·36+0100
commit86227390c59cd0f55d0bea77b86338e017c2498a (patch)
tree7628d122bfbc753a93a94dded10271443b46f96d /Makefile
parent6a308c7da4a36146eb019c764b0f6dd2a4f57c3f (diff)
parent5f831c10574ae7ec44d0d357a6a371ac55d00593 (diff)
Merge branch 'allow-import-from-derivation' of https://github.com/shlevy/nix
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions