boost: make 1.65 the default
This commit is contained in:
parent
c6c67c46bf
commit
b1736511ce
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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 { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue