From 771fb30cf907c14960c6551cfa698d80a330cf5c Mon Sep 17 00:00:00 2001 From: matt1432 Date: Mon, 20 Jan 2025 08:10:41 -0500 Subject: [PATCH] refactor: rename build-failures to misc-fixes --- lib/flake/default.nix | 8 +++++--- overlays/default.nix | 2 +- overlays/{build-failures => misc-fixes}/default.nix | 0 3 files changed, 6 insertions(+), 4 deletions(-) rename overlays/{build-failures => misc-fixes}/default.nix (100%) diff --git a/lib/flake/default.nix b/lib/flake/default.nix index 38c27b1f..363ef5a1 100644 --- a/lib/flake/default.nix +++ b/lib/flake/default.nix @@ -1,4 +1,6 @@ -inputs: rec { +inputs: let + inherit (builtins) removeAttrs; +in rec { # Import pkgs from a nixpkgs instance mkPkgs = { system, @@ -12,7 +14,7 @@ inputs: rec { overlays = [ (inputs.self.overlays.nix-version {inherit nix;}) - inputs.self.overlays.build-failures + inputs.self.overlays.misc-fixes ] ++ (cfg.overlays or []); config = @@ -25,7 +27,7 @@ inputs: rec { [] ++ (cfg.config.permittedInsecurePackages or []); } - // (builtins.removeAttrs ( + // (removeAttrs ( if cfg.config or null == null then {} else cfg.config diff --git a/overlays/default.nix b/overlays/default.nix index c91b0987..4213c8c7 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,5 +1,5 @@ self: { - build-failures = import ./build-failures; + misc-fixes = import ./misc-fixes; nix-version = import ./nix-version self; xdg-desktop-portal-kde = import ./xdg-desktop-portal-kde; } diff --git a/overlays/build-failures/default.nix b/overlays/misc-fixes/default.nix similarity index 100% rename from overlays/build-failures/default.nix rename to overlays/misc-fixes/default.nix