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

Merge pull request #252962 from collares/sage-trac-to-gh 

treewide: fetch sage patches from github instead of now-defunct trac
parents 2c84eef3 2701d140

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

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec { 
  patches = [

    (fetchpatch {

      name = "pari_2_11.patch";

      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/pari_2_11.patch?id=21ba7540d385a9864b44850d6987893dfa16bfc0";

      url = "https://raw.githubusercontent.com/sagemath/sage/21ba7540d385a9864b44850d6987893dfa16bfc0/build/pkgs/giac/patches/pari_2_11.patch";

      sha256 = "sha256-vEo/5MNzMdYRPWgLFPsDcMT1W80Qzj4EPBjx/B8j68k=";

    })
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec { 
    # means some outputs differ in the make check. Patch around this:

    (fetchpatch {

      name = "nofltk-check.patch";

      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26";

      url = "https://raw.githubusercontent.com/sagemath/sage/7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26/build/pkgs/giac/patches/nofltk-check.patch";

      sha256 = "sha256-nAl5q3ufLjK3X9s0qMlGNowdRRf3EaC24eVtJABzdXY=";

    })

  ];

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

+3 −3
Original line number Diff line number Diff line
@@ -63,20 +63,20 @@ stdenv.mkDerivation rec { 
  patches = [

    # fix path to info dir (see https://trac.sagemath.org/ticket/11348)

    (fetchpatch {

      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/infodir.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";

      url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/maxima/patches/infodir.patch";

      sha256 = "09v64n60f7i6frzryrj0zd056lvdpms3ajky4f9p6kankhbiv21x";

    })



    # fix https://sourceforge.net/p/maxima/bugs/2596/

    (fetchpatch {

      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/matrixexp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";

      url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/maxima/patches/matrixexp.patch";

      sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg";

    })



    # undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca

    # see https://trac.sagemath.org/ticket/13364#comment:93

    (fetchpatch {

      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";

      url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch";

      sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx";

    })

  ];

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

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec { 


  patches = [

    (fetchpatch {

      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ratpoints/patches/sturm_and_rp_private.patch?id=1615f58890e8f9881c4228c78a6b39b9aab1303a";

      url = "https://raw.githubusercontent.com/sagemath/sage/1615f58890e8f9881c4228c78a6b39b9aab1303a/build/pkgs/ratpoints/patches/sturm_and_rp_private.patch";

      sha256 = "0q3wajncyfr3gahd8gwk9x7g56zw54lpywrl63lqk7drkf60mrcl";

    })

  ];

pkgs/data/misc/conway_polynomials/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec { 


  # Script that creates the "database" (nested python array) and pickles it

  spkg-install = fetchurl {

    url = "https://git.sagemath.org/sage.git/plain/build/pkgs/conway_polynomials/spkg-install.py?id=9.2";

    url = "https://raw.githubusercontent.com/sagemath/sage/9.2/build/pkgs/conway_polynomials/spkg-install.py";

    sha256 = "1bwnqasnyv793hxg29viing4dnliz29grkhldsirq19d509yk1fs";

  };

pkgs/data/misc/elliptic_curves/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec { 


  # Script that creates the sqlite database from the allcurves textfile

  spkg-install = fetchurl {

    url = "https://git.sagemath.org/sage.git/plain/build/pkgs/${pname}/spkg-install.py?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";

    url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/${pname}/spkg-install.py";

    sha256 = "116g684i6mvs11fvb6fzfsr4fn903axn31vigdyb8bgpf8l4hvc5";

  };