From 1ebda9e13e0a11d3040267134e0a23600f9faf65 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Fri, 6 Jan 2023 18:56:38 +0300
Subject: fix(tvix/derivation): fix build after StorePath rename

This project was not previously covered by CI (fixed in this commit),
so we didn't catch breakage due to a renamed module.

This was noticed while rebasing a CL that has a dependency on this
crate in its Nix build.

Change-Id: Ic48570b9313e5f73e14daab50cf7ea70918c94d1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7778
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
---
 tvix/Cargo.nix | 116 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 58 insertions(+), 58 deletions(-)

(limited to 'tvix/Cargo.nix')

diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index 963b5dfae5b4..977def1c7d2b 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -33,30 +33,30 @@ rec {
   # You can override the features with
   # workspaceMembers."${crateName}".build.override { features = [ "default" "feature1" ... ]; }.
   workspaceMembers = {
-    "derivation" = rec {
-      packageId = "derivation";
+    "nix-cli" = rec {
+      packageId = "nix-cli";
       build = internal.buildRustCrateWithFeatures {
-        packageId = "derivation";
+        packageId = "nix-cli";
       };
 
       # Debug support which might change between releases.
       # File a bug if you depend on any for non-debug work!
       debug = internal.debugCrate { inherit packageId; };
     };
-    "nix-cli" = rec {
-      packageId = "nix-cli";
+    "tvix-cli" = rec {
+      packageId = "tvix-cli";
       build = internal.buildRustCrateWithFeatures {
-        packageId = "nix-cli";
+        packageId = "tvix-cli";
       };
 
       # Debug support which might change between releases.
       # File a bug if you depend on any for non-debug work!
       debug = internal.debugCrate { inherit packageId; };
     };
-    "tvix-cli" = rec {
-      packageId = "tvix-cli";
+    "tvix-derivation" = rec {
+      packageId = "tvix-derivation";
       build = internal.buildRustCrateWithFeatures {
-        packageId = "tvix-cli";
+        packageId = "tvix-derivation";
       };
 
       # Debug support which might change between releases.
@@ -1489,55 +1489,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "alloc" "default" "std" ];
       };
-      "derivation" = rec {
-        crateName = "derivation";
-        version = "0.1.0";
-        edition = "2021";
-        # We can't filter paths with references in Nix 2.4
-        # See https://github.com/NixOS/nix/issues/5410
-        src =
-          if (lib.versionOlder builtins.nixVersion "2.4pre20211007")
-          then lib.cleanSourceWith { filter = sourceFilter; src = ./derivation; }
-          else ./derivation;
-        dependencies = [
-          {
-            name = "anyhow";
-            packageId = "anyhow";
-          }
-          {
-            name = "glob";
-            packageId = "glob";
-          }
-          {
-            name = "serde";
-            packageId = "serde";
-            features = [ "derive" ];
-          }
-          {
-            name = "sha2";
-            packageId = "sha2";
-          }
-          {
-            name = "tvix-store";
-            packageId = "tvix-store";
-          }
-        ];
-        devDependencies = [
-          {
-            name = "serde_json";
-            packageId = "serde_json";
-          }
-          {
-            name = "test-case";
-            packageId = "test-case";
-          }
-          {
-            name = "test-generator";
-            packageId = "test-generator";
-          }
-        ];
-
-      };
       "diff" = rec {
         crateName = "diff";
         version = "0.1.13";
@@ -6537,6 +6488,55 @@ rec {
           }
         ];
 
+      };
+      "tvix-derivation" = rec {
+        crateName = "tvix-derivation";
+        version = "0.1.0";
+        edition = "2021";
+        # We can't filter paths with references in Nix 2.4
+        # See https://github.com/NixOS/nix/issues/5410
+        src =
+          if (lib.versionOlder builtins.nixVersion "2.4pre20211007")
+          then lib.cleanSourceWith { filter = sourceFilter; src = ./derivation; }
+          else ./derivation;
+        dependencies = [
+          {
+            name = "anyhow";
+            packageId = "anyhow";
+          }
+          {
+            name = "glob";
+            packageId = "glob";
+          }
+          {
+            name = "serde";
+            packageId = "serde";
+            features = [ "derive" ];
+          }
+          {
+            name = "sha2";
+            packageId = "sha2";
+          }
+          {
+            name = "tvix-store-bin";
+            packageId = "tvix-store-bin";
+          }
+        ];
+        devDependencies = [
+          {
+            name = "serde_json";
+            packageId = "serde_json";
+          }
+          {
+            name = "test-case";
+            packageId = "test-case";
+          }
+          {
+            name = "test-generator";
+            packageId = "test-generator";
+          }
+        ];
+
       };
       "tvix-eval" = rec {
         crateName = "tvix-eval";
-- 
cgit 1.4.1