From 7db074df7b753529bb715846bbf00fc3cbf716dc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 26 Dec 2023 10:39:50 +0000 Subject: [PATCH] ofborg/src/maintainers.nix: look up files pointed by "pos" attribute Sometimes most of attributes for a package are defined outside the file that defines it. Examples are `openjdk` and `nix`. At least `openjdk` defined `pos` attribute to guide `nix edit` to open the right file. Let's extend `ofborg` to do the same. Before the change (with `pos` applied to `nix_2_3`): $ printf '[["nix_2_3"]]' > attrs.json; \ printf '["pkgs/tools/package-management/nix/default.nix"]' > paths.json; \ nix-instantiate --eval maintainers.nix --arg changedattrsjson ./attrs.json --arg changedpathsjson ./paths.json { } After the change: $ printf '[["nix_2_3"]]' > attrs.json; \ printf '["pkgs/tools/package-management/nix/default.nix"]' > paths.json; \ nix-instantiate --eval maintainers.nix --arg changedattrsjson ./attrs.json --arg changedpathsjson ./paths.json { flokli = ; raitobezarius = ; } --- ofborg/src/maintainers.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ofborg/src/maintainers.nix b/ofborg/src/maintainers.nix index c519725..85dc8d8 100644 --- a/ofborg/src/maintainers.nix +++ b/ofborg/src/maintainers.nix @@ -62,6 +62,17 @@ let #(builtins.unsafeGetAttrPos "name" drv) (builtins.unsafeGetAttrPos "pname" drv) (builtins.unsafeGetAttrPos "version" drv) + + # Use ".meta.position" for cases when most of the package is + # defined in a "common" section and the only place where + # reference to the file with a derivation the "pos" + # attribute. + # + # ".meta.position" has the following form: + # "pkgs/tools/package-management/nix/default.nix:155" + # We transform it to the following: + # { file = "pkgs/tools/package-management/nix/default.nix"; } + { file = pkgs.lib.head (pkgs.lib.splitString ":" (drv.meta.position or "")); } ] )));