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

libbraiding: 1.2 -> 1.3.1, import sage update patch (#370861)

parents 13a15b48 5eed495f

pkgs/by-name/li/libbraiding/package.nix

+7 −3
Original line number Diff line number Diff line
@@ -3,21 +3,25 @@ 
  stdenv,

  fetchFromGitHub,

  autoreconfHook,

  pkg-config,

}:



stdenv.mkDerivation rec {

  version = "1.2";

  version = "1.3.1";

  pname = "libbraiding";



  src = fetchFromGitHub {

    owner = "miguelmarco";

    repo = "libbraiding";

    rev = version;

    sha256 = "sha256-cgg6rvlOvFqGjgbw6i7QXS+tqvfFd1MkPCEjnW/FyFs=";

    # version 1.3.1 contains a typo in configure.ac, fixed in the next commit.

    # TODO: remove if on upgrade

    rev = if version == "1.3.1" then "b174832026c2412baec83277c461e4df71d8525c" else version;

    hash = "sha256-ar/EiaMZuQRa1lr0sZPLRuk5K00j63TqNf0q0iuiKjw=";

  };



  nativeBuildInputs = [

    autoreconfHook

    pkg-config

  ];



  # no tests included for now (2018-08-05), but can't hurt to activate

pkgs/by-name/sa/sage/sage-src.nix

+7 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec { 
    # a more conservative version of https://github.com/sagemath/sage/pull/37951

    ./patches/gap-element-crash.patch



    # https://github.com/sagemath/sage/pull/38940, positively reviewed, to land in 10.6.beta0

    # https://github.com/sagemath/sage/pull/38940, landed in 10.6.beta0

    (fetchpatch {

      name = "simplicial-sets-flaky-test.patch";

      url = "https://github.com/sagemath/sage/commit/1830861c5130d30b891e8c643308e1ceb91ce2b5.diff";
@@ -76,6 +76,12 @@ stdenv.mkDerivation rec { 
  # should come from or be proposed to upstream. This list will probably never

  # be empty since dependencies update all the time.

  packageUpgradePatches = [

    # https://github.com/sagemath/sage/pull/38887, landed in 10.6.beta0

    (fetchpatch {

      name = "libbraiding-1.3-update.patch";

      url = "https://github.com/sagemath/sage/commit/f10a6d04599795732c1d99e2da0a4839ccdcb4f5.diff";

      hash = "sha256-xB0xg8dGLnSMdFK3/B5hkI9yzI5N3lUMhPZ89lDsp3s=";

    })

  ];



  patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;