3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

118 commits

Author SHA1 Message Date
Florian Klink 05590b3efd ceph: fix build and cleanup expression
correct platforms. ceph currently doesn't build on aarch64-linux. So
let's not lie in meta.platforms.

ceph: fix multiple output
We currently just move $out/share/ceph/mgr to
$lib/lib/ceph, and then remove all references to $out with a find
command.

I checked $out, the only reference to $out is in
$lib/lib/ceph/libceph-common.so.0, coming from src/common/options.cc:
https://github.com/ceph/ceph/blob/master/src/common/options.cc#L5050:

>  Option("mgr_module_path", Option::TYPE_STR, Option::LEVEL_ADVANCED)
>  .set_default(CEPH_DATADIR "/mgr")
>  .add_service("mgr")
>  .set_description("Filesystem path to manager modules."),

Just removing the reference might break some behaviour - it should point
to $lib/ceph/mgr instead.

We can fix this in a much more elegant fashion by just passing a custom
CMAKE_INSTALL_DATADIR to the build system.

ceph: fix outdated Boost::python substitutions

Instead of substituting in CMakeLists.txt files, one now needs to set
MGR_PYTHON_VERSION.

ceph: clean up PYTHONPATH wrapping

Set `pythonPath` instead of exporting PYTHONPATH.

Use `toPythonPath` to construct the PYTHONPATH where we need manual
wrapping. There's no ceph-volume, only ceph-mgr.

ceph: set doCheck = false explicitly

and describe why.

ceph: patch more shebangs

ceph: use system-provided gtest and rocksdb
2019-11-11 21:47:02 +01:00
Johan Thomsen 7a61cd29bd ceph: 14.2.3 -> 14.2.4 2019-09-26 14:52:02 +02:00
Johan Thomsen 161855c033 ceph: 14.2.1 -> 14.2.3 2019-09-05 14:33:29 +02:00
Johan Thomsen fb22d67fa7 ceph: 13.2.4 -> 14.2.1
* remove kinetic
* release note
* add johanot as maintainer

nixos/ceph: create option for mgr_module_path
  - since the upstream default is no longer correct in v14

* fix module, default location for libexec has changed
* ceph: fix test
2019-09-04 16:17:18 +02:00
Kristoffer 85baedaca3 ceph: 12.2.7 -> 13.2.4
* maintain only one version
* ceph-client: init
* include ceph-volume python tool in output

nixos/ceph: extraConfig, fix test, wait for ceph-mgr to become active

* run ceph with disk group permission
* add extraConfig option for the global section
needed per cluster
* clear up how ceph.conf is generated
* fix ceph testcase
2019-09-04 16:01:42 +02:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
magenbluten b54b5f9ad8 rocksdb: 5.11.3 -> 6.1.2
- mark osquery as broken
- mark ceph as broken

both osquery and ceph packages are outdated. furthermore, ceph has its
own inline rocksdb source tree which isn't use in the current nixpkg.
this needs to be fixed.
2019-06-19 15:01:27 +02:00
c0bw3b 9cb260d091 [treewide] delete unused patches 2019-05-04 19:52:24 +02:00
Jörg Thalheim b5c1deca8a
treewide: remove wkennington as maintainer
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
2019-01-26 10:05:32 +00:00
Robert Schütz 8c57113e14 python.pkgs.argparse: remove
argparse is part of stdlib in 2.7 and 3.2+
2019-01-22 12:43:07 +01:00
Tuomas Tynkkynen 5e84926a66 treewide: Replace meta.available checks in shouldUsePackages copypasta
This reverts commit 79d8353b5e.

This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
2018-09-28 15:01:00 +03:00
Uli Baum cd8bcb5f9f ceph: fix build, 12.2.2 -> 12.2.7
Since 772eef9168, Boost
doesn't support by python by default, which broke ceph.

Also bump to 12.2.7, the latest release of ceph 12.
2018-08-26 13:11:57 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Frederik Rietdijk 1a6af9f88e
Merge pull request #43857 from volth/unused
[bot] treewide: remove unreferenced code
2018-07-20 21:06:32 +02:00
volth 87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
Matthew Bauer 76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Jörg Thalheim 1a44de831a
Merge pull request #37597 from lejonet/ceph-#36622
ceph: Add makeWrapper to dependencies and nativeBuildInputs
2018-03-27 10:55:12 +01:00
Ryan Mulligan b189247ba0 treewide: use more HTTPS URLs
Uses the HTTPS url for cases where the existing URL has a permanent
redirect. For each domain, at least one fixed derivation URL was
downloaded to test the domain is properly serving downloads.

Also fixes jbake source URL, which was broken.
2018-03-24 22:04:25 -07:00
Daniel Kuehn d74bcbc8ad ceph: Change hardcoded site-packages path to utilizing the python2Packages.python.sitePackages attribute instead 2018-03-22 21:08:28 +01:00
Daniel Kuehn a9a7580c3f ceph: Add makeWrapper to dependencies and nativeBuildInputs
The ceph-mgr daemon needs to know the location of cephs own-made python modules for some of the modules
that you can enable for it.
With wrapProgram, a wrapper is added that sets the proper pythonpath environment variable for the ceph-mgr
daemon so its modules can find the ceph python modules
2018-03-21 21:53:02 +01:00
John Ericson 79d8353b5e treewide: Make shouldUsePackages copypasta use meta.available
The old way depended on old list-of-strings `meta.platforms`, and was
not good for cross.
2018-03-12 18:55:41 -04:00
Daniel Kuehn 987cad84ce ceph: Modify ceph package so that it compiles and runs fine on nixos
With adding a patch that makes 2 absolute paths into 2 relative paths, ensuring the third-party libraries are available
in the python environment used and wrapping the python tools with wrapPrograms does so that the fixed ceph pkg can
compile and run as intended on NixOS.
2018-02-24 18:56:25 +01:00
Adrien Devresse 6beb4da2f6 ceph: 9.2.0 -> 12.2.2
- Update Ceph to last version
- Solve vulernatibility problem in the old version
- Patch rocksdb ceph rocksdb API
- Simplify a lot ceph build by switching to CMake

This Pull request require #34662 and #34661 to be effective
2018-02-06 17:41:23 +01:00
John Ericson da19c34d0f stdenv setup: Always use both propagated files
This continues #23374, which always kept around both attributes, by
always including both propagated files: `propgated-native-build-inputs`
and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still
defined as before, however, so this change should only barely
observable.

This is an incremental step to fully keeping the dependencies separate
in all cases.
2017-11-21 10:44:44 -05:00
Tim Steinbach 6e00673e7f
accelio: Remove 2017-07-23 10:47:13 -04:00
John Ericson 85aa5005af Introduce mapNullable into lib and use it in a few places
Also simply some configure flag logic my grep also alerted me too.
2017-04-17 17:04:04 -04:00
Graham Christensen eb01090301
ceph: mark as broken 2016-12-29 17:45:40 -05:00
Frederik Rietdijk 509ef439ac ceph: use python2
print statement
2016-10-18 23:16:04 +02:00
Frederik Rietdijk 104c50dd1a Python: remove modules and pythonFull 2016-10-10 10:33:24 +02:00
Tuomas Tynkkynen 810135363e ceph: Fix 'lib.optional' use
Produces a list of list as buildInputs.
2016-08-30 23:00:13 +03:00
Tuomas Tynkkynen 1713255827 ceph: Add xfsprogs 4.5.0 compat patch 2016-08-11 00:50:16 +03:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Tuomas Tynkkynen b465dc202f boost: Kill unnecessary 'lib' output
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
2016-04-28 00:41:28 +03:00
Robin Gloster e2372a4183 ceph: fix for zip timestamps 2016-03-04 14:15:59 +00:00
Tobias Geerinckx-Rice 32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
Eelco Dolstra aab90653af ceph: Don't use symlinks
No need to invent an ad-hoc symlink scheme when we can handle this
kind of indirection at the Nix expression level (e.g. by doing
"ceph-dev = ceph").
2015-11-19 14:25:16 +01:00
Eelco Dolstra adde71ea6e ceph: Remove old and git versions 2015-11-19 14:25:16 +01:00
William A. Kennington III cf1ca41bfa ceph: Fix hash 2015-11-17 17:10:51 -08:00
Pascal Wittmann 7fd2796e99 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
William A. Kennington III 61402311cc ceph: Deduplicate the default 2015-11-16 05:15:19 -08:00
William A. Kennington III 452f1736d5 ceph: Major Update 0.94.4 -> 9.2.0 2015-11-05 18:22:48 -08:00
William A. Kennington III 86ba275a99 ceph: 0.94.4 -> 0.94.5 2015-11-04 00:58:28 -08:00
William A. Kennington III 9882e09471 ceph: 0.94.3.2 -> 0.94.4 2015-10-21 22:12:36 -07:00
William A. Kennington III b6710cba15 ceph-git: 2015-09-22 -> 2015-10-16 2015-10-16 16:45:00 -07:00
William A. Kennington III b7c3a9647a ceph-dev: 9.0.3 -> 9.1.0 2015-10-16 16:44:46 -07:00
William A. Kennington III 21bb385af5 ceph: 0.94.3 -> 0.94.3.2 2015-10-16 16:44:34 -07:00
William A. Kennington III cc698a2986 ceph-git: 2015-09-11 -> 2015-09-22 2015-09-23 12:30:00 -07:00
William A. Kennington III 26c3d3f060 ceph: Fix .la files 2015-09-18 14:52:52 -07:00
William A. Kennington III 25e25b1be2 ceph-git: 2015-09-04 -> 2015-09-11 2015-09-11 16:21:07 -07:00
William A. Kennington III 476b70c39c ceph-dev: Fix for i686-linux 2015-09-11 16:21:07 -07:00