Merge staging-next into staging
This commit is contained in:
Frederik Rietdijk
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
||||
# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
|
||||
src = fetchurl {
|
||||
url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz";
|
||||
sha256 = "0wpfj7q9vq2k2mkp2wx2yvrcq0v8229ddyk8viiaizs7msn588ac";
|
||||
sha256 = "0zr5mmqyj484vza089l8vc88d07g0m8ymxzglvar3ydwyvi1x1qx";
|
||||
};
|
||||
configurePhase = ''
|
||||
mkdir nix-tools
|
||||
|
||||
57
pkgs/development/compilers/cc65/default.nix
Normal file
57
pkgs/development/compilers/cc65/default.nix
Normal file
@@ -0,0 +1,57 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cc65";
|
||||
version = "2.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cc65";
|
||||
repo = pname;
|
||||
rev = "V${version}";
|
||||
sha256 = "sha256-XRGhukYite1GtPkO9clmkwvvU62OnYphO8V1Rrr7yMg=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}"];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://cc65.github.io/";
|
||||
description = "C compiler for processors of 6502 family";
|
||||
longDescription = ''
|
||||
cc65 is a complete cross development package for 65(C)02 systems,
|
||||
including a powerful macro assembler, a C compiler, linker, librarian and
|
||||
several other tools.
|
||||
|
||||
cc65 has C and runtime library support for many of the old 6502 machines,
|
||||
including the following Commodore machines:
|
||||
|
||||
- VIC20
|
||||
- C16/C116 and Plus/4
|
||||
- C64
|
||||
- C128
|
||||
- CBM 510 (aka P500)
|
||||
- the 600/700 family
|
||||
- newer PET machines (not 2001).
|
||||
- the Apple ][+ and successors.
|
||||
- the Atari 8-bit machines.
|
||||
- the Atari 2600 console.
|
||||
- the Atari 5200 console.
|
||||
- GEOS for the C64, C128 and Apple //e.
|
||||
- the Bit Corporation Gamate console.
|
||||
- the NEC PC-Engine (aka TurboGrafx-16) console.
|
||||
- the Nintendo Entertainment System (NES) console.
|
||||
- the Watara Supervision console.
|
||||
- the VTech Creativision console.
|
||||
- the Oric Atmos.
|
||||
- the Oric Telestrat.
|
||||
- the Lynx console.
|
||||
- the Ohio Scientific Challenger 1P.
|
||||
|
||||
The libraries are fairly portable, so creating a version for other 6502s
|
||||
shouldn't be too much work.
|
||||
'';
|
||||
license = licenses.zlib;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }:
|
||||
{ stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }:
|
||||
|
||||
let
|
||||
version = "4.13.0";
|
||||
@@ -21,31 +21,39 @@ stdenv.mkDerivation {
|
||||
sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd";
|
||||
};
|
||||
|
||||
setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh;
|
||||
setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh;
|
||||
|
||||
buildFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" ];
|
||||
installFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" ];
|
||||
# -fno-strict-overflow is not a supported argument in clang on darwin
|
||||
hardeningDisable = lib.optionals stdenv.isDarwin ["strictoverflow"];
|
||||
|
||||
makeFlags = [
|
||||
"PLATFORM=${platform}" "PREFIX=$(out)"
|
||||
"VARDIR=$(out)/var/lib"
|
||||
] ++ (lib.optionals stdenv.isDarwin [
|
||||
"XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin"
|
||||
"C_COMPILER=$(CC)"
|
||||
]);
|
||||
|
||||
# We need a bootstrap-chicken to regenerate the c-files after
|
||||
# applying a patch to add support for CHICKEN_REPOSITORY_EXTRA
|
||||
patches = lib.ifEnable (bootstrap-chicken != null) [
|
||||
patches = lib.optionals (bootstrap-chicken != null) [
|
||||
./0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
] ++ (lib.ifEnable (bootstrap-chicken != null) [
|
||||
] ++ (lib.optionals (bootstrap-chicken != null) [
|
||||
bootstrap-chicken
|
||||
]);
|
||||
|
||||
preBuild = lib.ifEnable (bootstrap-chicken != null) ''
|
||||
preBuild = lib.optionalString (bootstrap-chicken != null) ''
|
||||
# Backup the build* files - those are generated from hostname,
|
||||
# git-tag, etc. and we don't need/want that
|
||||
mkdir -p build-backup
|
||||
mv buildid buildbranch buildtag.h build-backup
|
||||
|
||||
# Regenerate eval.c after the patch
|
||||
make spotless $buildFlags
|
||||
make spotless $makeFlags
|
||||
|
||||
mv build-backup/* .
|
||||
'';
|
||||
@@ -64,7 +72,7 @@ stdenv.mkDerivation {
|
||||
homepage = "http://www.call-cc.org/";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
maintainers = with stdenv.lib.maintainers; [ corngood ];
|
||||
platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix
|
||||
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # Maybe other Unix
|
||||
description = "A portable compiler for the Scheme programming language";
|
||||
longDescription = ''
|
||||
CHICKEN is a compiler for the Scheme programming language.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }:
|
||||
{ stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }:
|
||||
|
||||
let
|
||||
version = "5.2.0";
|
||||
@@ -21,14 +21,21 @@ stdenv.mkDerivation {
|
||||
sha256 = "1yl0hxm9cirgcp8jgxp6vv29lpswfvaw3zfkh6rsj0vkrv44k4c1";
|
||||
};
|
||||
|
||||
setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh;
|
||||
setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh;
|
||||
|
||||
buildFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" ];
|
||||
installFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" ];
|
||||
# -fno-strict-overflow is not a supported argument in clang on darwin
|
||||
hardeningDisable = lib.optionals stdenv.isDarwin ["strictoverflow"];
|
||||
|
||||
makeFlags = [
|
||||
"PLATFORM=${platform}" "PREFIX=$(out)"
|
||||
] ++ (lib.optionals stdenv.isDarwin [
|
||||
"XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin"
|
||||
"C_COMPILER=$(CC)"
|
||||
]);
|
||||
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
] ++ (lib.ifEnable (bootstrap-chicken != null) [
|
||||
] ++ (lib.optionals (bootstrap-chicken != null) [
|
||||
bootstrap-chicken
|
||||
]);
|
||||
|
||||
@@ -46,7 +53,7 @@ stdenv.mkDerivation {
|
||||
homepage = "http://www.call-cc.org/";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
maintainers = with stdenv.lib.maintainers; [ corngood ];
|
||||
platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix
|
||||
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # Maybe other Unix
|
||||
description = "A portable compiler for the Scheme programming language";
|
||||
longDescription = ''
|
||||
CHICKEN is a compiler for the Scheme programming language.
|
||||
|
||||
@@ -1,7 +1,29 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper
|
||||
, coreutils, git, gmp, hostname, openssl, readline, tzdata, libxml2, libyaml
|
||||
, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib, pkgconfig
|
||||
, callPackage }:
|
||||
{ stdenv
|
||||
, callPackage
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, lib
|
||||
# Dependencies
|
||||
, boehmgc
|
||||
, coreutils
|
||||
, git
|
||||
, gmp
|
||||
, hostname
|
||||
, libatomic_ops
|
||||
, libevent
|
||||
, libiconv
|
||||
, libxml2
|
||||
, libyaml
|
||||
, llvmPackages
|
||||
, makeWrapper
|
||||
, openssl
|
||||
, pcre
|
||||
, pkgconfig
|
||||
, readline
|
||||
, tzdata
|
||||
, which
|
||||
, zlib
|
||||
}:
|
||||
|
||||
# We need multiple binaries as a given binary isn't always able to build
|
||||
# (even slightly) older or newer versions.
|
||||
@@ -43,144 +65,152 @@ let
|
||||
] ++ extraBuildInputs
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
generic = (
|
||||
{ version
|
||||
, sha256
|
||||
, binary
|
||||
, doCheck ? true
|
||||
, extraBuildInputs ? []
|
||||
, buildFlags ? ["all" "docs"]
|
||||
}:
|
||||
lib.fix (compiler: stdenv.mkDerivation {
|
||||
pname = "crystal";
|
||||
inherit buildFlags doCheck version;
|
||||
|
||||
generic = ({ version, sha256, binary, doCheck ? true, extraBuildInputs ? [] }:
|
||||
lib.fix (compiler: stdenv.mkDerivation {
|
||||
pname = "crystal";
|
||||
inherit doCheck version;
|
||||
src = fetchFromGitHub {
|
||||
owner = "crystal-lang";
|
||||
repo = "crystal";
|
||||
rev = version;
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crystal-lang";
|
||||
repo = "crystal";
|
||||
rev = version;
|
||||
inherit sha256;
|
||||
};
|
||||
outputs = [ "out" "lib" "bin" ];
|
||||
|
||||
outputs = [ "out" "lib" "bin" ];
|
||||
postPatch = ''
|
||||
# Add dependency of crystal to docs to avoid issue on flag changes between releases
|
||||
# https://github.com/crystal-lang/crystal/pull/8792#issuecomment-614004782
|
||||
substituteInPlace Makefile \
|
||||
--replace 'docs: ## Generate standard library documentation' 'docs: crystal ## Generate standard library documentation'
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/crystal/system/unix/time.cr \
|
||||
--replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo
|
||||
substituteInPlace src/crystal/system/unix/time.cr \
|
||||
--replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo
|
||||
|
||||
ln -sf spec/compiler spec/std
|
||||
ln -sf spec/compiler spec/std
|
||||
|
||||
# Dirty fix for when no sandboxing is enabled
|
||||
rm -rf /tmp/crystal
|
||||
mkdir -p /tmp/crystal
|
||||
# Dirty fix for when no sandboxing is enabled
|
||||
rm -rf /tmp/crystal
|
||||
mkdir -p /tmp/crystal
|
||||
|
||||
substituteInPlace spec/std/file_spec.cr \
|
||||
--replace '/bin/ls' '${coreutils}/bin/ls' \
|
||||
--replace '/usr/share' '/tmp/crystal' \
|
||||
--replace '/usr' '/tmp'
|
||||
substituteInPlace spec/std/file_spec.cr \
|
||||
--replace '/bin/ls' '${coreutils}/bin/ls' \
|
||||
--replace '/usr/share' '/tmp/crystal' \
|
||||
--replace '/usr' '/tmp'
|
||||
|
||||
substituteInPlace spec/std/process_spec.cr \
|
||||
--replace '/bin/cat' '${coreutils}/bin/cat' \
|
||||
--replace '/bin/ls' '${coreutils}/bin/ls' \
|
||||
--replace '/usr/bin/env' '${coreutils}/bin/env' \
|
||||
--replace '"env"' '"${coreutils}/bin/env"' \
|
||||
--replace '"/usr"' '"/tmp"'
|
||||
substituteInPlace spec/std/process_spec.cr \
|
||||
--replace '/bin/cat' '${coreutils}/bin/cat' \
|
||||
--replace '/bin/ls' '${coreutils}/bin/ls' \
|
||||
--replace '/usr/bin/env' '${coreutils}/bin/env' \
|
||||
--replace '"env"' '"${coreutils}/bin/env"' \
|
||||
--replace '"/usr"' '"/tmp"'
|
||||
|
||||
substituteInPlace spec/std/socket/tcp_server_spec.cr \
|
||||
--replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "'
|
||||
substituteInPlace spec/std/socket/tcp_server_spec.cr \
|
||||
--replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "'
|
||||
|
||||
substituteInPlace spec/std/system_spec.cr \
|
||||
--replace '`hostname`' '`${hostname}/bin/hostname`'
|
||||
substituteInPlace spec/std/system_spec.cr \
|
||||
--replace '`hostname`' '`${hostname}/bin/hostname`'
|
||||
|
||||
# See https://github.com/crystal-lang/crystal/pull/8640
|
||||
substituteInPlace spec/std/http/cookie_spec.cr \
|
||||
--replace '01 Jan 2020' '01 Jan #{Time.utc.year + 2}'
|
||||
# See https://github.com/crystal-lang/crystal/pull/8640
|
||||
substituteInPlace spec/std/http/cookie_spec.cr \
|
||||
--replace '01 Jan 2020' '01 Jan #{Time.utc.year + 2}'
|
||||
|
||||
# See https://github.com/crystal-lang/crystal/issues/8629
|
||||
substituteInPlace spec/std/socket/udp_socket_spec.cr \
|
||||
--replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"'
|
||||
# See https://github.com/crystal-lang/crystal/issues/8629
|
||||
substituteInPlace spec/std/socket/udp_socket_spec.cr \
|
||||
--replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"'
|
||||
|
||||
# See https://github.com/crystal-lang/crystal/pull/8699
|
||||
substituteInPlace spec/std/xml/xml_spec.cr \
|
||||
--replace 'it "handles errors"' 'pending "handles errors"'
|
||||
'';
|
||||
# See https://github.com/crystal-lang/crystal/pull/8699
|
||||
substituteInPlace spec/std/xml/xml_spec.cr \
|
||||
--replace 'it "handles errors"' 'pending "handles errors"'
|
||||
'';
|
||||
|
||||
buildInputs = commonBuildInputs extraBuildInputs;
|
||||
buildInputs = commonBuildInputs extraBuildInputs;
|
||||
|
||||
nativeBuildInputs = [ binary makeWrapper which pkgconfig llvm ];
|
||||
nativeBuildInputs = [ binary makeWrapper which pkgconfig llvmPackages.llvm ];
|
||||
|
||||
makeFlags = [
|
||||
"CRYSTAL_CONFIG_VERSION=${version}"
|
||||
];
|
||||
makeFlags = [
|
||||
"CRYSTAL_CONFIG_VERSION=${version}"
|
||||
];
|
||||
|
||||
buildFlags = [
|
||||
"all" "docs"
|
||||
];
|
||||
LLVM_CONFIG = "${llvmPackages.llvm}/bin/llvm-config";
|
||||
|
||||
LLVM_CONFIG = "${llvm}/bin/llvm-config";
|
||||
FLAGS = [
|
||||
"--release"
|
||||
"--single-module" # needed for deterministic builds
|
||||
];
|
||||
|
||||
FLAGS = [
|
||||
"--release"
|
||||
"--single-module" # needed for deterministic builds
|
||||
];
|
||||
# This makes sure we don't keep depending on the previous version of
|
||||
# crystal used to build this one.
|
||||
CRYSTAL_LIBRARY_PATH = "${placeholder "lib"}/crystal";
|
||||
|
||||
# This makes sure we don't keep depending on the previous version of
|
||||
# crystal used to build this one.
|
||||
CRYSTAL_LIBRARY_PATH = "${placeholder "lib"}/crystal";
|
||||
# We *have* to add `which` to the PATH or crystal is unable to build
|
||||
# stuff later if which is not available.
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# We *have* to add `which` to the PATH or crystal is unable to build stuff
|
||||
# later if which is not available.
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 .build/crystal $bin/bin/crystal
|
||||
wrapProgram $bin/bin/crystal \
|
||||
--suffix PATH : ${lib.makeBinPath [ pkgconfig llvmPackages.clang which ]} \
|
||||
--suffix CRYSTAL_PATH : lib:$lib/crystal \
|
||||
--suffix CRYSTAL_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath (commonBuildInputs extraBuildInputs)
|
||||
}
|
||||
install -dm755 $lib/crystal
|
||||
cp -r src/* $lib/crystal/
|
||||
|
||||
install -Dm755 .build/crystal $bin/bin/crystal
|
||||
wrapProgram $bin/bin/crystal \
|
||||
--suffix PATH : ${lib.makeBinPath [ pkgconfig clang which ]} \
|
||||
--suffix CRYSTAL_PATH : lib:$lib/crystal \
|
||||
--suffix CRYSTAL_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath (commonBuildInputs extraBuildInputs)
|
||||
}
|
||||
install -dm755 $lib/crystal
|
||||
cp -r src/* $lib/crystal/
|
||||
install -dm755 $out/share/doc/crystal/api
|
||||
cp -r docs/* $out/share/doc/crystal/api/
|
||||
cp -r samples $out/share/doc/crystal/
|
||||
|
||||
install -dm755 $out/share/doc/crystal/api
|
||||
cp -r docs/* $out/share/doc/crystal/api/
|
||||
cp -r samples $out/share/doc/crystal/
|
||||
install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal
|
||||
install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal
|
||||
|
||||
install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal
|
||||
install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal
|
||||
install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1
|
||||
|
||||
install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1
|
||||
install -Dm644 -t $out/share/licenses/crystal LICENSE README.md
|
||||
|
||||
install -Dm644 -t $out/share/licenses/crystal LICENSE README.md
|
||||
mkdir -p $out
|
||||
ln -s $bin/bin $out/bin
|
||||
ln -s $lib $out/lib
|
||||
|
||||
mkdir -p $out
|
||||
ln -s $bin/bin $out/bin
|
||||
ln -s $lib $out/lib
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
enableParallelBuilding = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
dontStrip = true;
|
||||
|
||||
dontStrip = true;
|
||||
checkTarget = "compiler_spec";
|
||||
|
||||
checkTarget = "spec";
|
||||
preCheck = ''
|
||||
export HOME=/tmp
|
||||
mkdir -p $HOME/test
|
||||
|
||||
preCheck = ''
|
||||
export HOME=/tmp
|
||||
mkdir -p $HOME/test
|
||||
export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH
|
||||
export PATH=${lib.makeBinPath checkInputs}:$PATH
|
||||
'';
|
||||
|
||||
export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH
|
||||
export PATH=${lib.makeBinPath checkInputs}:$PATH
|
||||
'';
|
||||
passthru.buildCrystalPackage = callPackage ./build-package.nix {
|
||||
crystal = compiler;
|
||||
};
|
||||
|
||||
passthru.buildCrystalPackage = callPackage ./build-package.nix {
|
||||
crystal = compiler;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A compiled language with Ruby like syntax and type inference";
|
||||
homepage = "https://crystal-lang.org/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ manveru david50407 peterhoeg ];
|
||||
platforms = builtins.attrNames archs;
|
||||
};
|
||||
}));
|
||||
meta = with lib; {
|
||||
description = "A compiled language with Ruby like syntax and type inference";
|
||||
homepage = "https://crystal-lang.org/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ];
|
||||
platforms = builtins.attrNames archs;
|
||||
};
|
||||
})
|
||||
);
|
||||
|
||||
in rec {
|
||||
binaryCrystal_0_31 = genericBinary {
|
||||
@@ -202,24 +232,30 @@ in rec {
|
||||
crystal_0_32 = generic {
|
||||
version = "0.32.1";
|
||||
sha256 = "120ndi3nhh2r52hjvhwfb49cdggr1bzdq6b8xg7irzavhjinfza6";
|
||||
binary = binaryCrystal_0_31;
|
||||
binary = crystal_0_31;
|
||||
};
|
||||
|
||||
crystal_0_33 = generic {
|
||||
version = "0.33.0";
|
||||
sha256 = "1zg0qixcws81s083wrh54hp83ng2pa8iyyafaha55mzrh8293jbi";
|
||||
binary = binaryCrystal_0_31;
|
||||
doCheck = false; # 4 checks are failing now
|
||||
binary = crystal_0_32;
|
||||
};
|
||||
|
||||
crystal_0_34 = generic {
|
||||
version = "0.34.0";
|
||||
sha256 = "110lfpxk9jnqyznbfnilys65ixj5sdmy8pvvnlhqhc3ccvrlnmq4";
|
||||
binary = crystal_0_33;
|
||||
doCheck = false; # 4 checks are failing now
|
||||
};
|
||||
|
||||
crystal = crystal_0_34;
|
||||
crystal_0_35 = generic {
|
||||
version = "0.35.1";
|
||||
sha256 = "0p51bjl1nsvwsm64lqq421dcsxa201w7wwq8plw4r8wqarpq0g69";
|
||||
binary = crystal_0_34;
|
||||
# Needs git to build as per https://github.com/crystal-lang/crystal/issues/9789
|
||||
extraBuildInputs = [ git ];
|
||||
};
|
||||
|
||||
crystal = crystal_0_35;
|
||||
|
||||
crystal2nix = callPackage ./crystal2nix.nix {};
|
||||
}
|
||||
|
||||
@@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "A statically typed language for the Erlang VM";
|
||||
homepage = "https://gleam.run/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ filalex77 ];
|
||||
maintainers = with maintainers; [ Br1ght0ne ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,19 @@
|
||||
import ./shared.nix {
|
||||
{ stdenv, fetchpatch, fetchurl, fetchzip
|
||||
# build tools
|
||||
, gfortran, m4, makeWrapper, patchelf, perl, which, python2
|
||||
, 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";
|
||||
@@ -6,4 +21,193 @@ import ./shared.nix {
|
||||
|
||||
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 python2 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
|
||||
]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
|
||||
;
|
||||
|
||||
patches = [
|
||||
# Julia recompiles a precompiled file if the mtime stored *in* the
|
||||
# .ji file differs from the mtime of the .ji file. This
|
||||
# doesn't work in Nix because Nix changes the mtime of files in
|
||||
# the Nix store to 1. So patch Julia to accept mtimes of 1.
|
||||
./allow_nix_mtime.patch
|
||||
./diagonal-test.patch
|
||||
./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 = stdenv.lib.head (stdenv.lib.splitString "-" stdenv.system);
|
||||
march = {
|
||||
x86_64 = stdenv.hostPlatform.platform.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}"
|
||||
|
||||
"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); (stdenv.lib.makeLibraryPath [
|
||||
arpack fftw fftwSinglePrec gmp libgit2 mpfr blas lapack openlibm
|
||||
openspecfun pcre2
|
||||
]);
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
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}
|
||||
'';
|
||||
|
||||
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 = stdenv.lib.licenses.mit;
|
||||
maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,70 +1,26 @@
|
||||
{ majorVersion
|
||||
, minorVersion
|
||||
, maintenanceVersion
|
||||
, src_sha256
|
||||
# source deps
|
||||
, libuvVersion
|
||||
, libuvSha256
|
||||
}:
|
||||
{ stdenv, fetchurl, fetchzip
|
||||
{ stdenv, fetchurl, fetchzip, fetchFromGitHub
|
||||
# build tools
|
||||
, gfortran, m4, makeWrapper, patchelf, perl, which, python2
|
||||
, cmake
|
||||
# libjulia dependencies
|
||||
, libunwind, readline, utf8proc, zlib
|
||||
# standard library dependencies
|
||||
, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
|
||||
, curl, fftwSinglePrec, fftw, libgit2, mpfr, openlibm, openspecfun, pcre2
|
||||
# linear algebra
|
||||
, blas, lapack, arpack
|
||||
# Darwin frameworks
|
||||
, CoreServices, ApplicationServices
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
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";
|
||||
};
|
||||
majorVersion = "1";
|
||||
minorVersion = "5";
|
||||
maintenanceVersion = "3";
|
||||
src_sha256 = "sha256:0jds8lrhk4hfdv7dg5p2ibzin9ivga7wrx7zwcmz6dqp3x792n1i";
|
||||
version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
|
||||
in
|
||||
|
||||
@@ -72,24 +28,13 @@ 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;
|
||||
};
|
||||
prePatch = ''
|
||||
export PATH=$PATH:${cmake}/bin
|
||||
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"
|
||||
'';
|
||||
src = fetchzip {
|
||||
url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
|
||||
sha256 = src_sha256;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001.1-use-system-utf8proc.patch
|
||||
./use-system-utf8proc-julia-1.3.patch
|
||||
|
||||
# Julia recompiles a precompiled file if the mtime stored *in* the
|
||||
# .ji file differs from the mtime of the .ji file. This
|
||||
@@ -106,28 +51,36 @@ stdenv.mkDerivation rec {
|
||||
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
|
||||
# LibGit2 fails with a weird error, so we skip it as well now
|
||||
rm stdlib/LibGit2/test/runtests.jl && touch stdlib/LibGit2/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
|
||||
'';
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
buildInputs = [
|
||||
arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
|
||||
arpack fftw fftwSinglePrec libgit2 libunwind mpfr
|
||||
pcre2.dev blas lapack openlibm openspecfun readline utf8proc
|
||||
zlib
|
||||
]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
|
||||
;
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices];
|
||||
|
||||
nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ];
|
||||
nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which cmake ];
|
||||
|
||||
makeFlags =
|
||||
let
|
||||
arch = head (splitString "-" stdenv.system);
|
||||
march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch}
|
||||
march = {
|
||||
x86_64 = stdenv.hostPlatform.platform.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"; }.${arch}
|
||||
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}"
|
||||
@@ -143,13 +96,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
"USE_SYSTEM_ARPACK=1"
|
||||
"USE_SYSTEM_FFTW=1"
|
||||
"USE_SYSTEM_GMP=1"
|
||||
"USE_SYSTEM_GMP=0"
|
||||
"USE_SYSTEM_LIBGIT2=1"
|
||||
"USE_SYSTEM_LIBUNWIND=1"
|
||||
|
||||
#"USE_SYSTEM_LLVM=1"
|
||||
"LLVM_VER=6.0.0"
|
||||
|
||||
"USE_SYSTEM_MPFR=1"
|
||||
"USE_SYSTEM_OPENLIBM=1"
|
||||
"USE_SYSTEM_OPENSPECFUN=1"
|
||||
@@ -160,17 +110,17 @@ stdenv.mkDerivation rec {
|
||||
"USE_SYSTEM_READLINE=1"
|
||||
"USE_SYSTEM_UTF8PROC=1"
|
||||
"USE_SYSTEM_ZLIB=1"
|
||||
|
||||
"USE_BINARYBUILDER=0"
|
||||
];
|
||||
|
||||
LD_LIBRARY_PATH = makeLibraryPath [
|
||||
arpack fftw fftwSinglePrec gmp libgit2 mpfr blas lapack openlibm
|
||||
openspecfun pcre2
|
||||
arpack fftw fftwSinglePrec libgit2 mpfr blas openlibm
|
||||
openspecfun pcre2 lapack
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
checkTarget = "testall";
|
||||
# Julia's tests require read/write access to $HOME
|
||||
preCheck = ''
|
||||
export HOME="$NIX_BUILD_TOP"
|
||||
@@ -204,7 +154,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://julialang.org/";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
|
||||
broken = stdenv.isi686;
|
||||
};
|
||||
}
|
||||
27
pkgs/development/compilers/julia/diagonal-test.patch
Normal file
27
pkgs/development/compilers/julia/diagonal-test.patch
Normal file
@@ -0,0 +1,27 @@
|
||||
From 9eb180c523b877a53b9e1cf53a4d5e6dad3d7bfe Mon Sep 17 00:00:00 2001
|
||||
From: Lars Jellema <lars.jellema@gmail.com>
|
||||
Date: Sat, 19 Sep 2020 13:52:20 +0200
|
||||
Subject: [PATCH] Use approximate comparisons for diagonal tests
|
||||
|
||||
---
|
||||
stdlib/LinearAlgebra/test/diagonal.jl | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/stdlib/LinearAlgebra/test/diagonal.jl b/stdlib/LinearAlgebra/test/diagonal.jl
|
||||
index e420d5bc6d..7f1b5d0aec 100644
|
||||
--- a/stdlib/LinearAlgebra/test/diagonal.jl
|
||||
+++ b/stdlib/LinearAlgebra/test/diagonal.jl
|
||||
@@ -450,8 +450,8 @@ end
|
||||
M = randn(T, 5, 5)
|
||||
MM = [randn(T, 2, 2) for _ in 1:2, _ in 1:2]
|
||||
for transform in (identity, adjoint, transpose, Adjoint, Transpose)
|
||||
- @test lmul!(transform(D), copy(M)) == *(transform(Matrix(D)), M)
|
||||
- @test rmul!(copy(M), transform(D)) == *(M, transform(Matrix(D)))
|
||||
+ @test lmul!(transform(D), copy(M)) ≈ *(transform(Matrix(D)), M)
|
||||
+ @test rmul!(copy(M), transform(D)) ≈ *(M, transform(Matrix(D)))
|
||||
@test lmul!(transform(DD), copy(MM)) == *(transform(fullDD), MM)
|
||||
@test rmul!(copy(MM), transform(DD)) == *(MM, transform(fullDD))
|
||||
end
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
|
||||
{ stdenv, lib, fetchFromGitHub, bash, pkgconfig, autoconf, cpio, file, which, unzip
|
||||
, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
|
||||
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
|
||||
, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap
|
||||
@@ -18,9 +18,11 @@ let
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
version = "${major}.${minor}.${update}+${build}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
|
||||
sha256 = "fc2ee2ee5822f2440e66114c8fa76888fea7ddd351282940c222d34b5f871858";
|
||||
src = fetchFromGitHub {
|
||||
owner = "openjdk";
|
||||
repo = "jdk${major}u";
|
||||
rev = "jdk-${version}";
|
||||
sha256 = "11j2rqz9nag5y562g99py4p72f2kv4wwwyrnaspmrzax00wynyx7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoconf ];
|
||||
|
||||
@@ -4,13 +4,14 @@
|
||||
, curl, git, unzip, gnutar, coreutils, sqlite }:
|
||||
|
||||
let
|
||||
name = "pakcs-2.2.0";
|
||||
pname = "pakcs";
|
||||
version = "2.2.1";
|
||||
|
||||
# Don't switch to development release without a reason, because its
|
||||
# source updates without version bump. Prefer current release instead.
|
||||
# Don't switch to "Current release" without a reason, because its
|
||||
# source updates without version bump. Prefer last from "Older releases" instead.
|
||||
src = fetchurl {
|
||||
url = "https://www.informatik.uni-kiel.de/~pakcs/download/${name}-src.tar.gz";
|
||||
sha256 = "0c0a6cp9lwha5i90kv9ya2zi1ggnvkf4gwjfzbffgwwa77s2wz2l";
|
||||
url = "https://www.informatik.uni-kiel.de/~pakcs/download/pakcs-${version}-src.tar.gz";
|
||||
sha256 = "1jyg29j8r8pgcin7ixdya6c3zzfjdi66rghpwrfnkk133fz4iz7s";
|
||||
};
|
||||
|
||||
curry-frontend = (haskellPackages.override {
|
||||
@@ -26,7 +27,7 @@ let
|
||||
};
|
||||
}).curry-frontend;
|
||||
in stdenv.mkDerivation {
|
||||
inherit name src;
|
||||
inherit pname version src;
|
||||
|
||||
buildInputs = [ swiProlog ];
|
||||
nativeBuildInputs = [ which makeWrapper ];
|
||||
|
||||
Reference in New Issue
Block a user