colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #75613 from timokau/brial-1.2.6

Browse Source 
brial: 1.2.5 -> 1.2.6, pybrial: use brial src
This commit is contained in:
Timo Kaufmann 2019-12-13 21:47:50 +01:00 committed by GitHub
commit ce013bb430
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/science/math/sage/pybrial.nix
View File

@ -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";

4
pkgs/development/libraries/science/math/brial/default.nix
View File

@ -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