Skip to content

Commit 7956d64

Browse files
kveykvey
committed
cells are executing, function invocation is working
1 parent 1a1ea6a commit 7956d64

30 files changed

+2363
-1712
lines changed

‎.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/nix/store/wpnij05f1bvqdfkysmfm5ynzzh1ym8h7-pre-commit-config.json
1+
/nix/store/dg7b04vxfdf5l7vw0smjjn5jcjg8jwi6-pre-commit-config.json

‎devenv.lock

+148-24
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"devenv": {
44
"locked": {
55
"dir": "src/modules",
6-
"lastModified": 1688422948,
7-
"narHash": "sha256-D5Le0gJgaB5fT9qKZ5jBmnBvdZJTOBr1cyeWsRiWZXc=",
6+
"lastModified": 1705853027,
7+
"narHash": "sha256-Oz6K7aGvUWYv4U7rouc5vtZ9WTv7L5vkgRrtziNyquY=",
88
"owner": "cachix",
99
"repo": "devenv",
10-
"rev": "6f761f07c5f53d5cc4a139db3f41a7f4a0821ffa",
10+
"rev": "aa237a7b5605b4f58714762d1f56627dfb1b3dfa",
1111
"type": "github"
1212
},
1313
"original": {
@@ -17,14 +17,51 @@
1717
"type": "github"
1818
}
1919
},
20+
"fenix": {
21+
"inputs": {
22+
"nixpkgs": [
23+
"nixpkgs"
24+
],
25+
"rust-analyzer-src": "rust-analyzer-src"
26+
},
27+
"locked": {
28+
"lastModified": 1705904706,
29+
"narHash": "sha256-0aJfyNYWy6pS4GfOA+pmGOE+PgJZLG78T+sPh8zRJx8=",
30+
"owner": "nix-community",
31+
"repo": "fenix",
32+
"rev": "8e7851239acf6bfb06637f4d3e180302f53ec542",
33+
"type": "github"
34+
},
35+
"original": {
36+
"owner": "nix-community",
37+
"repo": "fenix",
38+
"type": "github"
39+
}
40+
},
2041
"flake-compat": {
2142
"flake": false,
2243
"locked": {
23-
"lastModified": 1673956053,
24-
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
44+
"lastModified": 1696426674,
45+
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
2546
"owner": "edolstra",
2647
"repo": "flake-compat",
27-
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
48+
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
49+
"type": "github"
50+
},
51+
"original": {
52+
"owner": "edolstra",
53+
"repo": "flake-compat",
54+
"type": "github"
55+
}
56+
},
57+
"flake-compat_2": {
58+
"flake": false,
59+
"locked": {
60+
"lastModified": 1696426674,
61+
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
62+
"owner": "edolstra",
63+
"repo": "flake-compat",
64+
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
2865
"type": "github"
2966
},
3067
"original": {
@@ -38,11 +75,28 @@
3875
"systems": "systems"
3976
},
4077
"locked": {
41-
"lastModified": 1685518550,
42-
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
78+
"lastModified": 1705309234,
79+
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
80+
"owner": "numtide",
81+
"repo": "flake-utils",
82+
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
83+
"type": "github"
84+
},
85+
"original": {
86+
"id": "flake-utils",
87+
"type": "indirect"
88+
}
89+
},
90+
"flake-utils_2": {
91+
"inputs": {
92+
"systems": "systems_2"
93+
},
94+
"locked": {
95+
"lastModified": 1701680307,
96+
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
4397
"owner": "numtide",
4498
"repo": "flake-utils",
45-
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
99+
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
46100
"type": "github"
47101
},
48102
"original": {
@@ -59,11 +113,11 @@
59113
]
60114
},
61115
"locked": {
62-
"lastModified": 1660459072,
63-
"narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
116+
"lastModified": 1703887061,
117+
"narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
64118
"owner": "hercules-ci",
65119
"repo": "gitignore.nix",
66-
"rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
120+
"rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
67121
"type": "github"
68122
},
69123
"original": {
@@ -74,11 +128,11 @@
74128
},
75129
"nixpkgs": {
76130
"locked": {
77-
"lastModified": 1688523306,
78-
"narHash": "sha256-xcJHmwlw0w05D/c8oPX6COxVLYNbu6lXF2mIV7dFGkc=",
131+
"lastModified": 1705883077,
132+
"narHash": "sha256-ByzHHX3KxpU1+V0erFy8jpujTufimh6KaS/Iv3AciHk=",
79133
"owner": "NixOS",
80134
"repo": "nixpkgs",
81-
"rev": "023b1df882979a413a3f7e2009424db30d51a0fe",
135+
"rev": "5f5210aa20e343b7e35f40c033000db0ef80d7b9",
82136
"type": "github"
83137
},
84138
"original": {
@@ -88,38 +142,74 @@
88142
"type": "github"
89143
}
90144
},
145+
"nixpkgs-python": {
146+
"inputs": {
147+
"flake-compat": "flake-compat",
148+
"flake-utils": "flake-utils",
149+
"nixpkgs": "nixpkgs_2"
150+
},
151+
"locked": {
152+
"lastModified": 1705086858,
153+
"narHash": "sha256-/QamQ9bgh/hRB8FWZTH/XWG1KMZCzyi9zBhPO30yRx0=",
154+
"owner": "cachix",
155+
"repo": "nixpkgs-python",
156+
"rev": "d530242aee46505e2a950b93760bbe7c9f9b2442",
157+
"type": "github"
158+
},
159+
"original": {
160+
"owner": "cachix",
161+
"repo": "nixpkgs-python",
162+
"type": "github"
163+
}
164+
},
91165
"nixpkgs-stable": {
92166
"locked": {
93-
"lastModified": 1685801374,
94-
"narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
167+
"lastModified": 1704874635,
168+
"narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
95169
"owner": "NixOS",
96170
"repo": "nixpkgs",
97-
"rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
171+
"rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
98172
"type": "github"
99173
},
100174
"original": {
101175
"owner": "NixOS",
102-
"ref": "nixos-23.05",
176+
"ref": "nixos-23.11",
177+
"repo": "nixpkgs",
178+
"type": "github"
179+
}
180+
},
181+
"nixpkgs_2": {
182+
"locked": {
183+
"lastModified": 1705774713,
184+
"narHash": "sha256-j6ADaDH9XiumUzkTPlFyCBcoWYhO83lfgiSqEJF2zcs=",
185+
"owner": "NixOS",
186+
"repo": "nixpkgs",
187+
"rev": "1b64fc1287991a9cce717a01c1973ef86cb1af0b",
188+
"type": "github"
189+
},
190+
"original": {
191+
"owner": "NixOS",
192+
"ref": "nixos-23.11",
103193
"repo": "nixpkgs",
104194
"type": "github"
105195
}
106196
},
107197
"pre-commit-hooks": {
108198
"inputs": {
109-
"flake-compat": "flake-compat",
110-
"flake-utils": "flake-utils",
199+
"flake-compat": "flake-compat_2",
200+
"flake-utils": "flake-utils_2",
111201
"gitignore": "gitignore",
112202
"nixpkgs": [
113203
"nixpkgs"
114204
],
115205
"nixpkgs-stable": "nixpkgs-stable"
116206
},
117207
"locked": {
118-
"lastModified": 1688473851,
119-
"narHash": "sha256-j+ViA3lh4uQGIDqB6TjM4+wijX2M5mfNb6MVJVekpAs=",
208+
"lastModified": 1705757126,
209+
"narHash": "sha256-Eksr+n4Q8EYZKAN0Scef5JK4H6FcHc+TKNHb95CWm+c=",
120210
"owner": "cachix",
121211
"repo": "pre-commit-hooks.nix",
122-
"rev": "f6a6863a3bcb61e846a9e4777b90ee365607a925",
212+
"rev": "f56597d53fd174f796b5a7d3ee0b494f9e2285cc",
123213
"type": "github"
124214
},
125215
"original": {
@@ -131,10 +221,29 @@
131221
"root": {
132222
"inputs": {
133223
"devenv": "devenv",
224+
"fenix": "fenix",
134225
"nixpkgs": "nixpkgs",
226+
"nixpkgs-python": "nixpkgs-python",
135227
"pre-commit-hooks": "pre-commit-hooks"
136228
}
137229
},
230+
"rust-analyzer-src": {
231+
"flake": false,
232+
"locked": {
233+
"lastModified": 1705864945,
234+
"narHash": "sha256-ZATChFWHToTZQFLlzrzDUX8fjEbMHHBIyPaZU1JGmjI=",
235+
"owner": "rust-lang",
236+
"repo": "rust-analyzer",
237+
"rev": "d410d4a2baf9e99b37b03dd42f06238b14374bf7",
238+
"type": "github"
239+
},
240+
"original": {
241+
"owner": "rust-lang",
242+
"ref": "nightly",
243+
"repo": "rust-analyzer",
244+
"type": "github"
245+
}
246+
},
138247
"systems": {
139248
"locked": {
140249
"lastModified": 1681028828,
@@ -149,6 +258,21 @@
149258
"repo": "default",
150259
"type": "github"
151260
}
261+
},
262+
"systems_2": {
263+
"locked": {
264+
"lastModified": 1681028828,
265+
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
266+
"owner": "nix-systems",
267+
"repo": "default",
268+
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
269+
"type": "github"
270+
},
271+
"original": {
272+
"owner": "nix-systems",
273+
"repo": "default",
274+
"type": "github"
275+
}
152276
}
153277
},
154278
"root": "root",

‎devenv.nix

+6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
pkgs.protobuf3_21
1111
pkgs.nodejs_20
1212
pkgs.xdot
13+
pkgs.rustup
14+
pkgs.wasm-pack
1315
] ++ lib.optionals pkgs.stdenv.isDarwin (with pkgs.darwin.apple_sdk; [
16+
frameworks.SystemConfiguration
1417
frameworks.Security
1518
frameworks.CoreFoundation
1619
]);
@@ -28,13 +31,16 @@
2831
languages.nix.enable = true;
2932

3033
languages.python = {
34+
version = "3.12.0";
3135
enable = true;
3236
poetry.enable = true;
3337
venv.enable = true;
3438
};
3539

3640
languages.rust = {
3741
enable = true;
42+
channel = "nightly";
43+
components = [ "rustc" "cargo" "clippy" "rustfmt" "rust-analyzer"];
3844
};
3945

4046
# https://devenv.sh/pre-commit-hooks/

‎devenv.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
inputs:
22
nixpkgs:
33
url: github:NixOS/nixpkgs/nixpkgs-unstable
4+
nixpkgs-python:
5+
url: github:cachix/nixpkgs-python
6+
fenix:
7+
url: github:nix-community/fenix
8+
inputs:
9+
nixpkgs:
10+
follows: nixpkgs

0 commit comments

Comments
 (0)