sercanto/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

flake-parts: switch to new preferred style of importing

Browse source
This commit is contained in:
Jörg Thalheim 2022-12-19 15:03:55 +01:00
parent 287c9fff17
commit 3f1b6b3222
2 changed files with 12 additions and 16 deletions

12
flake.lock generated
View file

@ -23,11 +23,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1670441596, "lastModified": 1671322946,
"narHash": "sha256-+T487QnluBT5F9tVk0chG/zzv+9zzTrx3o7rlOBK7ps=", "narHash": "sha256-J8Qj+ITV+eti+irTK9Zn2LZVYoIW2g7irPUckU8yZvU=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "8d0e2444ab05f79df93b70e5e497f8c708eb6b9b", "rev": "3f7172646953bf86dad5953bc45f0edae62ac445",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,11 +60,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1671149032, "lastModified": 1671442489,
"narHash": "sha256-BP8mspP2oJqIm9zHj1EHSolkOWg9+jqIm2R/fUWQq28=", "narHash": "sha256-pSCuSrG+XxWCs5IZ90eKIxDIZy4rM22YSFMRZ/fiixc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "34274e6c8604be2d103606b11dae0ac2e3a0d584", "rev": "ff07b107adeda2164b29f8feb4a86ed012854dfb",
"type": "github" "type": "github"
}, },
"original": { "original": {

16
flake.nix
View file

@ -24,13 +24,9 @@
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
}; };
outputs = { outputs = inputs @ {flake-parts, ...}:
self,
flake-parts,
...
}:
flake-parts.lib.mkFlake flake-parts.lib.mkFlake
{inherit self;} {inherit inputs;}
{ {
systems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"]; systems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
@ -44,10 +40,10 @@
}; };
}; };
flake.nixosConfigurations = let flake.nixosConfigurations = let
inherit (self.inputs.nixpkgs.lib) nixosSystem; inherit (inputs.nixpkgs.lib) nixosSystem;
common = [ common = [
self.inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
{ _module.args.inputs = self.inputs; } { _module.args.inputs = inputs; }
]; ];
in { in {
"build01.nix-community.org" = nixosSystem { "build01.nix-community.org" = nixosSystem {
@ -66,7 +62,7 @@
++ [ ++ [
(import ./build02/nixpkgs-update.nix { (import ./build02/nixpkgs-update.nix {
inherit inherit
(self.inputs) (inputs)
nixpkgs-update nixpkgs-update
nixpkgs-update-github-releases nixpkgs-update-github-releases
nixpkgs-update-pypi-releases nixpkgs-update-pypi-releases