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

difftreelog

build upgrade nixpkgs

Yaroslav Bolyukin2021-10-07parent: #4daa40b.patch.diff
in: trunk

4 files changed

modifiedflake.lockdiffbeforeafterboth
before · flake.lock
4 packageslockfile v7
  • flake-utils7e5bf39github.com/numtide/flake-utils↘ 0↖ 1
    sourcegithub:numtide/flake-utils
    checksumsha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=
    used by
  • nixpkgs7f59b4bgithub.com/nixos/nixpkgs↘ 0↖ 1
    sourcegithub:nixos/nixpkgs/staging-next
    checksumsha256-UyEYSWTKB3boKu5JX/TrQtnAgaYvfSWT61VU8ZT1juk=
    used by
  • rootworkspace↘ 3↖ 0
    depends on
  • rust-overlay4e79ebfgithub.com/oxalica/rust-overlay↘ 0↖ 1
    sourcegithub:oxalica/rust-overlay
    checksumsha256-7OAtO2V8omtPaoFBASTfPA5m8MzN5LX8agk0k5p8dH0=
    used by
after · flake.lock
4 packageslockfile v7
  • flake-utils7e5bf39github.com/numtide/flake-utils↘ 0↖ 1
    sourcegithub:numtide/flake-utils
    checksumsha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=
    used by
  • nixpkgs471980fgithub.com/nixos/nixpkgs↘ 0↖ 1
    sourcegithub:nixos/nixpkgs/staging-next
    checksumsha256-1IItATjckflBBAFDm9C0v/pg9b9BvKMj0mT/NDKZkJE=
    used by
  • rootworkspace↘ 3↖ 0
    depends on
  • rust-overlay3131abegithub.com/oxalica/rust-overlay↘ 0↖ 1
    sourcegithub:oxalica/rust-overlay
    checksumsha256-h9NFLA4VLYfa5Cjkwkbq/8N0/wy9bJ7xiIeLE9bjh4g=
    used by
modifiedflake.nixdiffbeforeafterboth
--- a/flake.nix
+++ b/flake.nix
@@ -24,6 +24,7 @@
           rust
           cargo-edit
           cargo-udeps
+          cargo-fuzz
 
           pkgconfig
           openssl
modifiedlib/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)
modifiedmodules/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 {}));
           }
         ];
     });