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

liberfa: init at 1.7.0 #79842

Merged
merged 2 commits into from Jun 10, 2020
Merged

liberfa: init at 1.7.0 #79842

merged 2 commits into from Jun 10, 2020

Conversation

mir06
Copy link
Contributor

@mir06 mir06 commented Feb 11, 2020

Motivation for this change
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.

pkgs/development/libraries/liberfa/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/liberfa/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/liberfa/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/liberfa/default.nix Outdated Show resolved Hide resolved
Copy link
Contributor

@doronbehar doronbehar left a comment

Choose a reason for hiding this comment

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

Fix this and you are good to go :)

maintainers/maintainer-list.nix Outdated Show resolved Hide resolved
@doronbehar
Copy link
Contributor

There's still a syntax error in the maintainers list - see https://gist.github.com/GrahamcOfBorg/3bc52c87ed258789eb1d181c42a1d7e2 - an updated link will be in the "Details" button of the PR.

pkgs/development/libraries/liberfa/default.nix Outdated Show resolved Hide resolved
meta = with stdenv.lib; {
description = "A C library containing key algorithms for astronomy, and is based on the SOFA library published by the International Astronomical Union (IAU).";
homepage = "https://github.com/liberfa/erfa";
license = "https://github.com/liberfa/erfa/blob/master/LICENSE";
Copy link
Member

Choose a reason for hiding this comment

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

license should not be a link to the license file. Again, see https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well, then it shall be free as far as I can judge ERFA's license, right?

Copy link
Contributor

Choose a reason for hiding this comment

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

@timokau that license doesn't seem "standard", or like one of those available in https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix . The manual says:

[..] or in-place license description of the same format if the license is unlikely to be useful in another expression.

Though I don't see a way to specify a "description" of this license - it starts with a Copyright (C) 2013-2014, NumFOCUS Foundation. but after reading more it feels like it's a Free software...

I did a git grep 'license =' | grep LICENSE and there are some derivations that use a straight link to upstream's license, and some use license.free along with a comment to upstream's license file. Personally I like the approach of a straight link as it's parseble by Nix.

Copy link
Member

Choose a reason for hiding this comment

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

@doronbehar technically parsable with nix yes, but a URL doesn't provide much practical value when parsed with nix. free would actually be more valuable, since you could at least sort packages on whether they're free/unfree.

I think with "of the same format" it is meant that you should just define a license attrset inline. That could for example be modeled after this entry in licenses.nix:

  epson = {
    fullName = "Seiko Epson Corporation Software License Agreement for Linux";
    url = "https://download.ebz.epson.net/dsc/du/02/eula/global/LINUX_EN.html";
    free = false;
  };

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the advice. I'll put it into next commit.

@doronbehar doronbehar closed this May 25, 2020
@doronbehar
Copy link
Contributor

your PR should have eventually two commits:

maintainers: add <me>
<package-name>: init at <version>

lib/licenses.nix Outdated Show resolved Hide resolved
@timokau
Copy link
Member

timokau commented Jun 9, 2020

The diff looks good (though it may be a good idea to keep the fullName in the license spec). Please squash your commits into two:

maintains: add mir06
liberfa: init at 1.7.0

In case you're not familiar with the workflow, see Situation 3 in https://about.gitlab.com/blog/2018/06/07/keeping-git-commit-history-clean/.

@mir06
Copy link
Contributor Author

mir06 commented Jun 10, 2020

@timokau I removed the fullName as there is nothing like that in the license text. It starts reading:

Copyright (C) 2013-2014, NumFOCUS Foundation.
All rights reserved.

This library is derived, with permission, from the International
Astronomical Union's "Standards of Fundamental Astronomy" library,
available from http://www.iausofa.org.

@timokau
Copy link
Member

timokau commented Jun 10, 2020

Yeah, that's a valid point. It could still be nice to have some kind of a name, for example if you wanted to have a listing of nixpkgs packages with their licenses. Leaving it out is reasonable too though.

Thanks for your patience & responsiveness :) Looks good to me now.

@timokau timokau merged commit fd88929 into NixOS:master Jun 10, 2020
@timokau
Copy link
Member

timokau commented Jun 10, 2020

Congrats on your first commit and your first package :) Welcome to the team!

@mir06
Copy link
Contributor Author

mir06 commented Jun 10, 2020

Thank you @timokau !

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

4 participants