From cc1b0c4091c36e59956797e94fa9bc872af9f3d7 Mon Sep 17 00:00:00 2001 From: rafaelrc7 Date: Sun, 26 Nov 2023 19:43:17 -0300 Subject: [PATCH 1/3] mathematica: 13.3.0 -> 13.3.1 --- .../science/math/mathematica/generic.nix | 5 +++-- .../science/math/mathematica/versions.nix | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/mathematica/generic.nix b/pkgs/applications/science/math/mathematica/generic.nix index 7cd699e58e3c..5064a3ddbdf4 100644 --- a/pkgs/applications/science/math/mathematica/generic.nix +++ b/pkgs/applications/science/math/mathematica/generic.nix @@ -158,9 +158,10 @@ in stdenv.mkDerivation { # Remove PATH restriction, root and avahi daemon checks, and hostname call sed -i ' - s/^PATH=/# &/ + s/^\s*PATH=/# &/ s/isRoot="false"/# &/ - s/^checkAvahiDaemon$/# &/ + s/^\s*checkAvahiDaemon$/:/ + s/^\s*installBundledInstall$/:/ s/`hostname`/""/ ' MathInstaller diff --git a/pkgs/applications/science/math/mathematica/versions.nix b/pkgs/applications/science/math/mathematica/versions.nix index 2bcce6c58c3d..74422621c7b4 100644 --- a/pkgs/applications/science/math/mathematica/versions.nix +++ b/pkgs/applications/science/math/mathematica/versions.nix @@ -7,6 +7,20 @@ */ let versions = [ + { + version = "13.3.1"; + lang = "en"; + language = "English"; + sha256 = "sha256-0+mYVGiF4Qn3eiLIoINSHVIqT8GtlBPFRYIOF+nHyQo="; + installer = "Mathematica_13.3.1_LINUX.sh"; + } + { + version = "13.3.1"; + lang = "en"; + language = "English"; + sha256 = "sha256-03R4s05fmTcZnlZIMSI6xlLER58MIoccoCr27F8BXOk="; + installer = "Mathematica_13.3.1_BNDL_LINUX.sh"; + } { version = "13.3.0"; lang = "en"; From 459104f841356362bfb9ce1c788c1d42846b2454 Mon Sep 17 00:00:00 2001 From: rafaelrc7 Date: Sun, 26 Nov 2023 19:46:17 -0300 Subject: [PATCH 2/3] mathematica: add webdoc versions to all-packages The default mathematica package uses the BNDL version of the installer, which is much larger and results in a bigger package than the webdoc version. This change makes it much easier to install the webdoc version. --- pkgs/top-level/all-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3e5a64dc013..5504eb4eb0db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39306,10 +39306,19 @@ with pkgs; mathematica = callPackage ../applications/science/math/mathematica { }; + mathematica-webdoc = callPackage ../applications/science/math/mathematica { + webdoc = true; + }; + mathematica-cuda = callPackage ../applications/science/math/mathematica { cudaSupport = true; }; + mathematica-webdoc-cuda = callPackage ../applications/science/math/mathematica { + webdoc = true; + cudaSupport = true; + }; + mathematica9 = callPackage ../applications/science/math/mathematica { version = "9"; }; From 0bd493d85d37531bdab3bf8daf8652bba882c3b3 Mon Sep 17 00:00:00 2001 From: rafaelrc7 Date: Mon, 27 Nov 2023 17:10:58 -0300 Subject: [PATCH 3/3] mathematica: add rafaelrc to maintainers --- pkgs/applications/science/math/mathematica/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 289c9b7b6580..c4cebcd8e29a 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -77,7 +77,7 @@ callPackage real-drv { homepage = "http://www.wolfram.com/mathematica/"; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ herberteuler ]; + maintainers = with maintainers; [ herberteuler rafaelrc ]; platforms = [ "x86_64-linux" ]; }; }