bcb60de · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge pull request #170025 from felixsinger/update/pkgs/redmine

redmine: 4.2.4 -> 4.2.5

commitbcb60de7d567901ad4e736b8d4a829619539bf8d authorAaron Andersen <aaron@fosslib.net> dateSat 30 Apr 2022, 06:59 (5 years ago) parent69a9546 21458a4

5 files changed+109−106

compare with master

unifiedsplit

pkgs/applications/version-management/redmine/Gemfile+2−2 pkgs/applications/version-management/redmine/Gemfile.lock+48−50 pkgs/applications/version-management/redmine/default.nix+3−5 pkgs/applications/version-management/redmine/gemset.nix+39−49 pkgs/applications/version-management/redmine/update.sh+17

pkgs/applications/version-management/redmine/Gemfile+2−2

@@ -3,7 +3,7 @@ source 'https://rubygems.org'

33ruby '>= 2.4.0', '< 2.8.0'

44gem 'bundler', '>= 1.12.0'

6−gem 'rails', '5.2.6.2'

6+gem 'rails', '5.2.6.3'

77gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'

88gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0')

99gem 'rouge', '~> 3.26.0'

@@ -24,7 +24,7 @@ gem 'rubyzip', '~> 2.3.0'

2424gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]

2525

2626# TOTP-based 2-factor authentication

27−gem 'rotp'

27+gem 'rotp', '>= 5.0.0'

2828gem 'rqrcode'

2929

3030# Optional gem for LDAP authentication

pkgs/applications/version-management/redmine/Gemfile.lock+48−50

@@ -1,19 +1,19 @@

11GEM

22 remote: https://rubygems.org/

33 specs:

4− actioncable (5.2.6.2)

5− actionpack (= 5.2.6.2)

4+ actioncable (5.2.6.3)

5+ actionpack (= 5.2.6.3)

66 nio4r (~> 2.0)

77 websocket-driver (>= 0.6.1)

8− actionmailer (5.2.6.2)

9− actionpack (= 5.2.6.2)

10− actionview (= 5.2.6.2)

11− activejob (= 5.2.6.2)

8+ actionmailer (5.2.6.3)

9+ actionpack (= 5.2.6.3)

10+ actionview (= 5.2.6.3)

11+ activejob (= 5.2.6.3)

1212 mail (~> 2.5, >= 2.5.4)

1313 rails-dom-testing (~> 2.0)

14− actionpack (5.2.6.2)

15− actionview (= 5.2.6.2)

16− activesupport (= 5.2.6.2)

14+ actionpack (5.2.6.3)

15+ actionview (= 5.2.6.3)

16+ activesupport (= 5.2.6.3)

1717 rack (~> 2.0, >= 2.0.8)

1818 rack-test (>= 0.6.3)

1919 rails-dom-testing (~> 2.0)

@@ -21,26 +21,26 @@ GEM

2121 actionpack-xml_parser (2.0.1)

2222 actionpack (>= 5.0)

2323 railties (>= 5.0)

24− actionview (5.2.6.2)

25− activesupport (= 5.2.6.2)

24+ actionview (5.2.6.3)

25+ activesupport (= 5.2.6.3)

2626 builder (~> 3.1)

2727 erubi (~> 1.4)

2828 rails-dom-testing (~> 2.0)

2929 rails-html-sanitizer (~> 1.0, >= 1.0.3)

30− activejob (5.2.6.2)

31− activesupport (= 5.2.6.2)

30+ activejob (5.2.6.3)

31+ activesupport (= 5.2.6.3)

3232 globalid (>= 0.3.6)

33− activemodel (5.2.6.2)

34− activesupport (= 5.2.6.2)

35− activerecord (5.2.6.2)

36− activemodel (= 5.2.6.2)

37− activesupport (= 5.2.6.2)

33+ activemodel (5.2.6.3)

34+ activesupport (= 5.2.6.3)

35+ activerecord (5.2.6.3)

36+ activemodel (= 5.2.6.3)

37+ activesupport (= 5.2.6.3)

3838 arel (>= 9.0)

39− activestorage (5.2.6.2)

40− actionpack (= 5.2.6.2)

41− activerecord (= 5.2.6.2)

39+ activestorage (5.2.6.3)

40+ actionpack (= 5.2.6.3)

41+ activerecord (= 5.2.6.3)

4242 marcel (~> 1.0.0)

43− activesupport (5.2.6.2)

43+ activesupport (5.2.6.3)

4444 concurrent-ruby (~> 1.0, >= 1.0.2)

4545 i18n (>= 0.7, < 2)

4646 minitest (~> 5.1)

@@ -60,7 +60,7 @@ GEM

6060 xpath (~> 3.2)

6161 childprocess (4.1.0)

6262 chunky_png (1.4.0)

63− concurrent-ruby (1.1.9)

63+ concurrent-ruby (1.1.10)

6464 crass (1.0.6)

6565 css_parser (1.11.0)

6666 addressable

@@ -72,7 +72,7 @@ GEM

7272 htmlentities (4.3.4)

7373 i18n (1.8.11)

7474 concurrent-ruby (~> 1.0)

75− loofah (2.14.0)

75+ loofah (2.16.0)

7676 crass (~> 1.0.2)

7777 nokogiri (>= 1.5.9)

7878 mail (2.7.1)

@@ -81,21 +81,19 @@ GEM

8181 method_source (1.0.0)

8282 mini_magick (4.11.0)

8383 mini_mime (1.0.3)

84− mini_portile2 (2.5.3)

8584 minitest (5.15.0)

8685 mocha (1.13.0)

8786 mysql2 (0.5.3)

8887 net-ldap (0.17.0)

8988 nio4r (2.5.8)

9089 nokogiri (1.11.7)

91− mini_portile2 (~> 2.5.0)

9290 racc (~> 1.4)

93− parallel (1.21.0)

94− parser (3.1.1.0)

91+ parallel (1.22.1)

92+ parser (3.1.2.0)

9593 ast (~> 2.4.1)

9694 pg (1.2.3)

97− public_suffix (4.0.6)

98− puma (5.6.2)

95+ public_suffix (4.0.7)

96+ puma (5.6.4)

9997 nio4r (~> 2.0)

10098 racc (1.6.0)

10199 rack (2.2.3)

@@ -104,27 +102,27 @@ GEM

104102 ruby-openid (>= 2.1.8)

105103 rack-test (1.1.0)

106104 rack (>= 1.0, < 3)

107− rails (5.2.6.2)

108− actioncable (= 5.2.6.2)

109− actionmailer (= 5.2.6.2)

110− actionpack (= 5.2.6.2)

111− actionview (= 5.2.6.2)

112− activejob (= 5.2.6.2)

113− activemodel (= 5.2.6.2)

114− activerecord (= 5.2.6.2)

115− activestorage (= 5.2.6.2)

116− activesupport (= 5.2.6.2)

105+ rails (5.2.6.3)

106+ actioncable (= 5.2.6.3)

107+ actionmailer (= 5.2.6.3)

108+ actionpack (= 5.2.6.3)

109+ actionview (= 5.2.6.3)

110+ activejob (= 5.2.6.3)

111+ activemodel (= 5.2.6.3)

112+ activerecord (= 5.2.6.3)

113+ activestorage (= 5.2.6.3)

114+ activesupport (= 5.2.6.3)

117115 bundler (>= 1.3.0)

118− railties (= 5.2.6.2)

116+ railties (= 5.2.6.3)

119117 sprockets-rails (>= 2.0.0)

120118 rails-dom-testing (2.0.3)

121119 activesupport (>= 4.2.0)

122120 nokogiri (>= 1.6)

123121 rails-html-sanitizer (1.4.2)

124122 loofah (~> 2.3)

125− railties (5.2.6.2)

126− actionpack (= 5.2.6.2)

127− activesupport (= 5.2.6.2)

123+ railties (5.2.6.3)

124+ actionpack (= 5.2.6.3)

125+ activesupport (= 5.2.6.3)

128126 method_source

129127 rake (>= 0.8.7)

130128 thor (>= 0.19.0, < 2.0)

@@ -160,7 +158,7 @@ GEM

160158 rubocop-ast (>= 1.2.0, < 2.0)

161159 ruby-progressbar (~> 1.7)

162160 unicode-display_width (>= 1.4.0, < 3.0)

163− rubocop-ast (1.16.0)

161+ rubocop-ast (1.17.0)

164162 parser (>= 3.1.1.0)

165163 rubocop-performance (1.10.2)

166164 rubocop (>= 0.90.0, < 2.0)

@@ -180,7 +178,7 @@ GEM

180178 docile (~> 1.1)

181179 simplecov-html (~> 0.11)

182180 simplecov-html (0.12.3)

183− sprockets (4.0.2)

181+ sprockets (4.0.3)

184182 concurrent-ruby (~> 1.0)

185183 rack (> 1, < 3)

186184 sprockets-rails (3.4.2)

@@ -227,13 +225,13 @@ DEPENDENCIES

227225 pg (~> 1.2.2)

228226 puma

229227 rack-openid

230− rails (= 5.2.6.2)

228+ rails (= 5.2.6.3)

231229 rails-dom-testing

232230 rbpdf (~> 1.20.0)

233231 redcarpet (~> 3.5.1)

234232 request_store (~> 1.5.0)

235233 roadie-rails (~> 2.2.0)

236− rotp

234+ rotp (>= 5.0.0)

237235 rouge (~> 3.26.0)

238236 rqrcode

239237 rubocop (~> 1.12.0)

@@ -248,7 +246,7 @@ DEPENDENCIES

248246 yard

249247

250248RUBY VERSION

251− ruby 2.7.4p191

249+ ruby 2.7.6p219

252250

253251BUNDLED WITH

254− 2.1.4

252+ 2.2.33

pkgs/applications/version-management/redmine/default.nix+3−5

@@ -1,7 +1,7 @@

11{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }:

33let

4− version = "4.2.4";

4+ version = "4.2.5";

55 rubyEnv = bundlerEnv {

66 name = "redmine-env-${version}";

@@ -15,10 +15,8 @@ in

1515 inherit version;

1616

1717 src = fetchurl {

18− # https://www.redmine.org/news/134

19− # > "These releases are not available yet on the releases page from a technical reason, we are sorry for this and we expected to have them uploaded next week. I'll post here an update after we have them uploaded."

20− url = "https://www.redmine.org/attachments/download/28862/${pname}-${version}.tar.gz";

21− sha256 = "7f50fd4a6cf1c1e48091a87696b813ba264e11f04dec67fb006858a1b49a5c7d";

18+ url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";

19+ sha256 = "112rc2sjx6x7046fjz7np0ilszvkqapc180ld02ncwmdxaq88w6r";

2220 };

2321

2422 nativeBuildInputs = [ makeWrapper ];

pkgs/applications/version-management/redmine/gemset.nix+39−49

@@ -5,10 +5,10 @@

55 platforms = [];

66 source = {

77 remotes = ["https://rubygems.org"];

8− sha256 = "0il9l30jz1gfjccrahfk2gl57b31dqgjlzjc8cfifm76ggywmz67";

8+ sha256 = "1gmwailk92znzrdpi4116ih6bq609a38rpnszzh5piq7b507ikpn";

99 type = "gem";

1010 };

11− version = "5.2.6.2";

11+ version = "5.2.6.3";

1212 };

1313 actionmailer = {

1414 dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];

@@ -16,10 +16,10 @@

1616 platforms = [];

1717 source = {

1818 remotes = ["https://rubygems.org"];

19− sha256 = "1cci24da56d467ldq40n3l176h9qdw691w1b703c251izh6c4n5d";

19+ sha256 = "103a1nixkazzdk21bg42vs722m6gm0vf17ag2fdad5dycwk3ycpp";

2020 type = "gem";

2121 };

22− version = "5.2.6.2";

22+ version = "5.2.6.3";

2323 };

2424 actionpack = {

2525 dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];

@@ -27,10 +27,10 @@

2727 platforms = [];

2828 source = {

2929 remotes = ["https://rubygems.org"];

30− sha256 = "1xis55xvs4hja6fnmj4785rzafk553k5f0xb7jprqf38c6dzmiak";

30+ sha256 = "15fz3rjk85svpx9lsqfdwlvyd972zf0g5jasnsllcbf6d300gdj6";

3131 type = "gem";

3232 };

33− version = "5.2.6.2";

33+ version = "5.2.6.3";

3434 };

3535 actionpack-xml_parser = {

3636 dependencies = ["actionpack" "railties"];

@@ -49,10 +49,10 @@

4949 platforms = [];

5050 source = {

5151 remotes = ["https://rubygems.org"];

52− sha256 = "00a9g63xwfimnzsrcrnr4vmdwhg7jaic49jas70r695nznwkxr9x";

52+ sha256 = "00cfpmbk8gw9c589xnqazsbd860p2368gyh8nyzixcsa6k28wfwv";

5353 type = "gem";

5454 };

55− version = "5.2.6.2";

55+ version = "5.2.6.3";

5656 };

5757 activejob = {

5858 dependencies = ["activesupport" "globalid"];

@@ -60,10 +60,10 @@

6060 platforms = [];

6161 source = {

6262 remotes = ["https://rubygems.org"];

63− sha256 = "0fm5qxrv8pxhl7m88p17xxpizddasm9kknaldkax8im3b9vrgnr9";

63+ sha256 = "1gczbnk7qy4rjhv0q82nd70xawc9lb1vinvwr4ngpim5rqwzm6d6";

6464 type = "gem";

6565 };

66− version = "5.2.6.2";

66+ version = "5.2.6.3";

6767 };

6868 activemodel = {

6969 dependencies = ["activesupport"];

@@ -71,10 +71,10 @@

7171 platforms = [];

7272 source = {

7373 remotes = ["https://rubygems.org"];

74− sha256 = "0k0xizwbcadmslc8rkg2vnsbrsqivm6yj2yjrzb6rhqwphcr9zjf";

74+ sha256 = "0ib8qlbwr9hp5284c6bmx08lrfy45zzd4inzmawz08alkgdcrzca";

7575 type = "gem";

7676 };

77− version = "5.2.6.2";

77+ version = "5.2.6.3";

7878 };

7979 activerecord = {

8080 dependencies = ["activemodel" "activesupport" "arel"];

@@ -82,10 +82,10 @@

8282 platforms = [];

8383 source = {

8484 remotes = ["https://rubygems.org"];

85− sha256 = "1m00zh62rfn2h15vfn89jg39wxmghc88v2vjb5r4m0c7g24vrb14";

85+ sha256 = "0ky3zc8i5rjg2dpdb95icsgb443siim9sv71xwcmryjxp5rhkqyx";

8686 type = "gem";

8787 };

88− version = "5.2.6.2";

88+ version = "5.2.6.3";

8989 };

9090 activestorage = {

9191 dependencies = ["actionpack" "activerecord" "marcel"];

@@ -93,10 +93,10 @@

9393 platforms = [];

9494 source = {

9595 remotes = ["https://rubygems.org"];

96− sha256 = "0h3z331xli0j5didh0g9cv4zrlx32b5csp1566fpy0fr2kgqmpi9";

96+ sha256 = "1risg5jklxrm7j5i4rzaqpb94822ivbjaasblppwmx5f33vhfpca";

9797 type = "gem";

9898 };

99− version = "5.2.6.2";

99+ version = "5.2.6.3";

100100 };

101101 activesupport = {

102102 dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];

@@ -104,10 +104,10 @@

104104 platforms = [];

105105 source = {

106106 remotes = ["https://rubygems.org"];

107− sha256 = "164lmi9w96wdwd00dnly8f9dcak3blv49ymyqz30q2fdjn45c775";

107+ sha256 = "09vif5aajkvrsdcl51kvk8crz8hl38awprh7d5wj93nscpxmqgns";

108108 type = "gem";

109109 };

110− version = "5.2.6.2";

110+ version = "5.2.6.3";

111111 };

112112 addressable = {

113113 dependencies = ["public_suffix"];

@@ -186,10 +186,10 @@

186186 platforms = [];

187187 source = {

188188 remotes = ["https://rubygems.org"];

189− sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";

189+ sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";

190190 type = "gem";

191191 };

192− version = "1.1.9";

192+ version = "1.1.10";

193193 };

194194 crass = {

195195 groups = ["default"];

@@ -280,10 +280,10 @@

280280 platforms = [];

281281 source = {

282282 remotes = ["https://rubygems.org"];

283− sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w";

283+ sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km";

284284 type = "gem";

285285 };

286− version = "2.14.0";

286+ version = "2.16.0";

287287 };

288288 mail = {

289289 dependencies = ["mini_mime"];

@@ -336,16 +336,6 @@

336336 };

337337 version = "1.0.3";

338338 };

339− mini_portile2 = {

340− groups = ["default" "test"];

341− platforms = [];

342− source = {

343− remotes = ["https://rubygems.org"];

344− sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k";

345− type = "gem";

346− };

347− version = "2.5.3";

348− };

349339 minitest = {

350340 groups = ["default" "test"];

351341 platforms = [];

@@ -405,7 +395,7 @@

405395 version = "2.5.8";

406396 };

407397 nokogiri = {

408− dependencies = ["mini_portile2" "racc"];

398+ dependencies = ["racc"];

409399 groups = ["default" "test"];

410400 platforms = [];

411401 source = {

@@ -420,10 +410,10 @@

420410 platforms = [];

421411 source = {

422412 remotes = ["https://rubygems.org"];

423− sha256 = "1hkfpm78c2vs1qblnva3k1grijvxh87iixcnyd83s3lxrxsjvag4";

413+ sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb";

424414 type = "gem";

425415 };

426− version = "1.21.0";

416+ version = "1.22.1";

427417 };

428418 parser = {

429419 dependencies = ["ast"];

@@ -431,10 +421,10 @@

431421 platforms = [];

432422 source = {

433423 remotes = ["https://rubygems.org"];

434− sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c";

424+ sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d";

435425 type = "gem";

436426 };

437− version = "3.1.1.0";

427+ version = "3.1.2.0";

438428 };

439429 pg = {

440430 groups = ["default"];

@@ -459,10 +449,10 @@

459449 platforms = [];

460450 source = {

461451 remotes = ["https://rubygems.org"];

462− sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";

452+ sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";

463453 type = "gem";

464454 };

465− version = "4.0.6";

455+ version = "4.0.7";

466456 };

467457 puma = {

468458 dependencies = ["nio4r"];

@@ -470,10 +460,10 @@

470460 platforms = [];

471461 source = {

472462 remotes = ["https://rubygems.org"];

473− sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56";

463+ sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw";

474464 type = "gem";

475465 };

476− version = "5.6.2";

466+ version = "5.6.4";

477467 };

478468 racc = {

479469 groups = ["default" "test"];

@@ -523,10 +513,10 @@

523513 platforms = [];

524514 source = {

525515 remotes = ["https://rubygems.org"];

526− sha256 = "0fgbld733j2j85pf8kpv1mvp8rmlkqs7ccv77q2mwfm7ri4yisy0";

516+ sha256 = "19962nkjssr77753a8893yz17kmvb63h9rl3ajq6r8rx9xifq8fn";

527517 type = "gem";

528518 };

529− version = "5.2.6.2";

519+ version = "5.2.6.3";

530520 };

531521 rails-dom-testing = {

532522 dependencies = ["activesupport" "nokogiri"];

@@ -556,10 +546,10 @@

556546 platforms = [];

557547 source = {

558548 remotes = ["https://rubygems.org"];

559− sha256 = "1fgyw80j2mss3hdhzxa1b12c7j17az55znq0d16md69if8dwfmic";

549+ sha256 = "0waa50li6vvckz9mznyz4jhks46ba09fmbdadrrj35mzwahyb6fy";

560550 type = "gem";

561551 };

562− version = "5.2.6.2";

552+ version = "5.2.6.3";

563553 };

564554 rainbow = {

565555 groups = ["default" "test"];

@@ -723,10 +713,10 @@

723713 platforms = [];

724714 source = {

725715 remotes = ["https://rubygems.org"];

726− sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv";

716+ sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx";

727717 type = "gem";

728718 };

729− version = "1.16.0";

719+ version = "1.17.0";

730720 };

731721 rubocop-performance = {

732722 dependencies = ["rubocop" "rubocop-ast"];

@@ -818,10 +808,10 @@

818808 platforms = [];

819809 source = {

820810 remotes = ["https://rubygems.org"];

821− sha256 = "0ikgwbl6jv3frfiy3xhg5yxw9d0064rgzghar1rg391xmrc4gm38";

811+ sha256 = "19k5cwg8gyb6lkmz4kab7c5nlplpgj64jy7vw8p5l2i2ysq5hym0";

822812 type = "gem";

823813 };

824− version = "4.0.2";

814+ version = "4.0.3";

825815 };

826816 sprockets-rails = {

827817 dependencies = ["actionpack" "activesupport" "sprockets"];

pkgs/applications/version-management/redmine/update.shnew file+17

@@ -0,0 +1,17 @@

1+#!/usr/bin/env nix-shell

2+#!nix-shell --pure -i bash -p cacert bundix

4+# Do these steps before running this script:

5+# 1. Copy Gemfile from new Redmine version to this folder

6+# 2. Manually modify the database lines in Gemfile (diff the two files, it's obvious)

8+pkg_dir="$(dirname "$0")"

9+cd ${pkg_dir}

10+

11+for file in "gemset.nix" "Gemfile.lock"; do

12+ if [ -f ${file} ]; then

13+ rm ${file}

14+ fi

15+done

16+

17+bundix -l