mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-31 04:04:45 +00:00
Code Activity

Add support for submodules in flakes

Browse source 
Fixes https://github.com/LnL7/nix-darwin/issues/549
This commit is contained in:
Nathan Henrie 2022-10-18 12:50:14 -06:00 • committed by Nathan Henrie
parent 6349b99bc2
commit 5452c8c638
1 changed files with 20 additions and 4 deletions

24
pkgs/nix-tools/darwin-rebuild.sh
View file

@ -121,9 +121,16 @@ if [ -z "$action" ]; then showSyntax; fi
flakeFlags=(--extra-experimental-features 'nix-command flakes') flakeFlags=(--extra-experimental-features 'nix-command flakes')
if [ -n "$flake" ]; then if [ -n "$flake" ]; then
if [[ $flake =~ ^(.*)\#([^\#\"]*)$ ]]; then # Offical regex from https://www.rfc-editor.org/rfc/rfc3986#appendix-B
flake="${BASH_REMATCH[1]}" if [[ "${flake}" =~ ^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))? ]]; then
flakeAttr="${BASH_REMATCH[2]}" scheme=${BASH_REMATCH[2]}
authority=${BASH_REMATCH[4]}
path=${BASH_REMATCH[5]}
queryWithQuestion=${BASH_REMATCH[6]}
fragment=${BASH_REMATCH[9]}
flake=${scheme}${authority}${path}${queryWithQuestion}
flakeAttr=${fragment}
fi fi
if [ -z "$flakeAttr" ]; then if [ -z "$flakeAttr" ]; then
flakeAttr=$(hostname -s) flakeAttr=$(hostname -s)
@ -138,7 +145,16 @@ if [ -n "$flake" ]; then
cmd=info cmd=info
fi fi
flake=$(nix "${flakeFlags[@]}" flake "$cmd" --json "${extraMetadataFlags[@]}" "${extraLockFlags[@]}" -- "$flake" | jq -r .url) metadata=$(nix "${flakeFlags[@]}" flake "$cmd" --json "${extraMetadataFlags[@]}" "${extraLockFlags[@]}" -- "$flake")
flake=$(jq -r .url <<<"${metadata}")
if [ "$(jq -r .resolved.submodules <<<"${metadata}")" = "true" ]; then
if [[ "$flake" == *'?'* ]]; then
flake="${flake}&submodules=1"
else
flake="${flake}?submodules=1"
fi
fi
fi fi
if [ "$action" != build ] && [ -z "$flake" ]; then if [ "$action" != build ] && [ -z "$flake" ]; then