-
-
Notifications
You must be signed in to change notification settings - Fork 104
Comparing changes
Open a pull request
base repository: NixOS/nixpkgs-channels
base: 692a8cabbcc5
head repository: NixOS/nixpkgs-channels
compare: 63a3564987d3
- 18 commits
- 12 files changed
- 10 contributors
Commits on Jan 13, 2020
-
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' (cherry picked from commit 781d85c)
Configuration menu - View commit details
-
Copy full SHA for 0f48aae - Browse repository at this point
Copy the full SHA 0f48aaeView commit details -
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 (cherry picked from commit 05590b3)
Configuration menu - View commit details
-
Copy full SHA for 23a6575 - Browse repository at this point
Copy the full SHA 23a6575View commit details -
Configuration menu - View commit details
-
Copy full SHA for 543f12c - Browse repository at this point
Copy the full SHA 543f12cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 938da23 - Browse repository at this point
Copy the full SHA 938da23View commit details -
nixos/ceph: Rename old ceph test and add new multi-node test
Rename the old ceph test to ceph-single-node and add a new test ceph-multi-node. The ceph-single-node represents a dev cluster whereas ceph-multi-node is closer to a prod cluster. (cherry picked from commit 9165201)
Configuration menu - View commit details
-
Copy full SHA for e4c2df3 - Browse repository at this point
Copy the full SHA e4c2df3View commit details -
nixos/ceph: Rewrite old single-node test with new framework
(cherry picked from commit 6ac9d1f)
Configuration menu - View commit details
-
Copy full SHA for 9fdba84 - Browse repository at this point
Copy the full SHA 9fdba84View commit details -
Configuration menu - View commit details
-
Copy full SHA for 73475e9 - Browse repository at this point
Copy the full SHA 73475e9View commit details
Commits on Jan 14, 2020
-
nixos/ceph: Rename old ceph test and add new multi-node test to all-t…
…ests.nix (cherry picked from commit 5fbf0cf)
Configuration menu - View commit details
-
Copy full SHA for 87c5282 - Browse repository at this point
Copy the full SHA 87c5282View commit details
Commits on Jan 16, 2020
-
signal-desktop: 1.29.4 -> 1.29.5
Changelog: https://github.com/signalapp/Signal-Desktop/releases/tag/v1.29.5 (cherry picked from commit 8d5ec33) Reason: Avoid an expired (unusable) build in the stable release (Signal-Desktop builds expire after 90 days).
Configuration menu - View commit details
-
Copy full SHA for fdf7e83 - Browse repository at this point
Copy the full SHA fdf7e83View commit details
Commits on Jan 17, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 1cadf63 - Browse repository at this point
Copy the full SHA 1cadf63View commit details -
Merge pull request #77821 from taku0/flashplayer-32.0.0.314-release-1…
…9.09 [19.09] flashplayer: 32.0.0.293 -> 32.0.0.314
Configuration menu - View commit details
-
Copy full SHA for e2b3f8b - Browse repository at this point
Copy the full SHA e2b3f8bView commit details -
Merge pull request #77849 from primeos/signal-desktop-backport
[19.09] signal-desktop: 1.29.4 -> 1.29.5 (backport)
Configuration menu - View commit details
-
Copy full SHA for d7292e7 - Browse repository at this point
Copy the full SHA d7292e7View commit details -
signal-desktop: 1.29.5 -> 1.29.6
(cherry picked from commit e6ed469) Reason: Avoid an expired (unusable) build in the stable release (Signal-Desktop builds expire after 90 days).
Configuration menu - View commit details
-
Copy full SHA for 6a4a10f - Browse repository at this point
Copy the full SHA 6a4a10fView commit details -
Merge pull request #77949 from primeos/signal-desktop-backport
[19.09] signal-desktop: 1.29.5 -> 1.29.6 (backport)
Configuration menu - View commit details
-
Copy full SHA for aa1151c - Browse repository at this point
Copy the full SHA aa1151cView commit details -
skanlite: use qt5's mkDerivaiton
(cherry picked from commit 4b20959)
Configuration menu - View commit details
-
Copy full SHA for ed422d8 - Browse repository at this point
Copy the full SHA ed422d8View commit details -
skanlite: don't set enableParallelBuilding
it's default on (cherry picked from commit ac96ba0)
Configuration menu - View commit details
-
Copy full SHA for b7e1cdd - Browse repository at this point
Copy the full SHA b7e1cddView commit details -
Configuration menu - View commit details
-
Copy full SHA for 09aa1b2 - Browse repository at this point
Copy the full SHA 09aa1b2View commit details
Commits on Jan 18, 2020
-
Merge pull request #77605 from srhb/ceph-backport-14.2.6
Backport: Ceph 14.2.6
Configuration menu - View commit details
-
Copy full SHA for 63a3564 - Browse repository at this point
Copy the full SHA 63a3564View commit details
There are no files selected for viewing