Merge pull request 'chore(deps): update nixpkgs digest to d19cf9d' (#3273) from renovate/nixpkgs-digest into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3273
This commit is contained in:
@@ -18,16 +18,6 @@ let
|
|||||||
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:
|
|
||||||
# vm-test-run-test-installation> installer # error: sized: unexpected end-of-file
|
|
||||||
# vm-test-run-test-installation> installer # error: unexpected end-of-file
|
|
||||||
# This seems to be fixed with 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
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
@@ -49,7 +39,6 @@ let
|
|||||||
# both installer and target need to use the same diskImage
|
# both installer and target need to use the same diskImage
|
||||||
virtualisation.diskImage = "./target.qcow2";
|
virtualisation.diskImage = "./target.qcow2";
|
||||||
virtualisation.memorySize = 3048;
|
virtualisation.memorySize = 3048;
|
||||||
nix.package = nixPackage;
|
|
||||||
nix.settings = {
|
nix.settings = {
|
||||||
substituters = lib.mkForce [ ];
|
substituters = lib.mkForce [ ];
|
||||||
hashed-mirrors = null;
|
hashed-mirrors = null;
|
||||||
|
|||||||
6
flake.lock
generated
6
flake.lock
generated
@@ -107,10 +107,10 @@
|
|||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 315532800,
|
"lastModified": 315532800,
|
||||||
"narHash": "sha256-ItICEnpINZw5JS7D3OS8Yl7fjJsJK/xSIQKdLPEYWDU=",
|
"narHash": "sha256-G1wiMQR6wAFxbIb/Gyh9W9Y5BSXOo0C4C5B8iui/kNo=",
|
||||||
"rev": "b2b0718004cc9a5bca610326de0a82e6ea75920b",
|
"rev": "d19cf9dfc633816a437204555afeb9e722386b76",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre780817.b2b0718004cc/nixexprs.tar.xz"
|
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre781834.d19cf9dfc633/nixexprs.tar.xz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
|||||||
@@ -166,14 +166,7 @@ pythonRuntime.pkgs.buildPythonApplication {
|
|||||||
buildInputs = [
|
buildInputs = [
|
||||||
pkgs.bash
|
pkgs.bash
|
||||||
pkgs.coreutils
|
pkgs.coreutils
|
||||||
# looks like Nix 2.26 fixes the profile creation race condition we were running into on Nix 2.24
|
pkgs.nix
|
||||||
# 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 = [
|
||||||
|
|||||||
Reference in New Issue
Block a user