Add option for version_key

nix_update/__init__.py

@@ -18,7 +18,9 @@ def die(msg: str) -> NoReturn:
 
 
 def parse_args(args: list[str]) -> Options:
-    parser = argparse.ArgumentParser()
+    parser = argparse.ArgumentParser(
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter
+    )
     help = "File to import rather than default.nix. Examples, ./release.nix"
     parser.add_argument("-f", "--file", default="./.", help=help)
     parser.add_argument(
@@ -56,6 +58,12 @@ def parse_args(args: list[str]) -> Options:
         help="Regex to extract version with, i.e. 'jq-(.*)'",
         default="(.*)",
     )
+    parser.add_argument(
+        "-vk",
+        "--version-key",
+        help="Key of attribute that holds the version",
+        default="version",
+    )
     parser.add_argument(
         "--run",
         action="store_true",
@@ -107,6 +115,7 @@ def parse_args(args: list[str]) -> Options:
         attribute=a.attribute,
         test=a.test,
         version_regex=a.version_regex,
+        version_key=a.version_key,
         review=a.review,
         format=a.format,
         override_filename=a.override_filename,

nix_update/eval.py

@@ -91,7 +91,11 @@ def __post_init__(
 
 
 def eval_expression(
-    escaped_import_path: str, attr: str, flake: bool, system: str | None
+    escaped_import_path: str,
+    attr: str,
+    flake: bool,
+    version_key: str,
+    system: str | None,
 ) -> str:
     system = f'"{system}"' if system else "builtins.currentSystem"
 
@@ -135,7 +139,7 @@ def eval_expression(
     sanitizePosition (builtins.unsafeGetAttrPos "src" pkg);
 in {{
   name = pkg.name;
-  old_version = pkg.version or (builtins.parseDrvName pkg.name).version;
+  old_version = pkg.{version_key} or (builtins.parseDrvName pkg.name).{version_key};
   inherit raw_version_position;
   filename = position.file;
   line = position.line;
@@ -168,7 +172,11 @@ def eval_expression(
 
 def eval_attr(opts: Options) -> Package:
     expr = eval_expression(
-        opts.escaped_import_path, opts.escaped_attribute, opts.flake, opts.system
+        opts.escaped_import_path,
+        opts.escaped_attribute,
+        opts.flake,
+        opts.version_key,
+        opts.system,
     )
     cmd = [
         "nix",

nix_update/options.py

@@ -12,6 +12,7 @@ class Options:
     version: str = "stable"
     version_preference: VersionPreference = VersionPreference.STABLE
     version_regex: str = "(.*)"
+    version_key: str = "version"
     import_path: str = os.getcwd()
     override_filename: str | None = None
     url: str | None = None

tests/test_versionkey.py

@@ -0,0 +1,29 @@
+import subprocess
+
+import conftest
+
+from nix_update.options import Options
+from nix_update.update import update
+
+
+def test_update(helpers: conftest.Helpers) -> None:
+    with helpers.testpkgs() as path:
+        opts = Options(
+            attribute="versionkey", import_path=str(path), version_key="immich_version"
+        )
+        update(opts)
+        version = subprocess.run(
+            [
+                "nix",
+                "eval",
+                "--raw",
+                "--extra-experimental-features",
+                "nix-command",
+                "-f",
+                path,
+                "versionkey.immich_version",
+            ],
+            text=True,
+            stdout=subprocess.PIPE,
+        ).stdout.strip()
+        assert tuple(map(int, version.split("."))) >= (1, 91, 0)

tests/testpkgs/default.nix

@@ -12,4 +12,5 @@
   sourcehut = pkgs.python3.pkgs.callPackage ./sourcehut.nix { };
   savanna = pkgs.python3.pkgs.callPackage ./savanna.nix { };
   npm = pkgs.callPackage ./npm.nix { };
+  versionkey = pkgs.callPackage ./versionkey.nix { };
 }

tests/testpkgs/versionkey.nix

@@ -0,0 +1,22 @@
+{ buildNpmPackage
+, fetchFromGitHub
+}:
+buildNpmPackage rec {
+  pname = "immich-cli";
+  # version of immich and immich cli differes
+  version = (builtins.fromJSON (builtins.readFile "${src}/cli/package.json")).version;
+
+  immich_version = "1.91.0";
+  src = fetchFromGitHub {
+    owner = "immich-app";
+    repo = "immich";
+    rev = "v${immich_version}";
+    hash = "sha256-tFaa2rN4iGMlrPjHqSbMOE2xbyJh7Ro+Fm8j0+wa1MM=";
+  };
+
+  npmDepsHash = "sha256-NvU+v8MrwPK6q8RdVEHhzi5g6qRRmdTtInf7o2E5y6Y=";
+
+  postPatch = ''
+    cd cli
+  '';
+}