Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cf82fcd3ae63
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 774d39092e71
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 20, 2019

  1. sage: backport threejs r100 compatibility 

    #62736 (comment)
(cherry picked from commit 2d78d92)
    @timokau
    timokau committed Jun 20, 2019
    Copy the full SHA
    d7a2ea4 View commit details

  2. sage: fix online threejs 

    (cherry picked from commit 9955657)
    @timokau
    timokau committed Jun 20, 2019
    Copy the full SHA
    ee24b98 View commit details

  3. Merge pull request #63561 from timokau/sage-threejs-r105-19.03 

    sage: fix threejs r105 [19.03]
    @timokau
    timokau authored Jun 20, 2019
    Copy the full SHA
    774d390 View commit details
Showing with 14 additions and 0 deletions.
  1. +7 −0 pkgs/applications/science/math/sage/sage-src.nix
  2. +7 −0 pkgs/applications/science/math/sage/sage-with-env.nix
7 changes: 7 additions & 0 deletions pkgs/applications/science/math/sage/sage-src.nix
View file
Original file line number Diff line number Diff line change
@@ -146,6 +146,13 @@ stdenv.mkDerivation rec {

# https://trac.sagemath.org/ticket/27405
./patches/ignore-pip-deprecation.patch

# 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;
7 changes: 7 additions & 0 deletions pkgs/applications/science/math/sage/sage-with-env.nix
View file
Original file line number Diff line number Diff line change
@@ -99,6 +99,13 @@ stdenv.mkDerivation rec {
for pkg in ${lib.concatStringsSep " " input_names}; do
touch "installed/$pkg"
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 = ''