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

Commits on Mar 17, 2019

  1. pythonPackages.tensorflow-tensorboard: fix python2 build 

    Fix build after #56669. Update the
python2 hash and re-add the python2 `futures` dependency. Not sure if
there was a reason for it to be removed in the first place.

(cherry picked from commit 9e95109)
    @timokau
    timokau committed Mar 17, 2019
    Copy the full SHA
    57c8d4a View commit details

  2. pythonPackages.tensorflow: fix python<3.4 build 

    This was already added for the source build, but missing for the binary
build.

(cherry picked from commit af7455b)
    @timokau
    timokau committed Mar 17, 2019
    Copy the full SHA
    c42783a View commit details

  3. Merge pull request #57785 from timokau/tensorflow-fixes-19.03 

    [19.03] tensorflow py2 fixes
    @timokau
    timokau authored Mar 17, 2019
    Copy the full SHA
    30d143b View commit details
Showing with 10 additions and 5 deletions.
  1. +8 −4 pkgs/development/python-modules/tensorflow-tensorboard/default.nix
  2. +2 −1 pkgs/development/python-modules/tensorflow/bin.nix
12 changes: 8 additions & 4 deletions pkgs/development/python-modules/tensorflow-tensorboard/default.nix
View file
Original file line number Diff line number Diff line change
@@ -26,12 +26,16 @@ buildPythonPackage rec {
sha256 = "19ixs811ndx8qh72dif0ywjss3rv7pf1khsgg6rvfjb9nw8wgjc2";
} else {
python = "py2";
sha256 = "1mkyb5gn952i4s7fmc9ay4yh74ysrqbiqna6dl1qmahjpbaavbf5";
sha256 = "0qpv6jsf6jjvdl95qvarn006kfj5a99mq925d73xg4af50ssvkrf";
}));

propagatedBuildInputs = [ numpy werkzeug protobuf
markdown
grpcio absl-py ]; # ++ lib.optional (!isPy3k) futures;
propagatedBuildInputs = [
numpy
werkzeug
protobuf
markdown
grpcio absl-py
] ++ lib.optional (!isPy3k) futures;

meta = with stdenv.lib; {
description = "TensorFlow's Visualization Toolkit";
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/tensorflow/bin.nix
View file
Original file line number Diff line number Diff line change
@@ -55,7 +55,8 @@ in buildPythonPackage rec {
in fetchurl dls.${key};

propagatedBuildInputs = [ protobuf numpy termcolor grpcio six astor absl-py gast tensorflow-estimator tensorflow-tensorboard keras-applications keras-preprocessing ]
++ lib.optional (!isPy3k) mock;
++ lib.optional (!isPy3k) mock
++ lib.optionals (pythonOlder "3.4") [ backports_weakref ];

# Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
# and the propageted input tensorflow-tensorboard which causes environment collisions.