difftreelog
build upgrade nixpkgs
in: trunk
4 files changed
flake.lockdiffbeforeafterboth17 },17 },18 "nixpkgs": {18 "nixpkgs": {19 "locked": {19 "locked": {20 "lastModified": 1632011270,20 "lastModified": 1633629671,21 "narHash": "sha256-UyEYSWTKB3boKu5JX/TrQtnAgaYvfSWT61VU8ZT1juk=",21 "narHash": "sha256-1IItATjckflBBAFDm9C0v/pg9b9BvKMj0mT/NDKZkJE=",22 "owner": "nixos",22 "owner": "nixos",23 "repo": "nixpkgs",23 "repo": "nixpkgs",24 "rev": "7f59b4b5295b58659064a91d0bcc8e8a11d0b351",24 "rev": "471980fd33961a6b893041774a9633811d03354f",25 "type": "github"25 "type": "github"26 },26 },27 "original": {27 "original": {41 "rust-overlay": {41 "rust-overlay": {42 "flake": false,42 "flake": false,43 "locked": {43 "locked": {44 "lastModified": 1631758650,44 "lastModified": 1633573101,45 "narHash": "sha256-7OAtO2V8omtPaoFBASTfPA5m8MzN5LX8agk0k5p8dH0=",45 "narHash": "sha256-h9NFLA4VLYfa5Cjkwkbq/8N0/wy9bJ7xiIeLE9bjh4g=",46 "owner": "oxalica",46 "owner": "oxalica",47 "repo": "rust-overlay",47 "repo": "rust-overlay",48 "rev": "4e79ebf67452cca4ae938180728f9f513e828d5b",48 "rev": "3131abe7900b142eca189806f51fcc3c475ed072",49 "type": "github"49 "type": "github"50 },50 },51 "original": {51 "original": {flake.nixdiffbeforeafterboth--- a/flake.nix
+++ b/flake.nix
@@ -24,6 +24,7 @@
rust
cargo-edit
cargo-udeps
+ cargo-fuzz
pkgconfig
openssl
lib/default.nixdiffbeforeafterboth--- a/lib/default.nix
+++ b/lib/default.nix
@@ -19,10 +19,12 @@
map
(
name: {
- inherit name; value = nixpkgs.lib.nixosSystem {
- system = configuredHosts.${name}.system;
- modules = configuredHosts.${name}.modules;
- };
+ inherit name;
+ value = nixpkgs.lib.nixosSystem {
+ system = configuredHosts.${name}.system;
+ modules = configuredHosts.${name}.modules;
+ pkgs = import nixpkgs { system = configuredHosts.${name}.system; };
+ };
}
)
(builtins.attrNames root.config.hosts)
modules/fleet/secrets.nixdiffbeforeafterboth--- 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 {}));
}
];
});