JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #103360 from jonringer/python39

Browse Source 
[staging] python39Packages: recurseintoAttrs for package set
This commit is contained in:
Frederik Rietdijk 2020-11-21 13:57:13 +01:00 committed by GitHub
commit 3eb6d01fa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/python-modules/pyflakes/default.nix
View File

@ -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";

5
pkgs/development/python-modules/tensorflow/1/bin.nix
View File

@ -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;

4
pkgs/development/python-modules/tensorflow/2/bin.nix
View File

@ -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;

2
pkgs/top-level/all-packages.nix
View File

@ -10486,7 +10486,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;