Merge pull request #279215 from amesgen/cddl-0.10.3

cddl: 0.8.9 -> 0.10.3

pkgs/development/tools/cddl/Gemfile.lock

@@ -1,23 +1,33 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    abnc (0.1.0)
-    cbor-diag (0.5.6)
-      json
+    abnc (0.1.1)
+    abnftt (0.2.4)
+    base32 (0.3.4)
+    cbor-canonical (0.1.2)
+    cbor-deterministic (0.1.3)
+    cbor-diag (0.8.7)
+      cbor-canonical
+      cbor-deterministic
+      cbor-packed
+      json_pure
       neatjson
       treetop (~> 1)
-    cddl (0.8.9)
+    cbor-packed (0.1.5)
+    cddl (0.10.3)
       abnc
+      abnftt
+      base32 (~> 0.3)
       cbor-diag
       colorize
-      json
+      json_pure
       regexp-examples
-    colorize (0.8.1)
-    json (2.2.0)
-    neatjson (0.9)
+    colorize (1.1.0)
+    json_pure (2.7.1)
+    neatjson (0.10.5)
     polyglot (0.3.5)
-    regexp-examples (1.5.0)
-    treetop (1.6.10)
+    regexp-examples (1.5.1)
+    treetop (1.6.12)
       polyglot (~> 0.3)
 
 PLATFORMS
@@ -27,4 +37,4 @@ DEPENDENCIES
   cddl
 
 BUNDLED WITH
-   2.1.4
+   2.3.25

pkgs/development/tools/cddl/default.nix

@@ -1,18 +1,41 @@
-{ lib, bundlerApp, bundlerUpdateScript }:
+{ lib
+, bundlerApp
+, bundlerUpdateScript
+, makeBinaryWrapper
+}:
 
-bundlerApp {
+bundlerApp rec {
   pname = "cddl";
 
-  gemdir = ./.;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+
+  gemset = lib.recursiveUpdate (import ./gemset.nix) ({
+    "cddl" = {
+      dontBuild = false;
+      # setting env vars is not supported by patchShebangs
+      postPatch = ''
+        sed -i 's\#!/usr/bin/env RUBY_THREAD_VM_STACK_SIZE=5000000\#!/usr/bin/env\' bin/cddl
+      '';
+    };
+  });
+
   exes = [ "cddl" ];
 
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  postBuild = ''
+    wrapProgram $out/bin/cddl \
+      --set RUBY_THREAD_VM_STACK_SIZE 5000000
+  '';
+
   passthru.updateScript = bundlerUpdateScript "cddl";
 
   meta = with lib; {
     description = "A parser, generator, and validator for CDDL";
     homepage    = "https://rubygems.org/gems/cddl";
     license     = with licenses; mit;
-    maintainers = with maintainers; [ fdns nicknovitski ];
+    maintainers = with maintainers; [ fdns nicknovitski amesgen ];
     platforms   = platforms.unix;
   };
 }

pkgs/development/tools/cddl/gemset.nix

@@ -4,62 +4,112 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13nvzrk72nj130fs8bq8q3cfm48939rdzh7l31ncj5c4969hrbig";
+      sha256 = "0yj09gc9w208wsy0d45vzha4zfwxdpsqvkm9vms0chm4lxdwdg9x";
       type = "gem";
     };
-    version = "0.1.0";
+    version = "0.1.1";
+  };
+  abnftt = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1z7ibh0xv9mqk61rvvmz9fnfk6hffvnppqd8fx61vazjhisi9bcs";
+      type = "gem";
+    };
+    version = "0.2.4";
+  };
+  base32 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fjs0l3c5g9qxwp43kcnhc45slx29yjb6m6jxbb2x1krgjmi166b";
+      type = "gem";
+    };
+    version = "0.3.4";
+  };
+  cbor-canonical = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fhj51s5d9b9spw096sb0p92bgilw9hrsay383563dh913j2jn11";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
+  cbor-deterministic = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1w1mg4mn1dhlxlbijxpzja8m8ggrjs0hzkzvnaazw9zm1ji6dpba";
+      type = "gem";
+    };
+    version = "0.1.3";
   };
   cbor-diag = {
-    dependencies = ["json" "neatjson" "treetop"];
+    dependencies = ["cbor-canonical" "cbor-deterministic" "cbor-packed" "json_pure" "neatjson" "treetop"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0pd0k4malg1l7w3ck5glh9w0hrsvknk8rp32vrir74yww1g6yplv";
+      sha256 = "0rwd88xngbjamgydj9rg3wvgl53pfzhal2n702s9afa1yp8mjm51";
       type = "gem";
     };
-    version = "0.5.6";
+    version = "0.8.7";
+  };
+  cbor-packed = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dijyj7rivi39h34f32fx7k4xvngldf569i0372n1z6w01nv761l";
+      type = "gem";
+    };
+    version = "0.1.5";
   };
   cddl = {
-    dependencies = ["abnc" "cbor-diag" "colorize" "json" "regexp-examples"];
+    dependencies = ["abnc" "abnftt" "base32" "cbor-diag" "colorize" "json_pure" "regexp-examples"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "16rmcrsxwx33pj25g1si0dhjdl2brfhy2vlpfwdb6qqkaikmzhpz";
+      sha256 = "1qll1qvn3g75r742kr4da7240zdk2qj4vh325965rrjqp8brz23q";
       type = "gem";
     };
-    version = "0.8.9";
+    version = "0.10.3";
   };
   colorize = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b";
+      sha256 = "0dy8ryhcdzgmbvj7jpa1qq3bhhk1m7a2pz6ip0m6dxh30rzj7d9h";
       type = "gem";
     };
-    version = "0.8.1";
+    version = "1.1.0";
   };
-  json = {
+  json_pure = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
+      sha256 = "09w7f7xlcas9irlaavhz0rnh17cjvjmmqm07drgghx5gwjcrar31";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.7.1";
   };
   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"];
@@ -76,10 +126,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08s5d327i9dw5yjwv9vfss3qb7lwasjyc75wvh7vrdi5v4vm1y2k";
+      sha256 = "0wfkwczjn62qq3z96dxk43m0gh6d5cajx9pxkanvk88d3yqnx29v";
       type = "gem";
     };
-    version = "1.5.0";
+    version = "1.5.1";
   };
   treetop = {
     dependencies = ["polyglot"];
@@ -87,9 +137,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7";
+      sha256 = "0adc8qblz8ii668r3rksjx83p675iryh52rvdvysimx2hkbasj7d";
       type = "gem";
     };
-    version = "1.6.10";
+    version = "1.6.12";
   };
 }