3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #5842 from garrison/julia-overspecified-version

Don't overspecify the julia version
This commit is contained in:
Michael Raskin 2015-01-19 23:52:37 +03:00
commit ed85662e55
3 changed files with 4 additions and 4 deletions

View file

@ -3572,23 +3572,23 @@ let
jikes = callPackage ../development/compilers/jikes { };
julia021 = callPackage ../development/compilers/julia/0.2.1.nix {
julia02 = callPackage ../development/compilers/julia/0.2.nix {
liblapack = liblapack.override {shared = true;};
llvm = llvm_33;
openblas = openblas_0_2_2;
suitesparse = suitesparse_4_2;
};
julia035 = let
julia03 = let
liblapack = liblapack_3_5_0.override {shared = true;};
in callPackage ../development/compilers/julia/0.3.5.nix {
in callPackage ../development/compilers/julia/0.3.nix {
inherit liblapack;
suitesparse = suitesparse_4_2.override {
inherit liblapack;
};
llvm = llvm_33;
};
julia = julia035;
julia = julia03;
lazarus = callPackage ../development/compilers/fpc/lazarus.nix {
fpc = fpc;