pythonPackages.tensorflow: 1.11 -> 1.13.1 #56669
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timokau
reviewed
Mar 4, 2019
| propagatedBuildInputs = [ numpy werkzeug protobuf markdown grpcio ] ++ lib.optional (!isPy3k) futures; | ||
| propagatedBuildInputs = [ numpy werkzeug protobuf | ||
| markdown | ||
| grpcio absl-py ]; # ++ lib.optional (!isPy3k) futures; |
| @@ -22,13 +23,15 @@ buildPythonPackage rec { | |||
| format = "wheel"; | |||
| } // (if isPy3k then { | |||
| python = "py3"; | |||
| sha256 = "1nkd37zq9mk0gc9x6d4x8whahbx2cn0wl94lir3g1pibdzx9hc4v"; | |||
| sha256 = "19ixs811ndx8qh72dif0ywjss3rv7pf1khsgg6rvfjb9nw8wgjc2"; | |||
| } else { | |||
| python = "py2"; | |||
| sha256 = "1mkyb5gn952i4s7fmc9ay4yh74ysrqbiqna6dl1qmahjpbaavbf5"; | |||
There was a problem hiding this comment.
This should have been updated too. The python2 hash is wrong now.
timokau
added a commit
to timokau/nixpkgs
that referenced
this pull request
Mar 4, 2019
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.
timokau
added a commit
to timokau/nixpkgs
that referenced
this pull request
Mar 17, 2019
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)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)