From 976062ebd6728d63509e007245de97325dd5b19c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 10 Nov 2020 15:10:27 -0800 Subject: [PATCH 1/4] python39Packages: recurseintoAttrs for package set --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7a035589206..78b48577d154 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10450,7 +10450,7 @@ in python36Packages = python36.pkgs; python37Packages = recurseIntoAttrs python37.pkgs; python38Packages = recurseIntoAttrs python38.pkgs; - python39Packages = python39.pkgs; + python39Packages = recurseIntoAttrs python39.pkgs; python310Packages = python310.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; From a7871cb54ce021e415d71508b2996de6b293f683 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 10 Nov 2020 15:29:48 -0800 Subject: [PATCH 2/4] python39Packages.tensorflow_1-bin: fix disable logic --- pkgs/development/python-modules/tensorflow/1/bin.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/1/bin.nix b/pkgs/development/python-modules/tensorflow/1/bin.nix index 9bd2bc78437a..5c93e957f7c1 100644 --- a/pkgs/development/python-modules/tensorflow/1/bin.nix +++ b/pkgs/development/python-modules/tensorflow/1/bin.nix @@ -2,7 +2,7 @@ , lib , fetchurl , buildPythonPackage -, isPy3k, pythonOlder, isPy38 +, isPy3k, pythonOlder, pythonAtLeast , astor , gast , google-pasta @@ -50,8 +50,7 @@ in buildPythonPackage { inherit pname; inherit (packages) version; format = "wheel"; - - disabled = isPy38; + disabled = pythonAtLeast "3.8"; src = let pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion; From b61df8cd970c8d2c0a4c63df1f5dcedbc9267d55 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 10 Nov 2020 17:53:48 -0800 Subject: [PATCH 3/4] python39Packages.tensorflow_2-bin: fix disable logic --- pkgs/development/python-modules/tensorflow/2/bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/2/bin.nix b/pkgs/development/python-modules/tensorflow/2/bin.nix index acb5f473ec9d..8dd282666a75 100644 --- a/pkgs/development/python-modules/tensorflow/2/bin.nix +++ b/pkgs/development/python-modules/tensorflow/2/bin.nix @@ -2,7 +2,7 @@ , lib , fetchurl , buildPythonPackage -, isPy3k, pythonOlder, isPy38 +, isPy3k, pythonOlder, pythonAtLeast, isPy38 , astor , gast , google-pasta @@ -54,7 +54,7 @@ in buildPythonPackage { inherit (packages) version; format = "wheel"; - disabled = isPy38; + disabled = pythonAtLeast "3.8"; src = let pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion; From fbda64845f808768d9781c480a80af5c9f42470f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 10 Nov 2020 18:21:15 -0800 Subject: [PATCH 4/4] python39Packages.pyflakes: disable python39 tests Sensitive to exact parser output --- pkgs/development/python-modules/pyflakes/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index d8cc45119482..04bc56df12d2 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, unittest2 }: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, unittest2 }: buildPythonPackage rec { pname = "pyflakes"; @@ -11,6 +11,9 @@ buildPythonPackage rec { checkInputs = [ unittest2 ]; + # some tests are output dependent, which have changed slightly + doCheck = pythonOlder "3.9"; + meta = with stdenv.lib; { homepage = "https://launchpad.net/pyflakes"; description = "A simple program which checks Python source files for errors";