From 63c7d43dd75f298ad45deff3c0c470757c1227f7 Mon Sep 17 00:00:00 2001
From: Seongmin Lee <git@boltless.me>
Date: Tue, 30 Dec 2025 03:35:02 +0000
Subject: [PATCH] nix: update lexgen version, replace goat to atproto-goat

Signed-off-by: Seongmin Lee <git@boltless.me>
---
 flake.lock | 17 -----------------
 flake.nix | 16 +++++-----------
 nix/pkgs/lexgen.nix | 11 ++++++++---
 3 file(s) changed, 13 insertion(s)(+), 31 deletion(s)(-)

diff --git a/flake.lock b/flake.lock
--- a/flake.lock
+++ b/flake.lock
@@ -106,22 +106,6 @@
         "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip"
       }
     },
-    "indigo": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1753693716,
-        "narHash": "sha256-DMIKnCJRODQXEHUxA+7mLzRALmnZhkkbHlFT2rCQYrE=",
-        "owner": "oppiliappan",
-        "repo": "indigo",
-        "rev": "5f170569da9360f57add450a278d73538092d8ca",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oppiliappan",
-        "repo": "indigo",
-        "type": "github"
-      }
-    },
     "inter-fonts-src": {
       "flake": false,
       "locked": {
@@ -172,7 +156,6 @@
         "htmx-src": "htmx-src",
         "htmx-ws-src": "htmx-ws-src",
         "ibm-plex-mono-src": "ibm-plex-mono-src",
-        "indigo": "indigo",
         "inter-fonts-src": "inter-fonts-src",
         "lucide-src": "lucide-src",
         "nixpkgs": "nixpkgs",
diff --git a/flake.nix b/flake.nix
--- a/flake.nix
+++ b/flake.nix
@@ -11,10 +11,6 @@
       url = "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz";
       flake = false;
     };
-    indigo = {
-      url = "github:oppiliappan/indigo";
-      flake = false;
-    };
     htmx-src = {
       url = "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js";
       flake = false;
@@ -51,7 +47,6 @@
     self,
     nixpkgs,
     gomod2nix,
-    indigo,
     htmx-src,
     htmx-ws-src,
     lucide-src,
@@ -82,8 +77,7 @@
         sqlite-lib = self.callPackage ./nix/pkgs/sqlite-lib.nix {
           inherit sqlite-lib-src;
         };
-        lexgen = self.callPackage ./nix/pkgs/lexgen.nix {inherit indigo;};
-        goat = self.callPackage ./nix/pkgs/goat.nix {inherit indigo;};
+        lexgen = self.callPackage ./nix/pkgs/lexgen.nix {};
         appview-static-files = self.callPackage ./nix/pkgs/appview-static-files.nix {
           inherit htmx-src htmx-ws-src lucide-src inter-fonts-src ibm-plex-mono-src actor-typeahead-src;
         };
@@ -102,7 +96,7 @@
       });
   in {
     overlays.default = final: prev: {
-      inherit (mkPackageSet final) lexgen goat sqlite-lib spindle knot-unwrapped knot appview docs dolly did-method-plc bluesky-jetstream bluesky-relay tap;
+      inherit (mkPackageSet final) lexgen sqlite-lib spindle knot-unwrapped knot appview docs dolly did-method-plc bluesky-jetstream bluesky-relay tap;
     };
 
     packages = forAllSystems (system: let
@@ -116,7 +110,6 @@
         appview
         appview-static-files
         lexgen
-        goat
         spindle
         knot
         knot-unwrapped
@@ -189,6 +182,7 @@
           pkgs.nixos-shell
           pkgs.redis
           pkgs.coreutils # for those of us who are on systems that use busybox (alpine)
+          pkgs.atproto-goat
           packages'.lexgen
           packages'.treefmt-wrapper
         ];
@@ -197,7 +191,7 @@
           # no preserve is needed because watch-tailwind will want to be able to overwrite
           cp -fr --no-preserve=ownership ${packages'.appview-static-files}/* appview/pages/static
           export TANGLED_OAUTH_CLIENT_KID="$(date +%s)"
-          export TANGLED_OAUTH_CLIENT_SECRET="$(${packages'.goat}/bin/goat key generate -t P-256 | grep -A1 "Secret Key" | tail -n1 | awk '{print $1}')"
+          export TANGLED_OAUTH_CLIENT_SECRET="$(${pkgs.atproto-goat}/bin/goat key generate -t P-256 | grep -A1 "Secret Key" | tail -n1 | awk '{print $1}')"
         '';
         env.CGO_ENABLED = 1;
       };
@@ -291,7 +285,7 @@
 
               rm -f api/tangled/*
               lexgen --build-file lexicon-build-config.json lexicons
-              sed -i.bak 's/\tutil/\/\/\tutil/' api/tangled/*
+              sed -i.bak 's/\tlexutil.RegisterType/\/\/\tlexutil.RegisterType/' api/tangled/*
               # lexgen generates incomplete Marshaler/Unmarshaler for union types
               find api/tangled/*.go -not -name "cbor_gen.go" -exec \
                 sed -i '/^func.*\(MarshalCBOR\|UnmarshalCBOR\)/,/^}/ s/^/\/\/ /' {} +
diff --git a/nix/pkgs/lexgen.nix b/nix/pkgs/lexgen.nix
--- a/nix/pkgs/lexgen.nix
+++ b/nix/pkgs/lexgen.nix
@@ -1,12 +1,17 @@
 {
   buildGoModule,
-  indigo,
+  fetchFromGitHub,
 }:
 buildGoModule {
   pname = "lexgen";
   version = "0.1.0";
-  src = indigo;
+  src = fetchFromGitHub {
+    owner = "boltlessengineer";
+    repo = "indigo";
+    rev = "push-rossmvqxklvk";
+    sha256 = "sha256-t3SgVmfaOG+VaDHh4I03sifc3Als05zaUcDhFywfJao=";
+  };
   subPackages = ["cmd/lexgen"];
-  vendorHash = "sha256-VbDrcN4r5b7utRFQzVsKgDsVgdQLSXl7oZ5kdPA/huw=";
+  vendorHash = "sha256-UOedwNYnM8Jx6B7Y9tFcZX8IeUBESAFAPTRYk7n0yo8=";
   doCheck = false;
 }

--
tangled.sh