diff options
author | Graham Christensen <graham@grahamc.com> | 2017-11-11 10:11:18 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-11 10:11:18 -0500 |
commit | 417706dcc1ffcc4995af7e0ff312f75847ee3294 (patch) | |
tree | 10b4b166ae65428faef4a00d7649b06ffd8ca694 | |
parent | cd06d23ccb02ea96e0d202dbbe132e8eebfd921e (diff) | |
parent | f11e3b5c93b0551450c55689ef0efb6db13c7b1e (diff) | |
download | nixlib-417706dcc1ffcc4995af7e0ff312f75847ee3294.tar nixlib-417706dcc1ffcc4995af7e0ff312f75847ee3294.tar.gz nixlib-417706dcc1ffcc4995af7e0ff312f75847ee3294.tar.bz2 nixlib-417706dcc1ffcc4995af7e0ff312f75847ee3294.tar.lz nixlib-417706dcc1ffcc4995af7e0ff312f75847ee3294.tar.xz nixlib-417706dcc1ffcc4995af7e0ff312f75847ee3294.tar.zst nixlib-417706dcc1ffcc4995af7e0ff312f75847ee3294.zip |
Merge pull request #31522 from Mankarse/folly-v2017.11.06.00
folly: 2017.07.24.00 -> 2017.11.06.00
-rw-r--r-- | pkgs/development/libraries/folly/default.nix | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 286e4ac56b58..4abe7cf8507b 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,23 +3,15 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2017.07.24.00"; + version = "2017.11.06.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "1cmqrm9yjxrw4xr1kcgzl0s7vcvp125wcgb0cz7whssgj11mf169"; + sha256 = "11sn4gwqw94ygc2s4bzqy5k67v3rr20gy375brdcrl5rv0r2hhc0"; }; - patches = [ - # Fix compilation - (fetchpatch { - url = "https://github.com/facebook/folly/commit/9fc87c83d93f092859823ec32289ed1b6abeb683.patch"; - sha256 = "0ix0grqlzm16hwa4rjbajjck8kr9lksh6c3gn7p3ihbbchsmlhvl"; - }) - ]; - nativeBuildInputs = [ autoreconfHook python pkgconfig ]; buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ]; |