about summary refs log tree commit diff stats
path: root/pkgs
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-11-02 18:25:48 +0100
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-11-02 18:25:48 +0100
commit444a5231810e2575bb8955bca6492ef73e4388d5 (patch)
tree7c6a946d6be9282221cb8ee480c40b12156d8173 /pkgs
parentfix(flake/nixosConfigurations/common): Actually enable the new `less` module (diff)
downloadnixos-config-444a5231810e2575bb8955bca6492ef73e4388d5.tar.gz
nixos-config-444a5231810e2575bb8955bca6492ef73e4388d5.zip
fix(lib/maybeMerge): Actually output a warning if things will be overridden
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/default.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 39d225a9..294d5b91 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -5,10 +5,7 @@
 }: let
   inherit (pkgs) lib;
 
-  # FIXME: Make this override check actually work.
-  # I think that some parts of the lazy eval are causing that to not actually evaluate the
-  # error message. <2024-10-23>
-  maybeMergeMessage = "While merging the pkgs in ./pkgs/by-name to the nixpkgs set.";
+  maybeMergeMessage = "the ./pkgs/by-name set";
   mMM = maybeMergeMessage;
   callPackage = lib.callPackageWith (nixLib.maybeMerge (nixLib.maybeMerge pkgs myPkgs mMM) {inherit sysLib;} mMM);