From 27642c1e5c0fac3b093c9e753e2c4f054fd6bdb8 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Tue, 14 Jul 2020 21:41:09 +0200 Subject: [PATCH] flatbuffers: 1.11.0 -> 1.12.0 --- .../libraries/flatbuffers/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 825e052ad873..0b0e0fd9e22c 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { pname = "flatbuffers"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - sha256 = "1gl8pnykzifh7pnnvl80f5prmj5ga60dp44inpv9az2k9zaqx3qr"; + sha256 = "0f7xd66vc1lzjbn7jzd5kyqrgxpsfxi4zc7iymhb5xrwyxipjl1g"; }; preConfigure = stdenv.lib.optional stdenv.buildPlatform.isDarwin '' @@ -36,12 +36,4 @@ stdenv.mkDerivation (rec { platforms = stdenv.lib.platforms.unix; homepage = "https://google.github.io/flatbuffers/"; }; -} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isMusl { - # Remove when updating to the next version. - patches = [ - (fetchpatch { - url = "https://github.com/google/flatbuffers/commit/2b52494047fb6e97af03e1801b42adc7ed3fd78a.diff"; - sha256 = "01k07ws0f4w7nnl8nli795wgjm4p94lxd3kva4yf7nf3pg4p8arx"; - }) - ]; -}) +}