Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-06-12 08:57:26 +02:00
146 changed files with 1775 additions and 851 deletions
+2 -2
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, ant, jre, jdk}:
stdenv.mkDerivation rec {
pname = "abcl";
version = "1.6.1";
version = "1.7.0";
# 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 = "04myiba6g0vij2ym2dmb0156k20ki2lz13dxwp2bk9kvjn2zg88b";
sha256 = "0pbn5s22zygk6k0rzjc9g76220628lj1b3057gr0n4grl11p4lx5";
};
configurePhase = ''
mkdir nix-tools
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-jsonnet";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "google";
repo = "go-jsonnet";
rev = "v${version}";
sha256 = "0l6cwky2xl7m8nnc9abp76bhkdcf2ldbbv3r8p30xv2yr5wd1j8i";
sha256 = "17606gc75wnkm64am4hmlv7m3fy2hi8rnzadp6nrgpcd6rl26m83";
};
vendorSha256 = "1vdv0nq31mjprxzxf8x0diaigissy07vnm338h8jrk5i74x5by39";
vendorSha256 = "0nsm4gsbbn8myz4yfi6m7qc3iizhdambsr18iks0clkdn3mi2jn1";
subPackages = [ "cmd/jsonnet" ];
+1 -1
View File
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
LD_LIBRARY_PATH = makeLibraryPath [
arpack fftw fftwSinglePrec gmp libgit2 mpfr blas openlibm
openspecfun pcre2
openspecfun pcre2 lapack
];
enableParallelBuilding = true;
+6 -3
View File
@@ -1,5 +1,6 @@
{ stdenv
, abc-verifier
, bash
, bison
, fetchFromGitHub
, flex
@@ -15,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "yosys";
version = "2020.03.24";
version = "2020.06.11";
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
rev = "c9555c9adeba886a308c60615ac794ec20d9276e";
sha256 = "1fh118fv06jyfmkx6zy0w2k0rjj22m0ffyll3k5giaw8zzaf0j3a";
rev = "a1785e988b2b51dac32985dd6b0afdcedc6bda1d";
sha256 = "0987f5vm2zb0i02c3vlw21gihky2cfj5l9b78ddzhxfiv0qfkdfp";
};
enableParallelBuilding = true;
@@ -38,6 +39,8 @@ stdenv.mkDerivation rec {
--replace 'LD = gcc' 'LD = $(CXX)' \
--replace 'ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"' 'ABCMKARGS =' \
--replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}'
substituteInPlace ./misc/yosys-config.in \
--replace '/bin/bash' '${bash}/bin/bash'
patchShebangs tests
'';