From 6201512ce2326e3f606bbc9579be74111aaab2f3 Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Thu, 18 May 2023 11:19:43 +0300 Subject: [PATCH 1/4] redmine: 4.2.10 -> 5.0.5 --- .../version-management/redmine/Gemfile | 85 ++-- .../version-management/redmine/Gemfile.lock | 296 ++++++----- .../version-management/redmine/default.nix | 8 +- .../version-management/redmine/gemset.nix | 467 ++++++++++++------ 4 files changed, 540 insertions(+), 316 deletions(-) diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index 46499b7d5953..1b4ef45cbe12 100644 --- a/pkgs/applications/version-management/redmine/Gemfile +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -1,31 +1,27 @@ source 'https://rubygems.org' -ruby '>= 2.4.0', '< 2.8.0' -gem 'bundler', '>= 1.12.0' +ruby '>= 2.7.0', '< 3.3.0' -gem 'rails', '5.2.8.1' -gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' -gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') -gem 'rouge', '~> 3.26.0' +gem 'rails', '6.1.7.3' +gem 'rouge', '~> 4.1.0' gem 'request_store', '~> 1.5.0' -gem "mini_mime", "~> 1.0.1" +gem 'mini_mime', '~> 1.1.0' gem "actionpack-xml_parser" -gem 'roadie-rails', (RUBY_VERSION < '2.5' ? '~> 1.3.0' : '~> 2.2.0') +gem 'roadie-rails', '~> 3.0.0' gem 'marcel' -gem "mail", "~> 2.7.1" -gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1') -gem 'nokogiri', (if Gem.ruby_version < Gem::Version.new('2.5.0') - '~> 1.10.10' - elsif Gem.ruby_version < Gem::Version.new('2.6.0') - '~> 1.12.5' - else - '~> 1.13.10' - end) -gem 'i18n', '~> 1.8.2' -gem 'rbpdf', '~> 1.21.0' +gem 'mail', '~> 2.8.1' +gem 'nokogiri', '~> 1.14.0' +gem 'i18n', '~> 1.13.0' +gem 'rbpdf', '~> 1.21.1' gem 'addressable' gem 'rubyzip', '~> 2.3.0' -gem 'psych', '~> 3.1' if Gem.ruby_version < Gem::Version.new('2.6.0') + +# Ruby Standard Gems +gem 'csv', '~> 3.2.6' +gem 'net-imap', '~> 0.3.4' +gem 'net-pop', '~> 0.1.2' +gem 'net-smtp', '~> 0.3.3' +gem 'rexml', require: false if Gem.ruby_version >= Gem::Version.new('3.0') # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] @@ -34,54 +30,61 @@ gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] gem 'rotp', '>= 5.0.0' gem 'rqrcode' +# HTML pipeline and sanitization +gem "html-pipeline", "~> 2.13.2" +gem "sanitize", "~> 6.0" + # Optional gem for LDAP authentication group :ldap do gem 'net-ldap', '~> 0.17.0' end -# Optional gem for OpenID authentication -group :openid do - gem "ruby-openid", "~> 2.9.2", :require => "openid" - gem "rack-openid" -end - # Optional gem for exporting the gantt to a PNG file group :minimagick do - gem 'mini_magick', '~> 4.11.0' + gem 'mini_magick', '~> 4.12.0' end -# Optional Markdown support, not for JRuby +# Optional Markdown support group :markdown do - gem 'redcarpet', '~> 3.5.1' + gem 'redcarpet', '~> 3.6.0' end +# Optional CommonMark support, not for JRuby +group :common_mark do + gem "commonmarker", '~> 0.23.8' + gem 'deckar01-task_list', '2.3.2' +end + + # Include database gems for the database adapters NixOS supports +require 'erb' +require 'yaml' gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] -gem "pg", "~> 1.2.2", :platforms => [:mri, :mingw, :x64_mingw] +gem "pg", "~> 1.4.2", :platforms => [:mri, :mingw, :x64_mingw] group :development do + gem 'listen', '~> 3.3' gem "yard" end group :test do gem "rails-dom-testing" - gem 'mocha', (Gem.ruby_version < Gem::Version.new('2.7.0') ? ['>= 1.4.0', '< 2.0.0'] : '>= 1.4.0') - gem 'simplecov', '~> 0.18.5', :require => false - gem "ffi", platforms: [:mingw, :x64_mingw, :mswin] + gem 'mocha', '>= 1.4.0' + gem 'simplecov', '~> 0.22.0', :require => false + gem "ffi", platforms: [:mri, :mingw, :x64_mingw, :mswin] # For running system tests - # TODO: Remove version specification once Capybara supports Puma 6 - gem 'puma', '< 6.0.0' - gem 'capybara', '~> 3.31.0' + gem 'puma' + gem 'capybara', '~> 3.38.0' gem "selenium-webdriver", "~> 3.142.7" - gem 'webdrivers', '~> 4.4', require: false + gem 'webdrivers', '4.6.1', require: false # RuboCop - gem 'rubocop', '~> 1.12.0' - gem 'rubocop-performance', '~> 1.10.1' - gem 'rubocop-rails', '~> 2.9.0' + gem 'rubocop', '~> 1.51.0', require: false + gem 'rubocop-performance', '~> 1.17.1', require: false + gem 'rubocop-rails', '~> 2.19.1', require: false end local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") -if File.exists?(local_gemfile) +if File.exist?(local_gemfile) eval_gemfile local_gemfile end diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index 949742e91b7d..7697f8c58da9 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,188 +1,236 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.8.1) - actionpack (= 5.2.8.1) + actioncable (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.8.1) - actionpack (= 5.2.8.1) - actionview (= 5.2.8.1) - activejob (= 5.2.8.1) + actionmailbox (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) + mail (>= 2.7.1) + actionmailer (6.1.7.3) + actionpack (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.8.1) - actionview (= 5.2.8.1) - activesupport (= 5.2.8.1) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.7.3) + actionview (= 6.1.7.3) + activesupport (= 6.1.7.3) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) + rails-html-sanitizer (~> 1.0, >= 1.2.0) actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.2.8.1) - activesupport (= 5.2.8.1) + actiontext (6.1.7.3) + actionpack (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) + nokogiri (>= 1.8.5) + actionview (6.1.7.3) + activesupport (= 6.1.7.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.8.1) - activesupport (= 5.2.8.1) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.1.7.3) + activesupport (= 6.1.7.3) globalid (>= 0.3.6) - activemodel (5.2.8.1) - activesupport (= 5.2.8.1) - activerecord (5.2.8.1) - activemodel (= 5.2.8.1) - activesupport (= 5.2.8.1) - arel (>= 9.0) - activestorage (5.2.8.1) - actionpack (= 5.2.8.1) - activerecord (= 5.2.8.1) - marcel (~> 1.0.0) - activesupport (5.2.8.1) + activemodel (6.1.7.3) + activesupport (= 6.1.7.3) + activerecord (6.1.7.3) + activemodel (= 6.1.7.3) + activesupport (= 6.1.7.3) + activestorage (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activesupport (= 6.1.7.3) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (6.1.7.3) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.8.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) - arel (9.0.0) ast (2.4.2) builder (3.2.4) - capybara (3.31.0) + capybara (3.38.0) addressable + matrix mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - regexp_parser (~> 1.5) + regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) childprocess (3.0.0) chunky_png (1.4.0) + commonmarker (0.23.9) concurrent-ruby (1.2.2) crass (1.0.6) css_parser (1.14.0) addressable - csv (3.1.9) + csv (3.2.6) + date (3.3.3) + deckar01-task_list (2.3.2) + html-pipeline docile (1.4.0) erubi (1.12.0) + ffi (1.15.5) globalid (1.1.0) activesupport (>= 5.0) + html-pipeline (2.13.2) + activesupport (>= 2) + nokogiri (>= 1.4) htmlentities (4.3.4) - i18n (1.8.11) + i18n (1.13.0) concurrent-ruby (~> 1.0) - loofah (2.19.1) + json (2.6.3) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.21.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) + matrix (0.4.2) method_source (1.0.0) - mini_magick (4.11.0) - mini_mime (1.0.3) - mini_portile2 (2.8.1) + mini_magick (4.12.0) + mini_mime (1.1.2) + mini_portile2 (2.8.2) minitest (5.18.0) mocha (2.0.2) ruby2_keywords (>= 0.0.5) mysql2 (0.5.5) + net-imap (0.3.4) + date + net-protocol net-ldap (0.17.1) - nio4r (2.5.8) - nokogiri (1.13.10) + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-smtp (0.3.3) + net-protocol + nio4r (2.5.9) + nokogiri (1.14.4) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.13.10-x86_64-linux) - racc (~> 1.4) - parallel (1.22.1) - parser (3.2.1.1) + parallel (1.23.0) + parser (3.2.2.1) ast (~> 2.4.1) - pg (1.2.3) + pg (1.4.6) public_suffix (5.0.1) - puma (5.6.5) + puma (6.2.2) nio4r (~> 2.0) racc (1.6.2) - rack (2.2.6.4) - rack-openid (1.4.2) - rack (>= 1.1.0) - ruby-openid (>= 2.1.8) + rack (2.2.7) rack-test (2.1.0) rack (>= 1.3) - rails (5.2.8.1) - actioncable (= 5.2.8.1) - actionmailer (= 5.2.8.1) - actionpack (= 5.2.8.1) - actionview (= 5.2.8.1) - activejob (= 5.2.8.1) - activemodel (= 5.2.8.1) - activerecord (= 5.2.8.1) - activestorage (= 5.2.8.1) - activesupport (= 5.2.8.1) - bundler (>= 1.3.0) - railties (= 5.2.8.1) + rails (6.1.7.3) + actioncable (= 6.1.7.3) + actionmailbox (= 6.1.7.3) + actionmailer (= 6.1.7.3) + actionpack (= 6.1.7.3) + actiontext (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activemodel (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) + bundler (>= 1.15.0) + railties (= 6.1.7.3) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) - railties (5.2.8.1) - actionpack (= 5.2.8.1) - activesupport (= 5.2.8.1) + railties (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + rake (>= 12.2) + thor (~> 1.0) rainbow (3.1.1) rake (13.0.6) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) rbpdf (1.21.1) htmlentities rbpdf-font (~> 1.19.0) rbpdf-font (1.19.1) - redcarpet (3.5.1) - regexp_parser (1.8.2) + redcarpet (3.6.0) + regexp_parser (2.8.0) request_store (1.5.1) rack (>= 1.4) rexml (3.2.5) - roadie (4.0.0) + roadie (5.1.0) css_parser (~> 1.4) nokogiri (~> 1.8) - roadie-rails (2.2.0) - railties (>= 5.1, < 6.2) - roadie (>= 3.1, < 5.0) + roadie-rails (3.0.0) + railties (>= 5.1, < 7.1) + roadie (~> 5.0) rotp (6.2.2) - rouge (3.26.1) - rqrcode (2.1.2) + rouge (4.1.1) + rqrcode (2.2.0) chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) - rubocop (1.12.1) + rubocop (1.51.0) + json (~> 2.3) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.2.0, < 2.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.28.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.28.1) parser (>= 3.2.1.0) - rubocop-performance (1.10.2) - rubocop (>= 0.90.0, < 2.0) + rubocop-performance (1.17.1) + rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.9.1) + rubocop-rails (2.19.1) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.90.0, < 2.0) - ruby-openid (2.9.2) + rubocop (>= 1.33.0, < 2.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) rubyzip (2.3.2) + sanitize (6.0.1) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - simplecov (0.18.5) + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) sprockets (4.2.0) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) @@ -190,23 +238,22 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - thor (1.2.1) - thread_safe (0.3.6) - tzinfo (1.2.11) - thread_safe (~> 0.1) + thor (1.2.2) + timeout (0.3.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) unicode-display_width (2.4.2) - webdrivers (4.7.0) + webdrivers (4.6.1) nokogiri (~> 1.6) rubyzip (>= 1.3.0) - selenium-webdriver (> 3.141, < 5.0) - webrick (1.7.0) + selenium-webdriver (>= 3.0, < 4.0) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.28) - webrick (~> 1.7.0) + yard (0.9.34) + zeitwerk (2.6.8) PLATFORMS ruby @@ -214,40 +261,45 @@ PLATFORMS DEPENDENCIES actionpack-xml_parser addressable - bundler (>= 1.12.0) - capybara (~> 3.31.0) - csv (~> 3.1.1) + capybara (~> 3.38.0) + commonmarker (~> 0.23.8) + csv (~> 3.2.6) + deckar01-task_list (= 2.3.2) ffi - i18n (~> 1.8.2) - mail (~> 2.7.1) + html-pipeline (~> 2.13.2) + i18n (~> 1.13.0) + listen (~> 3.3) + mail (~> 2.8.1) marcel - mini_magick (~> 4.11.0) - mini_mime (~> 1.0.1) + mini_magick (~> 4.12.0) + mini_mime (~> 1.1.0) mocha (>= 1.4.0) mysql2 (~> 0.5.0) + net-imap (~> 0.3.4) net-ldap (~> 0.17.0) - nokogiri (~> 1.13.10) - pg (~> 1.2.2) - puma (< 6.0.0) - rack-openid - rails (= 5.2.8.1) + net-pop (~> 0.1.2) + net-smtp (~> 0.3.3) + nokogiri (~> 1.14.0) + pg (~> 1.4.2) + puma + rails (= 6.1.7.3) rails-dom-testing - rbpdf (~> 1.21.0) - redcarpet (~> 3.5.1) + rbpdf (~> 1.21.1) + redcarpet (~> 3.6.0) request_store (~> 1.5.0) - roadie-rails (~> 2.2.0) + roadie-rails (~> 3.0.0) rotp (>= 5.0.0) - rouge (~> 3.26.0) + rouge (~> 4.1.0) rqrcode - rubocop (~> 1.12.0) - rubocop-performance (~> 1.10.1) - rubocop-rails (~> 2.9.0) - ruby-openid (~> 2.9.2) + rubocop (~> 1.51.0) + rubocop-performance (~> 1.17.1) + rubocop-rails (~> 2.19.1) rubyzip (~> 2.3.0) + sanitize (~> 6.0) selenium-webdriver (~> 3.142.7) - simplecov (~> 0.18.5) + simplecov (~> 0.22.0) tzinfo-data - webdrivers (~> 4.4) + webdrivers (= 4.6.1) yard RUBY VERSION diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 969d7d945f98..1e15a897ef84 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper, nixosTests }: +{ lib, stdenv, fetchurl, bundlerEnv, ruby, defaultGemConfig, makeWrapper, nixosTests }: let - version = "4.2.10"; + version = "5.0.5"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; inherit ruby; gemdir = ./.; - groups = [ "development" "ldap" "markdown" "minimagick" "openid" "test" ]; + groups = [ "development" "ldap" "markdown" "minimagick" "test" ]; }; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-byY4jCOJKWJVLKSR1e/tq9QtrIiGHdnYC8M0WPZb4ek="; + sha256 = "sha256-qJrRxLub8CXmUnx3qxjI+vd0nJSpdcryz9u6AOsSpIE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index 1f15616d876f..fda883bed112 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -1,25 +1,36 @@ { actioncable = { - dependencies = ["actionpack" "nio4r" "websocket-driver"]; + dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v5bihkn3cdf7s1cv04wqpk3l5snjgyav0jz9x5vhzzdqyknvndr"; + sha256 = "0bndmmby5qxq8rs42fbb2ax3hhbjj2ds8wja08s0iadkbrn7shvf"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; + }; + actionmailbox = { + dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cx00kf0syq5gdhlrmw0q9v92ki55drbsk4gzy86ls2q8xkd792s"; + type = "gem"; + }; + version = "6.1.7.3"; }; actionmailer = { - dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; + dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x0qjs8v5z5wzk7vlg7pdr71hsm154d8d0gwhya573xpxfjzmjpx"; + sha256 = "0vbif021cyndq3v3m61dkmgdbbirqk9zcsszb9nisq24m3gx1aai"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mqvz5dsg9zis34y8m4d2ackr3zs7h27mv6zx5yx00a58fifhyv3"; + sha256 = "0k6hc7klvn8m88b88vykl83jrpqhn4zz67l2zx9v266xga6fhala"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; @@ -43,16 +54,27 @@ }; version = "2.0.1"; }; + actiontext = { + dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16ldxyxlxl9scggpmkww2fxzim7sl2b4js610pvddcsr74z9fjs7"; + type = "gem"; + }; + version = "6.1.7.3"; + }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06bk0hyv2sq386qc7r96qbhskg91apdj3mrdpzhry6p6nby2afml"; + sha256 = "0ck02cfc17s6g05qn0k7khwvvazwbf2rxbjcma8px2nw2j1ngvcn"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -60,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12y07kvq9y30ycl4i45g9c2c9jv5a9vlxvrjaqfl79iim6gk1klz"; + sha256 = "05bkw9qgjgj2nxzjj2fh6jp1fcvgff0aa4r77k0gcfmnzc1g8wdl"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,43 +93,43 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vsyxbjpl47grlkzgh2rm0i9yksfwk11lsdi11jmqszc6lkj1b9g"; + sha256 = "03hy5bwghdklcxbdylmsq70y0qzslck5slb2zkvp7g6mmvk86kwd"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; activerecord = { - dependencies = ["activemodel" "activesupport" "arel"]; + dependencies = ["activemodel" "activesupport"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jk8qwdvq465nklxr7z0qzpiacxcqd72y6frimlalchhigl8ya0a"; + sha256 = "1alshkgbcxp9s4vqb2b0yrrnyg15kxhlp1slsb03a61w7h42pspw"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; activestorage = { - dependencies = ["actionpack" "activerecord" "marcel"]; + dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qklddvw3v13dh79c7vljad8m25frlhnwcnw9xk510d676j3lr8a"; + sha256 = "06w4wlabqqr9bwdig44r5vdwkcbbivwgwn2fl775w7h05vrccgp8"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; - groups = ["default" "test"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r15sbhl4nrkh2g5ccbhmn3c2ngri71j0yfnarxkq90vdrhqqjgh"; + sha256 = "06mihpy83a5xmavvn7l8vbix472dsi0vh30xj6g594k0679m0ir6"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -115,20 +137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; + sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; type = "gem"; }; - version = "2.8.1"; - }; - arel = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0"; - type = "gem"; - }; - version = "9.0.0"; + version = "2.8.4"; }; ast = { groups = ["default" "test"]; @@ -151,15 +163,15 @@ version = "3.2.4"; }; capybara = { - dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; + dependencies = ["addressable" "matrix" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fhgnw6xgnphaka50b995mcmc2pjifmlr8ypz6dw2a6jkz3qqlcl"; + sha256 = "123198zk2ak8mziwa5jc3ckgpmsg08zn064n3aywnqm9s1bwjv3v"; type = "gem"; }; - version = "3.31.0"; + version = "3.38.0"; }; childprocess = { groups = ["default" "test"]; @@ -181,8 +193,18 @@ }; version = "1.4.0"; }; + commonmarker = { + groups = ["common_mark"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "074162raa8pc92q6833hgqdlfr3z5jgid9avdz5k25cnls2rqwrf"; + type = "gem"; + }; + version = "0.23.9"; + }; concurrent-ruby = { - groups = ["default" "test"]; + groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -217,10 +239,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07mgyalwdxaxnff86j5p6n5szmhqz7nrlkb40826mzggrmva8v1m"; + sha256 = "0l5f5cq8ki3h4djh7pb8yqdkywqd08vjy3vd64yqh7qd6pdwky6w"; type = "gem"; }; - version = "3.1.9"; + version = "3.2.6"; + }; + date = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + type = "gem"; + }; + version = "3.3.3"; + }; + deckar01-task_list = { + dependencies = ["html-pipeline"]; + groups = ["common_mark"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01c8vv0xwbhlyhiagj93b1hlm2n0rmj4sw62nbc0jhyj90jhj6as"; + type = "gem"; + }; + version = "2.3.2"; }; docile = { groups = ["default" "test"]; @@ -242,6 +285,26 @@ }; version = "1.12.0"; }; + ffi = { + groups = ["default" "development" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "mingw"; + } { + engine = "mingw"; + } { + engine = "mswin"; + } { + engine = "ruby"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + type = "gem"; + }; + version = "1.15.5"; + }; globalid = { dependencies = ["activesupport"]; groups = ["default"]; @@ -253,6 +316,17 @@ }; version = "1.1.0"; }; + html-pipeline = { + dependencies = ["activesupport" "nokogiri"]; + groups = ["common_mark" "default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00xqmlny1b4ixff8sk0rkl4wcgwqc6v93qv8l3rn8d1dppvq7pm1"; + type = "gem"; + }; + version = "2.13.2"; + }; htmlentities = { groups = ["default"]; platforms = []; @@ -265,14 +339,35 @@ }; i18n = { dependencies = ["concurrent-ruby"]; + groups = ["common_mark" "default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x"; + type = "gem"; + }; + version = "1.13.0"; + }; + json = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; type = "gem"; }; - version = "1.8.11"; + version = "2.6.3"; + }; + listen = { + dependencies = ["rb-fsevent" "rb-inotify"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13rgkfar8pp31z1aamxf5y7cfq88wv6rxxcwy7cmm177qq508ycn"; + type = "gem"; + }; + version = "3.8.0"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -280,21 +375,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; + sha256 = "1p744kjpb5zk2ihklbykzii77alycjc04vpnm2ch2f3cp65imlj3"; type = "gem"; }; - version = "2.19.1"; + version = "2.21.3"; }; mail = { - dependencies = ["mini_mime"]; + dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; + sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.1"; }; marcel = { groups = ["default"]; @@ -306,6 +401,16 @@ }; version = "1.0.2"; }; + matrix = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i"; + type = "gem"; + }; + version = "0.4.2"; + }; method_source = { groups = ["default"]; platforms = []; @@ -321,33 +426,33 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs"; + sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37"; type = "gem"; }; - version = "4.11.0"; + version = "4.12.0"; }; mini_mime = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1np6srnyagghhh2w4nyv09sz47v0i6ri3q6blicj94vgxqp12c94"; + sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.2"; }; mini_portile2 = { - groups = ["default" "test"]; + groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; + sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.2"; }; minitest = { - groups = ["default" "test"]; + groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -385,6 +490,17 @@ }; version = "0.5.5"; }; + net-imap = { + dependencies = ["date" "net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; + type = "gem"; + }; + version = "0.3.4"; + }; net-ldap = { groups = ["ldap"]; platforms = []; @@ -395,36 +511,69 @@ }; version = "0.17.1"; }; + net-pop = { + dependencies = ["net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4"; + type = "gem"; + }; + version = "0.1.2"; + }; + net-protocol = { + dependencies = ["timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + type = "gem"; + }; + version = "0.2.1"; + }; + net-smtp = { + dependencies = ["net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + type = "gem"; + }; + version = "0.3.3"; + }; nio4r = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; + sha256 = "0w9978zwjf1qhy3amkivab0f9syz6a7k0xgydjidaf7xc831d78f"; type = "gem"; }; - version = "2.5.8"; + version = "2.5.9"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; - groups = ["default" "test"]; + groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; + sha256 = "03g0hwp3z8m442nq8ag4lrbcgwcc7hhi8d1s0y7ipic0m50szl9b"; type = "gem"; }; - version = "1.13.10"; + version = "1.14.4"; }; parallel = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; + sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597"; type = "gem"; }; - version = "1.22.1"; + version = "1.23.0"; }; parser = { dependencies = ["ast"]; @@ -432,10 +581,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a2v5f8fw7nxm41xp422p1pbr41hafy62bp95m7vg42cqp5y4grc"; + sha256 = "08f89nssj7ws7sjfvc2fcjpfm83sjgmniyh0npnmpqf5sfv44r8x"; type = "gem"; }; - version = "3.2.1.1"; + version = "3.2.2.1"; }; pg = { groups = ["default"]; @@ -450,10 +599,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"; + sha256 = "07m6lxljabw9kyww5k5lgsxsznsm1v5l14r1la09gqka9b5kv3yr"; type = "gem"; }; - version = "1.2.3"; + version = "1.4.6"; }; public_suffix = { groups = ["default" "test"]; @@ -471,13 +620,13 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qzq0c791kacv68hgk9zqsd1p7zx1y1rr9j10rn9yphibb8jj436"; + sha256 = "0yf4jmkyy8das7pj1xzwllfvzkhq2p6p534j61d9h4wz3nfyf0s5"; type = "gem"; }; - version = "5.6.5"; + version = "6.2.2"; }; racc = { - groups = ["default" "test"]; + groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -487,25 +636,14 @@ version = "1.6.2"; }; rack = { - groups = ["default" "openid" "test"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk"; + sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; type = "gem"; }; - version = "2.2.6.4"; - }; - rack-openid = { - dependencies = ["rack" "ruby-openid"]; - groups = ["openid"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sg85yn981j3a0iri3ch4znzdwscvz29l7vrk3dafqw4fdg31llc"; - type = "gem"; - }; - version = "1.4.2"; + version = "2.2.7"; }; rack-test = { dependencies = ["rack"]; @@ -519,15 +657,15 @@ version = "2.1.0"; }; rails = { - dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jy4jfkq0xpqp0d3ii9xhj69kacx8l4q3pincncw2g30bqd7a66g"; + sha256 = "07cs7qdkx6vwp66diwdy9g6mx52rsd8rxhbnsqf9bqam58g2aynj"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -557,10 +695,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w9hm85jgbyar748z9nppsz8mgwywa2v9qqlbkzhpgirxhblifv2"; + sha256 = "1d2snjnx1j848axppj2napy3zjgbka3fnw2528rcamhm6dp694nd"; type = "gem"; }; - version = "5.2.8.1"; + version = "6.1.7.3"; }; rainbow = { groups = ["default" "test"]; @@ -582,6 +720,27 @@ }; version = "13.0.6"; }; + rb-fsevent = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; + type = "gem"; + }; + version = "0.11.2"; + }; + rb-inotify = { + dependencies = ["ffi"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + type = "gem"; + }; + version = "0.10.1"; + }; rbpdf = { dependencies = ["htmlentities" "rbpdf-font"]; groups = ["default"]; @@ -608,20 +767,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi"; + sha256 = "1sg9sbf9pm91l7lac7fs4silabyn0vflxwaa2x3lrzsm0ff8ilca"; type = "gem"; }; - version = "3.5.1"; + version = "3.6.0"; }; regexp_parser = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm"; + sha256 = "17xizkw5ryw8hhq64iqxmzdrrdxpc5lhkqc1fgm1aj0zsk1r2950"; type = "gem"; }; - version = "1.8.2"; + version = "2.8.0"; }; request_store = { dependencies = ["rack"]; @@ -650,10 +809,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01kld3drqfiih5x8c13cvr6dpvdl7jml0v9bcw4fsy322lax3kn0"; + sha256 = "0728slgr2rxx6v1mrh1416k1waj29szfa1jqpbiw3xrvgfpzvcm7"; type = "gem"; }; - version = "4.0.0"; + version = "5.1.0"; }; roadie-rails = { dependencies = ["railties" "roadie"]; @@ -661,10 +820,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jjcqnp37z65dksykzwjiz149kx65nw70lyx8dkw1fm5x7yraqvh"; + sha256 = "16j1cjhq8xqr77vyf7m7ip2132619wdnpvlbig4cnn96yyi0cnan"; type = "gem"; }; - version = "2.2.0"; + version = "3.0.0"; }; rotp = { groups = ["default"]; @@ -681,10 +840,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf"; + sha256 = "0jzx6ni3bjdajc9y4w6mclq165jwiypbxkav2k0gbag7ip93xk21"; type = "gem"; }; - version = "3.26.1"; + version = "4.1.1"; }; rqrcode = { dependencies = ["chunky_png" "rqrcode_core"]; @@ -692,10 +851,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s97q1rqmw7rzsdr500hr4f2k6s24n8qk1klciz5q94zvdrygx3p"; + sha256 = "1hggzz8i1l62pkkiybhiqv6ypxw7q844sddrrbbfczjcnj5sivi3"; type = "gem"; }; - version = "2.1.2"; + version = "2.2.0"; }; rqrcode_core = { groups = ["default"]; @@ -708,15 +867,15 @@ version = "1.2.0"; }; rubocop = { - dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hi2c3a6alya9yx07nirnjzlc0mvmidnx67874njp6wf7d5xqqr9"; + sha256 = "0013mnzj6ql3v8nif7fm8n2832jnwa46azync6azsg9d4iblrfmy"; type = "gem"; }; - version = "1.12.1"; + version = "1.51.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -724,10 +883,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n2gsafg6p7nr1z8i1hkvp2qqkkbg842ba183dnl0h08xd9ms6q5"; + sha256 = "0gs8zjigzdqj0kcmmrhvd4zavwr6kz6h9qvrh9m7bhy56f4aqljs"; type = "gem"; }; - version = "1.28.0"; + version = "1.28.1"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -735,10 +894,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07c3kymvsid9aajwmmwr3n6apxgyjcbzbl2n6r5lpzkyz28jqn15"; + sha256 = "1z6i24r0485fxa5n4g3rhp88w589fifszhd1khbzya2iiknkjxkr"; type = "gem"; }; - version = "1.10.2"; + version = "1.17.1"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -746,20 +905,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h656la1g644g54g3gidz45p6v8i1156nw6bi66cfx7078y1339d"; + sha256 = "0j6dn8pz70bngx6van8yzsimpdd93gm7c8lr93wz1j4ahm6q4hn9"; type = "gem"; }; - version = "2.9.1"; - }; - ruby-openid = { - groups = ["openid"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "190p1m0bxd9xkfk1j6cpcv3x5c367g36nsglg4m1fcwqdd13k3kz"; - type = "gem"; - }; - version = "2.9.2"; + version = "2.19.1"; }; ruby-progressbar = { groups = ["default" "test"]; @@ -791,6 +940,17 @@ }; version = "2.3.2"; }; + sanitize = { + dependencies = ["crass" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ga8yzc9zj45m92ycwnzhzahkwvc3dp3lym5m3f3880hs4jhh7l3"; + type = "gem"; + }; + version = "6.0.1"; + }; selenium-webdriver = { dependencies = ["childprocess" "rubyzip"]; groups = ["test"]; @@ -803,15 +963,15 @@ version = "3.142.7"; }; simplecov = { - dependencies = ["docile" "simplecov-html"]; + dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ycx5q699ycbjhp28sjbkrd62vwxlrb7fh4v2m7sjsp2qhi6cf6r"; + sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py"; type = "gem"; }; - version = "0.18.5"; + version = "0.22.0"; }; simplecov-html = { groups = ["default" "test"]; @@ -823,6 +983,16 @@ }; version = "0.12.3"; }; + simplecov_json_formatter = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j"; + type = "gem"; + }; + version = "0.1.4"; + }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; groups = ["default"]; @@ -850,31 +1020,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; - thread_safe = { - groups = ["default" "test"]; + timeout = { + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; type = "gem"; }; - version = "0.3.6"; + version = "0.3.2"; }; tzinfo = { - dependencies = ["thread_safe"]; - groups = ["default" "test"]; + dependencies = ["concurrent-ruby"]; + groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dk1cfnhgl14l580b650qyp8m5xpqb3zg0wb251h5jkm46hzc0b5"; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; type = "gem"; }; - version = "1.2.11"; + version = "2.0.6"; }; unicode-display_width = { groups = ["default" "test"]; @@ -892,20 +1062,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05fdb6z8541p912xanjbl9y15cyj6g44530y0nib6qhv6i90rkzp"; + sha256 = "1naymcfmm9pkf0f67xd99d9f6dpv477ggyvc1c04gxifirynfydp"; type = "gem"; }; - version = "4.7.0"; - }; - webrick = { - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; - type = "gem"; - }; - version = "1.7.0"; + version = "4.6.1"; }; websocket-driver = { dependencies = ["websocket-extensions"]; @@ -940,14 +1100,23 @@ version = "3.2.0"; }; yard = { - dependencies = ["webrick"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p1if8g9ww6hlpfkphqv3y1z0rbqnnrvb38c5qhnala0f8qpw6yk"; + sha256 = "013yrnwx1zhzhn1fnc19zck22a1qgimsaglp2iwgf5bz9l8h93js"; type = "gem"; }; - version = "0.9.28"; + version = "0.9.34"; + }; + zeitwerk = { + groups = ["common_mark" "default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk"; + type = "gem"; + }; + version = "2.6.8"; }; } From eb222f0f97106d2fbd96cf3ec181e8b2487aded5 Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Thu, 18 May 2023 14:35:38 +0300 Subject: [PATCH 2/4] redmine: upgrade start command --- nixos/modules/services/misc/redmine.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index d881ea913695..a296fd3816bb 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -419,7 +419,7 @@ in Group = cfg.group; TimeoutSec = "300"; WorkingDirectory = "${cfg.package}/share/redmine"; - ExecStart="${bundle} exec rails server webrick -e production -p ${toString cfg.port} -P '${cfg.stateDir}/redmine.pid'"; + ExecStart="${bundle} exec rails server -u webrick -e production -p ${toString cfg.port} -P '${cfg.stateDir}/redmine.pid'"; }; }; From 4fe4d9064efde7349ad71574e14b7c31ae95a7a2 Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Thu, 18 May 2023 14:35:59 +0300 Subject: [PATCH 3/4] redmine: add common_mark gem group --- pkgs/applications/version-management/redmine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 1e15a897ef84..1bb442919ccc 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -7,7 +7,7 @@ let inherit ruby; gemdir = ./.; - groups = [ "development" "ldap" "markdown" "minimagick" "test" ]; + groups = [ "development" "ldap" "markdown" "common_mark" "minimagick" "test" ]; }; in stdenv.mkDerivation rec { @@ -47,7 +47,7 @@ in meta = with lib; { homepage = "https://www.redmine.org/"; platforms = platforms.linux; - maintainers = with maintainers; [ aanderse felixsinger ]; + maintainers = with maintainers; [ aanderse felixsinger megheaiulian ]; license = licenses.gpl2; }; } From 739e17c306686cfd3a82ba901c5a0c19a1c97bfe Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Thu, 18 May 2023 15:01:41 +0300 Subject: [PATCH 4/4] redmine: add webrick gem dep --- pkgs/applications/version-management/redmine/Gemfile | 2 ++ .../version-management/redmine/Gemfile.lock | 4 ++++ .../applications/version-management/redmine/gemset.nix | 10 ++++++++++ 3 files changed, 16 insertions(+) diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index 1b4ef45cbe12..7837acedcf3c 100644 --- a/pkgs/applications/version-management/redmine/Gemfile +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -55,6 +55,8 @@ group :common_mark do gem 'deckar01-task_list', '2.3.2' end +# webrick +gem 'webrick' # Include database gems for the database adapters NixOS supports require 'erb' diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index 7697f8c58da9..46b22b9436db 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -134,6 +134,8 @@ GEM nokogiri (1.14.4) mini_portile2 (~> 2.8.0) racc (~> 1.4) + nokogiri (1.14.4-x86_64-linux) + racc (~> 1.4) parallel (1.23.0) parser (3.2.2.1) ast (~> 2.4.1) @@ -247,6 +249,7 @@ GEM nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (>= 3.0, < 4.0) + webrick (1.8.1) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -300,6 +303,7 @@ DEPENDENCIES simplecov (~> 0.22.0) tzinfo-data webdrivers (= 4.6.1) + webrick yard RUBY VERSION diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index fda883bed112..ea19f1ef35c2 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -1067,6 +1067,16 @@ }; version = "4.6.1"; }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; + type = "gem"; + }; + version = "1.8.1"; + }; websocket-driver = { dependencies = ["websocket-extensions"]; groups = ["default"];