boost: Do not force numpy support from 1.65 #33359
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
Ericson2314
reviewed
Jan 2, 2018
| @@ -9,6 +9,4 @@ callPackage ./generic.nix (args // rec { | |||
| sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"; | |||
| }; | |||
|
|
|||
| enableNumpy = args.enableNumpy or true; | |||
There was a problem hiding this comment.
enableNumpy = args.enableNumpy or stdenv.hostPlatform == stdenv.buildPlatform;`
There was a problem hiding this comment.
Yes could do this but it is not ideal: the same logic is repeated in the generic.nix and for each version. And the proper logic would also take into account if enablePython is passed into args: if that is false, enableNumpy should be false too.
Ideally it could all be handled in generic.nix?
| @@ -9,6 +9,4 @@ callPackage ./generic.nix (args // rec { | |||
| sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; | |||
| }; | |||
|
|
|||
| enableNumpy = args.enableNumpy or true; | |||
There was a problem hiding this comment.
diito
(enableNumpy = args.enableNumpy or stdenv.hostPlatform == stdenv.buildPlatform;`)
Ericson2314
added
the
6.topic: cross-compilation
Ericson2314
force-pushed
the
boostnumpy
branch
from
810c4be
to
aaafcdc
Compare
bnikolic
requested review from
edolstra,
FRidh,
peti and
zimbatm
as code owners
Ericson2314
reviewed
Jan 3, 2018
| @@ -11,7 +11,7 @@ | |||
| , enableShared ? !(hostPlatform.libc == "msvcrt") # problems for now | |||
| , enableStatic ? !enableShared | |||
| , enablePython ? hostPlatform == buildPlatform | |||
| , enableNumpy ? false | |||
| , enableNumpy ? enablePython && stdenv.lib.versionAtLeast version "1.65" | |||
There was a problem hiding this comment.
Good points in https://github.com/NixOS/nixpkgs/pull/33359/files#r15934008 . How does this look?
There was a problem hiding this comment.
This more directly implements 19dbfb6's description "In order to manipulate Python arrays numpy is needed from boost 1.65 on".
Ericson2314
requested review from
Ericson2314 and
globin
and removed request for
zimbatm,
peti,
edolstra and
FRidh
GrahamcOfBorg
added
10.rebuild-darwin: 501+
and removed
10.rebuild-darwin: 101-500
labels
The reason is that if cross compiling (or for other reasons) python bindings as a whole are turned off. Those two lines then trigger assertion errors unless manually overridden for cross compilation. This way: 1. The `enableNumpy` default respects the `enablePython deafult. 2. Cross works by default 3. Absurd manual overrides still break as they should 4. The `>= 1.65` logic is direct and not a maintaince gotcha.
Ericson2314
force-pushed
the
boostnumpy
branch
from
aaafcdc
to
00b038a
Compare
GrahamcOfBorg
added
10.rebuild-darwin: 0
10.rebuild-linux: 0
and removed
10.rebuild-darwin: 501+
10.rebuild-linux: 501+
labels
Ericson2314
requested review from
globin
and removed request for
Ericson2314 and
globin
Ericson2314
changed the title
|
Waited for @GrahamcOfBorg to confirm no rebuilds. |
|
That’s great, thanks
From: Frederik Rietdijk [mailto:notifications@github.com]
Sent: 03 January 2018 07:38
To: NixOS/nixpkgs <nixpkgs@noreply.github.com>
Cc: bnikolic <bojan@bnikolic.co.uk>; Mention <mention@noreply.github.com>
Subject: Re: [NixOS/nixpkgs] boost: Do not force numpy support from 1.65 (#33359)
@FRidh commented on this pull request.
Thanks!
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub <#33359 (review)> , or mute the thread <https://github.com/notifications/unsubscribe-auth/AAYienNQP7SlCHdkyewTPcNZ71QwYX_sks5tGy5qgaJpZM4RRLqg> .
|
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
The reason is that if cross compiling (or for other reasons) python bindings as a whole are turned off. Those two lines then trigger assertion errors unless manually overridden for cross compilation.
This way:
enableNumpydefault respects the `enablePython deafult.>= 1.65logic is direct and not a maintaince gotcha.Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)