puck/zilch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(zilch lang go): bump Go version

Browse source 
Also explicitly disable Cgo, as that is necessary for newer versions of
Go.

Change-Id: I24af36efbe5e2e4b873553c11798bbfa6a6a6964
This commit is contained in:
puck 2025-11-24 13:12:36 +00:00
parent 57f5e866c2
commit de26625157
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
default.nix
View file

@ -5,5 +5,4 @@ pkgs.symlinkJoin {
paths = [ paths = [
(pkgs.callPackage ./cli {}) (pkgs.callPackage ./cli {})
]; ];
postBuild = "echo ${go_1_23} >> $out/.go";
} }

6
lang/go/src/core.sld
View file

@ -42,7 +42,7 @@
(define %goarch (make-parameter "amd64")) (define %goarch (make-parameter "amd64"))
;; The Go toolchain to use to compile this all. ;; The Go toolchain to use to compile this all.
(define go-toolchain (cdr (assoc "out" (nixpkgs "go_1_24")))) (define go-toolchain (cdr (assoc "out" (nixpkgs "go_1_25"))))
;; Builds an importcfg file. This file describes the mapping of both ;; Builds an importcfg file. This file describes the mapping of both
;; packages to their api, and the mapping of package name as used in `import` ;; packages to their api, and the mapping of package name as used in `import`
@ -105,7 +105,9 @@
;; The environment to append to the build environment for any Go derivation. ;; The environment to append to the build environment for any Go derivation.
(define (env-for-goarch) (define (env-for-goarch)
`(("GOARCH" . ,(%goarch)))) `(("GOARCH" . ,(%goarch))
("CGO_ENABLED" . "0")
("GOCACHE" . "/build/gocache")))
;; Extra arguments to add to uses of `++go tool asm++`, to set the expected preprocessor ;; Extra arguments to add to uses of `++go tool asm++`, to set the expected preprocessor
;; variables. ;; variables.