BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #33359 from bnikolic/boostnumpy

Browse source 
boost: Do not force numpy support from 1.65
This commit is contained in:
John Ericson 2018-01-02 19:41:42 -05:00 committed by GitHub
commit f3bb3de213
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/boost/1.65.nix
View file

@ -9,6 +9,4 @@ callPackage ./generic.nix (args // rec {
sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81";
};
enableNumpy = args.enableNumpy or true;
})

2
pkgs/development/libraries/boost/1.66.nix
View file

@ -9,6 +9,4 @@ callPackage ./generic.nix (args // rec {
sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9";
};
enableNumpy = args.enableNumpy or true;
})

2
pkgs/development/libraries/boost/generic.nix
View file

@ -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"
, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
, patches ? []
, mpi ? null