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: add3780631ce
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: fd11f3af1ea1
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Mar 23, 2020

  1. python3Packages.spyder-kernels: Add spyder-kernels_0_5 

    Previously top-level/python-packages.nix called spyder-kernels v0.5 for
Py2k. Now both v0.5 and v1.8 (default.nix) are in pythonPackages, as
required by cq-editor and spyder v4 respectively.
v0.5 also now comes from GitHub instead of PyPi, with checks enabled.

(cherry picked from commit a1f4519)
    @marcus7070
    marcus7070 committed Mar 23, 2020
    Copy the full SHA
    088ae2c View commit details
    Browse the repository at this point in the history

  2. python3Packages.spyder_3: Added spyder_3 

    cq-editor currently requires spyder v3.x

(cherry picked from commit c5ceb64)
    @marcus7070
    marcus7070 committed Mar 23, 2020
    Copy the full SHA
    c5f397f View commit details
    Browse the repository at this point in the history

  3. cq-editor: use spyder_3 

    (cherry picked from commit d8a7d1f)
    @marcus7070
    marcus7070 committed Mar 23, 2020
    Copy the full SHA
    ee106b9 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #83184 from marcus7070/release-20.03 

    [20.03] python3Packages.spyder: add v3.x
    @worldofpeace
    worldofpeace committed Mar 23, 2020
    Copy the full SHA
    fd11f3a View commit details
    Browse the repository at this point in the history