From 931d7f929d700819e4f9e61a2931355768eefdc7 Mon Sep 17 00:00:00 2001 From: SharzyL Date: Sat, 5 Oct 2024 23:55:48 +0800 Subject: [PATCH] mathematica: fix incorrect matchesDoc with #343491 With mathematica 14 came into nixpkgs with #343491, there are two types of file names of local-doc installer, "Wolfram_*_LIN_Bndl.sh" and "Mathematica_*_BNDL_LINUX.sh". However, the modified matchesDoc implementation failed to match the later type, causing evaluation errors. --- pkgs/applications/science/math/mathematica/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 9d0a308f4435..617fd46b050e 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -51,10 +51,7 @@ 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]_LIN(UX)?.sh" - else ".*_B[Nn][Dd][Ll].sh") v.src.name != null; + matchesDoc = v: (builtins.match ".*[0-9]_LIN(UX)?.sh" v.src.name != null) == webdoc; in