`edc907b3856e`

4 files changed

modifiedflake.lockdiff before after both

--- a/flake.lock
+++ b/flake.lock
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1632011270,
-        "narHash": "sha256-UyEYSWTKB3boKu5JX/TrQtnAgaYvfSWT61VU8ZT1juk=",
+        "lastModified": 1633629671,
+        "narHash": "sha256-1IItATjckflBBAFDm9C0v/pg9b9BvKMj0mT/NDKZkJE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7f59b4b5295b58659064a91d0bcc8e8a11d0b351",
+        "rev": "471980fd33961a6b893041774a9633811d03354f",
         "type": "github"
       },
       "original": {
@@ -41,11 +41,11 @@
     "rust-overlay": {
       "flake": false,
       "locked": {
-        "lastModified": 1631758650,
-        "narHash": "sha256-7OAtO2V8omtPaoFBASTfPA5m8MzN5LX8agk0k5p8dH0=",
+        "lastModified": 1633573101,
+        "narHash": "sha256-h9NFLA4VLYfa5Cjkwkbq/8N0/wy9bJ7xiIeLE9bjh4g=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "4e79ebf67452cca4ae938180728f9f513e828d5b",
+        "rev": "3131abe7900b142eca189806f51fcc3c475ed072",
         "type": "github"
       },
       "original": {

modifiedflake.nixdiff before after both

--- a/flake.nix
+++ b/flake.nix
@@ -24,6 +24,7 @@
           rust
           cargo-edit
           cargo-udeps
+          cargo-fuzz
 
           pkgconfig
           openssl

modifiedlib/default.nixdiff before after both

1{2  fleetConfiguration = { data, nixpkgs, hosts, ... }@allConfig:3    let4      config = builtins.removeAttrs allConfig [ "nixpkgs" "data" ];5    in6    rec {7      root = nixpkgs.lib.evalModules {8        modules = (import ../modules/fleet/_modules.nix) ++ [ config data ];9        specialArgs = {10          inherit nixpkgs;11          fleet = import ./fleetLib.nix {12            inherit nixpkgs hosts;13          };14        };15      };16      configuredHosts = root.config.hosts;17      configuredSecrets = root.config.secrets;18      configuredSystems = nixpkgs.lib.listToAttrs (19        map20          (21            name: {22              inherit name; value = nixpkgs.lib.nixosSystem {23              system = configuredHosts.${name}.system;24              modules = configuredHosts.${name}.modules;25            };26            }27          )28          (builtins.attrNames root.config.hosts)29      ); #nixpkgs.lib.nixosSystem {}30    };31}

modifiedmodules/fleet/secrets.nixdiff before after both

--- a/modules/fleet/secrets.nix
+++ b/modules/fleet/secrets.nix
@@ -78,7 +78,7 @@
           {
             secrets = (mapAttrs cleanupSecret
               (filterAttrs (_: v: builtins.elem host v.owners) config.sharedSecrets)
-            ) // (mapAttrs cleanupSecret (if config.hostSecrets ? host then config.hostSecrets.${host} else {}));
+            ) // (mapAttrs cleanupSecret (config.hostSecrets.${host} or {}));
           }
         ];
     });