Navigation Menu

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
base: 1438b2fcc6d3
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 7abdacc4f2be
Choose a head ref
  • 16 commits
  • 7 files changed
  • 1 contributor

Commits on Nov 25, 2018

  1. sage: 8.4 -> 8.5.beta0

    @timokau
    timokau committed Nov 25, 2018
    Copy the full SHA
    6138f5d View commit details
    Browse the repository at this point in the history

  2. sage: 8.5.beta0 -> 8.5.beta1

    @timokau
    timokau committed Nov 25, 2018
    Copy the full SHA
    8e7da1b View commit details
    Browse the repository at this point in the history

  3. sage: add short tests

    @timokau
    timokau committed Nov 25, 2018
    Copy the full SHA
    883aa99 View commit details
    Browse the repository at this point in the history

  4. sage: 8.5.beta1 -> 8.5.beta2

    @timokau
    timokau committed Nov 25, 2018
    Copy the full SHA
    3370247 View commit details
    Browse the repository at this point in the history

  5. sage: 8.5.beta2 -> 8.5.beta3

    @timokau
    timokau committed Nov 25, 2018
    Copy the full SHA
    2a87caa View commit details
    Browse the repository at this point in the history

  6. sage: 8.5.beta3 -> 8.5.beta4

    @timokau
    timokau committed Nov 25, 2018
    Copy the full SHA
    90cebaf View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2018

  1. Merge remote-tracking branch 'upstream/master' into sage-8.5

    @timokau
    timokau committed Nov 27, 2018
    Copy the full SHA
    2dd9a0e View commit details
    Browse the repository at this point in the history

  2. sage: 8.5.beta4 -> 8.5.beta5

    @timokau
    timokau committed Nov 27, 2018
    Copy the full SHA
    7ca2915 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2018

  1. sage: preload openblasCompat

    @timokau
    timokau committed Nov 28, 2018
    Copy the full SHA
    4900bbe View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2018

  1. sage: 8.5.beta5 -> 8.5.beta6

    @timokau
    timokau committed Dec 10, 2018
    Copy the full SHA
    90bc5ce View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2018

  1. sage: 8.5.rc0 -> 8.5.rc1

    @timokau
    timokau committed Dec 16, 2018
    Copy the full SHA
    b09967d View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2018

  1. sage: 8.5.rc1 -> 8.5

    @timokau
    timokau committed Dec 28, 2018
    Copy the full SHA
    6f0f06e View commit details
    Browse the repository at this point in the history

  2. sage: remove outdated patch files

    @timokau
    timokau committed Dec 28, 2018
    Copy the full SHA
    360eddd View commit details
    Browse the repository at this point in the history

  3. Revert "sage: preload openblasCompat" 

    This reverts commit 4900bbe.

The issue that was supposed to fix is now fixed by lazy-loading rpy2 and
makign sure scipy is loaded before that.
That is not quite as nice, but preloading is now causing its own issues
with openblas 0.3.4:
OpenMathLib/OpenBLAS#1936
    @timokau
    timokau committed Dec 28, 2018
    Copy the full SHA
    95909d4 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2018

  1. Merge remote-tracking branch 'upstream/master' into sage-8.5

    @timokau
    timokau committed Dec 29, 2018
    Copy the full SHA
    22c16ed View commit details
    Browse the repository at this point in the history

  2. Merge pull request #51039 from timokau/sage-8.5 

    sage: 8.4 -> 8.5
    @timokau
    timokau committed Dec 29, 2018
    Copy the full SHA
    7abdacc View commit details
    Browse the repository at this point in the history