From 2d24c5f260945216ca01371d4120f5d53f08b2cd Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 31 Jan 2023 14:45:42 +0100
Subject: refactor(tvix/nix-compat): absorb //tvix/derivation

Put this in its src/derivation.

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

(limited to 'tvix/Cargo.nix')

diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index aa9fa9dbf84b..70c022ddcedd 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -63,16 +63,6 @@ rec {
       # File a bug if you depend on any for non-debug work!
       debug = internal.debugCrate { inherit packageId; };
     };
-    "tvix-derivation" = rec {
-      packageId = "tvix-derivation";
-      build = internal.buildRustCrateWithFeatures {
-        packageId = "tvix-derivation";
-      };
-
-      # 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-eval" = rec {
       packageId = "tvix-eval";
       build = internal.buildRustCrateWithFeatures {
@@ -3758,6 +3748,11 @@ rec {
             name = "glob";
             packageId = "glob";
           }
+          {
+            name = "serde";
+            packageId = "serde";
+            features = [ "derive" ];
+          }
           {
             name = "sha2";
             packageId = "sha2 0.10.6";
@@ -3768,10 +3763,18 @@ rec {
           }
         ];
         devDependencies = [
+          {
+            name = "serde_json";
+            packageId = "serde_json";
+          }
           {
             name = "test-case";
             packageId = "test-case";
           }
+          {
+            name = "test-generator";
+            packageId = "test-generator";
+          }
         ];
 
       };
@@ -7771,6 +7774,10 @@ rec {
             name = "dirs";
             packageId = "dirs";
           }
+          {
+            name = "nix-compat";
+            packageId = "nix-compat";
+          }
           {
             name = "rustyline";
             packageId = "rustyline";
@@ -7787,73 +7794,12 @@ rec {
             name = "thiserror";
             packageId = "thiserror";
           }
-          {
-            name = "tvix-derivation";
-            packageId = "tvix-derivation";
-          }
           {
             name = "tvix-eval";
             packageId = "tvix-eval";
           }
         ];
 
-      };
-      "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 = "data-encoding";
-            packageId = "data-encoding";
-          }
-          {
-            name = "glob";
-            packageId = "glob";
-          }
-          {
-            name = "nix-compat";
-            packageId = "nix-compat";
-          }
-          {
-            name = "serde";
-            packageId = "serde";
-            features = [ "derive" ];
-          }
-          {
-            name = "sha2";
-            packageId = "sha2 0.10.6";
-          }
-          {
-            name = "thiserror";
-            packageId = "thiserror";
-          }
-        ];
-        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