Julia language: update to a fresh version

Update julia and some of its dependencies

Split PCRE because a lot of packages depend on it and I am not sure we
want to test them in a hurry (and Julia specifies exact version).

1 files changed, 11 insertions, 7 deletions

diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index 845ec772010..6b4fbe7df6c 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -1,15 +1,19 @@
-{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false}:
-let localDefs = builderDefs.passthru.function { 
+{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false, pthreads ? false}:
+let
+  version = "3.3.2";
+  localDefs = builderDefs.passthru.function { 
   src = 
     fetchurl {
-      url = ftp://ftp.fftw.org/pub/fftw/fftw-3.2.2.tar.gz;
-      sha256 = "13vnglardq413q2518zi4a8pam3znydrz28m9w09kss9xrjsx9va";
+      url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz";
+      sha256 = "b1236a780ca6e66fc5f8eda6ef0665d680e8253d9f01d7bf211b714a50032d01";
     };
   buildInputs = [];
-  configureFlags = ["--enable-shared" "--enable-openmp"]
+  configureFlags = ["--enable-shared"]
                         # some distros seem to be shipping both versions within the same package?
                         # why does --enable-float still result in ..3f.so instead of ..3.so?
                    ++ (if singlePrecision then [ "--enable-single" ] else [ ])
+		   ++ (stdenv.lib.optional (!pthreads) "--enable-openmp")
+		   ++ (stdenv.lib.optional pthreads "--enable-threads")
                         # I think all i686 has sse
                    ++ (if (stdenv.isi686 || stdenv.isx86_64) && singlePrecision then [ "--enable-sse" ] else [ ])
                         # I think all x86_64 has sse2
@@ -18,8 +22,8 @@ let localDefs = builderDefs.passthru.function {
   };
 in with localDefs;
 stdenv.mkDerivation {
-  name = "fftw-3.2.2" + ( if singlePrecision then "-single" else "-double" );
-  builder = writeScript "fftw-3.2.1-builder"
+  name = "fftw-3.3.2" + ( if singlePrecision then "-single" else "-double" );
+  builder = writeScript "fftw-3.3.2-builder"
     (textClosure localDefs [doConfigure doMakeInstall doForceShare]);
   meta = {
     description = "Fastest Fourier Transform in the West library";