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

gerbera: init at 1.6.1 #93226

Merged
merged 1 commit into from Oct 7, 2020
Merged

gerbera: init at 1.6.1 #93226

merged 1 commit into from Oct 7, 2020

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

@aanderse
Copy link
Contributor

@aanderse aanderse commented Jul 16, 2020

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

@ardumont ardumont force-pushed the ardumont:gerbera-init branch from 19f56e3 to 8734a7a Jul 16, 2020
@ardumont
Copy link
Contributor Author

@ardumont 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 ardumont force-pushed the ardumont:gerbera-init branch from 8734a7a to a56ec2a Jul 17, 2020
@ardumont
Copy link
Contributor Author

@ardumont 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
Contributor

@symphorien symphorien commented Jul 18, 2020

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

@ardumont
Copy link
Contributor Author

@ardumont 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 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

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

pkgs/servers/gerbera/default.nix Outdated Show resolved Hide resolved

meta = with stdenv.lib; {
homepage = https://docs.gerbera.io/;
repositories.git = https://github.com/gerbera/gerbera;

This comment has been minimized.

@timokau

timokau Oct 6, 2020
Member

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

This comment has been minimized.

@ardumont

ardumont Oct 6, 2020
Author Contributor

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

pkgs/servers/gerbera/default.nix Outdated Show resolved Hide resolved
pkgs/servers/gerbera/default.nix Outdated Show resolved Hide resolved
@ardumont ardumont force-pushed the ardumont:gerbera-init branch 3 times, most recently from 6fe4f6b to 2b615c3 Oct 6, 2020
@ardumont
Copy link
Contributor Author

@ardumont 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 added a commit to ardumont/nixpkgs that referenced this pull request Oct 6, 2020
There has been no new release since 2.3.2 for some years now (around 2016) [1]

The most recent master branch for the amule project includes a commit [2] which
fixes compilation breakage with the next libupnp version [3].

So this bumps the amule version to the latest commit of that repository.

[1] amule-project/amule#219

[2] amule-project/amule@8784480

[3] NixOS#93226
@ardumont ardumont mentioned this pull request Oct 6, 2020
6 of 10 tasks complete
Copy link
Member

@timokau timokau left a comment

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

pkgs/servers/gerbera/default.nix Outdated Show resolved Hide resolved
pkgs/servers/gerbera/default.nix Outdated Show resolved Hide resolved
pkgs/servers/gerbera/default.nix Outdated Show resolved Hide resolved
@ardumont ardumont force-pushed the ardumont:gerbera-init branch from 2b615c3 to d475963 Oct 6, 2020
@timokau
Copy link
Member

@timokau timokau commented Oct 6, 2020

Looks good to me now, pending #93048 👍

@timokau
Copy link
Member

@timokau timokau commented Oct 7, 2020

Please rebase now that #93048 has been merged.

@ardumont ardumont force-pushed the ardumont:gerbera-init branch from d475963 to dc19e3b Oct 7, 2020
@timokau
timokau approved these changes Oct 7, 2020
Copy link
Member

@timokau timokau left a comment

Thank you!

@timokau timokau merged commit 3b0886c into NixOS:master Oct 7, 2020
19 checks passed
19 checks passed
tests tests
Details
action
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
gerbera, gerbera.passthru.tests on aarch64-linux Success
Details
gerbera, gerbera.passthru.tests on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="dc19e3b"; rev="dc19e3be0c38b4531d56f9e3e203375483e81369"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="dc19e3b"; rev="dc19e3be0c38b4531d56f9e3e203375483e81369"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="dc19e3b"; rev="dc19e3be0c38b4531d56f9e3e203375483e81369"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="dc19e3b"; rev="dc19e3be0c38b4531d56f9e3e203375483e81369"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="dc19e3b"; rev="dc19e3be0c38b4531d56f9e3e203375483e81369"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="dc19e3b"; rev="dc19e3be0c38b4531d56f9e3e203375483e81369"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="dc19e3b"; rev="dc19e3be0c38b4531d56f9e3e203375483e81369"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@ardumont ardumont deleted the ardumont:gerbera-init branch Oct 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.