raito/shared-public-infra
0
1
Fork 3
Code Issues Pull requests 1 Packages Projects Releases Wiki Activity

chore: update lix

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

15
flake.lock
View file

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

32
flake.nix
View file

@ -4,7 +4,7 @@
# To update all inputs: # To update all inputs:
# $ nix flake update --recreate-lock-file # $ nix flake update --recreate-lock-file
inputs = { 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"; lix.inputs.nixpkgs.follows = "nixpkgs";
disko.url = "github:nix-community/disko"; disko.url = "github:nix-community/disko";
@ -43,20 +43,27 @@
}; };
outputs = outputs =
{ flake-parts {
, ... flake-parts,
...
}@inputs: }@inputs:
(flake-parts.lib.evalFlakeModule (flake-parts.lib.evalFlakeModule { inherit inputs; } (
{ inherit inputs; } { self, inputs, ... }:
({ self, inputs, ... }: { {
systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; systems = [
"x86_64-linux"
"aarch64-linux"
"aarch64-darwin"
];
imports = [ imports = [
./configurations.nix ./configurations.nix
# ./modules/monitoring/flake-module.nix # ./modules/monitoring/flake-module.nix
# ./pkgs/flake-module.nix # ./pkgs/flake-module.nix
# ./templates # ./templates
]; ];
perSystem = { self', pkgs, ... }: { perSystem =
{ self', pkgs, ... }:
{
devShells.default = pkgs.mkShellNoCC { devShells.default = pkgs.mkShellNoCC {
buildInputs = [ buildInputs = [
pkgs.ipmitool pkgs.ipmitool
@ -101,10 +108,15 @@
}; };
}; };
flake = { 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; devShells = self.devShells.x86_64-linux.default;
}; };
}; };
})).config.flake; }
)).config.flake;
} }