Merge branch 'nix-channel-c++'

2016-08-31 09:49:24 -04:00 · 2016-08-31 09:49:24 -04:00 · 572aba284a
commit 572aba284a
parent aa1ea0d1e4 59124228b3
8 changed files with 304 additions and 233 deletions
--- a/1
+++ b/1
@ -14,6 +14,7 @@ makefiles = \
  src/nix-prefetch-url/local.mk \
  src/buildenv/local.mk \
  src/resolve-system-dependencies/local.mk \
+  src/nix-channel/local.mk \
  perl/local.mk \
  scripts/local.mk \
  corepkgs/local.mk \