git.iko.soy/helix
on master help sign in
build(nix): update flake dependencies, remove deprecated code from flake
c3c8774Yusuf Bera Ertan
flake.lock+87−24
compare with master
unifiedsplit
@@ -18,9 +18,6 @@
18 },
18 },
19 "dream2nix": {
19 "dream2nix": {
20 "inputs": {
20 "inputs": {
21− "alejandra": [
22− "nci"
23− ],
24 "all-cabal-json": [
21 "all-cabal-json": [
25 "nci"
22 "nci"
26 ],
23 ],
@@ -28,6 +25,8 @@
28 "devshell": [
25 "devshell": [
29 "nci"
26 "nci"
30 ],
27 ],
28+ "drv-parts": "drv-parts",
29+ "flake-compat": "flake-compat",
31 "flake-parts": [
30 "flake-parts": [
32 "nci",
31 "nci",
33 "parts"
32 "parts"
@@ -51,6 +50,7 @@
51 "nci",
50 "nci",
52 "nixpkgs"
51 "nixpkgs"
53 ],
52 ],
53+ "nixpkgsV1": "nixpkgsV1",
54 "poetry2nix": [
54 "poetry2nix": [
55 "nci"
55 "nci"
56 ],
56 ],
@@ -62,11 +62,11 @@
62 ]
62 ]
63 },
63 },
64 "locked": {
64 "locked": {
65− "lastModified": 1677289985,
65+ "lastModified": 1680258209,
66− "narHash": "sha256-lUp06cTTlWubeBGMZqPl9jODM99LpWMcwxRiscFAUJg=",
66+ "narHash": "sha256-lEo50RXI/17/a9aCIun8Hz62ZJ5JM5RGeTgclIP+Lgc=",
67 "owner": "nix-community",
67 "owner": "nix-community",
68 "repo": "dream2nix",
68 "repo": "dream2nix",
69− "rev": "28b973a8d4c30cc1cbb3377ea2023a76bc3fb889",
69+ "rev": "6f512b5a220fdb26bd3c659f7b55e4f052ec8b35",
70 "type": "github"
70 "type": "github"
71 },
71 },
72 "original": {
72 "original": {
@@ -75,6 +75,54 @@
75 "type": "github"
75 "type": "github"
76 }
76 }
77 },
77 },
78+ "drv-parts": {
79+ "inputs": {
80+ "flake-compat": [
81+ "nci",
82+ "dream2nix",
83+ "flake-compat"
84+ ],
85+ "flake-parts": [
86+ "nci",
87+ "dream2nix",
88+ "flake-parts"
89+ ],
90+ "nixpkgs": [
91+ "nci",
92+ "dream2nix",
93+ "nixpkgs"
94+ ]
95+ },
96+ "locked": {
97+ "lastModified": 1680172861,
98+ "narHash": "sha256-QMyI338xRxaHFDlCXdLCtgelGQX2PdlagZALky4ZXJ8=",
99+ "owner": "davhau",
100+ "repo": "drv-parts",
101+ "rev": "ced8a52f62b0a94244713df2225c05c85b416110",
102+ "type": "github"
103+ },
104+ "original": {
105+ "owner": "davhau",
106+ "repo": "drv-parts",
107+ "type": "github"
108+ }
109+ },
110+ "flake-compat": {
111+ "flake": false,
112+ "locked": {
113+ "lastModified": 1673956053,
114+ "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
115+ "owner": "edolstra",
116+ "repo": "flake-compat",
117+ "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
118+ "type": "github"
119+ },
120+ "original": {
121+ "owner": "edolstra",
122+ "repo": "flake-compat",
123+ "type": "github"
124+ }
125+ },
78 "flake-utils": {
126 "flake-utils": {
79 "locked": {
127 "locked": {
80 "lastModified": 1659877975,
128 "lastModified": 1659877975,
@@ -119,11 +167,11 @@
119 ]
167 ]
120 },
168 },
121 "locked": {
169 "locked": {
122− "lastModified": 1677297103,
170+ "lastModified": 1680329418,
123− "narHash": "sha256-ArlJIbp9NGV9yvhZdV0SOUFfRlI/kHeKoCk30NbSiLc=",
171+ "narHash": "sha256-+KN0eQLSZvL1J0kDO8/fxv0UCHTyZCADLmpIfeeiSGo=",
124 "owner": "yusdacra",
172 "owner": "yusdacra",
125 "repo": "nix-cargo-integration",
173 "repo": "nix-cargo-integration",
126− "rev": "a79272a2cb0942392bb3a5bf9a3ec6bc568795b2",
174+ "rev": "98c1d2ff5155f0fee5d290f6b982cb990839d540",
127 "type": "github"
175 "type": "github"
128 },
176 },
129 "original": {
177 "original": {
@@ -134,11 +182,11 @@
134 },
182 },
135 "nixpkgs": {
183 "nixpkgs": {
136 "locked": {
184 "locked": {
137− "lastModified": 1677063315,
185+ "lastModified": 1680213900,
138− "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=",
186+ "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
139 "owner": "nixos",
187 "owner": "nixos",
140 "repo": "nixpkgs",
188 "repo": "nixpkgs",
141− "rev": "988cc958c57ce4350ec248d2d53087777f9e1949",
189+ "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
142 "type": "github"
190 "type": "github"
143 },
191 },
144 "original": {
192 "original": {
@@ -151,11 +199,11 @@
151 "nixpkgs-lib": {
199 "nixpkgs-lib": {
152 "locked": {
200 "locked": {
153 "dir": "lib",
201 "dir": "lib",
154− "lastModified": 1675183161,
202+ "lastModified": 1678375444,
155− "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=",
203+ "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=",
156 "owner": "NixOS",
204 "owner": "NixOS",
157 "repo": "nixpkgs",
205 "repo": "nixpkgs",
158− "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e",
206+ "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e",
159 "type": "github"
207 "type": "github"
160 },
208 },
161 "original": {
209 "original": {
@@ -166,6 +214,21 @@
166 "type": "github"
214 "type": "github"
167 }
215 }
168 },
216 },
217+ "nixpkgsV1": {
218+ "locked": {
219+ "lastModified": 1678500271,
220+ "narHash": "sha256-tRBLElf6f02HJGG0ZR7znMNFv/Uf7b2fFInpTHiHaSE=",
221+ "owner": "NixOS",
222+ "repo": "nixpkgs",
223+ "rev": "5eb98948b66de29f899c7fe27ae112a47964baf8",
224+ "type": "github"
225+ },
226+ "original": {
227+ "id": "nixpkgs",
228+ "ref": "nixos-22.11",
229+ "type": "indirect"
230+ }
231+ },
169 "parts": {
232 "parts": {
170 "inputs": {
233 "inputs": {
171 "nixpkgs-lib": [
234 "nixpkgs-lib": [
@@ -174,11 +237,11 @@
174 ]
237 ]
175 },
238 },
176 "locked": {
239 "locked": {
177− "lastModified": 1675933616,
240+ "lastModified": 1679737941,
178− "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=",
241+ "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=",
179 "owner": "hercules-ci",
242 "owner": "hercules-ci",
180 "repo": "flake-parts",
243 "repo": "flake-parts",
181− "rev": "47478a4a003e745402acf63be7f9a092d51b83d7",
244+ "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c",
182 "type": "github"
245 "type": "github"
183 },
246 },
184 "original": {
247 "original": {
@@ -192,11 +255,11 @@
192 "nixpkgs-lib": "nixpkgs-lib"
255 "nixpkgs-lib": "nixpkgs-lib"
193 },
256 },
194 "locked": {
257 "locked": {
195− "lastModified": 1675933616,
258+ "lastModified": 1679737941,
196− "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=",
259+ "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=",
197 "owner": "hercules-ci",
260 "owner": "hercules-ci",
198 "repo": "flake-parts",
261 "repo": "flake-parts",
199− "rev": "47478a4a003e745402acf63be7f9a092d51b83d7",
262+ "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c",
200 "type": "github"
263 "type": "github"
201 },
264 },
202 "original": {
265 "original": {
@@ -221,11 +284,11 @@
221 ]
284 ]
222 },
285 },
223 "locked": {
286 "locked": {
224− "lastModified": 1677292251,
287+ "lastModified": 1680315536,
225− "narHash": "sha256-D+6q5Z2MQn3UFJtqsM5/AvVHi3NXKZTIMZt1JGq/spA=",
288+ "narHash": "sha256-0AsBuKssJMbcRcw4HJQwJsUHhZxR5+gaf6xPQayhR44=",
226 "owner": "oxalica",
289 "owner": "oxalica",
227 "repo": "rust-overlay",
290 "repo": "rust-overlay",
228− "rev": "34cdbf6ad480ce13a6a526f57d8b9e609f3d65dc",
291+ "rev": "5c8c151bdd639074a0051325c16df1a64ee23497",
229 "type": "github"
292 "type": "github"
230 },
293 },
231 "original": {
294 "original": {
flake.nix−2
@@ -123,8 +123,6 @@
123 then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
123 then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
124 else "$RUSTFLAGS";
124 else "$RUSTFLAGS";
125 in {
125 in {
126− # by default NCI adds rust-analyzer component, but helix toolchain doesn't have rust-analyzer
127− nci.toolchains.shell.components = ["rust-src" "rustfmt" "clippy"];
128 nci.projects."helix-project".relPath = "";
126 nci.projects."helix-project".relPath = "";
129 nci.crates."helix-term" = {
127 nci.crates."helix-term" = {
130 overrides = {
128 overrides = {