nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 16:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #243286 from wegank/tobim-boost-update-1

Browse Source 
boost17x, boost18x: remove aliases
This commit is contained in:
Weijia Wang 2023-07-13 20:48:31 +03:00 committed by GitHub
commit 0c87c8c09b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/snapcast/default.nix
View File

@ -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

4
pkgs/applications/emulators/citra/generic.nix
View File

@ -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

4
pkgs/applications/graphics/meshlab/default.nix
View File

@ -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
];

4
pkgs/applications/networking/instant-messengers/nheko/default.nix
View File

@ -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

4
pkgs/applications/science/electronics/openroad/default.nix
View File

@ -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

4
pkgs/applications/science/misc/colmap/default.nix
View File

@ -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;

4
pkgs/development/libraries/libpulsar/default.nix
View File

@ -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

4
pkgs/development/python-modules/ifcopenshell/default.nix
View File

@ -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

4
pkgs/games/freeorion/default.nix
View File

@ -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

2
pkgs/top-level/aliases.nix
View File

@ -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

46
pkgs/top-level/all-packages.nix
View File

@ -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;
};