From 270d040cdc4bdf6136a4f55c0b6cffa63c021215 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 21 Jul 2022 20:01:19 +0700 Subject: [PATCH 1/2] libdigidocpp: 3.14.8 -> 3.14.10 This includes 42a8cfd834c10bdd206fe784a13217df222b1c8e, fixing crashes with OpenSSL>1.1.1l. We previously fetchpatched the patch manually. --- .../libraries/libdigidocpp/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index c99e96863d33..c6070209f3cb 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,26 +2,14 @@ , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.14.8"; + version = "3.14.10"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - sha256 = "sha256-U5i5IAyJF4359q6M6mQemEuG7+inPYIXqLy8GHv4dkg="; + sha256 = "sha256-n/+R4ho1Qcft3YSKE12oxZjbFHAsUDwoLFNuk5GXf5c="; }; - patches = [ - (fetchpatch { - # fix runtime crashes when signing with OpenSSL>1.1.1l - # https://github.com/open-eid/libdigidocpp/issues/474 asks for a new release - url = "https://github.com/open-eid/libdigidocpp/commit/42a8cfd834c10bdd206fe784a13217df222b1c8e.patch"; - sha256 = "sha256-o3ZT0dXhIu79C5ZR+2HPdLMZ3YwPG1v3vly5bseuxtU="; - excludes = [ - ".github/workflows/build.yml" # failed hunk - ]; - }) - ]; - nativeBuildInputs = [ cmake pkg-config xxd ]; buildInputs = [ From 3a3cfc0d66d0fad7fe39cc59be4993a1f36a29b0 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 22 Jul 2022 14:09:33 +0700 Subject: [PATCH 2/2] Update pkgs/development/libraries/libdigidocpp/default.nix Co-authored-by: QuantMint --- pkgs/development/libraries/libdigidocpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index c6070209f3cb..7d34388aea39 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - sha256 = "sha256-n/+R4ho1Qcft3YSKE12oxZjbFHAsUDwoLFNuk5GXf5c="; + hash = "sha256-n/+R4ho1Qcft3YSKE12oxZjbFHAsUDwoLFNuk5GXf5c="; }; nativeBuildInputs = [ cmake pkg-config xxd ];