Merge branch 'master' into staging

pkgs/development/interpreters/elixir/default.nix

@@ -1,13 +1,15 @@
-{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash,
+{ stdenv, fetchFromGitHub, erlang, rebar, makeWrapper, coreutils, curl, bash,
   debugInfo ? false }:
 
 stdenv.mkDerivation rec {
   name = "elixir-${version}";
-  version = "1.2.4";
+  version = "1.2.5";
 
-  src = fetchurl {
-    url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
-    sha256 = "16759ff84d08b480b7e5499716e663b2fffd26e20cf2863de5613bc7bb05c817";
+  src = fetchFromGitHub {
+    owner = "elixir-lang";
+    repo = "elixir";
+    rev = "v${version}";
+    sha256 = "0qnmsmzmr431y1chkzk2aq501fk734mncdbn7nsiq98bnqgb6php";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];

pkgs/development/interpreters/php/default.nix

@@ -265,14 +265,12 @@ let
             --replace '@PHP_LDFLAGS@' ""
         done
 
-        iniFile=$out/etc/php-recommended.ini
         [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
         ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
       '';
 
-      installPhase = ''
-        unset installPhase; installPhase;
-        cp php.ini-production $iniFile
+      postInstall = ''
+        cp php.ini-production $out/etc/php.ini
       '';
 
       src = fetchurl {

pkgs/development/interpreters/racket/default.nix

@@ -28,20 +28,15 @@ let
     sqlite
   ];
 
-  boolPatch = fetchurl {
-    url = "http://copr-dist-git.fedorainfracloud.org/cgit/bthomas/racket/racket.git/plain/xform-errors-converting-fix.patch";
-    sha256 = "0h5g7a7w8wwj43jb8q69xldgbyxkn0y0i1na6r9fk17dd56nsm68";
-  };
-
 in
 
 stdenv.mkDerivation rec {
   name = "racket-${version}";
-  version = "6.4";
+  version = "6.5";
 
   src = fetchurl {
     url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
-    sha256 = "1qyzq91r1kzk2k0faggqd5idwmsxizkjbdgxn6ik9iwwsjycxbw6";
+    sha256 = "0gvh7i5k87mg1gpqk8gaq50ja9ksbhnvdqn7qqh0n17byidd6999";
   };
 
   FONTCONFIG_FILE = fontsConf;
@@ -56,10 +51,6 @@ stdenv.mkDerivation rec {
     cd src/build
   '';
 
-  # https://github.com/racket/racket/issues/1222
-  # Fixed upstream after the release of 6.4
-  patches = [ boolPatch ];
-
   shared = if stdenv.isDarwin then "dylib" else "shared";
   configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ]
                    ++ stdenv.lib.optional disableDocs [ "--disable-docs" ]