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

[18.09] nixos/emby: use the dataDir option #48150

Merged
merged 9 commits into from Oct 22, 2018
Merged

[18.09] nixos/emby: use the dataDir option #48150

merged 9 commits into from Oct 22, 2018

Conversation

Vskilet
Copy link
Contributor

@Vskilet Vskilet commented Oct 10, 2018 •
edited

Motivation for this change

In #48043 @joachifm suggest to add the pull request to the release. I added other commits to assure compatibility.

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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@worldofpeace
Copy link
Contributor

cc @xeji

@worldofpeace
Copy link
Contributor

@Vskilet btw it's nice to be able to tell if this is a backport by having the pr title include [18.09].

@worldofpeace
Copy link
Contributor

@GrahamcOfBorg build emby

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: emby

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: emby

Partial log (click to expand)

no configure script, doing nothing
building
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/znc3kg8brfwbwi2nwz8l1fzadl5b7isn-emby-3.5.3.0
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/znc3kg8brfwbwi2nwz8l1fzadl5b7isn-emby-3.5.3.0/bin
patching script interpreter paths in /nix/store/znc3kg8brfwbwi2nwz8l1fzadl5b7isn-emby-3.5.3.0
checking for references to /build in /nix/store/znc3kg8brfwbwi2nwz8l1fzadl5b7isn-emby-3.5.3.0...
/nix/store/znc3kg8brfwbwi2nwz8l1fzadl5b7isn-emby-3.5.3.0

@Vskilet Vskilet changed the title nixos/emby : use the dataDir option [18.09] nixos/emby : use the dataDir option Oct 11, 2018
@fpletz fpletz changed the title [18.09] nixos/emby : use the dataDir option nixos/emby: use the dataDir option Oct 11, 2018
@fpletz
Copy link
Member

fpletz commented Oct 11, 2018

@Vskilet Could you please stick to the contribution guidelines in your PRs and not add an extra space before colons in commit messages in the future? Also, please use cherry-pick -x for backports.

For general amusement, we have a word for this in Germany: https://en.wikipedia.org/wiki/Plenken 😄

@fpletz fpletz changed the title nixos/emby: use the dataDir option [18.09] nixos/emby: use the dataDir option Oct 11, 2018
@Vskilet
Copy link
Contributor Author

Vskilet commented Oct 12, 2018 •
edited

Ok @fpletz thanks to give feedbacks 😄
But should I cherry-picking with x now ?

Edit:
@fpletz It's done

worldofpeace and others added 9 commits October 12, 2018 16:56
@worldofpeace @Vskilet
nixos/emby: ensure plugins are writeable
cfd6ace 
(cherry picked from commit a16c6d8)
@worldofpeace @Vskilet
emby: 3.4.1.0 -> 3.5.2.0
c2638dd 
(cherry picked from commit bd02b33)
@nyanloutre @Vskilet
WIP emby: 3.5.2.0 -> 3.5.3.0
ef311d5 
(cherry picked from commit 6e8da1d)
@nyanloutre @Vskilet
emby: add sqlite to wrapper
04d75db 
(cherry picked from commit f7a2e20)
@nyanloutre @Vskilet
emby: move usr/lib to lib
36f064d 
(cherry picked from commit 9ec17c6)
@nyanloutre @Vskilet
emby: move lib to opt
3f8c202 
(cherry picked from commit c2e269e)
@nyanloutre @Vskilet
nixos/emby: fixes binary name change introduced by NixOS#47659
ca20a04 
(cherry picked from commit bb06b5b)
@Vskilet
nixos/emby : use the dataDir option
ec61247 
(cherry picked from commit 7d43e2a)
@Vskilet
nixos/emby : delete programData hardcode in pkg
2c5f94b 
(cherry picked from commit 751c647)
@worldofpeace
Copy link
Contributor

I don't see any reason to hold this off.
cc @fpletz @xeji @Mic92

@c0bw3b
Copy link
Contributor

c0bw3b commented Oct 21, 2018

Do we want/need to backport the version bump also?
Or was the goal to backport just the last 2 commits ("use the dataDir option" and "delete programData hardcode in pkg") ?

Naive question really, I did not follow previous work

@worldofpeace
Copy link
Contributor

Do we want/need to backport the version bump also?
Or was the goal to backport just the last 2 commits ("use the dataDir option" and "delete programData hardcode in pkg") ?

Naive question really, I did not follow previous work

Yes and yes.

I've tested in a vm with the 18.09 release and switching to this version hasn't caused any problems.
There was this issue but it was worked around with cfd6ace. The upstream fix will be in the next release.

dataDir fix is also pertinent because its use was non-functional.

@xeji
Copy link
Contributor

xeji commented Oct 22, 2018

@GrahamcOfBorg build emby

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: emby

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: emby

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: emby

Partial log (click to expand)

no configure script, doing nothing
building
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/znc3kg8brfwbwi2nwz8l1fzadl5b7isn-emby-3.5.3.0
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/znc3kg8brfwbwi2nwz8l1fzadl5b7isn-emby-3.5.3.0/bin
patching script interpreter paths in /nix/store/znc3kg8brfwbwi2nwz8l1fzadl5b7isn-emby-3.5.3.0
checking for references to /build in /nix/store/znc3kg8brfwbwi2nwz8l1fzadl5b7isn-emby-3.5.3.0...
/nix/store/znc3kg8brfwbwi2nwz8l1fzadl5b7isn-emby-3.5.3.0

@xeji xeji merged commit f80504e into NixOS:release-18.09 Oct 22, 2018
@Vskilet Vskilet deleted the release-18.09 branch May 1, 2020 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@Vskilet @worldofpeace @GrahamcOfBorg @fpletz @c0bw3b @xeji @nyanloutre