From bb17a88bc09e67a2604501940438b2573c24820c Mon Sep 17 00:00:00 2001 From: Rubikoid Date: Sat, 6 Apr 2024 11:52:47 +0300 Subject: [PATCH 1/4] Add offline flag to darwin-rebuild.sh --- pkgs/nix-tools/darwin-rebuild.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/nix-tools/darwin-rebuild.sh b/pkgs/nix-tools/darwin-rebuild.sh index 642226243..94bbdda4b 100644 --- a/pkgs/nix-tools/darwin-rebuild.sh +++ b/pkgs/nix-tools/darwin-rebuild.sh @@ -12,7 +12,7 @@ showSyntax() { echo " [--keep-going] [-k] [--keep-failed] [-K] [--fallback] [--show-trace]" >&2 echo " [-I path] [--option name value] [--arg name value] [--argstr name value]" >&2 echo " [--flake flake] [--update-input input flake] [--impure] [--recreate-lock-file]" >&2 - echo " [--no-update-lock-file] [--refresh] ..." >&2 + echo " [--no-update-lock-file] [--refresh] [--offline] ..." >&2 exit 1 } @@ -116,6 +116,9 @@ while [ $# -gt 0 ]; do fi shift 1 ;; + --offline) + extraBuildFlags+=("$i") + ;; *) echo "$0: unknown option '$i'" exit 1 From 3524643c3dee8304872de281dc1f748fb452210f Mon Sep 17 00:00:00 2001 From: Rubikoid Date: Sat, 6 Apr 2024 19:30:01 +0300 Subject: [PATCH 2/4] Fix --offline Add --substituters flag --- pkgs/nix-tools/darwin-rebuild.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/nix-tools/darwin-rebuild.sh b/pkgs/nix-tools/darwin-rebuild.sh index 94bbdda4b..4e6ca963f 100644 --- a/pkgs/nix-tools/darwin-rebuild.sh +++ b/pkgs/nix-tools/darwin-rebuild.sh @@ -117,8 +117,18 @@ while [ $# -gt 0 ]; do shift 1 ;; --offline) + extraMetadataFlags+=("$i") extraBuildFlags+=("$i") ;; + --substituters) + if [ -z "$1" ]; then + echo "$0: '$i' requires an argument" + exit 1 + fi + j=$1; shift 1 + extraMetadataFlags+=("$i" "$j") + extraBuildFlags+=("$i" "$j") + ;; *) echo "$0: unknown option '$i'" exit 1 From 2a2a311fca4fbaca43b85b2c6f3ca2c9235ebb89 Mon Sep 17 00:00:00 2001 From: Rubikoid Date: Sat, 6 Apr 2024 19:32:48 +0300 Subject: [PATCH 3/4] Fix help --- pkgs/nix-tools/darwin-rebuild.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/nix-tools/darwin-rebuild.sh b/pkgs/nix-tools/darwin-rebuild.sh index 4e6ca963f..4bb113c50 100644 --- a/pkgs/nix-tools/darwin-rebuild.sh +++ b/pkgs/nix-tools/darwin-rebuild.sh @@ -12,7 +12,8 @@ showSyntax() { echo " [--keep-going] [-k] [--keep-failed] [-K] [--fallback] [--show-trace]" >&2 echo " [-I path] [--option name value] [--arg name value] [--argstr name value]" >&2 echo " [--flake flake] [--update-input input flake] [--impure] [--recreate-lock-file]" >&2 - echo " [--no-update-lock-file] [--refresh] [--offline] ..." >&2 + echo " [--no-update-lock-file] [--refresh]" >&2 + echo " [--offline] [--substituters substituters-list] ..." >&2 exit 1 } From 24f7a3fdf4e7079284130f8311e300e499b311f1 Mon Sep 17 00:00:00 2001 From: Rubikoid Date: Sat, 18 May 2024 16:25:53 +0300 Subject: [PATCH 4/4] Move --offline to group of same behaviour flags --- pkgs/nix-tools/darwin-rebuild.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/nix-tools/darwin-rebuild.sh b/pkgs/nix-tools/darwin-rebuild.sh index 4bb113c50..2dec477b8 100644 --- a/pkgs/nix-tools/darwin-rebuild.sh +++ b/pkgs/nix-tools/darwin-rebuild.sh @@ -44,7 +44,7 @@ while [ $# -gt 0 ]; do edit|switch|activate|build|check|changelog) action=$i ;; - --show-trace|--keep-going|--keep-failed|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback) + --show-trace|--keep-going|--keep-failed|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--offline) extraMetadataFlags+=("$i") extraBuildFlags+=("$i") ;; @@ -117,10 +117,6 @@ while [ $# -gt 0 ]; do fi shift 1 ;; - --offline) - extraMetadataFlags+=("$i") - extraBuildFlags+=("$i") - ;; --substituters) if [ -z "$1" ]; then echo "$0: '$i' requires an argument"