From cd2ef49dd9b20a3e19a41217bced088627bbabb8 Mon Sep 17 00:00:00 2001 From: catvayor Date: Sat, 14 Dec 2024 14:48:58 +0100 Subject: [PATCH] fix: nixpkgs' are paths --- hive.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hive.nix b/hive.nix index 34ea79a..aee1fa0 100644 --- a/hive.nix +++ b/hive.nix @@ -5,22 +5,22 @@ let inherit (import sources.nix-patches { patchFile = ./patches; }) mkNixpkgsSrc; unstable = { - nixpkgs = import (mkNixpkgsSrc { + nixpkgs = mkNixpkgsSrc { src = sources.nixpkgs-unstable; version = "unstable"; - }) { }; + }; home-manager = "${sources.home-manager-unstable}/nixos"; nixvim = import sources.nixvim-unstable; }; stable = { - nixpkgs = import (mkNixpkgsSrc { + nixpkgs = mkNixpkgsSrc { src = sources.nixpkgs-stable; version = "stable"; - }) { }; + }; home-manager = "${sources.home-manager-stable}/nixos"; nixvim = import sources.nixvim-stable; }; - inherit (unstable.nixpkgs) lib; + inherit (import unstable.nixpkgs { }) lib; nodes = lib.mapAttrs' (name: _: { name = lib.removeSuffix ".nix" name; @@ -43,16 +43,16 @@ in _: node: lib.foldl ( pkgs: patch: - import (mkNixpkgsSrc { + mkNixpkgsSrc { src = pkgs; version = patch; - }) { } - ) (if node.unstable then unstable else stable).nixpkgs (node.nixPatches or []) + } + ) (if node.unstable then unstable else stable).nixpkgs (node.nixPatches or [ ]) ) nodes-meta; nodeSpecialArgs = lib.mapAttrs (name: node: { inherit (node) unstable; self-version = (if node.unstable then unstable else stable) // { - nixpkgs = nodeNixpkgs."${name}"; + nixpkgs = nodeNixpkgs.${name}; }; }) nodes-meta; };