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.

Sign up for GitHub

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

Jump to bottom

[19.03] tensorflow py2 fixes #57785

Merged
merged 2 commits into from Mar 17, 2019
Merged

[19.03] tensorflow py2 fixes #57785

merged 2 commits into from Mar 17, 2019

Conversation

timokau
Copy link
Member

@timokau timokau commented Mar 17, 2019

Motivation for this change

Backport of #56820.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@timokau
pythonPackages.tensorflow-tensorboard: fix python2 build
57c8d4a 
Fix build after NixOS#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
pythonPackages.tensorflow: fix python<3.4 build
c42783a 
This was already added for the source build, but missing for the binary
build.

(cherry picked from commit af7455b)
@timokau timokau requested a review from FRidh as a code owner March 17, 2019 10:33
@timokau
Copy link
Member Author

timokau commented Mar 17, 2019

@GrahamcOfBorg build python2.pkgs.tensorflow python3.pkgs.tensorflow

@timokau timokau merged commit 30d143b into NixOS:release-19.03 Mar 17, 2019
@timokau timokau deleted the tensorflow-fixes-19.03 branch March 17, 2019 10:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh Awaiting requested review from FRidh FRidh is a code owner

@abbradar abbradar Awaiting requested review from abbradar

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@timokau @GrahamcOfBorg