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

calls: init at 0.0.1 #65362

Merged
merged 3 commits into from Nov 10, 2019
Merged

calls: init at 0.0.1 #65362

merged 3 commits into from Nov 10, 2019

Conversation

craigem
Copy link
Contributor

@craigem craigem commented Jul 25, 2019

Motivation for this change

The calls application is required to provide phone calls for the Librem 5 phone.

This is the initial commit for this application to be packaged for NixOS and the first step to getting NixOS to fully support the Librem 5 phone.

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.

@craigem
Copy link
Contributor Author

craigem commented Jul 25, 2019

Resolves #65361

@peterhoeg peterhoeg changed the title calls: Initial commit to package the application calls: init at 0.0.1 Jul 25, 2019
pkgs/applications/radio/calls/default.nix Outdated Show resolved Hide resolved
pkgs/applications/radio/calls/default.nix Outdated Show resolved Hide resolved
pkgs/applications/radio/calls/default.nix Outdated Show resolved Hide resolved
pkgs/applications/radio/calls/default.nix Outdated Show resolved Hide resolved
pkgs/applications/radio/calls/default.nix Outdated Show resolved Hide resolved
@worldofpeace
Copy link
Contributor

This and a lot of other Librem software has been packaged as part of #57614.

ddee3c8 looks pretty complete, perhaps out of date.

@craigem
Copy link
Contributor Author

craigem commented Jul 25, 2019

This and a lot of other Librem software has been packaged as part of #57614.

I had not found this. I'll make sure I hook everything I'm doing back into that.

Thanks!

@craigem
Copy link
Contributor Author

craigem commented Jul 25, 2019

I had a read of #57614 and note that he had put it "networking" where as I had put it in "radio".

Any thoughts on the correct location?

@worldofpeace
Copy link
Contributor

worldofpeace commented Jul 27, 2019

A calling application would be a networking application. Additionally all the applications in that directory have no relation to this one.

@craigem
Copy link
Contributor Author

craigem commented Jul 28, 2019

A calling application would be a networking application. Additionally all the applications in that directory have no relation to this one.

I can see why that would be applicable, but this application is using modem manager to use operate a mobile phone radio to place phone calls across a mobile phone network.

Happy to switch this to "networking", just wanted to make it clear that this was not a VOIP application.

@worldofpeace
Copy link
Contributor

I can see why that would be applicable, but this application is using modem manager to use operate a mobile phone radio to place phone calls across a mobile phone network.

Indeed, but I think it has fallen out of fashion to refer to those things as "radio" even though it's correct.

also

Additionally all the applications in that directory have no relation to this one.

@craigem
Copy link
Contributor Author

craigem commented Jul 29, 2019

calls has now been moved to networking.

Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

You need to call this package in all-packages.nix.

Additonally, can you match the code style of ddee3c8 and *Inputs?

Currently the dependencies are declared improperly, and we shouldn't have to reference anything under the gnome3 attribute.

@craigem
Copy link
Contributor Author

craigem commented Jul 30, 2019

Thanks for your time and input @worldofpeace

I originally based this work on how the related package, libhandy was packaged so your corrections and guidance have been helpful.

If I've understood your suggestions correctly, this last commit should be what you're looking for.

@craigem
Copy link
Contributor Author

craigem commented Jul 31, 2019

Finally bumped all-packages.nix.

@nixos-discourse
Copy link

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/github-label-for-prs-for-librem-5-related-packages/3653/3

pkgs/applications/networking/calls/default.nix Outdated Show resolved Hide resolved
pkgs/applications/networking/calls/default.nix Outdated Show resolved Hide resolved
@worldofpeace
Copy link
Contributor

Doesn't this need other software/services like how #57614 mentioned?
I'd think without it this wouldn't be very useful.

checkInputs = [
dbus
xvfb_run
xlibs.xauth
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
xlibs.xauth
xorg.xauth

Copy link
Contributor

Choose a reason for hiding this comment

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

@jtojnar
Copy link
Contributor

jtojnar commented Aug 23, 2019

What the heck is this commit set:

~/P/nixpkgs ((3a0f023e…)|…)
$ git hub pull checkout 65362
Fetching pull/65362/head from git@github.com:NixOS/nixpkgs.git

~/P/nixpkgs ((6e99182f…)|…)
$ git rebase channels/nixos-unstable
First, rewinding head to replay your work on top of it...
Applying: calls: Initial commit to package the application
Applying: Corrected licence
Applying: Corrected licence
Using index info to reconstruct a base tree...
M	pkgs/applications/radio/calls/default.nix
Falling back to patching base and 3-way merge...
Auto-merging pkgs/applications/radio/calls/default.nix
No changes -- Patch already applied.

~/P/nixpkgs ((07e4206a…)|…)
$ nix-build -A calls
error: attribute 'calls' in selection path 'calls' not found

@lheckemann
Copy link
Member

I've pushed a version with a cleaned-up history, upgraded to a recent version from upstream git, and tested the application as far as I could (I haven't managed to bend ModemManager to my will yet, but calls seems fine). Will merge on Monday if nobody objects, or as soon as someone approves :)

nativeBuildInputs = [
meson ninja pkgconfig libhandy modemmanager desktop-file-utils
];
buildInputs = [ libhandy gnome3.gsound gtk3 gnome3.libpeas gom libxml2 evolution_data_server ];
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
buildInputs = [ libhandy gnome3.gsound gtk3 gnome3.libpeas gom libxml2 evolution_data_server ];
buildInputs = [ libhandy gsound gtk3 libpeas gom libxml2 evolution-data-server ];

old aliases

};

nativeBuildInputs = [
meson ninja pkgconfig libhandy modemmanager desktop-file-utils
Copy link
Contributor

Choose a reason for hiding this comment

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

why is modemanager and libhandy native?

@worldofpeace
Copy link
Contributor

@lheckemann This was never moved to networking #65362 (comment).

@worldofpeace
Copy link
Contributor

@lheckemann Can we format the expression as @jtojnar https://github.com/NixOS/nixpkgs/blob/4bc5288ac9f6d99ca595433fcaf9fa4ca9fbe5a5/pkgs/applications/networking/calls/default.nix.
That's a code style we're pretty much going for. You could even push that expression manually.

@lheckemann
Copy link
Member

Wow, that was a funky history. Rebase completely failed..? Anyway, here's my second cleanup attempt :)


stdenv.mkDerivation rec {
pname = "calls";
version = "2019-10-09-unstable";
Copy link
Contributor

Choose a reason for hiding this comment

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

unstable in pname.

#68518

];
buildInputs = [
libhandy
evolution_data_server
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
evolution_data_server
evolution-data-server

@worldofpeace
Copy link
Contributor

@lheckemann libhandy and modemanager are both sill in nativeBuildInputs.

@ofborg ofborg bot requested a review from lheckemann November 10, 2019 18:49
@lheckemann lheckemann merged commit da9b3ea into NixOS:master Nov 10, 2019
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Nov 11, 2019
calls: init at 0.0.1
(cherry picked from commit da9b3ea)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants