Navigation Menu

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

kodi 18.5 -> 18.6 #82317

Merged
merged 1 commit into from Mar 20, 2020
Merged

kodi 18.5 -> 18.6 #82317

merged 1 commit into from Mar 20, 2020

Conversation

dasj19
Copy link
Contributor

@dasj19 dasj19 commented Mar 11, 2020

Motivation for this change

Upgrade of the kodi release

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.

@alyssais
Copy link
Member

@GrahamcOfBorg build kodi

edwtjo
edwtjo requested changes Mar 12, 2020
View reviewed changes
Copy link
Member

@edwtjo edwtjo left a comment

Choose a reason for hiding this comment

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

The commit history needs to be squashed

pkgs/applications/video/kodi/default.nix Outdated Show resolved Hide resolved
@ofborg ofborg bot requested a review from edwtjo March 12, 2020 17:02
@ofborg ofborg bot requested review from sephalon and removed request for Ericson2314 March 13, 2020 09:30
@ofborg ofborg bot removed the 6.topic: emacs label Mar 13, 2020
@alyssais
Copy link
Member

Commit message should follow the style in CONTRIBUTING.md.

peterhoeg
peterhoeg reviewed Mar 14, 2020
View reviewed changes
pkgs/applications/video/kodi/default.nix Outdated
substituteInPlace xbmc/platform/linux/LinuxTimezone.cpp \
--replace 'usr/share/zoneinfo' 'etc/zoneinfo'
'';

Copy link
Member

Choose a reason for hiding this comment

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

Does upstream provide the proper path now?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Upstream does not have that file anymore

Copy link
Contributor

Choose a reason for hiding this comment

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

The file is still there from what I see, with no recent changes:
https://github.com/xbmc/xbmc/blob/Leia/xbmc/platform/linux/LinuxTimezone.cpp
I think you removed the wrong patch. The one that's no longer needed is the one in patches attr, as the comment suggests

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@cpages yes, sorry my bad... I removed the wrong patch... not I fixed it

@ofborg ofborg bot requested a review from peterhoeg March 15, 2020 11:49
jonringer
jonringer reviewed Mar 17, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

do you mind squashing the commits, otherwise LGTM

@dasj19
Copy link
Contributor Author

dasj19 commented Mar 18, 2020

still had trouble with squashing so I redid the commit on fresh... I guess this will help me in the future: https://www.internalpointers.com/post/squash-commits-into-one-git

jonringer
jonringer approved these changes Mar 18, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

[14 built, 0.0 MiB DL]
https://github.com/NixOS/nixpkgs/pull/82317
13 package built:
kodi kodi-wayland kodiPlain kodiPlainWayland kodiPlugins.inputstream-adaptive kodiPlugins.joystick kodiPlugins.kodi-platform kodiPlugins.pvr-hdhomerun kodiPlugins.pvr-hts kodiPlugins.pvr-iptvsimple kodiPlugins.steam-controller kodiPlugins.vfs-libarchive kodiPlugins.vfs-sftp

@jonringer
Copy link
Contributor

still had trouble with squashing so I redid the commit on fresh... I guess this will help me in the future: https://www.internalpointers.com/post/squash-commits-into-one-git

if you don't care about commit messages:

git reset HEAD^
git add pkgs/
git commit --amend --no-edit

if you do care:

git rebase -i HEAD~N

@jonringer
Copy link
Contributor

@GrahamcOfBorg build kodi

@cpages
Copy link
Contributor

cpages commented Mar 18, 2020

This can probably go in 20.03?

@jonringer
Copy link
Contributor

This can probably go in 20.03?

Unless there's a security related issue, I don't see a reason to, but I'm not a release manager

@cpages cpages merged commit e28f291 into NixOS:master Mar 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cpages cpages cpages left review comments

@jonringer jonringer jonringer approved these changes

@domenkozar domenkozar Awaiting requested review from domenkozar

@titanous titanous Awaiting requested review from titanous

@edwtjo edwtjo Awaiting requested review from edwtjo

@andir andir Awaiting requested review from andir

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

@etu etu Awaiting requested review from etu

@LnL7 LnL7 Awaiting requested review from LnL7

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@Mic92 Mic92 Awaiting requested review from Mic92

@peti peti Awaiting requested review from peti

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

@ttuegel ttuegel Awaiting requested review from ttuegel

@zimbatm zimbatm Awaiting requested review from zimbatm

@sephalon sephalon Awaiting requested review from sephalon

@peterhoeg peterhoeg Awaiting requested review from peterhoeg

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@dasj19 @alyssais @jonringer @cpages @edwtjo @peterhoeg @cdepillabout