From 315d1001133a8bd8d0f998a497f8bc4b8eb15012 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Thu, 29 Jun 2023 22:36:26 +0200 Subject: [PATCH] boost17x, boost18x: remove aliases --- pkgs/applications/audio/snapcast/default.nix | 4 +- pkgs/applications/emulators/citra/generic.nix | 4 +- .../applications/graphics/meshlab/default.nix | 4 +- .../instant-messengers/nheko/default.nix | 4 +- .../science/electronics/openroad/default.nix | 4 +- .../science/misc/colmap/default.nix | 4 +- .../libraries/libpulsar/default.nix | 4 +- .../python-modules/ifcopenshell/default.nix | 4 +- pkgs/games/freeorion/default.nix | 4 +- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 46 +++++++++---------- 11 files changed, 42 insertions(+), 42 deletions(-) diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index aef561e692a61..2ce4bbee229fa 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, boost17x, flac, libogg, libvorbis, soxr +, alsa-lib, asio, avahi, boost179, flac, libogg, libvorbis, soxr , IOKit, AudioToolbox , aixlog, popl , pulseaudioSupport ? false, libpulseaudio @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # snapcast also supports building against tremor but as we have libogg, that's # not needed buildInputs = [ - boost17x + boost179 asio avahi flac libogg libvorbis aixlog popl soxr ] ++ lib.optional pulseaudioSupport libpulseaudio diff --git a/pkgs/applications/emulators/citra/generic.nix b/pkgs/applications/emulators/citra/generic.nix index d7cea31e23f48..7bce3e16d8729 100644 --- a/pkgs/applications/emulators/citra/generic.nix +++ b/pkgs/applications/emulators/citra/generic.nix @@ -8,7 +8,7 @@ , stdenv , fetchFromGitHub , cmake -, boost17x +, boost179 , pkg-config , libusb1 , zstd @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableQt [ wrapQtAppsHook ]; buildInputs = [ - boost17x + boost179 libusb1 ] ++ lib.optionals enableQt [ qtbase qtmultimedia ] ++ lib.optional enableSdl2 SDL2 diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index dccfad9496331..3067bfefd2c79 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -15,7 +15,7 @@ , qhull , cmake , cgal_5 -, boost17x +, boost179 , mpfr , xercesc }: @@ -46,7 +46,7 @@ mkDerivation rec { levmar qhull cgal_5 - boost17x + boost179 mpfr xercesc ]; diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 0b37b6999e012..5dc6bde6fed6a 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -4,7 +4,7 @@ , cmake , asciidoc , pkg-config -, boost17x +, boost179 , cmark , coeurl , curl @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost17x + boost179 cmark coeurl curl diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix index 68e079e2f89b6..36f168a02b636 100644 --- a/pkgs/applications/science/electronics/openroad/default.nix +++ b/pkgs/applications/science/electronics/openroad/default.nix @@ -8,7 +8,7 @@ , git , python3 , swig4 -, boost17x +, boost179 , cbc # for clp , cimg , clp # for or-tools @@ -55,7 +55,7 @@ mkDerivation rec { ]; buildInputs = [ - boost17x + boost179 cbc cimg clp diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 8dc8f749897ee..e3ce66356ba66 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -1,11 +1,11 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen, +{ mkDerivation, lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, cudaSupport ? false, cudaPackages }: assert cudaSupport -> cudaPackages != { }; let - boost_static = boost17x.override { enableStatic = true; }; + boost_static = boost179.override { enableStatic = true; }; # TODO: migrate to redist packages inherit (cudaPackages) cudatoolkit; diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix index d16c6f7f18397..d87ef2b72802b 100644 --- a/pkgs/development/libraries/libpulsar/default.nix +++ b/pkgs/development/libraries/libpulsar/default.nix @@ -1,7 +1,7 @@ { lib , clang-tools , llvmPackages -, boost17x +, boost179 , protobuf , python3Support ? false , python3 @@ -40,7 +40,7 @@ let # Not really sure why I need to do this.. If I call clang-tools without the override it defaults to a different version and fails clangTools = clang-tools.override { inherit stdenv llvmPackages; }; # If boost has python enabled, then boost-python package will be installed which is used by libpulsars python wrapper - boost = if python3Support then boost17x.override { inherit stdenv; enablePython = python3Support; python = python3; } else boost17x; + boost = if python3Support then boost179.override { inherit stdenv; enablePython = python3Support; python = python3; } else boost179; defaultOptionals = [ boost protobuf ] ++ lib.optional python3Support python3 ++ lib.optional snappySupport snappy.dev diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index 3d17085a0e317..e2c945c2834ed 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , gcc10 , cmake -, boost17x +, boost179 , icu , swig , pcre @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ gcc10 cmake ]; buildInputs = [ - boost17x + boost179 icu pcre libxml2 diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index 9a3cce9ef8125..8c2c4ef86a08a 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -5,7 +5,7 @@ , doxygen , graphviz , makeWrapper -, boost17x +, boost179 , SDL2 , python3 , freetype @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - (boost17x.override { enablePython = true; python = python3; }) + (boost179.override { enablePython = true; python = python3; }) (python3.withPackages (p: with p; [ pycodestyle ])) SDL2 freetype diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cdb002947ad7c..5c7220f626e99 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -163,6 +163,8 @@ mapAliases ({ boost172 = throw "boost172 has been deprecated in favor of the latest version"; # Added 2023-06-08 boost173 = throw "boost173 has been deprecated in favor of the latest version"; # Added 2023-06-08 boost174 = throw "boost174 has been deprecated in favor of the latest version"; # Added 2023-06-08 + boost17x = throw "boost17x has been deprecated in favor of the latest version"; # Added 2023-07-13 + boost18x = throw "boost18x has been deprecated in favor of the latest version"; # Added 2023-07-13 botan = throw "botan has been removed because it did not support a supported openssl version"; # added 2021-12-15 bpftool = bpftools; # Added 2021-05-03 bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c585a3a0eeb41..199df7f1a1105 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8912,7 +8912,7 @@ with pkgs; inherit (callPackages ../tools/filesystems/irods rec { stdenv = llvmPackages.libcxxStdenv; libcxx = llvmPackages.libcxx; - boost = boost17x.override { inherit stdenv; }; + boost = boost179.override { inherit stdenv; }; fmt = fmt_8.override { inherit stdenv; }; nanodbc_llvm = nanodbc.override { inherit stdenv; }; avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; }; @@ -11225,7 +11225,7 @@ with pkgs; oshka = callPackage ../development/tools/oshka { }; osl = libsForQt5.callPackage ../development/compilers/osl { - boost = boost17x; + boost = boost179; }; osqp = callPackage ../development/libraries/science/math/osqp { }; @@ -14495,7 +14495,7 @@ with pkgs; }; xtreemfs = callPackage ../tools/filesystems/xtreemfs { - boost = boost17x; + boost = boost179; }; xurls = callPackage ../tools/text/xurls { }; @@ -20249,9 +20249,7 @@ with pkgs; boost182 ; - boost17x = boost179; - boost18x = boost182; - boost = boost17x; + boost = boost179; boost_process = callPackage ../development/libraries/boost-process { }; @@ -21560,8 +21558,8 @@ with pkgs; hpp-fcl = callPackage ../development/libraries/hpp-fcl { }; hpx = callPackage ../development/libraries/hpx { - boost = boost17x; - asio = asio.override { boost = boost17x; }; + boost = boost179; + asio = asio.override { boost = boost179; }; }; hspell = callPackage ../development/libraries/hspell { }; @@ -26400,14 +26398,14 @@ with pkgs; mongodb-4_4 = callPackage ../servers/nosql/mongodb/4.4.nix { sasl = cyrus_sasl; - boost = boost17x.override { enableShared = false; }; + boost = boost179.override { enableShared = false; }; inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; mongodb-5_0 = callPackage ../servers/nosql/mongodb/5.0.nix { sasl = cyrus_sasl; - boost = boost17x.override { enableShared = false; }; + boost = boost179.override { enableShared = false; }; inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; @@ -36336,19 +36334,19 @@ with pkgs; bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin { stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; - boost = boost17x; + boost = boost179; withGui = true; inherit (darwin) autoSignDarwinBinariesHook; }; bitcoind = callPackage ../applications/blockchains/bitcoin { - boost = boost17x; + boost = boost179; withGui = false; inherit (darwin) autoSignDarwinBinariesHook; }; bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { - boost = boost17x; + boost = boost179; withGui = false; inherit (darwin) autoSignDarwinBinariesHook; }; @@ -36370,11 +36368,11 @@ with pkgs; besu = callPackage ../applications/blockchains/besu { }; bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc { - boost = boost17x; + boost = boost179; withGui = true; }; bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc { - boost = boost17x; + boost = boost179; mkDerivation = stdenv.mkDerivation; withGui = false; }; @@ -36401,11 +36399,11 @@ with pkgs; dcrwallet = callPackage ../applications/blockchains/dcrwallet { }; dogecoin = libsForQt5.callPackage ../applications/blockchains/dogecoin { - boost = boost17x; + boost = boost179; withGui = true; }; dogecoind = callPackage ../applications/blockchains/dogecoin { - boost = boost17x; + boost = boost179; withGui = false; }; @@ -36452,13 +36450,13 @@ with pkgs; groestlcoin = libsForQt5.callPackage ../applications/blockchains/groestlcoin { stdenv = darwin.apple_sdk_11_0.stdenv; - boost = boost17x; + boost = boost179; withGui = true; inherit (darwin) autoSignDarwinBinariesHook; }; groestlcoind = callPackage ../applications/blockchains/groestlcoin { - boost = boost17x; + boost = boost179; inherit (darwin) autoSignDarwinBinariesHook; }; @@ -36495,11 +36493,11 @@ with pkgs; }; monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { - boost = boost17x; + boost = boost179; }; oxen = callPackage ../applications/blockchains/oxen - { stdenv = gcc10StdenvCompat; boost = boost17x; }; + { stdenv = gcc10StdenvCompat; boost = boost179; }; masari = callPackage ../applications/blockchains/masari { }; @@ -36528,7 +36526,7 @@ with pkgs; stellar-core = callPackage ../applications/blockchains/stellar-core { }; sumokoin = callPackage ../applications/blockchains/sumokoin { - boost = boost17x; + boost = boost179; }; solana-cli = callPackage ../applications/blockchains/solana { }; @@ -36554,11 +36552,11 @@ with pkgs; torq = callPackage ../applications/blockchains/torq { }; vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin { - boost = boost17x; + boost = boost179; withGui = true; }; vertcoind = callPackage ../applications/blockchains/vertcoin { - boost = boost17x; + boost = boost179; withGui = false; };