Unverified Commit a40405b9 authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

Merge pull request #207697 from herberteuler/fix/mathematica-13.2.0 

mathematica: 13.1.0 -> 13.2.0
parents 6f94877e d6a592c0

pkgs/applications/science/math/mathematica/default.nix

+13 −3
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
, cudaPackages

, cudaSupport ? config.cudaSupport or false

, lang ? "en"

, webdoc ? false

, version ? null

/*

If you wish to completely override the src, use:
@@ -30,16 +31,20 @@ let versions = callPackage ./versions.nix { }; 
    matching-versions =

      lib.sort (v1: v2: lib.versionAtLeast v1.version v2.version) (lib.filter

        (v: v.lang == lang

            && (if version == null then true else isMatching v.version version))

            && (version == null || isMatching v.version version)

            && matchesDoc v)

        versions);



    found-version =

      if matching-versions == []

      then throw ("No registered Mathematica version found to match"

                  + " version=${version} and language=${lang}")

                  + " version=${toString version} and language=${lang},"

                  + " ${if webdoc

                        then "using web documentation"

                        else "and with local documentation"}")

      else lib.head matching-versions;



    specific-drv = ./. + "/(lib.versions.major found-version.version).nix";

    specific-drv = ./. + "/${lib.versions.major found-version.version}.nix";



    real-drv = if lib.pathExists specific-drv

               then specific-drv
@@ -52,6 +57,11 @@ let versions = callPackage ./versions.nix { }; 
          sublist = l: lib.sublist 0 n l;

      in lib.compareLists lib.compare (sublist as) (sublist bs) == 0;



    matchesDoc = v:

      builtins.match (if webdoc

                      then ".*[0-9]_LINUX.sh"

                      else ".*[0-9]_BNDL_LINUX.sh") v.src.name != null;



in



callPackage real-drv {

pkgs/applications/science/math/mathematica/versions.nix

+27 −0
Original line number Diff line number Diff line 
{ lib, requireFile }:



/*

 * To calculate the hash of an installer, use a command like this:

 *

 *   nix --extra-experimental-features nix-command hash file <installer-file>

 */



let versions = [

  {

    version = "13.2.0";

    lang = "en";

    language = "English";

    sha256 = "sha256-T9XOXA6jpgN6bcO/do9sw1L73ABtyxuZCLzftv4Cl6o=";

    installer = "Mathematica_13.2.0_LINUX.sh";

  }

  {

    version = "13.2.0";

    lang = "en";

    language = "English";

    sha256 = "sha256-YRUvl2H9SwpwDZx04ugd7ZnK5G+t88bzAObXsGGVhk0=";

    installer = "Mathematica_13.2.0_BNDL_LINUX.sh";

  }

  {

    version = "13.1.0";

    lang = "en";

    language = "English";

    sha256 = "sha256-GZyUYslx/M4aFI3Pj9Osw3/w79/Jp/4T3mRE277pNuM=";

    installer = "Mathematica_13.1.0_LINUX.sh";

  }

  {

    version = "13.1.0";

    lang = "en";