Skip to content

Commit d7159e8

Browse files
authored
bump nixpkgs (#466)
2 parents ae6ed05 + f7548a8 commit d7159e8

16 files changed

Lines changed: 200 additions & 503 deletions

File tree

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/dap-cpp/default.nix

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

pkgs/dap-cpp/messages.nix

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

pkgs/dapPython/default.nix

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

pkgs/dapPython/wrapper.py

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

pkgs/historical-modules/default.nix

Lines changed: 60 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,13 @@ let
7474
displayVersion = "3";
7575
};
7676
}
77+
{
78+
moduleId = "dart-3.8";
79+
commit = "ae6ed05c623804560afd1cf3d80d13b6170d5c24";
80+
overrides = {
81+
displayVersion = "3.8";
82+
};
83+
}
7784
{
7885
moduleId = "deno-1";
7986
commit = "4327245815e8500233ed3af1cbb674bd147f673b";
@@ -221,6 +228,13 @@ let
221228
displayVersion = "3.8";
222229
};
223230
}
231+
{
232+
moduleId = "python-3.9";
233+
commit = "ae6ed05c623804560afd1cf3d80d13b6170d5c24";
234+
overrides = {
235+
displayVersion = "3.9";
236+
};
237+
}
224238
{
225239
moduleId = "r-4.2";
226240
commit = "1e1bb663068482cdb7c04bf585daed00205c0140";
@@ -248,9 +262,38 @@ let
248262
displayVersion = "0";
249263
};
250264
}
265+
{
266+
moduleId = "python-with-prybar-3.10";
267+
commit = "ae6ed05c623804560afd1cf3d80d13b6170d5c24";
268+
overrides = {
269+
displayVersion = "3.10";
270+
};
271+
}
272+
{
273+
moduleId = "go-1.24";
274+
commit = "ae6ed05c623804560afd1cf3d80d13b6170d5c24";
275+
overrides = {
276+
# /nix/store/...-replit-module-go-1.21
277+
# .runners["go-run"].displayVersion = "1...";
278+
displayVersion = "1.24";
279+
};
280+
}
281+
{
282+
moduleId = "ruby-3.1";
283+
commit = "ae6ed05c623804560afd1cf3d80d13b6170d5c24";
284+
overrides = {
285+
displayVersion = "3.1";
286+
};
287+
}
251288
];
252289

253-
moduleFromHistory = { moduleId, commit, deployment ? false, overrides }:
290+
moduleFromHistory =
291+
{ moduleId
292+
, commit
293+
, deployment ? false
294+
, overrides
295+
,
296+
}:
254297
let
255298
flake = getFlake "github:replit/nixmodules/${commit}";
256299
module =
@@ -263,27 +306,31 @@ let
263306
name = "replit-module-${moduleId}";
264307
buildCommand = ''
265308
set -x
266-
${pkgs.jq}/bin/jq --argjson overrides '${builtins.toJSON(overrides)}' '. * $overrides' < ${module} > $out
309+
${pkgs.jq}/bin/jq --argjson overrides '${builtins.toJSON (overrides)}' '. * $overrides' < ${module} > $out
267310
'';
268311
};
269312

270313
modules = foldl'
271-
(acc: module:
272-
acc // ({
273-
${module.moduleId} = moduleFromHistory module;
274-
})
314+
(
315+
acc: module:
316+
acc
317+
// ({
318+
${module.moduleId} = moduleFromHistory module;
319+
})
275320
)
276321
{ }
277322
historicalModulesList;
278323

279324
deploymentModules = foldl'
280-
(acc: module:
281-
acc // ({
282-
${module.moduleId} = moduleFromHistory {
283-
inherit (module) moduleId commit overrides;
284-
deployment = true;
285-
};
286-
})
325+
(
326+
acc: module:
327+
acc
328+
// ({
329+
${module.moduleId} = moduleFromHistory {
330+
inherit (module) moduleId commit overrides;
331+
deployment = true;
332+
};
333+
})
287334
)
288335
{ }
289336
historicalModulesList;

pkgs/moduleit/example.nix

Lines changed: 20 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,18 @@ in
3232
runners.nodeJS = {
3333
name = "Node.js";
3434
language = "javascript";
35-
extensions = [ ".js" ".ts" ".jsx" ".tsx" ];
35+
extensions = [
36+
".js"
37+
".ts"
38+
".jsx"
39+
".tsx"
40+
];
3641
start = "${pkgs.nodejs_20}/bin/node $file";
3742
compile = {
38-
args = [ "tsc" "$file" ];
43+
args = [
44+
"tsc"
45+
"$file"
46+
];
3947
env = {
4048
FOO = "BAR";
4149
};
@@ -49,53 +57,15 @@ in
4957
};
5058
};
5159

52-
debuggers.nodeDAP = {
53-
name = "Node DAP";
54-
language = "javascript";
55-
filePattern = "*.{js,jsx,ts,tsx}";
56-
transport = "localhost:0";
57-
fileParam = true;
58-
start = "dap-node";
59-
initializeMessage = {
60-
command = "initialize";
61-
type = "request";
62-
arguments = {
63-
clientID = "replit";
64-
clientName = "replit.com";
65-
adapterID = "dap-node";
66-
columnsStartAt1 = true;
67-
linesStartAt1 = true;
68-
locale = "en-us";
69-
pathFormat = "path";
70-
supportsInvalidatedEvent = true;
71-
supportsProgressReporting = true;
72-
supportsRunInTerminalRequest = true;
73-
supportsVariablePaging = true;
74-
supportsVariableType = true;
75-
};
76-
};
77-
launchMessage = {
78-
command = "launch";
79-
type = "request";
80-
arguments = {
81-
args = [ ];
82-
console = "externalTerminal";
83-
cwd = ".";
84-
environment = [ ];
85-
pauseForSourceMap = false;
86-
program = "$file";
87-
request = "launch";
88-
sourceMaps = true;
89-
stopOnEntry = false;
90-
type = "pwa-node";
91-
};
92-
};
93-
};
94-
9560
languageServers.tsServer = {
9661
name = "TypeScript Language Server";
9762
language = "javascript";
98-
extensions = [ ".js" ".ts" ".jsx" ".tsx" ];
63+
extensions = [
64+
".js"
65+
".ts"
66+
".jsx"
67+
".tsx"
68+
];
9969
start = "${typescript-language-server}/bin/typescript-language-server --stdio";
10070
};
10171

@@ -108,7 +78,10 @@ in
10878
enabledForHosting = false;
10979
};
11080
afterInstall = {
111-
args = [ "echo" "installed" ];
81+
args = [
82+
"echo"
83+
"installed"
84+
];
11285
};
11386
};
11487

0 commit comments

Comments
 (0)