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

ssl-proxy: 0.2.7 -> 0.2.7-unstable-2024-02-05 #286592

Merged
merged 1 commit into from
Feb 6, 2024

Conversation

konst-aa
Copy link
Contributor

@konst-aa konst-aa commented Feb 6, 2024

Description of changes

cc: @marsam

In PR #282237, marsam unpinned ssl-proxy's dependency on go 1.19 by adding a patch directly into the derivation. I put up a PR upstream, and it was merged! As we don't need the patch now, I removed it and updated the fetcher to grab the commit where it was applied.

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

@konst-aa konst-aa requested a review from marsam February 6, 2024 00:27
@konst-aa
Copy link
Contributor Author

konst-aa commented Feb 6, 2024

I just realized that I forgot to remove the fetchFromGithub dependency, I will do that when I get home. Also, is it reasonable to use fetchGit here?

@konst-aa konst-aa force-pushed the remove-ssl-proxy-patch branch from 05d6115 to af0d3fc Compare February 6, 2024 03:37
@kirillrdy
Copy link
Member

@konst-aa thank you for making those changes !

now i think the only thing that is left is to update commit and PR title

ssl-proxy: 0.2.7 -> 0.2.7-unstable-2024-02-05, you can add remove patch that has been applied upstream as second line in commit

@konst-aa konst-aa changed the title ssl-proxy: remove patch that has been applied upstream ssl-proxy: 0.2.7 -> 0.2.7-unstable-2024-02-05 Feb 6, 2024
Remove patch as it has been applied in the ssl-proxy repo.
@konst-aa konst-aa force-pushed the remove-ssl-proxy-patch branch from af0d3fc to 069c5a7 Compare February 6, 2024 05:44
@konst-aa konst-aa requested a review from kirillrdy February 6, 2024 05:44
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Feb 6, 2024
@NickCao NickCao merged commit b285a66 into NixOS:master Feb 6, 2024
23 of 24 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-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants