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

google-cloud-sdk: fix gsutil #358015

Merged
merged 1 commit into from
Nov 23, 2024

Conversation

terlar
Copy link
Contributor

@terlar terlar commented Nov 21, 2024

Fixes a runtime issue with gsutil introduced by #356927. It is an alternative fix to #357355.

This happened due to a more strict Python version constraint that was added to gsutil as part of this new release:
GoogleCloudPlatform/gsutil@c8e2709

gsutil is working on Python 3.12 support:

gsutil has been running with Python 3.12 for some time and other people indicate that it works "fine".

I added a gsutil check to the install check phase to avoid a similar error happening in the future.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@fabianhjr
Copy link
Member

Neutral comment (not against or in favour), there is a preference of not including patches in branch (doing fetchPatch instead of embedding the patch directly in nixpkgs)

As such, I would side with pinning the python version to 3.11 while upstream fixes the versions constraints.

@terlar
Copy link
Contributor Author

terlar commented Nov 21, 2024

Unfortunately the source code is bundled in a package (google-cloud-sdk) where the location of the file is in a different location than the source repo (gsutil). So I cannot use the fetchPatch.

Copy link
Contributor

@marcusramberg marcusramberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

@marcusramberg
Copy link
Contributor

Neutral comment (not against or in favour), there is a preference of not including patches in branch (doing fetchPatch instead of embedding the patch directly in nixpkgs)

As such, I would side with pinning the python version to 3.11 while upstream fixes the versions constraints.

Having to install an extra python seems worse for the user compared to this.

@fabianhjr
Copy link
Member

fabianhjr commented Nov 22, 2024

extra is only relative to the closure in question, eg a non-python closure that doesn't require any other package that depends on python wouldn't install an extra python (it would have a single python version installed) or closures that otherwise already have python311 would similarly not increase the closure size by one python.

As mentioned, due to being asked to review this PR, I have a preference for the version pinning over embedding a patch in nixpkgs but don't oppose this.

Decision wise it isn't my say at this point regardless.

maintainers = with maintainers; [ iammrinal0 marcusramberg pradyuman stephenmw zimbatm ];

since you are a maintainer feel free to merge (or request me to merge) as is.

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Nov 23, 2024
@marcusramberg marcusramberg merged commit b292fd8 into NixOS:master Nov 23, 2024
37 of 38 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants