chore: update lix

This commit is contained in:
Julien Malka 2024-10-12 20:22:06 +02:00
parent 2b0bd95587
commit e018572545
No known key found for this signature in database
GPG key ID: 6FC74C847011FD83
2 changed files with 72 additions and 61 deletions

View file

@ -298,18 +298,17 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1727301466,
"narHash": "sha256-357IEOtI+QZy9NzmKhU0vAS7aY528Uvh2n/gXQFgRpY=",
"ref": "refs/changes/46/1946/1",
"rev": "2c74949780830b5cfcd913ef24514dc8e7db5f14",
"revCount": 16269,
"lastModified": 1728506278,
"narHash": "sha256-ZAPqzjR86En31Yfau0auQmkDuyzr2QfD8yW+7205e8A=",
"ref": "refs/heads/main",
"rev": "9865ebaaa618d82a7b7fdccc636cbaa7dfa42427",
"revCount": 16335,
"type": "git",
"url": "https://gerrit.lix.systems/lix"
"url": "https://git.lix.systems/lix-project/lix.git"
},
"original": {
"ref": "refs/changes/46/1946/1",
"type": "git",
"url": "https://gerrit.lix.systems/lix"
"url": "https://git.lix.systems/lix-project/lix.git"
}
},
"nix2container": {

View file

@ -4,7 +4,7 @@
# To update all inputs:
# $ nix flake update --recreate-lock-file
inputs = {
lix.url = "git+https://gerrit.lix.systems/lix?ref=refs/changes/46/1946/1";
lix.url = "git+https://git.lix.systems/lix-project/lix.git";
lix.inputs.nixpkgs.follows = "nixpkgs";
disko.url = "github:nix-community/disko";
@ -43,20 +43,27 @@
};
outputs =
{ flake-parts
, ...
{
flake-parts,
...
}@inputs:
(flake-parts.lib.evalFlakeModule
{ inherit inputs; }
({ self, inputs, ... }: {
systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ];
(flake-parts.lib.evalFlakeModule { inherit inputs; } (
{ self, inputs, ... }:
{
systems = [
"x86_64-linux"
"aarch64-linux"
"aarch64-darwin"
];
imports = [
./configurations.nix
# ./modules/monitoring/flake-module.nix
# ./pkgs/flake-module.nix
# ./templates
];
perSystem = { self', pkgs, ... }: {
perSystem =
{ self', pkgs, ... }:
{
devShells.default = pkgs.mkShellNoCC {
buildInputs = [
pkgs.ipmitool
@ -101,10 +108,15 @@
};
};
flake = {
hydraJobs = inputs.nixpkgs.lib.mapAttrs' (name: config: inputs.nixpkgs.lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel) self.nixosConfigurations // {
hydraJobs =
inputs.nixpkgs.lib.mapAttrs' (
name: config: inputs.nixpkgs.lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel
) self.nixosConfigurations
// {
devShells = self.devShells.x86_64-linux.default;
};
};
})).config.flake;
}
)).config.flake;
}