diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/julia/1.3.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/julia/1.3.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/compilers/julia/1.3.nix b/nixpkgs/pkgs/development/compilers/julia/1.3.nix index 406ea73f2aed..da60fa8b9888 100644 --- a/nixpkgs/pkgs/development/compilers/julia/1.3.nix +++ b/nixpkgs/pkgs/development/compilers/julia/1.3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, fetchFromGitHub +{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2 , cmake @@ -14,7 +14,7 @@ assert (!blas.isILP64) && (!lapack.isILP64); -with stdenv.lib; +with lib; let majorVersion = "1"; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { pcre2.dev blas lapack openlibm openspecfun readline utf8proc zlib ] - ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] + ++ lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ; nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { let arch = head (splitString "-" stdenv.system); march = { - x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; + x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64"; i686 = "pentium4"; aarch64 = "armv8-a"; }.${arch} @@ -119,8 +119,6 @@ stdenv.mkDerivation rec { openspecfun pcre2 lapack ]; - enableParallelBuilding = true; - # Other versions of Julia pass the tests, but we are not sure why these fail. doCheck = false; checkTarget = "testall"; @@ -155,8 +153,8 @@ stdenv.mkDerivation rec { meta = { description = "High-level performance-oriented dynamical language for technical computing"; homepage = "https://julialang.org/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ raskin rob garrison ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; broken = stdenv.isi686; }; |