From 59fb0606d1d37a8f4dc08f2fa088706dd8df4a21 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 18 Dec 2022 14:21:07 +0000 Subject: [PATCH] redmine: 4.2.8 -> 4.2.9 --- .../version-management/redmine/Gemfile | 7 +- .../version-management/redmine/Gemfile.lock | 41 ++++++------ .../version-management/redmine/default.nix | 4 +- .../version-management/redmine/gemset.nix | 67 ++++++++++--------- 4 files changed, 61 insertions(+), 58 deletions(-) diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index 7e5cf752bc88..30bb8cc171a3 100644 --- a/pkgs/applications/version-management/redmine/Gemfile +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -65,13 +65,14 @@ end group :test do gem "rails-dom-testing" - gem 'mocha', '>= 1.4.0' + 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] # For running system tests - gem 'puma' + # TODO: Remove version specification once Capybara supports Puma 6 + gem 'puma', '< 6.0.0' gem 'capybara', '~> 3.31.0' - gem "selenium-webdriver" + gem "selenium-webdriver", "~> 3.142.7" gem 'webdrivers', '~> 4.4', require: false # RuboCop gem 'rubocop', '~> 1.12.0' diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index c57844b49a28..722205e17dbe 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -58,7 +58,7 @@ GEM rack-test (>= 0.6.3) regexp_parser (~> 1.5) xpath (~> 3.2) - childprocess (4.1.0) + childprocess (3.0.0) chunky_png (1.4.0) concurrent-ruby (1.1.10) crass (1.0.6) @@ -72,7 +72,7 @@ GEM htmlentities (4.3.4) i18n (1.8.11) concurrent-ruby (~> 1.0) - loofah (2.19.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -83,21 +83,24 @@ GEM mini_mime (1.0.3) mini_portile2 (2.8.0) minitest (5.16.3) - mocha (1.15.0) + mocha (2.0.2) + ruby2_keywords (>= 0.0.5) mysql2 (0.5.4) net-ldap (0.17.1) nio4r (2.5.8) - nokogiri (1.13.8) + nokogiri (1.13.10) mini_portile2 (~> 2.8.0) racc (~> 1.4) + nokogiri (1.13.10-x86_64-linux) + racc (~> 1.4) parallel (1.22.1) - parser (3.1.2.1) + parser (3.1.3.0) ast (~> 2.4.1) pg (1.2.3) - public_suffix (5.0.0) + public_suffix (5.0.1) puma (5.6.5) nio4r (~> 2.0) - racc (1.6.0) + racc (1.6.1) rack (2.2.4) rack-openid (1.4.2) rack (>= 1.1.0) @@ -120,8 +123,8 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) + rails-html-sanitizer (1.4.4) + loofah (~> 2.19, >= 2.19.1) railties (5.2.8.1) actionpack (= 5.2.8.1) activesupport (= 5.2.8.1) @@ -145,7 +148,7 @@ GEM roadie-rails (2.2.0) railties (>= 5.1, < 6.2) roadie (>= 3.1, < 5.0) - rotp (6.2.0) + rotp (6.2.2) rouge (3.26.1) rqrcode (2.1.2) chunky_png (~> 1.0) @@ -160,7 +163,7 @@ GEM rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) + rubocop-ast (1.24.0) parser (>= 3.1.1.0) rubocop-performance (1.10.2) rubocop (>= 0.90.0, < 2.0) @@ -171,12 +174,11 @@ GEM rubocop (>= 0.90.0, < 2.0) ruby-openid (2.9.2) ruby-progressbar (1.11.0) + ruby2_keywords (0.0.5) rubyzip (2.3.2) - selenium-webdriver (4.5.0) - childprocess (>= 0.5, < 5.0) - rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2, < 3.0) - websocket (~> 1.0) + selenium-webdriver (3.142.7) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) simplecov (0.18.5) docile (~> 1.1) simplecov-html (~> 0.11) @@ -198,7 +200,6 @@ GEM rubyzip (>= 1.3.0) selenium-webdriver (> 3.141, < 5.0) webrick (1.7.0) - websocket (1.2.9) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -227,7 +228,7 @@ DEPENDENCIES net-ldap (~> 0.17.0) nokogiri (~> 1.13.6) pg (~> 1.2.2) - puma + puma (< 6.0.0) rack-openid rails (= 5.2.8.1) rails-dom-testing @@ -243,7 +244,7 @@ DEPENDENCIES rubocop-rails (~> 2.9.0) ruby-openid (~> 2.9.2) rubyzip (~> 2.3.0) - selenium-webdriver + selenium-webdriver (~> 3.142.7) simplecov (~> 0.18.5) tzinfo-data webdrivers (~> 4.4) @@ -253,4 +254,4 @@ RUBY VERSION ruby 2.7.6p219 BUNDLED WITH - 2.3.9 + 2.3.26 diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 9da39ba4b1c9..d71b570b7dfe 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper, nixosTests }: let - version = "4.2.8"; + version = "4.2.9"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-C0McBS2P02uTIB2vrzYVzbjQNGDvzyQA59MmYrKrYnI="; + sha256 = "sha256-04dBNF9u/RDAeYmAk7JZ2NxNzY5B38T2RkloWueoyx4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index 5248ff369830..fa34afaa4d60 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -166,10 +166,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lvcp8bsd35g57f7wz4jigcw2sryzzwrpcgjwwf3chmjrjcww5in"; + sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; type = "gem"; }; - version = "4.1.0"; + version = "3.0.0"; }; chunky_png = { groups = ["default"]; @@ -280,10 +280,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; + sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; type = "gem"; }; - version = "2.19.0"; + version = "2.19.1"; }; mail = { dependencies = ["mini_mime"]; @@ -357,14 +357,15 @@ version = "5.16.3"; }; mocha = { + dependencies = ["ruby2_keywords"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z2nzk106b6af6n0d9xqf2sphaff4gpjgxvwqcmvy6k719hqhkh9"; + sha256 = "03bgnshh84hrw6f1sdj5srxnz0z50m0a7i93fa28fkbm52c2a1lg"; type = "gem"; }; - version = "1.15.0"; + version = "2.0.2"; }; mysql2 = { groups = ["default"]; @@ -410,10 +411,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; + sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; type = "gem"; }; - version = "1.13.8"; + version = "1.13.10"; }; parallel = { groups = ["default" "test"]; @@ -431,10 +432,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; + sha256 = "17qfhjvnr9q2gp1gfdl6kndy2mb6qdwsls3vnjhb1h8ddimdm4s5"; type = "gem"; }; - version = "3.1.2.1"; + version = "3.1.3.0"; }; pg = { groups = ["default"]; @@ -459,10 +460,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; + sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; type = "gem"; }; - version = "5.0.0"; + version = "5.0.1"; }; puma = { dependencies = ["nio4r"]; @@ -480,10 +481,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "0p685i23lr8pl7l09g9l2mcj615fr7g33w3mkcr472lcg34nq8n8"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; rack = { groups = ["default" "openid" "test"]; @@ -545,10 +546,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf"; + sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.4"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; @@ -670,10 +671,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11q7rkjx40yi6lpylgl2jkpy162mjw7mswrcgcax86vgpbpjx6i3"; + sha256 = "10mmzc85y7andsich586ndykw678qn1ns2wpjxrg0sc0gr4w3pig"; type = "gem"; }; - version = "6.2.0"; + version = "6.2.2"; }; rouge = { groups = ["default"]; @@ -723,10 +724,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4m9h9hzrpfmsnswvfimafmjwfa79cbqh9dvq18cja32dhrhpcg"; + sha256 = "0sqkg84npyq9z4d3z46w59zyr1r1rbd1mrrlglws9ksw04wdq5x9"; type = "gem"; }; - version = "1.21.0"; + version = "1.24.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -770,6 +771,16 @@ }; version = "1.11.0"; }; + ruby2_keywords = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; + }; rubyzip = { groups = ["default" "test"]; platforms = []; @@ -781,15 +792,15 @@ version = "2.3.2"; }; selenium-webdriver = { - dependencies = ["childprocess" "rexml" "rubyzip" "websocket"]; + dependencies = ["childprocess" "rubyzip"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fp7h5bnlqp649imgpnshgf3mxl8zwnpsl1ak1giii81r0cd6in3"; + sha256 = "0adcvp86dinaqq3nhf8p3m0rl2g6q0a4h52k0i7kdnsg1qz9k86y"; type = "gem"; }; - version = "4.5.0"; + version = "3.142.7"; }; simplecov = { dependencies = ["docile" "simplecov-html"]; @@ -896,16 +907,6 @@ }; version = "1.7.0"; }; - websocket = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; - type = "gem"; - }; - version = "1.2.9"; - }; websocket-driver = { dependencies = ["websocket-extensions"]; groups = ["default"];