james/nixery
1
0
Fork 0
mirror of https://code.tvl.fyi/depot.git:/tools/nixery.git synced 2025-03-15 14:11:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(nix): Support retrieving differently cased top-level attributes

Browse Source 
As described in issue #14, the registry API does not allow image names
with uppercase-characters in them.

However, the Nix package set has several top-level keys with uppercase
characters in them which could previously not be retrieved using
Nixery.

This change implements a method for retrieving those keys, but it is
explicitly only working for the top-level package set as nested
sets (such as `haskellPackages`) often contain packages that differ in
case only.
This commit is contained in:
Vincent Ambo 2019-08-03 18:27:26 +01:00 committed by Vincent Ambo
parent d578ca203f
commit 5a22294775
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
build-registry-image.nix
View File

@ -113,11 +113,36 @@ let
# For top-level items, the name of the key yields the result directly. Nested # For top-level items, the name of the key yields the result directly. Nested
# items are fetched by using dot-syntax, as in Nix itself. # items are fetched by using dot-syntax, as in Nix itself.
# #
# For example, `deepFetch pkgs "xorg.xev"` retrieves `pkgs.xorg.xev`. # Due to a restriction of the registry API specification it is not possible to
deepFetch = s: n: # pass uppercase characters in an image name, however the Nix package set
let path = lib.strings.splitString "." n; # makes use of camelCasing repeatedly (for example for `haskellPackages`).
#
# To work around this, if no value is found on the top-level a second lookup
# is done on the package set using lowercase-names. This is not done for
# nested sets, as they often have keys that only differ in case.
#
# For example, `deepFetch pkgs "xorg.xev"` retrieves `pkgs.xorg.xev` and
# `deepFetch haskellpackages.stylish-haskell` retrieves
# `haskellPackages.stylish-haskell`.
deepFetch = with lib; s: n:
let path = splitString "." n;
err = { error = "not_found"; pkg = n; }; err = { error = "not_found"; pkg = n; };
in lib.attrsets.attrByPath path err s; # The most efficient way I've found to do a lookup against
# case-differing versions of an attribute is to first construct a
# mapping of all lowercased attribute names to their differently cased
# equivalents.
#
# This map is then used for a second lookup if the top-level
# (case-sensitive) one does not yield a result.
hasUpper = str: (match ".*[A-Z].*" str) != null;
allUpperKeys = filter hasUpper (attrNames s);
lowercased = listToAttrs (map (k: {
name = toLower k;
value = k;
}) allUpperKeys);
caseAmendedPath = map (v: if hasAttr v lowercased then lowercased."${v}" else v) path;
fetchLower = attrByPath caseAmendedPath err s;
in attrByPath path fetchLower s;
# allContents is the combination of all derivations and store paths passed in # allContents is the combination of all derivations and store paths passed in
# directly, as well as packages referred to by name. # directly, as well as packages referred to by name.