diff options
author | Ryan Trinkle <ryan.trinkle@gmail.com> | 2016-03-21 23:26:18 -0400 |
---|---|---|
committer | Ryan Trinkle <ryan.trinkle@gmail.com> | 2016-03-21 23:26:18 -0400 |
commit | be30ba8e0eabbc2483122ddf9d5911484df3a578 (patch) | |
tree | ed015a27b8ea09dcbeece7b37ed071e90f8c7863 /pkgs/build-support/fetchgit | |
parent | 5bb0aa3bacb39ed910d6b8c7b86672d851662361 (diff) |
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.
Diffstat (limited to 'pkgs/build-support/fetchgit')
-rwxr-xr-x | pkgs/build-support/fetchgit/nix-prefetch-git | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 2c9d61504ed25..2af01ee5373bf 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 } |