pyrox.dev
Merge pull request #299864 from dotlambda/python3Packages.pybind11
python311Packages.pybind11: 2.11.1 -> 2.12.0
authored by Doron Behar and committed by GitHub 4eae5f9e 73229e7b
+15
-7
pkgs/development/python-modules/pybind11/default.nix
+15
-7
pkgs/development/python-modules/pybind11/default.nix
···
4
4
, pythonOlder
5
5
, fetchFromGitHub
6
6
, cmake
7
+
, ninja
8
+
, setuptools
7
9
, boost
8
10
, eigen
9
11
, python
···
37
39
else python.stdenv;
38
40
in buildPythonPackage rec {
39
41
pname = "pybind11";
40
-
version = "2.11.1";
41
-
format = "setuptools";
42
+
version = "2.12.0";
43
+
pyproject = true;
42
44
43
45
src = fetchFromGitHub {
44
46
owner = "pybind";
45
-
repo = pname;
47
+
repo = "pybind11";
46
48
rev = "v${version}";
47
-
hash = "sha256-sO/Fa+QrAKyq2EYyYMcjPrYI+bdJIrDoj6L3JHoDo3E=";
49
+
hash = "sha256-DVkI5NxM5uME9m3PFYVpJOOa2j+yjL6AJn76fCTv2nE=";
48
50
};
49
51
50
52
postPatch = ''
51
-
sed -i "/^timeout/d" pyproject.toml
53
+
substituteInPlace pyproject.toml \
54
+
--replace-fail "timeout=300" ""
52
55
'';
53
56
54
-
nativeBuildInputs = [ cmake ];
57
+
build-system = [
58
+
cmake
59
+
ninja
60
+
setuptools
61
+
];
62
+
55
63
buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ];
56
-
propagatedBuildInputs = [ setupHook ];
64
+
propagatedNativeBuildInputs = [ setupHook ];
57
65
58
66
stdenv = stdenv';
59
67
+7
-10
pkgs/development/python-modules/scipy/default.nix
+7
-10
pkgs/development/python-modules/scipy/default.nix
···
34
34
# nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy
35
35
#
36
36
# The update script uses sed regexes to replace them with the updated hashes.
37
-
version = "1.12.0";
38
-
srcHash = "sha256-PuiyYTgSegDTV9Kae5N68FOXT1jyJrNv9p2aFP70Z20=";
37
+
version = "1.13.0";
38
+
srcHash = "sha256-HaYk92hOREHMOXppK+Bs9DrBu9KUVUsZ0KV+isTofUo=";
39
39
datasetsHashes = {
40
40
ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3";
41
41
ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj";
···
76
76
"doc/source/dev/contributor/meson_advanced.rst"
77
77
];
78
78
})
79
-
(fetchpatch {
80
-
name = "openblas-0.3.26-compat.patch";
81
-
url = "https://github.com/scipy/scipy/commit/8c96a1f742335bca283aae418763aaba62c03378.patch";
82
-
hash = "sha256-SGoYDxwSAkr6D5/XEqHLerF4e4nmmI+PX+z+3taWAps=";
83
-
})
84
79
];
85
80
86
-
# Upstream complicated numpy version pinning is causing issues in the
87
-
# configurePhase, so we pass on it.
81
+
# Upstream says in a comment in their pyproject.toml that building against
82
+
# both numpy 2 and numpy 1 should work, but they seem to worry about numpy
83
+
# incompatibilities that we here with Nixpkgs' Python ecosystem, shouldn't
84
+
# experience.
88
85
postPatch = ''
89
86
substituteInPlace pyproject.toml \
90
-
--replace-fail 'numpy==' 'numpy>=' \
87
+
--replace-fail 'numpy>=2.0.0rc1,' 'numpy' \
91
88
'';
92
89
93
90
nativeBuildInputs = [