diff options
| author | Alejandro Soto <alejandro@34project.org> | 2024-08-02 14:25:52 -0600 |
|---|---|---|
| committer | Alejandro Soto <alejandro@34project.org> | 2024-08-02 17:10:10 -0600 |
| commit | d16bcb693db18b8ab2508cef6400ce1219dac833 (patch) | |
| tree | c031207e7f1784fe1e913d35436c02e63f79f814 /pkgs | |
| parent | 951025ec921a83d9ade36252b2fdc6da9f469c03 (diff) | |
pkgs/lib: refactor out of util/
Diffstat (limited to '')
| -rw-r--r-- | pkgs/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/lib/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/lib/importAll.nix (renamed from util/importAll.nix) | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix index d595e04..82f6380 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -3,6 +3,8 @@ with prev.lib; let inherit (final) callPackage fetchpatch; in { + lib = callPackage ./lib { }; + btclone = callPackage ./btclone { }; gem5 = callPackage ./gem5.nix { gem5ISA = "x86"; }; git-aliases = callPackage ./git-aliases.nix { }; diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix new file mode 100644 index 0000000..a273758 --- /dev/null +++ b/pkgs/lib/default.nix @@ -0,0 +1,4 @@ +{ callPackage }: +{ + importAll = callPackage ./importAll.nix { }; +} diff --git a/util/importAll.nix b/pkgs/lib/importAll.nix index cc18640..30a1dd9 100644 --- a/util/importAll.nix +++ b/pkgs/lib/importAll.nix @@ -1,4 +1,4 @@ -lib: +{ lib }: { root, exclude ? [ ] }: with builtins; with lib; |