Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
@@ -4,40 +4,45 @@
|
||||
, autoconf
|
||||
, automake
|
||||
, fontconfig
|
||||
, gmp
|
||||
, gmp-static
|
||||
, gperf
|
||||
, libX11
|
||||
, libpoly
|
||||
, perl
|
||||
, flex
|
||||
, bison
|
||||
, pkgconfig
|
||||
, itktcl
|
||||
, incrtcl
|
||||
, tcl
|
||||
, tk
|
||||
, verilog
|
||||
, xorg
|
||||
, yices
|
||||
, zlib
|
||||
, ghc
|
||||
}:
|
||||
|
||||
let
|
||||
# yices wants a libgmp.a and fails otherwise
|
||||
gmpStatic = gmp.override { withStatic = true; };
|
||||
|
||||
ghcWithPackages = ghc.withPackages (g: (with g; [old-time regex-compat syb]));
|
||||
ghcWithPackages = ghc.withPackages (g: (with g; [old-time regex-compat syb split ]));
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "bluespec";
|
||||
version = "unstable-2020.02.09";
|
||||
version = "unstable-2020.11.04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "B-Lang-org";
|
||||
repo = "bsc";
|
||||
rev = "05c8afb08078e437c635b9c708124b428ac51b3d";
|
||||
sha256 = "06yhpkz7wga1a0p9031cfjqbzw7205bj2jxgdghhfzmllaiphniy";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
owner = "B-Lang-org";
|
||||
repo = "bsc";
|
||||
rev = "103357f32cf63f2ca2b16ebc8e2c675ec5562464";
|
||||
sha256 = "0iikzx0fxky0fmc31lyxfldy1wixr2mayzcn24b8d76wd4ix1vk3";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [
|
||||
patches = [ ./libstp_stub_makefile.patch ];
|
||||
|
||||
buildInputs = yices.buildInputs ++ [
|
||||
zlib
|
||||
gmpStatic gperf libpoly # yices
|
||||
tcl tk
|
||||
libX11 # tcltk
|
||||
xorg.libXft
|
||||
fontconfig
|
||||
@@ -46,6 +51,8 @@ in stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
automake autoconf
|
||||
perl
|
||||
flex
|
||||
bison
|
||||
pkgconfig
|
||||
ghcWithPackages
|
||||
];
|
||||
@@ -54,13 +61,13 @@ in stdenv.mkDerivation rec {
|
||||
verilog
|
||||
];
|
||||
|
||||
patches = [
|
||||
# drop stp support https://github.com/B-Lang-org/bsc/pull/31
|
||||
(fetchpatch {
|
||||
url = "https://github.com/flokli/bsc/commit/0bd48ecc2561541dc1368918863c0b2f4915006f.patch";
|
||||
sha256 = "0bam9anld33zfi9d4gs502g94w49zhl5iqmbs2d1p5i19aqpy38l";
|
||||
})
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
mkdir -p $sourceRoot/src/vendor/yices/v2.6/yices2
|
||||
# XXX: only works because yices.src isn't a tarball.
|
||||
cp -av ${yices.src}/* $sourceRoot/src/vendor/yices/v2.6/yices2
|
||||
chmod -R +rwX $sourceRoot/src/vendor/yices/v2.6/yices2
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
patchShebangs \
|
||||
@@ -72,11 +79,15 @@ in stdenv.mkDerivation rec {
|
||||
substituteInPlace src/comp/Makefile \
|
||||
--replace 'BINDDIR' 'BINDIR' \
|
||||
--replace 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) install-utils'
|
||||
# allow running bsc to bootstrap
|
||||
export LD_LIBRARY_PATH=/build/source/inst/lib/SAT
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"NO_DEPS_CHECKS=1" # skip the subrepo check (this deriviation uses yices.src instead of the subrepo)
|
||||
"NOGIT=1" # https://github.com/B-Lang-org/bsc/issues/12
|
||||
"LDCONFIG=ldconfig" # https://github.com/B-Lang-org/bsc/pull/43
|
||||
"STP_STUB=1"
|
||||
];
|
||||
|
||||
installPhase = "mv inst $out";
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
diff -ru bsc-orig/src/vendor/stp/Makefile bsc-new/src/vendor/stp/Makefile
|
||||
--- bsc-orig/src/vendor/stp/Makefile 1969-12-31 16:00:01.000000000 -0800
|
||||
+++ bsc-new/src/vendor/stp/Makefile 2020-11-12 17:42:40.115143035 -0800
|
||||
@@ -9,12 +9,13 @@
|
||||
SRC = src
|
||||
else
|
||||
SRC = src_stub
|
||||
+SNAME += lib/libstp_stub.so
|
||||
endif
|
||||
|
||||
ifeq ($(OSTYPE), Darwin)
|
||||
-SNAME=libstp.dylib
|
||||
+SNAME = lib/libstp.dylib
|
||||
else
|
||||
-SNAME=libstp.so.1
|
||||
+SNAME += lib/libstp.so.1
|
||||
endif
|
||||
|
||||
all: install
|
||||
@@ -23,7 +24,7 @@
|
||||
$(MAKE) -C $(SRC) install
|
||||
ln -fsn HaskellIfc include_hs
|
||||
install -m 755 -d $(PREFIX)/lib/SAT
|
||||
- install -m 644 lib/$(SNAME) $(PREFIX)/lib/SAT
|
||||
+ install -m 644 $(SNAME) $(PREFIX)/lib/SAT
|
||||
|
||||
clean:
|
||||
$(MAKE) -C $(SRC) clean
|
||||
@@ -3,24 +3,23 @@
|
||||
, pkg-config
|
||||
, autoPatchelfHook
|
||||
, installShellFiles
|
||||
, ncurses5
|
||||
, ocl-icd
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "computecpp";
|
||||
version = "1.3.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/ubuntu-16.04-64bit.tar.gz";
|
||||
sha256 = "1q6gqjpzz4a260gsd6mm1iv4z8ar3vxaypmgdwl8pb4i7kg6ykaz";
|
||||
url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/x86_64-linux-gnu.tar.gz";
|
||||
hash = "sha256-niXNWbkXjd35col6dS66HdxFurXfJw/Xb2c5njukxcg=";
|
||||
stripRoot = true;
|
||||
};
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
buildInputs = [ stdenv.cc.cc.lib ncurses5 ocl-icd zlib ];
|
||||
buildInputs = [ stdenv.cc.cc.lib ocl-icd zlib ];
|
||||
nativeBuildInputs = [ autoPatchelfHook pkg-config installShellFiles ];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
let
|
||||
nodeEnv = import ../../../node-packages/node-env.nix {
|
||||
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
|
||||
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
|
||||
inherit nodejs;
|
||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||
};
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
{ stdenv
|
||||
, fetchzip
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fasmg";
|
||||
version = "j27m";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://flatassembler.net/fasmg.${version}.zip";
|
||||
sha256 = "0qmklb24n3r0my2risid8r61pi88gqrvm1c0xvyd0bp1ans6d7zd";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
buildPhase = let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
||||
path = {
|
||||
x86_64-linux = {
|
||||
bin = "fasmg.x64";
|
||||
asm = "source/linux/x64/fasmg.asm";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
bin = "source/macos/x64/fasmg";
|
||||
asm = "source/macos/x64/fasmg.asm";
|
||||
};
|
||||
x86-linux = {
|
||||
bin = "fasmg";
|
||||
asm = "source/linux/fasmg.asm";
|
||||
};
|
||||
x86-darwin = {
|
||||
bin = "source/macos/fasmg";
|
||||
asm = "source/macos/fasmg.asm";
|
||||
};
|
||||
}.${system} or (throw "Unsopported system: ${system}");
|
||||
|
||||
in ''
|
||||
chmod +x ${path.bin}
|
||||
./${path.bin} ${path.asm} fasmg
|
||||
'';
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 fasmg $out/bin/fasmg
|
||||
|
||||
mkdir -p $doc/share/doc/fasmg
|
||||
cp docs/*.txt $doc/share/doc/fasmg
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF";
|
||||
homepage = "https://flatassembler.net";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ orivej luc65r ];
|
||||
platforms = with platforms; intersectLists (linux ++ darwin) x86;
|
||||
};
|
||||
}
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-jsonnet";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "go-jsonnet";
|
||||
rev = "v${version}";
|
||||
sha256 = "17606gc75wnkm64am4hmlv7m3fy2hi8rnzadp6nrgpcd6rl26m83";
|
||||
sha256 = "1rprs8l15nbrx4dw4pdg81c5l22zhj80pl4zwqgsm4113wyyvc98";
|
||||
};
|
||||
|
||||
vendorSha256 = "0nsm4gsbbn8myz4yfi6m7qc3iizhdambsr18iks0clkdn3mi2jn1";
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jsonnet";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "google";
|
||||
repo = "jsonnet";
|
||||
sha256 = "0wxhc0ghjk88zrrn9a18h979ipkia2rx12489515gzhlplfx6724";
|
||||
sha256 = "1ddz14699v5lqx3dh0mb7hfffr6fk5zhmzn3z8yxkqqvriqnciim";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
|
||||
|
||||
let
|
||||
version = "1.4.0";
|
||||
version = "1.4.20";
|
||||
in stdenv.mkDerivation {
|
||||
inherit version;
|
||||
pname = "kotlin";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
|
||||
sha256 = "0qgiabpkisqjm9iryidrynqy452vzmpgaw54rd9blr9w7g8r20sr";
|
||||
sha256 = "07q16yc7xfw5kzziwxyd7m4dc9msgqk9y2znqw3397kqssj97nqi";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ] ;
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mlkit";
|
||||
version = "4.5.1";
|
||||
version = "4.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "melsman";
|
||||
repo = "mlkit";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zigigp168737vjrw5vijgyw4k1bgz4sr7j3rwlibw52snsh4y1c";
|
||||
sha256 = "1yk7phxnwkm94qs1gbxsr6sr11a0sgpcyjymmqwf0fsl5njgyb98";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook mlton ];
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
# https://nim-lang.github.io/Nim/packaging.html
|
||||
|
||||
{ stdenv, lib, fetchgit, fetchurl, makeWrapper, gdb, openssl, pcre, readline
|
||||
, boehmgc, sqlite, nim-unwrapped, nim }:
|
||||
{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub, makeWrapper, gdb, openssl
|
||||
, pcre, readline, boehmgc, sqlite, nim-unwrapped, nimble-unwrapped }:
|
||||
|
||||
let
|
||||
version = "1.2.6";
|
||||
version = "1.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://nim-lang.org/download/nim-${version}.tar.xz";
|
||||
sha256 = "0zk5qzxayqjw7kq6p92j4008g9bbyilyymhdc5xq9sln5rqym26z";
|
||||
sha256 = "0gf2lqkqzai6mg7mf4y04gdy1ddiavans09i8aisa88ssfza5ywx";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
@@ -139,7 +139,7 @@ let
|
||||
local HOME=$TMPDIR
|
||||
./bin/nim c koch
|
||||
./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES
|
||||
./koch tools $kochArgs --parallelBuild:$NIX_BUILD_CORES
|
||||
./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
@@ -153,21 +153,52 @@ let
|
||||
|
||||
inherit meta;
|
||||
};
|
||||
|
||||
nimble-unwrapped = stdenv.mkDerivation rec {
|
||||
pname = "nimble-unwrapped";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nim-lang";
|
||||
repo = "nimble";
|
||||
rev = "v" + version;
|
||||
sha256 = "0vx0mdk31n00dr2rhiip6f4x7aa3z3mnblnmwk7f65ixd5hayq6y";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ nim-unwrapped ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
nimFlags = [ "--cpu:${nimHost.cpu}" "--os:${nimHost.os}" "-d:release" ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
HOME=$NIX_BUILD_TOP nim c $nimFlags src/nimble
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preBuild
|
||||
install -Dt $out/bin src/nimble
|
||||
runHook postBuild
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
wrapped = let
|
||||
nim = nim-unwrapped;
|
||||
nim' = nim-unwrapped;
|
||||
nimble' = nimble-unwrapped;
|
||||
inherit (stdenv) targetPlatform;
|
||||
in stdenv.mkDerivation {
|
||||
name = "${targetPlatform.config}-nim-wrapper-${nim.version}";
|
||||
inherit (nim) version;
|
||||
name = "${targetPlatform.config}-nim-wrapper-${nim'.version}";
|
||||
inherit (nim') version;
|
||||
preferLocalBuild = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
tar xf ${nim.src} nim-$version/config/nim.cfg
|
||||
tar xf ${nim'.src} nim-$version/config/nim.cfg
|
||||
cd nim-$version
|
||||
runHook postUnpack
|
||||
'';
|
||||
@@ -210,7 +241,7 @@ let
|
||||
substituteAll config/nim.cfg $out/etc/nim/nim.cfg \
|
||||
--replace "cc = gcc" ""
|
||||
|
||||
for binpath in ${nim}/bin/nim?*; do
|
||||
for binpath in ${nim'}/bin/nim?*; do
|
||||
local binname=`basename $binpath`
|
||||
makeWrapper \
|
||||
$binpath $out/bin/${targetPlatform.config}-$binname \
|
||||
@@ -219,21 +250,25 @@ let
|
||||
done
|
||||
|
||||
makeWrapper \
|
||||
${nim}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \
|
||||
${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \
|
||||
$wrapperArgs
|
||||
ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim
|
||||
|
||||
makeWrapper \
|
||||
${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \
|
||||
--suffix PATH : $out/bin
|
||||
ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
dontInstall = true;
|
||||
|
||||
meta = meta // {
|
||||
description = nim.meta.description
|
||||
description = nim'.meta.description
|
||||
+ " (${targetPlatform.config} wrapper)";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
in wrapped // wrapperInputs
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
import ./generic.nix {
|
||||
major_version = "4";
|
||||
minor_version = "12";
|
||||
patch_version = "0-alpha1";
|
||||
src = fetchTarball {
|
||||
url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha1.tar.xz";
|
||||
sha256 = "1p9nnj7l43b697b6bm767znbf1h0s2lyc1qb8izr1vfpsmnm11ws";
|
||||
};
|
||||
}
|
||||
@@ -1,12 +1,8 @@
|
||||
{ minor_version, major_version, patch_version
|
||||
, url ? null
|
||||
, sha256, ...}@args:
|
||||
, ...}@args:
|
||||
let
|
||||
versionNoPatch = "${toString major_version}.${toString minor_version}";
|
||||
version = "${versionNoPatch}.${toString patch_version}";
|
||||
real_url = if url == null then
|
||||
"http://caml.inria.fr/pub/distrib/ocaml-${versionNoPatch}/ocaml-${version}.tar.xz"
|
||||
else url;
|
||||
safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips);
|
||||
in
|
||||
|
||||
@@ -22,6 +18,13 @@ assert aflSupport -> stdenv.lib.versionAtLeast version "4.05";
|
||||
assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03";
|
||||
assert spaceTimeSupport -> stdenv.lib.versionAtLeast version "4.04";
|
||||
|
||||
let
|
||||
src = args.src or (fetchurl {
|
||||
url = args.url or "http://caml.inria.fr/pub/distrib/ocaml-${versionNoPatch}/ocaml-${version}.tar.xz";
|
||||
inherit (args) sha256;
|
||||
});
|
||||
in
|
||||
|
||||
let
|
||||
useNativeCompilers = !stdenv.isMips;
|
||||
inherit (stdenv.lib) optional optionals optionalString;
|
||||
@@ -39,10 +42,7 @@ stdenv.mkDerivation (args // {
|
||||
inherit name;
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = real_url;
|
||||
inherit sha256;
|
||||
};
|
||||
inherit src;
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
configureFlags =
|
||||
|
||||
@@ -147,6 +147,7 @@ let
|
||||
passthru = {
|
||||
architecture = "";
|
||||
home = "${openjdk}/lib/openjdk";
|
||||
inherit gtk3;
|
||||
};
|
||||
};
|
||||
in openjdk
|
||||
|
||||
@@ -151,6 +151,7 @@ let
|
||||
passthru = {
|
||||
architecture = "";
|
||||
home = "${openjdk}/lib/openjdk";
|
||||
inherit gtk3;
|
||||
};
|
||||
};
|
||||
in openjdk
|
||||
|
||||
@@ -151,6 +151,7 @@ let
|
||||
passthru = {
|
||||
architecture = "";
|
||||
home = "${openjdk}/lib/openjdk";
|
||||
inherit gtk3;
|
||||
};
|
||||
};
|
||||
in openjdk
|
||||
|
||||
@@ -267,6 +267,7 @@ let
|
||||
passthru = {
|
||||
inherit architecture;
|
||||
home = "${openjdk8}/lib/openjdk";
|
||||
inherit gtk2;
|
||||
};
|
||||
};
|
||||
in openjdk8
|
||||
|
||||
@@ -31,10 +31,6 @@ let
|
||||
gtk3 gnome_vfs GConf glib
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit gtk3;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-java-home-jdk10.patch
|
||||
./read-truststore-from-env-jdk10.patch
|
||||
@@ -155,6 +151,7 @@ let
|
||||
passthru = {
|
||||
architecture = "";
|
||||
home = "${openjdk}/lib/openjdk";
|
||||
inherit gtk3;
|
||||
};
|
||||
};
|
||||
in openjdk
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ clangStdenv, stdenv, fetchFromGitHub, cmake, zlib, openexr,
|
||||
openimageio, llvm, boost165, flex, bison, partio, pugixml,
|
||||
utillinux, python
|
||||
util-linux, python
|
||||
}:
|
||||
|
||||
let boost_static = boost165.override { enableStatic = true; };
|
||||
@@ -25,7 +25,7 @@ in clangStdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
cmake zlib openexr openimageio llvm
|
||||
boost_static flex bison partio pugixml
|
||||
utillinux # needed just for hexdump
|
||||
util-linux # needed just for hexdump
|
||||
python # CMake doesn't check this?
|
||||
];
|
||||
# TODO: How important is partio? CMake doesn't seem to find it
|
||||
|
||||
@@ -6,7 +6,7 @@ with lib;
|
||||
let
|
||||
repo = "git@github.com:scala/scala.git";
|
||||
|
||||
common = { version, sha256, test, pname }:
|
||||
common = { version, sha256, tests, pname }:
|
||||
stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
|
||||
@@ -40,7 +40,7 @@ let
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests = [ test ];
|
||||
inherit tests;
|
||||
|
||||
updateScript = writeScript "update.sh" ''
|
||||
#!${stdenv.shell}
|
||||
@@ -90,28 +90,28 @@ in {
|
||||
scala_2_10 = common {
|
||||
version = "2.10.7";
|
||||
sha256 = "koMRmRb2u3cU4HaihAzPItWIGbNVIo7RWRrm92kp8RE=";
|
||||
test = { inherit (nixosTests) scala_2_10; };
|
||||
tests = [ nixosTests.scala.scala_2_10 ];
|
||||
pname = "scala_2_10";
|
||||
};
|
||||
|
||||
scala_2_11 = common {
|
||||
version = "2.11.12";
|
||||
sha256 = "sR19M2mcpPYLw7K2hY/ZU+PeK4UiyUP0zaS2dDFhlqg=";
|
||||
test = { inherit (nixosTests) scala_2_11; };
|
||||
tests = [ nixosTests.scala.scala_2_11 ];
|
||||
pname = "scala_2_11";
|
||||
};
|
||||
|
||||
scala_2_12 = common {
|
||||
version = "2.12.12";
|
||||
sha256 = "NSDNHzye//YrrudfMuUtHl3BIL4szzQGSeRw5I9Sfis=";
|
||||
test = { inherit (nixosTests) scala_2_12; };
|
||||
tests = [ nixosTests.scala.scala_2_12 ];
|
||||
pname = "scala_2_12";
|
||||
};
|
||||
|
||||
scala_2_13 = common {
|
||||
version = "2.13.4";
|
||||
sha256 = "1alcnzmxga00nsvgy8yky91zw5b4q0xg2697vrrdgjlglpxiqwdw";
|
||||
test = { inherit (nixosTests) scala_2_13; };
|
||||
tests = [ nixosTests.scala.scala_2_13 ];
|
||||
pname = "scala_2_13";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://www.villehelin.com/wla.html";
|
||||
homepage = "https://www.villehelin.com/wla.html";
|
||||
description = "Yet Another GB-Z80/Z80/6502/65C02/6510/65816/HUC6280/SPC-700 Multi Platform Cross Assembler Package";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
||||
|
||||
Reference in New Issue
Block a user