From e790e5347db2c70063b733bfa18d3ab0a01ee940 Mon Sep 17 00:00:00 2001 From: Seongmin Lee Date: Sat, 20 Dec 2025 03:36:24 +0900 Subject: [PATCH] nix: bump gomod2nix version Change-Id: lsokprnqomzpprsxzuymrkwkvtqwwywv this will fix build error on darwin machines Signed-off-by: Seongmin Lee --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 3de46cee..d580549e 100644 --- a/flake.lock +++ b/flake.lock @@ -35,11 +35,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -56,11 +56,11 @@ ] }, "locked": { - "lastModified": 1754078208, - "narHash": "sha256-YVoIFDCDpYuU3riaDEJ3xiGdPOtsx4sR5eTzHTytPV8=", + "lastModified": 1763982521, + "narHash": "sha256-ur4QIAHwgFc0vXiaxn5No/FuZicxBr2p0gmT54xZkUQ=", "owner": "nix-community", "repo": "gomod2nix", - "rev": "7f963246a71626c7fc70b431a315c4388a0c95cf", + "rev": "02e63a239d6eabd595db56852535992c898eba72", "type": "github" }, "original": { -- 2.43.0 From b695c76ad069679455ab7120aa9e1c4008030b77 Mon Sep 17 00:00:00 2001 From: Seongmin Lee Date: Sat, 20 Dec 2025 03:39:36 +0900 Subject: [PATCH] nix,gomod: bump gomod2nix & go mod tidy Change-Id: pqrvmxqszvkstzwqlstnytxmwzowlpyx Signed-off-by: Seongmin Lee --- go.mod | 4 ++-- nix/gomod2nix.toml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index da839cb6..d6dba6ce 100644 --- a/go.mod +++ b/go.mod @@ -45,13 +45,13 @@ require ( github.com/urfave/cli/v3 v3.3.3 github.com/whyrusleeping/cbor-gen v0.3.1 github.com/yuin/goldmark v1.7.13 + github.com/yuin/goldmark-emoji v1.0.6 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc gitlab.com/staticnoise/goldmark-callout v0.0.0-20240609120641-6366b799e4ab golang.org/x/crypto v0.40.0 golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b golang.org/x/image v0.31.0 golang.org/x/net v0.42.0 - golang.org/x/sync v0.17.0 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da gopkg.in/yaml.v3 v3.0.1 ) @@ -190,7 +190,6 @@ require ( github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect - github.com/yuin/goldmark-emoji v1.0.6 // indirect gitlab.com/yawning/secp256k1-voi v0.0.0-20230925100816-f2616030848b // indirect gitlab.com/yawning/tuplehash v0.0.0-20230713102510-df83abbf9a02 // indirect go.etcd.io/bbolt v1.4.0 // indirect @@ -204,6 +203,7 @@ require ( go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect + golang.org/x/sync v0.17.0 // indirect golang.org/x/sys v0.34.0 // indirect golang.org/x/text v0.29.0 // indirect golang.org/x/time v0.12.0 // indirect diff --git a/nix/gomod2nix.toml b/nix/gomod2nix.toml index 1f3bde66..4c9fc051 100644 --- a/nix/gomod2nix.toml +++ b/nix/gomod2nix.toml @@ -530,6 +530,9 @@ schema = 3 [mod."github.com/yuin/goldmark"] version = "v1.7.13" hash = "sha256-vBCxZrPYPc8x/nvAAv3Au59dCCyfS80Vw3/a9EXK7TE=" + [mod."github.com/yuin/goldmark-emoji"] + version = "v1.0.6" + hash = "sha256-+d6bZzOPE+JSFsZbQNZMCWE+n3jgcQnkPETVk47mxSY=" [mod."github.com/yuin/goldmark-highlighting/v2"] version = "v2.0.0-20230729083705-37449abec8cc" hash = "sha256-HpiwU7jIeDUAg2zOpTIiviQir8dpRPuXYh2nqFFccpg=" -- 2.43.0 From 5d0babbe93fe75e818344e6875791107ae45c838 Mon Sep 17 00:00:00 2001 From: Seongmin Lee Date: Fri, 19 Dec 2025 13:31:21 +0900 Subject: [PATCH] ci: add go mod tidy & gomod2nix check CI Change-Id: ywrpzwxwrtmsspmnvsrlyzptmxwtvoqk Signed-off-by: Seongmin Lee --- .tangled/workflows/test.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.tangled/workflows/test.yml b/.tangled/workflows/test.yml index 69a1b62c..6ed455d1 100644 --- a/.tangled/workflows/test.yml +++ b/.tangled/workflows/test.yml @@ -14,6 +14,20 @@ steps: command: | mkdir -p appview/pages/static; touch appview/pages/static/x + - name: run go mod tidy + command: go mod tidy + + - name: run gomod2nix + command: nix run .#gomod2nix + + - name: verify no changes + command: | + if ! git diff --quiet; then + echo "Error: gomod2nix produced changes. Please commit the updated files." + git diff + exit 1 + fi + - name: run linter environment: CGO_ENABLED: 1 -- 2.43.0