Simplify rust packages schema

codedownio · Sep 18, 2024 · 5b76e36 · 5b76e36
1 parent 4d1c85c
commit 5b76e36
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 15 deletions.
diff --git a/modules/base/convert-type.nix b/modules/base/convert-type.nix
@@ -23,7 +23,10 @@ let
     }
     else if (type.name == "submodule") then {
       tag = "submodule";
-      foo = "BAR";
+      keys = lib.mapAttrsRecursiveCond
+        (x: !(x ? _type))
+        (path: value: convertType target value.type)
+        (lib.removeAttrs (type.getSubOptions {}) ["_module"]);
     }
     else builtins.throw "Can't convert type for '${target}': ${toString type.name}"
   ;

diff --git a/modules/languages/rust/evcxr/python/build_init_evcxr.py b/modules/languages/rust/evcxr/python/build_init_evcxr.py
@@ -31,11 +31,11 @@
 with open(out, "a") as f:
   for package in packages:
     package_name = package if isinstance(package, str) else package["name"]
-    settings = {} if isinstance(package, str) else package.get("settings", {})
+    features = {} if isinstance(package, str) else package.get("features", {})
     if package_name in name_to_dir:
       clauses = [f"""version = \"{name_to_version.get(package_name, "*")}\""""]
-      if "features" in settings:
-        clauses.append(f"""features = {json.dumps(settings["features"])}""")
+      if features:
+        clauses.append(f"""features = {json.dumps(features)}""")
 
       clauses_joined = ", ".join(clauses)
 

diff --git a/modules/languages/rust/evcxr/withPackages.nix b/modules/languages/rust/evcxr/withPackages.nix
@@ -30,8 +30,8 @@ let
 
   renderPackage = pn:
     if builtins.isString pn then ''${pn} = "*"''
-    else if builtins.isAttrs pn && lib.hasAttrByPath ["settings" "features"] pn
-      then ''${pn.name} = { version = "*", features = [${lib.concatStringsSep ", " (map (feat: ''"'' + feat + ''"'') pn.settings.features)}] }''
+    else if builtins.isAttrs pn && lib.hasAttrByPath ["features"] pn
+      then ''${pn.name} = { version = "*", features = [${lib.concatStringsSep ", " (map (feat: ''"'' + feat + ''"'') pn.features)}] }''
       else ''${pn.name} = { version = "*" }'';
 
   cargoToml = packages: writeTextFile {

diff --git a/modules/languages/rust/module.nix b/modules/languages/rust/module.nix
@@ -17,7 +17,7 @@ with lib;
               type = types.str;
               description = "Package name";
             };
-            settings.features = mkOption rec {
+            features = mkOption rec {
               type = types.listOf types.str;
               description = "Features to enable for the package";
             };

diff --git a/sample_environments/rust.nix b/sample_environments/rust.nix
@@ -9,9 +9,7 @@ codedown.makeEnvironment {
     "rand"
     {
       name = "serde";
-      settings = {
-        features = ["derive"];
-      };
+      features = ["derive"];
     }
     "serde_json"
   ];

diff --git a/tests/app/Spec/Tests/Rust.hs b/tests/app/Spec/Tests/Rust.hs
@@ -17,6 +17,7 @@ import TestLib.NixEnvironmentContext
 import TestLib.NixTypes
 import TestLib.TestSearchers
 import TestLib.Types
+import TestLib.Util
 
 
 tests :: LanguageSpec
@@ -68,7 +69,7 @@ kernelSpec = NixKernelSpec {
   , nixKernelPackages = [
       nameOnly "rand"
 
-      , NameAndSettings "serde" (Just (A.object [("features", A.Array (V.fromList ["derive"]))]))
+      , NameAndSettings "serde" (Just (aesonFromList [("features", A.Array (V.fromList ["derive"]))]))
       , nameOnly "serde_json"
       , nameOnly "serde_derive"
       ]

diff --git a/tests/src/TestLib/NixRendering.hs b/tests/src/TestLib/NixRendering.hs
@@ -14,9 +14,9 @@ import qualified Data.Vector as V
 import TestLib.NixTypes
 
 #if MIN_VERSION_aeson(2,0,0)
-import qualified Data.Aeson.KeyMap          as HM
+import qualified Data.Aeson.KeyMap as HM
 #else
-import qualified Data.HashMap.Strict        as HM
+import qualified Data.HashMap.Strict as HM
 #endif
 
 
@@ -87,7 +87,7 @@ renderKernel (NixKernelSpec {..}) =
       xs -> [i|kernels.#{nixKernelName}.packages = [#{T.unwords $ fmap renderKernelPackage xs}];|]
 
     renderKernelPackage (NameAndSettings name Nothing) = quote name
-    renderKernelPackage (NameAndSettings name (Just settings)) = aesonToNix (A.object [("name", A.String name), ("settings", settings)])
+    renderKernelPackage (NameAndSettings name (Just settings)) = aesonToNix (A.object (("name", A.String name) : HM.toList settings))
       & parenQuote
 
     parenQuote x = "(" <> x <> ")"

diff --git a/tests/src/TestLib/NixTypes.hs b/tests/src/TestLib/NixTypes.hs
@@ -31,7 +31,7 @@ deriveJSON toSnakeBoth2 ''NixSrcSpec
 
 data NameAndSettings = NameAndSettings {
   nameAndSettingsName :: Text
-  , nameAndSettingsSettings :: Maybe Value
+  , nameAndSettingsSettings :: Maybe A.Object
   } deriving (Show, Eq, Ord)
 deriveJSON toSnake3 ''NameAndSettings
 

diff --git a/tests/src/TestLib/Util.hs b/tests/src/TestLib/Util.hs
@@ -44,3 +44,11 @@ aesonFromList xs = HM.fromList [(A.fromText k, v) | (k, v) <- xs]
 aesonFromList :: (Eq k, Hashable k) => [(Text, Value)] -> HM.HashMap A.Key v
 aesonFromList = HM.fromList
 #endif
+
+#if MIN_VERSION_aeson(2,0,0)
+aesonToList :: HM.KeyMap Value -> [(Text, Value)]
+aesonToList m = [(A.toText k, v) | (k, v) <- HM.toList m]
+#else
+aesonToList :: (Eq k, Hashable k) => HM.HashMap A.Key v -> [(Text, Value)]
+aesonToList = HM.toList
+#endif