nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-20 03:43:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

sage: 8.8.beta3 -> 8.8.beta4

Browse Source
This commit is contained in:
Timo Kaufmann 2019-05-05 22:17:44 +02:00
parent 608948e3e9
commit 240d4c31d2
2 changed files with 6 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/applications/science/math/sage/patches/do-not-test-package-manifests.patch
View File

@ -1,26 +0,0 @@
diff --git a/src/sage/misc/package.py b/src/sage/misc/package.py
index 3bca15d53b..7cf04ff8d1 100644
--- a/src/sage/misc/package.py
+++ b/src/sage/misc/package.py
@@ -478,16 +478,16 @@ def package_manifest(package):
EXAMPLES::
- sage: from sage.misc.package import package_manifest
- sage: sagetex_manifest = package_manifest('sagetex')
- sage: sagetex_manifest['package_name'] == 'sagetex'
+ sage: from sage.misc.package import package_manifest # optional - buildsystem
+ sage: sagetex_manifest = package_manifest('sagetex') # optional - buildsystem
+ sage: sagetex_manifest['package_name'] == 'sagetex' # optional - buildsystem
True
- sage: 'files' in sagetex_manifest
+ sage: 'files' in sagetex_manifest # optional - buildsystem
True
Test a nonexistent package::
- sage: package_manifest('dummy-package')
+ sage: package_manifest('dummy-package') # optional - buildsystem
Traceback (most recent call last):
...
KeyError: 'dummy-package'

16
pkgs/applications/science/math/sage/sage-src.nix
View File

@ -10,14 +10,14 @@
# all get the same sources with the same patches applied.
stdenv.mkDerivation rec {
version = "8.8.beta3";
version = "8.8.beta4";
pname = "sage-src";
src = fetchFromGitHub {
owner = "sagemath";
repo = "sage";
rev = version;
sha256 = "0cb95n1h5g9vaf4a6wczhwddj4xvx2a4ky8d7sp7cnxyd5a8618l";
sha256 = "01c1aj70kp4m20ga80mp09lks7p2pgp0g6ggs9nin0zvq5nhcpsx";
};
# Patches needed because of particularities of nix or the way this is packaged.
@ -45,19 +45,15 @@ stdenv.mkDerivation rec {
# Fixes a potential race condition which can lead to transient doctest failures.
./patches/fix-ecl-race.patch
# Part of the build system. Should become unnecessary with sage 8.8.
# Upstream discussion here: https://trac.sagemath.org/ticket/27124#comment:33
./patches/do-not-test-package-manifests.patch
# Not necessary since library location is set explicitly
# https://trac.sagemath.org/ticket/27660#ticket
./patches/do-not-test-find-library.patch
# https://trac.sagemath.org/ticket/27697#ticket
# https://trac.sagemath.org/ticket/27766
(fetchpatch {
name = "pplpy-doc-location-configurable.patch";
url = "https://git.sagemath.org/sage.git/patch/?h=c4d966e7cb0c7b87c55d52dc6f46518433a2a0a2";
sha256 = "0pqbbsx8mriwny422s9mp3z5d095cnam32sm62q4mxk8g8jb9vm9";
name = "more-optional-build-tags.patch";
url = "https://git.sagemath.org/sage.git/patch/?id=a6deff761da469fad57eae498e639d6166fd78ed";
sha256 = "02qb9r3p0vgb9q5hhrp41mcgrk1gxrl02fmp486gnrym3cqnw5n1";
})
# https://trac.sagemath.org/ticket/28007