Skip to content

Commit 76d0338

Browse files
stv0gstv0g
committed
Update dependencies
1 parent 9a01613 commit 76d0338

File tree

7 files changed

+214
-347
lines changed

7 files changed

+214
-347
lines changed

‎Makefile

+2-7
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ TARGET_HOST ?= [email protected]
66

77
REMOTE = ssh -t -i ~/.ssh/id_rsa $(TARGET_HOST)
88

9-
export GOOS ?= linux
10-
export GOARCH ?= arm
11-
12-
ifeq ($(GOARCH),arm)
13-
export GOARM ?= 7
14-
endif
9+
export CGO_ENABLED ?= 1
1510

1611
all: backend
1712

@@ -20,7 +15,7 @@ frontend:
2015
npm --prefix frontend/ run-script build
2116

2217
backend:
23-
go build -tags embed_frontend -o $(TARGET) ./cmd/
18+
go build -tags embed_frontend,virtual -o $(TARGET) ./cmd/
2419

2520
deploy: backend
2621
rsync --progress $(TARGET) $(TARGET_HOST):/usr/local/bin/$(TARGET)

‎flake.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix

+25-22
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
inputs = {
77
flake-utils.url = "github:numtide/flake-utils";
8-
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
8+
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
99
};
1010

1111
outputs =
@@ -21,9 +21,9 @@
2121
in
2222
rec {
2323
packages = {
24-
vand =
25-
let
26-
frontend = pkgs.buildNpmPackage {
24+
default = packages.backend;
25+
26+
frontend = pkgs.buildNpmPackage {
2727
name = "vand-frontend";
2828
src = ./frontend;
2929
npmDepsHash = "sha256-5tXDAYY07aVnrCn7QIiPJrv9Fu+yG+Pyy9iysli6S/o=";
@@ -32,15 +32,18 @@
3232
cp -r build/* $out/
3333
'';
3434
};
35-
in
36-
pkgs.buildGoModule {
37-
name = "vand";
35+
36+
backend = pkgs.buildGo124Module {
37+
name = "vand-backend";
3838
src = ./.;
39-
vendorHash = "sha256-dPNv9uFGbAk9Ul3YQ2woaifwez18O6plVDfd67grP+c=";
39+
vendorHash = "sha256-85x6oOsfu2kQXaRhNKPRb5ZI8SKEsTAKD/5p0aFOM4E=";
4040

4141
preBuild = ''
4242
rm -rf frontend/build
43-
cp -r ${frontend}/ frontend/build/
43+
cp -r ${packages.frontend}/ frontend/build/
44+
45+
echo $PATH
46+
pkg-config --version
4447
'';
4548

4649
postInstall = ''
@@ -52,20 +55,18 @@
5255
"virtual"
5356
];
5457

55-
buildInputs =
56-
with pkgs;
57-
[
58-
protobuf
59-
protoc-gen-go
60-
]
61-
++ (
62-
if stdenv.isLinux then
58+
nativeBuildInputs = with pkgs; [
59+
pkg-config
60+
protobuf
61+
protoc-gen-go
62+
];
63+
64+
buildInputs = with pkgs; if stdenv.isLinux then
6365
[
6466
vulkan-headers
6567
libxkbcommon
6668
wayland
6769
libGL
68-
pkg-config
6970
xorg.libX11
7071
xorg.libXcursor
7172
xorg.libXfixes
@@ -80,9 +81,8 @@
8081
frameworks.AppKit
8182
]
8283
else
83-
[ ]
84-
)
85-
++ (if stdenv.isLinux then with pkgs; [ libxkbcommon ] else [ ]);
84+
[ ];
85+
8686
doCheck = false;
8787
};
8888
};
@@ -96,7 +96,10 @@
9696
nodejs_18
9797
];
9898

99-
inputsFrom = [ packages.vand ];
99+
inputsFrom = with packages; [
100+
backend
101+
frontend
102+
];
100103
};
101104

102105
formatter = nixpkgs.nixfmt-rfc-style;

‎frontend/package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

+52-50
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33

44
module github.com/stv0g/vand
55

6-
go 1.22.6
7-
8-
toolchain go1.23.6
6+
go 1.24.1
97

108
require (
119
dario.cat/mergo v1.0.1
12-
gioui.org v0.7.1
10+
gioui.org v0.8.0
1311
github.com/adrianmo/go-nmea v1.10.0
12+
github.com/dgraph-io/badger/v4 v4.6.0
1413
github.com/eclipse/paho.mqtt.golang v1.5.0
1514
github.com/gin-contrib/static v1.1.3
1615
github.com/gin-gonic/gin v1.10.0
@@ -19,83 +18,86 @@ require (
1918
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
2019
github.com/rzetterberg/elmobd v0.0.0-20240426091703-01e7bbc11e6c
2120
github.com/simonvetter/modbus v1.6.3
22-
github.com/spf13/cobra v1.8.1
21+
github.com/spf13/cobra v1.9.1
2322
github.com/spf13/viper v1.19.0
2423
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07
25-
github.com/tdewolff/canvas v0.0.0-20241017013131-7441cbff7ba9
26-
golang.org/x/image v0.22.0
27-
golang.org/x/sys v0.29.0
24+
github.com/tdewolff/canvas v0.0.0-20250209140343-015076d8ff76
25+
golang.org/x/image v0.25.0
26+
golang.org/x/sys v0.31.0
2827
google.golang.org/protobuf v1.36.5
2928
gopkg.in/yaml.v3 v3.0.1
30-
periph.io/x/conn/v3 v3.7.1
29+
periph.io/x/conn/v3 v3.7.2
3130
periph.io/x/host/v3 v3.8.3
3231
)
3332

34-
require github.com/dgraph-io/badger/v4 v4.5.1
35-
3633
require (
37-
gioui.org/cpu v0.0.0-20220412190645-f1e9e8c3b1f7 // indirect
3834
gioui.org/shader v1.0.8 // indirect
35+
github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298 // indirect
36+
github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966 // indirect
37+
github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc // indirect
38+
github.com/BurntSushi/xgbutil v0.0.0-20190907113008-ad855c713046 // indirect
3939
github.com/ByteArena/poly2tri-go v0.0.0-20170716161910-d102ad91854f // indirect
40-
github.com/andybalholm/brotli v1.1.0 // indirect
41-
github.com/benoitkugler/textlayout v0.3.0 // indirect
40+
github.com/andybalholm/brotli v1.1.1 // indirect
41+
github.com/benoitkugler/textlayout v0.3.1 // indirect
4242
github.com/benoitkugler/textprocessing v0.0.3 // indirect
43-
github.com/bytedance/sonic v1.12.6 // indirect
44-
github.com/bytedance/sonic/loader v0.2.1 // indirect
43+
github.com/bytedance/sonic v1.13.1 // indirect
44+
github.com/bytedance/sonic/loader v0.2.4 // indirect
4545
github.com/cespare/xxhash/v2 v2.3.0 // indirect
46-
github.com/cloudwego/base64x v0.1.4 // indirect
47-
github.com/cloudwego/iasm v0.2.0 // indirect
46+
github.com/cloudwego/base64x v0.1.5 // indirect
4847
github.com/dgraph-io/ristretto/v2 v2.1.0 // indirect
4948
github.com/dustin/go-humanize v1.0.1 // indirect
50-
github.com/fsnotify/fsnotify v1.7.0 // indirect
51-
github.com/gabriel-vasile/mimetype v1.4.7 // indirect
52-
github.com/gin-contrib/sse v0.1.0 // indirect
53-
github.com/go-fonts/latin-modern v0.3.1 // indirect
49+
github.com/fsnotify/fsnotify v1.8.0 // indirect
50+
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
51+
github.com/gin-contrib/sse v1.0.0 // indirect
52+
github.com/go-fonts/latin-modern v0.3.3 // indirect
53+
github.com/go-logr/logr v1.4.2 // indirect
54+
github.com/go-logr/stdr v1.2.2 // indirect
5455
github.com/go-playground/locales v0.14.1 // indirect
5556
github.com/go-playground/universal-translator v0.18.1 // indirect
56-
github.com/go-playground/validator/v10 v10.23.0 // indirect
57-
github.com/go-text/typesetting v0.1.1 // indirect
57+
github.com/go-playground/validator/v10 v10.25.0 // indirect
58+
github.com/go-text/typesetting v0.3.0 // indirect
5859
github.com/goburrow/serial v0.1.0 // indirect
59-
github.com/goccy/go-json v0.10.4 // indirect
60-
github.com/gogo/protobuf v1.3.2 // indirect
60+
github.com/goccy/go-json v0.10.5 // indirect
6161
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
62-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
63-
github.com/golang/protobuf v1.5.4 // indirect
64-
github.com/google/flatbuffers v24.12.23+incompatible // indirect
62+
github.com/google/flatbuffers v25.2.10+incompatible // indirect
6563
github.com/hashicorp/hcl v1.0.0 // indirect
6664
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6765
github.com/json-iterator/go v1.1.12 // indirect
68-
github.com/klauspost/compress v1.17.11 // indirect
69-
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
66+
github.com/klauspost/compress v1.18.0 // indirect
67+
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
7068
github.com/leodido/go-urn v1.4.0 // indirect
71-
github.com/magiconair/properties v1.8.7 // indirect
69+
github.com/magiconair/properties v1.8.9 // indirect
7270
github.com/mattn/go-isatty v0.0.20 // indirect
7371
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7472
github.com/modern-go/reflect2 v1.0.2 // indirect
7573
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
7674
github.com/pkg/errors v0.9.1 // indirect
77-
github.com/sagikazarmark/locafero v0.4.0 // indirect
75+
github.com/sagikazarmark/locafero v0.7.0 // indirect
7876
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
7977
github.com/sourcegraph/conc v0.3.0 // indirect
80-
github.com/spf13/afero v1.11.0 // indirect
81-
github.com/spf13/cast v1.6.0 // indirect
82-
github.com/spf13/pflag v1.0.5 // indirect
78+
github.com/spf13/afero v1.12.0 // indirect
79+
github.com/spf13/cast v1.7.1 // indirect
80+
github.com/spf13/pflag v1.0.6 // indirect
81+
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
82+
github.com/srwiley/scanx v0.0.0-20190309010443-e94503791388 // indirect
8383
github.com/subosito/gotenv v1.6.0 // indirect
84-
github.com/tdewolff/font v0.0.0-20240728193914-9dc6e3441d03 // indirect
85-
github.com/tdewolff/minify/v2 v2.20.5 // indirect
86-
github.com/tdewolff/parse/v2 v2.7.15 // indirect
84+
github.com/tdewolff/font v0.0.0-20250207110603-e57683ffdb59 // indirect
85+
github.com/tdewolff/minify/v2 v2.21.3 // indirect
86+
github.com/tdewolff/parse/v2 v2.7.21-0.20250207110456-867b66db0fb0 // indirect
8787
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
8888
github.com/ugorji/go/codec v1.2.12 // indirect
89-
go.opencensus.io v0.24.0 // indirect
90-
go.uber.org/atomic v1.9.0 // indirect
91-
go.uber.org/multierr v1.9.0 // indirect
92-
golang.org/x/arch v0.12.0 // indirect
93-
golang.org/x/crypto v0.32.0 // indirect
94-
golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect
95-
golang.org/x/exp/shiny v0.0.0-20240707233637-46b078467d37 // indirect
96-
golang.org/x/net v0.34.0 // indirect
97-
golang.org/x/sync v0.10.0 // indirect
98-
golang.org/x/text v0.21.0 // indirect
89+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
90+
go.opentelemetry.io/otel v1.35.0 // indirect
91+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
92+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
93+
go.uber.org/multierr v1.11.0 // indirect
94+
golang.org/x/arch v0.15.0 // indirect
95+
golang.org/x/crypto v0.36.0 // indirect
96+
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
97+
golang.org/x/exp/shiny v0.0.0-20250305212735-054e65f0b394 // indirect
98+
golang.org/x/net v0.37.0 // indirect
99+
golang.org/x/sync v0.12.0 // indirect
100+
golang.org/x/text v0.23.0 // indirect
99101
gopkg.in/ini.v1 v1.67.0 // indirect
100-
star-tex.org/x/tex v0.4.0 // indirect
102+
star-tex.org/x/tex v0.5.0 // indirect
101103
)

0 commit comments

Comments
 (0)