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

Commits on Oct 16, 2019

  1. Merge staging into staging-next

    @FRidh
    FRidh committed Oct 16, 2019
    Copy the full SHA
    924574a View commit details

  2. pythonPackages: make isPy38 available

    @FRidh
    FRidh committed Oct 16, 2019
    Copy the full SHA
    0031003 View commit details

  3. pythonPackages.tensorflow-bin: disable for python 3.8

    @FRidh
    FRidh committed Oct 16, 2019
    Copy the full SHA
    d2c1c51 View commit details

Commits on Oct 17, 2019

  1. Merge staging-next into staging

    @FRidh
    FRidh committed Oct 17, 2019
    Copy the full SHA
    fc6706f View commit details
Showing with 4 additions and 2 deletions.
  1. +3 −1 pkgs/development/python-modules/tensorflow/bin.nix
  2. +1 −1 pkgs/top-level/python-packages.nix
4 changes: 3 additions & 1 deletion pkgs/development/python-modules/tensorflow/bin.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
, lib
, fetchurl
, buildPythonPackage
, isPy3k, pythonOlder
, isPy3k, pythonOlder, isPy38
, astor
, gast
, google-pasta
@@ -51,6 +51,8 @@ in buildPythonPackage {
inherit (packages) version;
format = "wheel";

disabled = isPy38;

src = let
pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion;
pyver = if stdenv.isDarwin then builtins.substring 0 1 pyVerNoDot else pyVerNoDot;
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -100,7 +100,7 @@ let

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 fetchPypi callPackage;
inherit hasPythonModule requiredPythonModules makePythonPath disabledIf;