Skip to content

gerbera: init at 1.6.1#93226

Merged
timokau merged 1 commit intoNixOS:masterfrom
ardumont:gerbera-init
Oct 7, 2020
Merged

gerbera: init at 1.6.1#93226
timokau merged 1 commit intoNixOS:masterfrom
ardumont:gerbera-init

Conversation

@ardumont
Copy link
Contributor

@ardumont ardumont commented Jul 16, 2020

Initialize a new and maintained upnp media server (gerbera).
Next step is to open a service which allows to configure it declaratively.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS (tested through my own overrides on odroid-n2 at [1] [2])
    • macOS
    • other Linux distributions: debian with nix
  • 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): +74906824 (new)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Note that it works but the compilation displays warnings because that depends on
other commits not yet merged:

[1] mypkgs override definition
https://github.com/ardumont/mypkgs/blob/master/default.nix#L10-L33

[2] my own (for now) gerbera configuration declaration for the gerbera service
https://gitlab.com/ardumont/nixos/-/blob/master/odroid/gerbera/default.nix

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jul 16, 2020
@aanderse
Copy link
Member

Since #82429 appears to be abandoned this PR is very welcome 👍

@ardumont
Copy link
Contributor Author

ardumont commented Jul 16, 2020

Since #82429 appears to be abandoned this PR is very welcome

Awesome (that it is welcome ;)

force-pushed...

I fixed the homepage which targeted the old mediatomb homepage.

@ardumont
Copy link
Contributor Author

ardumont commented Jul 18, 2020

Heads up, started the work on the mediatomb/gerbera service whose current head is at [1]

@aanderse I started from the other diff and iterated over that work. I also
took into consideration your review from the other diff ;)

I don't actually know how to properly test it though, so far:

nix-build --expr "(import <nixpkgs> {}).callPackage ./nixos/modules/services/misc/mediatomb.nix { }"

(which did not complain).

I probably need to look into how to add proper nix tests.

Note that, as a user, I don't like the idea to have a service name mediatomb
which runs something named gerbera. Even though they share history (as a
maintainer I know this), i'd say that's not the user's concerns though ;)

I did not open a PR yet as I did not have any response from the other
maintainer (who started a similar work). Plus I'm going afk, it's the week-end
after all ;)

I still thought that was worth a heads up ;)

[1] ardumont@629e04c

Cheers,

@symphorien
Copy link
Member

You can test with nix-build -A gerbera from the root of the repo.

@ardumont
Copy link
Contributor Author

ardumont commented Jul 18, 2020

You can test with nix-build -A gerbera from the root of the repo.

Yes, thanks, i know (i did already).
I meant testing on the other started work for the mediatomb/gerbera service (which should be in another thread).
I think i'll drop by irc and ask there.

Cheers,

@ardumont
Copy link
Contributor Author

ardumont commented Jul 18, 2020

I probably need to look into how to add proper nix tests.

I meant testing on the other started work for the mediatomb/gerbera service (which should be in another thread).
I think i'll drop by irc and ask there.

nice, found back [1]
\o/
And i'll be less noisy here now ;)

[1] https://nixos.org/nixos/manual/index.html#sec-nixos-tests

Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

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

Reviewing this separately from #93450 to make it more manageable.

Copy link
Member

Choose a reason for hiding this comment

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

Is meta.repositories a standard? I've never seen it anywhere else.

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 don't know about a standard, but I have seen it within the nixpkgs repository [1]

(must come from the mediatomb which is within the list [1])

[1] https://github.com/NixOS/nixpkgs/search?q=meta.repositories

@ardumont ardumont force-pushed the gerbera-init branch 3 times, most recently from 6fe4f6b to 2b615c3 Compare October 6, 2020 18:48
@ardumont
Copy link
Contributor Author

ardumont commented Oct 6, 2020

After rebasing on latest upnp 1.4, it failed on compilation error, something
an include error on headers.
So I bump to a more recent version which happens since I updated this diff...
In its changelog is a reference about an include error fix (which is the one i got) [1]

[1] https://github.com/gerbera/gerbera/releases/tag/v1.6.1

It builds fine again now.

@ardumont ardumont changed the title gerbera: init at 1.5.0 gerbera: init at 1.6.1 Oct 6, 2020
@ardumont ardumont mentioned this pull request Oct 6, 2020
10 tasks
Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

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

Setting to "changes requested" while waiting on #93048.

@timokau
Copy link
Member

timokau commented Oct 6, 2020

Looks good to me now, pending #93048 👍

@timokau
Copy link
Member

timokau commented Oct 7, 2020

Please rebase now that #93048 has been merged.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Oct 7, 2020
@ofborg ofborg bot added 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. and removed 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Oct 7, 2020
Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

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

Thank you!

@timokau timokau merged commit 3b0886c into NixOS:master Oct 7, 2020
@ardumont ardumont deleted the gerbera-init branch October 7, 2020 09:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants