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

libssh2: fix broken patch hash #89326

Merged
merged 1 commit into from Jun 4, 2020
Merged

libssh2: fix broken patch hash #89326

merged 1 commit into from Jun 4, 2020

Conversation

bhipple
Copy link
Contributor

@bhipple bhipple commented Jun 1, 2020

Patches from direct URLs on github are not stable (comment headers change w/
server settings), hence why we usually use fetchpatch. In lieu of that, vendor
the unstable patch.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Patches from direct URLs on github are not stable (comment headers change w/
server settings), hence why we usually use `fetchpatch`. In lieu of that, vendor
the unstable patch.
@prusnak
Copy link
Member

prusnak commented Jun 1, 2020

Is the patch unstable also when this URL is used?
https://patch-diff.githubusercontent.com/raw/libssh2/libssh2/pull/402.patch

@vcunat
Copy link
Member

vcunat commented Jun 1, 2020

Probably not that much, but I've certainly seen these parts change on some git upgrades:

@@ -537,26 +537,26 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,

@vcunat
Copy link
Member

vcunat commented Jun 1, 2020

Last time I got pissed by such a breakage and didn't want to cause a rebuild nor increase nixpkgs repo size, I created a bit-perfect mirror for that patch. I could add this one as well (nix build -f . libssh2.patches got it for me), but I wasn't being completely rational at that moment and I'm not yet perfectly sure if the approach is a good one.

@FRidh FRidh merged commit 62ee860 into NixOS:staging Jun 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants