Unverified Commit 9889d760 authored by Aaron Andersen's avatar Aaron Andersen Committed by GitHub
Browse files

Merge pull request #232607 from plumelo/feat/redmine-5 

redmine: 4.2.10 -> 5.0.5
parents 6e805348 739e17c3

nixos/modules/services/misc/redmine.nix

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ in 
        Group = cfg.group;

        TimeoutSec = "300";

        WorkingDirectory = "${cfg.package}/share/redmine";

        ExecStart="${bundle} exec rails server webrick -e production -p ${toString cfg.port} -P '${cfg.stateDir}/redmine.pid'";

        ExecStart="${bundle} exec rails server -u webrick -e production -p ${toString cfg.port} -P '${cfg.stateDir}/redmine.pid'";

      };



    };

pkgs/applications/version-management/redmine/Gemfile

+46 −41
Original line number Diff line number Diff line 
source 'https://rubygems.org'



ruby '>= 2.4.0', '< 2.8.0'

gem 'bundler', '>= 1.12.0'

ruby '>= 2.7.0', '< 3.3.0'



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'

gem 'rails', '6.1.7.3'

gem 'rouge', '~> 4.1.0'

gem 'request_store', '~> 1.5.0'

gem "mini_mime", "~> 1.0.1"

gem 'mini_mime', '~> 1.1.0'

gem "actionpack-xml_parser"

gem 'roadie-rails', (RUBY_VERSION < '2.5' ? '~> 1.3.0' : '~> 2.2.0')

gem 'roadie-rails', '~> 3.0.0'

gem 'marcel'

gem "mail", "~> 2.7.1"

gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1')

gem 'nokogiri', (if Gem.ruby_version < Gem::Version.new('2.5.0')

                   '~> 1.10.10'

                 elsif Gem.ruby_version < Gem::Version.new('2.6.0')

                   '~> 1.12.5'

                 else

                   '~> 1.13.10'

                 end)

gem 'i18n', '~> 1.8.2'

gem 'rbpdf', '~> 1.21.0'

gem 'mail', '~> 2.8.1'

gem 'nokogiri', '~> 1.14.0'

gem 'i18n', '~> 1.13.0'

gem 'rbpdf', '~> 1.21.1'

gem 'addressable'

gem 'rubyzip', '~> 2.3.0'

gem 'psych', '~> 3.1' if Gem.ruby_version < Gem::Version.new('2.6.0')



#  Ruby Standard Gems

gem 'csv', '~> 3.2.6'

gem 'net-imap', '~> 0.3.4'

gem 'net-pop', '~> 0.1.2'

gem 'net-smtp', '~> 0.3.3'

gem 'rexml', require: false if Gem.ruby_version >= Gem::Version.new('3.0')



# Windows does not include zoneinfo files, so bundle the tzinfo-data gem

gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
@@ -34,54 +30,63 @@ gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] 
gem 'rotp', '>= 5.0.0'

gem 'rqrcode'



# HTML pipeline and sanitization

gem "html-pipeline", "~> 2.13.2"

gem "sanitize", "~> 6.0"



# Optional gem for LDAP authentication

group :ldap do

  gem 'net-ldap', '~> 0.17.0'

end



# Optional gem for OpenID authentication

group :openid do

  gem "ruby-openid", "~> 2.9.2", :require => "openid"

  gem "rack-openid"

end



# Optional gem for exporting the gantt to a PNG file

group :minimagick do

  gem 'mini_magick', '~> 4.11.0'

  gem 'mini_magick', '~> 4.12.0'

end



# Optional Markdown support, not for JRuby

# Optional Markdown support

group :markdown do

  gem 'redcarpet', '~> 3.5.1'

  gem 'redcarpet', '~> 3.6.0'

end



# Optional CommonMark support, not for JRuby

group :common_mark do

  gem "commonmarker", '~> 0.23.8'

  gem 'deckar01-task_list', '2.3.2'

end



# webrick

gem 'webrick'



# Include database gems for the database adapters NixOS supports

require 'erb'

require 'yaml'

gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw]

gem "pg", "~> 1.2.2", :platforms => [:mri, :mingw, :x64_mingw]

gem "pg", "~> 1.4.2", :platforms => [:mri, :mingw, :x64_mingw]



group :development do

  gem 'listen', '~> 3.3'

  gem "yard"

end



group :test do

  gem "rails-dom-testing"

  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]

  gem 'mocha', '>= 1.4.0'

  gem 'simplecov', '~> 0.22.0', :require => false

  gem "ffi", platforms: [:mri, :mingw, :x64_mingw, :mswin]

  # For running system tests

  # TODO: Remove version specification once Capybara supports Puma 6

  gem 'puma', '< 6.0.0'

  gem 'capybara', '~> 3.31.0'

  gem 'puma'

  gem 'capybara', '~> 3.38.0'

  gem "selenium-webdriver", "~> 3.142.7"

  gem 'webdrivers', '~> 4.4', require: false

  gem 'webdrivers', '4.6.1', require: false

  # RuboCop

  gem 'rubocop', '~> 1.12.0'

  gem 'rubocop-performance', '~> 1.10.1'

  gem 'rubocop-rails', '~> 2.9.0'

  gem 'rubocop', '~> 1.51.0', require: false

  gem 'rubocop-performance', '~> 1.17.1', require: false

  gem 'rubocop-rails', '~> 2.19.1', require: false

end



local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")

if File.exists?(local_gemfile)

if File.exist?(local_gemfile)

  eval_gemfile local_gemfile

end

pkgs/applications/version-management/redmine/Gemfile.lock

+177 −121
Original line number Diff line number Diff line 
GEM

  remote: https://rubygems.org/

  specs:

    actioncable (5.2.8.1)

      actionpack (= 5.2.8.1)

    actioncable (6.1.7.3)

      actionpack (= 6.1.7.3)

      activesupport (= 6.1.7.3)

      nio4r (~> 2.0)

      websocket-driver (>= 0.6.1)

    actionmailer (5.2.8.1)

      actionpack (= 5.2.8.1)

      actionview (= 5.2.8.1)

      activejob (= 5.2.8.1)

    actionmailbox (6.1.7.3)

      actionpack (= 6.1.7.3)

      activejob (= 6.1.7.3)

      activerecord (= 6.1.7.3)

      activestorage (= 6.1.7.3)

      activesupport (= 6.1.7.3)

      mail (>= 2.7.1)

    actionmailer (6.1.7.3)

      actionpack (= 6.1.7.3)

      actionview (= 6.1.7.3)

      activejob (= 6.1.7.3)

      activesupport (= 6.1.7.3)

      mail (~> 2.5, >= 2.5.4)

      rails-dom-testing (~> 2.0)

    actionpack (5.2.8.1)

      actionview (= 5.2.8.1)

      activesupport (= 5.2.8.1)

      rack (~> 2.0, >= 2.0.8)

    actionpack (6.1.7.3)

      actionview (= 6.1.7.3)

      activesupport (= 6.1.7.3)

      rack (~> 2.0, >= 2.0.9)

      rack-test (>= 0.6.3)

      rails-dom-testing (~> 2.0)

      rails-html-sanitizer (~> 1.0, >= 1.0.2)

      rails-html-sanitizer (~> 1.0, >= 1.2.0)

    actionpack-xml_parser (2.0.1)

      actionpack (>= 5.0)

      railties (>= 5.0)

    actionview (5.2.8.1)

      activesupport (= 5.2.8.1)

    actiontext (6.1.7.3)

      actionpack (= 6.1.7.3)

      activerecord (= 6.1.7.3)

      activestorage (= 6.1.7.3)

      activesupport (= 6.1.7.3)

      nokogiri (>= 1.8.5)

    actionview (6.1.7.3)

      activesupport (= 6.1.7.3)

      builder (~> 3.1)

      erubi (~> 1.4)

      rails-dom-testing (~> 2.0)

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

    activejob (5.2.8.1)

      activesupport (= 5.2.8.1)

      rails-html-sanitizer (~> 1.1, >= 1.2.0)

    activejob (6.1.7.3)

      activesupport (= 6.1.7.3)

      globalid (>= 0.3.6)

    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.1)

      actionpack (= 5.2.8.1)

      activerecord (= 5.2.8.1)

      marcel (~> 1.0.0)

    activesupport (5.2.8.1)

    activemodel (6.1.7.3)

      activesupport (= 6.1.7.3)

    activerecord (6.1.7.3)

      activemodel (= 6.1.7.3)

      activesupport (= 6.1.7.3)

    activestorage (6.1.7.3)

      actionpack (= 6.1.7.3)

      activejob (= 6.1.7.3)

      activerecord (= 6.1.7.3)

      activesupport (= 6.1.7.3)

      marcel (~> 1.0)

      mini_mime (>= 1.1.0)

    activesupport (6.1.7.3)

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

      i18n (>= 0.7, < 2)

      minitest (~> 5.1)

      tzinfo (~> 1.1)

    addressable (2.8.1)

      i18n (>= 1.6, < 2)

      minitest (>= 5.1)

      tzinfo (~> 2.0)

      zeitwerk (~> 2.3)

    addressable (2.8.4)

      public_suffix (>= 2.0.2, < 6.0)

    arel (9.0.0)

    ast (2.4.2)

    builder (3.2.4)

    capybara (3.31.0)

    capybara (3.38.0)

      addressable

      matrix

      mini_mime (>= 0.1.3)

      nokogiri (~> 1.8)

      rack (>= 1.6.0)

      rack-test (>= 0.6.3)

      regexp_parser (~> 1.5)

      regexp_parser (>= 1.5, < 3.0)

      xpath (~> 3.2)

    childprocess (3.0.0)

    chunky_png (1.4.0)

    commonmarker (0.23.9)

    concurrent-ruby (1.2.2)

    crass (1.0.6)

    css_parser (1.14.0)

      addressable

    csv (3.1.9)

    csv (3.2.6)

    date (3.3.3)

    deckar01-task_list (2.3.2)

      html-pipeline

    docile (1.4.0)

    erubi (1.12.0)

    ffi (1.15.5)

    globalid (1.1.0)

      activesupport (>= 5.0)

    html-pipeline (2.13.2)

      activesupport (>= 2)

      nokogiri (>= 1.4)

    htmlentities (4.3.4)

    i18n (1.8.11)

    i18n (1.13.0)

      concurrent-ruby (~> 1.0)

    loofah (2.19.1)

    json (2.6.3)

    listen (3.8.0)

      rb-fsevent (~> 0.10, >= 0.10.3)

      rb-inotify (~> 0.9, >= 0.9.10)

    loofah (2.21.3)

      crass (~> 1.0.2)

      nokogiri (>= 1.5.9)

    mail (2.7.1)

      nokogiri (>= 1.12.0)

    mail (2.8.1)

      mini_mime (>= 0.1.1)

      net-imap

      net-pop

      net-smtp

    marcel (1.0.2)

    matrix (0.4.2)

    method_source (1.0.0)

    mini_magick (4.11.0)

    mini_mime (1.0.3)

    mini_portile2 (2.8.1)

    mini_magick (4.12.0)

    mini_mime (1.1.2)

    mini_portile2 (2.8.2)

    minitest (5.18.0)

    mocha (2.0.2)

      ruby2_keywords (>= 0.0.5)

    mysql2 (0.5.5)

    net-imap (0.3.4)

      date

      net-protocol

    net-ldap (0.17.1)

    nio4r (2.5.8)

    nokogiri (1.13.10)

    net-pop (0.1.2)

      net-protocol

    net-protocol (0.2.1)

      timeout

    net-smtp (0.3.3)

      net-protocol

    nio4r (2.5.9)

    nokogiri (1.14.4)

      mini_portile2 (~> 2.8.0)

      racc (~> 1.4)

    nokogiri (1.13.10-x86_64-linux)

    nokogiri (1.14.4-x86_64-linux)

      racc (~> 1.4)

    parallel (1.22.1)

    parser (3.2.1.1)

    parallel (1.23.0)

    parser (3.2.2.1)

      ast (~> 2.4.1)

    pg (1.2.3)

    pg (1.4.6)

    public_suffix (5.0.1)

    puma (5.6.5)

    puma (6.2.2)

      nio4r (~> 2.0)

    racc (1.6.2)

    rack (2.2.6.4)

    rack-openid (1.4.2)

      rack (>= 1.1.0)

      ruby-openid (>= 2.1.8)

    rack (2.2.7)

    rack-test (2.1.0)

      rack (>= 1.3)

    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.1)

    rails (6.1.7.3)

      actioncable (= 6.1.7.3)

      actionmailbox (= 6.1.7.3)

      actionmailer (= 6.1.7.3)

      actionpack (= 6.1.7.3)

      actiontext (= 6.1.7.3)

      actionview (= 6.1.7.3)

      activejob (= 6.1.7.3)

      activemodel (= 6.1.7.3)

      activerecord (= 6.1.7.3)

      activestorage (= 6.1.7.3)

      activesupport (= 6.1.7.3)

      bundler (>= 1.15.0)

      railties (= 6.1.7.3)

      sprockets-rails (>= 2.0.0)

    rails-dom-testing (2.0.3)

      activesupport (>= 4.2.0)

      nokogiri (>= 1.6)

    rails-html-sanitizer (1.5.0)

      loofah (~> 2.19, >= 2.19.1)

    railties (5.2.8.1)

      actionpack (= 5.2.8.1)

      activesupport (= 5.2.8.1)

    railties (6.1.7.3)

      actionpack (= 6.1.7.3)

      activesupport (= 6.1.7.3)

      method_source

      rake (>= 0.8.7)

      thor (>= 0.19.0, < 2.0)

      rake (>= 12.2)

      thor (~> 1.0)

    rainbow (3.1.1)

    rake (13.0.6)

    rb-fsevent (0.11.2)

    rb-inotify (0.10.1)

      ffi (~> 1.0)

    rbpdf (1.21.1)

      htmlentities

      rbpdf-font (~> 1.19.0)

    rbpdf-font (1.19.1)

    redcarpet (3.5.1)

    regexp_parser (1.8.2)

    redcarpet (3.6.0)

    regexp_parser (2.8.0)

    request_store (1.5.1)

      rack (>= 1.4)

    rexml (3.2.5)

    roadie (4.0.0)

    roadie (5.1.0)

      css_parser (~> 1.4)

      nokogiri (~> 1.8)

    roadie-rails (2.2.0)

      railties (>= 5.1, < 6.2)

      roadie (>= 3.1, < 5.0)

    roadie-rails (3.0.0)

      railties (>= 5.1, < 7.1)

      roadie (~> 5.0)

    rotp (6.2.2)

    rouge (3.26.1)

    rqrcode (2.1.2)

    rouge (4.1.1)

    rqrcode (2.2.0)

      chunky_png (~> 1.0)

      rqrcode_core (~> 1.0)

    rqrcode_core (1.2.0)

    rubocop (1.12.1)

    rubocop (1.51.0)

      json (~> 2.3)

      parallel (~> 1.10)

      parser (>= 3.0.0.0)

      parser (>= 3.2.0.0)

      rainbow (>= 2.2.2, < 4.0)

      regexp_parser (>= 1.8, < 3.0)

      rexml

      rubocop-ast (>= 1.2.0, < 2.0)

      rexml (>= 3.2.5, < 4.0)

      rubocop-ast (>= 1.28.0, < 2.0)

      ruby-progressbar (~> 1.7)

      unicode-display_width (>= 1.4.0, < 3.0)

    rubocop-ast (1.28.0)

      unicode-display_width (>= 2.4.0, < 3.0)

    rubocop-ast (1.28.1)

      parser (>= 3.2.1.0)

    rubocop-performance (1.10.2)

      rubocop (>= 0.90.0, < 2.0)

    rubocop-performance (1.17.1)

      rubocop (>= 1.7.0, < 2.0)

      rubocop-ast (>= 0.4.0)

    rubocop-rails (2.9.1)

    rubocop-rails (2.19.1)

      activesupport (>= 4.2.0)

      rack (>= 1.1)

      rubocop (>= 0.90.0, < 2.0)

    ruby-openid (2.9.2)

      rubocop (>= 1.33.0, < 2.0)

    ruby-progressbar (1.13.0)

    ruby2_keywords (0.0.5)

    rubyzip (2.3.2)

    sanitize (6.0.1)

      crass (~> 1.0.2)

      nokogiri (>= 1.12.0)

    selenium-webdriver (3.142.7)

      childprocess (>= 0.5, < 4.0)

      rubyzip (>= 1.2.2)

    simplecov (0.18.5)

    simplecov (0.22.0)

      docile (~> 1.1)

      simplecov-html (~> 0.11)

      simplecov_json_formatter (~> 0.1)

    simplecov-html (0.12.3)

    simplecov_json_formatter (0.1.4)

    sprockets (4.2.0)

      concurrent-ruby (~> 1.0)

      rack (>= 2.2.4, < 4)
@@ -190,23 +240,23 @@ GEM 
      actionpack (>= 5.2)

      activesupport (>= 5.2)

      sprockets (>= 3.0.0)

    thor (1.2.1)

    thread_safe (0.3.6)

    tzinfo (1.2.11)

      thread_safe (~> 0.1)

    thor (1.2.2)

    timeout (0.3.2)

    tzinfo (2.0.6)

      concurrent-ruby (~> 1.0)

    unicode-display_width (2.4.2)

    webdrivers (4.7.0)

    webdrivers (4.6.1)

      nokogiri (~> 1.6)

      rubyzip (>= 1.3.0)

      selenium-webdriver (> 3.141, < 5.0)

    webrick (1.7.0)

      selenium-webdriver (>= 3.0, < 4.0)

    webrick (1.8.1)

    websocket-driver (0.7.5)

      websocket-extensions (>= 0.1.0)

    websocket-extensions (0.1.5)

    xpath (3.2.0)

      nokogiri (~> 1.8)

    yard (0.9.28)

      webrick (~> 1.7.0)

    yard (0.9.34)

    zeitwerk (2.6.8)



PLATFORMS

  ruby
@@ -214,40 +264,46 @@ PLATFORMS 
DEPENDENCIES

  actionpack-xml_parser

  addressable

  bundler (>= 1.12.0)

  capybara (~> 3.31.0)

  csv (~> 3.1.1)

  capybara (~> 3.38.0)

  commonmarker (~> 0.23.8)

  csv (~> 3.2.6)

  deckar01-task_list (= 2.3.2)

  ffi

  i18n (~> 1.8.2)

  mail (~> 2.7.1)

  html-pipeline (~> 2.13.2)

  i18n (~> 1.13.0)

  listen (~> 3.3)

  mail (~> 2.8.1)

  marcel

  mini_magick (~> 4.11.0)

  mini_mime (~> 1.0.1)

  mini_magick (~> 4.12.0)

  mini_mime (~> 1.1.0)

  mocha (>= 1.4.0)

  mysql2 (~> 0.5.0)

  net-imap (~> 0.3.4)

  net-ldap (~> 0.17.0)

  nokogiri (~> 1.13.10)

  pg (~> 1.2.2)

  puma (< 6.0.0)

  rack-openid

  rails (= 5.2.8.1)

  net-pop (~> 0.1.2)

  net-smtp (~> 0.3.3)

  nokogiri (~> 1.14.0)

  pg (~> 1.4.2)

  puma

  rails (= 6.1.7.3)

  rails-dom-testing

  rbpdf (~> 1.21.0)

  redcarpet (~> 3.5.1)

  rbpdf (~> 1.21.1)

  redcarpet (~> 3.6.0)

  request_store (~> 1.5.0)

  roadie-rails (~> 2.2.0)

  roadie-rails (~> 3.0.0)

  rotp (>= 5.0.0)

  rouge (~> 3.26.0)

  rouge (~> 4.1.0)

  rqrcode

  rubocop (~> 1.12.0)

  rubocop-performance (~> 1.10.1)

  rubocop-rails (~> 2.9.0)

  ruby-openid (~> 2.9.2)

  rubocop (~> 1.51.0)

  rubocop-performance (~> 1.17.1)

  rubocop-rails (~> 2.19.1)

  rubyzip (~> 2.3.0)

  sanitize (~> 6.0)

  selenium-webdriver (~> 3.142.7)

  simplecov (~> 0.18.5)

  simplecov (~> 0.22.0)

  tzinfo-data

  webdrivers (~> 4.4)

  webdrivers (= 4.6.1)

  webrick

  yard



RUBY VERSION

pkgs/applications/version-management/redmine/default.nix

+5 −5
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper, nixosTests }:

{ lib, stdenv, fetchurl, bundlerEnv, ruby, defaultGemConfig, makeWrapper, nixosTests }:



let

  version = "4.2.10";

  version = "5.0.5";

  rubyEnv = bundlerEnv {

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



    inherit ruby;

    gemdir = ./.;

    groups = [ "development" "ldap" "markdown" "minimagick" "openid" "test" ];

    groups = [ "development" "ldap" "markdown" "common_mark" "minimagick" "test" ];

  };

in

  stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ in 


    src = fetchurl {

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

      sha256 = "sha256-byY4jCOJKWJVLKSR1e/tq9QtrIiGHdnYC8M0WPZb4ek=";

      sha256 = "sha256-qJrRxLub8CXmUnx3qxjI+vd0nJSpdcryz9u6AOsSpIE=";

    };



    nativeBuildInputs = [ makeWrapper ];
@@ -47,7 +47,7 @@ in 
    meta = with lib; {

      homepage = "https://www.redmine.org/";

      platforms = platforms.linux;

      maintainers = with maintainers; [ aanderse felixsinger ];

      maintainers = with maintainers; [ aanderse felixsinger megheaiulian ];

      license = licenses.gpl2;

    };

  }

pkgs/applications/version-management/redmine/gemset.nix

+321 −142

File changed.

Preview size limit exceeded, changes collapsed.