diff options
| author | Niklas Hambüchen <mail@nh2.me> | 2024-03-21 01:32:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-21 01:32:07 +0100 |
| commit | 527e02169ad31ab29f194c329f02e2d664ea0f97 (patch) | |
| tree | 2f1c6ef2ddad5342c0b077024bb5cedeb5bf4b12 | |
| parent | 71a5d2c832a3af02a649713d502515bd33acef4a (diff) | |
| parent | f7bba2d518509ad30fdb0d462e2ab99c69749e44 (diff) | |
Merge pull request #297136 from srhb/ceph-workaround-mgr-pyo3-bcrypt
ceph: workaround broken mgr modules
| -rw-r--r-- | pkgs/tools/filesystems/ceph/default.nix | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index ebaf6532df523..88d303079f2a0 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -169,7 +169,28 @@ let # Watch out for python <> boost compatibility python = python310.override { - packageOverrides = self: super: let cryptographyOverrideVersion = "40.0.1"; in { + packageOverrides = self: super: let + cryptographyOverrideVersion = "40.0.1"; + bcryptOverrideVersion = "4.0.1"; + in { + # Ceph does not support `bcrypt` > 4.0 yet: + # * Upstream issue: https://tracker.ceph.com/issues/63529 + # > Python Sub-Interpreter Model Used by ceph-mgr Incompatible With Python Modules Based on PyO3 + bcrypt = super.bcrypt.overridePythonAttrs (old: rec { + pname = "bcrypt"; + version = bcryptOverrideVersion; + src = fetchPypi { + inherit pname version; + hash = "sha256-J9N1kDrIJhz+QEf2cJ0W99GNObHskqr3KvmJVSplDr0="; + }; + cargoRoot = "src/_bcrypt"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sourceRoot = "${pname}-${version}/${cargoRoot}"; + name = "${pname}-${version}"; + hash = "sha256-lDWX69YENZFMu7pyBmavUZaalGvFqbHSHfkwkzmDQaY="; + }; + }); # Ceph does not support `cryptography` > 40 yet: # * https://github.com/NixOS/nixpkgs/pull/281858#issuecomment-1899358602 # * Upstream issue: https://tracker.ceph.com/issues/63529 |