From ae5dee394c2526b14de41586ba31a2b95ff38c2d Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 27 Nov 2023 10:22:45 +0000 Subject: [PATCH] sane-clone: simplify to not use jq --- pkgs/additional/sane-scripts/default.nix | 2 +- pkgs/additional/sane-scripts/src/sane-clone | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/additional/sane-scripts/default.nix b/pkgs/additional/sane-scripts/default.nix index d99c1429..5684e092 100644 --- a/pkgs/additional/sane-scripts/default.nix +++ b/pkgs/additional/sane-scripts/default.nix @@ -69,7 +69,7 @@ let clone = static-nix-shell.mkBash { pname = "sane-clone"; src = ./src; - pkgs = [ "jq" "nix" ]; + pkgs = [ "nix" ]; }; deadlines = static-nix-shell.mkBash { pname = "sane-deadlines"; diff --git a/pkgs/additional/sane-scripts/src/sane-clone b/pkgs/additional/sane-scripts/src/sane-clone index cd747512..3c8718b2 100755 --- a/pkgs/additional/sane-scripts/src/sane-clone +++ b/pkgs/additional/sane-scripts/src/sane-clone @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p jq -p nix +#!nix-shell -i bash -p nix # use like `eval $(sane-clone tuba)` to clone and cd into a tuba checkout @@ -8,9 +8,9 @@ basedir=/home/colin/ref/repos # fetchFromGitHub: provides src.{gitRepoUrl,owner,repo} # fetchFromGitLab: provides src.gitRepoUrl only -repourl="$(nix eval nixpkgs#$srcattr.gitRepoUrl | jq --raw-output)" -repoowner="$(nix eval nixpkgs#$srcattr.owner | jq --raw-output)" -reponame="$(nix eval nixpkgs#$srcattr.repo | jq --raw-output)" +repourl="$(nix eval --raw nixpkgs#$srcattr.gitRepoUrl)" +repoowner="$(nix eval --raw nixpkgs#$srcattr.owner)" +reponame="$(nix eval --raw nixpkgs#$srcattr.repo)" ownerdir="$basedir/$repoowner" clonedir="$ownerdir/$reponame"