Commit graph

201515 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
Florian Klink
781d85c69a rocksdb: enable USE_RTTI=1
This is required for programs using rocksdb and and typeinfo.

Otherwise, linking them fails with errors like this (that's ceph):

/nix/store/cg0k49h66nkdqx6ccwnqr0i4q0fnfznc-binutils-2.31.1/bin/ld: ../../lib/libos.a(RocksDBStore.cc.o):(.data.rel.ro._ZTIN12RocksDBStore14RocksWBHandlerE[_ZTIN12RocksDBStore14RocksWBHandlerE]+0x10): undefined reference to `typeinfo for rocksdb::WriteBatch::Handler'
/nix/store/cg0k49h66nkdqx6ccwnqr0i4q0fnfznc-binutils-2.31.1/bin/ld: ../../lib/libos.a(RocksDBStore.cc.o):(.data.rel.ro._ZTIN12RocksDBStore19MergeOperatorRouterE[_ZTIN12RocksDBStore19MergeOperatorRouterE]+0x10): undefined reference to `typeinfo for rocksdb::AssociativeMergeOperator'
/nix/store/cg0k49h66nkdqx6ccwnqr0i4q0fnfznc-binutils-2.31.1/bin/ld: ../../lib/libos.a(RocksDBStore.cc.o):(.data.rel.ro._ZTIN12RocksDBStore19MergeOperatorLinkerE[_ZTIN12RocksDBStore19MergeOperatorLinkerE]+0x10): undefined reference to `typeinfo for rocksdb::AssociativeMergeOperator'
/nix/store/cg0k49h66nkdqx6ccwnqr0i4q0fnfznc-binutils-2.31.1/bin/ld: ../../lib/libos.a(RocksDBStore.cc.o):(.data.rel.ro._ZTI17CephRocksdbLogger[_ZTI17CephRocksdbLogger]+0x10): undefined reference to `typeinfo for rocksdb::Logger'
/nix/store/cg0k49h66nkdqx6ccwnqr0i4q0fnfznc-binutils-2.31.1/bin/ld: ../../lib/libos.a(BlueRocksEnv.cc.o):(.data.rel.ro._ZTI12BlueRocksEnv[_ZTI12BlueRocksEnv]+0x10): undefined reference to `typeinfo for rocksdb::EnvWrapper'
/nix/store/cg0k49h66nkdqx6ccwnqr0i4q0fnfznc-binutils-2.31.1/bin/ld: ../../lib/libos.a(BlueRocksEnv.cc.o):(.data.rel.ro._ZTI23BlueRocksSequentialFile[_ZTI23BlueRocksSequentialFile]+0x10): undefined reference to `typeinfo for rocksdb::SequentialFile'
/nix/store/cg0k49h66nkdqx6ccwnqr0i4q0fnfznc-binutils-2.31.1/bin/ld: ../../lib/libos.a(BlueRocksEnv.cc.o):(.data.rel.ro._ZTI25BlueRocksRandomAccessFile[_ZTI25BlueRocksRandomAccessFile]+0x10): undefined reference to `typeinfo for rocksdb::RandomAccessFile'
/nix/store/cg0k49h66nkdqx6ccwnqr0i4q0fnfznc-binutils-2.31.1/bin/ld: ../../lib/libos.a(BlueRocksEnv.cc.o):(.data.rel.ro._ZTI21BlueRocksWritableFile[_ZTI21BlueRocksWritableFile]+0x10): undefined reference to `typeinfo for rocksdb::WritableFile'
/nix/store/cg0k49h66nkdqx6ccwnqr0i4q0fnfznc-binutils-2.31.1/bin/ld: ../../lib/libos.a(BlueRocksEnv.cc.o):(.data.rel.ro._ZTI17BlueRocksFileLock[_ZTI17BlueRocksFileLock]+0x10): undefined reference to `typeinfo for rocksdb::FileLock'
2019-11-11 21:47:01 +01:00
worldofpeace
c9601a67a5
Merge pull request #71622 from worldofpeace/iso-no-slim
installer: use sddm in plasma5
2019-11-11 20:46:32 +00:00
isgy
da006ed937 python3Packages.jupyterlab_server: added pyjson5 dependency 2019-11-11 12:45:02 -08:00
isgy
3be103989c python3Packages.pyjson5: init at 0.8.5 2019-11-11 12:45:02 -08:00
isgy
053168d470 maintainers: add isgy
maintainers: fixed typo
2019-11-11 12:45:02 -08:00
Jan Tojnar
b35e68d77d
calls: fix build 2019-11-11 21:44:31 +01:00
markuskowa
79302a8d36
Merge pull request #73240 from filalex77/licensor-2.0.0
licensor: init at 2.0.0
2019-11-11 21:42:53 +01:00
Sondre Nilsen
150f62b923 pythonPackage.jsonlines: init at 1.2.0 2019-11-11 12:35:48 -08:00
worldofpeace
deb125271c
Merge pull request #73137 from worldofpeace/port-xmonad-test
nixosTests.xmonad: port to python
2019-11-11 20:23:41 +00:00
worldofpeace
d73e94578f
Merge pull request #73216 from filalex77/antibody-4.2.0
antibody: 4.1.2 -> 4.2.0
2019-11-11 20:19:53 +00:00
Jaka Hudoklin
4432135955
Merge pull request #73150 from ashkitten/add-elasticsearch-ingest-attachment
elasticsearchPlugins: add ingest-attachment
2019-11-11 21:01:06 +01:00
John Ericson
63eac67319 nghttp2: Fix MinGW build by skipping some optional deps
I think those deps could be made to build, but I didn't want to get
bogged down investigating further. "Use flags" are always a good thing,
so this is fine for now.
2019-11-11 14:10:02 -05:00
John Ericson
dec8d2c5da openssl: Switch deafult for MinGW
Working around broken build for now.
2019-11-11 14:10:02 -05:00
John Ericson
e00237e790 boehm-gc: Fix build on MinGW with mcfgthreads
CC @lhmouse
2019-11-11 14:10:01 -05:00
markuskowa
23ed6ff635
Merge pull request #72973 from pasqui23/hm
home-manager:2019-10-23 -> 2019-10-29
2019-11-11 20:07:33 +01:00
Oleksii Filonenko
3fe11d1180
licensor: init at 2.0.0 2019-11-11 21:04:14 +02:00
markuskowa
1c2c3c9ea2
Merge pull request #73096 from danieldk/drawio-12.2.2
drawio: 12.1.7 -> 12.2.2
2019-11-11 20:03:11 +01:00
WilliButz
ef1d31e53c
prometheus-blackbox-exporter: 0.15.1 -> 0.16.0, disable tests 2019-11-11 19:49:38 +01:00
Alex Guzman
82dfacc7fe trousers: 0.3.13 -> 0.3.14
* Update trousers to latest, use regular openssl (#68338)

trousers: cleanup

* some CFLAGS and LDFLAGS are not needed anymore

* libtool file fixup was a no-op

* license is now BSD-3 since:
0160d229f8/
2019-11-11 19:43:14 +01:00
c0bw3b
1289606e02
mpg321: fix CVE-2018-7263
Close #57154
Close #70105
2019-11-11 19:35:54 +01:00
c0bw3b
92edb06109
libmad: fix three CVE from 2017
* add patch for CVE-2017-8372 and CVE-2017-8373
* add patch for CVE-2017-8374
* add patch for x86_64 platforms
* fetch existing patches from remote sources
2019-11-11 19:35:53 +01:00
Renaud
c64e9dadfe
Merge pull request #72742 from Avaq/avaq/twa-190
twa: 1.8.0 -> 1.9.1
2019-11-11 18:31:43 +01:00
Elis Hirwing
4403cd16f9
profiles/graphical.nix: Drop systemWide pulseaudio in iso
It's not needed since #66338 and should have been done earlier.

This is based on a follow-up on #56167.
2019-11-11 17:07:42 +01:00
John Ericson
89ec69e25e pcre: Skip winpthread dep
Seems to build just fine without it, maybe it was just using C++ threads
which mcfgthread provides?
2019-11-11 11:02:39 -05:00
John Ericson
04cb05d20c gcc: Build MinGW stage two with threading library
Currently this is set up to be mcfgthreads, but it could be something
else instead.
2019-11-11 11:02:38 -05:00
Aldwin Vlasblom
776d4c13ac
twa: 1.8.0 -> 1.9.1
This commit updates twa from version 1.8.0 to version 1.9.1,
specifying its new 'jq' dependency.

It also moves 'makeWrapper' from the build inputs to the native
build inputs, as it's not necessary during runtime.
2019-11-11 16:25:34 +01:00
Jörg Thalheim
556a169f14
Merge pull request #73189 from flokli/python-tests-return-multiple
nixos/tests: fix succeed() with multiple commands
2019-11-11 13:48:45 +00:00
Renaud
ceb648f66a
fierce: 1.3.0 -> 1.4.0
(#73129)
2019-11-11 14:14:24 +01:00
Niklas Hambüchen
d80a11295d
Merge pull request #73210 from B4dM4n/hotspot-wrapqt
hotspot: use Qt mkDerivation
2019-11-11 14:10:11 +01:00
tekeri
cd41194654 circus: fix incompatible dependency of python-circus (#73199)
* circus: fix incompatible dependency of python-circus

* circus: move out of python packages set

* circus: remove directly used python packages arguments
2019-11-11 14:09:58 +01:00
Aaron Andersen
d68d23bb26
Merge pull request #72767 from Izorkin/phpfpm-fix
nixos/phpfpm: fix apply global phpOptions
2019-11-11 07:45:28 -05:00
Florian Klink
a8e9a93493 nixos/tests: fix succeed() with multiple commands
we previously immediately returned the first commands output, and didn't
execute any of the other commands.

Now, return the last commands output.
This should be documented in the method docstring.
2019-11-11 13:45:11 +01:00
Florian Klink
60390c81dc
Merge pull request #72603 from flokli/ceph-tmpfiles
nixos/ceph: run unprivileged, use state directories, handle non-initialized clusters without config switch
2019-11-11 13:42:54 +01:00
tekeri
a4b4681905 perlPackages.LogDispatchFileRotate: init at 1.36 2019-11-11 20:55:05 +09:00
tekeri
c432914491 perlPackages.FindLib: init at 1.04 2019-11-11 20:51:57 +09:00
Oleksii Filonenko
dfb9a1e164
antibody: add filalex77 as a maintainer 2019-11-11 13:51:02 +02:00
tekeri
eb523b823c perlPackages.Furl: init at 3.13 2019-11-11 20:50:42 +09:00
Oleksii Filonenko
3f72f7bac2
antibody: 4.1.2 -> 4.2.0 2019-11-11 13:50:42 +02:00
tekeri
6fe78ec26a perlPackages.CacheKyotoTycoon: init at 0.16 2019-11-11 20:50:29 +09:00
tekeri
00164f2fd3 perlPackages.CDB_File: init at 0.99 2019-11-11 20:44:58 +09:00
Dmitry Kalinkin
c57018fb3b
arrow-cpp: fix tests not being run on linux
Fixes: 8c86e54a ('arrow-cpp: fix/disable some plasma tests on darwin')
2019-11-11 06:18:42 -05:00
Mario Rodas
542fb7715b
Merge pull request #73182 from avdv/wtf-0.24.0
wtf: 0.23.0 -> 0.24.0
2019-11-11 06:10:37 -05:00
Frederik Rietdijk
73b88e17dd Merge staging-next into staging 2019-11-11 12:09:26 +01:00
Dennis Gosnell
2df923eaab
Merge pull request #73170 from MarcFontaine/mafo/ghcjs
fix ghc-paths-nix-ghcjs.patch
2019-11-11 20:08:53 +09:00
Frederik Rietdijk
cf27abf534 Merge master into staging-next 2019-11-11 12:06:42 +01:00
Frederik Rietdijk
6e9743f120 pythonPackages.spyder: fix package 2019-11-11 11:55:52 +01:00
Frederik Rietdijk
a94b6a90ac Revert "python: spyder-kernels: 0.5.2 -> 1.6.0"
We should still stick with an older version for spyder 3.3.6. As soon
as 4.0.0 is released we need to upgrade this package.

This reverts commit 757fd1e27b.
2019-11-11 11:55:52 +01:00
Renaud
2ea154b801
Merge pull request #72412 from Tomahna/mopidy-iris
mopidy-iris: 3.41.1 -> 3.42.1
2019-11-11 11:55:03 +01:00
Oleksii Filonenko
7b5194aee9 fselect: init at 0.6.7 (#73206)
* fselect: init at 0.6.7

* Fix cargoSha256

Co-authored-by: zimbatm <zimbatm@users.noreply.github.com>
2019-11-11 10:25:16 +00:00