chore: update dependencies and configurations

- Bump `cc` crate version from 1.1.13 to 1.1.14 in Cargo.lock - Update cargoHash in flake.nix - Modify test-nickel target in justfile to include system parameter - Update sandbox_image default value in schema.ncl to use target-specific images - Add architecture-specific sandbox images in vorpal.lock.ncl - Update cargo_hash for vorpal package in vorpal.ncl
ALT-F4-LLC · Aug 23, 2024 · 1b026aa · 1b026aa
1 parent abe9451
commit 1b026aa
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Dockerfile b/Dockerfile
diff --git a/flake.nix b/flake.nix
@@ -58,7 +58,7 @@
           default = buildRustPackage {
             inherit pname version;
             buildInputs = [openssl] ++ optionals isDarwin [CoreServices SystemConfiguration Security];
-            cargoHash = "sha256-QpfL3JQ+Amzr5TXjmceefY4NZtW0p/C6g9twpWYlN3s=";
+            cargoHash = "sha256-fEUE3vACYowEIOtUMeitMateKineQxjevu0qInhw0Ck=";
             nativeBuildInputs = [pkg-config protobuf];
             src = ./.;
           };

diff --git a/justfile b/justfile
@@ -55,8 +55,8 @@ test-cargo:
     cargo test -j $(nproc)
 
 # test nickel
-test-nickel:
-    nickel export "vorpal.ncl"
+test-nickel system="x86_64-linux":
+    nickel export <<< 'let config = import "vorpal.ncl" in config "{{ system }}"'
 
 # test everything
 test: test-cargo test-nickel

diff --git a/nickel/packages/@vorpal/schema.ncl b/nickel/packages/@vorpal/schema.ncl
@@ -5,7 +5,7 @@ let { sandbox } = import "vorpal.lock.ncl" in
     environment | { _ : String } | default = {},
     name | String,
     packages | Array Package | default = [],
-    sandbox_image | String | default = sandbox.image,
+    sandbox_image | String | default = std.record.get "%{target}" sandbox.image,
     script | String,
     source | String | optional,
     source_excludes | Array String | default = [],

diff --git a/vorpal.lock.ncl b/vorpal.lock.ncl
@@ -1,5 +1,8 @@
 {
   sandbox = {
-    image = "ghcr.io/alt-f4-llc/vorpal-sandbox:edge@sha256:8ef5ca1e9057e7508f28f0fc4db1b8555ba7a9cdbc5acccb1c86542e934d2027",
+    image = {
+      aarch64-linux = "ghcr.io/alt-f4-llc/vorpal-sandbox:edge@sha256:6e1894f97ad12090e496ae28989b2ee56dfcaa6cb472efebe611727ad04cab57",
+      x86_64-linux = "ghcr.io/alt-f4-llc/vorpal-sandbox:edge@sha256:ec8be0090a399609ac17b9b3336245832727d21016b5e594fe6a40bab66a1b03",
+    },
   }
 }
diff --git a/vorpal.ncl b/vorpal.ncl
@@ -7,7 +7,7 @@ fun system =>
       default =
         RustPackage
           {
-            cargo_hash = "9c138a7d798a766b33388422c3b12f395f172ba93d4c4b37fcd330433ee5b55a",
+            cargo_hash = "eacfdcf3386a4b9f1a7032d8bed61e0a37df5c860c3e4a7de70ad203779ef447",
             name = "vorpal",
             source = ".",
             systems = ["aarch64-linux", "x86_64-linux"],