Merge pull request #95 from nikstur/various-improvements

Various improvements

flake.nix

@@ -104,6 +104,10 @@
           packages = [
             pkgs.clippy
             pkgs.rustfmt
+            pkgs.cargo-machete
+            pkgs.cargo-edit
+            pkgs.cargo-bloat
+            pkgs.cargo-deny
           ];
 
           inputsFrom = [ transformer ];

nix/buildtime-dependencies.nix

@@ -41,10 +41,20 @@ let
   optionalGetAttrs = names: attrs:
     lib.genAttrs (builtins.filter (x: lib.hasAttr x attrs) names) (name: attrs.${name});
 
-  # Retrieves only the required fields from a derivation and renames outPath so that
-  # builtins.toJSON actually emits JSON and not only the nix store path
+  # Retrieve only the required fields from a derivation.
+  #
+  # Also renames outPath so that builtins.toJSON actually emits JSON and not
+  # only the nix store path.
   fields = drv:
-    (optionalGetAttrs [ "name" "pname" "version" "meta" ] drv) // { path = drv.outPath; };
+    (optionalGetAttrs [ "name" "pname" "version" "meta" ] drv) // {
+      path = drv.outPath;
+    } // lib.optionalAttrs (drv ? src && drv.src ? url) {
+      src = {
+        inherit (drv.src) url;
+      } // lib.optionalAttrs (drv.src ? outputHash) {
+        hash = drv.src.outputHash;
+      };
+    };
 
 in
 

rust/transformer/Cargo.toml

@@ -1,19 +1,18 @@
 [package]
 name = "bombon-transformer"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
-anyhow = "1.0"
-clap = { version = "4.5", features = ["derive"] }
-cyclonedx-bom = "0.5"
-itertools = "0.12"
-serde = { version = "1.0", features = [ "derive" ] }
-serde_json = "1.0"
-sha2 = "0.10"
-uuid = "1.8"
+anyhow = "1.0.83"
+clap = { version = "4.5.4", default-features = false, features = ["std", "derive"] }
+cyclonedx-bom = "0.5.0"
+itertools = "0.12.1"
+serde = { version = "1.0.201", features = [ "derive" ] }
+serde_json = "1.0.117"
+sha2 = "0.10.8"
+uuid = "1.8.0"
+base64 = "0.21.7"
 
 [lints.rust]
 unsafe_code = "forbid"