Merge master into staging

pkgs/development/interpreters/php/default.nix

@@ -21,6 +21,8 @@ let
 
       buildInputs = [ flex bison pkgconfig ];
 
+      configureFlags = ["EXTENSION_DIR=$(out)/lib/php/extensions"];
+
       flags = {
 
         # much left to do here...

pkgs/development/interpreters/python/2.7/default.nix

@@ -22,11 +22,11 @@ with stdenv.lib;
 
 let
   majorVersion = "2.7";
-  version = "${majorVersion}.10";
+  version = "${majorVersion}.11";
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
-    sha256 = "1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw";
+    sha256 = "0iiz844riiznsyhhyy962710pz228gmhv8qi3yk4w4jhmx2lqawn";
   };
 
   patches =

pkgs/development/interpreters/python/3.5/default.nix

@@ -23,7 +23,7 @@ with stdenv.lib;
 let
   majorVersion = "3.5";
   pythonVersion = majorVersion;
-  version = "${majorVersion}.0";
+  version = "${majorVersion}.1";
   fullVersion = "${version}";
 
   buildInputs = filter (p: p != null) [
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
-    sha256 = "14dywb94mci0kqbsji9riyyq8kx0h9ljdjjgxnkfrvm56hbammyn";
+    sha256 = "1j95yx32ggqx8jf13h3c8qfp34ixpyg8ipqcdjmn143d6q67rmf6";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

pkgs/development/interpreters/ruby/default.nix

@@ -150,10 +150,10 @@ in {
     majorVersion = "2";
     minorVersion = "0";
     teenyVersion = "0";
-    patchLevel = "645";
+    patchLevel = "647";
     sha256 = {
-      src = "1azl3kbqqw3jvwfcsy6fdb7vmwz5w73fwpq1y1gblz79zzzqx7sy";
-      git = "14bnas1iif2shyaz4ylb0832x96y2mda52x0v0aglkvqmcz1cfxb";
+      src = "1v2vbvydarcx5801gx9lc6gr6dfi0i7qbzwhsavjqbn79rdsz2n8";
+      git = "186pf4q9xymzn4zn1sjppl1skrl5f0159ixz5cz8g72dmmynq3g3";
     };
   };
 
@@ -212,6 +212,17 @@ in {
     };
   };
 
+  ruby_2_1_7 = generic {
+    majorVersion = "2";
+    minorVersion = "1";
+    teenyVersion = "7";
+    patchLevel = "0";
+    sha256 = {
+      src = "10fxlqmpbq9407zgsx060q22yj4zq6c3czbf29h7xk1rmjb1b77m";
+      git = "1fmbqd943akqjwsfbj9bg394ac46qmpavm8s0kv2w87rflrjcjfb";
+    };
+  };
+
   ruby_2_2_0 = generic {
     majorVersion = "2";
     minorVersion = "2";
@@ -233,4 +244,15 @@ in {
       git = "08mw1ql2ghy483cp8xzzm78q17simn4l6phgm2gah7kjh9y3vbrn";
     };
   };
+
+  ruby_2_2_3 = generic {
+    majorVersion = "2";
+    minorVersion = "2";
+    teenyVersion = "3";
+    patchLevel = "0";
+    sha256 = {
+      src = "1kpdf7f8pw90n5bckpl2idzggk0nn0240ah92sj4a1w6k4pmyyfz";
+      git = "1ssq3c23ay57ypfis47y2n817hfmb71w0xrdzp57j6bv12jqmgrx";
+    };
+  };
 }

pkgs/development/interpreters/ruby/patchsets.nix

@@ -91,6 +91,17 @@ let self = rec {
     "${patchSet}/patches/ruby/2.1.6/railsexpress/08-funny-falcon-method-cache.patch"
     "${patchSet}/patches/ruby/2.1.6/railsexpress/09-heap-dump-support.patch"
   ];
+  "2.1.7" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.1.7/railsexpress/01-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.1.7/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.1.7/railsexpress/03-display-more-detailed-stack-trace.patch"
+    "${patchSet}/patches/ruby/2.1.7/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
+    "${patchSet}/patches/ruby/2.1.7/railsexpress/05-funny-falcon-stc-density.patch"
+    "${patchSet}/patches/ruby/2.1.7/railsexpress/06-funny-falcon-stc-pool-allocation.patch"
+    "${patchSet}/patches/ruby/2.1.7/railsexpress/07-aman-opt-aset-aref-str.patch"
+    "${patchSet}/patches/ruby/2.1.7/railsexpress/08-funny-falcon-method-cache.patch"
+    "${patchSet}/patches/ruby/2.1.7/railsexpress/09-heap-dump-support.patch"
+  ];
   "2.2.0" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.2.0/railsexpress/01-zero-broken-tests.patch"
     "${patchSet}/patches/ruby/2.2.0/railsexpress/02-improve-gc-stats.patch"
@@ -104,4 +115,9 @@ let self = rec {
     "${patchSet}/patches/ruby/2.2.2/railsexpress/03-display-more-detailed-stack-trace.patch"
     "${patchSet}/patches/ruby/2.2.2/railsexpress/04-backported-bugfixes-222.patch"
   ];
+  "2.2.3" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.2.3/railsexpress/01-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.2.3/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.2.3/railsexpress/03-display-more-detailed-stack-trace.patch"
+  ];
 }; in self

pkgs/development/interpreters/ruby/rvm-patchsets.nix

@@ -3,6 +3,6 @@
 fetchFromGitHub {
   owner  = "skaes";
   repo   = "rvm-patchsets";
-  rev    = "68be466019aa592e0321e894487f090aa459d602";
-  sha256 = "12dw5shirnqbw037jg1sqk1aixyzl32w94y2nlan9by3cv7k3643";
+  rev    = "8ccf24490fec2218374734520c27d925078096de";
+  sha256 = "88418484d2d3963975190836eafb2e28206e3e2bac9ee7c6208645bfe7428e2f";
 }