public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

boost: make 1.65 the default

Browse Source
This commit is contained in:
Nikolay Amiantov 2017-09-17 07:08:28 +03:00
parent c6c67c46bf
commit b1736511ce
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/altcoins/default.nix
View File

@ -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 { rec {
@ -59,6 +59,5 @@ rec {
zcash = callPackage ./zcash { zcash = callPackage ./zcash {
withGui = false; withGui = false;
openssl = openssl_1_1_0; openssl = openssl_1_1_0;
boost = boost163;
}; };
} }

4
pkgs/applications/editors/rstudio/default.nix
View File

@ -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 R, qt5, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc
}: }:
@ -10,7 +10,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "RStudio-${version}"; 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 { src = fetchurl {
url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";

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

@ -645,9 +645,7 @@ with pkgs;
}; };
aria = aria2; aria = aria2;
aspcud = callPackage ../tools/misc/aspcud { aspcud = callPackage ../tools/misc/aspcud { };
boost = boost163;
};
at = callPackage ../tools/system/at { }; at = callPackage ../tools/system/at { };
@ -1402,9 +1400,7 @@ with pkgs;
citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { }; citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { };
citra = libsForQt5.callPackage ../misc/emulators/citra { citra = libsForQt5.callPackage ../misc/emulators/citra { };
boost = boost163;
};
cmst = libsForQt5.callPackage ../tools/networking/cmst { }; cmst = libsForQt5.callPackage ../tools/networking/cmst { };
@ -7826,7 +7822,7 @@ with pkgs;
boost164 = callPackage ../development/libraries/boost/1.64.nix { }; boost164 = callPackage ../development/libraries/boost/1.64.nix { };
boost165 = callPackage ../development/libraries/boost/1.65.nix { }; boost165 = callPackage ../development/libraries/boost/1.65.nix { };
boost16x = boost165; boost16x = boost165;
boost = boost162; boost = boost16x;
boost_process = callPackage ../development/libraries/boost-process { }; boost_process = callPackage ../development/libraries/boost-process { };