forked from
tangled.org/core
Monorepo for Tangled
nix: update lexgen version, replace goat to atproto-goat
Signed-off-by: Seongmin Lee <git@boltless.me>
+13
-31
-17
flake.lock
-17
flake.lock
···
106
106
"url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip"
107
107
}
108
108
},
109
-
"indigo": {
110
-
"flake": false,
111
-
"locked": {
112
-
"lastModified": 1753693716,
113
-
"narHash": "sha256-DMIKnCJRODQXEHUxA+7mLzRALmnZhkkbHlFT2rCQYrE=",
114
-
"owner": "oppiliappan",
115
-
"repo": "indigo",
116
-
"rev": "5f170569da9360f57add450a278d73538092d8ca",
117
-
"type": "github"
118
-
},
119
-
"original": {
120
-
"owner": "oppiliappan",
121
-
"repo": "indigo",
122
-
"type": "github"
123
-
}
124
-
},
125
109
"inter-fonts-src": {
126
110
"flake": false,
127
111
"locked": {
···
172
156
"htmx-src": "htmx-src",
173
157
"htmx-ws-src": "htmx-ws-src",
174
158
"ibm-plex-mono-src": "ibm-plex-mono-src",
175
-
"indigo": "indigo",
176
159
"inter-fonts-src": "inter-fonts-src",
177
160
"lucide-src": "lucide-src",
178
161
"nixpkgs": "nixpkgs",
+5
-11
flake.nix
+5
-11
flake.nix
···
11
11
url = "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz";
12
12
flake = false;
13
13
};
14
-
indigo = {
15
-
url = "github:oppiliappan/indigo";
16
-
flake = false;
17
-
};
18
14
htmx-src = {
19
15
url = "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js";
20
16
flake = false;
···
51
47
self,
52
48
nixpkgs,
53
49
gomod2nix,
54
-
indigo,
55
50
htmx-src,
56
51
htmx-ws-src,
57
52
lucide-src,
···
82
77
sqlite-lib = self.callPackage ./nix/pkgs/sqlite-lib.nix {
83
78
inherit sqlite-lib-src;
84
79
};
85
-
lexgen = self.callPackage ./nix/pkgs/lexgen.nix {inherit indigo;};
86
-
goat = self.callPackage ./nix/pkgs/goat.nix {inherit indigo;};
80
+
lexgen = self.callPackage ./nix/pkgs/lexgen.nix {};
87
81
appview-static-files = self.callPackage ./nix/pkgs/appview-static-files.nix {
88
82
inherit htmx-src htmx-ws-src lucide-src inter-fonts-src ibm-plex-mono-src actor-typeahead-src;
89
83
};
···
102
96
});
103
97
in {
104
98
overlays.default = final: prev: {
105
-
inherit (mkPackageSet final) lexgen goat sqlite-lib spindle knot-unwrapped knot appview docs dolly did-method-plc bluesky-jetstream bluesky-relay tap;
99
+
inherit (mkPackageSet final) lexgen sqlite-lib spindle knot-unwrapped knot appview docs dolly did-method-plc bluesky-jetstream bluesky-relay tap;
106
100
};
107
101
108
102
packages = forAllSystems (system: let
···
116
110
appview
117
111
appview-static-files
118
112
lexgen
119
-
goat
120
113
spindle
121
114
knot
122
115
knot-unwrapped
···
189
182
pkgs.nixos-shell
190
183
pkgs.redis
191
184
pkgs.coreutils # for those of us who are on systems that use busybox (alpine)
185
+
pkgs.atproto-goat
192
186
packages'.lexgen
193
187
packages'.treefmt-wrapper
194
188
];
···
197
191
# no preserve is needed because watch-tailwind will want to be able to overwrite
198
192
cp -fr --no-preserve=ownership ${packages'.appview-static-files}/* appview/pages/static
199
193
export TANGLED_OAUTH_CLIENT_KID="$(date +%s)"
200
-
export TANGLED_OAUTH_CLIENT_SECRET="$(${packages'.goat}/bin/goat key generate -t P-256 | grep -A1 "Secret Key" | tail -n1 | awk '{print $1}')"
194
+
export TANGLED_OAUTH_CLIENT_SECRET="$(${pkgs.atproto-goat}/bin/goat key generate -t P-256 | grep -A1 "Secret Key" | tail -n1 | awk '{print $1}')"
201
195
'';
202
196
env.CGO_ENABLED = 1;
203
197
};
···
291
285
292
286
rm -f api/tangled/*
293
287
lexgen --build-file lexicon-build-config.json lexicons
294
-
sed -i.bak 's/\tutil/\/\/\tutil/' api/tangled/*
288
+
sed -i.bak 's/\tlexutil.RegisterType/\/\/\tlexutil.RegisterType/' api/tangled/*
295
289
# lexgen generates incomplete Marshaler/Unmarshaler for union types
296
290
find api/tangled/*.go -not -name "cbor_gen.go" -exec \
297
291
sed -i '/^func.*\(MarshalCBOR\|UnmarshalCBOR\)/,/^}/ s/^/\/\/ /' {} +
+8
-3
nix/pkgs/lexgen.nix
+8
-3
nix/pkgs/lexgen.nix
···
1
1
{
2
2
buildGoModule,
3
-
indigo,
3
+
fetchFromGitHub,
4
4
}:
5
5
buildGoModule {
6
6
pname = "lexgen";
7
7
version = "0.1.0";
8
-
src = indigo;
8
+
src = fetchFromGitHub {
9
+
owner = "boltlessengineer";
10
+
repo = "indigo";
11
+
rev = "push-rossmvqxklvk";
12
+
sha256 = "sha256-t3SgVmfaOG+VaDHh4I03sifc3Als05zaUcDhFywfJao=";
13
+
};
9
14
subPackages = ["cmd/lexgen"];
10
-
vendorHash = "sha256-VbDrcN4r5b7utRFQzVsKgDsVgdQLSXl7oZ5kdPA/huw=";
15
+
vendorHash = "sha256-UOedwNYnM8Jx6B7Y9tFcZX8IeUBESAFAPTRYk7n0yo8=";
11
16
doCheck = false;
12
17
}