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
base: b8da5fc4bdd7
Choose a base ref
...
head repository: NixOS/nixpkgs
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
    Browse the repository at this point in the history

  2. Merge pull request #44381 from twhitehead/tensorflow 

    tensorflow: workaround tensorboard collision due to upstream pip hack
    @FRidh
    FRidh committed Aug 3, 2018
    Copy the full SHA
    2356a84 View commit details
    Browse the repository at this point in the history