From 681555c11c75337462703c5a2f936fd28ff82e20 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 4 Jan 2018 10:57:24 -0600 Subject: lua-5: isMingw -> isMinGW --- pkgs/development/interpreters/lua-5/5.2.nix | 6 +++--- pkgs/development/interpreters/lua-5/5.3.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 43e289cd3690..0cdc4770a983 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ''; crossAttrs = let - inherit (hostPlatform) isDarwin isMingw; + inherit (hostPlatform) isDarwin isMinGW; in { configurePhase = '' makeFlagsArray=( @@ -65,10 +65,10 @@ stdenv.mkDerivation rec { INSTALL_MAN=$out/share/man/man1 V=${luaversion} R=${version} - ${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin '' + ${if isMinGW then "mingw" else stdenv.lib.optionalString isDarwin '' ''} ) - '' + stdenv.lib.optionalString isMingw '' + '' + stdenv.lib.optionalString isMinGW '' installFlagsArray=( TO_BIN="lua.exe luac.exe" TO_LIB="liblua.a lua52.dll" diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index a512a2513134..ad1dfa8823cb 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; crossAttrs = let - inherit (hostPlatform) isDarwin isMingw; + inherit (hostPlatform) isDarwin isMinGW; in { configurePhase = '' makeFlagsArray=( @@ -64,10 +64,10 @@ stdenv.mkDerivation rec { INSTALL_MAN=$out/share/man/man1 V=${luaversion} R=${version} - ${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin '' + ${if isMinGW then "mingw" else stdenv.lib.optionalString isDarwin '' ''} ) - '' + stdenv.lib.optionalString isMingw '' + '' + stdenv.lib.optionalString isMinGW '' installFlagsArray=( TO_BIN="lua.exe luac.exe" TO_LIB="liblua.a lua52.dll" -- cgit 1.4.1 From 4cd40bb062672ddeb2a9239d9cbe6057367ffdf1 Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Thu, 11 Jan 2018 11:02:47 -0500 Subject: Update Elixir 1.6 RC --- pkgs/development/interpreters/elixir/1.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix index c8b0d904ccd3..168007d22d77 100644 --- a/pkgs/development/interpreters/elixir/1.6.nix +++ b/pkgs/development/interpreters/elixir/1.6.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.6.0-rc.0"; - sha256 = "1yfyp7y0mfdbh410xsfkq9a7ai2y22mjh2qn2cvpim76s96qjpw6"; + version = "1.6.0-rc.1"; + sha256 = "06g6n9qvv57xa07fyaqhki2y8zw24m3smcjiw1wiw9pzl5a76iby"; minimumOTPVersion = "18"; } -- cgit 1.4.1 From e90412debb744dfc481cebf4243e48aef512c726 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Fri, 12 Jan 2018 13:15:50 +0100 Subject: Ruby: 2.2.8 -> 2.2.9, 2.3.5 -> 2.3.6, 2.4.2 -> 2.4.3 --- pkgs/development/interpreters/ruby/default.nix | 24 ++++++++++++------------ pkgs/development/interpreters/ruby/patchsets.nix | 6 +++--- pkgs/top-level/all-packages.nix | 12 ++++++------ 3 files changed, 21 insertions(+), 21 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 6a49107361ab..9d82810900f0 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -205,27 +205,27 @@ in { }; }; - ruby_2_2_8 = generic { - version = rubyVersion "2" "2" "8" ""; + ruby_2_2_9 = generic { + version = rubyVersion "2" "2" "9" ""; sha256 = { - src = "12i6v5i0djl4xx3x7fq12snqb5d4drqjmnwqs05fby4bagcbjdwg"; - git = "16nw0795nhrj13crp5x4jis8hmi3gsyjl96pwk698wlrb89lf9bw"; + src = "19m1ximl7vcrsvq595dgrjh4yb6kar944095wbywqh7waiqcfirg"; + git = "03qrjh55098wcqh2khxryzkzfqkznjrcdgwf27r2bgcycbg5ca5q"; }; }; - ruby_2_3_5 = generic { - version = rubyVersion "2" "3" "5" ""; + ruby_2_3_6 = generic { + version = rubyVersion "2" "3" "6" ""; sha256 = { - src = "1k6x4g68lq30i0myip5bn56rcbwjxmqq95j1fkdgbvwbnaxzfqjl"; - git = "0spwqz4b5xxqzs13azsd4xz4jkc3is7d9q4s6s2qilb8ib4863jl"; + src = "07jpa7fw1gyf069m7alf2b0zm53qm08w2ns45mhzmvgrg4r528l3"; + git = "1bk59i0ygdc5z3zz3k6indfrxd2ix55np6rwvkcdpdw8svm749ds"; }; }; - ruby_2_4_2 = generic { - version = rubyVersion "2" "4" "2" ""; + ruby_2_4_3 = generic { + version = rubyVersion "2" "4" "3" ""; sha256 = { - src = "174cdiz3am1f76vsnm3iqi9c5vqphypbf9kbxx6vqqmj01gfgfck"; - git = "1w83kzak3m6vv3k09ynfw9vpgc7vpmij3x3zmgrhwm4ds1sp5irl"; + src = "161smb52q19r9lrzy22b3bhnkd0z8wjffm0qsfkml14j5ic7a0zx"; + git = "0x2lqbqm2rq9j5zh1p72dma56nqvdkfbgzb9wybm4y4hwhiw8c1m"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 858bc0a13f34..55f4a9ef237b 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -24,17 +24,17 @@ rec { "${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.patch" "${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch" ]; - "2.2.8" = ops useRailsExpress [ + "2.2.9" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.2/head/railsexpress/01-zero-broken-tests.patch" "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.3.5" = ops useRailsExpress [ + "2.3.6" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.4.2" = ops useRailsExpress [ + "2.4.3" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a632a0fe6ab..b2a98700b8fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6945,18 +6945,18 @@ with pkgs; inherit (callPackage ../development/interpreters/ruby { inherit (darwin.apple_sdk.frameworks) Foundation; }) ruby_2_0_0 ruby_2_1_10 - ruby_2_2_8 - ruby_2_3_5 - ruby_2_4_2 + ruby_2_2_9 + ruby_2_3_6 + ruby_2_4_3 ruby_2_5_0; # Ruby aliases ruby = ruby_2_3; ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_10; - ruby_2_2 = ruby_2_2_8; - ruby_2_3 = ruby_2_3_5; - ruby_2_4 = ruby_2_4_2; + ruby_2_2 = ruby_2_2_9; + ruby_2_3 = ruby_2_3_6; + ruby_2_4 = ruby_2_4_3; ruby_2_5 = ruby_2_5_0; scsh = callPackage ../development/interpreters/scsh { }; -- cgit 1.4.1 From 7dea1f20ed5512fd2992ced563e9b355e70afe97 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 13 Jan 2018 01:27:06 +0800 Subject: supercollider: 3.8.0 -> 3.8.1 --- pkgs/development/interpreters/supercollider/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 642fd928f41d..19abfe1cea27 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -9,12 +9,12 @@ in stdenv.mkDerivation rec { name = "supercollider-${version}"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"; - sha256 = "053b2xc2x1sczvlb41w6iciqlwy0zyfiv3jrynx4f8jgd6mizsm6"; + sha256 = "1y8yb20k3lvj7c93qz2srrkvfv175n4n7p3qj89w0dp085mj0qmw"; }; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f4ec1a5d894..0b79a11913ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6983,7 +6983,7 @@ with pkgs; ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; - supercollider = libsForQt56.callPackage ../development/interpreters/supercollider { + supercollider = libsForQt5.callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; }; -- cgit 1.4.1