From cbe3ca2591b1d0c129602d90fe35901840574e63 Mon Sep 17 00:00:00 2001 From: guangtao Date: Wed, 13 Nov 2024 11:26:45 -0800 Subject: [PATCH] chore(lock): update --- flake.lock | 18 +++++++++--------- local/lock/flake.lock | 12 ++++++------ src/hive/collectors/colmenaConfigurations.nix | 3 +-- src/hive/collectors/homeConfigurations.nix | 1 - 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 7f1db73..d4998fa 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ }, "call-flake": { "locked": { - "lastModified": 1725155583, - "narHash": "sha256-ythzL6iO/eE6r1IA6dflpWx0vC4JBGBlHLTK3BpYhrQ=", + "lastModified": 1730625993, + "narHash": "sha256-11/dQG/vjpfMi4D7ku2o1UtUMf8Sud0KJ/Le44zHIc8=", "owner": "divnix", "repo": "call-flake", - "rev": "ffd01f6f44397e4f8508151b47b145c0d2180eda", + "rev": "3441e7638e516c1f78da7fb96a40c07aafc45633", "type": "github" }, "original": { @@ -81,11 +81,11 @@ "yants": "yants" }, "locked": { - "lastModified": 1726168018, - "narHash": "sha256-UJSAgde5EVN4HmaUofPFP1fTuvw/tG/DhzPnjBFVkWI=", + "lastModified": 1731446083, + "narHash": "sha256-t6crwkKZ09eBM5aEnDr9/rnJg7wyR3RcUFzv/nUjuFs=", "owner": "tao3k", "repo": "flops", - "rev": "8dec3f00bf5e01049597f46641c645eeae28796f", + "rev": "70f84823b13437d2bc7f1dda1f8d52b9b907f999", "type": "github" }, "original": { @@ -117,11 +117,11 @@ }, "nixlib": { "locked": { - "lastModified": 1725757153, - "narHash": "sha256-c1a6iLmCVPFI9EUVMrBN8xdmFxFXEjcVwiTSVmqajOs=", + "lastModified": 1731200463, + "narHash": "sha256-qDaAweJjdFbVExqs8aG27urUgcgKufkIngHW3Rzustg=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "68584f89dd0eb16fea5d80ae127f3f681f6a5df7", + "rev": "e04234d263750db01c78a412690363dc2226e68a", "type": "github" }, "original": { diff --git a/local/lock/flake.lock b/local/lock/flake.lock index 68e2808..bcd90b9 100644 --- a/local/lock/flake.lock +++ b/local/lock/flake.lock @@ -1719,11 +1719,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1726463316, - "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -2452,11 +2452,11 @@ "yants": "yants" }, "locked": { - "lastModified": 1722333425, - "narHash": "sha256-C9w5BNBMq1rZ6FqP1eJoIuRzyIhGIGC0GV8qys38LKQ=", + "lastModified": 1731405425, + "narHash": "sha256-ZCPFj5gN51aQAmmkL2j0e1hnbC1itsrn+KKoRMimZeI=", "owner": "divnix", "repo": "std", - "rev": "f8f6f70cdc9234d36d3d445d99a60b9267644df8", + "rev": "e2b20a91d37989f85d6852ebf3f55b4b9dff3cfb", "type": "github" }, "original": { diff --git a/src/hive/collectors/colmenaConfigurations.nix b/src/hive/collectors/colmenaConfigurations.nix index 4edf689..8ce9a1e 100644 --- a/src/hive/collectors/colmenaConfigurations.nix +++ b/src/hive/collectors/colmenaConfigurations.nix @@ -19,8 +19,7 @@ let colmenaTopLevelCliSchema = comb: l.fix (this: { - __schema = "v0"; - + __schema = (import (inputs.colmena + /src/nix/hive/eval.nix) { }).__schema; nodes = l.mapAttrs (_: c: c.bee._evaled) comb; toplevel = l.mapAttrs (_: v: v.config.system.build.toplevel) this.nodes; deploymentConfig = l.mapAttrs (_: v: v.config.deployment) this.nodes; diff --git a/src/hive/collectors/homeConfigurations.nix b/src/hive/collectors/homeConfigurations.nix index 1c8b2db..c7d61c9 100644 --- a/src/hive/collectors/homeConfigurations.nix +++ b/src/hive/collectors/homeConfigurations.nix @@ -39,7 +39,6 @@ let asserted = showAssertions evaled; in { - # __schema = "v0"; inherit (asserted) options config; inherit (asserted.config.home) activationPackage; newsDisplay = evaled.config.news.display;