summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2022-07-21 20:01:19 +0700
committerFlorian Klink <flokli@flokli.de>2022-07-21 20:08:24 +0700
commit270d040cdc4bdf6136a4f55c0b6cffa63c021215 (patch)
treec6c53140f93b48c1b94b08bf4c07b33c96f0e05a
parent4392899832862e716d2f681d256168f937a7e54d (diff)
downloadnixpkgs-270d040cdc4bdf6136a4f55c0b6cffa63c021215.tar
nixpkgs-270d040cdc4bdf6136a4f55c0b6cffa63c021215.tar.gz
nixpkgs-270d040cdc4bdf6136a4f55c0b6cffa63c021215.tar.bz2
nixpkgs-270d040cdc4bdf6136a4f55c0b6cffa63c021215.tar.lz
nixpkgs-270d040cdc4bdf6136a4f55c0b6cffa63c021215.tar.xz
nixpkgs-270d040cdc4bdf6136a4f55c0b6cffa63c021215.tar.zst
nixpkgs-270d040cdc4bdf6136a4f55c0b6cffa63c021215.zip
libdigidocpp: 3.14.8 -> 3.14.10
This includes 42a8cfd834c10bdd206fe784a13217df222b1c8e, fixing crashes
with OpenSSL>1.1.1l. We previously fetchpatched the patch manually.
-rw-r--r--pkgs/development/libraries/libdigidocpp/default.nix16
1 files changed, 2 insertions, 14 deletions
diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix
index c99e96863d3..c6070209f3c 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 = [