From 49dace385791938bb84bcdb9870a54ee03a1643f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 22 Apr 2022 11:18:05 +0200 Subject: [PATCH] =?UTF-8?q?ronn:=200.7.3=20=E2=86=92=200.9.1=20(#169617)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The original ronn has long been unmaintained. Let’s switch to the same fork Alpine and Debian use, since there are projects expecting ronn to support command-line arguments introduced by this fork. Fixes: https://github.com/NixOS/nixpkgs/issues/168103 --- pkgs/development/tools/ronn/Gemfile | 2 +- pkgs/development/tools/ronn/Gemfile.lock | 24 +++++---- pkgs/development/tools/ronn/default.nix | 12 +++-- pkgs/development/tools/ronn/gemset.nix | 63 +++++++++++++++++++----- 4 files changed, 77 insertions(+), 24 deletions(-) diff --git a/pkgs/development/tools/ronn/Gemfile b/pkgs/development/tools/ronn/Gemfile index 64f1df743ab..0643ca6ddfd 100644 --- a/pkgs/development/tools/ronn/Gemfile +++ b/pkgs/development/tools/ronn/Gemfile @@ -1,3 +1,3 @@ source "https://rubygems.org" -gem "ronn" +gem "ronn-ng" diff --git a/pkgs/development/tools/ronn/Gemfile.lock b/pkgs/development/tools/ronn/Gemfile.lock index ff71ebd7a01..a7f76ffd787 100644 --- a/pkgs/development/tools/ronn/Gemfile.lock +++ b/pkgs/development/tools/ronn/Gemfile.lock @@ -1,19 +1,25 @@ GEM remote: https://rubygems.org/ specs: - hpricot (0.8.6) - mustache (1.0.3) - rdiscount (2.2.0.1) - ronn (0.7.3) - hpricot (>= 0.8.2) - mustache (>= 0.7.0) - rdiscount (>= 1.5.8) + kramdown (2.3.2) + rexml + mini_portile2 (2.8.0) + mustache (0.99.8) + nokogiri (1.13.4) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) + racc (1.6.0) + rexml (3.2.5) + ronn-ng (0.9.1) + kramdown (~> 2.1) + mustache (~> 0.7, >= 0.7.0) + nokogiri (~> 1.9, >= 1.9.0) PLATFORMS ruby DEPENDENCIES - ronn + ronn-ng BUNDLED WITH - 2.1.4 + 2.3.9 diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix index 4d06db77a69..c3f0d263184 100644 --- a/pkgs/development/tools/ronn/default.nix +++ b/pkgs/development/tools/ronn/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "ronn"; - version = env.gems.ronn.version; + version = env.gems.ronn-ng.version; env = bundlerEnv { name = "ronn-gems"; @@ -11,12 +11,18 @@ stdenv.mkDerivation rec { dontUnpack = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin makeWrapper ${env}/bin/ronn $out/bin/ronn \ --set PATH ${groff}/bin + + runHook postInstall ''; passthru.updateScript = bundlerUpdateScript "ronn"; @@ -25,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "markdown-based tool for building manpages"; - homepage = "https://rtomayko.github.io/ronn/"; + homepage = "https://github.com/apjanke/ronn-ng"; license = licenses.mit; maintainers = with maintainers; [ zimbatm nicknovitski ]; platforms = env.ruby.meta.platforms; diff --git a/pkgs/development/tools/ronn/gemset.nix b/pkgs/development/tools/ronn/gemset.nix index 534741a6993..04703a84a36 100644 --- a/pkgs/development/tools/ronn/gemset.nix +++ b/pkgs/development/tools/ronn/gemset.nix @@ -1,34 +1,75 @@ { - hpricot = { + kramdown = { + dependencies = ["rexml"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jn8x9ch79gqmnzgyz78kppavjh5lqx0y0r6frykga2b86rz9s6z"; + sha256 = "0757lqaq593z8hzdv98nai73ag384dkk7jgj3mcq2r6ix7130ifb"; type = "gem"; }; - version = "0.8.6"; + version = "2.3.2"; + }; + mini_portile2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + type = "gem"; + }; + version = "2.8.0"; }; mustache = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v4pdvgvs8gw0zbh5sy3l308amlsjg8sdfrkml0g0m0wwj4x7naf"; + sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; type = "gem"; }; - version = "1.0.3"; + version = "0.99.8"; }; - rdiscount = { + nokogiri = { + dependencies = ["mini_portile2" "racc"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3"; + sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd"; type = "gem"; }; - version = "2.2.0.1"; + version = "1.13.4"; }; - ronn = { + racc = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07plsxxfx5bxdk72ii9za6km0ziqlq8jh3bicr4774dalga6zpw2"; + sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; type = "gem"; }; - version = "0.7.3"; + version = "1.6.0"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; + ronn-ng = { + dependencies = ["kramdown" "mustache" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1slxfg57cabmh98fw507z4ka6lwq1pvbrqwppflxw6700pi8ykfh"; + type = "gem"; + }; + version = "0.9.1"; }; }