Update go.mod to try harder to build on nix

This commit is contained in:
Eli Ribble 2026-03-04 02:46:23 +00:00
parent 6cadc8bdca
commit d0ba21ac58
No known key found for this signature in database
6 changed files with 94 additions and 18 deletions

@ -1 +1 @@
Subproject commit fd4ccdf44d3862857a11dc46b186752a7dc2ec73 Subproject commit 624afd71d18405fcb4225f31749b044b4cb22cda

View file

@ -9,7 +9,7 @@ pkgs.buildGoModule rec {
subPackages = []; subPackages = [];
version = "0.0.11"; version = "0.0.11";
# Needs to be updated after every modification of go.mod/go.sum # Needs to be updated after every modification of go.mod/go.sum
vendorHash = "sha256-aVj7uMzA9mMKxsGwTIOAK1UNVp6xTqkDjx1reyySJgQ="; vendorHash = "sha256-FX9ZmllLpjsk5vN+dzHTjHaZSfDntJkKkAh5cXCfX5U=";
nativeBuildInputs = [ pkgs.dart-sass pkgs.pkg-config ]; nativeBuildInputs = [ pkgs.dart-sass pkgs.pkg-config ];

71
flake.lock generated
View file

@ -18,6 +18,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1772465433, "lastModified": 1772465433,
@ -34,10 +52,46 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1772542754,
"narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"proj": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1772585816,
"narHash": "sha256-OzcpuCRUCxWKxDqp6H8tE/a0UpJh8IJKZsISbYrrqlg=",
"owner": "Gleipnir-Technology",
"repo": "proj",
"rev": "5147c51d86481dbe88e7996c71401ea9be2e536f",
"type": "github"
},
"original": {
"owner": "Gleipnir-Technology",
"repo": "proj",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"proj": "proj"
} }
}, },
"systems": { "systems": {
@ -54,6 +108,21 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -4,15 +4,18 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
proj.url = "github:Gleipnir-Technology/proj";
}; };
outputs = { self, nixpkgs, flake-utils }: outputs = { self, nixpkgs, flake-utils, proj }:
flake-utils.lib.eachDefaultSystem (system: flake-utils.lib.eachDefaultSystem (system:
let let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
package = import ./default.nix { # Override pkgs.proj with your custom proj
inherit pkgs; customPkgs = pkgs // {
proj = proj.packages.${system}.default;
}; };
package = import ./default.nix { pkgs = customPkgs; };
in in
{ {
packages.default = package; packages.default = package;
@ -31,6 +34,7 @@
pkgs.pkg-config pkgs.pkg-config
pkgs.prettier pkgs.prettier
pkgs.prettier-plugin-go-template pkgs.prettier-plugin-go-template
proj.packages.${system}.default
pkgs.watchexec pkgs.watchexec
]; ];
}; };

5
go.mod
View file

@ -3,7 +3,7 @@ module github.com/Gleipnir-Technology/nidus-sync
go 1.24.9 go 1.24.9
require ( require (
github.com/Gleipnir-Technology/arcgis-go v0.0.9 github.com/Gleipnir-Technology/arcgis-go v0.0.10
github.com/Gleipnir-Technology/bob v0.42.5 github.com/Gleipnir-Technology/bob v0.42.5
github.com/Gleipnir-Technology/go-geojson2h3/v2 v2.0.0 github.com/Gleipnir-Technology/go-geojson2h3/v2 v2.0.0
github.com/aarondl/opt v0.0.0-20250607033636-982744e1bd65 github.com/aarondl/opt v0.0.0-20250607033636-982744e1bd65
@ -84,6 +84,7 @@ require (
github.com/tidwall/rtree v1.3.1 // indirect github.com/tidwall/rtree v1.3.1 // indirect
github.com/tidwall/sjson v1.2.4 // indirect github.com/tidwall/sjson v1.2.4 // indirect
github.com/tinylib/msgp v1.3.0 // indirect github.com/tinylib/msgp v1.3.0 // indirect
github.com/twpayne/go-proj/v11 v11.0.0 // indirect
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
go.mongodb.org/mongo-driver v1.11.4 // indirect go.mongodb.org/mongo-driver v1.11.4 // indirect
go.uber.org/multierr v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect
@ -96,4 +97,4 @@ require (
) )
// replace github.com/stephenafamo/bob v0.42.0 => ../bob // replace github.com/stephenafamo/bob v0.42.0 => ../bob
// replace github.com/Gleipnir-Technology/arcgis-go v0.0.9 => ./arcgis-go // replace github.com/Gleipnir-Technology/arcgis-go v0.0.10 => ./arcgis-go

6
go.sum
View file

@ -2,8 +2,8 @@ dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
github.com/Gleipnir-Technology/arcgis-go v0.0.9 h1:9iwn219mWU3R8CAgMRrS5WbaeUrZlngOKLP0SZvfI/c= github.com/Gleipnir-Technology/arcgis-go v0.0.10 h1:HpyVmcVqxnLGhjkjdNANNTwRIXYZ/aIZhHfU1ZaLgB4=
github.com/Gleipnir-Technology/arcgis-go v0.0.9/go.mod h1:Y+p4pKQM8S69X67LlPhLqKGHb5lKQSE/zjtEddISMVk= github.com/Gleipnir-Technology/arcgis-go v0.0.10/go.mod h1:kx56u2NTEykhKe2cnP5E+4TRsWxx0SNHbNTPPc5+Uak=
github.com/Gleipnir-Technology/bob v0.42.5 h1:fm4vH48E7scLwMFSJ4fX3+q2wSo+6Iphh+yVIrMgatE= github.com/Gleipnir-Technology/bob v0.42.5 h1:fm4vH48E7scLwMFSJ4fX3+q2wSo+6Iphh+yVIrMgatE=
github.com/Gleipnir-Technology/bob v0.42.5/go.mod h1:cjUNiSRIMBsk94NQQrpYoraCe0WxIc04C8A+PcJ5z8Q= github.com/Gleipnir-Technology/bob v0.42.5/go.mod h1:cjUNiSRIMBsk94NQQrpYoraCe0WxIc04C8A+PcJ5z8Q=
github.com/Gleipnir-Technology/go-geojson2h3/v2 v2.0.0 h1:6OMVxoiX9r7dEkIyYYKtSu7I2UDq64dww4JxJTo3p78= github.com/Gleipnir-Technology/go-geojson2h3/v2 v2.0.0 h1:6OMVxoiX9r7dEkIyYYKtSu7I2UDq64dww4JxJTo3p78=
@ -306,6 +306,8 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F
github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
github.com/twilio/twilio-go v1.29.1 h1:4dx1d9EhRUhL5ubzYrDROERAiw55s7mBE6/w3q2epVg= github.com/twilio/twilio-go v1.29.1 h1:4dx1d9EhRUhL5ubzYrDROERAiw55s7mBE6/w3q2epVg=
github.com/twilio/twilio-go v1.29.1/go.mod h1:FpgNWMoD8CFnmukpKq9RNpUSGXC0BwnbeKZj2YHlIkw= github.com/twilio/twilio-go v1.29.1/go.mod h1:FpgNWMoD8CFnmukpKq9RNpUSGXC0BwnbeKZj2YHlIkw=
github.com/twpayne/go-proj/v11 v11.0.0 h1:jkGRE2DOwxhbn2hPnps1wNepdCgA8JB/K8rJosVR2jM=
github.com/twpayne/go-proj/v11 v11.0.0/go.mod h1:2qEvCqcSQqaKRxHc8K6F5THAzS/SVknfWVPnTHFqE3M=
github.com/uber/h3-go/v4 v4.4.0 h1:sCHcZHvIKEbdt4rY5ZVs2HDNlCy2wXeJ98vAbz+iLok= github.com/uber/h3-go/v4 v4.4.0 h1:sCHcZHvIKEbdt4rY5ZVs2HDNlCy2wXeJ98vAbz+iLok=
github.com/uber/h3-go/v4 v4.4.0/go.mod h1:c94kwXZNHVWkZGIN+y9dV81YVEttypqJpOjsmXGr68Y= github.com/uber/h3-go/v4 v4.4.0/go.mod h1:c94kwXZNHVWkZGIN+y9dV81YVEttypqJpOjsmXGr68Y=
github.com/wasilibs/go-pgquery v0.0.0-20250409022910-10ac41983c07 h1:mJdDDPblDfPe7z7go8Dvv1AJQDI3eQ/5xith3q2mFlo= github.com/wasilibs/go-pgquery v0.0.0-20250409022910-10ac41983c07 h1:mJdDDPblDfPe7z7go8Dvv1AJQDI3eQ/5xith3q2mFlo=