From 0fc48fd45f756534648d989f5a2c4f3060464218 Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 24 Dec 2023 04:20:53 -0500 Subject: pkgs: auto-import directories *and* files --- pkgs/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'pkgs/default.nix') diff --git a/pkgs/default.nix b/pkgs/default.nix index d6c02bb..3825a46 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,31 +1,31 @@ final: prev: with prev; let - # directories are mapped to packages here for convenience sake + # files/directories are mapped to packages here for convenience sake imported = lib.pipe ./. [ builtins.readDir ( lib.filterAttrs ( - name: type: !(lib.hasPrefix "_" name) && type == "directory" + name: _: !(lib.hasPrefix "_" name) && name != "default.nix" ) ) ( - lib.mapAttrs ( - file: _: callPackage ./${file} {} + lib.mapAttrs' ( + file: _: lib.nameValuePair (lib.removeSuffix ".nix" file) (callPackage ./${file} {}) ) ) ]; in imported // { - clang-tidy-sarif = callPackage ./clang-tidy-sarif {inherit (final) clang-tidy-sarif;}; - clippy-sarif = callPackage ./clippy-sarif {inherit (final) clippy-sarif;}; - hadolint-sarif = callPackage ./hadolint-sarif {inherit (final) hadolint-sarif;}; - sarif-fmt = callPackage ./sarif-fmt {inherit (final) sarif-fmt;}; - shellcheck-sarif = callPackage ./shellcheck-sarif {inherit (final) shellcheck-sarif;}; + clang-tidy-sarif = callPackage ./clang-tidy-sarif.nix {inherit (final) clang-tidy-sarif;}; + clippy-sarif = callPackage ./clippy-sarif.nix {inherit (final) clippy-sarif;}; + hadolint-sarif = callPackage ./hadolint-sarif.nix {inherit (final) hadolint-sarif;}; + sarif-fmt = callPackage ./sarif-fmt.nix {inherit (final) sarif-fmt;}; + shellcheck-sarif = callPackage ./shellcheck-sarif.nix {inherit (final) shellcheck-sarif;}; - klassy = libsForQt5.callPackage ./klassy {}; + klassy = libsForQt5.callPackage ./klassy.nix {}; modrinth-app-unwrapped = callPackage ./modrinth-app { inherit (final.nodePackages or prev.nodePackages) pnpm; -- cgit v1.2.3