Skip to content

Commit 3f4f4e0

Browse files
eliasnaurdeadprogram
authored andcommitted
flake.*: upgrade to nixpkgs 25.05, LLVM 20
Add a work around for #4819.
1 parent 5c35bad commit 3f4f4e0

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

flake.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
inputs = {
3535
# Use a recent stable release, but fix the version to make it reproducible.
3636
# This version should be updated from time to time.
37-
nixpkgs.url = "nixpkgs/nixos-24.05";
37+
nixpkgs.url = "nixpkgs/nixos-25.05";
3838
flake-utils.url = "github:numtide/flake-utils";
3939
};
4040
outputs = { self, nixpkgs, flake-utils }:
@@ -48,11 +48,11 @@
4848
buildInputs = [
4949
# These dependencies are required for building tinygo (go install).
5050
go
51-
llvmPackages_18.llvm
52-
llvmPackages_18.libclang
51+
llvmPackages_20.llvm
52+
llvmPackages_20.libclang
5353
# Additional dependencies needed at runtime, for building and/or
5454
# flashing.
55-
llvmPackages_18.lld
55+
llvmPackages_20.lld
5656
avrdude
5757
binaryen
5858
# Additional dependencies needed for on-chip debugging.
@@ -67,8 +67,11 @@
6767
# has `md5sum`).
6868
export MD5SUM=md5sum
6969
70+
# Work around #4819, missing support for generic type aliases.
71+
export GODEBUG=gotypesalias=0
72+
7073
# Ugly hack to make the Clang resources directory available.
71-
export GOFLAGS="\"-ldflags=-X github.com/tinygo-org/tinygo/goenv.clangResourceDir=${llvmPackages_18.clang.cc.lib}/lib/clang/18\" -tags=llvm18"
74+
export GOFLAGS="\"-ldflags=-X github.com/tinygo-org/tinygo/goenv.clangResourceDir=${llvmPackages_20.clang.cc.lib}/lib/clang/20\" -tags=llvm20"
7275
'';
7376
};
7477
}

0 commit comments

Comments
 (0)