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

Jump to bottom

rink: init at 0.4.4 #55077

Merged
merged 1 commit into from Feb 7, 2019
Merged

rink: init at 0.4.4 #55077

merged 1 commit into from Feb 7, 2019

Conversation

sbourdeauducq
Copy link
Contributor

Motivation for this change

Add the Rink unit-aware calculator (https://rink.tiffnix.com/)

Things done
  • Tested using sandboxing
  • 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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@dtzWill
Copy link
Member

dtzWill commented Feb 2, 2019

mpl2 -> mpl20, apparently :).

@dtzWill
Copy link
Member

dtzWill commented Feb 2, 2019 

--- a/pkgs/applications/science/misc/rink/default.nix
+++ b/pkgs/applications/science/misc/rink/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   meta = with stdenv.lib; {
     description = "Unit-aware calculator";
     homepage = http://rink.tiffnix.com;
-    license = [ licenses.mpl2 licenses.gpl3 ];
-    maintainers = maintainers.sb0;
+    license = with licenses; [ mpl20 gpl3 ];
+    maintainers = [ maintainers.sb0 ];
   };
 }

@sbourdeauducq
Copy link
Contributor Author

fixed

@dtzWill
Copy link
Member

dtzWill commented Feb 2, 2019

fixed

Not quite, still need mpl2 -> mpl20.

See f011feb for an example of how to fix this, with short description of what is needed to change.

@sbourdeauducq
Copy link
Contributor Author

Sorry, I had made a mistake when using git.

@sbourdeauducq
Copy link
Contributor Author

Should be OK now.

@dtzWill dtzWill merged commit dcfce97 into NixOS:master Feb 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@sbourdeauducq @dtzWill @GrahamcOfBorg