Skip to content

Commit

Permalink
Use go 1.22 when building Injective
Browse files Browse the repository at this point in the history
  • Loading branch information
romac committed Aug 14, 2024
1 parent 3812b96 commit a18301f
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 40 deletions.
57 changes: 23 additions & 34 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,16 @@
sbt-derivation.url = "github:zaninime/sbt-derivation";
nix-std.url = "github:chessai/nix-std";
flake-parts.url = "github:hercules-ci/flake-parts";
gomod2nix.url = "github:JonathanLorimer/gomod2nix/jonathan/update-go";
nix2container = {
url = "github:nlewo/nix2container";
# just to save size of this flake (assuming that currently containers are optional features)
inputs.nixpkgs.follows = "nixpkgs";
};
gomod2nix = {
url = "github:nix-community/gomod2nix";
# just to save size of this flake (assuming that currently containers are optional features)
inputs.nixpkgs.follows = "nixpkgs";
};
# Freshautomations inputs
stoml-src.url = "github:freshautomations/stoml";
stoml-src.flake = false;
Expand Down
1 change: 1 addition & 0 deletions modules/packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@
# Injective
(import ../packages/injective {
inherit pkgs;
inherit system;
inherit (inputs) injective-src;
inherit (cosmosLib) mkGenerator;
inherit cosmosLib;
Expand Down
3 changes: 2 additions & 1 deletion packages/evmos/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
pname = "evmos";
version = "v16.0.0-rc4";
src = evmos-src;
goVersion = "1.21";
go = pkgs.go_1_21;
pwd = ./.;
modules = ./gomod2nix.toml;
doCheck = false;
};
Expand Down
10 changes: 6 additions & 4 deletions packages/injective/default.nix
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
{
mkGenerator,
injective-src,
pkgs,
injective-src,
system,
cosmosLib,
libwasmvm_2_0_0,
mkGenerator,
}: {
injective = pkgs.buildGoApplication {
injective = pkgs.gomod2nix.buildGoApplication {
# NOTE: this uses `buildGoApplication` from `gomod2nix`. Which requires that you pre-generate
# the go.mod dependency hashes. Therefore you need to run `nix run .#gen-injective` which is below
pname = "injective";
version = "v1.13.1";
src = injective-src;
goVersion = "1.22";
go = pkgs.go_1_22;
modules = ./gomod2nix.toml;
doCheck = false;
pwd = ./.;

engine = "cometbft/cometbft";
preFixup = ''
Expand Down

0 comments on commit a18301f

Please sign in to comment.