Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 07ead02f6b1e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4c0be4081551
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Mar 1, 2019

  1. redmine: 3.4.8 -> 3.4.9

    @aanderse
    aanderse committed Mar 1, 2019
    Copy the full SHA
    5b1b46f View commit details

Commits on Mar 2, 2019

  1. Merge pull request #56558 from aanderse/redmine-18.09 

    redmine: 3.4.8 -> 3.4.9 [18.09 backport]
    @7c6f434c
    7c6f434c authored Mar 2, 2019
    Copy the full SHA
    4c0be40 View commit details
3 changes: 2 additions & 1 deletion pkgs/applications/version-management/redmine/Gemfile
View file
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions pkgs/applications/version-management/redmine/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -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)
@@ -89,7 +89,7 @@ GEM
protected_attributes (1.1.4)
activemodel (>= 4.0.1, < 5.0)
public_suffix (3.0.3)
rack (1.6.10)
rack (1.6.11)
rack-openid (1.4.2)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
@@ -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)
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/redmine/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
12 changes: 6 additions & 6 deletions pkgs/applications/version-management/redmine/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = {
@@ -350,10 +350,10 @@
rack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q";
sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
type = "gem";
};
version = "1.6.10";
version = "1.6.11";
};
rack-openid = {
dependencies = ["rack" "ruby-openid"];
@@ -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 = {