Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tensorflow-bin_2: fix tensorboard dependency #85399

Merged
merged 2 commits into from May 5, 2020

Conversation

@cgevans
Copy link
Contributor

cgevans commented Apr 16, 2020

Motivation for this change

Fixes #85090. Tensorboard-bin_2 had the wrong tensorboard as an input, and did not include handling of the tensorboard pip hack (#44381).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
cgevans added 2 commits Apr 16, 2020
@cole-h
Copy link
Member

cole-h commented Apr 17, 2020

@ofborg eval

GitHub and broken APIs, name a better duo. (Sorry about this.)

Copy link
Member

cdepillabout left a comment

LGTM.

I tested this by checking out this PR and running the following:

$ nix-shell -I nixpkgs=./. -p 'python3.withPackages (p: with p; [tensorflow-bin_2])'
...
$ tensorboard  --logdir mylogdir   # this was run in the nix-shell

tensorboard appears to run fine.

I had noticed the collision of the tensorboard binaries before, so I think this fixes it.

@FRidh FRidh requested a review from Ericson2314 Apr 17, 2020
@bhipple bhipple merged commit 36ee1e7 into NixOS:master May 5, 2020
14 checks passed
14 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="dfbee5e"; rev="dfbee5e5568960f3c416367ee865e9b2f9621a58"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="dfbee5e"; rev="dfbee5e5568960f3c416367ee865e9b2f9621a58"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="dfbee5e"; rev="dfbee5e5568960f3c416367ee865e9b2f9621a58"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="dfbee5e"; rev="dfbee5e5568960f3c416367ee865e9b2f9621a58"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="dfbee5e"; rev="dfbee5e5568960f3c416367ee865e9b2f9621a58"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="dfbee5e"; rev="dfbee5e5568960f3c416367ee865e9b2f9621a58"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="dfbee5e"; rev="dfbee5e5568960f3c416367ee865e9b2f9621a58"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

5 participants
You can’t perform that action at this time.