Skip to content

Commit 8363d95

Browse files
committed
chore: Fix nixpkgs for tinygo <= 1.25
1 parent 1c34984 commit 8363d95

2 files changed

Lines changed: 24 additions & 3 deletions

File tree

flake.lock

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

flake.nix

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
inputs = {
33
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
4+
nixpkgs-tinygo.url = "github:NixOS/nixpkgs/b40629efe5d6ec48dd1efba650c797ddbd39ace0";
45
flake-utils.url = "github:numtide/flake-utils";
56
rust-overlay = {
67
url = "github:oxalica/rust-overlay";
@@ -17,14 +18,17 @@
1718
};
1819
};
1920
};
20-
outputs = { self, nixpkgs, flake-utils, rust-overlay, obelisk }:
21+
outputs = { self, nixpkgs, nixpkgs-tinygo, flake-utils, rust-overlay, obelisk }:
2122
flake-utils.lib.eachDefaultSystem
2223
(system:
2324
let
2425
overlays = [ (import rust-overlay) ];
2526
pkgs = import nixpkgs {
2627
inherit system overlays;
2728
};
29+
pkgsTinyGo = import nixpkgs-tinygo {
30+
inherit system;
31+
};
2832
rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
2933
wit-bindgen-go-cli = pkgs.buildGoModule (rec {
3034
pname = "wit-bindgen-go-cli";
@@ -61,8 +65,8 @@
6165
nodejs_22
6266
wizer
6367
# Go
64-
go
65-
tinygo
68+
go_1_25
69+
pkgsTinyGo.tinygo
6670
wit-bindgen-go-cli
6771
];
6872
withObelisk = commonDeps ++ [ obelisk.packages.${system}.default ];

0 commit comments

Comments
 (0)