mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 07:46:09 +01:00
Merge pull request #56557 from aanderse/redmine-pkg-update
redmine: 3.4.8 -> 3.4.9 & 4.0.1 -> 4.0.2
This commit is contained in:
commit
7093aa51b8
8 changed files with 22 additions and 20 deletions
|
@ -14,6 +14,7 @@ gem "csv", "~> 3.0.1" if RUBY_VERSION >= "2.3" && RUBY_VERSION < "2.6"
|
|||
|
||||
gem "nokogiri", (RUBY_VERSION >= "2.3" ? "~> 1.10.0" : "~> 1.9.1")
|
||||
gem "i18n", "~> 0.7.0"
|
||||
gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3"
|
||||
|
||||
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
|
||||
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
|
||||
|
@ -33,7 +34,7 @@ end
|
|||
platforms :mri, :mingw, :x64_mingw do
|
||||
# Optional gem for exporting the gantt to a PNG file, not supported with jruby
|
||||
group :rmagick do
|
||||
gem "rmagick", ">= 2.14.0"
|
||||
gem "rmagick", "~> 2.16.0"
|
||||
end
|
||||
|
||||
# Optional Markdown support, not for JRuby
|
||||
|
|
|
@ -60,7 +60,7 @@ GEM
|
|||
ffi (~> 1.0, >= 1.0.11)
|
||||
concurrent-ruby (1.1.4)
|
||||
crass (1.0.4)
|
||||
css_parser (1.6.0)
|
||||
css_parser (1.7.0)
|
||||
addressable
|
||||
csv (3.0.4)
|
||||
docile (1.1.5)
|
||||
|
@ -70,7 +70,7 @@ GEM
|
|||
activesupport (>= 4.2.0)
|
||||
htmlentities (4.3.4)
|
||||
i18n (0.7.0)
|
||||
json (2.1.0)
|
||||
json (2.2.0)
|
||||
loofah (2.2.3)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
|
@ -191,7 +191,7 @@ DEPENDENCIES
|
|||
rbpdf (~> 1.19.6)
|
||||
redcarpet (~> 3.4.0)
|
||||
request_store (= 1.0.5)
|
||||
rmagick (>= 2.14.0)
|
||||
rmagick (~> 2.16.0)
|
||||
roadie-rails (~> 1.3.0)
|
||||
rouge (~> 3.3.0)
|
||||
ruby-openid (~> 2.3.0)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchurl, bundlerEnv, ruby }:
|
||||
|
||||
let
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
rubyEnv = bundlerEnv {
|
||||
name = "redmine-env-${version}";
|
||||
|
||||
|
@ -15,7 +15,7 @@ in
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.redmine.org/releases/${name}.tar.gz";
|
||||
sha256 = "1zzn9rkh7x1h9f2shcc8qhb693hp0hpah0z53i6gfgg5p8k5hns1";
|
||||
sha256 = "0v00f6m7si0ca0bmh6h7mx8yz1pl4zql2c8abavya57j97mi8182";
|
||||
};
|
||||
|
||||
buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
|
||||
|
|
|
@ -152,10 +152,10 @@
|
|||
dependencies = ["addressable"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61";
|
||||
sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
};
|
||||
csv = {
|
||||
source = {
|
||||
|
@ -217,10 +217,10 @@
|
|||
json = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
|
||||
sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
};
|
||||
loofah = {
|
||||
dependencies = ["crass" "nokogiri"];
|
||||
|
|
|
@ -21,6 +21,7 @@ gem "mail", "~> 2.6.4"
|
|||
gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.1" : "~> 1.6.8")
|
||||
gem "i18n", "~> 0.7.0"
|
||||
gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"
|
||||
gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3"
|
||||
|
||||
# Request at least rails-html-sanitizer 1.0.3 because of security advisories
|
||||
gem "rails-html-sanitizer", ">= 1.0.3"
|
||||
|
@ -43,7 +44,7 @@ end
|
|||
platforms :mri, :mingw, :x64_mingw do
|
||||
# Optional gem for exporting the gantt to a PNG file, not supported with jruby
|
||||
group :rmagick do
|
||||
gem "rmagick", ">= 2.14.0"
|
||||
gem "rmagick", "~> 2.16.0"
|
||||
end
|
||||
|
||||
# Optional Markdown support, not for JRuby
|
||||
|
|
|
@ -53,7 +53,7 @@ GEM
|
|||
coderay (1.1.2)
|
||||
concurrent-ruby (1.1.4)
|
||||
crass (1.0.4)
|
||||
css_parser (1.6.0)
|
||||
css_parser (1.7.0)
|
||||
addressable
|
||||
docile (1.1.5)
|
||||
erubis (2.7.0)
|
||||
|
@ -120,7 +120,7 @@ GEM
|
|||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (12.3.2)
|
||||
rbpdf (1.19.7)
|
||||
rbpdf (1.19.8)
|
||||
htmlentities
|
||||
rbpdf-font (~> 1.19.0)
|
||||
rbpdf-font (1.19.1)
|
||||
|
@ -191,7 +191,7 @@ DEPENDENCIES
|
|||
rdoc (~> 4.3)
|
||||
redcarpet (~> 3.4.0)
|
||||
request_store (= 1.0.5)
|
||||
rmagick (>= 2.14.0)
|
||||
rmagick (~> 2.16.0)
|
||||
roadie (~> 3.2.1)
|
||||
roadie-rails (~> 1.1.1)
|
||||
ruby-openid (~> 2.3.0)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchurl, bundlerEnv, ruby }:
|
||||
|
||||
let
|
||||
version = "3.4.8";
|
||||
version = "3.4.9";
|
||||
rubyEnv = bundlerEnv {
|
||||
name = "redmine-env-${version}";
|
||||
|
||||
|
@ -15,7 +15,7 @@ in
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.redmine.org/releases/${name}.tar.gz";
|
||||
sha256 = "1d8bj3hx2nlyvsqbx7zbslb4dgwgyxidj4jzh4n2ki0i7vgw0x5m";
|
||||
sha256 = "1f7sgyka21cjkvmdqkkwrx1hn0b38yq4b7283vw858fccp0l2vy2";
|
||||
};
|
||||
|
||||
buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
|
||||
|
|
|
@ -142,10 +142,10 @@
|
|||
dependencies = ["addressable"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61";
|
||||
sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
};
|
||||
docile = {
|
||||
source = {
|
||||
|
@ -430,10 +430,10 @@
|
|||
dependencies = ["htmlentities" "rbpdf-font"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0i00mmc028p7hnpwlx9r6zdwwz589kd9ns6qpxmgl6f620n1fvs2";
|
||||
sha256 = "0fnhcn4z2zz6ic1yvl5hmhwmkdnybh8f8fnk1ni7bvl2s4ig5195";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.19.7";
|
||||
version = "1.19.8";
|
||||
};
|
||||
rbpdf-font = {
|
||||
source = {
|
||||
|
|
Loading…
Reference in a new issue