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: 56f8f6f31fbc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e897fc34b4ce
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 29, 2020

  1. pythonPackages.webcolors: disable python2, abandoned upstream

    Jonathan Ringer committed Jun 29, 2020
    Copy the full SHA
    990d806 View commit details

  2. pythonPackages.imageio: disable python2 

    ```
  Processing ./imageio-2.8.0-py2-none-any.whl
  ERROR: Package 'imageio' requires a different Python: 2.7.18 not in '>=3.5'
  ```
    Jonathan Ringer committed Jun 29, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f122c08 View commit details

  3. pythonPackages.pydicom: disable python2, abandoned 

    ```
  Processing ./pydicom-2.0.0-py2-none-any.whl
  ERROR: Package 'pydicom' requires a different Python: 2.7.18 not in '>=3.5'
  ```
    Jonathan Ringer committed Jun 29, 2020
    Copy the full SHA
    e897fc3 View commit details
8 changes: 3 additions & 5 deletions pkgs/development/python-modules/imageio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv
, buildPythonPackage
, isPy27
, pathlib
, fetchPypi
, pillow
@@ -16,6 +17,7 @@
buildPythonPackage rec {
pname = "imageio";
version = "2.8.0";
disabled = isPy27;

src = fetchPypi {
sha256 = "fb5fd6d3d17126bbaac9af29fe340e2c97a196eb9416d4f28c0e543744a152cf";
@@ -25,11 +27,7 @@ buildPythonPackage rec {
checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [
imageio-ffmpeg ffmpeg_3
];
propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [
futures
enum34
pathlib
];
propagatedBuildInputs = [ numpy pillow ];

checkPhase = ''
export IMAGEIO_USERDIR="$TMP"
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/pydicom/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy27
, pytest
, pytestrunner
, numpy
@@ -10,6 +11,7 @@
buildPythonPackage rec {
version = "2.0.0";
pname = "pydicom";
disabled = isPy27;

src = fetchPypi {
inherit pname version;
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/webcolors/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy27
, python
, six
}:

buildPythonPackage rec {
pname = "webcolors";
version = "1.11.1";
disabled = isPy27;

src = fetchPypi {
inherit pname version;