From fc27f4b297306ffb52144f66fa909668e2eb734c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 25 Dec 2018 18:14:52 -0800 Subject: gauche: 0.9.6 -> 0.9.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gauche/versions --- pkgs/development/interpreters/gauche/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index 2478493d41d7..5481c4e7d05a 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gauche-${version}"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { url = "mirror://sourceforge/gauche/Gauche-${version}.tgz"; - sha256 = "1bwwwvyxsrp2a4cfib6hn0hcgwzmp2znylm088w09f331miji2fd"; + sha256 = "181nycikma0rwrb1h6mi3kys11f8628pq8g5r3fg5hiz5sabscrd"; }; nativeBuildInputs = [ pkgconfig texinfo ]; -- cgit 1.4.1 From 7d141ec3269d34484fd1b98a8c67d9f71811ebe6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 25 Dec 2018 14:25:45 -0500 Subject: ruby_2_6: init at 2.6.0 --- pkgs/development/interpreters/ruby/default.nix | 16 ++++++++++++---- pkgs/development/interpreters/ruby/patchsets.nix | 2 ++ pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 16 insertions(+), 5 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index f1d48578541e..9be8247add11 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -32,7 +32,7 @@ let generic = { version, sha256 }: let ver = version; tag = ver.gitTag; - isRuby25 = ver.majMin == "2.5"; + atLeast25 = lib.versionAtLeast ver.majMin "2.5"; baseruby = self.override { useRailsExpress = false; }; self = lib.makeOverridable ( { stdenv, buildPackages, lib @@ -56,7 +56,7 @@ let rev = tag; sha256 = sha256.git; } else fetchurl { - url = "http://cache.ruby-lang.org/pub/ruby/${ver.majMin}/ruby-${ver}.tar.gz"; + url = "https://cache.ruby-lang.org/pub/ruby/${ver.majMin}/ruby-${ver}.tar.gz"; sha256 = sha256.src; }; in @@ -86,7 +86,7 @@ let ++ (op opensslSupport openssl) ++ (op gdbmSupport gdbm) ++ (op yamlSupport libyaml) - ++ (op isRuby25 autoconf) + ++ (op atLeast25 autoconf) # Looks like ruby fails to build on darwin without readline even if curses # support is not enabled, so add readline to the build inputs if curses # support is disabled (if it's enabled, we already have it) and we're @@ -109,7 +109,7 @@ let popd ''; - postPatch = if isRuby25 then '' + postPatch = if atLeast25 then '' sed -i configure.ac -e '/config.guess/d' cp --remove-destination ${config}/config.guess tool/ cp --remove-destination ${config}/config.sub tool/ @@ -224,4 +224,12 @@ in { git = "0r9mgvqk6gj8pc9q6qmy7j2kbln7drc8wy67sb2ij8ciclcw9nn2"; }; }; + + ruby_2_6 = generic { + version = rubyVersion "2" "6" "0" ""; + sha256 = { + src = "0wn0gxlx6xhhqrm2caxp0h6cj4nw7knnv5gh27qqzj0i9a95phzk"; + git = "0bwbl4hz18dd5aij2l4s6xy90dc17d03kk577gdl34l9mbd9m7mn"; + }; + }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index c87cb120b401..8afc64edb3fd 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -16,4 +16,6 @@ rec { "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" ]; + "2.6.0" = ops useRailsExpress [ # no Rails Express patchset yet (2018-12-26) + ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eac05e5125db..88ea436477a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8073,7 +8073,8 @@ in }) ruby_2_3 ruby_2_4 - ruby_2_5; + ruby_2_5 + ruby_2_6; ruby = ruby_2_5; -- cgit 1.4.1 From 31680c54e1efc73791376e09ef31290adf2c7da1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 26 Dec 2018 15:34:20 -0500 Subject: python36: fix darwin build Remove issue24658 patch because is already fixed and backported to Python 3.6 https://github.com/python/cpython/commit/a5ebc205beea2bf1501e4ac33ed6e81732dd0604 --- pkgs/development/interpreters/python/cpython/3.6/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 15a62b42959c..cad35cac53a8 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -69,12 +69,6 @@ in stdenv.mkDerivation { patches = [ ./no-ldconfig.patch - ] ++ optionals stdenv.isDarwin [ - # Fix for https://bugs.python.org/issue24658 - (fetchpatch { - url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff"; - sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a"; - }) ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ] ++ optionals hasDistutilsCxxPatch [ @@ -83,8 +77,8 @@ in stdenv.mkDerivation { # only works for GCC and Apple Clang. This makes distutils to call C++ # compiler when needed. (fetchpatch { - url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch"; - sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii"; + url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch"; + sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2"; }) ]; -- cgit 1.4.1 From 17648708130df10c5984af4d252f3cfb001a1827 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 26 Dec 2018 15:36:23 -0500 Subject: python37: fix darwin build Remove issue24658 patch because is already fixed and backported to Python 3.7 https://github.com/python/cpython/commit/178d1c07778553bf66e09fe0bb13796be3fb9abf --- pkgs/development/interpreters/python/cpython/3.7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix index 800534e17d5a..a008be707c2c 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix @@ -74,8 +74,8 @@ in stdenv.mkDerivation { # only works for GCC and Apple Clang. This makes distutils to call C++ # compiler when needed. (fetchpatch { - url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch"; - sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii"; + url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch"; + sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2"; }) ]; -- cgit 1.4.1