From 10fe47e99771e830d80dd67c29cfb272dc9c5c0c Mon Sep 17 00:00:00 2001 From: dusk Date: Mon, 14 Jul 2025 01:17:59 +0300 Subject: [PATCH] flake.nix,nix: use gomod2nix to build tangled packages Change-Id: lwznzstzpoqqlvxnxsoulpokwxwkuwzw Change-Id: lwznzstzpoqqlvxnxsoulpokwxwkuwzw --- flake.lock | 61 ++++- flake.nix | 17 +- nix/gomod2nix.toml | 454 ++++++++++++++++++++++++++++++++++++ nix/pkgs/appview.nix | 16 +- nix/pkgs/genjwks.nix | 11 +- nix/pkgs/knot-unwrapped.nix | 14 +- nix/pkgs/spindle.nix | 14 +- 7 files changed, 548 insertions(+), 39 deletions(-) create mode 100644 nix/gomod2nix.toml diff --git a/flake.lock b/flake.lock index d63a3d4..a3c3a0f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,44 @@ { "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gomod2nix": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751702058, + "narHash": "sha256-/GTdqFzFw/Y9DSNAfzvzyCMlKjUyRKMPO+apIuaTU4A=", + "owner": "nix-community", + "repo": "gomod2nix", + "rev": "664ad7a2df4623037e315e4094346bff5c44e9ee", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "gomod2nix", + "type": "github" + } + }, "htmx-src": { "flake": false, "locked": { @@ -81,11 +120,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746904237, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -97,6 +136,7 @@ }, "root": { "inputs": { + "gomod2nix": "gomod2nix", "htmx-src": "htmx-src", "htmx-ws-src": "htmx-ws-src", "ibm-plex-mono-src": "ibm-plex-mono-src", @@ -119,6 +159,21 @@ "type": "tarball", "url": "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip" } + }, + "systems": { + "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", diff --git a/flake.nix b/flake.nix index 69aa1dd..30a4074 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,10 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + gomod2nix = { + url = "github:nix-community/gomod2nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; indigo = { url = "github:oppiliappan/indigo"; flake = false; @@ -38,6 +42,7 @@ outputs = { self, nixpkgs, + gomod2nix, indigo, htmx-src, htmx-ws-src, @@ -103,26 +108,24 @@ mkPackageSet = pkgs: pkgs.lib.makeScope pkgs.newScope (self: { + inherit (gomod2nix.legacyPackages.${pkgs.system}) buildGoApplication; + modules = ./nix/gomod2nix.toml; sqlite-lib = self.callPackage ./nix/pkgs/sqlite-lib.nix { inherit (pkgs) gcc; inherit sqlite-lib-src; }; genjwks = self.callPackage ./nix/pkgs/genjwks.nix { - goModHash = "sha256-dDIwwM5gePR1jNpyIFRP9d6ocxB+NeEAP+lmKQIy2aE="; src = genjwksSrc; }; lexgen = self.callPackage ./nix/pkgs/lexgen.nix {inherit indigo;}; appview = self.callPackage ./nix/pkgs/appview.nix { inherit htmx-src htmx-ws-src lucide-src inter-fonts-src ibm-plex-mono-src; - goModHash = "sha256-iDNH2EyKa3Sj+IbZ6BopXQtz/rjoxq7Rc5l352rqkWs="; src = appviewSrc; }; spindle = self.callPackage ./nix/pkgs/spindle.nix { - goModHash = "sha256-N2GxNgeusKq+z5OkMNs/6EaDR/SjxiGCWeIWYRyb4jU="; src = spindleSrc; }; knot-unwrapped = self.callPackage ./nix/pkgs/knot-unwrapped.nix { - goModHash = "sha256-KJZQO9OZUDx4Mj64XC7F2b0K5sQC4Vq2+zT3oH8UTIE="; src = knotSrc; }; knot = self.callPackage ./nix/pkgs/knot.nix {}; @@ -227,6 +230,12 @@ ${pkgs.nixos-shell}/bin/nixos-shell --flake .#vm ''); }; + gomod2nix = { + type = "app"; + program = toString (pkgs.writeShellScript "gomod2nix" '' + ${gomod2nix.legacyPackages.${system}.gomod2nix}/bin/gomod2nix generate --outdir ./nix + ''); + }; }); nixosModules.appview = import ./nix/modules/appview.nix {inherit self;}; diff --git a/nix/gomod2nix.toml b/nix/gomod2nix.toml new file mode 100644 index 0000000..8d3eca5 --- /dev/null +++ b/nix/gomod2nix.toml @@ -0,0 +1,454 @@ +schema = 3 + +[mod] + [mod."dario.cat/mergo"] + version = "v1.0.1" + hash = "sha256-wcG6+x0k6KzOSlaPA+1RFxa06/RIAePJTAjjuhLbImw=" + [mod."github.com/Blank-Xu/sql-adapter"] + version = "v1.1.1" + hash = "sha256-9AiQhXoNPCiViV+p5aa3qGFkYU4rJNbADvNdYGq4GA4=" + [mod."github.com/Microsoft/go-winio"] + version = "v0.6.2" + hash = "sha256-tVNWDUMILZbJvarcl/E7tpSnkn7urqgSHa2Eaka5vSU=" + [mod."github.com/ProtonMail/go-crypto"] + version = "v1.2.0" + hash = "sha256-5fKgWUz6BoyFNNZ1OD9QjhBrhNEBCuVfO2WqH+X59oo=" + [mod."github.com/alecthomas/chroma/v2"] + version = "v2.19.0" + hash = "sha256-dxsu43a+PvHg2jYR0Tfys6a8x6IVR+9oCGAh+fvL3SM=" + replaced = "github.com/oppiliappan/chroma/v2" + [mod."github.com/anmitsu/go-shlex"] + version = "v0.0.0-20200514113438-38f4b401e2be" + hash = "sha256-L3Ak4X2z7WXq7vMKuiHCOJ29nlpajUQ08Sfb9T0yP54=" + [mod."github.com/avast/retry-go/v4"] + version = "v4.6.1" + hash = "sha256-PeZc8k4rDV64+k8nZt/oy1YNVbLevltXP3ZD1jf6Z6k=" + [mod."github.com/aymerick/douceur"] + version = "v0.2.0" + hash = "sha256-NiBX8EfOvLXNiK3pJaZX4N73YgfzdrzRXdiBFe3X3sE=" + [mod."github.com/beorn7/perks"] + version = "v1.0.1" + hash = "sha256-h75GUqfwJKngCJQVE5Ao5wnO3cfKD9lSIteoLp/3xJ4=" + [mod."github.com/bluekeyes/go-gitdiff"] + version = "v0.8.2" + hash = "sha256-GWm5i1ukuBukV0GMF1rffpbOSSXZdfg6/0pABMiGzLQ=" + replaced = "tangled.sh/oppi.li/go-gitdiff" + [mod."github.com/bluesky-social/indigo"] + version = "v0.0.0-20250520232546-236dd575c91e" + hash = "sha256-SmwhGkAKcB/oGwYP68U5192fAUhui6D0GWYiJOeB1/0=" + [mod."github.com/bluesky-social/jetstream"] + version = "v0.0.0-20241210005130-ea96859b93d1" + hash = "sha256-AiapbrkjXboIKc5QNiWH0KyNs0zKnn6UlGwWFlkUfm0=" + [mod."github.com/bmatcuk/doublestar/v4"] + version = "v4.7.1" + hash = "sha256-idO38nWZtmxvE0CgdziepwFM+Xc70Isr6NiKEZjHOjA=" + [mod."github.com/carlmjohnson/versioninfo"] + version = "v0.22.5" + hash = "sha256-tf7yKVFTUPmGKBLK43bjyIRQUboCYduh3I5HXE5+LPw=" + [mod."github.com/casbin/casbin/v2"] + version = "v2.103.0" + hash = "sha256-adYds8Arni/ioPM9J0F+wAlJqhLLtCV9epv7d7tDvAQ=" + [mod."github.com/casbin/govaluate"] + version = "v1.3.0" + hash = "sha256-vDUFEGt8oL4n/PHwlMZPjmaLvcpGTN4HEIRGl2FPxUA=" + [mod."github.com/cespare/xxhash/v2"] + version = "v2.3.0" + hash = "sha256-7hRlwSR+fos1kx4VZmJ/7snR7zHh8ZFKX+qqqqGcQpY=" + [mod."github.com/cloudflare/circl"] + version = "v1.6.0" + hash = "sha256-a+SVfnHYC8Fb+NQLboNg5P9sry+WutzuNetVHFVAAo0=" + [mod."github.com/containerd/errdefs"] + version = "v1.0.0" + hash = "sha256-wMZGoeqvRhuovYCJx0Js4P3qFCNTZ/6Atea/kNYoPMI=" + [mod."github.com/containerd/errdefs/pkg"] + version = "v0.3.0" + hash = "sha256-BILJ0Be4cc8xfvLPylc/Pvwwa+w88+Hd0njzetUCeTg=" + [mod."github.com/containerd/log"] + version = "v0.1.0" + hash = "sha256-vuE6Mie2gSxiN3jTKTZovjcbdBd1YEExb7IBe3GM+9s=" + [mod."github.com/cyphar/filepath-securejoin"] + version = "v0.4.1" + hash = "sha256-NOV6MfbkcQbfhNmfADQw2SJmZ6q1nw0wwg8Pm2tf2DM=" + [mod."github.com/davecgh/go-spew"] + version = "v1.1.2-0.20180830191138-d8f796af33cc" + hash = "sha256-fV9oI51xjHdOmEx6+dlq7Ku2Ag+m/bmbzPo6A4Y74qc=" + [mod."github.com/decred/dcrd/dcrec/secp256k1/v4"] + version = "v4.4.0" + hash = "sha256-qrhEIwhDll3cxoVpMbm1NQ9/HTI42S7ms8Buzlo5HCg=" + [mod."github.com/dgraph-io/ristretto"] + version = "v0.2.0" + hash = "sha256-bnpxX+oO/Qf7IJevA0gsbloVoqRx+5bh7RQ9d9eLNYw=" + [mod."github.com/dgryski/go-rendezvous"] + version = "v0.0.0-20200823014737-9f7001d12a5f" + hash = "sha256-n/7xo5CQqo4yLaWMSzSN1Muk/oqK6O5dgDOFWapeDUI=" + [mod."github.com/distribution/reference"] + version = "v0.6.0" + hash = "sha256-gr4tL+qz4jKyAtl8LINcxMSanztdt+pybj1T+2ulQv4=" + [mod."github.com/dlclark/regexp2"] + version = "v1.11.5" + hash = "sha256-jN5+2ED+YbIoPIuyJ4Ou5pqJb2w1uNKzp5yTjKY6rEQ=" + [mod."github.com/docker/docker"] + version = "v28.2.2+incompatible" + hash = "sha256-5FnlTcygdxpHyFB0/7EsYocFhADUAjC/Dku0Xn4W8so=" + [mod."github.com/docker/go-connections"] + version = "v0.5.0" + hash = "sha256-aGbMRrguh98DupIHgcpLkVUZpwycx1noQXbtTl5Sbms=" + [mod."github.com/docker/go-units"] + version = "v0.5.0" + hash = "sha256-iK/V/jJc+borzqMeqLY+38Qcts2KhywpsTk95++hImE=" + [mod."github.com/dustin/go-humanize"] + version = "v1.0.1" + hash = "sha256-yuvxYYngpfVkUg9yAmG99IUVmADTQA0tMbBXe0Fq0Mc=" + [mod."github.com/emirpasic/gods"] + version = "v1.18.1" + hash = "sha256-hGDKddjLj+5dn2woHtXKUdd49/3xdsqnhx7VEdCu1m4=" + [mod."github.com/felixge/httpsnoop"] + version = "v1.0.4" + hash = "sha256-c1JKoRSndwwOyOxq9ddCe+8qn7mG9uRq2o/822x5O/c=" + [mod."github.com/gliderlabs/ssh"] + version = "v0.3.8" + hash = "sha256-FW+91qCB3rfTm0I1VmqfwA7o+2kDys2JHOudKKyxWwc=" + [mod."github.com/go-chi/chi/v5"] + version = "v5.2.0" + hash = "sha256-rCZ2W5BdWwjtv7SSpHOgpYEHf9ketzdPX+r2500JL8A=" + [mod."github.com/go-enry/go-enry/v2"] + version = "v2.9.2" + hash = "sha256-LkCSW+4+DkTok1JcOQR0rt3UKNKVn4KPaiDeatdQhCU=" + [mod."github.com/go-enry/go-oniguruma"] + version = "v1.2.1" + hash = "sha256-DoCNyX75CuCgFnfSZs63VB4+HAIMDBgwcQglXXHRj/I=" + [mod."github.com/go-git/gcfg"] + version = "v1.5.1-0.20230307220236-3a3c6141e376" + hash = "sha256-f4k0gSYuo0/q3WOoTxl2eFaj7WZpdz29ih6CKc8Ude8=" + [mod."github.com/go-git/go-billy/v5"] + version = "v5.6.2" + hash = "sha256-VgbxcLkHjiSyRIfKS7E9Sn8OynCrMGUDkwFz6K2TVL4=" + [mod."github.com/go-git/go-git/v5"] + version = "v5.17.0" + hash = "sha256-gya68abB6GtejUqr60DyU7NIGtNzHQVCAeDTYKk1evQ=" + replaced = "github.com/oppiliappan/go-git/v5" + [mod."github.com/go-logr/logr"] + version = "v1.4.2" + hash = "sha256-/W6qGilFlZNTb9Uq48xGZ4IbsVeSwJiAMLw4wiNYHLI=" + [mod."github.com/go-logr/stdr"] + version = "v1.2.2" + hash = "sha256-rRweAP7XIb4egtT1f2gkz4sYOu7LDHmcJ5iNsJUd0sE=" + [mod."github.com/go-redis/cache/v9"] + version = "v9.0.0" + hash = "sha256-b4S3K4KoZhF0otw6FRIOq/PTdHGrb/LumB4GKo4khsY=" + [mod."github.com/goccy/go-json"] + version = "v0.10.5" + hash = "sha256-/EtlGihP0/7oInzMC5E0InZ4b5Ad3s4xOpqotloi3xw=" + [mod."github.com/gogo/protobuf"] + version = "v1.3.2" + hash = "sha256-pogILFrrk+cAtb0ulqn9+gRZJ7sGnnLLdtqITvxvG6c=" + [mod."github.com/golang-jwt/jwt/v5"] + version = "v5.2.2" + hash = "sha256-C0MhDguxWR6dQUrNVQ5xaFUReSV6CVEBAijG3b4wnX4=" + [mod."github.com/golang/groupcache"] + version = "v0.0.0-20241129210726-2c02b8208cf8" + hash = "sha256-AdLZ3dJLe/yduoNvZiXugZxNfmwJjNQyQGsIdzYzH74=" + [mod."github.com/google/uuid"] + version = "v1.6.0" + hash = "sha256-VWl9sqUzdOuhW0KzQlv0gwwUQClYkmZwSydHG2sALYw=" + [mod."github.com/gorilla/css"] + version = "v1.0.1" + hash = "sha256-6JwNHqlY2NpZ0pSQTyYPSpiNqjXOdFHqrUT10sv3y8A=" + [mod."github.com/gorilla/securecookie"] + version = "v1.1.2" + hash = "sha256-KeMHNM9emxX+N0WYiZsTii7n8sNsmjWwbnQ9SaJfTKE=" + [mod."github.com/gorilla/sessions"] + version = "v1.4.0" + hash = "sha256-cLK2z1uOEz7Wah/LclF65ptYMqzuvaRnfIGYqtn3b7g=" + [mod."github.com/gorilla/websocket"] + version = "v1.5.3" + hash = "sha256-vTIGEFMEi+30ZdO6ffMNJ/kId6pZs5bbyqov8xe9BM0=" + [mod."github.com/hashicorp/go-cleanhttp"] + version = "v0.5.2" + hash = "sha256-N9GOKYo7tK6XQUFhvhImtL7PZW/mr4C4Manx/yPVvcQ=" + [mod."github.com/hashicorp/go-retryablehttp"] + version = "v0.7.7" + hash = "sha256-XZjxncyLPwy6YBHR3DF5bEl1y72or0JDUncTIsb/eIU=" + [mod."github.com/hashicorp/golang-lru"] + version = "v1.0.2" + hash = "sha256-yy+5botc6T5wXgOe2mfNXJP3wr+MkVlUZ2JBkmmrA48=" + [mod."github.com/hashicorp/golang-lru/v2"] + version = "v2.0.7" + hash = "sha256-t1bcXLgrQNOYUVyYEZ0knxcXpsTk4IuJZDjKvyJX75g=" + [mod."github.com/hiddeco/sshsig"] + version = "v0.2.0" + hash = "sha256-Yc8Ip4XxrL5plb7Lq0ziYFznteVDZnskoyOZDIMsWOU=" + [mod."github.com/hpcloud/tail"] + version = "v1.0.0" + hash = "sha256-7ByBr/RcOwIsGPCiCUpfNwUSvU18QAY+HMnCJr8uU1w=" + [mod."github.com/ipfs/bbloom"] + version = "v0.0.4" + hash = "sha256-4k778kBlNul2Rc4xuNQ9WA4kT0V7x5X9odZrT+2xjTU=" + [mod."github.com/ipfs/boxo"] + version = "v0.30.0" + hash = "sha256-PWH+nlIZZlqB/PuiBX9X4McLZF4gKR1MEnjvutKT848=" + [mod."github.com/ipfs/go-block-format"] + version = "v0.2.1" + hash = "sha256-npEV0Axe6zJlzN00/GwiegE9HKsuDR6RhsAfPyphOl8=" + [mod."github.com/ipfs/go-cid"] + version = "v0.5.0" + hash = "sha256-BuZKkcBXrnx7mM1c9SP4LdzZoaAoai9U49vITGrYJQk=" + [mod."github.com/ipfs/go-datastore"] + version = "v0.8.2" + hash = "sha256-9Q7+bi04srAE3AcXzWSGs/HP6DWnE1Edtx3NnjMQi8U=" + [mod."github.com/ipfs/go-ipfs-blockstore"] + version = "v1.3.1" + hash = "sha256-NFlKr8bdJcM5FLlkc51sKt4AnMMlHS4wbdKiiaoDaqg=" + [mod."github.com/ipfs/go-ipfs-ds-help"] + version = "v1.1.1" + hash = "sha256-cpEohOsf4afYRGTdsWh84TCVGIDzJo2hSjWy7NtNtvY=" + [mod."github.com/ipfs/go-ipld-cbor"] + version = "v0.2.0" + hash = "sha256-bvHFCIQqim3/+xzl1bld3NxKY8WoeCO3HpdTfUsXvlc=" + [mod."github.com/ipfs/go-ipld-format"] + version = "v0.6.1" + hash = "sha256-v1zLYYGaoDxsgOW5joQGWHEHZoJjIXc6tLVgTomZ2z4=" + [mod."github.com/ipfs/go-log"] + version = "v1.0.5" + hash = "sha256-WQarHZo2y/rH6ixLsOlN5fFZeLUqsOTMnvdxszP2Qj4=" + [mod."github.com/ipfs/go-log/v2"] + version = "v2.6.0" + hash = "sha256-cZ+rsx7LIROoNITyu/s0B6hq8lNQsUC1ynvx2f2o4Gk=" + [mod."github.com/ipfs/go-metrics-interface"] + version = "v0.3.0" + hash = "sha256-b3tp3jxecLmJEGx2kW7MiKGlAKPEWg/LJ7hXylSC8jQ=" + [mod."github.com/kevinburke/ssh_config"] + version = "v1.2.0" + hash = "sha256-Ta7ZOmyX8gG5tzWbY2oES70EJPfI90U7CIJS9EAce0s=" + [mod."github.com/klauspost/compress"] + version = "v1.18.0" + hash = "sha256-jc5pMU/HCBFOShMcngVwNMhz9wolxjOb579868LtOuk=" + [mod."github.com/klauspost/cpuid/v2"] + version = "v2.2.10" + hash = "sha256-o21Tk5sD7WhhLUoqSkymnjLbzxl0mDJCTC1ApfZJrC0=" + [mod."github.com/lestrrat-go/blackmagic"] + version = "v1.0.3" + hash = "sha256-1wyfD6fPopJF/UmzfAEa0N1zuUzVuHIpdcxks1kqxxw=" + [mod."github.com/lestrrat-go/httpcc"] + version = "v1.0.1" + hash = "sha256-SMRSwJpqDIs/xL0l2e8vP0W65qtCHX2wigcOeqPJmos=" + [mod."github.com/lestrrat-go/httprc"] + version = "v1.0.6" + hash = "sha256-mfZzePEhrmyyu/avEBd2MsDXyto8dq5+fyu5lA8GUWM=" + [mod."github.com/lestrrat-go/iter"] + version = "v1.0.2" + hash = "sha256-30tErRf7Qu/NOAt1YURXY/XJSA6sCr6hYQfO8QqHrtw=" + [mod."github.com/lestrrat-go/jwx/v2"] + version = "v2.1.6" + hash = "sha256-0LszXRZIba+X8AOrs3T4uanAUafBdlVB8/MpUNEFpbc=" + [mod."github.com/lestrrat-go/option"] + version = "v1.0.1" + hash = "sha256-jVcIYYVsxElIS/l2akEw32vdEPR8+anR6oeT1FoYULI=" + [mod."github.com/mattn/go-isatty"] + version = "v0.0.20" + hash = "sha256-qhw9hWtU5wnyFyuMbKx+7RB8ckQaFQ8D+8GKPkN3HHQ=" + [mod."github.com/mattn/go-sqlite3"] + version = "v1.14.24" + hash = "sha256-taGKFZFQlR5++5b2oZ1dYS3RERKv6yh1gniNWhb4egg=" + [mod."github.com/microcosm-cc/bluemonday"] + version = "v1.0.27" + hash = "sha256-EZSya9FLPQ83CL7N2cZy21fdS35hViTkiMK5f3op8Es=" + [mod."github.com/minio/sha256-simd"] + version = "v1.0.1" + hash = "sha256-4hfGDIQaWq8fvtGzHDhoK9v2IocXnJY7OAL6saMJbmA=" + [mod."github.com/moby/docker-image-spec"] + version = "v1.3.1" + hash = "sha256-xwSNLmMagzywdGJIuhrWl1r7cIWBYCOMNYbuDDT6Jhs=" + [mod."github.com/moby/sys/atomicwriter"] + version = "v0.1.0" + hash = "sha256-i46GNrsICnJ0AYkN+ocbVZ2GNTQVEsrVX5WcjKzjtBM=" + [mod."github.com/moby/term"] + version = "v0.5.2" + hash = "sha256-/G20jUZKx36ktmPU/nEw/gX7kRTl1Dbu7zvNBYNt4xU=" + [mod."github.com/morikuni/aec"] + version = "v1.0.0" + hash = "sha256-5zYgLeGr3K+uhGKlN3xv0PO67V+2Zw+cezjzNCmAWOE=" + [mod."github.com/mr-tron/base58"] + version = "v1.2.0" + hash = "sha256-8FzMu3kHUbBX10pUdtGf59Ag7BNupx8ZHeUaodR1/Vk=" + [mod."github.com/multiformats/go-base32"] + version = "v0.1.0" + hash = "sha256-O2IM7FB+Y9MkDdZztyQL5F8oEnmON2Yew7XkotQziio=" + [mod."github.com/multiformats/go-base36"] + version = "v0.2.0" + hash = "sha256-GKNnAGA0Lb39BDGYBm1ieKdXmho8Pu7ouyfVPXvV0PE=" + [mod."github.com/multiformats/go-multibase"] + version = "v0.2.0" + hash = "sha256-w+hp6u5bWyd34qe0CX+bq487ADqq6SgRR/JuqRB578s=" + [mod."github.com/multiformats/go-multihash"] + version = "v0.2.3" + hash = "sha256-zqIIE5jMFzm+qhUrouSF+WdXGeHUEYIQvVnKWWU6mRs=" + [mod."github.com/multiformats/go-varint"] + version = "v0.0.7" + hash = "sha256-To3Uuv7uSUJEr5OTwxE1LEIpA62xY3M/KKMNlscHmlA=" + [mod."github.com/munnerz/goautoneg"] + version = "v0.0.0-20191010083416-a7dc8b61c822" + hash = "sha256-79URDDFenmGc9JZu+5AXHToMrtTREHb3BC84b/gym9Q=" + [mod."github.com/opencontainers/go-digest"] + version = "v1.0.0" + hash = "sha256-cfVDjHyWItmUGZ2dzQhCHgmOmou8v7N+itDkLZVkqkQ=" + [mod."github.com/opencontainers/image-spec"] + version = "v1.1.1" + hash = "sha256-bxBjtl+6846Ed3QHwdssOrNvlHV6b+Dn17zPISSQGP8=" + [mod."github.com/opentracing/opentracing-go"] + version = "v1.2.0" + hash = "sha256-kKTKFGXOsCF6QdVzI++GgaRzv2W+kWq5uDXOJChvLxM=" + [mod."github.com/pjbgf/sha1cd"] + version = "v0.3.2" + hash = "sha256-jdbiRhU8xc1C5c8m7BSCj71PUXHY3f7TWFfxDKKpUMk=" + [mod."github.com/pkg/errors"] + version = "v0.9.1" + hash = "sha256-mNfQtcrQmu3sNg/7IwiieKWOgFQOVVe2yXgKBpe/wZw=" + [mod."github.com/pmezard/go-difflib"] + version = "v1.0.1-0.20181226105442-5d4384ee4fb2" + hash = "sha256-XA4Oj1gdmdV/F/+8kMI+DBxKPthZ768hbKsO3d9Gx90=" + [mod."github.com/polydawn/refmt"] + version = "v0.89.1-0.20221221234430-40501e09de1f" + hash = "sha256-wBdFROClTHNPYU4IjeKbBXaG7F6j5hZe15gMxiqKvi4=" + [mod."github.com/posthog/posthog-go"] + version = "v1.5.5" + hash = "sha256-ouhfDUCXsfpcgaCLfJE9oYprAQHuV61OJzb/aEhT0j8=" + [mod."github.com/prometheus/client_golang"] + version = "v1.22.0" + hash = "sha256-OJ/9rlWG1DIPQJAZUTzjykkX0o+f+4IKLvW8YityaMQ=" + [mod."github.com/prometheus/client_model"] + version = "v0.6.2" + hash = "sha256-q6Fh6v8iNJN9ypD47LjWmx66YITa3FyRjZMRsuRTFeQ=" + [mod."github.com/prometheus/common"] + version = "v0.63.0" + hash = "sha256-TbUZNkN4ZA7eC/MlL1v2V5OL28QRnftSuaWQZ944zBE=" + [mod."github.com/prometheus/procfs"] + version = "v0.16.1" + hash = "sha256-OBCvKlLW2obct35p0L9Q+1ZrxZjpTmbgHMP2rng9hpo=" + [mod."github.com/redis/go-redis/v9"] + version = "v9.3.0" + hash = "sha256-PNXDX3BH92d2jL/AkdK0eWMorh387Y6duwYNhsqNe+w=" + [mod."github.com/resend/resend-go/v2"] + version = "v2.15.0" + hash = "sha256-1lMoxuMLQXaNWFKadS6rpztAKwvIl3/LWMXqw7f5WYg=" + [mod."github.com/segmentio/asm"] + version = "v1.2.0" + hash = "sha256-zbNuKxNrUDUc6IlmRQNuJQzVe5Ol/mqp7srDg9IMMqs=" + [mod."github.com/sergi/go-diff"] + version = "v1.1.0" + hash = "sha256-8NJMabldpf40uwQN20T6QXx5KORDibCBJL02KD661xY=" + replaced = "github.com/sergi/go-diff" + [mod."github.com/sethvargo/go-envconfig"] + version = "v1.1.0" + hash = "sha256-WelRHfyZG9hrA4fbQcfBawb2ZXBQNT1ourEYHzQdZ4w=" + [mod."github.com/spaolacci/murmur3"] + version = "v1.1.0" + hash = "sha256-RWD4PPrlAsZZ8Xy356MBxpj+/NZI7w2XOU14Ob7/Y9M=" + [mod."github.com/stretchr/testify"] + version = "v1.10.0" + hash = "sha256-fJ4gnPr0vnrOhjQYQwJ3ARDKPsOtA7d4olQmQWR+wpI=" + [mod."github.com/urfave/cli/v3"] + version = "v3.3.3" + hash = "sha256-FdPiu7koY1qBinkfca4A05zCrX+Vu4eRz8wlRDZJyGg=" + [mod."github.com/vmihailenco/go-tinylfu"] + version = "v0.2.2" + hash = "sha256-ZHr4g7DJAV6rLcfrEWZwo9wJSeZcXB9KSP38UIOFfaM=" + [mod."github.com/vmihailenco/msgpack/v5"] + version = "v5.4.1" + hash = "sha256-pDplX6xU6UpNLcFbO1pRREW5vCnSPvSU+ojAwFDv3Hk=" + [mod."github.com/vmihailenco/tagparser/v2"] + version = "v2.0.0" + hash = "sha256-M9QyaKhSmmYwsJk7gkjtqu9PuiqZHSmTkous8VWkWY0=" + [mod."github.com/whyrusleeping/cbor-gen"] + version = "v0.3.1" + hash = "sha256-PAd8M2Z8t6rVRBII+Rg8Bz+QaJIwbW64bfyqsv31kgc=" + [mod."github.com/yuin/goldmark"] + version = "v1.4.13" + hash = "sha256-GVwFKZY6moIS6I0ZGuio/WtDif+lkZRfqWS6b4AAJyI=" + [mod."gitlab.com/yawning/secp256k1-voi"] + version = "v0.0.0-20230925100816-f2616030848b" + hash = "sha256-X8INg01LTg13iOuwPI3uOhPN7r01sPZtmtwJ2sudjCA=" + [mod."gitlab.com/yawning/tuplehash"] + version = "v0.0.0-20230713102510-df83abbf9a02" + hash = "sha256-pehQduoaJRLchebhgvMYacVvbuNIBA++XkiqCuqdato=" + [mod."go.opentelemetry.io/auto/sdk"] + version = "v1.1.0" + hash = "sha256-cA9qCCu8P1NSJRxgmpfkfa5rKyn9X+Y/9FSmSd5xjyo=" + [mod."go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"] + version = "v0.61.0" + hash = "sha256-4pfXD7ErXhexSynXiEEQSAkWoPwHd7PEDE3M1Zi5gLM=" + [mod."go.opentelemetry.io/otel"] + version = "v1.36.0" + hash = "sha256-j8wojdCtKal3LKojanHA8KXXQ0FkbWONpO8tUxpJDko=" + [mod."go.opentelemetry.io/otel/metric"] + version = "v1.36.0" + hash = "sha256-z6Uqi4HhUljWIYd58svKK5MqcGbpcac+/M8JeTrUtJ8=" + [mod."go.opentelemetry.io/otel/trace"] + version = "v1.36.0" + hash = "sha256-owWD9x1lp8aIJqYt058BXPUsIMHdk3RI0escso0BxwA=" + [mod."go.opentelemetry.io/proto/otlp"] + version = "v1.6.0" + hash = "sha256-1kjkJ9cqkvx3ib6ytLcw+Adp4xqD3ShF97lpzt/BeCg=" + [mod."go.uber.org/atomic"] + version = "v1.11.0" + hash = "sha256-TyYws/cSPVqYNffFX0gbDml1bD4bBGcysrUWU7mHPIY=" + [mod."go.uber.org/multierr"] + version = "v1.11.0" + hash = "sha256-Lb6rHHfR62Ozg2j2JZy3MKOMKdsfzd1IYTR57r3Mhp0=" + [mod."go.uber.org/zap"] + version = "v1.27.0" + hash = "sha256-8655KDrulc4Das3VRduO9MjCn8ZYD5WkULjCvruaYsU=" + [mod."golang.org/x/crypto"] + version = "v0.38.0" + hash = "sha256-5tTXlXQBlfW1sSNDAIalOpsERbTJlZqbwCIiih4T4rY=" + [mod."golang.org/x/exp"] + version = "v0.0.0-20250408133849-7e4ce0ab07d0" + hash = "sha256-Lw/WupSM8gcq0JzPSAaBqj9l1uZ68ANhaIaQzPhRpy8=" + [mod."golang.org/x/net"] + version = "v0.40.0" + hash = "sha256-BhDOHTP8RekXDQDf9HlORSmI2aPacLo53fRXtTgCUH8=" + [mod."golang.org/x/sync"] + version = "v0.14.0" + hash = "sha256-YNQLeFMeXN9y0z4OyXV/LJ4hA54q+ljm1ytcy80O6r4=" + [mod."golang.org/x/sys"] + version = "v0.33.0" + hash = "sha256-wlOzIOUgAiGAtdzhW/KPl/yUVSH/lvFZfs5XOuJ9LOQ=" + [mod."golang.org/x/time"] + version = "v0.8.0" + hash = "sha256-EA+qRisDJDPQ2g4pcfP4RyQaB7CJKkAn68EbNfBzXdQ=" + [mod."golang.org/x/xerrors"] + version = "v0.0.0-20240903120638-7835f813f4da" + hash = "sha256-bE7CcrnAvryNvM26ieJGXqbAtuLwHaGcmtVMsVnksqo=" + [mod."google.golang.org/genproto/googleapis/api"] + version = "v0.0.0-20250519155744-55703ea1f237" + hash = "sha256-ivktx8ipWgWZgchh4FjKoWL7kU8kl/TtIavtZq/F5SQ=" + [mod."google.golang.org/genproto/googleapis/rpc"] + version = "v0.0.0-20250519155744-55703ea1f237" + hash = "sha256-WK7iDtAhH19NPe3TywTQlGjDawNaDKWnxhFL9PgVUwM=" + [mod."google.golang.org/grpc"] + version = "v1.72.1" + hash = "sha256-5JczomNvroKWtIYKDgXwaIaEfuNEK//MHPhJQiaxMXs=" + [mod."google.golang.org/protobuf"] + version = "v1.36.6" + hash = "sha256-lT5qnefI5FDJnowz9PEkAGylH3+fE+A3DJDkAyy9RMc=" + [mod."gopkg.in/fsnotify.v1"] + version = "v1.4.7" + hash = "sha256-j/Ts92oXa3k1MFU7Yd8/AqafRTsFn7V2pDKCyDJLah8=" + [mod."gopkg.in/tomb.v1"] + version = "v1.0.0-20141024135613-dd632973f1e7" + hash = "sha256-W/4wBAvuaBFHhowB67SZZfXCRDp5tzbYG4vo81TAFdM=" + [mod."gopkg.in/warnings.v0"] + version = "v0.1.2" + hash = "sha256-ATVL9yEmgYbkJ1DkltDGRn/auGAjqGOfjQyBYyUo8s8=" + [mod."gopkg.in/yaml.v3"] + version = "v3.0.1" + hash = "sha256-FqL9TKYJ0XkNwJFnq9j0VvJ5ZUU1RvH/52h/f5bkYAU=" + [mod."gotest.tools/v3"] + version = "v3.5.2" + hash = "sha256-eAxnRrF2bQugeFYzGLOr+4sLyCPOpaTWpoZsIKNP1WE=" + [mod."lukechampine.com/blake3"] + version = "v1.4.1" + hash = "sha256-HaZGo9L44ptPsgxIhvKy3+0KZZm1+xt+cZC1rDQA9Yc=" + [mod."tangled.sh/icyphox.sh/atproto-oauth"] + version = "v0.0.0-20250526154904-3906c5336421" + hash = "sha256-CvR8jic0YZfj0a8ubPj06FiMMR/1K9kHoZhLQw1LItM=" diff --git a/nix/pkgs/appview.nix b/nix/pkgs/appview.nix index 90cbd8f..e5f9182 100644 --- a/nix/pkgs/appview.nix +++ b/nix/pkgs/appview.nix @@ -1,6 +1,6 @@ { - buildGoModule, - stdenv, + buildGoApplication, + modules, htmx-src, htmx-ws-src, lucide-src, @@ -8,16 +8,13 @@ ibm-plex-mono-src, tailwindcss, sqlite-lib, - goModHash, src, lib, }: -buildGoModule { - inherit stdenv; - +buildGoApplication { pname = "appview"; version = "0.1.0"; - inherit src; + inherit src modules; postUnpack = '' pushd source @@ -34,10 +31,9 @@ buildGoModule { doCheck = false; subPackages = ["cmd/appview"]; - vendorHash = goModHash; - tags = "libsqlite3"; + tags = ["libsqlite3"]; env.CGO_CFLAGS = "-I ${sqlite-lib}/include "; env.CGO_LDFLAGS = "-L ${sqlite-lib}/lib"; - env.CGO_ENABLED = 1; + CGO_ENABLED = 1; } diff --git a/nix/pkgs/genjwks.nix b/nix/pkgs/genjwks.nix index 9f82415..2e658df 100644 --- a/nix/pkgs/genjwks.nix +++ b/nix/pkgs/genjwks.nix @@ -1,15 +1,14 @@ { - buildGoModule, - goModHash, + buildGoApplication, + modules, src, lib, }: -buildGoModule { +buildGoApplication { pname = "genjwks"; version = "0.1.0"; - inherit src; + inherit src modules; subPackages = ["cmd/genjwks"]; - vendorHash = goModHash; doCheck = false; - env.CGO_ENABLED = 0; + CGO_ENABLED = 0; } diff --git a/nix/pkgs/knot-unwrapped.nix b/nix/pkgs/knot-unwrapped.nix index 6620689..12faccf 100644 --- a/nix/pkgs/knot-unwrapped.nix +++ b/nix/pkgs/knot-unwrapped.nix @@ -1,23 +1,21 @@ { - buildGoModule, - stdenv, + buildGoApplication, + modules, sqlite-lib, - goModHash, src, lib, }: -buildGoModule { +buildGoApplication { pname = "knot"; version = "0.1.0"; - inherit src; + inherit src modules; doCheck = false; subPackages = ["cmd/knot"]; - vendorHash = goModHash; - tags = "libsqlite3"; + tags = ["libsqlite3"]; env.CGO_CFLAGS = "-I ${sqlite-lib}/include "; env.CGO_LDFLAGS = "-L ${sqlite-lib}/lib"; - env.CGO_ENABLED = 1; + CGO_ENABLED = 1; } diff --git a/nix/pkgs/spindle.nix b/nix/pkgs/spindle.nix index 9e7c2b6..79b5a1f 100644 --- a/nix/pkgs/spindle.nix +++ b/nix/pkgs/spindle.nix @@ -1,23 +1,21 @@ { - buildGoModule, - stdenv, + buildGoApplication, + modules, sqlite-lib, - goModHash, src, lib, }: -buildGoModule { +buildGoApplication { pname = "spindle"; version = "0.1.0"; - inherit src; + inherit src modules; doCheck = false; subPackages = ["cmd/spindle"]; - vendorHash = goModHash; - tags = "libsqlite3"; + tags = ["libsqlite3"]; env.CGO_CFLAGS = "-I ${sqlite-lib}/include "; env.CGO_LDFLAGS = "-L ${sqlite-lib}/lib"; - env.CGO_ENABLED = 1; + CGO_ENABLED = 1; } -- 2.43.0