Merge pull request #141655 from NixOS/backport-141438-to-release-21.05

[Backport release-21.05] redmine: 4.2.2 -> 4.2.3
This commit is contained in:
Aaron Andersen 2021-10-16 10:36:31 -04:00 committed by GitHub
commit d892ba359c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 33 deletions

View File

@ -77,7 +77,7 @@ GEM
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.1) mail (2.7.1)
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
marcel (1.0.1) marcel (1.0.2)
method_source (1.0.0) method_source (1.0.0)
mini_magick (4.11.0) mini_magick (4.11.0)
mini_mime (1.0.3) mini_mime (1.0.3)
@ -90,12 +90,12 @@ GEM
nokogiri (1.11.7) nokogiri (1.11.7)
mini_portile2 (~> 2.5.0) mini_portile2 (~> 2.5.0)
racc (~> 1.4) racc (~> 1.4)
parallel (1.20.1) parallel (1.21.0)
parser (3.0.2.0) parser (3.0.2.0)
ast (~> 2.4.1) ast (~> 2.4.1)
pg (1.2.3) pg (1.2.3)
public_suffix (4.0.6) public_suffix (4.0.6)
puma (5.4.0) puma (5.5.2)
nio4r (~> 2.0) nio4r (~> 2.0)
racc (1.5.2) racc (1.5.2)
rack (2.2.3) rack (2.2.3)
@ -120,7 +120,7 @@ GEM
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0) rails-html-sanitizer (1.4.2)
loofah (~> 2.3) loofah (~> 2.3)
railties (5.2.6) railties (5.2.6)
actionpack (= 5.2.6) actionpack (= 5.2.6)
@ -146,11 +146,11 @@ GEM
railties (>= 5.1, < 6.2) railties (>= 5.1, < 6.2)
roadie (>= 3.1, < 5.0) roadie (>= 3.1, < 5.0)
rotp (6.2.0) rotp (6.2.0)
rouge (3.26.0) rouge (3.26.1)
rqrcode (2.0.0) rqrcode (2.1.0)
chunky_png (~> 1.0) chunky_png (~> 1.0)
rqrcode_core (~> 1.0) rqrcode_core (~> 1.0)
rqrcode_core (1.1.0) rqrcode_core (1.2.0)
rubocop (1.12.1) rubocop (1.12.1)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 3.0.0.0) parser (>= 3.0.0.0)
@ -160,7 +160,7 @@ GEM
rubocop-ast (>= 1.2.0, < 2.0) rubocop-ast (>= 1.2.0, < 2.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0) unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.10.0) rubocop-ast (1.12.0)
parser (>= 3.0.1.1) parser (>= 3.0.1.1)
rubocop-performance (1.10.2) rubocop-performance (1.10.2)
rubocop (>= 0.90.0, < 2.0) rubocop (>= 0.90.0, < 2.0)
@ -190,8 +190,8 @@ GEM
thread_safe (0.3.6) thread_safe (0.3.6)
tzinfo (1.2.9) tzinfo (1.2.9)
thread_safe (~> 0.1) thread_safe (~> 0.1)
unicode-display_width (2.0.0) unicode-display_width (2.1.0)
webdrivers (4.6.0) webdrivers (4.6.1)
nokogiri (~> 1.6) nokogiri (~> 1.6)
rubyzip (>= 1.3.0) rubyzip (>= 1.3.0)
selenium-webdriver (>= 3.0, < 4.0) selenium-webdriver (>= 3.0, < 4.0)
@ -245,7 +245,7 @@ DEPENDENCIES
yard yard
RUBY VERSION RUBY VERSION
ruby 2.7.3p183 ruby 2.7.4p191
BUNDLED WITH BUNDLED WITH
2.1.4 2.1.4

View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }: { lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }:
let let
version = "4.2.2"; version = "4.2.3";
rubyEnv = bundlerEnv { rubyEnv = bundlerEnv {
name = "redmine-env-${version}"; name = "redmine-env-${version}";
@ -16,7 +16,7 @@ in
src = fetchurl { src = fetchurl {
url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
sha256 = "1xlqf7g5imjmc3as2aajvbrs217jh3qpdvvpsd9mka9rk4kykyz6"; sha256 = "033slhr5kmz5b29v7n52336i0r7y4m9si748b22r85s2jpf37xkj";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View File

@ -301,10 +301,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0bp001p687nsa4a8sp3q1iv8pfhs24w7s3avychjp64sdkg6jxq3"; sha256 = "0kky3yiwagsk8gfbzn3mvl2fxlh3b39v6nawzm4wpjs6xxvvc4x0";
type = "gem"; type = "gem";
}; };
version = "1.0.1"; version = "1.0.2";
}; };
method_source = { method_source = {
groups = ["default"]; groups = ["default"];
@ -420,10 +420,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; sha256 = "1hkfpm78c2vs1qblnva3k1grijvxh87iixcnyd83s3lxrxsjvag4";
type = "gem"; type = "gem";
}; };
version = "1.20.1"; version = "1.21.0";
}; };
parser = { parser = {
dependencies = ["ast"]; dependencies = ["ast"];
@ -470,10 +470,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0bz9y1hxfyv73yb26nvs2kcw08gxi7nxkfc94j82hgx2sifcnv3x"; sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn";
type = "gem"; type = "gem";
}; };
version = "5.4.0"; version = "5.5.2";
}; };
racc = { racc = {
groups = ["default" "test"]; groups = ["default" "test"];
@ -545,10 +545,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f"; sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk";
type = "gem"; type = "gem";
}; };
version = "1.3.0"; version = "1.4.2";
}; };
railties = { railties = {
dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
@ -680,10 +680,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf";
type = "gem"; type = "gem";
}; };
version = "3.26.0"; version = "3.26.1";
}; };
rqrcode = { rqrcode = {
dependencies = ["chunky_png" "rqrcode_core"]; dependencies = ["chunky_png" "rqrcode_core"];
@ -691,20 +691,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "073w0qgjydkqpsqsb9yr8qg0mhvwlzx6z53hqr2b5zifvb9wzh02"; sha256 = "0444sgvx3ahvgr3c9swpy32kcdpciwgcqahp3pb4m7d23xp1qjdc";
type = "gem"; type = "gem";
}; };
version = "2.0.0"; version = "2.1.0";
}; };
rqrcode_core = { rqrcode_core = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0d632w2pd34bw9l3bsfnyqaa8vgbz9pxpj29gpf8parqr7wq922k"; sha256 = "06ld6386hbdhy5h0k09axmgn424kavpc8f27k1vjhknjhbf8jjfg";
type = "gem"; type = "gem";
}; };
version = "1.1.0"; version = "1.2.0";
}; };
rubocop = { rubocop = {
dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
@ -723,10 +723,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0x6za0j9wwxr14rkkkmpbnwj04lak4yjmkyrdl8c31m9acba80zw"; sha256 = "0x0xfq2mpg194rcanbjrgvjbh94s9kq72jynxx61789s628kxy59";
type = "gem"; type = "gem";
}; };
version = "1.10.0"; version = "1.12.0";
}; };
rubocop-performance = { rubocop-performance = {
dependencies = ["rubocop" "rubocop-ast"]; dependencies = ["rubocop" "rubocop-ast"];
@ -870,10 +870,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1bilbnc8j6jkb59lrf177i3p1pdyxll0n8400hzqr35vl3r3kv2m"; sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn";
type = "gem"; type = "gem";
}; };
version = "2.0.0"; version = "2.1.0";
}; };
webdrivers = { webdrivers = {
dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"]; dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"];
@ -881,10 +881,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0hi6pgkfwgz1bzfclyrr449xy9y2f2bcrnnnlb5ghvvrqkgn0dry"; sha256 = "1naymcfmm9pkf0f67xd99d9f6dpv477ggyvc1c04gxifirynfydp";
type = "gem"; type = "gem";
}; };
version = "4.6.0"; version = "4.6.1";
}; };
websocket-driver = { websocket-driver = {
dependencies = ["websocket-extensions"]; dependencies = ["websocket-extensions"];