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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 43deb3b335a5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d94f92c816be
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 14, 2019

  1. python3.pkgs.tables: fix build against hdf5 

    In 6cbf0b4 the package splitted
of header files, which broke this build as a result.

cc @ttuegel
    @Mic92
    Mic92 committed Oct 14, 2019
    Copy the full SHA
    d94f92c View commit details
Showing with 8 additions and 6 deletions.
  1. +8 −6 pkgs/development/python-modules/tables/default.nix
14 changes: 8 additions & 6 deletions pkgs/development/python-modules/tables/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{ stdenv, fetchPypi, python, buildPythonPackage
, cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc, mock }:

with stdenv.lib;

buildPythonPackage rec {
version = "3.5.2";
pname = "tables";
@@ -15,12 +17,12 @@ buildPythonPackage rec {

# The setup script complains about missing run-paths, but they are
# actually set.
setupPyBuildFlags =
[ "--hdf5=${hdf5}"
"--lzo=${lzo}"
"--bzip2=${bzip2.dev}"
"--blosc=${c-blosc}"
];
setupPyBuildFlags = [
"--hdf5=${getDev hdf5}"
"--lzo=${getDev lzo}"
"--bzip2=${getDev bzip2}"
"--blosc=${getDev c-blosc}"
];

# Run the test suite.
# It requires the build path to be in the python search path.