From f8e7cee32e702d7e46d4326d436da78af690d529 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" <william@wkennington.com> Date: Thu, 17 Sep 2015 15:39:21 -0700 Subject: [PATCH] folly: 0.57.0 -> 2015-09-17 --- pkgs/development/libraries/folly/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 5ca5fe638eff..4659ba211230 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -2,14 +2,14 @@ , google-gflags, python, libiberty, openssl }: stdenv.mkDerivation rec { - version = "0.57.0"; + version = "2015-09-17"; name = "folly-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; - rev = "v${version}"; - sha256 = "12b9bkwmndfwmsknc209kpplxn9wqmwr3p2h0l2szrppq4qqyfq9"; + rev = "e4527fb5d04f5fec823bd6a2402b620a6e1a64e3"; + sha256 = "0iicq19yylafr7qs221xgk8pcwf6nnyx6srgsx9y9cyf72siadcb"; }; nativeBuildInputs = [ autoreconfHook python ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76b83ae5edc3..0e0b8cc8288a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6174,9 +6174,7 @@ let fontconfig-ultimate = callPackage ../development/libraries/fontconfig-ultimate {}; - folly = callPackage ../development/libraries/folly { - boost = boost157; - }; + folly = callPackage ../development/libraries/folly { }; makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}: callPackage ../development/libraries/fontconfig/make-fonts-conf.nix {