From f8cdb3eee183ddfbd6cd7ea39aef19da553db481 Mon Sep 17 00:00:00 2001 From: coolcuber Date: Wed, 10 Jun 2026 11:06:38 -0400 Subject: [PATCH] macaulay2: 1.26.05->1.26.06 --- pkgs/by-name/ma/macaulay2/package.nix | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ma/macaulay2/package.nix b/pkgs/by-name/ma/macaulay2/package.nix index 04c20ea6ab78..7bb50d08f63d 100644 --- a/pkgs/by-name/ma/macaulay2/package.nix +++ b/pkgs/by-name/ma/macaulay2/package.nix @@ -64,19 +64,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "macaulay2"; - version = "1.26.05"; + version = "1.26.06"; src = fetchFromGitHub { owner = "Macaulay2"; repo = "M2"; tag = "release-${finalAttrs.version}"; - hash = "sha256-UiPLownaFtuYFUlZhBl+Nl/sRZRhG9OUwepZtFTkTqc"; + hash = "sha256-2e39qzBO63Ft+yw+tJChLsupeinalTkDwXp3WBF2wms="; fetchSubmodules = true; }; docs = fetchurl { url = "https://macaulay2.com/Downloads/OtherSourceCode/Macaulay2-docs-${finalAttrs.version}.tar.gz"; - hash = "sha256-rz9b7HvxfxI978yM9wE7XvLu7DO38i/amokXBU0RjSg="; + hash = "sha256-0+ilvDh87Gmwzx0bLhT6nnadcPwgU3uB6pKhP9VqW0Q="; }; buildInputs = [ @@ -152,16 +152,10 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' sed -i 's/AC_SUBST(REL,.*uname -r.*)/AC_SUBST(REL,"")/' configure.ac - substituteInPlace Macaulay2/packages/DeterminantalRepresentations.m2 \ - --replace-fail "eps = 1e-15" "eps = 1e-14" - '' - # TODO remove in v1.26.06 (see https://github.com/Macaulay2/M2/pull/4334) - # ForeignFunctions.m2 uses `brew --prefix` to discover potential library paths, - # which fails when Homebrew is not installed. - # We patch it to return an empty path instead, which should be harmless - + '' - substituteInPlace Macaulay2/packages/ForeignFunctions.m2 \ - --replace-fail 'get "!brew --prefix"' 'try get "!brew --prefix" else ""' + substituteInPlace configure.ac \ + --replace-fail "[\$gfan_version], [ge], [0.8]" "[\$gfan_version], [ge], [0.6]" + substituteInPlace Macaulay2/packages/gfanInterface.m2 \ + --replace-fail 'MinimumVersion => ("0.8"' 'MinimumVersion => ("0.6"' ''; preConfigure = ''