Merge pull request #95 from qowoz/fod

add vendorHash

README.md

@@ -11,7 +11,7 @@ designed to work with nixpkgs but also other package sets.
     -   pypi
     -   rubygems.org
 -   update buildRustPackage's cargoHash/cargoSha256
--   update buildGoModule's vendorSha256/modSha256
+-   update buildGoModule's vendorHash/vendorSha256
 -   build and run the resulting package (see `--build`,
     `--run` or `--shell`
 -   commit updated files (see `--commit` flag)

nix_update/eval.py

@@ -26,9 +26,9 @@ class Package:
     url: Optional[str]
     rev: str
     hash: Optional[str]
-    mod_sha256: Optional[str]
+    vendor_hash: Optional[str]
     vendor_sha256: Optional[str]
-    cargo_sha256: Optional[str]
+    cargo_deps: Optional[str]
     tests: List[str]
 
     raw_version_position: InitVar[Optional[Dict[str, Any]]]
@@ -67,9 +67,9 @@ def eval_expression(import_path: str, attr: str) -> str:
       url = pkg.src.url or null;
       rev = pkg.src.rev or null;
       hash = pkg.src.outputHash or null;
-      mod_sha256 = pkg.modSha256 or null;
+      vendor_hash = pkg.vendorHash or null;
       vendor_sha256 = pkg.vendorSha256 or null;
-      cargo_sha256 = pkg.cargoHash or pkg.cargoSha256 or null;
+      cargo_deps = pkg.cargoHash or pkg.cargoSha256 or null;
       tests = builtins.attrNames (pkg.passthru.tests or {{}});
     }})"""
 

nix_update/update.py

@@ -91,19 +91,13 @@ def update_src_hash(opts: Options, filename: str, current_hash: str) -> None:
     replace_hash(filename, current_hash, target_hash)
 
 
-def update_mod256_hash(opts: Options, filename: str, current_hash: str) -> None:
-    expr = f"{{ sha256 }}: (import {opts.import_path} {disable_check_meta(opts)}).{opts.attribute}.go-modules.overrideAttrs (_: {{ modSha256 = sha256; }})"
+def update_go_modules_hash(opts: Options, filename: str, current_hash: str) -> None:
+    expr = f"{{ sha256 }}: (import {opts.import_path} {disable_check_meta(opts)}).{opts.attribute}.go-modules.overrideAttrs (_: {{ inherit sha256; }})"
     target_hash = nix_prefetch([expr])
     replace_hash(filename, current_hash, target_hash)
 
 
-def update_go_vendor_hash(opts: Options, filename: str, current_hash: str) -> None:
-    expr = f"{{ sha256 }}: (import {opts.import_path} {disable_check_meta(opts)}).{opts.attribute}.go-modules.overrideAttrs (_: {{ vendorSha256 = sha256; }})"
-    target_hash = nix_prefetch([expr])
-    replace_hash(filename, current_hash, target_hash)
-
-
-def update_cargo_sha256_hash(opts: Options, filename: str, current_hash: str) -> None:
+def update_cargo_deps_hash(opts: Options, filename: str, current_hash: str) -> None:
     expr = f"{{ sha256 }}: (import {opts.import_path} {disable_check_meta(opts)}).{opts.attribute}.cargoDeps.overrideAttrs (_: {{ inherit sha256; }})"
     target_hash = nix_prefetch([expr])
     replace_hash(filename, current_hash, target_hash)
@@ -150,13 +144,13 @@ def update(opts: Options) -> Package:
 
     # if no package.hash was provided we just update the other hashes unconditionally
     if update_hash or not package.hash:
-        if package.vendor_sha256:
-            update_go_vendor_hash(opts, package.filename, package.vendor_sha256)
-        # legacy go module checksums
-        elif package.mod_sha256:
-            update_mod256_hash(opts, package.filename, package.mod_sha256)
-
-        if package.cargo_sha256:
-            update_cargo_sha256_hash(opts, package.filename, package.cargo_sha256)
+        if package.vendor_hash and package.vendor_sha256 == "_unset":
+            update_go_modules_hash(opts, package.filename, package.vendor_hash)
+
+        if package.vendor_sha256 and package.vendor_hash == "_unset":
+            update_go_modules_hash(opts, package.filename, package.vendor_sha256)
+
+        if package.cargo_deps:
+            update_cargo_deps_hash(opts, package.filename, package.cargo_deps)
 
     return package