Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(rpds-py): add getCargoHash for 0.17.1 #1502

Merged
merged 1 commit into from
Feb 4, 2024

Conversation

jugendhacker
Copy link
Contributor

@jugendhacker jugendhacker commented Jan 14, 2024

Contribution checklist (recommended but not always applicable/required):

  • There's an automated test for this change
  • Commit messages or code include references to related issues or PRs (including third parties)
  • Commit messages are conventional - examples from the log include "feat: add changelog files to fixup hook", "fix(contourpy): allow wheel usage", and "test: add sqlalchemy2 test"

@voidus
Copy link

voidus commented Jan 31, 2024

Relevant snip from CI failure:

error: builder for '/nix/store/6rr9j6abzkk86fvdbvaqq0y0xy7ln7fa-python3.11-poetry-1.7.1.drv' failed with exit code 1;
       last 10 log lines:
       > adding 'poetry-1.7.1.dist-info/RECORD'
       > OK
       > /private/tmp/nix-build-python3.11-poetry-1.7.1.drv-0/source
       > Finished executing pypaBuildPhase
       > Running phase: pythonRuntimeDepsCheckHook
       > Executing pythonRuntimeDepsCheck
       > Checking runtime dependencies for poetry-1.7.1-py3-none-any.whl
       >   - fastjsonschema not installed
       >   - platformdirs<4.0.0,>=3.0.0 not satisfied by version 4.0.0
       >   - xattr<0.11.0,>=0.10.0 not satisfied by version 1.0.0

The failure seems unrelated and it seems to work, maybe a rebase/rerun could resolve that?

My project builds with the following poetry override:

self: super: let
  inherit (self.lib.asserts) assertMsg;
in {
  rpds-py = super.rpds-py.overridePythonAttrs (old: {
    cargoDeps =
      assert assertMsg (old.version == "0.17.1")
      "Expected ${old.version} to be version 0.17.1, remove this workaround in poetryOverrides.nix";
      assert assertMsg (old.cargoDeps.hash == "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=")
      "Workaround no longer needed, remove it in poetryOverrides.nix";
      self.pkgs.rustPlatform.fetchCargoTarball {
        inherit (old) src;
        name = "${old.pname}-${old.version}";
        hash = "sha256-sFutrKLa2ISxtUN7hmw2P02nl4SM6Hn4yj1kkXrNWmI=";
      };
    });
}

or, without my anxious-I-might-forget-and-run-into-problems-later stuff:

self: super: {
  rpds-py = super.rpds-py.overridePythonAttrs (old: {
    cargoDeps = self.pkgs.rustPlatform.fetchCargoTarball {
        inherit (old) src;
        name = "${old.pname}-${old.version}";
        hash = "sha256-sFutrKLa2ISxtUN7hmw2P02nl4SM6Hn4yj1kkXrNWmI=";
      };
    });
}

But I'd leave it in, since I think there might be weird build errors

sigprof added a commit to sigprof/nix-devenv-qmk that referenced this pull request Feb 1, 2024
@cpcloud cpcloud merged commit 7d25ceb into nix-community:master Feb 4, 2024
147 checks passed
@cpcloud
Copy link
Collaborator

cpcloud commented Feb 4, 2024

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants