Merge pull request #62681 from dtzWill/update/fltrdr-0.3.1

fltrdr: 0.2.1 -> 0.3.1
This commit is contained in:
Will Dietz 2019-06-06 23:43:42 -05:00 committed by GitHub
commit 276dc23b61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions

View File

@ -1,22 +1,23 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, icu , icu, openssl
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fltrdr-${version}"; name = "fltrdr-${version}";
version = "0.2.1"; version = "0.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "fltrdr"; repo = "fltrdr";
owner = "octobanana"; owner = "octobanana";
rev = "${version}"; rev = "${version}";
sha256 = "0hj7pwb93l4ahykmmr0665nq50jvwdq0aiaciz82225aw1cq939w"; sha256 = "1vpci7vqzcpdd21zgigyz38k77r9fc81dmiwsvfr8w7gad5sg6sj";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ icu ];
buildInputs = [ icu openssl ];
enableParallelBuilding = true; enableParallelBuilding = true;

View File

@ -2901,7 +2901,10 @@ in
flatpak-builder = callPackage ../development/tools/flatpak-builder { }; flatpak-builder = callPackage ../development/tools/flatpak-builder { };
fltrdr = callPackage ../tools/misc/fltrdr { stdenv = gcc8Stdenv; }; fltrdr = callPackage ../tools/misc/fltrdr {
stdenv = gcc8Stdenv;
icu = icu63;
};
fluent-bit = callPackage ../tools/misc/fluent-bit { fluent-bit = callPackage ../tools/misc/fluent-bit {
stdenv = gccStdenv; stdenv = gccStdenv;