Unverified Commit d3fd6364 authored by Mauricio Collares's avatar Mauricio Collares Committed by GitHub
Browse files

Merge pull request #298957 from Feyorsh/sage-dep 

sage: fix dependencies on Darwin/Clang16
parents f6618fa3 e7f6ab70

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

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec { 


  postPatch = lib.optionalString stdenv.cc.isClang ''

    substituteInPlace Makefile --replace "-fno-guess-branch-probability" ""



    for f in $(find -name "*.h" -or -name "*.cpp"); do

        substituteInPlace "$f" --replace-quiet "log2" "_log2"

    done

  '';



  buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++" ];

pkgs/applications/science/math/sage/sage-env.nix

+0 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
, ecm

, lcalc

, rubiks

, flintqs

, blas

, lapack

, flint3
@@ -93,7 +92,6 @@ let 
    ecm

    lcalc

    rubiks

    flintqs

    jdk # only needed for `jmol` which may be replaced in the future

    less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved

  ]

pkgs/applications/science/math/sage/sage-with-env.nix

+0 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
, gmp

, gfan

, python3

, flintqs

, eclib

, ntl

, ecm
@@ -40,7 +39,6 @@ let 
    gfan

    maxima

    eclib

    flintqs

    ntl

    ecm

  ];

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

+3 −6
Original line number Diff line number Diff line
@@ -13,12 +13,9 @@ 
, doxygen

, graphviz

, latex2html

# upstream generates docs with texinfo 4. later versions of texinfo

# use letters instead of numbers for post-appendix chapters, and we

# want it to match the upstream format because sage depends on it.

, texinfo4

, texinfo

, texliveSmall

, enableDocs ? true

, enableDocs ? !stdenv.isDarwin

, enableGfanlib ? true

}:
@@ -85,7 +82,7 @@ stdenv.mkDerivation rec { 
    doxygen

    graphviz

    latex2html

    texinfo4

    texinfo

    texliveSmall

  ] ++ lib.optionals stdenv.isDarwin [ getconf ];

  depsBuildBuild = [ buildPackages.stdenv.cc ];

pkgs/development/libraries/fflas-ffpack/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ stdenv.mkDerivation rec { 
  doCheck = true;



  meta = with lib; {

    broken = stdenv.isDarwin;

    description = "Finite Field Linear Algebra Subroutines";

    mainProgram = "fflas-ffpack-config";

    license = licenses.lgpl21Plus;