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

mathematica: 13.1.0 -> 13.2.0 #207697

Merged
merged 4 commits into from
Dec 31, 2022

Conversation

herberteuler
Copy link
Member

@herberteuler herberteuler commented Dec 25, 2022

Description of changes
Things done

This PR upgrades Mathematica to 13.2.0.
Since this version, both installations of local documentation and no local documentation are supported, with the local documentation installation being the default. (#207087)

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@doronbehar
Copy link
Contributor

I tried to add my installer to versions.nix, without success yet. Will continue to debug this tomorrow. Other then that, changes look good to me.

@bjornfor
Copy link
Contributor

Ready to merge?

@doronbehar
Copy link
Contributor

Sorry for ghosting, it was a busy week. Can you add perhaps a comment, somewhere at versions.nix, specifying what Nix command should one run in order to add their installer to the list? I don't get along with all of these nix store commands.. See NixOS/nix#6210

@doronbehar
Copy link
Contributor

doronbehar commented Dec 31, 2022

Adding the installer to the list is explained in the requireFile's message, but how to get it's hash isn't, and I think that's where I fail. Here's what I ran:

nix-store --query --hash $(nix-store --add-fixed sha256 Mathematica_13.1.0_LINUX.sh)

And here's how I tried to install it:

diff --git i/pkgs/applications/science/math/mathematica/versions.nix w/pkgs/applications/science/math/mathematica/versions.nix
index 96e6805df8b..a17b1f4c299 100644
--- i/pkgs/applications/science/math/mathematica/versions.nix
+++ w/pkgs/applications/science/math/mathematica/versions.nix
@@ -15,6 +15,13 @@ let versions = [
     sha256 = "sha256-YRUvl2H9SwpwDZx04ugd7ZnK5G+t88bzAObXsGGVhk0=";
     installer = "Mathematica_13.2.0_BNDL_LINUX.sh";
   }
+  {
+    version = "13.1.0";
+    lang = "en";
+    language = "English";
+    sha256 = "06shx2d0qlyc2lj4agq3l70d7qqip1gabjf9hkdgm6mfycgznb4q";
+    installer = "Mathematica_13.1.0_LINUX.sh";
+  }
   {
     version = "13.1.0";
     lang = "en";
diff --git i/pkgs/top-level/all-packages.nix w/pkgs/top-level/all-packages.nix
index f75fb132dfb..d18d9b68caa 100644
--- i/pkgs/top-level/all-packages.nix
+++ w/pkgs/top-level/all-packages.nix
@@ -35816,6 +35816,10 @@ with pkgs;
   clmagma = callPackage ../development/libraries/science/math/clmagma { };
 
   mathematica = callPackage ../applications/science/math/mathematica { };
+  mathematica_my = mathematica.override { 
+    version = "13.1.0";
+    webdoc = true;
+  };
 
   mathematica-cuda = callPackage ../applications/science/math/mathematica {
     cudaSupport = true;

@herberteuler
Copy link
Member Author

Sorry for ghosting, it was a busy week. Can you add perhaps a comment, somewhere at versions.nix, specifying what Nix command should one run in order to add their installer to the list? I don't get along with all of these nix store commands.. See NixOS/nix#6210

I've just added a comment, please check it out.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin and removed 10.rebuild-darwin: 1 10.rebuild-darwin: 1-10 labels Dec 31, 2022
@doronbehar doronbehar force-pushed the fix/mathematica-13.2.0 branch from df37bfa to d6a592c Compare December 31, 2022 19:32
@doronbehar
Copy link
Contributor

doronbehar commented Dec 31, 2022

I added my 13.1.0 webdoc=true version I have on my computer, using the nix hash file command specified. This PR is ready IMO, can merge when CI is green.

@doronbehar doronbehar merged commit a40405b into NixOS:master Dec 31, 2022
@herberteuler
Copy link
Member Author

I added my 13.1.0 webdoc=true version I have on my computer, using the nix hash file command specified. This PR is ready IMO, can merge when CI is green.

Oh right, I recalled the command from my bash history, when nix hash was not available. Now we can use the simpler form instead.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: clean-up 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants