From 820f1a3bbed58ce341b63b1fe6678a36059fbafe Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Fri, 22 Dec 2023 01:15:02 -0700 Subject: [PATCH 1/2] julia.withPackages: bump the augmented registry to pick up a few hash fixes --- pkgs/development/julia-modules/registry.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/julia-modules/registry.nix b/pkgs/development/julia-modules/registry.nix index 929a805b48c5..71d0a2733e8c 100644 --- a/pkgs/development/julia-modules/registry.nix +++ b/pkgs/development/julia-modules/registry.nix @@ -3,7 +3,7 @@ fetchFromGitHub { owner = "CodeDownIO"; repo = "General"; - rev = "baf9e22ecdf97b6424a611ac4a565c6ee60d3f44"; - sha256 = "1nd3x2z8r6578149pbpkx9qw2ajln1kfy7w5kjsnv56v180h0ddf"; - # date = "2023-12-14T12:20:00+00:00"; + rev = "de80ad56e87f222ca6a7a517c69039d35437ab42"; + sha256 = "0pz1jmmcb2vn854w8w0zlpnihi470649cd8djh1wzgq2i2fy83bl"; + # date = "2023-12-22T03:28:12+00:00"; } From df22fb01dfdd4e35ddb6b8edbb3c709deaa353a2 Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Fri, 22 Dec 2023 01:15:42 -0700 Subject: [PATCH 2/2] julia.withPackages: better error message on missing nix-sha256 hash --- pkgs/development/julia-modules/python/sources_nix.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/julia-modules/python/sources_nix.py b/pkgs/development/julia-modules/python/sources_nix.py index 99a952753e80..989bf6bf186f 100755 --- a/pkgs/development/julia-modules/python/sources_nix.py +++ b/pkgs/development/julia-modules/python/sources_nix.py @@ -45,10 +45,14 @@ with open(out_path, "w") as f: path = registry_info["path"] packageToml = toml.load(registry_path / path / "Package.toml") - all_versions = toml.load(registry_path / path / "Versions.toml") + versions_toml = registry_path / path / "Versions.toml" + all_versions = toml.load(versions_toml) if not pkg["version"] in all_versions: continue version_to_use = all_versions[pkg["version"]] + if not "nix-sha256" in version_to_use: + raise KeyError(f"""Couldn't find nix-sha256 hash for {pkg["name"]} {pkg["version"]} in {versions_toml}. This might indicate that we failed to prefetch the hash when computing the augmented registry. Was there a relevant failure in {registry_path / "failures.yml"}?""") + repo = packageToml["repo"] f.write(f""" "{uuid}" = {{ src = fetchgit {{