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

Jump to bottom

libmtp, libgphoto2, gphoto2: Switch to Github, allow building from repo #104000

Merged
merged 3 commits into from Nov 25, 2020
Merged

libmtp, libgphoto2, gphoto2: Switch to Github, allow building from repo #104000

merged 3 commits into from Nov 25, 2020

Conversation

nh2
Copy link
Contributor

@nh2 nh2 commented Nov 16, 2020 •
edited

Motivation for this change

Github is where upstream's development happens now,
and building from repo makes adding patches and overriding the commit easier.

Also use pname+version, see #103997, and reformat for reduced merge conflicts.

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.

@nh2
libmtp: Switch to Github, allow building from repo.
c75b9da 
Github is where upstream's development happens now,
and building from repo makes adding patches and overriding the commit easier.

Also use pname+version, see NixOS#103997.
@nh2
libgphoto: Switch to Github, allow building from repo.
25b7b88 
Github is where upstream's development happens now,
and building from repo makes adding patches and overriding the commit easier.

Also use pname+version, see NixOS#103997.
@nh2
gphoto2: Switch to Github, allow building from repo.
58957e4 
Github is where upstream's development happens now,
and building from repo makes adding patches and overriding the commit easier.

Also use pname+version, see NixOS#103997.
@nh2
Copy link
Contributor Author

nh2 commented Nov 16, 2020

cc @jcumming

@nh2 nh2 self-assigned this Nov 16, 2020
SuperSandro2000
SuperSandro2000 reviewed Nov 17, 2020
View reviewed changes
pkgs/development/libraries/libgphoto2/default.nix
@@ -33,8 +48,6 @@ stdenv.mkDerivation rec {
MTP, and other vendor specific protocols for controlling and transferring data
from digital cameras.
'';
version = "2.5.23";
tag = "libgphoto2-2_5_23-release";
# XXX: the homepage claims LGPL, but several src files are lgpl21Plus
Copy link
Member

Choose a reason for hiding this comment

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

What does the XXX: mean?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's a way to indicate a sort of TODO or ugliness note, but I don't think it's good, exactly because it isn't obvious what it means.

Copy link
Contributor

Choose a reason for hiding this comment

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

I recognized the writing style as mine, but I didn't remember writing that comment.

Git blame claims I wrote it 8 years ago!

The upstream project now reports: GNU Lesser General Public License v2.1. Let's use that.

Copy link
Contributor

@jtojnar jtojnar Nov 18, 2020 •
edited

Choose a reason for hiding this comment

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

@jcumming Unfortunately, the GitHub license detector is not able to determine if the license is *gpl-or-later or *gpl-only, see https://discourse.nixos.org/t/lib-licenses-gpl3-co-are-now-deprecated/8206 for more details.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll leave it to you people to figure that one out 😁

Beyond that, anybody mind approving if it looks good?

@nh2 nh2 merged commit 76aac1e into NixOS:staging Nov 25, 2020
@jonringer jonringer mentioned this pull request Nov 27, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar left review comments

@jcumming jcumming jcumming left review comments

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

Assignees

@nh2 nh2

Labels
8.has: clean-up 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@nh2 @jtojnar @jcumming @SuperSandro2000