diff options
author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-05-23 13:26:22 +0200 |
---|---|---|
committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-05-23 13:26:22 +0200 |
commit | 204731c0a69136c9cebcb54f1afecf5145e26bbe (patch) | |
tree | fc9132e5dc74e4a8e1327cdd411839a90f9410aa /pkgs/by-name-overlay.nix | |
parent | refactor(sys): Modularize and move to `modules/system` or `pkgs` (diff) | |
download | nixos-config-204731c0a69136c9cebcb54f1afecf5145e26bbe.tar.gz nixos-config-204731c0a69136c9cebcb54f1afecf5145e26bbe.zip |
refactor(pkgs): Categorize into `by-name` shards
This might not be the perfect way to organize a package set -- especially if the set is not nearly the size of nixpkgs -- but it is _at_ least a way of organization.
Diffstat (limited to 'pkgs/by-name-overlay.nix')
-rw-r--r-- | pkgs/by-name-overlay.nix | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/pkgs/by-name-overlay.nix b/pkgs/by-name-overlay.nix new file mode 100644 index 00000000..7eb3d239 --- /dev/null +++ b/pkgs/by-name-overlay.nix @@ -0,0 +1,70 @@ +# Adapted from this: https://github.com/NixOS/nixpkgs/blob/1814b56453c91192f6d5a6276079948f9fe96c18/pkgs/top-level/by-name-overlay.nix +{ + lib, + sysLib, + pkgs, + baseDirectory, +}: +# This file turns the pkgs/by-name directory (see its README.md for more info) into an overlay that adds all the defined packages. +# No validity checks are done here, +# instead this file is optimised for performance, +# and validity checks are done by CI on PRs. +let + # FIXME: Check if we override something in the set <2024-05-22> + callPackage = lib.callPackageWith (pkgs // myPkgs // {inherit sysLib;}); + inherit lib; + + inherit + (builtins) + readDir + ; + + inherit + (lib.attrsets) + mapAttrs + mapAttrsToList + mergeAttrsList + ; + + # Package files for a single shard + # Type: String -> String -> AttrsOf Path + namesForShard = shard: type: + if type != "directory" + then + # Ignore all non-directories. Technically only README.md is allowed as a file in the base directory, so we could alternatively: + # - Assume that README.md is the only file and change the condition to `shard == "README.md"` for a minor performance improvement. + # This would however cause very poor error messages if there's other files. + # - Ensure that README.md is the only file, throwing a better error message if that's not the case. + # However this would make for a poor code architecture, because one type of error would have to be duplicated in the validity checks and here. + # Additionally in either of those alternatives, we would have to duplicate the hardcoding of "README.md" + {} + else + mapAttrs + (name: _: baseDirectory + "/${shard}/${name}/package.nix") + (readDir (baseDirectory + "/${shard}")); + + # The attribute set mapping names to the package files defining them + # This is defined up here in order to allow reuse of the value (it's kind of expensive to compute) + # if the overlay has to be applied multiple times + packageFiles = mergeAttrsList (mapAttrsToList namesForShard (readDir baseDirectory)); + myPkgs = + mapAttrs + (_: path: callPackage path {}) + packageFiles; +in + # # TODO: Consider optimising this using `builtins.deepSeq packageFiles`, + # # which could free up the above thunks and reduce GC times. + # # Currently this would be hard to measure until we have more packages + # # and ideally https://github.com/NixOS/nix/pull/8895 + # self: super: + # { + # # This attribute is necessary to allow CI to ensure that all packages defined in `pkgs/by-name` + # # don't have an overriding definition in `all-packages.nix` with an empty (`{ }`) second `callPackage` argument. + # # It achieves that with an overlay that modifies both `callPackage` and this attribute to signal whether `callPackage` is used + # # and whether it's defined by this file here or `all-packages.nix`. + # # TODO: This can be removed once `pkgs/by-name` can handle custom `callPackage` arguments without `all-packages.nix` (or any other way of achieving the same result). + # # Because at that point the code in ./stage.nix can be changed to not allow definitions in `all-packages.nix` to override ones from `pkgs/by-name` anymore and throw an error if that happens instead. + # _internalCallByNamePackageFile = file: self.callPackage file {}; + # } + # // + myPkgs |