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

Clean up git-series packaging, use OpenSSL 1.1 #71334

Merged
merged 5 commits into from
Oct 18, 2019
Merged

Clean up git-series packaging, use OpenSSL 1.1 #71334

merged 5 commits into from
Oct 18, 2019
+18 −16

Conversation

edef1c
Copy link
Member

@edef1c edef1c commented Oct 18, 2019

Motivation for this change

This cleans up the git-series packaging to use fewer vendored native libraries, and minimally upgrades some of the Cargo dependencies to allow using recent versions of OpenSSL.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.
Notify maintainers

cc @vmandela

Sorry, something went wrong.

@ofborg ofborg bot requested a review from vmandela October 18, 2019 12:24
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Oct 18, 2019
worldofpeace
worldofpeace approved these changes Oct 18, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

LGTM, though upstream really needs to make a release soon. Things like having problems with latest rust and OpenSSL 1.1 isn't going to be good for them. Judging from recent commit activity I hope there will be one.

We could update to an unstable commit, but patching is just really the best way to go.

edef1c added 4 commits October 18, 2019 21:28
@edef1c
git-series: upgrade Cargo dependencies to allow using OpenSSL 1.1
f7de72a
@edef1c
git-series: use nixpkgs libcurl
2bc9e6c 
This replaces the vendored copy from curl-sys.
@edef1c
git-series: use nixpkgs libgit2

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
fca5204 
This replaces the vendored copy from libgit2-sys.
@edef1c
git-series: add edef as maintainer
67b8f4e
@edef1c
Copy link
Member Author

edef1c commented Oct 18, 2019 •
edited
Loading

Judging from recent commit activity I hope there will be one.

Oh! That's a pleasant surprise. When I wrote this originally (and mailed it out for upstreaming), there hadn't been any activity in 3 years.

@worldofpeace
Copy link
Contributor

Hmm, judging from

maybe more advisable to use an unstable version?

@edef1c
Copy link
Member Author

edef1c commented Oct 18, 2019

Perhaps, but this patch is strictly more conservative than that. I have more confidence in this version than in an unreleased version that upgrades major versions of more complex dependencies.

@worldofpeace
Copy link
Contributor

Perhaps, but this patch is strictly more conservative than that. I have more confidence in this version than in an unreleased version that upgrades major versions of more complex dependencies.

Correct, and you volunteer to maintain this anyway 👍

@worldofpeace worldofpeace merged commit 020e1b0 into NixOS:master Oct 18, 2019
@edef1c edef1c deleted the git-series branch October 18, 2019 21:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace

@vmandela vmandela

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@edef1c @worldofpeace