yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'checks: use pkgs.nixVersions.latest until pkgs.nix is 2.26+' (#3076) from push-vswxxyynxtmz into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3076
This commit is contained in:
Michael Hoang
2025-03-20 07:01:57 +00:00
parent d5e4d96fee 62d9a325a2
commit 6ffbb43cb2
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
checks/installation-without-system/flake-module.nix
View File

@@ -117,11 +117,16 @@
pkgs.bubblewrap pkgs.bubblewrap
] ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs); ] ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
closureInfo = pkgs.closureInfo { rootPaths = dependencies; }; closureInfo = pkgs.closureInfo { rootPaths = dependencies; };
# with nix 2.24 we get: # with Nix 2.24 we get:
# vm-test-run-test-installation> client # error: sized: unexpected end-of-file # vm-test-run-test-installation> client # error: sized: unexpected end-of-file
# vm-test-run-test-installation> client # error: unexpected end-of-file # vm-test-run-test-installation> client # error: unexpected end-of-file
# This seems to be fixed with nix 2.26 # This seems to be fixed with Nix 2.26
nixPackage = pkgs.nixVersions.nix_2_26; # Remove this line once `pkgs.nix` is 2.26+
nixPackage =
assert
lib.versionOlder pkgs.nix.version "2.26"
&& lib.versionAtLeast pkgs.nixVersions.latest.version "2.26";
pkgs.nixVersions.latest;
in in
{ {
# On aarch64-linux, hangs on reboot with after installation: # On aarch64-linux, hangs on reboot with after installation:

11
checks/installation/flake-module.nix
View File

@@ -99,11 +99,16 @@
] ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs); ] ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
closureInfo = pkgs.closureInfo { rootPaths = dependencies; }; closureInfo = pkgs.closureInfo { rootPaths = dependencies; };
# with nix 2.24 we get: # with Nix 2.24 we get:
# vm-test-run-test-installation> client # error: sized: unexpected end-of-file # vm-test-run-test-installation> client # error: sized: unexpected end-of-file
# vm-test-run-test-installation> client # error: unexpected end-of-file # vm-test-run-test-installation> client # error: unexpected end-of-file
# This seems to be fixed with nix 2.26 # This seems to be fixed with Nix 2.26
nixPackage = pkgs.nixVersions.nix_2_26; # Remove this line once `pkgs.nix` is 2.26+
nixPackage =
assert
lib.versionOlder pkgs.nix.version "2.26"
&& lib.versionAtLeast pkgs.nixVersions.latest.version "2.26";
pkgs.nixVersions.latest;
in in
{ {
# On aarch64-linux, hangs on reboot with after installation: # On aarch64-linux, hangs on reboot with after installation:

10
pkgs/clan-cli/default.nix
View File

@@ -166,8 +166,14 @@ pythonRuntime.pkgs.buildPythonApplication {
buildInputs = [ buildInputs = [
pkgs.bash pkgs.bash
pkgs.coreutils pkgs.coreutils
# Use newer nix versions to get more insights on profile creation race condition # looks like Nix 2.26 fixes the profile creation race condition we were running into on Nix 2.24
nixVersions.nix_2_26 # Switch this back to `pkgs.nix` when `pkgs.nix` is Nix 2.26+
(
assert
lib.versionOlder pkgs.nix.version "2.26"
&& lib.versionAtLeast pkgs.nixVersions.latest.version "2.26";
pkgs.nixVersions.latest
)
]; ];
closureInfo = pkgs.closureInfo { closureInfo = pkgs.closureInfo {
rootPaths = [ rootPaths = [