Skip to content

Commit affe3b7

Browse files
committed
Add Go 1.24 tool support for enumer
Drop enumer package from flake. Future work: - Remove /x/tools dependency override once dmarkham/enumer#106 merges.
1 parent 3214351 commit affe3b7

File tree

4 files changed

+31
-24
lines changed

4 files changed

+31
-24
lines changed

cmd/runitor/pingtype.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
// PingType is an enumerator type for PingType* constants.
1212
type PingType int
1313

14-
//go:generate enumer -type PingType -trimprefix=PingType -transform=kebab
14+
//go:generate go tool github.com/dmarkham/enumer -type PingType -trimprefix=PingType -transform=kebab
1515
const (
1616
PingTypeExitCode PingType = iota
1717
PingTypeSuccess

flake.nix

+3-22
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
description = "runitor";
55

66
inputs = {
7-
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-23.11-darwin";
7+
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-24.11-darwin";
88
flake-utils.url = "github:numtide/flake-utils";
99
};
1010

@@ -36,32 +36,13 @@
3636
maintainers = [ pkgs.maintainers.bdd ];
3737
};
3838
};
39-
40-
enumer = pkgs.buildGoModule rec {
41-
pname = "enumer";
42-
version = "1.5.9";
43-
src = pkgs.fetchFromGitHub {
44-
owner = "dmarkham";
45-
repo = "enumer";
46-
rev = "v${version}";
47-
hash = "sha256-NYL36GBogFM48IgIWhFa1OLZNUeEi0ppS6KXybnPQks=";
48-
};
49-
vendorHash = "sha256-CJCay24FlzDmLjfZ1VBxih0f+bgBNu+Xn57QgWT13TA=";
50-
meta = {
51-
description = "A Go tool to auto generate methods for your enums";
52-
license = pkgs.lib.licenses.bsd2;
53-
mainProgram = "enumer";
54-
maintainers = [ pkgs.maintainers.bdd ];
55-
};
56-
};
5739
in
5840
{
5941
devShells = {
6042
default = pkgs.mkShell {
6143
buildInputs = [
6244
# build
63-
pkgs.go
64-
self.packages.${system}.enumer
45+
pkgs.go_1_24
6546

6647
# release
6748
pkgs.gh # create a release on github and upload artifacts
@@ -74,7 +55,7 @@
7455
};
7556

7657
packages = {
77-
inherit runitor enumer;
58+
inherit runitor;
7859
default = runitor;
7960
};
8061
}

go.mod

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
module bdd.fi/x/runitor
22

3-
go 1.21
3+
go 1.24
44

55
retract v1.1.0 // URI contruction bug affecting self hosted instances. GH #75.
6+
7+
tool github.com/dmarkham/enumer
8+
9+
require (
10+
github.com/dmarkham/enumer v1.5.10 // indirect
11+
github.com/pascaldekloe/name v1.0.0 // indirect
12+
golang.org/x/mod v0.23.0 // indirect
13+
golang.org/x/sync v0.11.0 // indirect
14+
golang.org/x/tools v0.14.0 // indirect
15+
)
16+
17+
// for github:dmarkham/enumer.
18+
// remove after https://github.com/dmarkham/enumer/pull/106 merges.
19+
replace golang.org/x/tools => golang.org/x/tools v0.30.0

go.sum

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
github.com/dmarkham/enumer v1.5.10 h1:ygL0L6quiTiH1jpp68DyvsWaea6MaZLZrTTkIS++R0M=
2+
github.com/dmarkham/enumer v1.5.10/go.mod h1:e4VILe2b1nYK3JKJpRmNdl5xbDQvELc6tQ8b+GsGk6E=
3+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
4+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
5+
github.com/pascaldekloe/name v1.0.0 h1:n7LKFgHixETzxpRv2R77YgPUFo85QHGZKrdaYm7eY5U=
6+
github.com/pascaldekloe/name v1.0.0/go.mod h1:Z//MfYJnH4jVpQ9wkclwu2I2MkHmXTlT9wR5UZScttM=
7+
golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
8+
golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
9+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
10+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
11+
golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
12+
golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=

0 commit comments

Comments
 (0)