Skip to content

Commit 4d68cbc

Browse files
committed
bump nixpkgs
Why === * dotnet10 was segfaulting on the old version What changed === * Moved python 3.9 to historical modules since it is out of support * Moved python-with-prybar-3.10 to historical modules since we aren't supporting prybar any more and it was having trouble evaluating with the new nixpkgs * Update lua language server based on deprecation recommendations in nixpkgs * Update ruby from 3.1 to 4.0 Test plan === ``` nix build '.#"dotnet-10.0"' ``` builds now
1 parent ae6ed05 commit 4d68cbc

File tree

7 files changed

+109
-143
lines changed

7 files changed

+109
-143
lines changed

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkgs/historical-modules/default.nix

Lines changed: 39 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,13 @@ let
221221
displayVersion = "3.8";
222222
};
223223
}
224+
{
225+
moduleId = "python-3.9";
226+
commit = "ae6ed05c623804560afd1cf3d80d13b6170d5c24";
227+
overrides = {
228+
displayVersion = "3.9";
229+
};
230+
}
224231
{
225232
moduleId = "r-4.2";
226233
commit = "1e1bb663068482cdb7c04bf585daed00205c0140";
@@ -248,9 +255,22 @@ let
248255
displayVersion = "0";
249256
};
250257
}
258+
{
259+
moduleId = "python-with-prybar-3.10";
260+
commit = "ae6ed05c623804560afd1cf3d80d13b6170d5c24";
261+
overrides = {
262+
displayVersion = "3.10";
263+
};
264+
}
251265
];
252266

253-
moduleFromHistory = { moduleId, commit, deployment ? false, overrides }:
267+
moduleFromHistory =
268+
{
269+
moduleId,
270+
commit,
271+
deployment ? false,
272+
overrides,
273+
}:
254274
let
255275
flake = getFlake "github:replit/nixmodules/${commit}";
256276
module =
@@ -263,30 +283,28 @@ let
263283
name = "replit-module-${moduleId}";
264284
buildCommand = ''
265285
set -x
266-
${pkgs.jq}/bin/jq --argjson overrides '${builtins.toJSON(overrides)}' '. * $overrides' < ${module} > $out
286+
${pkgs.jq}/bin/jq --argjson overrides '${builtins.toJSON (overrides)}' '. * $overrides' < ${module} > $out
267287
'';
268288
};
269289

270-
modules = foldl'
271-
(acc: module:
272-
acc // ({
273-
${module.moduleId} = moduleFromHistory module;
274-
})
275-
)
276-
{ }
277-
historicalModulesList;
290+
modules = foldl' (
291+
acc: module:
292+
acc
293+
// ({
294+
${module.moduleId} = moduleFromHistory module;
295+
})
296+
) { } historicalModulesList;
278297

279-
deploymentModules = foldl'
280-
(acc: module:
281-
acc // ({
282-
${module.moduleId} = moduleFromHistory {
283-
inherit (module) moduleId commit overrides;
284-
deployment = true;
285-
};
286-
})
287-
)
288-
{ }
289-
historicalModulesList;
298+
deploymentModules = foldl' (
299+
acc: module:
300+
acc
301+
// ({
302+
${module.moduleId} = moduleFromHistory {
303+
inherit (module) moduleId commit overrides;
304+
deployment = true;
305+
};
306+
})
307+
) { } historicalModulesList;
290308

291309
in
292310
{

pkgs/modules/c/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{ pkgs, lib, ... }:
22
let
3-
clang = pkgs.clang_14;
3+
clang = pkgs.clang_20;
44
run-extensions = [ ".c" ]; # use this list for file-param runners because
55
# we don't want .h files to be runnable
66
clang-compile = import ../../clang-compile {

pkgs/modules/cpp/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{ pkgs, lib, ... }:
22
let
3-
clang = pkgs.clang_14;
3+
clang = pkgs.clang_20;
44
clang-compile = import ../../clang-compile {
55
inherit pkgs;
66
inherit clang;

pkgs/modules/default.nix

Lines changed: 62 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
1-
{ pkgs, pkgs-23_05, pkgs-24_11, pkgs-25_05, pkgs-master, pkgs-staging, ... }:
1+
{
2+
pkgs,
3+
pkgs-23_05,
4+
pkgs-24_11,
5+
pkgs-25_05,
6+
pkgs-master,
7+
pkgs-staging,
8+
...
9+
}:
210
with builtins;
311
let
4-
mkModule = path: pkgs.callPackage ../moduleit/entrypoint.nix {
5-
configPath = path;
6-
inherit pkgs-23_05 pkgs-24_11;
7-
};
8-
mkDeploymentModule = path: pkgs.callPackage ../moduleit/entrypoint.nix {
9-
configPath = path;
10-
inherit pkgs-23_05 pkgs-24_11;
11-
deployment = true;
12-
};
12+
mkModule =
13+
path:
14+
pkgs.callPackage ../moduleit/entrypoint.nix {
15+
configPath = path;
16+
inherit pkgs-23_05 pkgs-24_11;
17+
};
18+
mkDeploymentModule =
19+
path:
20+
pkgs.callPackage ../moduleit/entrypoint.nix {
21+
configPath = path;
22+
inherit pkgs-23_05 pkgs-24_11;
23+
deployment = true;
24+
};
1325
apply-upgrade-map = import ../upgrade-map;
1426
historical = pkgs.callPackage ../historical-modules { };
1527

@@ -19,31 +31,29 @@ let
1931
pypkgs = pkgs-24_11.python39Packages;
2032
})
2133
(import ./python {
22-
python = pkgs.python310Full;
34+
python = pkgs.python310;
2335
pypkgs = pkgs.python310Packages;
2436
})
2537
(import ./python {
26-
python = pkgs.python311Full;
38+
python = pkgs.python311;
2739
pypkgs = pkgs.python311Packages;
2840
})
2941
(import ./python {
30-
python = pkgs.python312Full;
42+
python = pkgs.python312;
3143
pypkgs = pkgs.python312Packages;
3244
})
3345
(import ./python-base {
34-
python = pkgs.python311Full;
46+
python = pkgs.python311;
3547
pypkgs = pkgs.python311Packages;
3648
})
3749
(import ./python-base {
38-
python = pkgs.python312Full;
50+
python = pkgs.python312;
3951
pypkgs = pkgs.python312Packages;
4052
})
4153
(import ./python-base {
42-
python = pkgs.python313Full;
54+
python = pkgs.python313;
4355
pypkgs = pkgs.python313Packages;
4456
})
45-
(import ./python-with-prybar)
46-
4757
(import ./pyright-extended {
4858
nodejs = pkgs-24_11.nodejs-18_x;
4959
})
@@ -119,8 +129,8 @@ let
119129
(import ./R)
120130
(import ./replit)
121131
(import ./ruby {
122-
ruby = pkgs.ruby_3_1;
123-
rubyPackages = pkgs.rubyPackages_3_1;
132+
ruby = pkgs.ruby_4_0;
133+
rubyPackages = pkgs.rubyPackages_4_0;
124134
})
125135
(
126136
# pinning ruby to specific version to avoid breaking gems with built .so's
@@ -156,47 +166,54 @@ let
156166
];
157167

158168
activeModules = listToAttrs (
159-
map
160-
(moduleInput:
161-
let
162-
module = mkModule moduleInput;
163-
in
164-
{
165-
name = get-module-id module;
166-
value = module;
167-
}
168-
)
169-
modulesList
169+
map (
170+
moduleInput:
171+
let
172+
module = mkModule moduleInput;
173+
in
174+
{
175+
name = get-module-id module;
176+
value = module;
177+
}
178+
) modulesList
170179
);
171180

172181
modules = apply-upgrade-map (activeModules // historical.modules);
173182

174183
activeDeploymentModules = listToAttrs (
175-
map
176-
(moduleInput:
177-
let
178-
module = mkDeploymentModule moduleInput;
179-
in
180-
{
181-
name = get-deployment-module-id module;
182-
value = module;
183-
}
184-
)
185-
modulesList
184+
map (
185+
moduleInput:
186+
let
187+
module = mkDeploymentModule moduleInput;
188+
in
189+
{
190+
name = get-deployment-module-id module;
191+
value = module;
192+
}
193+
) modulesList
186194
);
187195

188196
deploymentModules = apply-upgrade-map (activeDeploymentModules // historical.deploymentModules);
189197

190-
get-module-id = module:
198+
get-module-id =
199+
module:
191200
let
192201
match = builtins.match "^\/nix\/store\/([^-]+)-replit-module-(.+)$" module.outPath;
193202
in
194203
builtins.elemAt match 1;
195204

196-
get-deployment-module-id = module:
205+
get-deployment-module-id =
206+
module:
197207
let
198208
match = builtins.match "^\/nix\/store\/([^-]+)-replit-deployment-module-(.+)$" module.outPath;
199209
in
200210
builtins.elemAt match 1;
201211
in
202-
{ inherit modules activeModules deploymentModules activeDeploymentModules; }
212+
{
213+
inherit
214+
modules
215+
activeModules
216+
deploymentModules
217+
activeDeploymentModules
218+
;
219+
}

pkgs/modules/lua/default.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{ pkgs, lib, ... }:
2-
let lua-version = lib.versions.majorMinor pkgs.lua.version;
2+
let
3+
lua-version = lib.versions.majorMinor pkgs.lua.version;
34
in
45
{
56
id = "lua-${lua-version}";
@@ -25,6 +26,6 @@ in
2526
name = "lua-language-server";
2627
language = "lua";
2728

28-
start = "${pkgs.sumneko-lua-language-server}/bin/lua-language-server";
29+
start = "${pkgs.lua-language-server}/bin/lua-language-server";
2930
};
3031
}

pkgs/modules/python-with-prybar/default.nix

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)