Skip to content

maxima: various cleanups#101830

Closed
omasanori wants to merge 5 commits intoNixOS:masterfrom
omasanori:maxima/cleanup-v2
Closed

maxima: various cleanups#101830
omasanori wants to merge 5 commits intoNixOS:masterfrom
omasanori:maxima/cleanup-v2

Conversation

@omasanori
Copy link
Contributor

@omasanori omasanori commented Oct 27, 2020

Motivation for this change

I have done some groundwork to ease not-yet-published update to Maxima 5.44.0. I published these cleanups separate from the update itself to make reviews easier.
I am still new to Nix so while I did my best some changes might not be idiomatic. Any suggestions are welcome!

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.

@ofborg ofborg bot requested a review from peti October 27, 2020 08:58
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Oct 27, 2020
This was referenced Oct 27, 2020
Closed
Closed
peti
peti reviewed Oct 28, 2020
View reviewed changes
Copy link
Member

@peti peti left a comment

Choose a reason for hiding this comment

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

Those gratuitous whitespace changes make it pretty hard to figure out what you've actually changed. I'm not a fan of submissions reformatting the entire file to their personal taste.

@omasanori
Copy link
Contributor Author

omasanori commented Oct 28, 2020 •
edited
Loading

Thank you for your reviews, @7c6f434c and @peti!

Those gratuitous whitespace changes make it pretty hard to figure out what you've actually changed. I'm not a fan of submissions reformatting the entire file to their personal taste.

I am sorry to bother you. I will revise the patch to minimize whitespace changes.

@omasanori
Copy link
Contributor Author

omasanori commented Oct 28, 2020

So, the formatting seems closer now. Would you point out if any of these patches are irrelevant to you? I will adopt subsequent patches.

@omasanori omasanori requested a review from peti October 28, 2020 07:48
@omasanori omasanori force-pushed the maxima/cleanup-v2 branch 2 times, most recently from 918b805 to edbcc5d Compare October 28, 2020 15:21
@omasanori
maxima: refactor dependencies
67dbe61 
Since packages are inherited by default, `package ? null` does not work
as a declaration of optional dependency. To solve the problem, I added
`with*` flags and used them consistently.

With this change, the closure size of `maxima` was shrunk from 275429480
bytes to 213117176 bytes (reduced by 22.6%), and that of `maxima-ecl`
was done from 383156392 bytes to 326807728 bytes (reduced by 14.5%).

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
@omasanori
maxima: use stdenv.mkDerivation rec
ee172b1 
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
@omasanori
maxima: introduce fetchPatchFromSage
52a4b69 
This makes `patches` easier to read.

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
@omasanori
maxima: use with where appropriate
d324c5c 
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
@omasanori
maxima: update comment on test errors
16d1ffa 
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
@omasanori
Copy link
Contributor Author

omasanori commented Nov 2, 2020

So, I will rework this and Maxima update to make them acceptable. I appologize for my hasty action.

@omasanori omasanori closed this Nov 2, 2020
@omasanori omasanori deleted the maxima/cleanup-v2 branch November 2, 2020 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@7c6f434c 7c6f434c 7c6f434c approved these changes

@peti peti Awaiting requested review from peti

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@omasanori @peti @7c6f434c