commit
9329cc8654
|
@ -1,207 +0,0 @@
|
||||||
{ lib, stdenv, fetchpatch, fetchurl, fetchzip
|
|
||||||
# build tools
|
|
||||||
, gfortran, m4, makeWrapper, patchelf, perl, which, python3
|
|
||||||
, cmake
|
|
||||||
# libjulia dependencies
|
|
||||||
, libunwind, readline, utf8proc, zlib
|
|
||||||
# standard library dependencies
|
|
||||||
, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
|
|
||||||
# linear algebra
|
|
||||||
, blas, lapack, arpack
|
|
||||||
# Darwin frameworks
|
|
||||||
, CoreServices, ApplicationServices
|
|
||||||
}:
|
|
||||||
|
|
||||||
|
|
||||||
let
|
|
||||||
majorVersion = "1";
|
|
||||||
minorVersion = "0";
|
|
||||||
maintenanceVersion = "4";
|
|
||||||
src_sha256 = "1dfx68wbrrzpbh74rla7i2g3r5z6wa1pxq3ahyfm5m27vfyjbkhg";
|
|
||||||
|
|
||||||
libuvVersion = "ed3700c849289ed01fe04273a7bf865340b2bd7e";
|
|
||||||
libuvSha256 = "137w666zsjw1p0ma3lf94d75hr1q45sgkfmbizkyji2qm57cnxjs";
|
|
||||||
|
|
||||||
dsfmtVersion = "2.2.3";
|
|
||||||
dsfmt = fetchurl {
|
|
||||||
url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz";
|
|
||||||
sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
|
|
||||||
};
|
|
||||||
|
|
||||||
libuv = fetchurl {
|
|
||||||
url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
|
|
||||||
sha256 = libuvSha256;
|
|
||||||
};
|
|
||||||
|
|
||||||
rmathVersion = "0.1";
|
|
||||||
rmath-julia = fetchurl {
|
|
||||||
url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
|
|
||||||
sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
|
|
||||||
};
|
|
||||||
|
|
||||||
virtualenvVersion = "15.0.0";
|
|
||||||
virtualenv = fetchurl {
|
|
||||||
url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
|
|
||||||
sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh";
|
|
||||||
};
|
|
||||||
|
|
||||||
libwhichVersion = "81e9723c0273d78493dc8c8ed570f68d9ce7e89e";
|
|
||||||
libwhich = fetchurl {
|
|
||||||
url = "https://api.github.com/repos/vtjnash/libwhich/tarball/${libwhichVersion}";
|
|
||||||
sha256 = "1p7zg31kpmpbmh1znrk1xrbd074agx13b9q4dcw8n2zrwwdlbz3b";
|
|
||||||
};
|
|
||||||
|
|
||||||
llvmVersion = "6.0.0";
|
|
||||||
llvm = fetchurl {
|
|
||||||
url = "http://releases.llvm.org/6.0.0/llvm-${llvmVersion}.src.tar.xz";
|
|
||||||
sha256 = "0224xvfg6h40y5lrbnb9qaq3grmdc5rg00xq03s1wxjfbf8krx8z";
|
|
||||||
};
|
|
||||||
|
|
||||||
suitesparseVersion = "4.4.5";
|
|
||||||
suitesparse = fetchurl {
|
|
||||||
url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${suitesparseVersion}.tar.gz";
|
|
||||||
sha256 = "1jcbxb8jx5wlcixzf6n5dca2rcfx6mlcms1k2rl5gp67ay3bix43";
|
|
||||||
};
|
|
||||||
version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "julia";
|
|
||||||
inherit version;
|
|
||||||
|
|
||||||
src = fetchzip {
|
|
||||||
url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
|
|
||||||
sha256 = src_sha256;
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake curl gfortran m4 makeWrapper patchelf perl python3 which ];
|
|
||||||
# cmake is only used to build the bundled deps
|
|
||||||
dontUseCmakeConfigure = true;
|
|
||||||
|
|
||||||
# We assert that compatible blas and lapack are used.
|
|
||||||
buildInputs = assert (blas.isILP64 == lapack.isILP64); [
|
|
||||||
arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
|
|
||||||
pcre2.dev blas lapack openlibm openspecfun readline utf8proc
|
|
||||||
zlib
|
|
||||||
]
|
|
||||||
++ lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
|
|
||||||
;
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
./patches/1.0/use-system-utf8proc-julia-1.0.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
patchShebangs . contrib
|
|
||||||
for i in backtrace cmdlineargs; do
|
|
||||||
mv test/$i.jl{,.off}
|
|
||||||
touch test/$i.jl
|
|
||||||
done
|
|
||||||
rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl
|
|
||||||
rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl
|
|
||||||
sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl
|
|
||||||
sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl
|
|
||||||
'';
|
|
||||||
prePatch = ''
|
|
||||||
mkdir deps/srccache
|
|
||||||
cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz"
|
|
||||||
cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz"
|
|
||||||
cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz"
|
|
||||||
cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz"
|
|
||||||
cp "${libwhich}" "./deps/srccache/libwhich-${libwhichVersion}.tar.gz"
|
|
||||||
cp "${llvm}" "./deps/srccache/llvm-${llvmVersion}.src.tar.xz"
|
|
||||||
cp "${suitesparse}" "./deps/srccache/SuiteSparse-${suitesparseVersion}.tar.gz"
|
|
||||||
'';
|
|
||||||
|
|
||||||
makeFlags =
|
|
||||||
let
|
|
||||||
arch = lib.head (lib.splitString "-" stdenv.system);
|
|
||||||
march = {
|
|
||||||
x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
|
|
||||||
i686 = "pentium4";
|
|
||||||
aarch64 = "armv8-a";
|
|
||||||
}.${arch}
|
|
||||||
or (throw "unsupported architecture: ${arch}");
|
|
||||||
# Julia requires Pentium 4 (SSE2) or better
|
|
||||||
cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; aarch64 = "generic"; }.${arch}
|
|
||||||
or (throw "unsupported architecture: ${arch}");
|
|
||||||
in [
|
|
||||||
"ARCH=${arch}"
|
|
||||||
"MARCH=${march}"
|
|
||||||
"JULIA_CPU_TARGET=${cpuTarget}"
|
|
||||||
"PREFIX=$(out)"
|
|
||||||
"prefix=$(out)"
|
|
||||||
"SHELL=${stdenv.shell}"
|
|
||||||
|
|
||||||
(lib.optionalString (!stdenv.isDarwin) "USE_SYSTEM_BLAS=1")
|
|
||||||
"USE_BLAS64=${if blas.isILP64 then "1" else "0"}"
|
|
||||||
|
|
||||||
"USE_SYSTEM_LAPACK=1"
|
|
||||||
|
|
||||||
"USE_SYSTEM_ARPACK=1"
|
|
||||||
"USE_SYSTEM_FFTW=1"
|
|
||||||
"USE_SYSTEM_GMP=1"
|
|
||||||
"USE_SYSTEM_LIBGIT2=1"
|
|
||||||
"USE_SYSTEM_LIBUNWIND=1"
|
|
||||||
|
|
||||||
# We will probably never do that
|
|
||||||
#"USE_SYSTEM_LLVM=1"
|
|
||||||
"LLVM_VER=6.0.0"
|
|
||||||
|
|
||||||
"USE_SYSTEM_MPFR=1"
|
|
||||||
"USE_SYSTEM_OPENLIBM=1"
|
|
||||||
"USE_SYSTEM_OPENSPECFUN=1"
|
|
||||||
"USE_SYSTEM_PATCHELF=1"
|
|
||||||
"USE_SYSTEM_PCRE=1"
|
|
||||||
"PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
|
|
||||||
"PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
|
|
||||||
"USE_SYSTEM_READLINE=1"
|
|
||||||
"USE_SYSTEM_UTF8PROC=1"
|
|
||||||
"USE_SYSTEM_ZLIB=1"
|
|
||||||
];
|
|
||||||
|
|
||||||
LD_LIBRARY_PATH = assert (blas.isILP64 == lapack.isILP64); (lib.makeLibraryPath [
|
|
||||||
arpack fftw fftwSinglePrec gmp libgit2 mpfr blas lapack openlibm
|
|
||||||
openspecfun pcre2
|
|
||||||
]);
|
|
||||||
|
|
||||||
doCheck = !stdenv.isDarwin;
|
|
||||||
checkTarget = "testall";
|
|
||||||
# Julia's tests require read/write access to $HOME
|
|
||||||
preCheck = ''
|
|
||||||
export HOME="$NIX_BUILD_TOP"
|
|
||||||
'';
|
|
||||||
|
|
||||||
preBuild = ''
|
|
||||||
sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
|
|
||||||
sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
|
|
||||||
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
|
|
||||||
'';
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
# Symlink shared libraries from LD_LIBRARY_PATH into lib/julia,
|
|
||||||
# as using a wrapper with LD_LIBRARY_PATH causes segmentation
|
|
||||||
# faults when program returns an error:
|
|
||||||
# $ julia -e 'throw(Error())'
|
|
||||||
find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do
|
|
||||||
if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then
|
|
||||||
ln -sv $lib $out/lib/julia/$(basename $lib)
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru = {
|
|
||||||
inherit majorVersion minorVersion maintenanceVersion;
|
|
||||||
site = "share/julia/site/v${majorVersion}.${minorVersion}";
|
|
||||||
};
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "High-level performance-oriented dynamical language for technical computing";
|
|
||||||
homepage = "https://julialang.org/";
|
|
||||||
license = lib.licenses.mit;
|
|
||||||
maintainers = with lib.maintainers; [ raskin rob garrison ];
|
|
||||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,147 +0,0 @@
|
||||||
{ lib, stdenv, fetchzip
|
|
||||||
# build tools
|
|
||||||
, gfortran, m4, makeWrapper, patchelf, perl, which, python3, cmake
|
|
||||||
# libjulia dependencies
|
|
||||||
, libunwind, readline, utf8proc, zlib
|
|
||||||
# standard library dependencies
|
|
||||||
, curl, fftwSinglePrec, fftw, libgit2, mpfr, openlibm, openspecfun, pcre2
|
|
||||||
# linear algebra
|
|
||||||
, blas, lapack, arpack
|
|
||||||
# Darwin frameworks
|
|
||||||
, CoreServices, ApplicationServices
|
|
||||||
}:
|
|
||||||
|
|
||||||
assert (!blas.isILP64) && (!lapack.isILP64);
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
let
|
|
||||||
majorVersion = "1";
|
|
||||||
minorVersion = "5";
|
|
||||||
maintenanceVersion = "4";
|
|
||||||
src_sha256 = "1ba1v7hakgj95xvhyff0zcp0574qv6vailjl48wl1f8w5k54lsw2";
|
|
||||||
version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "julia";
|
|
||||||
inherit version;
|
|
||||||
|
|
||||||
src = fetchzip {
|
|
||||||
url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
|
|
||||||
sha256 = src_sha256;
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
./patches/1.5/use-system-utf8proc-julia-1.3.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
patchShebangs . contrib
|
|
||||||
'';
|
|
||||||
|
|
||||||
dontUseCmakeConfigure = true;
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
arpack fftw fftwSinglePrec libgit2 libunwind mpfr
|
|
||||||
pcre2.dev blas lapack openlibm openspecfun readline utf8proc
|
|
||||||
zlib
|
|
||||||
] ++ lib.optionals stdenv.isDarwin [CoreServices ApplicationServices];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python3 which cmake ];
|
|
||||||
|
|
||||||
makeFlags =
|
|
||||||
let
|
|
||||||
arch = head (splitString "-" stdenv.system);
|
|
||||||
march = {
|
|
||||||
x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
|
|
||||||
i686 = "pentium4";
|
|
||||||
aarch64 = "armv8-a";
|
|
||||||
}.${arch}
|
|
||||||
or (throw "unsupported architecture: ${arch}");
|
|
||||||
# Julia requires Pentium 4 (SSE2) or better
|
|
||||||
cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; aarch64 = "generic"; }.${arch}
|
|
||||||
or (throw "unsupported architecture: ${arch}");
|
|
||||||
# Julia applies a lot of patches to its dependencies, so for now do not use the system LLVM
|
|
||||||
# https://github.com/JuliaLang/julia/tree/master/deps/patches
|
|
||||||
in [
|
|
||||||
"ARCH=${arch}"
|
|
||||||
"MARCH=${march}"
|
|
||||||
"JULIA_CPU_TARGET=${cpuTarget}"
|
|
||||||
"PREFIX=$(out)"
|
|
||||||
"prefix=$(out)"
|
|
||||||
"SHELL=${stdenv.shell}"
|
|
||||||
|
|
||||||
(lib.optionalString (!stdenv.isDarwin) "USE_SYSTEM_BLAS=1")
|
|
||||||
"USE_BLAS64=${if blas.isILP64 then "1" else "0"}"
|
|
||||||
|
|
||||||
"USE_SYSTEM_LAPACK=1"
|
|
||||||
|
|
||||||
"USE_SYSTEM_ARPACK=1"
|
|
||||||
"USE_SYSTEM_FFTW=1"
|
|
||||||
"USE_SYSTEM_GMP=0"
|
|
||||||
"USE_SYSTEM_LIBGIT2=1"
|
|
||||||
"USE_SYSTEM_LIBUNWIND=1"
|
|
||||||
|
|
||||||
"USE_SYSTEM_MPFR=1"
|
|
||||||
"USE_SYSTEM_OPENLIBM=1"
|
|
||||||
"USE_SYSTEM_OPENSPECFUN=1"
|
|
||||||
"USE_SYSTEM_PATCHELF=1"
|
|
||||||
"USE_SYSTEM_PCRE=1"
|
|
||||||
"PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
|
|
||||||
"PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
|
|
||||||
"USE_SYSTEM_READLINE=1"
|
|
||||||
"USE_SYSTEM_UTF8PROC=1"
|
|
||||||
"USE_SYSTEM_ZLIB=1"
|
|
||||||
|
|
||||||
"USE_BINARYBUILDER=0"
|
|
||||||
];
|
|
||||||
|
|
||||||
LD_LIBRARY_PATH = makeLibraryPath [
|
|
||||||
arpack fftw fftwSinglePrec libgit2 mpfr blas openlibm
|
|
||||||
openspecfun pcre2 lapack
|
|
||||||
];
|
|
||||||
|
|
||||||
preBuild = ''
|
|
||||||
sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
|
|
||||||
sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
|
|
||||||
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
|
|
||||||
'';
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
# Julia's tests require read/write access to $HOME
|
|
||||||
preCheck = ''
|
|
||||||
export HOME="$NIX_BUILD_TOP"
|
|
||||||
'';
|
|
||||||
doCheck = true;
|
|
||||||
checkTarget = "test";
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
# Symlink shared libraries from LD_LIBRARY_PATH into lib/julia,
|
|
||||||
# as using a wrapper with LD_LIBRARY_PATH causes segmentation
|
|
||||||
# faults when program returns an error:
|
|
||||||
# $ julia -e 'throw(Error())'
|
|
||||||
find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do
|
|
||||||
if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then
|
|
||||||
ln -sv $lib $out/lib/julia/$(basename $lib)
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru = {
|
|
||||||
inherit majorVersion minorVersion maintenanceVersion;
|
|
||||||
site = "share/julia/site/v${majorVersion}.${minorVersion}";
|
|
||||||
};
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "High-level performance-oriented dynamical language for technical computing";
|
|
||||||
homepage = "https://julialang.org/";
|
|
||||||
license = lib.licenses.mit;
|
|
||||||
maintainers = with lib.maintainers; [ raskin rob garrison ];
|
|
||||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
|
|
||||||
# Unfortunately, this derivation does not pass Julia's test suite. See
|
|
||||||
# https://github.com/NixOS/nixpkgs/pull/121114.
|
|
||||||
broken = true;
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "julia-bin";
|
pname = "julia-bin";
|
||||||
version = "1.8.2";
|
version = "1.8.3";
|
||||||
|
|
||||||
src = {
|
src = {
|
||||||
x86_64-linux = fetchurl {
|
x86_64-linux = fetchurl {
|
||||||
url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
|
url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
|
||||||
sha256 = "sha256-ZxzzpFC2OnF+Hu3X9pCH44VvAVsuFGy1SSjxmjwF55Y=";
|
sha256 = "sha256-M8Owk1b/qiXTMxw2RrHy1LCZROj5P8uZSVeAG4u/WKk=";
|
||||||
};
|
};
|
||||||
aarch64-linux = fetchurl {
|
aarch64-linux = fetchurl {
|
||||||
url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz";
|
url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz";
|
||||||
sha256 = "sha256-+RwnZCj/swrMIJ4Os+cLHJEmDoh+EdS2b1VFCEtTBUc=";
|
sha256 = "sha256-2/+xNKQTtxLUqOHujmZepV7bCGVxmhutmXkSPWQzrMk=";
|
||||||
};
|
};
|
||||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||||
|
|
||||||
|
|
|
@ -28,11 +28,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "julia";
|
pname = "julia";
|
||||||
version = "1.8.2";
|
version = "1.8.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
|
url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
|
||||||
sha256 = "sha256-5Xz8Lm2JF1Ckf3zwNVmk6PchK/VJAPJqnxL9bQCdTKk=";
|
hash = "sha256-UraJWp1K0v422yYe6MTIzJISuDehL5MAL6r1N6IVH1A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches =
|
patches =
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
From 54a66b5728ec98f44a1768f064509be4fd3f2ef6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
|
||||||
Date: Sat, 10 Oct 2015 13:09:48 -0500
|
|
||||||
Subject: [PATCH 1/3] use system utf8proc
|
|
||||||
|
|
||||||
---
|
|
||||||
src/flisp/Makefile | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/flisp/Makefile b/src/flisp/Makefile
|
|
||||||
index bec8624..5437b5c 100644
|
|
||||||
--- a/src/flisp/Makefile
|
|
||||||
+++ b/src/flisp/Makefile
|
|
||||||
@@ -24,9 +24,9 @@ DOBJS = $(SRCS:%.c=$(BUILDDIR)/%.dbg.obj)
|
|
||||||
LLTDIR := ../support
|
|
||||||
LLT_release := $(BUILDDIR)/$(LLTDIR)/libsupport.a
|
|
||||||
LLT_debug := $(BUILDDIR)/$(LLTDIR)/libsupport-debug.a
|
|
||||||
-LIBFILES_release := $(LLT_release) $(LIBUV) $(LIBUTF8PROC)
|
|
||||||
-LIBFILES_debug := $(LLT_debug) $(LIBUV) $(LIBUTF8PROC)
|
|
||||||
-LIBS :=
|
|
||||||
+LIBFILES_release := $(LLT_release) $(LIBUV)
|
|
||||||
+LIBFILES_debug := $(LLT_debug) $(LIBUV)
|
|
||||||
+LIBS := $(LIBUTF8PROC)
|
|
||||||
ifneq ($(OS),WINNT)
|
|
||||||
LIBS += -lpthread
|
|
||||||
endif
|
|
||||||
--
|
|
||||||
2.5.2
|
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
---
|
|
||||||
src/flisp/Makefile | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/flisp/Makefile b/src/flisp/Makefile
|
|
||||||
index d97075e..6bebca7 100644
|
|
||||||
--- a/src/flisp/Makefile
|
|
||||||
+++ b/src/flisp/Makefile
|
|
||||||
@@ -32,9 +32,9 @@ OBJS := $(SRCS:%.c=$(BUILDDIR)/%.o)
|
|
||||||
DOBJS := $(SRCS:%.c=$(BUILDDIR)/%.dbg.obj)
|
|
||||||
LLT_release := $(LLT_BUILDDIR)/libsupport.a
|
|
||||||
LLT_debug := $(LLT_BUILDDIR)/libsupport-debug.a
|
|
||||||
-LIBFILES_release := $(LLT_release) $(LIBUV) $(LIBUTF8PROC)
|
|
||||||
-LIBFILES_debug := $(LLT_debug) $(LIBUV) $(LIBUTF8PROC)
|
|
||||||
-LIBS :=
|
|
||||||
+LIBFILES_release := $(LLT_release) $(LIBUV)
|
|
||||||
+LIBFILES_debug := $(LLT_debug) $(LIBUV)
|
|
||||||
+LIBS := $(LIBUTF8PROC)
|
|
||||||
ifneq ($(OS),WINNT)
|
|
||||||
LIBS += -lpthread
|
|
||||||
endif
|
|
||||||
|
|
||||||
--
|
|
|
@ -676,8 +676,10 @@ mapAliases ({
|
||||||
# Julia
|
# Julia
|
||||||
julia_07 = throw "julia_07 has been deprecated in favor of the latest LTS version"; # Added 2020-09-15
|
julia_07 = throw "julia_07 has been deprecated in favor of the latest LTS version"; # Added 2020-09-15
|
||||||
julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # Added 2021-03-13
|
julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # Added 2021-03-13
|
||||||
|
julia_10 = throw "julia_10 has been deprecated in favor of the latest stable version"; # Added 2022-11-15
|
||||||
julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # Added 2020-09-15
|
julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # Added 2020-09-15
|
||||||
julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # Added 2021-03-13
|
julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # Added 2021-03-13
|
||||||
|
julia_15 = throw "julia_15 has been deprecated in favor of the latest stable version"; # Added 2022-11-15
|
||||||
julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # Added 2021-12-02
|
julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # Added 2021-12-02
|
||||||
julia_17-bin = throw "julia_17-bin has been deprecated in favor of the latest stable version"; # Added 2022-09-04
|
julia_17-bin = throw "julia_17-bin has been deprecated in favor of the latest stable version"; # Added 2022-09-04
|
||||||
|
|
||||||
|
|
|
@ -14519,31 +14519,8 @@ with pkgs;
|
||||||
|
|
||||||
juniper = callPackage ../development/compilers/juniper { };
|
juniper = callPackage ../development/compilers/juniper { };
|
||||||
|
|
||||||
julia_10 = callPackage ../development/compilers/julia/1.0.nix {
|
julia-lts = julia_16-bin;
|
||||||
gmp = gmp6;
|
julia-stable = julia_18;
|
||||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
|
|
||||||
libgit2 = libgit2.overrideAttrs (_: rec {
|
|
||||||
version = "0.27.10";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "libgit2";
|
|
||||||
repo = "libgit2";
|
|
||||||
rev = "v${version}";
|
|
||||||
sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad";
|
|
||||||
};
|
|
||||||
patches = [];
|
|
||||||
meta.knownVulnerabilities = [
|
|
||||||
"CVE-2020-12278"
|
|
||||||
"CVE-2020-12279"
|
|
||||||
];
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
julia_15 = callPackage ../development/compilers/julia/1.5.nix {
|
|
||||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
|
|
||||||
};
|
|
||||||
|
|
||||||
julia-lts = julia_10;
|
|
||||||
julia-stable = julia_15;
|
|
||||||
julia = julia-stable;
|
julia = julia-stable;
|
||||||
|
|
||||||
julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { };
|
julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { };
|
||||||
|
|
Loading…
Reference in a new issue