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: d7cd7835ddda
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 088a542b8af4
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 17, 2019

  1. pythonPackages.pybind11: expose headers

    Jonathan Ringer committed Oct 17, 2019
    Copy the full SHA
    4a8a197 View commit details

  2. python3Packages.trio: 0.11.0 -> 0.12.1

    Jonathan Ringer committed Oct 17, 2019
    Copy the full SHA
    088a542 View commit details
Showing with 11 additions and 4 deletions.
  1. +7 −1 pkgs/development/python-modules/pybind11/default.nix
  2. +4 −3 pkgs/development/python-modules/trio/default.nix
8 changes: 7 additions & 1 deletion pkgs/development/python-modules/pybind11/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,8 @@ buildPythonPackage rec {

dontUseCmakeConfigure = true;

checkInputs = [ pytest cmake ]
nativeBuildInputs = [ cmake ];
checkInputs = [ pytest ]
++ (lib.optional (numpy != null) numpy)
++ (lib.optional (eigen != null) eigen)
++ (lib.optional (scipy != null) scipy);
@@ -32,6 +33,11 @@ buildPythonPackage rec {
make -j $NIX_BUILD_CORES pytest
'';

# re-expose the headers to other packages
postInstall = ''
ln -s $out/include/python${python.pythonVersion}m/pybind11/ $out/include/pybind11
'';

meta = {
homepage = https://github.com/pybind/pybind11;
description = "Seamless operability between C++11 and Python";
7 changes: 4 additions & 3 deletions pkgs/development/python-modules/trio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,19 +12,20 @@
, stdenv
, jedi
, pylint
, astor
}:

buildPythonPackage rec {
pname = "trio";
version = "0.11.0";
version = "0.12.1";
disabled = pythonOlder "3.5";

src = fetchPypi {
inherit pname version;
sha256 = "3796774aedbf5be581c68f98c79b565654876de6e9a01c6a95e3ec6cd4e4b4c3";
sha256 = "0wnnrs36arvimrfgrlbpjw3nx7lppx43yvk2b380ivv69h52i6hl";
};

checkInputs = [ pytest pyopenssl trustme jedi pylint ];
checkInputs = [ astor pytest pyopenssl trustme jedi pylint ];
# It appears that the build sandbox doesn't include /etc/services, and these tests try to use it.
checkPhase = ''
HOME="$(mktemp -d)" py.test -k 'not test_getnameinfo and not test_SocketType_resolve and not test_getprotobyname and not test_waitpid'