various: unpin Boost (round 2) (#358944)

This commit is contained in:
Emily
2024-11-25 14:59:40 +00:00
committed by GitHub
11 changed files with 24 additions and 30 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config
, alsa-lib, asio, avahi, boost179, flac, libogg, libvorbis, libopus, soxr
, alsa-lib, asio, avahi, boost, flac, libogg, libvorbis, libopus, soxr
, IOKit, AudioToolbox
, aixlog, popl
, pulseaudioSupport ? false, libpulseaudio
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
# snapcast also supports building against tremor but as we have libogg, that's
# not needed
buildInputs = [
boost179
boost
asio avahi flac libogg libvorbis libopus
aixlog popl soxr
] ++ lib.optional pulseaudioSupport libpulseaudio
@@ -1,4 +1,4 @@
{ autoreconfHook, boost180, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub
{ autoreconfHook, boost, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub
, git, hexdump, lib, libevent, libsodium, makeWrapper, rustPlatform
, pkg-config, Security, stdenv, testers, tl-expected, utf8cpp, util-linux, zcash, zeromq
}:
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
nativeBuildInputs = [ autoreconfHook cargo cxx-rs git hexdump makeWrapper pkg-config ];
buildInputs = [
boost180
boost
db62
libevent
libsodium
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
configureFlags = [
"--disable-tests"
"--with-boost-libdir=${lib.getLib boost180}/lib"
"--with-boost-libdir=${lib.getLib boost}/lib"
"RUST_TARGET=${stdenv.hostPlatform.rust.rustcTargetSpec}"
];
+3 -3
View File
@@ -6,11 +6,11 @@
, openssl
, protobuf_21
, catch2
, boost181
, boost
, icu
}:
let
boost = boost181.override { enableStatic = true; };
boost' = boost.override { enableStatic = true; };
protobuf = protobuf_21.override { enableShared = false; };
in
stdenv.mkDerivation (finalAttrs: {
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
buildInputs = [ openssl protobuf catch2 boost icu ];
buildInputs = [ openssl protobuf catch2 boost' icu ];
postPatch = ''
sed -i '/set(OPENSSL_USE_STATIC_LIBS TRUE)/d' CMakeLists.txt
+2 -2
View File
@@ -5,7 +5,7 @@
cmake,
asciidoc,
pkg-config,
boost179,
boost,
cmark,
coeurl,
curl,
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
buildInputs =
[
boost179
boost
cmark
coeurl
curl
+2 -2
View File
@@ -2,7 +2,7 @@
, stdenv
, fetchFromGitHub
, cmake
, boost186 # (boost181) breaks on darwin
, boost
}:
stdenv.mkDerivation (finalAttrs: {
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [ cmake ];
buildInputs = [ boost186 ];
buildInputs = [ boost ];
# Required by RQuantLib, may be beneficial for others too
cmakeFlags = [ "-DQL_HIGH_RESOLUTION_DATE=ON" ];
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, boost182
, boost
, catch2_3
, cmake
, ninja
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
buildInputs = [
unordered_dense
boost182
boost
fmt_9
# though only used in tests, cmake will complain its absence when configuring
catch2_3
@@ -9,7 +9,7 @@
gperf,
gawk,
pkg-config,
boost182,
boost,
fmt,
luajit_openresty,
ncurses,
@@ -47,8 +47,6 @@ let
EOF
'';
};
boost = boost182;
in
stdenv.mkDerivation (self: {
@@ -1,7 +1,7 @@
{ lib
, asioSupport ? true
, asio
, boost180
, boost
, log4cxxSupport ? false
, log4cxx
, snappySupport ? false
@@ -41,7 +41,7 @@ let
++ lib.optional zstdSupport zstd
++ lib.optional log4cxxSupport log4cxx
++ lib.optional asioSupport asio
++ lib.optional (!asioSupport) boost180;
++ lib.optional (!asioSupport) boost;
in
stdenv.mkDerivation (finalAttrs: rec {
@@ -3,7 +3,7 @@
stdenv,
fetchFromGitHub,
cmake,
boost182,
boost,
gtest,
llvmPackages,
meson,
@@ -72,7 +72,7 @@ in
buildInputs = [
gtest
boost182
boost
nlohmann_json
];
@@ -103,7 +103,7 @@ in
buildInputs = [
nix
gtest
boost182
boost
];
env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";
@@ -132,7 +132,7 @@ in
nixt
llvmPackages.llvm
gtest
boost182
boost
];
nativeBuildInputs = common.nativeBuildInputs ++ [ cmake ];
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, postgresql, boost182, postgresqlTestExtension, buildPostgresqlExtension }:
{ stdenv, lib, fetchFromGitHub, postgresql, boost, postgresqlTestExtension, buildPostgresqlExtension }:
let
version = "1.7.0";
@@ -28,7 +28,7 @@ buildPostgresqlExtension (finalAttrs: {
sourceRoot = main_src.name;
buildInputs = [ boost182 ];
buildInputs = [ boost ];
patchPhase = ''
runHook prePatch
+1 -5
View File
@@ -4765,7 +4765,6 @@ with pkgs;
};
osl = libsForQt5.callPackage ../development/compilers/osl {
boost = boost179;
libclang = llvmPackages_15.libclang;
clang = clang_15;
llvm = llvm_15;
@@ -9564,10 +9563,7 @@ with pkgs;
autoreconfHook = buildPackages.autoreconfHook269;
};
hpx = callPackage ../development/libraries/hpx {
boost = boost179;
asio = asio.override { boost = boost179; };
};
hpx = callPackage ../development/libraries/hpx { };
hspell = callPackage ../development/libraries/hspell { };