about summary refs log tree commit diff stats
path: root/pkgs
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-12-20 17:50:16 +0100
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-12-20 17:50:16 +0100
commit0ac11166a8fb22d1ce4de111f46e8a3ba1de7663 (patch)
tree25187cbc4273c69ca553dc0450b69fdfb9bea19a /pkgs
parentfix(modules/lf): Always retry connecting to the server (diff)
downloadnixos-config-0ac11166a8fb22d1ce4de111f46e8a3ba1de7663.tar.gz
nixos-config-0ac11166a8fb22d1ce4de111f46e8a3ba1de7663.zip
refactor(lib): Upstream `lib` to vhack.eu
This allows to share it with the server config.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 3ed326ac..1f0a25cc 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -9,8 +9,8 @@
   mMM = maybeMergeMessage;
   callPackage =
     lib.callPackageWith
-    (nixLib.maybeMerge
-      (nixLib.maybeMerge
+    (nixLib.warnMerge
+      (nixLib.warnMerge
         pkgs
         myPkgs
         mMM)