git.iko.soy/typeable/nixpkgs
on master help sign in
Merge branch 'pr-54933'

* pr-54933: redmine: 3.4.6 -> 3.4.8

commit85ff56cdde104a09b7de6e92fa0d50e836b64688 authorLéo Gaspard <leo@gaspard.io> dateThu 31 Jan 2019, 23:52 (8 years ago) parent65e6d800f3ecc6
4 files changed+102−103
pkgs/applications/version-management/redmine/Gemfile+4−6 pkgs/applications/version-management/redmine/Gemfile.lock+51−50 pkgs/applications/version-management/redmine/default.nix+3−3 pkgs/applications/version-management/redmine/gemset.nix+44−44
pkgs/applications/version-management/redmine/Gemfile+4−6
@@ -1,10 +1,8 @@
11source 'https://rubygems.org'
22
3−if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0')
4− abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
5−end
3+gem "bundler", ">= 1.5.0", "< 2.0.0"
64
7−gem "rails", "4.2.8"
5+gem "rails", "4.2.11"
86gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
97if RUBY_VERSION < "2.1"
108 gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5")
@@ -29,7 +27,7 @@ gem "rails-html-sanitizer", ">= 1.0.3"
2927
3028# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
3129gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
32−gem "rbpdf", "~> 1.19.3"
30+gem "rbpdf", "~> 1.19.6"
3331
3432# Optional gem for LDAP authentication
3533group :ldap do
@@ -71,7 +69,7 @@ group :test do
7169 # TODO: remove this after upgrading to Rails 5
7270 gem "test_after_commit", "~> 0.4.2"
7371 # For running UI tests
74− gem "capybara"
72+ gem "capybara", '~> 2.13'
7573 gem "selenium-webdriver", "~> 2.53.4"
7674end
7775
pkgs/applications/version-management/redmine/Gemfile.lock+51−50
@@ -1,71 +1,71 @@
11GEM
22 remote: https://rubygems.org/
33 specs:
4− actionmailer (4.2.8)
5− actionpack (= 4.2.8)
6− actionview (= 4.2.8)
7− activejob (= 4.2.8)
4+ actionmailer (4.2.11)
5+ actionpack (= 4.2.11)
6+ actionview (= 4.2.11)
7+ activejob (= 4.2.11)
88 mail (~> 2.5, >= 2.5.4)
99 rails-dom-testing (~> 1.0, >= 1.0.5)
10− actionpack (4.2.8)
11− actionview (= 4.2.8)
12− activesupport (= 4.2.8)
10+ actionpack (4.2.11)
11+ actionview (= 4.2.11)
12+ activesupport (= 4.2.11)
1313 rack (~> 1.6)
1414 rack-test (~> 0.6.2)
1515 rails-dom-testing (~> 1.0, >= 1.0.5)
1616 rails-html-sanitizer (~> 1.0, >= 1.0.2)
1717 actionpack-xml_parser (1.0.2)
1818 actionpack (>= 4.0.0, < 5)
19− actionview (4.2.8)
20− activesupport (= 4.2.8)
19+ actionview (4.2.11)
20+ activesupport (= 4.2.11)
2121 builder (~> 3.1)
2222 erubis (~> 2.7.0)
2323 rails-dom-testing (~> 1.0, >= 1.0.5)
2424 rails-html-sanitizer (~> 1.0, >= 1.0.3)
25− activejob (4.2.8)
26− activesupport (= 4.2.8)
25+ activejob (4.2.11)
26+ activesupport (= 4.2.11)
2727 globalid (>= 0.3.0)
28− activemodel (4.2.8)
29− activesupport (= 4.2.8)
28+ activemodel (4.2.11)
29+ activesupport (= 4.2.11)
3030 builder (~> 3.1)
31− activerecord (4.2.8)
32− activemodel (= 4.2.8)
33− activesupport (= 4.2.8)
31+ activerecord (4.2.11)
32+ activemodel (= 4.2.11)
33+ activesupport (= 4.2.11)
3434 arel (~> 6.0)
35− activesupport (4.2.8)
35+ activesupport (4.2.11)
3636 i18n (~> 0.7)
3737 minitest (~> 5.1)
3838 thread_safe (~> 0.3, >= 0.3.4)
3939 tzinfo (~> 1.1)
40− addressable (2.5.2)
40+ addressable (2.6.0)
4141 public_suffix (>= 2.0.2, < 4.0)
4242 arel (6.0.4)
4343 builder (3.2.3)
44− capybara (3.9.0)
44+ capybara (2.18.0)
4545 addressable
4646 mini_mime (>= 0.1.3)
47− nokogiri (~> 1.8)
48− rack (>= 1.6.0)
49− rack-test (>= 0.6.3)
50− xpath (~> 3.1)
47+ nokogiri (>= 1.3.3)
48+ rack (>= 1.0.0)
49+ rack-test (>= 0.5.4)
50+ xpath (>= 2.0, < 4.0)
5151 childprocess (0.9.0)
5252 ffi (~> 1.0, >= 1.0.11)
5353 coderay (1.1.2)
54− concurrent-ruby (1.0.5)
54+ concurrent-ruby (1.1.4)
5555 crass (1.0.4)
5656 css_parser (1.6.0)
5757 addressable
5858 docile (1.1.5)
5959 erubis (2.7.0)
60− ffi (1.9.25)
61− globalid (0.4.1)
60+ ffi (1.10.0)
61+ globalid (0.4.2)
6262 activesupport (>= 4.2.0)
6363 htmlentities (4.3.4)
6464 i18n (0.7.0)
6565 jquery-rails (3.1.5)
6666 railties (>= 3.0, < 5.0)
6767 thor (>= 0.14, < 2.0)
68− loofah (2.2.2)
68+ loofah (2.2.3)
6969 crass (~> 1.0.2)
7070 nokogiri (>= 1.5.9)
7171 mail (2.6.6)
@@ -74,11 +74,11 @@ GEM
7474 mime-types (3.2.2)
7575 mime-types-data (~> 3.2015)
7676 mime-types-data (3.2018.0812)
77− mimemagic (0.3.2)
77+ mimemagic (0.3.3)
7878 mini_mime (1.0.1)
7979 mini_portile2 (2.3.0)
8080 minitest (5.11.3)
81− mocha (1.7.0)
81+ mocha (1.8.0)
8282 metaclass (~> 0.0.1)
8383 multi_json (1.13.1)
8484 mysql2 (0.4.10)
@@ -95,16 +95,16 @@ GEM
9595 ruby-openid (>= 2.1.8)
9696 rack-test (0.6.3)
9797 rack (>= 1.0)
98− rails (4.2.8)
99− actionmailer (= 4.2.8)
100− actionpack (= 4.2.8)
101− actionview (= 4.2.8)
102− activejob (= 4.2.8)
103− activemodel (= 4.2.8)
104− activerecord (= 4.2.8)
105− activesupport (= 4.2.8)
98+ rails (4.2.11)
99+ actionmailer (= 4.2.11)
100+ actionpack (= 4.2.11)
101+ actionview (= 4.2.11)
102+ activejob (= 4.2.11)
103+ activemodel (= 4.2.11)
104+ activerecord (= 4.2.11)
105+ activesupport (= 4.2.11)
106106 bundler (>= 1.3.0, < 2.0)
107− railties (= 4.2.8)
107+ railties (= 4.2.11)
108108 sprockets-rails
109109 rails-deprecated_sanitizer (1.0.3)
110110 activesupport (>= 4.2.0.alpha)
@@ -114,13 +114,13 @@ GEM
114114 rails-deprecated_sanitizer (>= 1.0.1)
115115 rails-html-sanitizer (1.0.4)
116116 loofah (~> 2.2, >= 2.2.2)
117− railties (4.2.8)
118− actionpack (= 4.2.8)
119− activesupport (= 4.2.8)
117+ railties (4.2.11)
118+ actionpack (= 4.2.11)
119+ activesupport (= 4.2.11)
120120 rake (>= 0.8.7)
121121 thor (>= 0.18.1, < 2.0)
122− rake (12.3.1)
123− rbpdf (1.19.6)
122+ rake (12.3.2)
123+ rbpdf (1.19.7)
124124 htmlentities
125125 rbpdf-font (~> 1.19.0)
126126 rbpdf-font (1.19.1)
@@ -154,21 +154,22 @@ GEM
154154 sprockets (>= 3.0.0)
155155 test_after_commit (0.4.2)
156156 activerecord (>= 3.2)
157− thor (0.20.0)
157+ thor (0.20.3)
158158 thread_safe (0.3.6)
159159 tzinfo (1.2.5)
160160 thread_safe (~> 0.1)
161161 websocket (1.2.8)
162− xpath (3.1.0)
162+ xpath (3.2.0)
163163 nokogiri (~> 1.8)
164− yard (0.9.16)
164+ yard (0.9.18)
165165
166166PLATFORMS
167167 ruby
168168
169169DEPENDENCIES
170170 actionpack-xml_parser
171− capybara
171+ bundler (>= 1.5.0, < 2.0.0)
172+ capybara (~> 2.13)
172173 coderay (~> 1.1.1)
173174 i18n (~> 0.7.0)
174175 jquery-rails (~> 3.1.4)
@@ -183,10 +184,10 @@ DEPENDENCIES
183184 pg (~> 0.18.1)
184185 protected_attributes
185186 rack-openid
186− rails (= 4.2.8)
187+ rails (= 4.2.11)
187188 rails-dom-testing
188189 rails-html-sanitizer (>= 1.0.3)
189− rbpdf (~> 1.19.3)
190+ rbpdf (~> 1.19.6)
190191 rdoc (~> 4.3)
191192 redcarpet (~> 3.4.0)
192193 request_store (= 1.0.5)
@@ -201,4 +202,4 @@ DEPENDENCIES
201202 yard
202203
203204BUNDLED WITH
204− 1.16.4
205+ 1.16.3
pkgs/applications/version-management/redmine/default.nix+3−3
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, bundlerEnv, ruby }:
22
33let
4− version = "3.4.6";
4+ version = "3.4.8";
55 rubyEnv = bundlerEnv {
66 name = "redmine-env-${version}";
77
@@ -15,7 +15,7 @@ in
1515
1616 src = fetchurl {
1717 url = "https://www.redmine.org/releases/${name}.tar.gz";
18− sha256 = "15akq6pn42w7cf7dg45xmvw06fixck1qznp7s8ix7nyxlmcyvcg3";
18+ sha256 = "1d8bj3hx2nlyvsqbx7zbslb4dgwgyxidj4jzh4n2ki0i7vgw0x5m";
1919 };
2020
2121 buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
@@ -40,4 +40,4 @@ in
4040 maintainers = [ maintainers.garbas ];
4141 license = licenses.gpl2;
4242 };
43− }
43+ }
pkgs/applications/version-management/redmine/gemset.nix+44−44
@@ -3,19 +3,19 @@
33 dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
44 source = {
55 remotes = ["https://rubygems.org"];
6− sha256 = "0pr3cmr0bpgg5d0f6wy1z6r45n14r9yin8jnr4hi3ssf402xpc0q";
6+ sha256 = "0zkklsh7ymhvdm5p9fr5ycd39d5caassag8yq0dga9cbk7fps74m";
77 type = "gem";
88 };
9− version = "4.2.8";
9+ version = "4.2.11";
1010 };
1111 actionpack = {
1212 dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
1313 source = {
1414 remotes = ["https://rubygems.org"];
15− sha256 = "09fbazl0ja80na2wadfp3fzmdmdy1lsb4wd2yg7anbj0zk0ap7a9";
15+ sha256 = "13xkil3y7gjj0m4ky14asi4m08x69wwv63wfn0h95wli4x8h8w7r";
1616 type = "gem";
1717 };
18− version = "4.2.8";
18+ version = "4.2.11";
1919 };
2020 actionpack-xml_parser = {
2121 dependencies = ["actionpack"];
@@ -30,55 +30,55 @@
3030 dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
3131 source = {
3232 remotes = ["https://rubygems.org"];
33− sha256 = "1mg4a8143q2wjhjq4mngl69jkv249z5jvg0jkdribdv4zkg586rp";
33+ sha256 = "09vwq0xgxxhssxxh8fa7l2pv6a56smw3v6gvb9l1mycmf8vprd4b";
3434 type = "gem";
3535 };
36− version = "4.2.8";
36+ version = "4.2.11";
3737 };
3838 activejob = {
3939 dependencies = ["activesupport" "globalid"];
4040 source = {
4141 remotes = ["https://rubygems.org"];
42− sha256 = "0kazbpfgzz6cdmwjnlb9m671ps4qgggwv2hy8y9xi4h96djyyfqz";
42+ sha256 = "12yqs22f4lz20nw6djsrkhii3p3nfpd51nw0lhvnczx0q8kl0nyk";
4343 type = "gem";
4444 };
45− version = "4.2.8";
45+ version = "4.2.11";
4646 };
4747 activemodel = {
4848 dependencies = ["activesupport" "builder"];
4949 source = {
5050 remotes = ["https://rubygems.org"];
51− sha256 = "11vhh7zmp92880s5sx8r32v2p0b7xg039mfr92pjynpkz4q901ld";
51+ sha256 = "11aqvabf5c1pgb404f5bqp1i7mxkyhzmwk6y8zm5w6rf4nq095mq";
5252 type = "gem";
5353 };
54− version = "4.2.8";
54+ version = "4.2.11";
5555 };
5656 activerecord = {
5757 dependencies = ["activemodel" "activesupport" "arel"];
5858 source = {
5959 remotes = ["https://rubygems.org"];
60− sha256 = "1kk4dhn8jfhqfsf1dmb3a183gix6k46xr6cjkxj0rp51w2za1ns0";
60+ sha256 = "1sw0m19cnasbr4cabvc302hjddc3s6fja3fr0gbj9h2n8b3633i5";
6161 type = "gem";
6262 };
63− version = "4.2.8";
63+ version = "4.2.11";
6464 };
6565 activesupport = {
6666 dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
6767 source = {
6868 remotes = ["https://rubygems.org"];
69− sha256 = "0wibdzd2f5l5rlsw1a1y3j3fhw2imrrbkxggdraa6q9qbdnc66hi";
69+ sha256 = "0pqr25wmhvvlg8av7bi5p5c7r5464clhhhhv45j63bh7xw4ad6n4";
7070 type = "gem";
7171 };
72− version = "4.2.8";
72+ version = "4.2.11";
7373 };
7474 addressable = {
7575 dependencies = ["public_suffix"];
7676 source = {
7777 remotes = ["https://rubygems.org"];
78− sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
78+ sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
7979 type = "gem";
8080 };
81− version = "2.5.2";
81+ version = "2.6.0";
8282 };
8383 arel = {
8484 source = {
@@ -100,10 +100,10 @@
100100 dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"];
101101 source = {
102102 remotes = ["https://rubygems.org"];
103− sha256 = "1sz6ick0pn7886jh9fd4571wyplshnpb95pr22ds4hd51zcrnfi4";
103+ sha256 = "0yv77rnsjlvs8qpfn9n5vf1h6b9agxwhxw09gssbiw9zn9j20jh8";
104104 type = "gem";
105105 };
106− version = "3.9.0";
106+ version = "2.18.0";
107107 };
108108 childprocess = {
109109 dependencies = ["ffi"];
@@ -125,10 +125,10 @@
125125 concurrent-ruby = {
126126 source = {
127127 remotes = ["https://rubygems.org"];
128− sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
128+ sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1";
129129 type = "gem";
130130 };
131− version = "1.0.5";
131+ version = "1.1.4";
132132 };
133133 crass = {
134134 source = {
@@ -166,19 +166,19 @@
166166 ffi = {
167167 source = {
168168 remotes = ["https://rubygems.org"];
169− sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q";
169+ sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
170170 type = "gem";
171171 };
172− version = "1.9.25";
172+ version = "1.10.0";
173173 };
174174 globalid = {
175175 dependencies = ["activesupport"];
176176 source = {
177177 remotes = ["https://rubygems.org"];
178− sha256 = "02smrgdi11kziqi9zhnsy9i6yr2fnxrqlv3lllsvdjki3cd4is38";
178+ sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1";
179179 type = "gem";
180180 };
181− version = "0.4.1";
181+ version = "0.4.2";
182182 };
183183 htmlentities = {
184184 source = {
@@ -209,10 +209,10 @@
209209 dependencies = ["crass" "nokogiri"];
210210 source = {
211211 remotes = ["https://rubygems.org"];
212− sha256 = "0yjs6wbcj3n06d3xjqpy3qbpx0bfa12h3x2rbpc2k33ldjlkx6zy";
212+ sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg";
213213 type = "gem";
214214 };
215− version = "2.2.2";
215+ version = "2.2.3";
216216 };
217217 mail = {
218218 dependencies = ["mime-types"];
@@ -251,10 +251,10 @@
251251 mimemagic = {
252252 source = {
253253 remotes = ["https://rubygems.org"];
254− sha256 = "00ibc1mhvdfyfyl103xwb45621nwyqxf124cni5hyfhag0fn1c3q";
254+ sha256 = "04cp5sfbh1qx82yqxn0q75c7hlcx8y1dr5g3kyzwm4mx6wi2gifw";
255255 type = "gem";
256256 };
257− version = "0.3.2";
257+ version = "0.3.3";
258258 };
259259 mini_mime = {
260260 source = {
@@ -284,10 +284,10 @@
284284 dependencies = ["metaclass"];
285285 source = {
286286 remotes = ["https://rubygems.org"];
287− sha256 = "13whjmrm4n48rwx7h7a2jwa5grar3m0fxspbm2pm4lyp7hi119c1";
287+ sha256 = "12aglpiq1h18j5a4rlwvnsvnsi2f3407v5xm59lgcg3ymlyak4al";
288288 type = "gem";
289289 };
290− version = "1.7.0";
290+ version = "1.8.0";
291291 };
292292 multi_json = {
293293 source = {
@@ -377,10 +377,10 @@
377377 dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
378378 source = {
379379 remotes = ["https://rubygems.org"];
380− sha256 = "0dpbf3ybzbhqqkwg5vi60121860cr8fybvchrxk5wy3f2jcj0mch";
380+ sha256 = "0rhp1l5klw8alqnzji2p4w01x7ygsfnzc7mf87ncr2jlizmgy4nx";
381381 type = "gem";
382382 };
383− version = "4.2.8";
383+ version = "4.2.11";
384384 };
385385 rails-deprecated_sanitizer = {
386386 dependencies = ["activesupport"];
@@ -413,27 +413,27 @@
413413 dependencies = ["actionpack" "activesupport" "rake" "thor"];
414414 source = {
415415 remotes = ["https://rubygems.org"];
416− sha256 = "0bavl4hj7bnl3ryqi9rvykm410kflplgingkcxasfv1gdilddh4g";
416+ sha256 = "09x32zkxs0vfi4y0bjrqd61821kx2azwhdxvk2ygqj4yvxfh11i1";
417417 type = "gem";
418418 };
419− version = "4.2.8";
419+ version = "4.2.11";
420420 };
421421 rake = {
422422 source = {
423423 remotes = ["https://rubygems.org"];
424− sha256 = "1idi53jay34ba9j68c3mfr9wwkg3cd9qh0fn9cg42hv72c6q8dyg";
424+ sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn";
425425 type = "gem";
426426 };
427− version = "12.3.1";
427+ version = "12.3.2";
428428 };
429429 rbpdf = {
430430 dependencies = ["htmlentities" "rbpdf-font"];
431431 source = {
432432 remotes = ["https://rubygems.org"];
433− sha256 = "159vg56bzy09f6zrh9h3rxm2r0vkvsfn9qczqmv1vi5xkd918s0d";
433+ sha256 = "0i00mmc028p7hnpwlx9r6zdwwz589kd9ns6qpxmgl6f620n1fvs2";
434434 type = "gem";
435435 };
436− version = "1.19.6";
436+ version = "1.19.7";
437437 };
438438 rbpdf-font = {
439439 source = {
@@ -565,10 +565,10 @@
565565 thor = {
566566 source = {
567567 remotes = ["https://rubygems.org"];
568− sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl";
568+ sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
569569 type = "gem";
570570 };
571− version = "0.20.0";
571+ version = "0.20.3";
572572 };
573573 thread_safe = {
574574 source = {
@@ -599,17 +599,17 @@
599599 dependencies = ["nokogiri"];
600600 source = {
601601 remotes = ["https://rubygems.org"];
602− sha256 = "1y61ijvv04bwga802s8py5xd7fcxci6478wgr9wkd35p45x20jzi";
602+ sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd";
603603 type = "gem";
604604 };
605− version = "3.1.0";
605+ version = "3.2.0";
606606 };
607607 yard = {
608608 source = {
609609 remotes = ["https://rubygems.org"];
610− sha256 = "0lmmr1839qgbb3zxfa7jf5mzy17yjl1yirwlgzdhws4452gqhn67";
610+ sha256 = "07fykkfyrwqkfnxx9i5w6adyiadz00h497c516n96rgvs7alc74f";
611611 type = "gem";
612612 };
613− version = "0.9.16";
613+ version = "0.9.18";
614614 };
615615}