diff --git a/pkgs/default.nix b/pkgs/default.nix index 9f52bbc..05dfb66 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -5,10 +5,8 @@ with prev.lib; let inherit (final) callPackage fetchpatch; in { - lib = callPackage ./lib {}; - override = - { + {# add python modules here to make them available in all versions } // ( let diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix deleted file mode 100644 index e3ab56e..0000000 --- a/pkgs/lib/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{callPackage}: { - importAll = callPackage ./importAll.nix {}; -} diff --git a/pkgs/lib/importAll.nix b/pkgs/lib/importAll.nix deleted file mode 100644 index 6acabe9..0000000 --- a/pkgs/lib/importAll.nix +++ /dev/null @@ -1,20 +0,0 @@ -{lib}: { - root, - exclude ? [], -}: -with builtins; -with lib; -# http://chriswarbo.net/projects/nixos/useful_hacks.html - let - basename = removeSuffix ".nix"; - - isMatch = name: type: - (hasSuffix ".nix" name || type == "directory") - && ! elem name (map basename exclude); - - entry = name: _: { - name = basename name; - value = import (root + "/${name}"); - }; - in - mapAttrs' entry (filterAttrs isMatch (readDir root))