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: c43fe70feb82
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 511957a4d4fe
Choose a head ref
  • 9 commits
  • 11 files changed
  • 3 contributors

Commits on Oct 19, 2019

  1. Copy the full SHA
    7370ddd View commit details

Commits on Oct 20, 2019

  1. putty: fix build on darwin

    risicle committed Oct 20, 2019
    Copy the full SHA
    1a5c8cc View commit details

Commits on Oct 21, 2019

  1. unixODBCDrivers.msodbcsql17: add missing openssl dependency

    (cherry picked from commit 18ad0a8)
    aanderse committed Oct 21, 2019
    Copy the full SHA
    51885ec View commit details

Commits on Oct 22, 2019

  1. Copy the full SHA
    7bf4f9f View commit details
  2. wordpress: 5.2.3 -> 5.2.4

    (cherry picked from commit 327d406)
    aanderse committed Oct 22, 2019
    Copy the full SHA
    a18d9fd View commit details
  3. Merge pull request #71606 from aanderse/wordpress

    wordpress: 5.2.3 -> 5.2.4 [19.09 backport]
    globin authored Oct 22, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    e0e7756 View commit details
  4. Merge pull request #71604 from aanderse/redmine-update

    redmine: 3.4.11 -> 3.4.12, 4.0.4 -> 4.0.5 [19.09]
    globin authored Oct 22, 2019
    Copy the full SHA
    a954005 View commit details
  5. Merge pull request #71595 from aanderse/msodbc

    unixODBCDrivers.msodbcsql17: add missing openssl dependency [19.09 backport]
    globin authored Oct 22, 2019
    Copy the full SHA
    88264b3 View commit details
  6. Merge pull request #71411 from risicle/ris-putty-CVE-2019-17069-r19.09

    [r19.09] putty: add patch for CVE-2019-17069
    globin authored Oct 22, 2019
    Copy the full SHA
    511957a View commit details
14 changes: 11 additions & 3 deletions pkgs/applications/networking/remote/putty/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, autoconf, automake, pkgconfig, libtool
, gtk2, halibut, ncurses, perl
{ stdenv, lib, fetchurl, fetchpatch, autoconf, automake, pkgconfig, libtool
, gtk2, halibut, ncurses, perl, darwin
}:

stdenv.mkDerivation rec {
@@ -14,6 +14,14 @@ stdenv.mkDerivation rec {
sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg";
};

patches = [
(fetchpatch {
name = "CVE-2019-17069.patch";
url = "https://git.tartarus.org/?p=simon/putty.git;a=patch;h=69201ad8936fe0ff1b8723b7a43accb5e9f1c888";
sha256 = "1gblwc2r26ikb26b22f2r61b2lkjf80pbclfb5dhhkkqal6kbvga";
})
];

preConfigure = lib.optionalString stdenv.hostPlatform.isUnix ''
perl mkfiles.pl
( cd doc ; make );
@@ -38,7 +46,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ];
buildInputs = lib.optionals stdenv.hostPlatform.isUnix [
gtk2 ncurses
];
] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp;
enableParallelBuilding = true;

meta = with lib; {
5 changes: 4 additions & 1 deletion pkgs/applications/version-management/redmine/4.x/Gemfile
Original file line number Diff line number Diff line change
@@ -16,6 +16,9 @@ gem "nokogiri", (RUBY_VERSION >= "2.3" ? "~> 1.10.0" : "~> 1.9.1")
gem "i18n", "~> 0.7.0"
gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3"

# TODO: Remove the following line when #32223 is fixed
gem "sprockets", "~> 3.7.2"

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
gem "rbpdf", "~> 1.19.6"
@@ -27,7 +30,7 @@ end

# Optional gem for OpenID authentication
group :openid do
gem "ruby-openid", "~> 2.3.0", :require => "openid"
gem "ruby-openid", "~> 2.9.2", :require => "openid"
gem "rack-openid"
end

48 changes: 24 additions & 24 deletions pkgs/applications/version-management/redmine/4.x/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -45,8 +45,8 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
arel (9.0.0)
builder (3.2.3)
capybara (2.18.0)
@@ -56,21 +56,20 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (>= 2.0, < 4.0)
childprocess (1.0.1)
rake (< 13.0)
childprocess (3.0.0)
concurrent-ruby (1.1.5)
crass (1.0.4)
crass (1.0.5)
css_parser (1.7.0)
addressable
csv (3.0.9)
docile (1.1.5)
erubi (1.8.0)
erubi (1.9.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
htmlentities (4.3.4)
i18n (0.7.0)
json (2.2.0)
loofah (2.2.3)
loofah (2.3.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
@@ -80,18 +79,18 @@ GEM
metaclass (0.0.4)
method_source (0.9.2)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
mocha (1.8.0)
minitest (5.12.2)
mocha (1.9.0)
metaclass (~> 0.0.1)
mysql2 (0.5.2)
net-ldap (0.16.1)
nio4r (2.3.1)
nokogiri (1.10.3)
nio4r (2.5.2)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
pg (1.1.4)
public_suffix (3.1.0)
public_suffix (4.0.1)
puma (3.12.1)
rack (2.0.7)
rack-openid (1.4.2)
@@ -115,34 +114,34 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.2.3)
actionpack (= 5.2.3)
activesupport (= 5.2.3)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.2)
rake (13.0.0)
rbpdf (1.19.8)
htmlentities
rbpdf-font (~> 1.19.0)
rbpdf-font (1.19.1)
redcarpet (3.4.0)
request_store (1.0.5)
rmagick (2.16.0)
roadie (3.5.0)
roadie (3.5.1)
css_parser (~> 1.4)
nokogiri (~> 1.8)
roadie-rails (1.3.0)
railties (>= 3.0, < 5.3)
roadie (~> 3.1)
rouge (3.3.0)
ruby-openid (2.3.0)
rubyzip (1.2.3)
selenium-webdriver (3.142.3)
childprocess (>= 0.5, < 2.0)
rubyzip (~> 1.2, >= 1.2.2)
ruby-openid (2.9.2)
rubyzip (2.0.0)
selenium-webdriver (3.142.6)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
simplecov (0.14.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
@@ -164,7 +163,7 @@ GEM
websocket-extensions (0.1.4)
xpath (3.2.0)
nokogiri (~> 1.8)
yard (0.9.19)
yard (0.9.20)

PLATFORMS
ruby
@@ -193,9 +192,10 @@ DEPENDENCIES
rmagick (~> 2.16.0)
roadie-rails (~> 1.3.0)
rouge (~> 3.3.0)
ruby-openid (~> 2.3.0)
ruby-openid (~> 2.9.2)
selenium-webdriver
simplecov (~> 0.14.1)
sprockets (~> 3.7.2)
tzinfo-data
yard

4 changes: 2 additions & 2 deletions pkgs/applications/version-management/redmine/4.x/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, bundlerEnv, ruby }:

let
version = "4.0.4";
version = "4.0.5";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";

@@ -16,7 +16,7 @@ in

src = fetchurl {
url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
sha256 = "0i5bmgdi3mahbis9hn0hk53rnz4ihp9yij4b4i07ny9vf3n4kp1a";
sha256 = "1s39qd3j27ryn3p01501iavbkyvikdxl3165nk8i8pgxcxlbxsk4";
};

buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
73 changes: 36 additions & 37 deletions pkgs/applications/version-management/redmine/4.x/gemset.nix
Original file line number Diff line number Diff line change
@@ -93,10 +93,10 @@
dependencies = ["public_suffix"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
type = "gem";
};
version = "2.6.0";
version = "2.7.0";
};
arel = {
source = {
@@ -124,13 +124,12 @@
version = "2.18.0";
};
childprocess = {
dependencies = ["rake"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d2gasf988jh2k3fjb7i54c68rq6ni6jf9w0gnsfhrq94a6mprkz";
sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5";
type = "gem";
};
version = "1.0.1";
version = "3.0.0";
};
concurrent-ruby = {
source = {
@@ -143,10 +142,10 @@
crass = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi";
sha256 = "030sc98kjrb36rh7g21qsbdfxrj6knsjkx0mn3b7gig8zknwhp2f";
type = "gem";
};
version = "1.0.4";
version = "1.0.5";
};
css_parser = {
dependencies = ["addressable"];
@@ -176,10 +175,10 @@
erubi = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1";
sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x";
type = "gem";
};
version = "1.8.0";
version = "1.9.0";
};
globalid = {
dependencies = ["activesupport"];
@@ -218,10 +217,10 @@
dependencies = ["crass" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg";
sha256 = "06kfq90vi38gv6i128f4zg462kj32szs5vsgm25hxgw9zd12pj9x";
type = "gem";
};
version = "2.2.3";
version = "2.3.0";
};
mail = {
dependencies = ["mini_mime"];
@@ -268,10 +267,10 @@
mini_mime = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha";
type = "gem";
};
version = "1.0.1";
version = "1.0.2";
};
mini_portile2 = {
source = {
@@ -284,19 +283,19 @@
minitest = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
sha256 = "0zjm24aiz42i9n37mcw8lydd7n0y7wfk27by06jx77ypcld3qvkw";
type = "gem";
};
version = "5.11.3";
version = "5.12.2";
};
mocha = {
dependencies = ["metaclass"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12aglpiq1h18j5a4rlwvnsvnsi2f3407v5xm59lgcg3ymlyak4al";
sha256 = "1s56iivmwpv4979hd25v3ghwwgy8ah15nh378lrj8czlh4kf5k5s";
type = "gem";
};
version = "1.8.0";
version = "1.9.0";
};
mysql2 = {
source = {
@@ -317,19 +316,19 @@
nio4r = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a41ca1kpdmrypjp9xbgvckpy8g26zxphkja9vk7j5wl4n8yvlyr";
sha256 = "0gnmvbryr521r135yz5bv8354m7xn6miiapfgpg1bnwsvxz8xj6c";
type = "gem";
};
version = "2.3.1";
version = "2.5.2";
};
nokogiri = {
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
type = "gem";
};
version = "1.10.3";
version = "1.10.4";
};
pg = {
source = {
@@ -342,10 +341,10 @@
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";
sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0";
type = "gem";
};
version = "3.1.0";
version = "4.0.1";
};
puma = {
source = {
@@ -403,10 +402,10 @@
dependencies = ["loofah"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr";
sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f";
type = "gem";
};
version = "1.0.4";
version = "1.3.0";
};
railties = {
dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
@@ -420,10 +419,10 @@
rake = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn";
sha256 = "05l80mgaabdipkjsnjlffn9gc1wx9fi629d2kfbz8628cx3m6686";
type = "gem";
};
version = "12.3.2";
version = "13.0.0";
};
rbpdf = {
dependencies = ["htmlentities" "rbpdf-font"];
@@ -470,10 +469,10 @@
dependencies = ["css_parser" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b2qgr725hnscz3ldb607gwgjkr47ncs1jjnk6zh0h70p5dxrk2d";
sha256 = "1zihd316bkbnrinz5s1s7pg7s0cadhhj6qs7wmc713j0g6ai1k9r";
type = "gem";
};
version = "3.5.0";
version = "3.5.1";
};
roadie-rails = {
dependencies = ["railties" "roadie"];
@@ -495,27 +494,27 @@
ruby-openid = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yzaf2c1i88757554wk38rxqmj0xzgmwk2zx7gi98w2zx42d17pn";
sha256 = "190p1m0bxd9xkfk1j6cpcv3x5c367g36nsglg4m1fcwqdd13k3kz";
type = "gem";
};
version = "2.3.0";
version = "2.9.2";
};
rubyzip = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
sha256 = "1gz0ri0pa2xr7b6bf66yjc2wfvk51f4gi6yk7bklwl1nr65zc4gz";
type = "gem";
};
version = "1.2.3";
version = "2.0.0";
};
selenium-webdriver = {
dependencies = ["childprocess" "rubyzip"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0i0jr4qrcvg5isc11ivjw7f9gywbimnz613k82bfcrnlzdf90mxy";
sha256 = "11abil34dr8p1kw7hlaqd6kr430v4srmhzf72zzqvhcimlfvm4yb";
type = "gem";
};
version = "3.142.3";
version = "3.142.6";
};
simplecov = {
dependencies = ["docile" "json" "simplecov-html"];
@@ -606,9 +605,9 @@
yard = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v";
sha256 = "0rxqwry3h2hjz069f0kfr140wgx1khgljnqf112dk5x9rm4l0xny";
type = "gem";
};
version = "0.9.19";
version = "0.9.20";
};
}
5 changes: 4 additions & 1 deletion pkgs/applications/version-management/redmine/Gemfile
Original file line number Diff line number Diff line change
@@ -26,6 +26,9 @@ 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"

# TODO: Remove the following line when #32223 is fixed
gem "sprockets", "~> 3.7.2"

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
gem "rbpdf", "~> 1.19.6"
@@ -37,7 +40,7 @@ end

# Optional gem for OpenID authentication
group :openid do
gem "ruby-openid", "~> 2.3.0", :require => "openid"
gem "ruby-openid", "~> 2.9.2", :require => "openid"
gem "rack-openid"
end

37 changes: 19 additions & 18 deletions pkgs/applications/version-management/redmine/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -37,8 +37,8 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
arel (6.0.4)
builder (3.2.3)
capybara (2.18.0)
@@ -52,7 +52,7 @@ GEM
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.2)
concurrent-ruby (1.1.5)
crass (1.0.4)
crass (1.0.5)
css_parser (1.7.0)
addressable
docile (1.1.5)
@@ -65,30 +65,30 @@ GEM
jquery-rails (3.1.5)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
loofah (2.2.3)
loofah (2.3.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.6)
mime-types (>= 1.16, < 4)
metaclass (0.0.4)
mime-types (3.2.2)
mime-types (3.3)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
mime-types-data (3.2019.1009)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_mime (1.0.2)
mini_portile2 (2.3.0)
minitest (5.11.3)
mocha (1.8.0)
minitest (5.12.2)
mocha (1.9.0)
metaclass (~> 0.0.1)
multi_json (1.13.1)
multi_json (1.14.1)
mysql2 (0.4.10)
net-ldap (0.12.1)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
pg (0.18.4)
protected_attributes (1.1.4)
activemodel (>= 4.0.1, < 5.0)
public_suffix (3.1.0)
public_suffix (4.0.1)
rack (1.6.11)
rack-openid (1.4.2)
rack (>= 1.1.0)
@@ -112,14 +112,14 @@ GEM
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (4.2.11.1)
actionpack (= 4.2.11.1)
activesupport (= 4.2.11.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.2)
rake (13.0.0)
rbpdf (1.19.8)
htmlentities
rbpdf-font (~> 1.19.0)
@@ -134,8 +134,8 @@ GEM
roadie-rails (1.1.1)
railties (>= 3.0, < 5.1)
roadie (~> 3.1)
ruby-openid (2.3.0)
rubyzip (1.2.3)
ruby-openid (2.9.2)
rubyzip (1.3.0)
selenium-webdriver (2.53.4)
childprocess (~> 0.5)
rubyzip (~> 1.0)
@@ -161,7 +161,7 @@ GEM
websocket (1.2.8)
xpath (3.2.0)
nokogiri (~> 1.8)
yard (0.9.19)
yard (0.9.20)

PLATFORMS
ruby
@@ -194,9 +194,10 @@ DEPENDENCIES
rmagick (~> 2.16.0)
roadie (~> 3.2.1)
roadie-rails (~> 1.1.1)
ruby-openid (~> 2.3.0)
ruby-openid (~> 2.9.2)
selenium-webdriver (~> 2.53.4)
simplecov (~> 0.9.1)
sprockets (~> 3.7.2)
test_after_commit (~> 0.4.2)
tzinfo-data
yard
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/redmine/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, bundlerEnv, ruby }:

let
version = "3.4.11";
version = "3.4.12";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";

@@ -16,7 +16,7 @@ in

src = fetchurl {
url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
sha256 = "14987sd9ff2n3982qlfwd4m0g1m10w8jyv791nica3wppvnrxh0r";
sha256 = "1781ji6qqx7d92wbcw52wv5b3ydbih36b7biislgyp7ffc3f5y7l";
};

buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
60 changes: 30 additions & 30 deletions pkgs/applications/version-management/redmine/gemset.nix
Original file line number Diff line number Diff line change
@@ -75,10 +75,10 @@
dependencies = ["public_suffix"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
type = "gem";
};
version = "2.6.0";
version = "2.7.0";
};
arel = {
source = {
@@ -133,10 +133,10 @@
crass = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi";
sha256 = "030sc98kjrb36rh7g21qsbdfxrj6knsjkx0mn3b7gig8zknwhp2f";
type = "gem";
};
version = "1.0.4";
version = "1.0.5";
};
css_parser = {
dependencies = ["addressable"];
@@ -209,10 +209,10 @@
dependencies = ["crass" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg";
sha256 = "06kfq90vi38gv6i128f4zg462kj32szs5vsgm25hxgw9zd12pj9x";
type = "gem";
};
version = "2.2.3";
version = "2.3.0";
};
mail = {
dependencies = ["mime-types"];
@@ -235,18 +235,18 @@
dependencies = ["mime-types-data"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
sha256 = "0g7l18igjb9z7q4b2ykvyxyvjxlx5pwsmx5z3ibdbr6372xgfglk";
type = "gem";
};
version = "3.2.2";
version = "3.3";
};
mime-types-data = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
sha256 = "18x61fc36951vw7f74gq8cyybdpxvyg5d0azvqhrs82ddw3v16xh";
type = "gem";
};
version = "3.2019.0331";
version = "3.2019.1009";
};
mimemagic = {
source = {
@@ -259,10 +259,10 @@
mini_mime = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha";
type = "gem";
};
version = "1.0.1";
version = "1.0.2";
};
mini_portile2 = {
source = {
@@ -275,27 +275,27 @@
minitest = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
sha256 = "0zjm24aiz42i9n37mcw8lydd7n0y7wfk27by06jx77ypcld3qvkw";
type = "gem";
};
version = "5.11.3";
version = "5.12.2";
};
mocha = {
dependencies = ["metaclass"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12aglpiq1h18j5a4rlwvnsvnsi2f3407v5xm59lgcg3ymlyak4al";
sha256 = "1s56iivmwpv4979hd25v3ghwwgy8ah15nh378lrj8czlh4kf5k5s";
type = "gem";
};
version = "1.8.0";
version = "1.9.0";
};
multi_json = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr";
type = "gem";
};
version = "1.13.1";
version = "1.14.1";
};
mysql2 = {
source = {
@@ -342,10 +342,10 @@
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";
sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0";
type = "gem";
};
version = "3.1.0";
version = "4.0.1";
};
rack = {
source = {
@@ -404,10 +404,10 @@
dependencies = ["loofah"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr";
sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f";
type = "gem";
};
version = "1.0.4";
version = "1.3.0";
};
railties = {
dependencies = ["actionpack" "activesupport" "rake" "thor"];
@@ -421,10 +421,10 @@
rake = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn";
sha256 = "05l80mgaabdipkjsnjlffn9gc1wx9fi629d2kfbz8628cx3m6686";
type = "gem";
};
version = "12.3.2";
version = "13.0.0";
};
rbpdf = {
dependencies = ["htmlentities" "rbpdf-font"];
@@ -496,18 +496,18 @@
ruby-openid = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yzaf2c1i88757554wk38rxqmj0xzgmwk2zx7gi98w2zx42d17pn";
sha256 = "190p1m0bxd9xkfk1j6cpcv3x5c367g36nsglg4m1fcwqdd13k3kz";
type = "gem";
};
version = "2.3.0";
version = "2.9.2";
};
rubyzip = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l";
type = "gem";
};
version = "1.2.3";
version = "1.3.0";
};
selenium-webdriver = {
dependencies = ["childprocess" "rubyzip" "websocket"];
@@ -607,9 +607,9 @@
yard = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v";
sha256 = "0rxqwry3h2hjz069f0kfr140wgx1khgljnqf112dk5x9rm4l0xny";
type = "gem";
};
version = "0.9.19";
version = "0.9.20";
};
}
10 changes: 7 additions & 3 deletions pkgs/development/libraries/unixODBCDrivers/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, kerberos, curl, libuuid, autoPatchelfHook }:
{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, libuuid, patchelf }:

# I haven't done any parameter tweaking.. So the defaults provided here might be bad

@@ -133,8 +133,7 @@
sha256 = "0jb16irr7qlgd2zshg0vyia7zqipd0pcvwfcr6z807pss1mnzj8w";
};

nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [ unixODBC dpkg kerberos libuuid stdenv.cc.cc ];
nativeBuildInputs = [ dpkg patchelf ];

unpackPhase = "dpkg -x $src ./";
buildPhase = "";
@@ -145,6 +144,11 @@
cp -r opt/microsoft/msodbcsql${versionMajor}/lib64 opt/microsoft/msodbcsql${versionMajor}/share $out/
'';

postFixup = ''
patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl.out kerberos libuuid stdenv.cc.cc ]} \
$out/lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional}
'';

passthru = {
fancyName = "ODBC Driver 17 for SQL Server";
driver = "lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional}";
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/wordpress/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "wordpress";
version = "5.2.3";
version = "5.2.4";

src = fetchurl {
url = "https://wordpress.org/${pname}-${version}.tar.gz";
sha256 = "07gqdzhnqivyfah386lwyz984y9k2bc0hmji1y2pbvv0a60r63wr";
sha256 = "1vf5220rw37sxvzy6yxn636ip2lx4bkc84z7q8rdwcs2wkv6md1p";
};

installPhase = ''