diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-10-16 19:26:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-16 19:26:48 -0400 |
| commit | 84c2b044c021d61a36ef6f7dc451f4e57e750d53 (patch) | |
| tree | e94d1c71f7b285bd1807a06e0ae1889cf2bca805 | |
| parent | [Backport release-24.05] warp-terminal: 0.2024.07.16.08.02.stable_03 -> 0.202... (diff) | |
| parent | mathematica: 14.0.0 -> 14.1.0 (diff) | |
| download | nixpkgs-84c2b044c021d61a36ef6f7dc451f4e57e750d53.tar.gz | |
[Backport release-24.05] mathematica: 14.0.0 -> 14.1.0 (#348324)
3 files changed, 29 insertions, 9 deletions
diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index c4cebcd8e29a..49da225d4c24 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -59,8 +59,8 @@ let versions = callPackage ./versions.nix { }; matchesDoc = v: builtins.match (if webdoc - then ".*[0-9]_LINUX.sh" - else ".*[0-9]_BNDL_LINUX.sh") v.src.name != null; + then ".*[0-9]_LIN(UX)?.sh" + else ".*_B[Nn][Dd][Ll].sh") v.src.name != null; in @@ -77,7 +77,7 @@ callPackage real-drv { homepage = "http://www.wolfram.com/mathematica/"; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ herberteuler rafaelrc ]; + maintainers = with maintainers; [ herberteuler rafaelrc chewblacka ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/science/math/mathematica/generic.nix b/pkgs/applications/science/math/mathematica/generic.nix index 5a96bf1a2625..17b6916bc087 100644 --- a/pkgs/applications/science/math/mathematica/generic.nix +++ b/pkgs/applications/science/math/mathematica/generic.nix @@ -157,9 +157,15 @@ in stdenv.mkDerivation { mkdir -p "$out/lib/udev/rules.d" - # Patch MathInstaller's shebangs and udev rules dir - patchShebangs MathInstaller - substituteInPlace MathInstaller \ + # Set name of installer file + if [ -f "MathInstaller" ]; then + INSTALLER="MathInstaller" + else + INSTALLER="WolframInstaller" + fi + # Patch Installer's shebangs and udev rules dir + patchShebangs $INSTALLER + substituteInPlace $INSTALLER \ --replace /etc/udev/rules.d $out/lib/udev/rules.d # Remove PATH restriction, root and avahi daemon checks, and hostname call @@ -169,13 +175,13 @@ in stdenv.mkDerivation { s/^\s*checkAvahiDaemon$/:/ s/^\s*installBundledInstall$/:/ s/`hostname`/""/ - ' MathInstaller + ' $INSTALLER # NOTE: some files placed under HOME may be useful XDG_DATA_HOME="$out/share" HOME="$TMPDIR/home" vernierLink=y \ - ./MathInstaller -execdir="$out/bin" -targetdir="$out/libexec/Mathematica" -auto -verbose -createdir=y + ./$INSTALLER -execdir="$out/bin" -targetdir="$out/libexec/Mathematica" -auto -verbose -createdir=y - # Check if MathInstaller produced any errors + # Check if Installer produced any errors errLog="$out/libexec/Mathematica/InstallErrors" if [ -f "$errLog" ]; then echo "Installation errors:" diff --git a/pkgs/applications/science/math/mathematica/versions.nix b/pkgs/applications/science/math/mathematica/versions.nix index 3bbf70433471..5f525a28fdfb 100644 --- a/pkgs/applications/science/math/mathematica/versions.nix +++ b/pkgs/applications/science/math/mathematica/versions.nix @@ -8,6 +8,20 @@ let versions = [ { + version = "14.1.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-PCpjwqA6NC+iwvYxddYBlmF5+vl76r+MoIYAL91WFns="; + installer = "Wolfram_14.1.0_LIN.sh"; + } + { + version = "14.1.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-pnu60Pv3xo3+MAkDLiU3yTPVbbQ00diV45vSVL8B310="; + installer = "Wolfram_14.1.0_LIN_Bndl.sh"; + } + { version = "14.0.0"; lang = "en"; language = "English"; |