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": {

118
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,68 +43,80 @@
}; };
outputs = outputs =
{ flake-parts {
, ... flake-parts,
} @ inputs: ...
(flake-parts.lib.evalFlakeModule }@inputs:
{ inherit inputs; } (flake-parts.lib.evalFlakeModule { 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 =
devShells.default = pkgs.mkShellNoCC { { self', pkgs, ... }:
buildInputs = [ {
pkgs.ipmitool devShells.default = pkgs.mkShellNoCC {
pkgs.colmena buildInputs = [
pkgs.ipmitool
pkgs.colmena
pkgs.python3.pkgs.invoke pkgs.python3.pkgs.invoke
#Until nixos-anywhere is packaged #Until nixos-anywhere is packaged
pkgs.python3.pkgs.deploykit pkgs.python3.pkgs.deploykit
pkgs.mypy pkgs.mypy
pkgs.pixiecore pkgs.pixiecore
pkgs.dnsmasq pkgs.dnsmasq
pkgs.python3.pkgs.netaddr pkgs.python3.pkgs.netaddr
pkgs.qemu_kvm pkgs.qemu_kvm
pkgs.openssh pkgs.openssh
pkgs.gitMinimal # for git flakes pkgs.gitMinimal # for git flakes
pkgs.rsync pkgs.rsync
pkgs.nix pkgs.nix
pkgs.coreutils pkgs.coreutils
pkgs.curl # when uploading tarballs pkgs.curl # when uploading tarballs
pkgs.gnugrep pkgs.gnugrep
pkgs.findutils pkgs.findutils
pkgs.gnused # needed by ssh-copy-id pkgs.gnused # needed by ssh-copy-id
# sops dependencies # sops dependencies
pkgs.age pkgs.age
pkgs.yq-go pkgs.yq-go
] ++ pkgs.lib.optional (pkgs.stdenv.isLinux) pkgs.mkpasswd; ] ++ pkgs.lib.optional (pkgs.stdenv.isLinux) pkgs.mkpasswd;
}; };
packages = { packages = {
# netboot = pkgs.callPackage ./modules/netboot/netboot.nix { # netboot = pkgs.callPackage ./modules/netboot/netboot.nix {
# # this nixosSystem is built for x86_64 machines regardless of the host machine # # this nixosSystem is built for x86_64 machines regardless of the host machine
# pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; # pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
# inherit (inputs.nixpkgs.lib) nixosSystem; # inherit (inputs.nixpkgs.lib) nixosSystem;
# extraModules = [ # extraModules = [
# self.inputs.nur.nixosModules.nur # self.inputs.nur.nixosModules.nur
# { _module.args.inputs = self.inputs; } # { _module.args.inputs = self.inputs; }
# ]; # ];
# }; # };
# netboot-pixie-core = pkgs.callPackage ./modules/netboot/netboot-pixie-core.nix { # netboot-pixie-core = pkgs.callPackage ./modules/netboot/netboot-pixie-core.nix {
# inherit (self'.packages) netboot; # inherit (self'.packages) netboot;
# }; # };
};
}; };
};
flake = { flake = {
hydraJobs = inputs.nixpkgs.lib.mapAttrs' (name: config: inputs.nixpkgs.lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel) self.nixosConfigurations // { hydraJobs =
devShells = self.devShells.x86_64-linux.default; 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;
} }