From 9c6084bf47b6487071dac302ad3e610dab6f11b7 Mon Sep 17 00:00:00 2001 From: Jacob Birkett Date: Sun, 27 Oct 2024 19:20:18 -0700 Subject: [PATCH] nix: overlays: remove mkJoinedOverlays function Closes #285 I introuced `mkJoinedOverlays` long ago, but we can use `lib.composeManyExtensions` instead. I am happy to remove it! --- nix/overlays.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nix/overlays.nix b/nix/overlays.nix index 9496a05..4287eee 100644 --- a/nix/overlays.nix +++ b/nix/overlays.nix @@ -5,9 +5,6 @@ }: let ver = lib.removeSuffix "\n" (builtins.readFile ../VERSION); - mkJoinedOverlays = overlays: final: prev: - lib.foldl' (attrs: overlay: attrs // (overlay final prev)) {} overlays; - mkDate = longDate: (lib.concatStringsSep "-" [ (builtins.substring 0 4 longDate) (builtins.substring 4 2 longDate) @@ -16,7 +13,7 @@ version = ver + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty"); in { - default = mkJoinedOverlays (with self.overlays; [ + default = lib.composeManyExtensions (with self.overlays; [ xdg-desktop-portal-hyprland inputs.hyprlang.overlays.default inputs.hyprland-protocols.overlays.default