From be30ba8e0eabbc2483122ddf9d5911484df3a578 Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Mon, 21 Mar 2016 23:26:18 -0400 Subject: [PATCH] nix-prefetch-scripts: make nix-prefetch-git report fetchSubmodules in its JSON output Previously, nix-prefetch-git would report the same JSON whether submodules were being fetched or not; with this change, the --fetch-submodules option will cause the JSON output to include "fetchSubmodules": true, so that fetchgit (builtins.fromJSON (builtins.readFile ./path/to/output.json)) will work. --- pkgs/build-support/fetchgit/nix-prefetch-git | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 2c9d61504ed..2af01ee5373 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -327,7 +327,12 @@ print_results() { echo "{" echo " \"url\": \"$url\"," echo " \"rev\": \"$fullRev\"," - echo " \"$hashType\": \"$hash\"" + echo -n " \"$hashType\": \"$hash\"" + if test -n "$fetchSubmodules"; then + echo "," + echo -n " \"fetchSubmodules\": true" + fi + echo "" echo "}" fi }