diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2019-09-24 17:51:09 +0200 |
|---|---|---|
| committer | Timo Kaufmann <timokau@zoho.com> | 2019-09-24 17:51:09 +0200 |
| commit | 1797c9c295a1ffe53866fdfc379afdb37efef09e (patch) | |
| tree | 69bd4edc8f2fefedd9274c7621f44c7feee8ef7d | |
| parent | ba9e5a2785cd81a5c53a2693d4556344b24dd8a5 (diff) | |
| download | nixlib-1797c9c295a1ffe53866fdfc379afdb37efef09e.tar nixlib-1797c9c295a1ffe53866fdfc379afdb37efef09e.tar.gz nixlib-1797c9c295a1ffe53866fdfc379afdb37efef09e.tar.bz2 nixlib-1797c9c295a1ffe53866fdfc379afdb37efef09e.tar.lz nixlib-1797c9c295a1ffe53866fdfc379afdb37efef09e.tar.xz nixlib-1797c9c295a1ffe53866fdfc379afdb37efef09e.tar.zst nixlib-1797c9c295a1ffe53866fdfc379afdb37efef09e.zip | |
sage: 8.9.beta9 -> 8.9.rc0
Sage now by default expects the lcalc library to be named Lfunction (instead of libLfunction). This could be changed by an environment variable (https://trac.sagemath.org/ticket/28224), but various distros seem to agree on this standard (https://groups.google.com/forum/#!topic/sage-packaging/xvh55IxHTZg) so it's best just to follow it. The old standard was set by sage anyway and sage is the only consumer of lcalc in nixpkgs.
| -rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/science/math/lcalc/makefile.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index e85a1f7239db..cf333b315311 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -10,14 +10,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.9.beta9"; + version = "8.9.rc0"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "0axiazlr24rc98784i68hzkzjx7rvrf3qiqz2g6w120a2ls7f1qm"; + sha256 = "112lgdnl11azhpvr8xsrw848l7axijfklcnx19byb0f0vkqd1n3j"; }; # Patches needed because of particularities of nix or the way this is packaged. diff --git a/pkgs/development/libraries/science/math/lcalc/makefile.patch b/pkgs/development/libraries/science/math/lcalc/makefile.patch index f55bbe3f24fa..5c22cf0b84e8 100644 --- a/pkgs/development/libraries/science/math/lcalc/makefile.patch +++ b/pkgs/development/libraries/science/math/lcalc/makefile.patch @@ -104,10 +104,10 @@ index 84e4e88..56ca676 100644 - cp -rf ../include $(INSTALL_DIR)/include/Lfunction + install -d $(INSTALL_DIR)/bin + install -d $(INSTALL_DIR)/$(LIB_DIR) -+ install -d $(INSTALL_DIR)/include/libLfunction ++ install -d $(INSTALL_DIR)/include/Lfunction + install lcalc $(INSTALL_DIR)/bin + install libLfunction.so $(INSTALL_DIR)/$(LIB_DIR) -+ install -m 644 -t $(INSTALL_DIR)/include/libLfunction ../include/*.h ++ install -m 644 -t $(INSTALL_DIR)/include/Lfunction ../include/*.h SRCS = Lcommandline.cc Lcommandline_elliptic.cc Lcommandline_globals.cc Lcommandline_misc.cc Lcommandline_numbertheory.cc Lcommandline_twist.cc Lcommandline_values_zeros.cc Lgamma.cc Lglobals.cc Lmisc.cc Lriemannsiegel.cc Lriemannsiegel_blfi.cc cmdline.c |