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

Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk 2019-10-17 10:49:56 +02:00
parent 36756e930f d2c1c51ebc
commit fc6706f126
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
, lib , lib
, fetchurl , fetchurl
, buildPythonPackage , buildPythonPackage
, isPy3k, pythonOlder , isPy3k, pythonOlder, isPy38
, astor , astor
, gast , gast
, google-pasta , google-pasta
@ -51,6 +51,8 @@ in buildPythonPackage {
inherit (packages) version; inherit (packages) version;
format = "wheel"; format = "wheel";
disabled = isPy38;
src = let src = let
pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion; pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion;
pyver = if stdenv.isDarwin then builtins.substring 0 1 pyVerNoDot else pyVerNoDot; pyver = if stdenv.isDarwin then builtins.substring 0 1 pyVerNoDot else pyVerNoDot;

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

@ -100,7 +100,7 @@ let
in { in {
inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy3k isPyPy pythonAtLeast pythonOlder; inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy3k isPyPy pythonAtLeast pythonOlder;
inherit python bootstrapped-pip buildPythonPackage buildPythonApplication; inherit python bootstrapped-pip buildPythonPackage buildPythonApplication;
inherit fetchPypi callPackage; inherit fetchPypi callPackage;
inherit hasPythonModule requiredPythonModules makePythonPath disabledIf; inherit hasPythonModule requiredPythonModules makePythonPath disabledIf;