Skip to content

Commit b3ee962

Browse files
authored
Update to nixpkgs-25.05 and use that in tests consistently (#4)
1 parent c722623 commit b3ee962

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

flake.lock

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

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05-small";
2+
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
33
inputs.flake-utils.url = "github:numtide/flake-utils";
44
inputs.cradle = {
55
url = "github:garnix-io/cradle";

spec/IntegrationSpec.hs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ spec = around_ inTempDirectory $ do
3434
(workingDir ctx </> "flake.nix")
3535
[i|
3636
{
37-
inputs.nixpkgs.url = "github:nixos/nixpkgs/2f913f37ac91d3dda25c9259f17dbedcf908a157";
37+
inputs.nixpkgs.url = "github:nixos/nixpkgs/#{nixpkgs2505Commit}";
3838
outputs = { nixpkgs, ... }: {
3939
nixosConfigurations.a = (nixpkgs.lib.nixosSystem {
4040
modules = [
4141
{
4242
networking.hostName = "a";
4343
nixpkgs.hostPlatform = "x86_64-linux";
44-
system.stateVersion = "24.11";
44+
system.stateVersion = "25.05";
4545
}
4646
];
4747
});
@@ -50,7 +50,7 @@ spec = around_ inTempDirectory $ do
5050
{
5151
networking.hostName = "b";
5252
nixpkgs.hostPlatform = "x86_64-linux";
53-
system.stateVersion = "24.11";
53+
system.stateVersion = "25.05";
5454
}
5555
];
5656
});
@@ -59,7 +59,7 @@ spec = around_ inTempDirectory $ do
5959
{
6060
networking.hostName = "c";
6161
nixpkgs.hostPlatform = "x86_64-linux";
62-
system.stateVersion = "24.11";
62+
system.stateVersion = "25.05";
6363
}
6464
];
6565
});
@@ -117,22 +117,22 @@ spec = around_ inTempDirectory $ do
117117
_ <- assertSuccess $ test ctx ["start", "server"]
118118
B.hPutStr ctx.stdin "echo foo\nexit\n"
119119
hSeek ctx.stdin AbsoluteSeek 0
120-
(stdout <$> assertSuccess (test ctx ["ssh", "server"])) `shouldReturn` "foo\n"
120+
(stdout <$> assertSuccess (test ctx ["ssh", "server"])) `shouldReturn` "foo\n\ESC]0;\a"
121121

122122
it "can start multiple vms" $ do
123123
withContext $ \ctx -> do
124124
writeFile
125125
(workingDir ctx </> "flake.nix")
126126
[i|
127127
{
128-
inputs.nixpkgs.url = "github:nixos/nixpkgs/2f913f37ac91d3dda25c9259f17dbedcf908a157";
128+
inputs.nixpkgs.url = "github:nixos/nixpkgs/#{nixpkgs2505Commit}";
129129
outputs = { nixpkgs, ... }: {
130130
nixosConfigurations.a = (nixpkgs.lib.nixosSystem {
131131
modules = [
132132
{
133133
networking.hostName = "a";
134134
nixpkgs.hostPlatform = "x86_64-linux";
135-
system.stateVersion = "24.11";
135+
system.stateVersion = "25.05";
136136
}
137137
];
138138
});
@@ -141,7 +141,7 @@ spec = around_ inTempDirectory $ do
141141
{
142142
networking.hostName = "b";
143143
nixpkgs.hostPlatform = "x86_64-linux";
144-
system.stateVersion = "24.11";
144+
system.stateVersion = "25.05";
145145
}
146146
];
147147
});
@@ -192,14 +192,14 @@ writeStandardFlake ctx addedModule = do
192192
cs
193193
[i|
194194
{
195-
inputs.nixpkgs.url = "github:nixos/nixpkgs/2f913f37ac91d3dda25c9259f17dbedcf908a157";
195+
inputs.nixpkgs.url = "github:nixos/nixpkgs/#{nixpkgs2505Commit}";
196196
outputs = { nixpkgs, ... }: {
197197
nixosConfigurations.server = (nixpkgs.lib.nixosSystem {
198198
modules = [
199199
{
200200
networking.hostName = "server";
201201
nixpkgs.hostPlatform = "x86_64-linux";
202-
system.stateVersion = "24.11";
202+
system.stateVersion = "25.05";
203203
}
204204
(#{fromMaybe emptyModule addedModule})
205205
];
@@ -208,3 +208,6 @@ writeStandardFlake ctx addedModule = do
208208
}
209209
|]
210210
T.writeFile (ctx.workingDir </> "flake.nix") flake
211+
212+
nixpkgs2505Commit :: Text
213+
nixpkgs2505Commit = "3ff0e34b1383648053bba8ed03f201d3466f90c9"

0 commit comments

Comments
 (0)