diff options
author | Hunter Jones <hjones2199@gmail.com> | 2021-09-17 12:17:40 -0500 |
---|---|---|
committer | Hunter Jones <hjones2199@gmail.com> | 2021-09-17 12:47:21 -0500 |
commit | eca50883fc25ecc4b27a9ec3e694f261bba2f21e (patch) | |
tree | d2113b9f345e6cf3e1bf542088f07feca76313df /pkgs/top-level/all-packages.nix | |
parent | 2e34bfb45ab7d074009653a32daf8aa69cc9f4e2 (diff) |
boost: default to boost 1.77
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 38 |
1 files changed, 11 insertions, 27 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b9fa4192e720..01968bf421d81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4595,9 +4595,7 @@ with pkgs; vorta = libsForQt5.callPackage ../applications/backup/vorta { }; - vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { - boost = boost17x; - }; + vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { }; utahfs = callPackage ../applications/networking/utahfs { }; @@ -14814,9 +14812,7 @@ with pkgs; uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { }; uhd3_5 = callPackage ../applications/radio/uhd/3.5.nix { }; - uhd = callPackage ../applications/radio/uhd { - boost = boost17x; - }; + uhd = callPackage ../applications/radio/uhd { }; uisp = callPackage ../development/embedded/uisp { }; @@ -15129,12 +15125,13 @@ with pkgs; boost173 boost174 boost175 + boost177 ; boost15x = boost159; boost16x = boost169; - boost17x = boost175; - boost = boost16x; + boost17x = boost177; + boost = boost17x; boost_process = callPackage ../development/libraries/boost-process { }; @@ -20718,14 +20715,10 @@ with pkgs; libtool = darwin.cctools; }; - # Fails to compile with boost >= 1.72 - rippled = callPackage ../servers/rippled { - boost = boost17x; - }; + # Fails to compile with boost <= 1.72 + rippled = callPackage ../servers/rippled { }; - rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { - boost = boost17x; - }; + rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { }; roon-bridge = callPackage ../servers/roon-bridge { }; @@ -24147,7 +24140,6 @@ with pkgs; unwrapped = callPackage ../applications/radio/gnuradio { inherit (darwin.apple_sdk.frameworks) CoreAudio; python = python3; - boost = boost17x; }; }; gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs; @@ -24177,7 +24169,6 @@ with pkgs; unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix { inherit (darwin.apple_sdk.frameworks) CoreAudio; python = python3; - boost = boost17x; }; }; gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs; @@ -26814,9 +26805,7 @@ with pkgs; qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { }; - qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { - boost = boost17x; - }; + qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { }; qmplay2 = libsForQt5.callPackage ../applications/video/qmplay2 { }; @@ -28801,16 +28790,11 @@ with pkgs; monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; - boost = boost17x; }; - oxen = callPackage ../applications/blockchains/oxen { - boost = boost17x; - }; + oxen = callPackage ../applications/blockchains/oxen { }; - monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { - boost = boost17x; - }; + monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { }; masari = callPackage ../applications/blockchains/masari { boost = boost165; }; |