Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #215

Merged
merged 2 commits into from
Mar 13, 2025
Merged

Update dependencies #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76d0338
Update dependencies
stv0g Mar 13, 2025
c6168ad
ci: Do not REUSE check twice
stv0g Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/reuse.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@

name: Compliance Checks

on: [push, pull_request]
on:
push:
branches:
- master
pull_request:

jobs:
reuse:
Expand Down
9 changes: 2 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@ TARGET_HOST ?= [email protected]

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

export GOOS ?= linux
export GOARCH ?= arm

ifeq ($(GOARCH),arm)
export GOARM ?= 7
endif
export CGO_ENABLED ?= 1

all: backend

Expand All @@ -20,7 +15,7 @@ frontend:
npm --prefix frontend/ run-script build

backend:
go build -tags embed_frontend -o $(TARGET) ./cmd/
go build -tags embed_frontend,virtual -o $(TARGET) ./cmd/

deploy: backend
rsync --progress $(TARGET) $(TARGET_HOST):/usr/local/bin/$(TARGET)
Expand Down
8 changes: 4 additions & 4 deletions flake.lock
View file
Open in desktop

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

47 changes: 25 additions & 22 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

inputs = {
flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
};

outputs =
Expand All @@ -21,9 +21,9 @@
in
rec {
packages = {
vand =
let
frontend = pkgs.buildNpmPackage {
default = packages.backend;

frontend = pkgs.buildNpmPackage {
name = "vand-frontend";
src = ./frontend;
npmDepsHash = "sha256-5tXDAYY07aVnrCn7QIiPJrv9Fu+yG+Pyy9iysli6S/o=";
Expand All @@ -32,15 +32,18 @@
cp -r build/* $out/
'';
};
in
pkgs.buildGoModule {
name = "vand";

backend = pkgs.buildGo124Module {
name = "vand-backend";
src = ./.;
vendorHash = "sha256-dPNv9uFGbAk9Ul3YQ2woaifwez18O6plVDfd67grP+c=";
vendorHash = "sha256-85x6oOsfu2kQXaRhNKPRb5ZI8SKEsTAKD/5p0aFOM4E=";

preBuild = ''
rm -rf frontend/build
cp -r ${frontend}/ frontend/build/
cp -r ${packages.frontend}/ frontend/build/

echo $PATH
pkg-config --version
'';

postInstall = ''
Expand All @@ -52,20 +55,18 @@
"virtual"
];

buildInputs =
with pkgs;
[
protobuf
protoc-gen-go
]
++ (
if stdenv.isLinux then
nativeBuildInputs = with pkgs; [
pkg-config
protobuf
protoc-gen-go
];

buildInputs = with pkgs; if stdenv.isLinux then
[
vulkan-headers
libxkbcommon
wayland
libGL
pkg-config
xorg.libX11
xorg.libXcursor
xorg.libXfixes
Expand All @@ -80,9 +81,8 @@
frameworks.AppKit
]
else
[ ]
)
++ (if stdenv.isLinux then with pkgs; [ libxkbcommon ] else [ ]);
[ ];

doCheck = false;
};
};
Expand All @@ -96,7 +96,10 @@
nodejs_18
];

inputsFrom = [ packages.vand ];
inputsFrom = with packages; [
backend
frontend
];
};

formatter = nixpkgs.nixfmt-rfc-style;
Expand Down
2 changes: 1 addition & 1 deletion frontend/package-lock.json
View file
Open in desktop

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

102 changes: 52 additions & 50 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@

module github.com/stv0g/vand

go 1.22.6

toolchain go1.23.6
go 1.24.1

require (
dario.cat/mergo v1.0.1
gioui.org v0.7.1
gioui.org v0.8.0
github.com/adrianmo/go-nmea v1.10.0
github.com/dgraph-io/badger/v4 v4.6.0
github.com/eclipse/paho.mqtt.golang v1.5.0
github.com/gin-contrib/static v1.1.3
github.com/gin-gonic/gin v1.10.0
Expand All @@ -19,83 +18,86 @@ require (
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
github.com/rzetterberg/elmobd v0.0.0-20240426091703-01e7bbc11e6c
github.com/simonvetter/modbus v1.6.3
github.com/spf13/cobra v1.8.1
github.com/spf13/cobra v1.9.1
github.com/spf13/viper v1.19.0
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07
github.com/tdewolff/canvas v0.0.0-20241017013131-7441cbff7ba9
golang.org/x/image v0.22.0
golang.org/x/sys v0.29.0
github.com/tdewolff/canvas v0.0.0-20250209140343-015076d8ff76
golang.org/x/image v0.25.0
golang.org/x/sys v0.31.0
google.golang.org/protobuf v1.36.5
gopkg.in/yaml.v3 v3.0.1
periph.io/x/conn/v3 v3.7.1
periph.io/x/conn/v3 v3.7.2
periph.io/x/host/v3 v3.8.3
)

require github.com/dgraph-io/badger/v4 v4.5.1

require (
gioui.org/cpu v0.0.0-20220412190645-f1e9e8c3b1f7 // indirect
gioui.org/shader v1.0.8 // indirect
github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298 // indirect
github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966 // indirect
github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc // indirect
github.com/BurntSushi/xgbutil v0.0.0-20190907113008-ad855c713046 // indirect
github.com/ByteArena/poly2tri-go v0.0.0-20170716161910-d102ad91854f // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/benoitkugler/textlayout v0.3.0 // indirect
github.com/andybalholm/brotli v1.1.1 // indirect
github.com/benoitkugler/textlayout v0.3.1 // indirect
github.com/benoitkugler/textprocessing v0.0.3 // indirect
github.com/bytedance/sonic v1.12.6 // indirect
github.com/bytedance/sonic/loader v0.2.1 // indirect
github.com/bytedance/sonic v1.13.1 // indirect
github.com/bytedance/sonic/loader v0.2.4 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cloudwego/base64x v0.1.4 // indirect
github.com/cloudwego/iasm v0.2.0 // indirect
github.com/cloudwego/base64x v0.1.5 // indirect
github.com/dgraph-io/ristretto/v2 v2.1.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.7 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-fonts/latin-modern v0.3.1 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
github.com/gin-contrib/sse v1.0.0 // indirect
github.com/go-fonts/latin-modern v0.3.3 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.23.0 // indirect
github.com/go-text/typesetting v0.1.1 // indirect
github.com/go-playground/validator/v10 v10.25.0 // indirect
github.com/go-text/typesetting v0.3.0 // indirect
github.com/goburrow/serial v0.1.0 // indirect
github.com/goccy/go-json v0.10.4 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/goccy/go-json v0.10.5 // indirect
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/flatbuffers v24.12.23+incompatible // indirect
github.com/google/flatbuffers v25.2.10+incompatible // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
github.com/klauspost/compress v1.18.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/magiconair/properties v1.8.9 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/locafero v0.7.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/afero v1.12.0 // indirect
github.com/spf13/cast v1.7.1 // indirect
github.com/spf13/pflag v1.0.6 // indirect
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
github.com/srwiley/scanx v0.0.0-20190309010443-e94503791388 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/tdewolff/font v0.0.0-20240728193914-9dc6e3441d03 // indirect
github.com/tdewolff/minify/v2 v2.20.5 // indirect
github.com/tdewolff/parse/v2 v2.7.15 // indirect
github.com/tdewolff/font v0.0.0-20250207110603-e57683ffdb59 // indirect
github.com/tdewolff/minify/v2 v2.21.3 // indirect
github.com/tdewolff/parse/v2 v2.7.21-0.20250207110456-867b66db0fb0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.12 // indirect
go.opencensus.io v0.24.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/arch v0.12.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect
golang.org/x/exp/shiny v0.0.0-20240707233637-46b078467d37 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/text v0.21.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/arch v0.15.0 // indirect
golang.org/x/crypto v0.36.0 // indirect
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
golang.org/x/exp/shiny v0.0.0-20250305212735-054e65f0b394 // indirect
golang.org/x/net v0.37.0 // indirect
golang.org/x/sync v0.12.0 // indirect
golang.org/x/text v0.23.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
star-tex.org/x/tex v0.4.0 // indirect
star-tex.org/x/tex v0.5.0 // indirect
)
Loading