Merge pull request #228407 from amesgen/update-cbor-diag

pkgs/development/tools/cbor-diag/Gemfile.lock

@@ -1,14 +1,20 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    cbor-diag (0.5.6)
+    cbor-canonical (0.1.2)
-      json
+    cbor-deterministic (0.1.3)
+    cbor-diag (0.8.4)
+      cbor-canonical
+      cbor-deterministic
+      cbor-packed
+      json_pure
       neatjson
       treetop (~> 1)
-    json (2.2.0)
+    cbor-packed (0.1.5)
-    neatjson (0.9)
+    json_pure (2.6.3)
+    neatjson (0.10.5)
     polyglot (0.3.5)
-    treetop (1.6.10)
+    treetop (1.6.12)
       polyglot (~> 0.3)
 
 PLATFORMS
@@ -18,4 +24,4 @@ DEPENDENCIES
   cbor-diag
 
 BUNDLED WITH
-   2.1.4
+   2.4.10

pkgs/development/tools/cbor-diag/default.nix

@@ -10,6 +10,10 @@ bundlerApp {
     "cbor2json.rb"
     "cbor2pretty.rb"
     "cbor2yaml.rb"
+    "cborseq2diag.rb"
+    "cborseq2json.rb"
+    "cborseq2neatjson.rb"
+    "cborseq2yaml.rb"
     "diag2cbor.rb"
     "diag2pretty.rb"
     "json2cbor.rb"

pkgs/development/tools/cbor-diag/gemset.nix

@@ -1,34 +1,64 @@
 {
-  cbor-diag = {
+  cbor-canonical = {
-    dependencies = ["json" "neatjson" "treetop"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0pd0k4malg1l7w3ck5glh9w0hrsvknk8rp32vrir74yww1g6yplv";
+      sha256 = "1fhj51s5d9b9spw096sb0p92bgilw9hrsay383563dh913j2jn11";
       type = "gem";
     };
-    version = "0.5.6";
+    version = "0.1.2";
   };
-  json = {
+  cbor-deterministic = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
+      sha256 = "1w1mg4mn1dhlxlbijxpzja8m8ggrjs0hzkzvnaazw9zm1ji6dpba";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "0.1.3";
+  };
+  cbor-diag = {
+    dependencies = ["cbor-canonical" "cbor-deterministic" "cbor-packed" "json_pure" "neatjson" "treetop"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0k57gminnhz5fmnclrixdp1f2mg8d6zjnbbf67glaqpxf08a99j6";
+      type = "gem";
+    };
+    version = "0.8.4";
+  };
+  cbor-packed = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dijyj7rivi39h34f32fx7k4xvngldf569i0372n1z6w01nv761l";
+      type = "gem";
+    };
+    version = "0.1.5";
+  };
+  json_pure = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kn736pb52j8b9xxq6l8wqp2chs74aa14vfnp0rijjn086m8b4f3";
+      type = "gem";
+    };
+    version = "2.6.3";
   };
   neatjson = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fa2v7b6433j0iqh5iq9r71v7a5xabgjvqwsbl21vcsac7vf3ncw";
+      sha256 = "0wm1lq8yl6rzysh3wg6fa55w5534k6ppiz0qb7jyvdy582mk5i0s";
       type = "gem";
     };
-    version = "0.9";
+    version = "0.10.5";
   };
   polyglot = {
     groups = ["default"];
@@ -46,9 +76,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7";
+      sha256 = "0adc8qblz8ii668r3rksjx83p675iryh52rvdvysimx2hkbasj7d";
       type = "gem";
     };
-    version = "1.6.10";
+    version = "1.6.12";
   };
 }