From c95ae2e11c937484490158722f5a05547e5c4940 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Wed, 28 Jun 2023 15:27:59 -0500 Subject: [PATCH] fix: typo that caused block types to fail --- src/local/flake.lock | 6 +++--- ...ProceesSnippet.nix => _askUserToProceedSnippet.nix} | 2 +- src/tests/flake.lock | 6 +++--- tests/_snapshots/bt-blocktypes | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) rename src/std/fwlib/blockTypes/{_askUserToProceesSnippet.nix => _askUserToProceedSnippet.nix} (95%) diff --git a/src/local/flake.lock b/src/local/flake.lock index 73b18a7a..b6d21b15 100644 --- a/src/local/flake.lock +++ b/src/local/flake.lock @@ -521,12 +521,12 @@ }, "locked": { "lastModified": 0, - "narHash": "sha256-+8DdGr779JftL12hFY6XmQUhnzFMNxJdKcEXODC24v8=", - "path": "/nix/store/c73zayz22k5344i3hbl0a1mgh2k1ch1q-source", + "narHash": "sha256-UQ8eXnX2X2bFTWLIEwxxW+vkfjalaprFIZxLmQ/YhcM=", + "path": "/nix/store/j0vvh0hqggr12lchhg3jhhx586f6mcq7-source", "type": "path" }, "original": { - "path": "/nix/store/c73zayz22k5344i3hbl0a1mgh2k1ch1q-source", + "path": "/nix/store/j0vvh0hqggr12lchhg3jhhx586f6mcq7-source", "type": "path" } }, diff --git a/src/std/fwlib/blockTypes/_askUserToProceesSnippet.nix b/src/std/fwlib/blockTypes/_askUserToProceedSnippet.nix similarity index 95% rename from src/std/fwlib/blockTypes/_askUserToProceesSnippet.nix rename to src/std/fwlib/blockTypes/_askUserToProceedSnippet.nix index 94aa49ee..2e8b835a 100644 --- a/src/std/fwlib/blockTypes/_askUserToProceesSnippet.nix +++ b/src/std/fwlib/blockTypes/_askUserToProceedSnippet.nix @@ -4,7 +4,7 @@ _: action: func: '' read -rp "Proceed with ${action}? (y/N)" answer case "$answer" in [Yy]) - ${fun} + ${func} ;; *) echo "Not proceeding with ${action}." diff --git a/src/tests/flake.lock b/src/tests/flake.lock index dd52599f..ba16e04c 100644 --- a/src/tests/flake.lock +++ b/src/tests/flake.lock @@ -516,12 +516,12 @@ }, "locked": { "lastModified": 0, - "narHash": "sha256-9L7p5FVY0h+8kONIJay21qFScOBOnJ2TfFB/c1rGaWk=", - "path": "/nix/store/3kvilbzzjpnp74pdvkiypnq5klg7dg0i-source", + "narHash": "sha256-7B6B5vg4Dt+LMffU4kx7r2qN11Zb5ckLwEo2Nlvt3ng=", + "path": "/nix/store/3nbfb5669g2fmfli6iz0ahgrz0fnk3bp-source", "type": "path" }, "original": { - "path": "/nix/store/3kvilbzzjpnp74pdvkiypnq5klg7dg0i-source", + "path": "/nix/store/3nbfb5669g2fmfli6iz0ahgrz0fnk3bp-source", "type": "path" } }, diff --git a/tests/_snapshots/bt-blocktypes b/tests/_snapshots/bt-blocktypes index 41c16263..370d7dd2 100644 --- a/tests/_snapshots/bt-blocktypes +++ b/tests/_snapshots/bt-blocktypes @@ -46,7 +46,7 @@ command = ; description = "build it"; name = "build"; - proviso = /nix/store/7l4gnmcb7b5v10san4r0sbidsidbs87c-incl/std/fwlib/actions/build-proviso.sh; + proviso = /nix/store/gxak6rzyi0qrk609bnrxjqmn7ain9h8f-incl/std/fwlib/actions/build-proviso.sh; targetDrv = "drvPath"; } { @@ -61,7 +61,7 @@ image = "repo:tag"; }; name = "publish"; - proviso = /nix/store/7l4gnmcb7b5v10san4r0sbidsidbs87c-incl/std/fwlib/blockTypes/containers-proviso.sh; + proviso = /nix/store/gxak6rzyi0qrk609bnrxjqmn7ain9h8f-incl/std/fwlib/blockTypes/containers-proviso.sh; } { command = ; @@ -94,7 +94,7 @@ command = ; description = "build it"; name = "build"; - proviso = /nix/store/7l4gnmcb7b5v10san4r0sbidsidbs87c-incl/std/fwlib/actions/build-proviso.sh; + proviso = /nix/store/gxak6rzyi0qrk609bnrxjqmn7ain9h8f-incl/std/fwlib/actions/build-proviso.sh; targetDrv = "drvPath"; } { @@ -127,7 +127,7 @@ command = ; description = "build it"; name = "build"; - proviso = /nix/store/7l4gnmcb7b5v10san4r0sbidsidbs87c-incl/std/fwlib/actions/build-proviso.sh; + proviso = /nix/store/gxak6rzyi0qrk609bnrxjqmn7ain9h8f-incl/std/fwlib/actions/build-proviso.sh; targetDrv = "drvPath"; } { @@ -280,7 +280,7 @@ command = ; description = "build it"; name = "build"; - proviso = /nix/store/7l4gnmcb7b5v10san4r0sbidsidbs87c-incl/std/fwlib/actions/build-proviso.sh; + proviso = /nix/store/gxak6rzyi0qrk609bnrxjqmn7ain9h8f-incl/std/fwlib/actions/build-proviso.sh; targetDrv = "drvPath"; } {