Merge pull request #5683 from garrison/julia-v0.3.5

julia: 0.3.3 -> 0.3.5
This commit is contained in:
Arseniy Seroka 2015-01-10 10:34:08 +03:00
commit 5e5e6e6685
2 changed files with 7 additions and 7 deletions

View File

@ -1,7 +1,7 @@
{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
, readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
, ncurses, libunistring, patchelf, openblas, liblapack
, tcl, tk, xproto, libX11, git, mpfr, which
, tcl, tk, xproto, libX11, git, mpfr, which, wget
} :
assert stdenv.isLinux;
@ -11,7 +11,7 @@ let
in
stdenv.mkDerivation rec {
pname = "julia";
version = "0.3.3";
version = "0.3.5";
name = "${pname}-${version}";
dsfmt_ver = "2.2";
@ -63,13 +63,13 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://github.com/JuliaLang/julia.git";
rev = "refs/tags/v${version}";
md5 = "84266f0201ad34abe8ca1474620fe891";
md5 = "abdee0e64f8e9ae3d96e37734e2db40a";
name = "julia-git-v${version}";
};
buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
openblas liblapack tcl tk xproto libX11 git mpfr which
openblas liblapack tcl tk xproto libX11 git mpfr which wget
];
configurePhase = ''

View File

@ -3555,16 +3555,16 @@ let
suitesparse = suitesparse_4_2;
};
julia033 = let
julia035 = let
liblapack = liblapack_3_5_0.override {shared = true;};
in callPackage ../development/compilers/julia/0.3.3.nix {
in callPackage ../development/compilers/julia/0.3.5.nix {
inherit liblapack;
suitesparse = suitesparse_4_2.override {
inherit liblapack;
};
llvm = llvm_33;
};
julia = julia033;
julia = julia035;
lazarus = callPackage ../development/compilers/fpc/lazarus.nix {
fpc = fpc;