diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-09-17 07:08:28 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-10-17 03:40:11 +0300 |
| commit | b1736511cedee31dbc76bf48da1de9904d4825b7 (patch) | |
| tree | 7acee672534d7cfdc712a83e6a99078557ae6cd9 | |
| parent | c6c67c46bf7dacfc4f5beb8584f1ce30630c4f75 (diff) | |
| download | nixlib-b1736511cedee31dbc76bf48da1de9904d4825b7.tar nixlib-b1736511cedee31dbc76bf48da1de9904d4825b7.tar.gz nixlib-b1736511cedee31dbc76bf48da1de9904d4825b7.tar.bz2 nixlib-b1736511cedee31dbc76bf48da1de9904d4825b7.tar.lz nixlib-b1736511cedee31dbc76bf48da1de9904d4825b7.tar.xz nixlib-b1736511cedee31dbc76bf48da1de9904d4825b7.tar.zst nixlib-b1736511cedee31dbc76bf48da1de9904d4825b7.zip | |
boost: make 1.65 the default
| -rw-r--r-- | pkgs/applications/altcoins/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/editors/rstudio/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
3 files changed, 6 insertions, 11 deletions
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 0264ce397762..1a21efc32322 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,4 +1,4 @@ -{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages, darwin, libsForQt5 }: +{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5 }: rec { @@ -59,6 +59,5 @@ rec { zcash = callPackage ./zcash { withGui = false; openssl = openssl_1_1_0; - boost = boost163; }; } diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index bf8374fdaaa1..80f020b6c503 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost163, zlib, openssl, +{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost, zlib, openssl, R, qt5, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc }: @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { name = "RStudio-${version}"; - buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid unzip ant jdk makeWrapper pandoc ]; + buildInputs = [ cmake boost zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid unzip ant jdk makeWrapper pandoc ]; src = fetchurl { url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf16b0716849..487b32526d89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -645,9 +645,7 @@ with pkgs; }; aria = aria2; - aspcud = callPackage ../tools/misc/aspcud { - boost = boost163; - }; + aspcud = callPackage ../tools/misc/aspcud { }; at = callPackage ../tools/system/at { }; @@ -1402,9 +1400,7 @@ with pkgs; citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { }; - citra = libsForQt5.callPackage ../misc/emulators/citra { - boost = boost163; - }; + citra = libsForQt5.callPackage ../misc/emulators/citra { }; cmst = libsForQt5.callPackage ../tools/networking/cmst { }; @@ -7826,7 +7822,7 @@ with pkgs; boost164 = callPackage ../development/libraries/boost/1.64.nix { }; boost165 = callPackage ../development/libraries/boost/1.65.nix { }; boost16x = boost165; - boost = boost162; + boost = boost16x; boost_process = callPackage ../development/libraries/boost-process { }; |