diff options
| -rw-r--r-- | pkgs/check-pr.nix (renamed from pkgs/check-pr/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/clang-tidy-sarif.nix (renamed from pkgs/clang-tidy-sarif/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/clippy-sarif.nix (renamed from pkgs/clippy-sarif/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/hadolint-sarif.nix (renamed from pkgs/hadolint-sarif/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/klassy.nix (renamed from pkgs/klassy/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/nixgc.nix (renamed from pkgs/nixgc/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/sarif-fmt.nix (renamed from pkgs/sarif-fmt/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/shellcheck-sarif.nix (renamed from pkgs/shellcheck-sarif/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/treefetch.nix (renamed from pkgs/treefetch/default.nix) | 0 |
10 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/check-pr/default.nix b/pkgs/check-pr.nix index fca30b1..fca30b1 100644 --- a/pkgs/check-pr/default.nix +++ b/pkgs/check-pr.nix diff --git a/pkgs/clang-tidy-sarif/default.nix b/pkgs/clang-tidy-sarif.nix index 12dfe55..12dfe55 100644 --- a/pkgs/clang-tidy-sarif/default.nix +++ b/pkgs/clang-tidy-sarif.nix diff --git a/pkgs/clippy-sarif/default.nix b/pkgs/clippy-sarif.nix index a9fa10c..a9fa10c 100644 --- a/pkgs/clippy-sarif/default.nix +++ b/pkgs/clippy-sarif.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; diff --git a/pkgs/hadolint-sarif/default.nix b/pkgs/hadolint-sarif.nix index 44a813b..44a813b 100644 --- a/pkgs/hadolint-sarif/default.nix +++ b/pkgs/hadolint-sarif.nix diff --git a/pkgs/klassy/default.nix b/pkgs/klassy.nix index f4c809a..f4c809a 100644 --- a/pkgs/klassy/default.nix +++ b/pkgs/klassy.nix diff --git a/pkgs/nixgc/default.nix b/pkgs/nixgc.nix index 9e25bd7..9e25bd7 100644 --- a/pkgs/nixgc/default.nix +++ b/pkgs/nixgc.nix diff --git a/pkgs/sarif-fmt/default.nix b/pkgs/sarif-fmt.nix index 451af0c..451af0c 100644 --- a/pkgs/sarif-fmt/default.nix +++ b/pkgs/sarif-fmt.nix diff --git a/pkgs/shellcheck-sarif/default.nix b/pkgs/shellcheck-sarif.nix index 4842c5d..4842c5d 100644 --- a/pkgs/shellcheck-sarif/default.nix +++ b/pkgs/shellcheck-sarif.nix diff --git a/pkgs/treefetch/default.nix b/pkgs/treefetch.nix index dd8283a..dd8283a 100644 --- a/pkgs/treefetch/default.nix +++ b/pkgs/treefetch.nix |