From 989a9e84a518835487d8245375e3008abacda400 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 23 Nov 2024 03:13:50 +0000 Subject: [PATCH 01/12] localproxy: unpin Boost --- pkgs/by-name/lo/localproxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lo/localproxy/package.nix b/pkgs/by-name/lo/localproxy/package.nix index f693bcb12c04..895f8796fe40 100644 --- a/pkgs/by-name/lo/localproxy/package.nix +++ b/pkgs/by-name/lo/localproxy/package.nix @@ -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 From b15f8dd1a502cde4e632f4d51d1d184702c95761 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 23 Nov 2024 03:14:05 +0000 Subject: [PATCH 02/12] nheko: unpin Boost --- pkgs/by-name/nh/nheko/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nh/nheko/package.nix b/pkgs/by-name/nh/nheko/package.nix index 2e1bf3126d75..e9e0a5141818 100644 --- a/pkgs/by-name/nh/nheko/package.nix +++ b/pkgs/by-name/nh/nheko/package.nix @@ -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 From ba861095f9473396d1024da194ee5c1b8acd8910 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 23 Nov 2024 03:14:20 +0000 Subject: [PATCH 03/12] quantlib: unpin Boost --- pkgs/by-name/qu/quantlib/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quantlib/package.nix b/pkgs/by-name/qu/quantlib/package.nix index aad65c6045db..0bd608ceb728 100644 --- a/pkgs/by-name/qu/quantlib/package.nix +++ b/pkgs/by-name/qu/quantlib/package.nix @@ -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" ]; From e45f423d2ec9c82bf94df77fbac1cf3631a93f7f Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 23 Nov 2024 03:14:35 +0000 Subject: [PATCH 04/12] sv-lang: unpin Boost --- pkgs/by-name/sv/sv-lang/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sv/sv-lang/package.nix b/pkgs/by-name/sv/sv-lang/package.nix index 2bc5059b8b80..87a4573cb6d8 100644 --- a/pkgs/by-name/sv/sv-lang/package.nix +++ b/pkgs/by-name/sv/sv-lang/package.nix @@ -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 From 4b3e26348014280fc39272fb665146f4dd6b2262 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 23 Nov 2024 03:37:53 +0000 Subject: [PATCH 05/12] {nixf,nixt,nixd}: unpin Boost --- pkgs/development/tools/language-servers/nixd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index 5a2956984eae..59ff96a3f42f 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -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 ]; From 06b0d517259494f846af667671e126fa9168f1f6 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 23 Nov 2024 03:46:55 +0000 Subject: [PATCH 06/12] zcash: unpin Boost --- pkgs/applications/blockchains/zcash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index f2c3cc7a065f..d1764ee8f78a 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -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}" ]; From bf46289766e0de417ffe4d1086f6cff2a4e31d65 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 23 Nov 2024 04:04:41 +0000 Subject: [PATCH 07/12] snapcast: unpin Boost --- pkgs/applications/audio/snapcast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 821cda32e977..4fd1d1fec9bd 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -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 From 8f79887fa1823bd3b0e7bb86c86d4e8f49b48a53 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 23 Nov 2024 04:57:24 +0000 Subject: [PATCH 08/12] emilua: unpin Boost --- pkgs/development/interpreters/emilua/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix index 22affc8b9add..366782276241 100644 --- a/pkgs/development/interpreters/emilua/default.nix +++ b/pkgs/development/interpreters/emilua/default.nix @@ -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: { From 4a7266d952af42044d8ef6972786decb0167a4f3 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 23 Nov 2024 05:03:06 +0000 Subject: [PATCH 09/12] libpulsar: unpin Boost --- pkgs/development/libraries/libpulsar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix index f083ef041457..9e227f92ded0 100644 --- a/pkgs/development/libraries/libpulsar/default.nix +++ b/pkgs/development/libraries/libpulsar/default.nix @@ -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 { From b54dcbddce1c18f54927594fd17ce3016c7ec9b0 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 23 Nov 2024 05:10:31 +0000 Subject: [PATCH 10/12] postgresqlPackages.apache_datasketches: unpin Boost --- pkgs/servers/sql/postgresql/ext/apache_datasketches.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix index 46b5fac3852b..23bccca34ab2 100644 --- a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix +++ b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix @@ -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 From 84fdfde3835719eefeeaa3e68cf7009f400848b2 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 23 Nov 2024 06:07:00 +0000 Subject: [PATCH 11/12] osl: unpin Boost --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71757dfc349b..d17a46398ee9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4769,7 +4769,6 @@ with pkgs; }; osl = libsForQt5.callPackage ../development/compilers/osl { - boost = boost179; libclang = llvmPackages_15.libclang; clang = clang_15; llvm = llvm_15; From cf10dfe614008c2fa80822b7ff32375d7bdbd111 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 24 Nov 2024 04:24:35 +0000 Subject: [PATCH 12/12] hpx: unpin Boost --- pkgs/top-level/all-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d17a46398ee9..fd1b214c97be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9569,10 +9569,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 { };