From a5d5057d9acb5c69cb6879cdfc38efbc7163b5b6 Mon Sep 17 00:00:00 2001 From: squalus Date: Wed, 14 Dec 2022 09:34:30 -0800 Subject: [PATCH 1/4] librewolf: 107.0.1-2 -> 108.0-1 (cherry picked from commit 5046b3bd1a23a1553a98412603bf86bdaaa56b09) --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 8cc32b8e3b31..4070556cdce6 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "107.0.1-2", + "packageVersion": "108.0-1", "source": { - "rev": "107.0.1-2", - "sha256": "1s009nbsqihmhnaa20j9g1qyifl3kgsbpgxc8ms5ahx3j97hbpk5" + "rev": "108.0-1", + "sha256": "1gfqxlcgf7qxgisbj565ndrfhkk68py2jpwrx7k2j7zpszkb2f4m" }, "firefox": { - "version": "107.0.1", - "sha512": "e57e4bfcecbcc6dbe73f23577a14a2998c8c3f3d602f85ea06f99e0974e78481b9f7bdb019cb4e9733e59f56be1407edd64a2adb7b284bb4a87b46b1e2295dea" + "version": "108.0", + "sha512": "fa800f62cca395a51b9a04373a27be48fc3860208e34ecf74d908127638d1eb8c41cf9898be6896777d408127d5c4b7104d9ee89c97da923b2dc6ea32186187e" } } From 2772a171db929b526fee2d7cfe99af3bc5c6e285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 19 Dec 2022 09:56:30 -0800 Subject: [PATCH 2/4] imagemagick: 7.1.0-54 -> 7.1.0-55 Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.0-54...7.1.0-55 (cherry picked from commit d0be85dd11eb919bedd912d7125767dfbfa728be) --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index d1f2a8195b05..c57366ab9d6d 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-54"; + version = "7.1.0-55"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-aQipCcqOS9viOLPHEx21MrJHdxYKZl++3DIKMz97Ukw="; + hash = "sha256-V0poyS1QnHhnSc3QbHHE+BctCBv2knriK0ihMF565d8="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 4325b72aaa4e6b16a56dcfe3bf4f9ba186979507 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Wed, 5 Oct 2022 01:36:56 +0200 Subject: [PATCH 3/4] redmine: 4.2.7 -> 4.2.8 (cherry picked from commit 32a43582e7dc2eadc58c572b8eb83be992cd6ffa) --- .../version-management/redmine/Gemfile | 3 +- .../version-management/redmine/Gemfile.lock | 88 +++++++++---------- .../version-management/redmine/default.nix | 4 +- .../version-management/redmine/gemset.nix | 64 +++++++------- 4 files changed, 79 insertions(+), 80 deletions(-) diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index 3b22a9d50743..7e5cf752bc88 100644 --- a/pkgs/applications/version-management/redmine/Gemfile +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby '>= 2.4.0', '< 2.8.0' gem 'bundler', '>= 1.12.0' -gem 'rails', '5.2.8' +gem 'rails', '5.2.8.1' gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') gem 'rouge', '~> 3.26.0' @@ -25,6 +25,7 @@ gem 'i18n', '~> 1.8.2' gem "rbpdf", "~> 1.20.0" gem 'addressable' gem 'rubyzip', '~> 2.3.0' +gem 'psych', '~> 3.1' if Gem.ruby_version < Gem::Version.new('2.6.0') # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index 5ad1b80d3c77..c57844b49a28 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,19 +1,19 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.8) - actionpack (= 5.2.8) + actioncable (5.2.8.1) + actionpack (= 5.2.8.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.8) - actionpack (= 5.2.8) - actionview (= 5.2.8) - activejob (= 5.2.8) + actionmailer (5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.8) - actionview (= 5.2.8) - activesupport (= 5.2.8) + actionpack (5.2.8.1) + actionview (= 5.2.8.1) + activesupport (= 5.2.8.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -21,26 +21,26 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.2.8) - activesupport (= 5.2.8) + actionview (5.2.8.1) + activesupport (= 5.2.8.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.8) - activesupport (= 5.2.8) + activejob (5.2.8.1) + activesupport (= 5.2.8.1) globalid (>= 0.3.6) - activemodel (5.2.8) - activesupport (= 5.2.8) - activerecord (5.2.8) - activemodel (= 5.2.8) - activesupport (= 5.2.8) + activemodel (5.2.8.1) + activesupport (= 5.2.8.1) + activerecord (5.2.8.1) + activemodel (= 5.2.8.1) + activesupport (= 5.2.8.1) arel (>= 9.0) - activestorage (5.2.8) - actionpack (= 5.2.8) - activerecord (= 5.2.8) + activestorage (5.2.8.1) + actionpack (= 5.2.8.1) + activerecord (= 5.2.8.1) marcel (~> 1.0.0) - activesupport (5.2.8) + activesupport (5.2.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -62,7 +62,7 @@ GEM chunky_png (1.4.0) concurrent-ruby (1.1.10) crass (1.0.6) - css_parser (1.11.0) + css_parser (1.12.0) addressable csv (3.1.9) docile (1.4.0) @@ -72,7 +72,7 @@ GEM htmlentities (4.3.4) i18n (1.8.11) concurrent-ruby (~> 1.0) - loofah (2.18.0) + loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -83,15 +83,13 @@ GEM mini_mime (1.0.3) mini_portile2 (2.8.0) minitest (5.16.3) - mocha (1.14.0) + mocha (1.15.0) mysql2 (0.5.4) net-ldap (0.17.1) nio4r (2.5.8) nokogiri (1.13.8) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.13.8-x86_64-linux) - racc (~> 1.4) parallel (1.22.1) parser (3.1.2.1) ast (~> 2.4.1) @@ -106,27 +104,27 @@ GEM ruby-openid (>= 2.1.8) rack-test (2.0.2) rack (>= 1.3) - rails (5.2.8) - actioncable (= 5.2.8) - actionmailer (= 5.2.8) - actionpack (= 5.2.8) - actionview (= 5.2.8) - activejob (= 5.2.8) - activemodel (= 5.2.8) - activerecord (= 5.2.8) - activestorage (= 5.2.8) - activesupport (= 5.2.8) + rails (5.2.8.1) + actioncable (= 5.2.8.1) + actionmailer (= 5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) + activemodel (= 5.2.8.1) + activerecord (= 5.2.8.1) + activestorage (= 5.2.8.1) + activesupport (= 5.2.8.1) bundler (>= 1.3.0) - railties (= 5.2.8) + railties (= 5.2.8.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.3) loofah (~> 2.3) - railties (5.2.8) - actionpack (= 5.2.8) - activesupport (= 5.2.8) + railties (5.2.8.1) + actionpack (= 5.2.8.1) + activesupport (= 5.2.8.1) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -174,7 +172,7 @@ GEM ruby-openid (2.9.2) ruby-progressbar (1.11.0) rubyzip (2.3.2) - selenium-webdriver (4.4.0) + selenium-webdriver (4.5.0) childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) @@ -194,7 +192,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.10) thread_safe (~> 0.1) - unicode-display_width (2.2.0) + unicode-display_width (2.3.0) webdrivers (4.7.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) @@ -231,7 +229,7 @@ DEPENDENCIES pg (~> 1.2.2) puma rack-openid - rails (= 5.2.8) + rails (= 5.2.8.1) rails-dom-testing rbpdf (~> 1.20.0) redcarpet (~> 3.5.1) @@ -255,4 +253,4 @@ RUBY VERSION ruby 2.7.6p219 BUNDLED WITH - 2.3.20 + 2.3.9 diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index a518a9cec2e8..9da39ba4b1c9 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.7"; + version = "4.2.8"; 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-7UvgO1q2PCZBqH24l4c53Zl8D2Rr+hAQrJ5SEMNDck4="; + sha256 = "sha256-C0McBS2P02uTIB2vrzYVzbjQNGDvzyQA59MmYrKrYnI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index a478796ca226..5248ff369830 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "123nrlrh5kikl314l4gjbc8ljw3h2ppzhpmm7cilisqvn71s5ysd"; + sha256 = "1v5bihkn3cdf7s1cv04wqpk3l5snjgyav0jz9x5vhzzdqyknvndr"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18vrdwdwfmrnpj8k30qhvdx23km233ffnhhzpbmx8m6spavwvli2"; + sha256 = "1x0qjs8v5z5wzk7vlg7pdr71hsm154d8d0gwhya573xpxfjzmjpx"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1knnka6n292f4hhbjfchpa4sbjj79wys5y8bcggm8ah894051kzk"; + sha256 = "0mqvz5dsg9zis34y8m4d2ackr3zs7h27mv6zx5yx00a58fifhyv3"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zndg7ax4bckayjw558p9hz92ic6x3r5acfbd5vnad0xh7hfdrmx"; + sha256 = "06bk0hyv2sq386qc7r96qbhskg91apdj3mrdpzhry6p6nby2afml"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kzb5y4lflmvi3vxz2zrj55k6xyys2h5bdqp2ki69rcyd4ay5qrg"; + sha256 = "12y07kvq9y30ycl4i45g9c2c9jv5a9vlxvrjaqfl79iim6gk1klz"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b6pskl8x4c1hcsf4xh4cl9qlh814s91bjv3yy94cdc4xpl76vr6"; + sha256 = "0vsyxbjpl47grlkzgh2rm0i9yksfwk11lsdi11jmqszc6lkj1b9g"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "078iiv5g02n1ivrgpkbw5bxkbihi85msvn88p5q37vbfr14ynk0a"; + sha256 = "0jk8qwdvq465nklxr7z0qzpiacxcqd72y6frimlalchhigl8ya0a"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; activestorage = { dependencies = ["actionpack" "activerecord" "marcel"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xnxgg9j4nr6yw8g3l0jdr9m985k3wrvjql9j5qr5lfcsn9zwz4w"; + sha256 = "0qklddvw3v13dh79c7vljad8m25frlhnwcnw9xk510d676j3lr8a"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0anvhpxjgic1cv1h66lmz6x5nd7g0bbnwl0rgxnbdr3w76fa8w02"; + sha256 = "0r15sbhl4nrkh2g5ccbhmn3c2ngri71j0yfnarxkq90vdrhqqjgh"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -207,10 +207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; + sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; csv = { groups = ["default"]; @@ -280,10 +280,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; + sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; type = "gem"; }; - version = "2.18.0"; + version = "2.19.0"; }; mail = { dependencies = ["mini_mime"]; @@ -361,10 +361,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ffd7zn24lwhp3xp747jfg4zxgqbm04ar7shhjy2iv5xg1pz01lr"; + sha256 = "0z2nzk106b6af6n0d9xqf2sphaff4gpjgxvwqcmvy6k719hqhkh9"; type = "gem"; }; - version = "1.14.0"; + version = "1.15.0"; }; mysql2 = { groups = ["default"]; @@ -523,10 +523,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0884z2ilm4by47qk7my856dr42vzy12ghj241rymp13flaf54449"; + sha256 = "1jy4jfkq0xpqp0d3ii9xhj69kacx8l4q3pincncw2g30bqd7a66g"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -556,10 +556,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "157mmm2jhvq2g08xhq0780i3r4i679h14m68jj7265ik26gbchhc"; + sha256 = "0w9hm85jgbyar748z9nppsz8mgwywa2v9qqlbkzhpgirxhblifv2"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; rainbow = { groups = ["default" "test"]; @@ -786,10 +786,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vy0baak61wr652a7qf249n85sqq5k5mi51ws5ccyyirlsymz2gv"; + sha256 = "0fp7h5bnlqp649imgpnshgf3mxl8zwnpsl1ak1giii81r0cd6in3"; type = "gem"; }; - version = "4.4.0"; + version = "4.5.0"; }; simplecov = { dependencies = ["docile" "simplecov-html"]; @@ -870,10 +870,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nlfck6z986fngp0r74maswmyb1rcksc8xc3mfpw9cj23c3s8zwn"; + sha256 = "0ra70s8prfacpqwj5v2mqn1rbfz6xds3n9nsr9cwzs3z2c0wm5j7"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; webdrivers = { dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"]; From 77ac4a848e5520a240561020055f4ca5d3695571 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 18 Dec 2022 14:21:07 +0000 Subject: [PATCH 4/4] redmine: 4.2.8 -> 4.2.9 (cherry picked from commit 59fb0606d1d37a8f4dc08f2fa088706dd8df4a21) --- .../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"];