git.delta.rocks / jrsonnet / refs/commits / b56a5a338d1e

difftreelog

ci add flake outputs formatter, schemas

Yaroslav Bolyukin2024-06-03parent: #7c29776.patch.diff
in: trunk

4 files changed

modifiedflake.nixdiffbeforeafterboth
36 craneLib = crane.mkLib pkgs;36 craneLib = crane.mkLib pkgs;
37 };37 };
38 };38 };
39 # To be used with https://github.com/NixOS/nix/pull/8892
40 schemas = {
41 fleetConfigurations = {
42 version = 1;
43 doc = ''
44 The `fleetConfigurations` flake output defines fleet cluster configurations.
45 '';
46 inventory = output: {
47 children =
48 builtins.mapAttrs (configName: cluster: {
49 what = "fleet cluster configuration";
50
51 children =
52 builtins.mapAttrs (hostName: host: {
53 what = "host [${host.system}]";
54 })
55 cluster.config.hosts;
56 # It is possible to implement this inventory right now, but I want to
57 # get rid of `fleet.nix` file in the future.
58 # children.secrets = { };
59 })
60 output;
61 };
62 };
63 };
39 };64 };
40 # Supported and tested list of deployment targets.65 # Supported and tested list of deployment targets.
41 systems = ["x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux"];66 systems = ["x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux"];
108 # `fleet` crate wants nightly rust, also little sense of supporting it on stable nixpkgs.133 # `fleet` crate wants nightly rust, also little sense of supporting it on stable nixpkgs.
109 (prefixAttrs "nixpkgs-" (removeAttrs packages ["fleet"]))134 (prefixAttrs "nixpkgs-" (removeAttrs packages ["fleet"]))
110 // (prefixAttrs "nixpkgs-stable-" (removeAttrs packages-with-nixpkgs-stable ["fleet"]));135 // (prefixAttrs "nixpkgs-stable-" (removeAttrs packages-with-nixpkgs-stable ["fleet"]));
136 formatter = pkgs.alejandra;
111 };137 };
112 };138 };
113}139}
modifiedlib/default.nixdiffbeforeafterboth
1{1{fleetPkgsForPkgs}: {
2 fleetPkgsForPkgs,
3}: {
4 fleetConfiguration = {2 fleetConfiguration = {
5 # TODO: Provide by fleet, instead of requesting user to provide it.3 # TODO: Provide by fleet, instead of requesting user to provide it.
modifiedmodules/fleet/assertions.nixdiffbeforeafterboth

no syntactic changes

modifiedpkgs/generator-helper.nixdiffbeforeafterboth
87
9 cargoExtraArgs = "--locked -p ${pname}";8 cargoExtraArgs = "--locked -p ${pname}";
109
11 postInstall = ''10 postInstall = ''
12 mv bin/${pname} bin/genhelper11 mv bin/${pname} bin/genhelper
13 '';12 '';
14}13}
1514