chore: update local flakes

divnix · Nov 11, 2024 · e799c3f · e799c3f
1 parent d2b2f53
commit e799c3f
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 24 deletions.
diff --git a/src/local/flake.lock b/src/local/flake.lock
diff --git a/src/std/fwlib/actions/build-proviso.sh b/src/std/fwlib/actions/build-proviso.sh
@@ -1,11 +1,11 @@
 declare action="$1"
 declare targetDrv
 
-eval "$(jq -r '@sh "targetDrv=\(.targetDrv)"' <<< "$action" )"
+eval "$(jq -r '@sh "targetDrv=\(.targetDrv)"' <<<"$action")"
 
 mapfile -t uncached < <(
-  command nix-store --realise --dry-run "$targetDrv" 2>&1 1>/dev/null \
-  | command sed -nr '
+  command nix-store --realise --dry-run "$targetDrv" 2>&1 1>/dev/null |
+    command sed -nE '
     # If the line "will be built" is matched ...
     /will be built/ {
         # Create a label to iterate over dervivations
@@ -28,18 +28,17 @@ mapfile -t uncached < <(
   '
 )
 
-if [[ ${#uncached[@]} -eq 0 ]];
-then
+if [[ ${#uncached[@]} -eq 0 ]]; then
   exit 1
 fi
 
 if ! (
-  command nix show-derivation ''${uncached[@]} 2> /dev/null \
-  | command jq --exit-status \
-  ' with_entries(
+  command nix show-derivation ''${uncached[@]} 2>/dev/null |
+    command jq --exit-status \
+      ' with_entries(
       select(.value|.env.preferLocalBuild != "1")
     ) | any
-  ' 1> /dev/null
+  ' 1>/dev/null
 ); then
   exit 1
 fi

diff --git a/src/std/fwlib/blockTypes/nvfetcher.nix b/src/std/fwlib/blockTypes/nvfetcher.nix
@@ -40,7 +40,7 @@ in
            --changelog "$tmpfile" \
            --filter "^$targetname$"
 
-        sed -i -e "s|^|- \`$(date --iso-8601=m)\` |" "$tmpfile"
+        sed -i '''' -e "s|^|- \`$(date --iso-8601=m)\` |" "$tmpfile"
         cat "$tmpfile" >> "$updates"
       '' {})
     ];

diff --git a/src/tests/flake.lock b/src/tests/flake.lock
diff --git a/src/tests/flake.nix b/src/tests/flake.nix
@@ -13,7 +13,7 @@
     terranix.inputs.terranix-examples.follows = "";
     terranix.inputs.bats-support.follows = "";
     terranix.inputs.bats-assert.follows = "";
-    namaka.url = "github:nix-community/namaka/v0.2.0";
+    namaka.url = "github:nix-community/namaka/ecefdd6d1e0e075403a69202c2695f966ea2f412";
     namaka.inputs.haumea.follows = "std/haumea";
     namaka.inputs.nixpkgs.follows = "std/nixpkgs";
     makes.url = "github:fluidattacks/makes";

diff --git a/tests/_snapshots/check-augmented-cell-inputs b/tests/_snapshots/check-augmented-cell-inputs
@@ -12,7 +12,7 @@
   makes = "/nix/store/71rzg7vs53gmxqph64d9zqf4ns928c6c-source";
   microvm = "/nix/store/v5za7dzczgcvfvqgcm80qari3msyhw6b-source";
   n2c = "/nix/store/rgd4s5ylv38p94wi6vays6wc1a0l5iyf-source";
-  namaka = "/nix/store/xgzvi3baaaz9lpymfv6f1fgxfmy0ygvv-source";
+  namaka = "/nix/store/prb836vl3r64l97045clfli0d5m5fyap-source";
   nixago = "/nix/store/cys15p6lyyhj85bk4bckn82waih2l945-source";
   nixpkgs = "/nix/store/g8zzlf6drg73c987ii390yicq4c0j778-source";
   paisano = "/nix/store/4v8nn2z2vl74yz1557n1dha3l7rzzbgs-source";