liblouis: 3.21.0 → 3.22.0
http://liblouis.org/liblouis/2022/06/07/liblouis-release-3.22.0.html CVE-2022-26981 Also correct license.
This commit is contained in:
parent
914ef51ffa
commit
0631bf9509
|
@ -1,7 +1,6 @@
|
||||||
{ fetchFromGitHub
|
{ fetchFromGitHub
|
||||||
, lib
|
, lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchpatch
|
|
||||||
, autoreconfHook
|
, autoreconfHook
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, gettext
|
, gettext
|
||||||
|
@ -14,25 +13,17 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "liblouis";
|
pname = "liblouis";
|
||||||
version = "3.21.0";
|
version = "3.22.0";
|
||||||
|
|
||||||
|
outputs = [ "out" "dev" "man" "info" "doc" ];
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "liblouis";
|
owner = "liblouis";
|
||||||
repo = "liblouis";
|
repo = "liblouis";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-Hfn0dfXihtUfO3R+qJaetrPwupcIwblvi1DQdHCF1s8=";
|
sha256 = "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
name = "parenthesize-memcpy-calls-clang.patch";
|
|
||||||
url = "https://github.com/liblouis/liblouis/commit/528f38938e9f539a251d9de92ad1c1b90401c4d0.patch";
|
|
||||||
sha256 = "0hlhqsvd5wflg70bd7bmssnchk8znzbr93in0zpspzbyap6xz112";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" "man" "info" "doc" ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoreconfHook
|
autoreconfHook
|
||||||
pkg-config
|
pkg-config
|
||||||
|
@ -71,7 +62,10 @@ stdenv.mkDerivation rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Open-source braille translator and back-translator";
|
description = "Open-source braille translator and back-translator";
|
||||||
homepage = "http://liblouis.org/";
|
homepage = "http://liblouis.org/";
|
||||||
license = licenses.lgpl21;
|
license = with licenses; [
|
||||||
|
lgpl21Plus # library
|
||||||
|
gpl3Plus # tools
|
||||||
|
];
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ jtojnar ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue