From 6a800927bbd97c606b3c0096cab9c218d652cc6f Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 13 Dec 2019 20:29:16 +0100 Subject: [PATCH 1/2] pybrial: 1.2.3 -> 1.2.5, directly use the brial src The pybrial package is a bit awkward. It doesn't have its own top-level attribute, since it has a cyclic dependency with sage. That's one of the reasons why it rarely gets updated. Its distributed along with brial, so its best to keep the versions synchronized. The easiest way to do this is to just re-use the source of brial. --- pkgs/applications/science/math/sage/pybrial.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/math/sage/pybrial.nix b/pkgs/applications/science/math/sage/pybrial.nix index 092a340bb5b518..718414126ae8f0 100644 --- a/pkgs/applications/science/math/sage/pybrial.nix +++ b/pkgs/applications/science/math/sage/pybrial.nix @@ -1,6 +1,7 @@ { stdenv , fetchFromGitHub , buildPythonPackage +, brial }: # This has a cyclic dependency with sage. I don't include sage in the # buildInputs and let python figure it out at runtime. Because of this, @@ -9,15 +10,10 @@ # it). buildPythonPackage rec { pname = "pyBRiAl"; - version = "1.2.3"; + version = brial.version; # included with BRiAl source - src = fetchFromGitHub { - owner = "BRiAl"; - repo = "BRiAl"; - rev = version; - sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg"; - }; + src = brial.src; sourceRoot = "source/sage-brial"; From 135081a53821ff49f5dc93b24dba585dd867a78a Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 13 Dec 2019 20:31:31 +0100 Subject: [PATCH 2/2] brial: 1.2.5 -> 1.2.6 Motivation is mostly https://github.com/BRiAl/BRiAl/pull/37, which is a pre-requiste for getting the sage tests to pass with python3. --- pkgs/development/libraries/science/math/brial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix index f08f6425655f4d..56a78b00cd6483 100644 --- a/pkgs/development/libraries/science/math/brial/default.nix +++ b/pkgs/development/libraries/science/math/brial/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - version = "1.2.5"; + version = "1.2.6"; pname = "brial"; src = fetchFromGitHub { owner = "BRiAl"; repo = "BRiAl"; rev = version; - sha256 = "1nv56fp3brpzanxj7vwvxqdafqfsfhdgq5imr3m94psw5gdfqwja"; + sha256 = "1mc1zjr3mxcx6bg0js5k9jx65japg7644b0aj1al75m4nwh2ygab"; }; # FIXME package boost-test and enable checks