Merge: make dev output references explicit

This is a rebase of most commits from #14766, resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
parent bfd522da63 c02f0ade90
commit c4661e9643
199 changed files with 308 additions and 306 deletions
--- a/pkgs/development/python-modules/tables/default.nix
+++ b/pkgs/development/python-modules/tables/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
  setupPyBuildFlags =
    [ "--hdf5=${hdf5}"
      "--lzo=${lzo}"
-      "--bzip2=${bzip2}"
+      "--bzip2=${bzip2.dev}"
    ];

  # Run the test suite.