Merge master into staging-next
This commit is contained in:
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "closure-compiler";
|
||||
version = "20200406";
|
||||
version = "20200517";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
|
||||
sha256 = "1dd6fakavnadpm8h8r4d1saf9flm7ilhknfy0q6i5i237psjf7i5";
|
||||
sha256 = "05bbsrxw2nxjlcfc22w1ympi66jnmzymivg29cvidh5n28jgwba2";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -40,7 +40,6 @@ gccStdenv.mkDerivation rec {
|
||||
"--enable-gcc-opts"
|
||||
"--enable-shared"
|
||||
"--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it.
|
||||
"--enable-poll"
|
||||
"--enable-openssl"
|
||||
"--enable-default-runtime-options=${gambit-params.defaultRuntimeOptions}"
|
||||
# "--enable-debug" # Nope: enables plenty of good stuff, but also the costly console.log
|
||||
@@ -57,7 +56,9 @@ gccStdenv.mkDerivation rec {
|
||||
# "--enable-coverage"
|
||||
# "--enable-inline-jumps"
|
||||
# "--enable-char-size=1" # default is 4
|
||||
];
|
||||
] ++
|
||||
# due not enable poll on darwin due to https://github.com/gambit/gambit/issues/498
|
||||
lib.optional (!gccStdenv.isDarwin) "--enable-poll";
|
||||
|
||||
configurePhase = ''
|
||||
export CC=${gcc}/bin/gcc \
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import ./jdk-linux-base.nix {
|
||||
productVersion = "8";
|
||||
patchVersion = "241";
|
||||
sha256.i686-linux = "1niiwifby8zqvsh0ccdf3n21vlqfvvms223dc3kw2c2rksch3yg4";
|
||||
sha256.x86_64-linux = "1jz8d6663jspxgw8yxxx5ca6jaa3g67dbbi5d83pdxjmg1kk57a1";
|
||||
sha256.armv7l-linux = "1pjzyi1qd4nzfwvh0z5fpwga7j8mksiv5h8wzirv2ccdyy4wqw24";
|
||||
sha256.aarch64-linux = "1zliv4a0ygrsdpq36b89yl7jf7kidmxqbnp1sk2661y471x02p9l";
|
||||
patchVersion = "251";
|
||||
sha256.i686-linux = "0c6d25c09459e435570204f1a22a1cb765ce5d62c5bced92c9a9546b7be337f2";
|
||||
sha256.x86_64-linux = "777a8d689e863275a647ae52cb30fd90022a3af268f34fc5b9867ce32f1b374e";
|
||||
sha256.armv7l-linux = "f1b0c979e1b61ec52ebd5e1d0b754d7681d8623b09ac90c69718a553ef9b0cd1";
|
||||
sha256.aarch64-linux = "58baeaab7da97dd5a6b02ad2dcd77c14b3b6ba014029ee67dbc2bd5f0fa98d1b";
|
||||
jceName = "jce_policy-8.zip";
|
||||
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
|
||||
}
|
||||
|
||||
@@ -6,13 +6,13 @@ let main = ./main.go;
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "tinygo";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tinygo-org";
|
||||
repo = "tinygo";
|
||||
rev = "v${version}";
|
||||
sha256 = "0x59j56y704m2hfkg78illgw9f6czrx265x887jfd989lnxphyqa";
|
||||
sha256 = "0das5z5y2x1970yi9c4yssxvwrrjhdmsj495q0r5mb02amvc954v";
|
||||
};
|
||||
|
||||
overrideModAttrs = (_: {
|
||||
|
||||
Reference in New Issue
Block a user