gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tinygo: 0.35.0 -> 0.37.0 (#392337)

Browse Source
This commit is contained in:
Peder Bergebakken Sundt
2025-03-24 02:20:29 +01:00
committed by GitHub
parent afaa89335c 47d31a0b69
commit 00c65e2e9a
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/tinygo/0001-GNUmakefile.patch
+7 -6
View File
@@ -1,7 +1,7 @@
diff --git a/GNUmakefile b/GNUmakefile
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -14,11 +14,6 @@ LLVM_VERSIONS = 18 17 16 15
@@ -14,11 +14,6 @@ LLVM_VERSIONS = 19 18 17 16 15
errifempty = $(if $(1),$(1),$(error $(2)))
detect = $(shell which $(call errifempty,$(firstword $(foreach p,$(2),$(shell command -v $(p) 2> /dev/null && echo $(p)))),failed to locate $(1) at any of: $(2)))
toolSearchPathsVersion = $(1)-$(2)
@@ -13,26 +13,27 @@ diff --git a/GNUmakefile b/GNUmakefile
# First search for a custom built copy, then move on to explicitly version-tagged binaries, then just see if the tool is in path with its normal name.
findLLVMTool = $(call detect,$(1),$(abspath llvm-build/bin/$(1)) $(foreach ver,$(LLVM_VERSIONS),$(call toolSearchPathsVersion,$(1),$(ver))) $(1))
CLANG ?= $(call findLLVMTool,clang)
@@ -848,9 +843,8 @@ endif
@@ -939,10 +934,9 @@ endif
wasmtest:
$(GO) test ./tests/wasm
-build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN)),,binaryen)
+build/release:
@mkdir -p build/release/tinygo/bin
@mkdir -p build/release/tinygo/lib/bdwgc
- @mkdir -p build/release/tinygo/lib/clang/include
@mkdir -p build/release/tinygo/lib/CMSIS/CMSIS
@mkdir -p build/release/tinygo/lib/macos-minimal-sdk
@mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common
@@ -871,7 +865,6 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN
ifneq ($(USE_SYSTEM_BINARYEN),1)
@@ -964,7 +958,6 @@ ifneq ($(USE_SYSTEM_BINARYEN),1)
@cp -p build/wasm-opt$(EXE) build/release/tinygo/bin
endif
@cp -rp lib/bdwgc/* build/release/tinygo/lib/bdwgc
- @cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include
@cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS
@cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS
@cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk
@@ -927,8 +920,7 @@ endif
@@ -1026,8 +1019,7 @@ endif
@cp -rp lib/wasi-libc/libc-top-half/musl/include build/release/tinygo/lib/wasi-libc/libc-top-half/musl
@cp -rp lib/wasi-libc/sysroot build/release/tinygo/lib/wasi-libc/sysroot
@cp -rp lib/wasi-cli/wit build/release/tinygo/lib/wasi-cli/wit
@@ -43,5 +44,5 @@ diff --git a/GNUmakefile b/GNUmakefile
@cp -rp targets build/release/tinygo/targets
--
2.37.2
2.48.1
pkgs/development/compilers/tinygo/default.nix
+3 -3
View File
@@ -34,13 +34,13 @@ in
buildGoModule rec {
pname = "tinygo";
version = "0.35.0";
version = "0.37.0";
src = fetchFromGitHub {
owner = "tinygo-org";
repo = "tinygo";
rev = "v${version}";
hash = "sha256-oy6797o3lMMRJ+bPHY59Bv7mX25aEwBn4OslAohfY2g=";
hash = "sha256-I/9JXjt6aF/80Mh3iRgUYXv4l+m3XIpmKsIBviOuWCo=";
fetchSubmodules = true;
# The public hydra server on `hydra.nixos.org` is configured with
# `max_output_size` of 3GB. The purpose of this `postFetch` step
@@ -51,7 +51,7 @@ buildGoModule rec {
'';
};
vendorHash = "sha256-aY1gX++Dc5/G6VFXnP7sBdekk2IKHlenOC0erlB/Quw=";
vendorHash = "sha256-juADakh+s8oEY9UXUwxknvVeL1TgB/zRi8Xtzt/4qPA=";
patches = [
./0001-GNUmakefile.patch
pkgs/top-level/all-packages.nix
+1 -3
View File
@@ -6673,9 +6673,7 @@ with pkgs;
tinycc = darwin.apple_sdk_11_0.callPackage ../development/compilers/tinycc { };
tinygo = callPackage ../development/compilers/tinygo {
llvmPackages = llvmPackages_18;
};
tinygo = callPackage ../development/compilers/tinygo { };
urweb = callPackage ../development/compilers/urweb {
icu = icu67;