Commit graph

201 commits

Author SHA1 Message Date
Vladimír Čunát 20f77aa099
Merge #295458: staging-next 2024-03-13 2024-03-21 07:18:55 +01:00
Sarah Brofeldt f7bba2d518 ceph: workaround broken mgr modules
This is yet another incarnation of https://tracker.ceph.com/issues/64213
which was fixed for cryptography specifically (thus fixing dashboard)
but since our bcrypt update https://github.com/NixOS/nixpkgs/pull/291195
every module broke for the same reason

Until upstream manages to get this fixed permanently, I don't see that
we can do much but "vendor" in these old deps.

It may be possible to more delicately patch the rust package underneath
bcrypt, but I'm not sure how
2024-03-19 10:19:20 +01:00
Martin Weinelt 69aa302c35
ceph: suppress pytest8 warnings in pyopenssl override 2024-03-17 19:38:59 +01:00
Sarah Brofeldt aadc609b0e ceph: fix cryptography patching for in-expr version 2024-02-22 02:04:49 +00:00
Robert Schütz b06ebb2cf3 ceph: fix cryptography override
Since ba83271df0 the build fails with

    applying patch /nix/store/46rxbbvl2l3mrxb50y9rzy7ahgx0lraj-d741901dddd731895346636c0d3556c6fa51fbe6.patch
    patching file tests/hazmat/primitives/test_aead.py
    Hunk #1 FAILED at 56.
    Hunk #2 FAILED at 197.
    Hunk #3 FAILED at 378.
    Hunk #4 FAILED at 525.
    Hunk #5 FAILED at 700.
    Hunk #6 FAILED at 844.
    6 out of 6 hunks FAILED -- saving rejects to file tests/hazmat/primitives/test_aead.py.rej
2024-02-17 23:34:40 -08:00
Robert Schütz 39ccdca518 ceph: 18.2.0 -> 18.2.1
Changelog: https://docs.ceph.com/en/latest/releases/reef/#v18-2-1-reef
2024-02-05 21:20:29 +00:00
Niklas Hambüchen 506b21518d ceph: Fix tests by adding back old required python libs. See #281858.
Fixes #241482.

Also fix test putting cluster in unhealthy `POOL_APP_NOT_ENABLED` state;
this seems to be the default state with Ceph 18.2.1 at least,
and it does not hurt to fix it now already in the way the Ceph docs say.

Also revert "nixosTests.ceph-single-node: remove dashboard check"

This reverts commit 41b27d7f4b.
2024-01-24 14:29:24 +00:00
Kartik Gokte 68221c35ff ceph: use absolute binary paths instead of relative paths
While trying to mount CephFS using libceph and systemd, mount.ceph tries to call "modinfo", "modprobe", and "grep", but fails with the error "sh: line 1: modprobe: command not found". This is because ceph calls these binaries by running the command "sh -c -- <application> %s %s", which does not pass the PATH environment variable through. This isn't usually a problem, because ceph, by default, calls the paths of these binaries as they would be in debian, in /sbin and /bin, but a change was made to replace these with relative paths, thus breaking the mounting process entirely. Replacing these relative paths with absolute store paths alleviates this issue whilst preserving all functionality.
2023-12-11 19:09:26 +05:30
Martin Weinelt 8c462229c3
ceph: drop sqlalchemy override
The flask-sqlalchemy package requires sqlalchemy>=2.0.16 now.
2023-10-25 23:08:10 +02:00
Niklas Hambüchen 9f3e7595f5
Merge pull request #247849 from nh2/ceph-18
ceph: 17.2.5 -> 18.2.0
2023-09-05 18:44:18 +02:00
Niklas Hambüchen f8262c2cc6 ceph: 17.2.5 -> 18.2.0
The following issues were encountered during the upgrade:

* "Could NOT find thrift (missing: thrift_LIBRARIES thrift_INCLUDE_DIR)"
  Fixed by disabling Jaeger support, see added comment.
* ```
  /build/ceph-18.2.0/src/extblkdev/ExtBlkDevInterface.h:38:10: fatal error: sys/capability.h: No such file or directory
    38 | #include <sys/capability.h>
  ```
  Fixed by `libcap` dependency.
  Ceph's Debian dependencies include both `libcap` and `libcap-ng`:
  c8c946c970/debian/control (L38-L39)
* ```
  Manually-specified variables were not used by the project:
    MGR_PYTHON_VERSION
  ```
  Dropped 4 years ago for Ceph 15:
  5fc657b40d
  So I removed the flag.
* Warning:
  ```
  -- Could NOT find nasm
  ```
  Looking at the code (macros such as `HAVE_NASM_X64`), nasm existence actually results in some optimised crypto SIMD instructions being compiled, so we probably want this for performance.
  Adding `nasm` to `nativeBuildInputs` first brought error:
  ```
  /nix/store/p6dlr3skfhxpyphipg2bqnj52999banh-bash-5.2-p15/bin/bash: line 1: /build/ceph-18.2.0/src/nasm-wrapper: cannot execute: required file not found
  make[2]: *** [src/crypto/isa-l/CMakeFiles/ceph_crypto_isal.dir/build.make:117: src/crypto/isa-l/CMakeFiles/ceph_crypto_isal.dir/isa-l_crypto/aes/cbc_multibinary.asm.o] Error 127
  ```
  Solution: `patchShebangs src/nasm-wrapper`, even better `patchShebangs src/`.
* ```
  Manually-specified variables were not used by the project:
    WITH_SYSTEM_CIMG
    WITH_SYSTEM_JSONCPP
  ```
  These never were Ceph CMake options, so I removed them.
* `libcap-ng` is Linux-only, and only used for the `mount.ceph` command:
  c8c946c970/src/CMakeLists.txt (L829-L830)
  Thus use it for Linux only.
* The Parquet build error is now gone, so we can enable support for it.
2023-08-08 02:16:59 +00:00
Adam Joseph dc028fdac2 ceph: use availableOn instead of meta.available
pkg.meta.available is deprecated (see subsequent commit which adds a
warning) and does not distinguish between the buildPlatform and the
hostPlatform.
2023-08-05 16:27:33 -07:00
figsoda b035cabadf pkgs/tools/filesystems: remove dead code
with the help of deadnix & nil
2023-07-25 10:08:41 -04:00
Vladimír Čunát f5d5556aaf
ceph: fixup the embedded sqlalchemy
This version-override approach is annoying me, as the original
derivation is then supposed to support multiple versions
without knowing about it.  And naturally it tends to break.
(this time on 446a8703c3)
https://hydra.nixos.org/build/228178995/nixlog/3/tail
2023-07-21 09:41:49 +02:00
Weijia Wang 35690e335f treewide/tools: use top-level fetchPypi 2023-05-25 19:03:52 +03:00
Sandro Jäckel 264f60811e
ceph: use https to download src, use inherit 2023-05-19 23:02:56 +02:00
Martin Weinelt deb1d7ac1e
ceph: 16.2.10 -> 17.2.5
Updates Ceph from the Pacific to the Quincy release tree.

Upgrade to boost179 and python310, cleans up the python environment,
builds with more system libraries.

Disables parquet support for the radosgw, because I couldn't
get it to build.

Also properly enable the testsuite on ceph-common and generally unroll
and sort lists for a better overview and history.

Co-Authored-By: name_snrl <Demogorgon-74@ya.ru>
2023-03-24 23:50:45 +01:00
Martin Weinelt cf7a8642fc
ceph: Pin sqlalchemy at 1.4.46
The pecan library it uses is incompatible with sqlalchemy>=2.0.
2023-03-08 14:44:18 +01:00
github-actions[bot] 67e4f6dde0
Merge staging-next into staging 2023-02-22 12:02:05 +00:00
Vladimír Čunát 9eeb000bfe
ceph: add xz dependency
It's needed to build after boost changes in a67949a3fc.
2023-02-22 09:05:05 +01:00
Martin Weinelt 9e7f9a402b
python310Packages.mako: Normalize attribute, pname, dirname 2023-02-19 21:36:02 +01:00
Nick Cao 9034e45a78
ceph: fix build with gcc 12 2023-02-06 13:46:51 +08:00
Guillaume Girol 33afbf39f6 treewide: switch to nativeCheckInputs
checkInputs used to be added to nativeBuildInputs. Now we have
nativeCheckInputs to do that instead. Doing this treewide change allows
to keep hashes identical to before the introduction of
nativeCheckInputs.
2023-01-21 12:00:00 +00:00
Robin Stumm c590d51037 ceph: comment where to find python dependencies
Co-authored-by: Martin Weinelt <mweinelt@users.noreply.github.com>
2023-01-16 10:48:42 +01:00
Robin Stumm 2ed8ff81c5 ceph: add missing python library
required by mgr dashboard module
2023-01-14 14:56:08 +01:00
R. Ryantm 4303cfcc64 ceph: 16.2.9 -> 16.2.10 2022-07-28 00:44:37 +00:00
Thomas Tuegel e1e0d5d513
Merge pull request #108496 from knedlsepp/cmake-rpath
cmake/setup-hook.sh: Don't skip build-RPATH
2022-07-11 10:18:47 -05:00
R. Ryantm 034e77eea2 ceph: 16.2.7 -> 16.2.9 2022-07-07 20:08:47 +00:00
Josef Kemetmüller bcd7045998 treewide: Remove now-unneeded LD_LIBRARY_PATH in cmake derivations
Since the setting DCMAKE_SKIP_BUILD_RPATH was disabled, we can now run
the checkPhase of cmake derivations without having to tweak the
LD_LIBRARY_PATH anymore.
2022-07-04 03:49:01 +03:00
Robert Schütz edc8808603 ceph: use python39
Boost 1.75 is not compatible with Python 3.10.
2022-06-11 06:36:27 +00:00
Aaron Jheng f0c470f5eb
oath-toolkit: Rename from oathToolkit to oath-toolkit 2022-04-04 01:11:06 +00:00
Ben Siraphob 5e04dac5d6
ceph: update homepage 2022-01-07 16:45:53 +07:00
Jonathan Ringer 09bd298765
ceph: update homepage 2021-12-28 09:00:35 -08:00
Niklas Hambüchen a9bdcf8a82 ceph: 16.2.6 -> 16.2.7. Fixes data-loss upgrade bug.
See https://ceph.io/en/news/blog/2021/v16-2-7-pacific-released/
2021-12-09 02:19:14 +00:00
Niklas Hambüchen c6cb7badab ceph: Remove obsolete scipy override.
The mentioned bugs have merged linked pull requests a long time ago:

* b9dea87ff1
  in Ceph v15.1.0
* f701ed8b26
  in Ceph v16.1.0
2021-12-09 02:19:14 +00:00
Daniel Poelzleithner f74c838dbf ceph-client: install sbin binaries into bin, link sbin to bin 2021-11-15 17:12:36 +01:00
Daniel Poelzleithner f95c6d6112 ceph-client: fix copy of python modules
the site-packages content was wrongly copied, causing a
.../site-packages/site-packages/... in the ceph-client packages.
This renders thi ceph tool unusable.
2021-11-15 10:41:35 +01:00
Daniel Poelzleithner f8431991d9 [ceph-client] Install cephfs client tools as well 2021-11-10 21:44:52 +01:00
Martin Weinelt ed6c2fa9b4 ceph: 16.2.5 -> 16.2.6 2021-09-28 03:15:11 +02:00
Martin Weinelt 9203210f36 ceph: 16.2.4 -> 16.2.5 2021-08-30 07:41:24 +00:00
Robert Schütz 1ec5651913 treewide: use pythonPackages.python-dateutil instead of pythonPackages.dateutil 2021-07-03 13:45:57 +02:00
Janne Heß 196a7136a9
ceph: Enable cephfs-shell and use system liburing 2021-07-01 09:25:21 +02:00
Robert Schütz 0a1695b024 ceph: use packageOverrides 2021-06-23 11:41:54 +02:00
R. RyanTM 42779e4e31 ceph: 16.2.3 -> 16.2.4 2021-05-24 03:20:12 +00:00
R. RyanTM 809ddbdbd9 ceph: 16.2.1 -> 16.2.3 2021-05-07 08:17:43 +00:00
Luke Granger-Brown f64e68e09b
Merge pull request #120071 from johanot/ceph-16
ceph: 15.2.10 -> 16.2.1
2021-04-29 00:03:45 +01:00
Luke Granger-Brown eeeaa150a8 ceph: require big-parallel
It takes 3h+ for a 2 core build, and 24m for a big-parallel build for
x86_64. For aarch64-linux, it times out with 2 cores.
2021-04-26 00:50:05 +00:00
Daniel Nagy 7748904754
ceph: substitute /bin/grep 2021-04-23 20:33:49 +02:00
Johan Thomsen c3bd75c752 ceph: 15.2.10 -> 16.2.1 2021-04-22 13:17:57 +02:00
Sarah Brofeldt 38b27aa6e9
ceph: 15.2.8 -> 15.2.10 and python dependency fix (#118724) 2021-04-12 04:24:24 +02:00