diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-07-13 20:48:31 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-13 20:48:31 +0300 |
commit | 0c87c8c09b94a292f3db6c333fce17fb53af907b (patch) | |
tree | 1b953b098da7f0bf8eec5785d2bd4b212a109150 /pkgs/top-level | |
parent | bbf9a8c44fcd841eb9f735697d31861390aa5154 (diff) | |
parent | 315d1001133a8bd8d0f998a497f8bc4b8eb15012 (diff) |
Merge pull request #243286 from wegank/tobim-boost-update-1
boost17x, boost18x: remove aliases
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 46 |
2 files changed, 24 insertions, 24 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7f7ffefadbcb1..4dfcec2635d70 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 fbbf96a987df7..00a89a950db64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8916,7 +8916,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; }; @@ -11229,7 +11229,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 { }; @@ -14501,7 +14501,7 @@ with pkgs; }; xtreemfs = callPackage ../tools/filesystems/xtreemfs { - boost = boost17x; + boost = boost179; }; xurls = callPackage ../tools/text/xurls { }; @@ -20250,9 +20250,7 @@ with pkgs; boost182 ; - boost17x = boost179; - boost18x = boost182; - boost = boost17x; + boost = boost179; boost_process = callPackage ../development/libraries/boost-process { }; @@ -21561,8 +21559,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 { }; @@ -26399,14 +26397,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; }; @@ -36337,19 +36335,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; }; @@ -36371,11 +36369,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; }; @@ -36402,11 +36400,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; }; @@ -36453,13 +36451,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; }; @@ -36496,11 +36494,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 { }; @@ -36529,7 +36527,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 { }; @@ -36555,11 +36553,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; }; |