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

Merge pull request #63560 from timokau/sage-threejs-r105

Browse Source 
sage: fix threejs r105
This commit is contained in:
Timo Kaufmann 2019-06-20 14:55:13 +02:00 committed by GitHub
commit ac28607a03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,6 +152,13 @@ stdenv.mkDerivation rec {
rev = "c11d9cfa23ff9f77681a8f12742f68143eed4504"; rev = "c11d9cfa23ff9f77681a8f12742f68143eed4504";
sha256 = "0xzra7mbgqvahk9v45bjwir2mqz73hrhhy314jq5nxrb35ysdxyi"; sha256 = "0xzra7mbgqvahk9v45bjwir2mqz73hrhhy314jq5nxrb35ysdxyi";
}) })
# https://trac.sagemath.org/ticket/26718
(fetchpatch {
name = "threejs-r100.patch";
url = "https://git.sagemath.org/sage.git/patch/?h=86c5bb000259e6de5d7c60afc608a4b0d010b690";
sha256 = "0sgqqd4df2bxsq19b6kfy7dvgyxprlpg7f3xx7g3fs8ij937m352";
})
]; ];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

7
pkgs/applications/science/math/sage/sage-with-env.nix
View File

@ -99,6 +99,13 @@ stdenv.mkDerivation rec {
for pkg in ${lib.concatStringsSep " " input_names}; do for pkg in ${lib.concatStringsSep " " input_names}; do
touch "installed/$pkg" touch "installed/$pkg"
done done
# threejs version is in format 0.<version>.minor, but sage currently still
# relies on installed_packages for the online version of threejs to work
# and expects the format r<version>. This is a hotfix for now.
# upstream: https://trac.sagemath.org/ticket/26434
rm "installed/threejs"*
touch "installed/threejs-r${lib.versions.minor three.version}"
''; '';
installPhase = '' installPhase = ''