From bed5ba3529343adf26f510afceb50beefa50c818 Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Fri, 17 Jun 2022 10:35:17 +0000 Subject: [PATCH] =?UTF-8?q?gollum:=205.2.3=20=E2=86=92=205.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/gollum/Gemfile.lock | 23 +++++--- pkgs/applications/misc/gollum/gemset.nix | 65 ++++++++++++++++++---- 2 files changed, 70 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 49c723efe98..6a88aa6acb0 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -13,13 +13,15 @@ GEM gemojione (4.3.3) json github-markup (4.0.1) - gollum (5.2.3) + gollum (5.3.0) gemojione (~> 4.1) gollum-lib (~> 5.1) + i18n (~> 1.8) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.1.0) - mustache-sinatra (~> 1.0) + mustache-sinatra (>= 1.0.1, < 2) octicons (~> 12.0) + rdoc (~> 6) rss (~> 0.2.9) sass (~> 3.5) sinatra (~> 2.0) @@ -30,7 +32,7 @@ GEM uglifier (~> 4.2) useragent (~> 0.16.2) webrick (~> 1.7) - gollum-lib (5.1.3) + gollum-lib (5.2) gemojione (~> 4.1) github-markup (~> 4.0) gollum-rugged_adapter (~> 1.0) @@ -43,6 +45,8 @@ GEM mime-types (~> 1.15) rugged (~> 1.1.0) htmlentities (4.3.4) + i18n (1.10.0) + concurrent-ruby (~> 1.0) json (2.6.2) kramdown (2.4.0) rexml @@ -66,15 +70,19 @@ GEM nokogiri (>= 1.6.3.1) org-ruby (0.9.12) rubypants (~> 0.2) + psych (4.0.4) + stringio racc (1.6.0) - rack (2.2.3) + rack (2.2.3.1) rack-protection (2.2.0) rack rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) + rdoc (6.4.0) + psych (>= 4.0.0) rexml (3.2.5) - rouge (3.28.0) + rouge (3.29.0) rss (0.2.9) rexml ruby2_keywords (0.0.5) @@ -101,6 +109,7 @@ GEM rack (> 1, < 3) sprockets-helpers (1.4.0) sprockets (>= 2.2) + stringio (3.0.2) therubyrhino (2.1.2) therubyrhino_jar (>= 1.7.4, < 1.7.9) therubyrhino_jar (1.7.8) @@ -111,7 +120,7 @@ GEM execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.8.1) + unf_ext (0.0.8.2) useragent (0.16.10) webrick (1.7.0) wikicloth (0.8.3) @@ -133,4 +142,4 @@ DEPENDENCIES wikicloth BUNDLED WITH - 2.2.33 + 2.3.9 diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index fba88415874..3817782a6f6 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -101,15 +101,15 @@ version = "4.0.1"; }; gollum = { - dependencies = ["gemojione" "gollum-lib" "kramdown" "kramdown-parser-gfm" "mustache-sinatra" "octicons" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent" "webrick"]; + dependencies = ["gemojione" "gollum-lib" "i18n" "kramdown" "kramdown-parser-gfm" "mustache-sinatra" "octicons" "rdoc" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent" "webrick"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zdpl8rj6r2psigcjavwi57ljriyakh0ydfai9c3q85jzc005bax"; + sha256 = "1xz7d3xfc536njk0fg4inmzzy350c5bjp237vghrcky8azc6xl7k"; type = "gem"; }; - version = "5.2.3"; + version = "5.3.0"; }; gollum-lib = { dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "octicons" "rouge" "twitter-text"]; @@ -117,10 +117,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1samwcxjr1z0sy8a87xvp0z4qx0fc2irzx568s6q1yxcba9nqqv2"; + sha256 = "1acxi4zjdmxlj7hzv9fjqilqngcwjvzhk3khnykdfvnb0l6l4xbs"; type = "gem"; }; - version = "5.1.3"; + version = "5.2"; }; gollum-rugged_adapter = { dependencies = ["mime-types" "rugged"]; @@ -143,6 +143,17 @@ }; version = "4.3.4"; }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; + type = "gem"; + }; + version = "1.10.0"; + }; json = { groups = ["default"]; platforms = []; @@ -281,6 +292,17 @@ }; version = "0.9.12"; }; + psych = { + dependencies = ["stringio"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c2lz03mkn43rf2a2xiy8vqgir1dvds0a0fpx7m7my6a21ygryw2"; + type = "gem"; + }; + version = "4.0.4"; + }; racc = { groups = ["default"]; platforms = []; @@ -296,10 +318,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + sha256 = "1b1qsg0yfargdhmpapp2d3mlxj82wyygs9nj74w0r03diyi8swlc"; type = "gem"; }; - version = "2.2.3"; + version = "2.2.3.1"; }; rack-protection = { dependencies = ["rack"]; @@ -333,6 +355,17 @@ }; version = "0.10.1"; }; + rdoc = { + dependencies = ["psych"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bxzcvxvrmb1ngxz0bgz1va4q9c4w8m6gc8lmdhi6gnvaaf98gsy"; + type = "gem"; + }; + version = "6.4.0"; + }; RedCloth = { groups = ["default"]; platforms = []; @@ -358,10 +391,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "080fswzii68wnbsg7pgq55ba7p289sqjlxwp4vch0h32qy1f8v8d"; + sha256 = "17dhzc9hfzd8x18hfsvn9rsp4jg18wdfsdy3a5p99y5dhfh1321r"; type = "gem"; }; - version = "3.28.0"; + version = "3.29.0"; }; rss = { dependencies = ["rexml"]; @@ -470,6 +503,16 @@ }; version = "1.4.0"; }; + stringio = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jns0x5lbafyqyx7pgzfs6i4ykc7p6zg7gxa6hd82w40n6z9rdvi"; + type = "gem"; + }; + version = "3.0.2"; + }; therubyrhino = { dependencies = ["therubyrhino_jar"]; groups = ["default"]; @@ -539,10 +582,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf120xbq23zjyf8zi8h1576d71g58srr8rndig0whn10w72vrxz"; + sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; type = "gem"; }; - version = "0.0.8.1"; + version = "0.0.8.2"; }; useragent = { groups = ["default"];