Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

brial: 1.2.5 -> 1.2.6, pybrial: use brial src #75613

Merged
merged 2 commits into from Dec 13, 2019
Merged

brial: 1.2.5 -> 1.2.6, pybrial: use brial src #75613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a80092
pybrial: 1.2.3 -> 1.2.5, directly use the brial src
timokau Dec 13, 2019
135081a
brial: 1.2.5 -> 1.2.6
timokau Dec 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 3 additions & 7 deletions pkgs/applications/science/math/sage/pybrial.nix
View file
Open in desktop
@@ -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,
Expand All @@ -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";

Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/science/math/brial/default.nix
View file
Open in desktop
Expand Up @@ -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
Expand Down