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

ktorrent: 5.1.0 -> 5.1.2 #68086

Merged
merged 1 commit into from Sep 10, 2019
Merged

ktorrent: 5.1.0 -> 5.1.2 #68086

merged 1 commit into from Sep 10, 2019

Conversation

alapshin
Copy link
Contributor

@alapshin alapshin commented Sep 4, 2019 •
edited

Motivation for this change

Update ktorrent from 5.1.0 to 5.1.2 and libktorrent from 2.1 to 2.1.1 and remove already included patches to fix failing build.

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.

@ofborg ofborg bot requested a review from edolstra September 4, 2019 05:32
peterhoeg
peterhoeg requested changes Sep 4, 2019
View reviewed changes
pkgs/development/libraries/libktorrent/default.nix
@@ -4,14 +4,14 @@
}:

let
mainVersion = "5.1";
mainVersion = "5.1.2";
Copy link
Member

Choose a reason for hiding this comment

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

if mainVersion really is just version, we should drop the mainVersion bit.

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 think mainVersion specifies ktorrent version while version specifies libktorrent version
In some cases mainVersion has format x.y while full ktorrent version has patch version, in other cases mainVersion has patch version as well and matches with ktorrent version.

I'm not sure what should be done here. You could see different directory structure here used by ktorrent here https://download.kde.org/stable/ktorrent/

Copy link
Member

Choose a reason for hiding this comment

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

That's messy. I agree, let's keep it.

pkgs/development/libraries/libktorrent/default.nix Outdated

in stdenv.mkDerivation rec {
name = "libktorrent-2.1";
name = "libktorrent-2.1.1";
Copy link
Member

Choose a reason for hiding this comment

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

Split this into pname and version.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@alapshin
ktorrent: 5.1.0 -> 5.1.2
3f0f7d5 
Update ktorrent from 5.1.0 to 5.1.2 and libktorrent from 2.1 to 2.1.1,
remove already included patches
@lheckemann lheckemann added this to the 19.09 milestone Sep 10, 2019
@peterhoeg peterhoeg merged commit d9b2900 into NixOS:master Sep 10, 2019
@alapshin alapshin deleted the ktorrent branch September 26, 2019 13:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peterhoeg peterhoeg peterhoeg approved these changes

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
19.09
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@alapshin @peterhoeg @lheckemann