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

salt: fix urllib.parse module #372604

Merged
merged 1 commit into from
Jan 19, 2025

Conversation

SpiritLooper
Copy link
Contributor

Retrograding python package version from 3.12 to 3.10.

Since the upgrade to version 24.11, Salt has exhibited strange behavior with SLS files:

In salt’s GitHub workflow, we can see that salt has been tested with Python 3.10.
Retrograding python to the tested version resolves the issues.

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.

@nix-owners nix-owners bot requested a review from Flakebi January 10, 2025 09:29
@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jan 10, 2025
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/upgrade-to-24-11-gives-issue-in-salt/57735/2

Copy link
Member

@Flakebi Flakebi left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks.
Looks like there is a fix in progress upstream: saltstack/salt#66899

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 372604


x86_64-linux

✅ 4 packages built:
  • python312Packages.pytest-testinfra
  • python312Packages.pytest-testinfra.dist
  • salt
  • salt.dist

@mweinelt
Copy link
Member

mweinelt commented Jan 13, 2025

Please apply the patch and stick with the default Python version.

@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 Jan 14, 2025
@SpiritLooper SpiritLooper force-pushed the fix-salt-top-sls-not-found branch 5 times, most recently from 4958e0d to 34955e2 Compare January 14, 2025 14:42
@SuperSandro2000 SuperSandro2000 changed the title salt: retrograding python 3.12 to 3.10 salt: fix urllib.parse module Jan 14, 2025
@SpiritLooper
Copy link
Contributor Author

As @mweinelt advised, I applied the patch from Fedora mainstream and revert my previous commit.
I ran tests on my side and the patch seems to work 🥳

@Flakebi
Copy link
Member

Flakebi commented Jan 14, 2025

Can you use fetchpatch for the patch file?

@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 14, 2025
@SpiritLooper SpiritLooper force-pushed the fix-salt-top-sls-not-found branch from 34955e2 to 5ef56b8 Compare January 15, 2025 13:02
@Flakebi
Copy link
Member

Flakebi commented Jan 15, 2025

I get a hash-mismatch for the patch:

error: hash mismatch in fixed-output derivation '/nix/store/brx3x26n6zh0jw19l557c2hw5z13c063-urllib.patch.drv':
        likely URL: https://src.fedoraproject.org/rpms/salt/raw/1c6e7b7a88fb81902f5fcee32e04fa80713b81f8/f/urllib.patch
         specified: sha256-+asvGPv4XIoOu6aqiP5BX5k8o3eqoPNUGzLSnw1pDFo=
            got:    sha256-yldIurafduOAYpf2X0PcTQyyNjz5KKl/N7J2OTEF/c0=

@SpiritLooper SpiritLooper force-pushed the fix-salt-top-sls-not-found branch from 5ef56b8 to 55e1713 Compare January 15, 2025 16:23
Copy link
Member

@Flakebi Flakebi left a comment

Choose a reason for hiding this comment

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

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 372604


x86_64-linux

✅ 4 packages built:
  • python312Packages.pytest-testinfra
  • python312Packages.pytest-testinfra.dist
  • salt
  • salt.dist

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 15, 2025
@mweinelt mweinelt merged commit a8815cd into NixOS:master Jan 19, 2025
26 of 28 checks passed
@SpiritLooper SpiritLooper deleted the fix-salt-top-sls-not-found branch January 20, 2025 13:43
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 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants