From 24896293e40cecb2f22cc4db0a13c41697745049 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 25 Mar 2021 08:34:54 +0100 Subject: [PATCH] python2Packages.scandir: python 2 only --- pkgs/development/python-modules/graphite-web/default.nix | 6 +++--- pkgs/development/python-modules/pathlib2/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 2 -- pkgs/top-level/python2-packages.nix | 2 ++ 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index 81260110f92..d2d6a78436a 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -1,4 +1,6 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , django , memcached , txamqp @@ -9,7 +11,6 @@ , cairocffi , whisper , whitenoise -, scandir , urllib3 , six }: @@ -38,7 +39,6 @@ buildPythonPackage rec { cairocffi whisper whitenoise - scandir urllib3 six ]; diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 6e04f2e7a03..b21536060d3 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -3,9 +3,9 @@ , fetchPypi , six , pythonOlder -, scandir +, scandir ? null , glibcLocales -, mock +, mock ? null }: buildPythonPackage rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 634ba5a64f0..3c697925b7d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6931,8 +6931,6 @@ in { scales = callPackage ../development/python-modules/scales { }; - scandir = callPackage ../development/python-modules/scandir { }; - scapy = callPackage ../development/python-modules/scapy { }; schedule = callPackage ../development/python-modules/schedule { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 7538c485dc1..4d22811757b 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -511,6 +511,8 @@ with self; with super; { sandboxlib = callPackage ../development/python-modules/sandboxlib { }; + scandir = callPackage ../development/python-modules/scandir { }; + scikitlearn = callPackage ../development/python-modules/scikitlearn/0.20.nix { inherit (pkgs) gfortran glibcLocales; };