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.

Sign up for GitHub

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

Jump to bottom

subsurface: 4.8.2 -> 4.9.3 #84822

Merged
merged 1 commit into from Apr 14, 2020
Merged

subsurface: 4.8.2 -> 4.9.3 #84822

merged 1 commit into from Apr 14, 2020

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Apr 9, 2020

This bumps subsurface to the latest release, and applies a patch to make
it work with libgit2 v1.0.

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.

@flokli
Copy link
Contributor Author

flokli commented Apr 10, 2020

I'd like to postpone this until subsurface/subsurface#2737 has been merged, and maybe a release has been done.

@flokli flokli added the 2.status: wait-for-upstream Waiting for upstream fix (or their other action). label Apr 10, 2020
@dirkhh
Copy link

dirkhh commented Apr 11, 2020

I'd like to postpone this until Subsurface-divelog/subsurface#2737 has been merged, and maybe a release has been done.

I just merged the PR, but a release isn't immediately forthcoming. I want us to finish some cylinder undo code before creating a 4.10 release... and then there's updates to the user manual, endless testing, etc... so this is several weeks away at best.

@flokli
subsurface: 4.8.2 -> 4.9.3
435ff31 
This bumps subsurface to 4.9.3.

As the subsurface-specific libdivecomputer source is shipped as a git
submodule these days, we can avoid having to fetch a separate tarball
that needs to be kept in sync (and is only uploaded for each release).

This also applies a patch on top of 4.9.3 to properly handle libgit2
versions 1.0 and later - conditional code for older libgit versions has
been removed upstream, but that's a nontrivial backport, which is why
this patch was added.
@flokli
Copy link
Contributor Author

flokli commented Apr 11, 2020

I fixed the off-by-one error in the original patch and added it to nixpkgs - this seemed preferrable over bumping to a WIP snapshot, or keeping subsurface broken till a release is done.

I know patches in nixpkgs are usually discouraged, but this one is really small, fixed in upstreams master in a nontrivial backportable fashion, and more understandable than something like this.

PTAL.

@adisbladis adisbladis merged commit 46f06e0 into NixOS:master Apr 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adisbladis adisbladis Awaiting requested review from adisbladis

@mguentner mguentner Awaiting requested review from mguentner

Assignees
No one assigned
Labels
2.status: wait-for-upstream Waiting for upstream fix (or their other action). 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@flokli @dirkhh @adisbladis