Skip to content

Commit f60c8e8

Browse files
authored
update nixpkgs input (#453)
2 parents 32109c4 + 108214a commit f60c8e8

File tree

10 files changed

+83
-39
lines changed

10 files changed

+83
-39
lines changed

flake.lock

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

flake.nix

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
{
22
description = "Nix expressions for defining Replit development environments";
3-
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
4-
inputs.nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
3+
inputs.nixpkgs-23_05.url = "github:nixos/nixpkgs/nixos-23.05";
4+
inputs.nixpkgs-24_11.url = "github:nixos/nixpkgs/nixos-24.11";
5+
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
56
inputs.fenix.url = "github:nix-community/fenix";
67
inputs.fenix.inputs.nixpkgs.follows = "nixpkgs";
78
inputs.nil.url = "github:oxalica/nil";
89
inputs.nil.inputs.nixpkgs.follows = "nixpkgs";
910
inputs.prybar.url = "github:replit/prybar";
1011
inputs.prybar.inputs.nixpkgs.follows = "nixpkgs";
1112
inputs.java-language-server.url = "github:replit/java-language-server";
12-
inputs.java-language-server.inputs.nixpkgs.follows = "nixpkgs";
13+
inputs.java-language-server.inputs.nixpkgs.follows = "nixpkgs-23_05";
1314
inputs.ztoc-rs.url = "github:replit/ztoc-rs";
1415
inputs.ztoc-rs.inputs.nixpkgs.follows = "nixpkgs";
1516
inputs.replit-rtld-loader.url = "github:replit/replit_rtld_loader";
1617
inputs.replit-rtld-loader.inputs.nixpkgs.follows = "nixpkgs";
1718

18-
outputs = { self, nixpkgs, nixpkgs-unstable, prybar, java-language-server, nil, fenix, replit-rtld-loader, ... }:
19+
outputs = { self, nixpkgs, nixpkgs-23_05, nixpkgs-24_11, prybar, java-language-server, nil, fenix, replit-rtld-loader, ... }:
1920
let
2021
mkPkgs = nixpkgs-spec: system: import nixpkgs-spec {
2122
inherit system;
@@ -33,11 +34,12 @@
3334
];
3435
};
3536

36-
pkgs-23_05 = mkPkgs nixpkgs "x86_64-linux";
37+
pkgs-23_05 = mkPkgs nixpkgs-23_05 "x86_64-linux";
38+
pkgs-24_11 = mkPkgs nixpkgs-24_11 "x86_64-linux";
3739

38-
patched-unstable = nixpkgs-unstable.legacyPackages.x86_64-linux.applyPatches {
40+
patched-unstable = nixpkgs.legacyPackages.x86_64-linux.applyPatches {
3941
name = "nixpkgs-unstable-patched";
40-
src = nixpkgs-unstable;
42+
src = nixpkgs;
4143
patches = [
4244
# rexml broke solargraph at some point in the past.
4345
# Attempting to run:
@@ -114,6 +116,7 @@
114116
import ./pkgs/modules {
115117
inherit pkgs;
116118
inherit pkgs-23_05;
119+
inherit pkgs-24_11;
117120
}
118121
);
119122
}

pkgs/moduleit/entrypoint.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{ pkgs ? import <nixpkgs-unstable> { }
22
, pkgs-23_05 ? import <nixpkgs-stable-23_05> { }
3+
, pkgs-24_11 ? import <nixpkgs-stable-24_11> { }
34
, configPath
45
, deployment ? false
56
}:
@@ -10,7 +11,7 @@ let
1011
(import ./module-definition.nix)
1112
];
1213
specialArgs = {
13-
inherit pkgs pkgs-23_05;
14+
inherit pkgs pkgs-23_05 pkgs-24_11;
1415
pkgs-unstable = pkgs;
1516
modulesPath = builtins.toString ./.;
1617
};

pkgs/modules/default.nix

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
{ pkgs, pkgs-23_05 }:
1+
{ pkgs, pkgs-23_05, pkgs-24_11 }:
22
with builtins;
33
let
44
mkModule = path: pkgs.callPackage ../moduleit/entrypoint.nix {
55
configPath = path;
6-
inherit pkgs-23_05;
6+
inherit pkgs-23_05 pkgs-24_11;
77
};
88
mkDeploymentModule = path: pkgs.callPackage ../moduleit/entrypoint.nix {
99
configPath = path;
10-
inherit pkgs-23_05;
10+
inherit pkgs-23_05 pkgs-24_11;
1111
deployment = true;
1212
};
1313
apply-upgrade-map = import ../upgrade-map;
1414
historical = pkgs.callPackage ../historical-modules { };
1515

1616
modulesList = [
1717
(import ./python {
18-
python = pkgs.python39Full;
19-
pypkgs = pkgs.python39Packages;
18+
python = pkgs-24_11.python39Full;
19+
pypkgs = pkgs-24_11.python39Packages;
2020
})
2121
(import ./python {
2222
python = pkgs.python310Full;
@@ -42,14 +42,20 @@ let
4242
python = pkgs.python313Full;
4343
pypkgs = pkgs.python313Packages;
4444
})
45+
(import ./python-base {
46+
python = pkgs.python314Full;
47+
pypkgs = pkgs.python314Packages;
48+
})
4549
(import ./python-with-prybar)
4650

47-
(import ./pyright-extended)
51+
(import ./pyright-extended {
52+
nodejs = pkgs-24_11.nodejs-18_x;
53+
})
4854
(import ./pyright)
4955
(import ./ruff)
5056

5157
(import ./nodejs {
52-
nodejs = pkgs.nodejs-18_x;
58+
nodejs = pkgs-24_11.nodejs-18_x;
5359
})
5460
(import ./nodejs {
5561
nodejs = pkgs.nodejs_20;
@@ -58,14 +64,25 @@ let
5864
nodejs = pkgs.nodejs_22;
5965
})
6066
(import ./nodejs {
61-
nodejs = pkgs.nodejs_23;
67+
nodejs = pkgs-24_11.nodejs_23;
68+
})
69+
(import ./nodejs {
70+
nodejs = pkgs.nodejs_24;
71+
})
72+
(import ./nodejs-with-prybar {
73+
nodejs = pkgs-24_11.nodejs-18_x;
6274
})
63-
(import ./nodejs-with-prybar)
6475

6576
(import ./go {
6677
go = pkgs.go_1_23;
6778
gopls = pkgs.gopls.override {
68-
buildGoModule = pkgs.buildGo123Module;
79+
buildGoLatestModule = pkgs.buildGo123Module;
80+
};
81+
})
82+
(import ./go {
83+
go = pkgs.go_1_24;
84+
gopls = pkgs.gopls.override {
85+
buildGoLatestModule = pkgs.buildGo124Module;
6986
};
7087
})
7188

@@ -125,7 +142,7 @@ let
125142
nodejs = pkgs.nodejs_20;
126143
})
127144
(import ./vue {
128-
nodejs = pkgs.nodejs_18;
145+
nodejs = pkgs-24_11.nodejs-18_x;
129146
})
130147
(import ./web)
131148
(import ./hermit)

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1+
{ nodejs }:
12
{ pkgs, lib, ... }:
23
let
3-
nodejs = pkgs.nodejs-18_x;
4-
54
nodeVersion = lib.versions.major nodejs.version;
65

76
prybar = pkgs.prybar.prybar-nodejs;

pkgs/modules/pyright-extended/default.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
{ nodejs }:
12
{ pkgs, lib, ... }:
23
let
3-
pyright-extended = pkgs.callPackage ../../pyright-extended { };
4+
pyright-extended = pkgs.callPackage ../../pyright-extended {
5+
nodejs = nodejs;
6+
};
47
in
58
{
69
id = "pyright-extended";

pkgs/modules/python/default.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ python, pypkgs }:
2-
{ pkgs-unstable, pkgs-23_05, lib, ... }:
2+
{ pkgs-unstable, pkgs-24_11, pkgs-23_05, lib, ... }:
33
let
44
pythonVersion = lib.versions.majorMinor python.version;
55

@@ -86,6 +86,7 @@ let
8686
};
8787

8888
pyright-extended = pkgs.callPackage ../../pyright-extended {
89+
nodejs = pkgs-24_11.nodejs-18_x;
8990
yapf = pypkgs.yapf;
9091
};
9192

pkgs/pyright-extended/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ pkgs, lib, yapf, ... }:
1+
{ pkgs, lib, yapf, nodejs, ... }:
22
let
33
version = "2.0.13";
44
in
@@ -14,7 +14,7 @@ pkgs.stdenvNoCC.mkDerivation rec {
1414
binPath = lib.makeBinPath [
1515
pkgs.ruff
1616
yapf
17-
pkgs.nodejs_18
17+
nodejs
1818
];
1919

2020
nativeBuildInputs = [

pkgs/stderred/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage {
1313
name = "stderred";
1414
};
1515

16-
cargoSha256 = "sha256-Fc5ZP/ARqcNdwU5t/xarhsEglbYCNo2XVsJjdHT+/DA=";
16+
cargoHash = "sha256-Fc5ZP/ARqcNdwU5t/xarhsEglbYCNo2XVsJjdHT+/DA=";
1717

1818
nativeBuildInputs = [ makeWrapper ];
1919

pkgs/upgrade-map/default.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@ let
1515
"dart-3.2" = "dart-3.3";
1616
"dart-3.3" = "dart-3.4";
1717
"dart-3.4" = "dart-3.5";
18+
"dart-3.5" = "dart-3.8";
1819
"elixir-1_16" = "elixir-1_17";
20+
"elixir-1_17" = "elixir-1_18";
1921
"go" = "go-1.19";
2022
"r-4.3" = "r-4.4";
23+
"r-4.4" = "r-4.5";
2124
"rust" = "rust-1.69";
2225
"rust-1.69" = "rust-1.70";
2326
"rust-1.70" = "rust-1.72";

0 commit comments

Comments
 (0)