about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-03-20 00:13:35 +0000
committerGitHub <noreply@github.com>2024-03-20 00:13:35 +0000
commit10a5d48c6a07836f9f667cb5d81a331702532d6e (patch)
tree0084edaf5c03735ac87e7a1497108d949b3e4b79 /pkgs/tools
parent67ee144c658d9d0adb9d10ed854bc9a6be26734f (diff)
parent7cdcf69edff87285f6a6b4cc130a7193e0dcd092 (diff)
Merge staging-next-23.11 into staging-23.11
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/security/opensc/default.nix12
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix
index 9b5b6fba8b24f..6edc9a7da55cd 100644
--- a/pkgs/tools/security/opensc/default.nix
+++ b/pkgs/tools/security/opensc/default.nix
@@ -8,23 +8,15 @@
 
 stdenv.mkDerivation rec {
   pname = "opensc";
-  version = "0.23.0";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "OpenSC";
     rev = version;
-    sha256 = "sha256-Yo8dwk7+d6q+hi7DmJ0GJM6/pmiDOiyEm/tEBSbCU8k=";
+    sha256 = "sha256-pNorJiZzLGpxtlkog2d3E9xePMy9ASoHeWduqVZiBiA=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2023-2977.patch";
-      url = "https://github.com/OpenSC/OpenSC/commit/81944d1529202bd28359bede57c0a15deb65ba8a.patch";
-      hash = "sha256-rCeYYKPtv3pii5zgDP5x9Kl2r98p3uxyBSCYlPJZR/s=";
-    })
-  ];
-
   nativeBuildInputs = [ pkg-config autoreconfHook ];
   buildInputs = [
     zlib readline openssl libassuan