public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/compilers/julia/0.2.1.nix → pkgs/development/compilers/julia/0.2.nix
View File

0
pkgs/development/compilers/julia/0.3.5.nix → pkgs/development/compilers/julia/0.3.nix
View File

8
pkgs/top-level/all-packages.nix
View File

@ -3572,23 +3572,23 @@ let
jikes = callPackage ../development/compilers/jikes { }; 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;}; liblapack = liblapack.override {shared = true;};
llvm = llvm_33; llvm = llvm_33;
openblas = openblas_0_2_2; openblas = openblas_0_2_2;
suitesparse = suitesparse_4_2; suitesparse = suitesparse_4_2;
}; };
julia035 = let julia03 = let
liblapack = liblapack_3_5_0.override {shared = true;}; 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; inherit liblapack;
suitesparse = suitesparse_4_2.override { suitesparse = suitesparse_4_2.override {
inherit liblapack; inherit liblapack;
}; };
llvm = llvm_33; llvm = llvm_33;
}; };
julia = julia035; julia = julia03;
lazarus = callPackage ../development/compilers/fpc/lazarus.nix { lazarus = callPackage ../development/compilers/fpc/lazarus.nix {
fpc = fpc; fpc = fpc;