From ca26d7f8e104c0c6576448b3652835247b27c67e Mon Sep 17 00:00:00 2001 From: chn Date: Tue, 15 Jul 2025 12:33:45 +0800 Subject: [PATCH] lib.buildNixpkgsConfig: use bees from unstable --- flake.lock | 6 +++--- flake/lib/buildNixpkgsConfig/default.nix | 1 + modules/services/beesd.nix | 27 ++++++++++-------------- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index cb5cb8c9..f7e365c4 100644 --- a/flake.lock +++ b/flake.lock @@ -792,11 +792,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1750554037, - "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "lastModified": 1752553852, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "CHN-beta", "repo": "nixpkgs", - "rev": "f6b1f449aa69592d8f9bce2d4141766b667294ac", + "rev": "72d2707fa09a82bae26845eadb136ce94fd96a3e", "type": "github" }, "original": { diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index 67d03b86..71824a19 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -66,6 +66,7 @@ in platformConfig // cmakeFlags = prev.cmakeFlags ++ [ "-DCMAKE_CXX_STANDARD=23" ]; }); inherit (final.pkgs-2411) iio-sensor-proxy; + inherit (final.pkgs-unstable) bees; } // ( let diff --git a/modules/services/beesd.nix b/modules/services/beesd.nix index b8ed3af9..92cb627d 100644 --- a/modules/services/beesd.nix +++ b/modules/services/beesd.nix @@ -15,24 +15,19 @@ inputs: }; config = let inherit (inputs.config.nixos.services) beesd; in inputs.lib.mkIf (beesd != null) { - services.beesd.filesystems = builtins.listToAttrs (builtins.map - (fs: + services.beesd.filesystems = inputs.lib.mapAttrs' + (n: v: inputs.lib.nameValuePair (inputs.utils.escapeSystemdPath n) { - name = inputs.utils.escapeSystemdPath fs.name; - value = - { - spec = fs.name; - inherit (fs.value) hashTableSizeMB; - extraOptions = - [ - "--thread-count" "${builtins.toString fs.value.threads}" - "--loadavg-target" "${builtins.toString fs.value.loadAverage}" - "--scan-mode" "3" - "--verbose" "4" - ]; - }; + spec = n; + inherit (v) hashTableSizeMB; + extraOptions = + [ + "--thread-count" "${builtins.toString v.threads}" + "--loadavg-target" "${builtins.toString v.loadAverage}" + "--verbose" "4" + ]; }) - (inputs.localLib.attrsToList beesd)); + beesd; nixos.packages.packages._packages = [ inputs.pkgs.bees ]; }; }