folly: 0.57.0 -> 2015-09-17

This commit is contained in:
William A. Kennington III 2015-09-17 15:39:21 -07:00
parent fb30776a77
commit f8e7cee32e
2 changed files with 4 additions and 6 deletions

View File

@ -2,14 +2,14 @@
, google-gflags, python, libiberty, openssl }: , google-gflags, python, libiberty, openssl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.57.0"; version = "2015-09-17";
name = "folly-${version}"; name = "folly-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "folly"; repo = "folly";
rev = "v${version}"; rev = "e4527fb5d04f5fec823bd6a2402b620a6e1a64e3";
sha256 = "12b9bkwmndfwmsknc209kpplxn9wqmwr3p2h0l2szrppq4qqyfq9"; sha256 = "0iicq19yylafr7qs221xgk8pcwf6nnyx6srgsx9y9cyf72siadcb";
}; };
nativeBuildInputs = [ autoreconfHook python ]; nativeBuildInputs = [ autoreconfHook python ];

View File

@ -6174,9 +6174,7 @@ let
fontconfig-ultimate = callPackage ../development/libraries/fontconfig-ultimate {}; fontconfig-ultimate = callPackage ../development/libraries/fontconfig-ultimate {};
folly = callPackage ../development/libraries/folly { folly = callPackage ../development/libraries/folly { };
boost = boost157;
};
makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}: makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}:
callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { callPackage ../development/libraries/fontconfig/make-fonts-conf.nix {