`35053409e3f1`

16 files changed

modifiedCargo.tomldiff before after both

2members = ["crates/*", "cmds/*"]2members = ["crates/*", "cmds/*"]
3resolver = "2"3resolver = "2"
4package.version = "0.1.0"4package.version = "0.1.0"
5package.edition = "2021"
6package.rust-version = "1.82.0"
57
6[workspace.dependencies]8[workspace.dependencies]
7nixlike = { path = "./crates/nixlike" }9nixlike = { path = "./crates/nixlike" }

modifiedcmds/fleet/Cargo.tomldiff before after both

3description = "NixOS configuration management"3description = "NixOS configuration management"
4version = "0.2.0"4version = "0.2.0"
5authors = ["Yaroslav Bolyukin <iam@lach.pw>"]5authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
6edition = "2021"6edition.workspace = true
7rust-version.workspace = true
78
8[dependencies]9[dependencies]
9nixlike.workspace = true10nixlike.workspace = true

modifiedcmds/generator-helper/Cargo.tomldiff before after both

1[package]1[package]
2name = "fleet-generator-helper"2name = "fleet-generator-helper"
3version.workspace = true
3edition = "2021"4edition.workspace = true
4version.workspace = true5rust-version.workspace = true
56
6[dependencies]7[dependencies]
7age.workspace = true8age.workspace = true

modifiedcmds/generator-helper/src/main.rsdiff before after both

234			let recipients = load_identities()?;234			let recipients = load_identities()?;
235			write_private(&recipients, &output, stdin(), encoding)?;235			write_private(&recipients, &output, stdin(), encoding)?;
236		}236		}
237		Opts::Generate(gen) => {237		Opts::Generate(generate) => {
238			match gen {238			match generate {
239				Generate::Ed25519 {239				Generate::Ed25519 {
240					public,240					public,
241					private,241					private,

modifiedcmds/install-secrets/Cargo.tomldiff before after both

1[package]1[package]
2name = "fleet-install-secrets"2name = "fleet-install-secrets"
3version = "0.1.0"3version = "0.1.0"
4edition = "2021"4edition.workspace = true
5rust-version = "1.77.2"5rust-version.workspace = true
66
7[dependencies]7[dependencies]
8clap.workspace = true8clap.workspace = true

modifiedcmds/terraform-provider-fleet/Cargo.tomldiff before after both

1[package]1[package]
2name = "terraform-provider-fleet"2name = "terraform-provider-fleet"
3version.workspace = true
3edition = "2021"4edition.workspace = true
4version.workspace = true5rust-version.workspace = true
56
6[dependencies]7[dependencies]
7anyhow.workspace = true8anyhow.workspace = true

modifiedcrates/better-command/Cargo.tomldiff before after both

1[package]1[package]
2name = "better-command"2name = "better-command"
3version = "0.1.0"3version = "0.1.0"
4edition = "2021"4edition.workspace = true
5rust-version.workspace = true
56
6[dependencies]7[dependencies]
7regex = "1.10"8regex = "1.10"

modifiedcrates/fleet-base/Cargo.tomldiff before after both

1[package]1[package]
2name = "fleet-base"2name = "fleet-base"
3version.workspace = true
3edition = "2021"4edition.workspace = true
4version.workspace = true5rust-version.workspace = true
56
6[dependencies]7[dependencies]
7age.workspace = true8age.workspace = true

modifiedcrates/fleet-shared/Cargo.tomldiff before after both

1[package]1[package]
2name = "fleet-shared"2name = "fleet-shared"
3version.workspace = true
3edition = "2021"4edition.workspace = true
4version.workspace = true5rust-version.workspace = true
56
6[dependencies]7[dependencies]
7base64 = "0.22.1"8base64 = "0.22.1"

modifiedcrates/nix-eval/Cargo.tomldiff before after both

1[package]1[package]
2name = "nix-eval"2name = "nix-eval"
3edition = "2021"
4version.workspace = true3version.workspace = true
5build = "build.rs"4build = "build.rs"
5edition.workspace = true
6rust-version.workspace = true
67
7[dependencies]8[dependencies]
8anyhow.workspace = true9anyhow.workspace = true

modifiedcrates/nix-native-eval/Cargo.tomldiff before after both

1[package]1[package]
2name = "nix-native-eval"2name = "nix-native-eval"
3version.workspace = true
3edition = "2021"4edition.workspace = true
4version.workspace = true5rust-version.workspace = true
56
6[dependencies]7[dependencies]
7anyhow.workspace = true8anyhow.workspace = true

modifiedcrates/nixlike/Cargo.tomldiff before after both

1[package]1[package]
2name = "nixlike"2name = "nixlike"
3version = "0.1.0"3version = "0.1.0"
4edition = "2021"4edition.workspace = true
5rust-version.workspace = true
56
6[dependencies]7[dependencies]
7thiserror.workspace = true8thiserror.workspace = true

modifiedflake.lockdiff before after both

2  "nodes": {2  "nodes": {
3    "crane": {3    "crane": {
4      "locked": {4      "locked": {
5        "lastModified": 1731098351,5        "lastModified": 1739936662,
6        "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=",6        "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=",
7        "owner": "ipetkov",7        "owner": "ipetkov",
8        "repo": "crane",8        "repo": "crane",
9        "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28",9        "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7",
10        "type": "github"10        "type": "github"
11      },11      },
12      "original": {12      "original": {
22        ]22        ]
23      },23      },
24      "locked": {24      "locked": {
25        "lastModified": 1730504689,25        "lastModified": 1738453229,
26        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",26        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
27        "owner": "hercules-ci",27        "owner": "hercules-ci",
28        "repo": "flake-parts",28        "repo": "flake-parts",
29        "rev": "506278e768c2a08bec68eb62932193e341f55c90",29        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
30        "type": "github"30        "type": "github"
31      },31      },
32      "original": {32      "original": {
37    },37    },
38    "nixpkgs": {38    "nixpkgs": {
39      "locked": {39      "locked": {
40        "lastModified": 1731873344,40        "lastModified": 1740339700,
41        "narHash": "sha256-bKfFggwcvvh9gmOsaMCXKVAGBfXCZZ6QrxLq9Nb1/vw=",41        "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=",
42        "owner": "nixos",42        "owner": "nixos",
43        "repo": "nixpkgs",43        "repo": "nixpkgs",
44        "rev": "39e98fadd66c2564ac85b1f65bab89e044302c62",44        "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195",
45        "type": "github"45        "type": "github"
46      },46      },
47      "original": {47      "original": {
48        "owner": "nixos",48        "owner": "nixos",
49        "ref": "master",49        "ref": "release-24.11",
50        "repo": "nixpkgs",50        "repo": "nixpkgs",
51        "type": "github"51        "type": "github"
52      }52      }
56        "crane": "crane",56        "crane": "crane",
57        "flake-parts": "flake-parts",57        "flake-parts": "flake-parts",
58        "nixpkgs": "nixpkgs",58        "nixpkgs": "nixpkgs",
59        "rust-overlay": "rust-overlay"59        "rust-overlay": "rust-overlay",
60        "shelly": "shelly"
60      }61      }
61    },62    },
62    "rust-overlay": {63    "rust-overlay": {
66        ]67        ]
67      },68      },
68      "locked": {69      "locked": {
69        "lastModified": 1731820690,70        "lastModified": 1740277845,
70        "narHash": "sha256-/hHFMTD+FGURXZ4JtfXoIgpy87zL505pVi6AL76Wc+U=",71        "narHash": "sha256-NNU0CdiaSbAeZ8tpDG4aFi9qtcdlItRvk8Xns9oBrVU=",
71        "owner": "oxalica",72        "owner": "oxalica",
72        "repo": "rust-overlay",73        "repo": "rust-overlay",
73        "rev": "bbab2ab9e1932133b1996baa1dc00fefe924ca81",74        "rev": "f933070c29f9c1c5457447a51903f27f76ebb519",
74        "type": "github"75        "type": "github"
75      },76      },
76      "original": {77      "original": {
77        "owner": "oxalica",78        "owner": "oxalica",
78        "repo": "rust-overlay",79        "repo": "rust-overlay",
79        "type": "github"80        "type": "github"
80      }81      }
81    }82    },
83    "shelly": {
84      "locked": {
85        "lastModified": 1737089050,
86        "narHash": "sha256-SQ22z9L7fSC8FWNIlImpKeBGBUPoWpsTy9uc75o7uK0=",
87        "owner": "CertainLach",
88        "repo": "shelly",
89        "rev": "b5fa6bb56dcd1541ec399ceab1e95a74872ecd34",
90        "type": "github"
91      },
92      "original": {
93        "owner": "CertainLach",
94        "repo": "shelly",
95        "type": "github"
96      }
97    }
82  },98  },
83  "root": "root",99  "root": "root",
84  "version": 7100  "version": 7

modifiedflake.nixdiff before after both

2  description = "NixOS configuration management";2  description = "NixOS configuration management";
33
4  inputs = {4  inputs = {
5    nixpkgs.url = "github:nixos/nixpkgs/master";5    nixpkgs.url = "github:nixos/nixpkgs/release-24.11";
6    rust-overlay = {6    rust-overlay = {
7      url = "github:oxalica/rust-overlay";7      url = "github:oxalica/rust-overlay";
8      inputs.nixpkgs.follows = "nixpkgs";8      inputs.nixpkgs.follows = "nixpkgs";
12      inputs.nixpkgs-lib.follows = "nixpkgs";12      inputs.nixpkgs-lib.follows = "nixpkgs";
13    };13    };
14    crane.url = "github:ipetkov/crane";14    crane.url = "github:ipetkov/crane";
15    shelly.url = "github:CertainLach/shelly";
15  };16  };
16  outputs = inputs:17  outputs =
18    inputs:
17    inputs.flake-parts.lib.mkFlake {19    inputs.flake-parts.lib.mkFlake
20      {
18      inherit inputs;21        inherit inputs;
19    } {22      }
23      {
24        imports = [ inputs.shelly.flakeModule ];
20      flake = rec {25        flake = rec {
21        lib =26          lib =
22          (import ./lib {27            (import ./lib {
45            {
39          fleetConfigurations = {46              fleetConfigurations = {
40            version = 1;47                version = 1;
41            doc = ''48                doc = ''
42              The `fleetConfigurations` flake output defines fleet cluster configurations.49                  The `fleetConfigurations` flake output defines fleet cluster configurations.
43            '';50                '';
44            inventory = output: {51                inventory = output: {
45              children =52                  children = mapAttrs (configName: cluster: {
46                mapAttrs (configName: cluster: {
95        # checks there build packages for default nixpkgs rustPlatform packages.111            # checks there build packages for default nixpkgs rustPlatform packages.
96        checks = let112            checks =
113              let
114                nixpkgsCraneLib = inputs.crane.mkLib pkgs;
97          packages = pkgs.callPackages ./pkgs {115                packages = pkgs.callPackages ./pkgs {
98            inherit craneLib;116                  craneLib = nixpkgsCraneLib;
99          };117                };
100          prefixAttrs = prefix: attrs:118                prefixAttrs =
119                  prefix: attrs:
106            })125                  }) attrs;
107            attrs;
108        in126              in
109          # `fleet` crate wants nightly rust, also little sense of supporting it on stable nixpkgs.127              # fleet-install-secrets is installed to remote systems, thus needs to work
128              # with rust in nixpkgs.
110          (prefixAttrs "nixpkgs-" (removeAttrs packages ["fleet"]));129              (prefixAttrs "nixpkgs-" {
130                inherit (packages) fleet-install-secrets;
131              });
111        # TODO: It should be possible to move lib.mkIf to default attribute, instead of disabling the whole132            # TODO: It should be possible to move lib.mkIf to default attribute, instead of disabling the whole
112        # devShells block, yet nix flake check fails here, due to no default shell found. It is nix or flake-parts bug?133            # devShells block, yet nix flake check fails here, due to no default shell found. It is nix or flake-parts bug?
113        devShells = lib.mkIf deployerSystem {134            shelly.shells.default = lib.mkIf deployerSystem {
114          default = craneLib.devShell {135              factory = craneLib.devShell;
115            packages = with pkgs; [136              packages = with pkgs; [
116              rust137                rust
117              alejandra138                alejandra
128              rustPlatform.bindgenHook149                rustPlatform.bindgenHook
129              nixVersions.nix_2_22150                nixVersions.nix_2_22
130            ];151              ];
131            env.PROTOC = "${pkgs.protobuf}/bin/protoc";152              environment.PROTOC = "${pkgs.protobuf}/bin/protoc";
132          };
133        };153            };
134        formatter = pkgs.alejandra;154            formatter = pkgs.alejandra;
135      };155          };

modifiedlib/flakePart.nixdiff before after both

65                      else data;65                      else data;
66                    nixpkgs.buildUsing = mkOptionDefault bootstrapNixpkgs;66                    nixpkgs.buildUsing = mkOptionDefault bootstrapNixpkgs;
67                    nixpkgs.overlays = [67                    nixpkgs.overlays = [
68                      (final: prev:68                      (final: prev: {
69                        import ../pkgs {69                        inherit (import ../pkgs {
70                          inherit (prev) callPackage;70                          inherit (prev) callPackage;
71                          craneLib = crane.mkLib prev;71                          craneLib = crane.mkLib prev;
72                        })72                        }) fleet-install-secrets;
73                      })
73                    ];74                    ];
74                  };75                  };
75                }76                }

modifiedrust-toolchain.tomldiff before after both

1[toolchain]1[toolchain]
2channel = "nightly-2024-11-12"2channel = "1.85.0"
3components = ["rustfmt", "clippy", "rust-analyzer", "rust-src"]3components = ["rustfmt", "clippy", "rust-analyzer", "rust-src"]
44