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: b720e9c23a2e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f3bb3de2136d
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 3, 2018

  1. boost: Do not force numpy support from 1.65 

    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.
    @bnikolic @Ericson2314
    bnikolic authored and Ericson2314 committed Jan 3, 2018
    Copy the full SHA
    00b038a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #33359 from bnikolic/boostnumpy 

     boost: Do not force numpy support from 1.65
    @Ericson2314
    Ericson2314 committed Jan 3, 2018
    Copy the full SHA
    f3bb3de View commit details
    Browse the repository at this point in the history