diff --git a/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch b/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch index 54e389fe1401..7e4c8eded677 100644 --- a/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch +++ b/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch @@ -18,18 +18,18 @@ index 121398fa..a589988b 100644 sourceDir: func() string { llvmDir := filepath.Join(goenv.Get("TINYGOROOT"), "llvm-project/compiler-rt/lib/builtins") diff --git a/builder/picolibc.go b/builder/picolibc.go -index f1b061ae..159f90cf 100644 +index d0786ee3..9a5cf9b0 100644 --- a/builder/picolibc.go +++ b/builder/picolibc.go -@@ -27,7 +27,7 @@ var Picolibc = Library{ - "-D_COMPILING_NEWLIB", - "-DHAVE_ALIAS_ATTRIBUTE", - "-DTINY_STDIO", +@@ -30,7 +30,7 @@ var Picolibc = Library{ + "-D_IEEE_LIBM", + "-D__OBSOLETE_MATH_FLOAT=1", // use old math code that doesn't expect a FPU + "-D__OBSOLETE_MATH_DOUBLE=0", - "-nostdlibinc", + "-isystem", "@clang_include@", - "-isystem", picolibcDir + "/include", - "-I" + picolibcDir + "/tinystdio", - "-I" + headerPath, + "-isystem", newlibDir + "/libc/include", + "-I" + newlibDir + "/libc/tinystdio", + "-I" + newlibDir + "/libm/common", diff --git a/compileopts/config.go b/compileopts/config.go index a006b673..3a105b49 100644 --- a/compileopts/config.go diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 43b981ffd068..2f6eb98be286 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -28,17 +28,17 @@ in buildGoModule rec { pname = "tinygo"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - sha256 = "sha256-Rxdxum1UIaz8tpEAGqpLvKd25nHdj4Se+IoN29EJEHg="; + sha256 = "rI8CADPWKdNvfknEsrpp2pCeZobf9fAp0GDIWjupzZA="; fetchSubmodules = true; }; - vendorSha256 = "sha256-QxLY4KT05PtA/W7d1vKxsq5w35YZ6MJL3Lh726b+E9w="; + vendorSha256 = "sha256-ihQd/RAjAQhgQZHbNiWmAD0eOo1MvqAR/OwIOUWtdAM="; patches = [ ./0001-Makefile.patch