Various review changes for meta in provenance

Author: RossComputerGuy

src/libexpr/include/nix/expr/eval.hh

@@ -228,7 +228,7 @@ struct StaticEvalSymbols
         line, column, functor, toString, right, wrong, structuredAttrs, json, allowedReferences, allowedRequisites,
         disallowedReferences, disallowedRequisites, maxSize, maxClosureSize, builder, args, contentAddressed, impure,
         outputHash, outputHashAlgo, outputHashMode, recurseForDerivations, description, self, epsilon, startSet,
-        operator_, key, path, prefix, outputSpecified;
+        operator_, key, path, prefix, outputSpecified, __meta;
 
     Expr::AstSymbols exprSymbols;
 
@@ -281,6 +281,7 @@ struct StaticEvalSymbols
             .path = alloc.create("path"),
             .prefix = alloc.create("prefix"),
             .outputSpecified = alloc.create("outputSpecified"),
+            .__meta = alloc.create("__meta"),
             .exprSymbols = {
                 .sub = alloc.create("__sub"),
                 .lessThan = alloc.create("__lessThan"),

src/libexpr/include/nix/expr/provenance.hh

@@ -8,12 +8,12 @@ namespace nix {
  * Provenance indicating that this store path was instantiated by the `derivation` builtin function. Its main purpose is
  * to record `meta` fields.
  */
-struct MetaProvenance : Provenance
+struct DerivationProvenance : Provenance
 {
     std::shared_ptr<const Provenance> next;
     ref<nlohmann::json> meta;
 
-    MetaProvenance(std::shared_ptr<const Provenance> next, ref<nlohmann::json> meta)
+    DerivationProvenance(std::shared_ptr<const Provenance> next, ref<nlohmann::json> meta)
         : next(std::move(next))
         , meta(std::move(meta)) {};
 

src/libexpr/primops.cc

@@ -1574,10 +1574,8 @@ static void derivationStrictInternal(EvalState & state, std::string_view drvName
                     experimentalFeatureSettings.require(Xp::ImpureDerivations);
                 }
                 break;
-            case EvalState::s.meta.getId():
-                experimentalFeatureSettings.require(Xp::Provenance);
-
-                {
+            case EvalState::s.__meta.getId():
+                if (experimentalFeatureSettings.isEnabled(Xp::Provenance)) {
                     auto meta = printValueAsJSON(state, true, *i->value, pos, context);
 
                     for (auto it = meta.begin(); it != meta.end();) {
@@ -1589,7 +1587,8 @@ static void derivationStrictInternal(EvalState & state, std::string_view drvName
                         it = meta.erase(it);
                     }
 
-                    provenance = std::make_shared<const MetaProvenance>(provenance, make_ref<nlohmann::json>(meta));
+                    provenance =
+                        std::make_shared<const DerivationProvenance>(provenance, make_ref<nlohmann::json>(meta));
                 }
                 break;
             /* The `args' attribute is special: it supplies the

src/libexpr/provenance.cc

@@ -5,21 +5,21 @@
 
 namespace nix {
 
-nlohmann::json MetaProvenance::to_json() const
+nlohmann::json DerivationProvenance::to_json() const
 {
     return nlohmann::json{
-        {"type", "meta"},
+        {"type", "derivation"},
         {"meta", *meta},
         {"next", next ? next->to_json() : nlohmann::json(nullptr)},
     };
 }
 
-Provenance::Register registerMetaProvenance("meta", [](nlohmann::json json) {
+Provenance::Register registerDerivationProvenance("derivation", [](nlohmann::json json) {
     auto & obj = getObject(json);
     std::shared_ptr<const Provenance> next;
     if (auto p = optionalValueAt(obj, "next"); p && !p->is_null())
         next = Provenance::from_json(*p);
-    return make_ref<MetaProvenance>(next, make_ref<nlohmann::json>(valueAt(obj, "meta")));
+    return make_ref<DerivationProvenance>(next, make_ref<nlohmann::json>(valueAt(obj, "meta")));
 });
 
 } // namespace nix

src/nix/provenance.cc

@@ -5,6 +5,7 @@
 #include "nix/flake/provenance.hh"
 #include "nix/fetchers/provenance.hh"
 #include "nix/util/provenance.hh"
+#include "nix/util/json-utils.hh"
 
 #include <memory>
 #include <nlohmann/json.hpp>
@@ -93,9 +94,60 @@ struct CmdProvenanceShow : StorePathsCommand
             } else if (auto subpath = std::dynamic_pointer_cast<const SubpathProvenance>(provenance)) {
                 logger->cout("← from file " ANSI_BOLD "%s" ANSI_NORMAL, subpath->subpath.abs());
                 provenance = subpath->next;
-            } else if (auto meta = std::dynamic_pointer_cast<const MetaProvenance>(provenance)) {
-                logger->cout("← with metadata");
-                provenance = meta->next;
+            } else if (auto drv = std::dynamic_pointer_cast<const DerivationProvenance>(provenance)) {
+                logger->cout("← with derivation metadata");
+#define TAB "    "
+                auto json = getObject(*(drv->meta));
+                if (auto identifiers = optionalValueAt(json, "identifiers")) {
+                    auto ident = getObject(*identifiers);
+                    if (auto cpeParts = optionalValueAt(ident, "cpeParts")) {
+                        auto parts = getObject(*cpeParts);
+
+                        auto vendor = parts["vendor"];
+                        auto product = parts["product"];
+                        auto version = parts["version"];
+                        auto update = parts["update"];
+
+                        logger->cout(
+                            TAB "" ANSI_BOLD "CPE:" ANSI_NORMAL " cpe:2.3:a:%s:%s:%s:%s:*:*:*:*:*:*",
+                            vendor.is_null() ? "*" : vendor.get<std::string>(),
+                            product.is_null() ? "*" : product.get<std::string>(),
+                            version.is_null() ? "*" : version.get<std::string>(),
+                            update.is_null() ? "*" : update.get<std::string>());
+                    }
+                }
+                if (auto license = optionalValueAt(json, "license")) {
+                    if (license->is_array()) {
+                        logger->cout(TAB "" ANSI_BOLD "Licenses:" ANSI_NORMAL);
+                        auto licenses = getArray(*license);
+                        for (auto it = licenses.begin(); it != licenses.end(); it++) {
+                            auto license = getObject(*it);
+                            auto shortName = license["shortName"];
+                            logger->cout(TAB "" TAB "- %s", shortName.get<std::string>());
+                        }
+                    } else {
+                        auto obj = getObject(*license);
+                        auto shortName = obj["shortName"];
+                        logger->cout(TAB "" ANSI_BOLD "License:" ANSI_NORMAL " %s", shortName.get<std::string>());
+                    }
+                }
+                if (auto licenses = optionalValueAt(json, "licenses")) {
+                    if (licenses->is_array()) {
+                        logger->cout(TAB "" ANSI_BOLD "Licenses:" ANSI_NORMAL);
+                        auto licensesArray = getArray(*licenses);
+                        for (auto it = licensesArray.begin(); it != licensesArray.end(); it++) {
+                            auto license = getObject(*it);
+                            auto shortName = license["shortName"];
+                            logger->cout(TAB "" TAB "- %s", shortName.get<std::string>());
+                        }
+                    } else {
+                        auto license = getObject(*licenses);
+                        auto shortName = license["shortName"];
+                        logger->cout(TAB "" ANSI_BOLD "License:" ANSI_NORMAL " %s", shortName.get<std::string>());
+                    }
+                }
+#undef TAB
+                provenance = drv->next;
             } else {
                 // Unknown or unhandled provenance type
                 auto json = provenance->to_json();

tests/functional/config.nix.in

@@ -28,6 +28,8 @@ rec {
         eval "$buildCommand"
       '')];
       PATH = path;
-    } // caArgs // removeAttrs args (["builder"] ++ optional (builtins.langVersion < 7) "meta"))
-    // optionalAttrs (builtins.langVersion < 7) { meta = args.meta or {}; };
+    } // caArgs // optionalAttrs (builtins.langVersion >= 7) {
+      __meta = args.meta or {};
+    } // removeAttrs args ["builder" "meta"])
+    // { meta = args.meta or {}; };
 }

tests/functional/flakes/provenance.sh

@@ -53,7 +53,7 @@ builder=$(nix eval --raw "$flake1Dir#packages.$system.default._builder")
       },
       "type": "flake"
     },
-    "type": "meta"
+    "type": "derivation"
   },
   "output": "out",
   "system": "$system",
@@ -145,7 +145,7 @@ nix copy --from "file://$binaryCache" "$outPath" --no-check-sigs
         },
         "type": "flake"
       },
-      "type": "meta"
+      "type": "derivation"
     },
     "output": "out",
     "system": "$system",
@@ -161,7 +161,9 @@ EOF
 $outPath
 ← copied from file://$binaryCache
 ← built from derivation $drvPath (output out) on test-host for $system
-← with metadata
+← with derivation metadata
+    Licenses:
+        - lgpl21
 ← instantiated from flake output git+file://$flake1Dir?ref=refs/heads/master&rev=$rev#packages.$system.default
 EOF
 ) ]]
@@ -185,7 +187,7 @@ nix build --impure --print-out-paths --no-link "$flake1Dir#packages.$system.defa
     ]
   },
   "next": null,
-  "type": "meta"
+  "type": "derivation"
 }
 EOF
 )" ]]