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: b8da5fc4bdd7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2356a84bbd91
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 3, 2018

  1. tensorflow: workaround tensorboard collision from upstream pip hack 

    Upstream lists tensorboard as a utility from tensorflow despite it
being provided by tensorboard to stop pip for deleting it.  This
causes python.withPackages collisions between the two.
    @twhitehead
    twhitehead committed Aug 3, 2018
    Copy the full SHA
    fd0c467 View commit details

  2. Merge pull request #44381 from twhitehead/tensorflow 

    tensorflow: workaround tensorboard collision due to upstream pip hack
    @FRidh
    FRidh authored Aug 3, 2018
    Copy the full SHA
    2356a84 View commit details
Showing with 9 additions and 0 deletions.
  1. +9 −0 pkgs/development/python-modules/tensorflow/bin.nix
9 changes: 9 additions & 0 deletions pkgs/development/python-modules/tensorflow/bin.nix
View file
Original file line number Diff line number Diff line change
@@ -61,6 +61,15 @@ in buildPythonPackage rec {
# bleach) Hence we disable dependency checking for now.
installFlags = lib.optional isPy36 "--no-dependencies";


# Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
# and the propageted input tensorflow-tensorboard which causes environment collisions.
#
# https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79
postInstall = ''
rm $out/bin/tensorboard
'';

# Note that we need to run *after* the fixup phase because the
# libraries are loaded at runtime. If we run in preFixup then
# patchelf --shrink-rpath will remove the cuda libraries.