aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXe Iaso <me@xeiaso.net>2024-05-23 11:38:12 -0400
committerXe Iaso <me@xeiaso.net>2024-05-23 11:38:57 -0400
commita20e8412ebe2fabec8f1393357932bb06f362dd6 (patch)
tree46c3122443f55e113ad0e8c835e7a0b70fa105fb
parentc31167db575c63b5c5d4416af78f952421437713 (diff)
downloadx-a20e8412ebe2fabec8f1393357932bb06f362dd6.tar.xz
x-a20e8412ebe2fabec8f1393357932bb06f362dd6.zip
cmd/mi: try switching to gormlite to regain cross-compilation
Signed-off-by: Xe Iaso <me@xeiaso.net>
-rw-r--r--.go.mod.sri2
-rw-r--r--cmd/mi/models/dao.go5
-rw-r--r--flake.nix2
-rw-r--r--go.mod6
-rw-r--r--go.sum12
5 files changed, 17 insertions, 10 deletions
diff --git a/.go.mod.sri b/.go.mod.sri
index 327e8b6..cebfe70 100644
--- a/.go.mod.sri
+++ b/.go.mod.sri
@@ -1 +1 @@
-sha256-8qBd9rrU5dgEFvrGeseGtS6vXtij++qy30RKU1JZYUA=
+sha256-EsfFTlyPnFw3627pAiAb6jOBIzC6YcL+1ql+Z6+99e0=
diff --git a/cmd/mi/models/dao.go b/cmd/mi/models/dao.go
index 9849c6d..afb3f9e 100644
--- a/cmd/mi/models/dao.go
+++ b/cmd/mi/models/dao.go
@@ -8,9 +8,10 @@ import (
"os"
"time"
+ _ "github.com/ncruces/go-sqlite3/embed"
+ "github.com/ncruces/go-sqlite3/gormlite"
"github.com/oklog/ulid/v2"
slogGorm "github.com/orandin/slog-gorm"
- "gorm.io/driver/sqlite"
"gorm.io/gorm"
)
@@ -35,7 +36,7 @@ func (d *DAO) Ping(ctx context.Context) error {
}
func New(dbLoc string) (*DAO, error) {
- db, err := gorm.Open(sqlite.Open(dbLoc), &gorm.Config{
+ db, err := gorm.Open(gormlite.Open(dbLoc), &gorm.Config{
Logger: slogGorm.New(
slogGorm.WithErrorField("err"),
slogGorm.WithRecordNotFoundError(),
diff --git a/flake.nix b/flake.nix
index e3df081..e486d6c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,4 +1,4 @@
-# nix-direnv cache busting line: sha256-8qBd9rrU5dgEFvrGeseGtS6vXtij++qy30RKU1JZYUA=
+# nix-direnv cache busting line: sha256-EsfFTlyPnFw3627pAiAb6jOBIzC6YcL+1ql+Z6+99e0=
{
description = "/x/perimental code";
diff --git a/go.mod b/go.mod
index d5f66cc..3a00060 100644
--- a/go.mod
+++ b/go.mod
@@ -36,6 +36,8 @@ require (
github.com/lib/pq v1.10.9
github.com/mndrix/golog v0.0.0-20170330170653-a28e2a269775
github.com/mymmrac/telego v0.29.2
+ github.com/ncruces/go-sqlite3 v0.15.0
+ github.com/ncruces/go-sqlite3/gormlite v0.14.0
github.com/orandin/slog-gorm v1.3.2
github.com/otiai10/copy v1.14.0
github.com/peterh/liner v1.2.2
@@ -47,7 +49,7 @@ require (
github.com/rs/cors v1.11.0
github.com/sebest/xff v0.0.0-20210106013422-671bd2870b3a
github.com/stoewer/go-strcase v1.3.0
- github.com/tetratelabs/wazero v1.7.0
+ github.com/tetratelabs/wazero v1.7.1
github.com/thoj/go-ircevent v0.0.0-20210723090443-73e444401d64
github.com/tmc/scp v0.0.0-20170824174625-f7b48647feef
github.com/twitchtv/twirp v8.1.3+incompatible
@@ -58,7 +60,6 @@ require (
golang.org/x/oauth2 v0.18.0
golang.org/x/sync v0.7.0
google.golang.org/grpc v1.62.1
- gorm.io/driver/sqlite v1.5.5
gorm.io/gorm v1.25.10
honnef.co/go/transmission v0.0.0-20200712215954-58262f0ca9c9
modernc.org/sqlite v1.29.10
@@ -168,6 +169,7 @@ require (
github.com/multiformats/go-multihash v0.2.3 // indirect
github.com/multiformats/go-varint v0.0.7 // indirect
github.com/ncruces/go-strftime v0.1.9 // indirect
+ github.com/ncruces/julianday v1.0.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/polydawn/refmt v0.89.1-0.20221221234430-40501e09de1f // indirect
diff --git a/go.sum b/go.sum
index 68bb9be..84c2048 100644
--- a/go.sum
+++ b/go.sum
@@ -712,8 +712,14 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
github.com/mymmrac/telego v0.29.2 h1:5+fQ/b8d8Ld6ihCJ0OLe1CwUdT3t1sIUl3RaSaSvRJs=
github.com/mymmrac/telego v0.29.2/go.mod h1:BsKr+GF9BHqaVaLBwsZeDnfuJcJx2olWuDEtKm4zHMc=
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
+github.com/ncruces/go-sqlite3 v0.15.0 h1:C+SIrcYsAIR5GUYWmCnif6x81n6BS9y75vYcQynuGNU=
+github.com/ncruces/go-sqlite3 v0.15.0/go.mod h1:kHHYmFmK4G2VFFoIovEg9BEQ8BP+D81y4ESHXnzJV/w=
+github.com/ncruces/go-sqlite3/gormlite v0.14.0 h1:3eIJavjEZTPShzF1ZECy/mnfP9CYo2jL2HL0422ogsA=
+github.com/ncruces/go-sqlite3/gormlite v0.14.0/go.mod h1:E0wP/7T1fHMtyjZZktNXg9wDiQAvvtnEqaRds9yUBhs=
github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
+github.com/ncruces/julianday v1.0.0 h1:fH0OKwa7NWvniGQtxdJRxAgkBMolni2BjDHaWTxqt7M=
+github.com/ncruces/julianday v1.0.0/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvza5fFc9G7g=
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
github.com/oklog/ulid/v2 v2.1.0 h1:+9lhoxAP56we25tyYETBBY1YLA2SaoLvUFgrP2miPJU=
@@ -877,8 +883,8 @@ github.com/tc-hib/winres v0.2.1 h1:YDE0FiP0VmtRaDn7+aaChp1KiF4owBiJa5l964l5ujA=
github.com/tc-hib/winres v0.2.1/go.mod h1:C/JaNhH3KBvhNKVbvdlDWkbMDO9H4fKKDaN7/07SSuk=
github.com/tcnksm/go-httpstat v0.2.0 h1:rP7T5e5U2HfmOBmZzGgGZjBQ5/GluWUylujl0tJ04I0=
github.com/tcnksm/go-httpstat v0.2.0/go.mod h1:s3JVJFtQxtBEBC9dwcdTTXS9xFnM3SXAZwPG41aurT8=
-github.com/tetratelabs/wazero v1.7.0 h1:jg5qPydno59wqjpGrHph81lbtHzTrWzwwtD4cD88+hQ=
-github.com/tetratelabs/wazero v1.7.0/go.mod h1:ytl6Zuh20R/eROuyDaGPkp82O9C/DJfXAwJfQ3X6/7Y=
+github.com/tetratelabs/wazero v1.7.1 h1:QtSfd6KLc41DIMpDYlJdoMc6k7QTN246DM2+n2Y/Dx8=
+github.com/tetratelabs/wazero v1.7.1/go.mod h1:ytl6Zuh20R/eROuyDaGPkp82O9C/DJfXAwJfQ3X6/7Y=
github.com/thlib/go-timezone-local v0.0.0-20210907160436-ef149e42d28e/go.mod h1:/Tnicc6m/lsJE0irFMA0LfIwTBo4QP7A8IfyIv4zZKI=
github.com/thoj/go-ircevent v0.0.0-20210723090443-73e444401d64 h1:l/T7dYuJEQZOwVOpjIXr1180aM9PZL/d1MnMVIxefX4=
github.com/thoj/go-ircevent v0.0.0-20210723090443-73e444401d64/go.mod h1:Q1NAJOuRdQCqN/VIWdnaaEhV8LpeO2rtlBP7/iDJNII=
@@ -1530,8 +1536,6 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/sqlite v1.5.5 h1:7MDMtUZhV065SilG62E0MquljeArQZNfJnjd9i9gx3E=
-gorm.io/driver/sqlite v1.5.5/go.mod h1:6NgQ7sQWAIFsPrJJl1lSNSu2TABh0ZZ/zm5fosATavE=
gorm.io/gorm v1.25.10 h1:dQpO+33KalOA+aFYGlK+EfxcI5MbO7EP2yYygwh9h+s=
gorm.io/gorm v1.25.10/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
gvisor.dev/gvisor v0.0.0-20240306221502-ee1e1f6070e3 h1:/8/t5pz/mgdRXhYOIeqqYhFAQLE4DDGegc0Y4ZjyFJM=