flake: add flake-parts without moving attributes

This commit adds flake-parts and does minimal enabling without moving
any of the attributes into their "proper" locations yet.
This commit is contained in:
Julian Stecklina 2023-01-07 11:09:35 +01:00
parent b3bef69365
commit e7ec7ceefd
2 changed files with 166 additions and 114 deletions

View File

@ -59,6 +59,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1673047662,
"narHash": "sha256-dXYxH/0Ea5oQSkGAWWNy7HzmFutguycDGn2dt6lTYRQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "aa1f6ca773b6e740037ebfb35f7010e0c3960638",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
@ -90,6 +108,24 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1672350804,
"narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-test": { "nixpkgs-test": {
"locked": { "locked": {
"lastModified": 1671812130, "lastModified": 1671812130,
@ -110,6 +146,7 @@
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-parts": "flake-parts",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-test": "nixpkgs-test", "nixpkgs-test": "nixpkgs-test",

View File

@ -5,6 +5,12 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
nixpkgs-test.url = "github:RaitoBezarius/nixpkgs/simplified-qemu-boot-disks"; nixpkgs-test.url = "github:RaitoBezarius/nixpkgs/simplified-qemu-boot-disks";
flake-parts.url = "github:hercules-ci/flake-parts";
# We only have this input to pass it to other dependencies and
# avoid having mulitple versions in our dependencies.
flake-utils.url = "github:numtide/flake-utils";
crane = { crane = {
url = "github:ipetkov/crane"; url = "github:ipetkov/crane";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -22,11 +28,11 @@
url = "github:edolstra/flake-compat"; url = "github:edolstra/flake-compat";
flake = false; flake = false;
}; };
flake-utils.url = "github:numtide/flake-utils";
}; };
outputs = { self, nixpkgs, nixpkgs-test, crane, rust-overlay, ... }: outputs = inputs@{ self, nixpkgs, nixpkgs-test, crane, rust-overlay, flake-parts, ... }:
let flake-parts.lib.mkFlake { inherit inputs; } {
flake = let
pkgs = import nixpkgs { pkgs = import nixpkgs {
system = "x86_64-linux"; system = "x86_64-linux";
overlays = [ overlays = [
@ -153,4 +159,13 @@
lanzabooteModule = self.nixosModules.lanzaboote; lanzabooteModule = self.nixosModules.lanzaboote;
}); });
}; };
systems = [
"x86_64-linux"
];
perSystem = { config, ... }: {
# Nothing here yet.
};
};
} }