nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-30 11:50:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-24.05 into staging-next-24.05

Browse Source
This commit is contained in:
github-actions[bot]
2024-11-29 00:17:51 +00:00
committed by GitHub
parent 857246b0bc fa7db5bea1
commit a193d2102b
3 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/tools/security/opensc/0001-Revert-Desctivate-driver-for-MICARDO.patch Normal file
View File

@@ -0,0 +1,33 @@
From 6b576118c02241c7e366696be2f16850460fac35 Mon Sep 17 00:00:00 2001
From: Michael Adler <therisen06@gmail.com>
Date: Wed, 27 Nov 2024 09:23:04 +0100
Subject: [PATCH] Revert "Desctivate driver for MICARDO"
This reverts commit 13951f633b5f1df14d5c49310cd397a42a467f36.
---
src/libopensc/ctx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libopensc/ctx.c b/src/libopensc/ctx.c
index 6fbab389c..2316209ee 100644
--- a/src/libopensc/ctx.c
+++ b/src/libopensc/ctx.c
@@ -148,6 +148,7 @@ static const struct _sc_driver_entry internal_card_drivers[] = {
* put the muscle driver first to cope with this bug. */
{ "muscle", (void *(*)(void)) sc_get_muscle_driver },
{ "sc-hsm", (void *(*)(void)) sc_get_sc_hsm_driver },
+ { "mcrd", (void *(*)(void)) sc_get_mcrd_driver },
{ "setcos", (void *(*)(void)) sc_get_setcos_driver },
{ "PIV-II", (void *(*)(void)) sc_get_piv_driver },
{ "cac", (void *(*)(void)) sc_get_cac_driver },
@@ -175,7 +176,6 @@ static const struct _sc_driver_entry old_card_drivers[] = {
{ "atrust-acos",(void *(*)(void)) sc_get_atrust_acos_driver },
{ "cyberflex", (void *(*)(void)) sc_get_cyberflex_driver },
{ "flex", (void *(*)(void)) sc_get_cryptoflex_driver },
- { "mcrd", (void *(*)(void)) sc_get_mcrd_driver },
{ NULL, NULL }
};
// clang-format on
--
2.47.1

8
pkgs/tools/security/opensc/default.nix
View File

@@ -8,15 +8,19 @@
stdenv.mkDerivation rec {
pname = "opensc";
version = "0.25.1";
version = "0.26.0";
src = fetchFromGitHub {
owner = "OpenSC";
repo = "OpenSC";
rev = version;
sha256 = "sha256-Ktvp/9Hca87qWmDlQhFzvWsr7TvNpIAvOFS+4zTZbB8=";
sha256 = "sha256-EIQ9YpIGwckg/JjpK0S2ZYdFf/0YC4KaWcLXRNRMuzA=";
};
patches = [
./0001-Revert-Desctivate-driver-for-MICARDO.patch
];
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [
zlib readline openssl libassuan

6
pkgs/top-level/perl-packages.nix
View File

@@ -16515,10 +16515,10 @@ with self; {
ModuleScanDeps = buildPerlPackage {
pname = "Module-ScanDeps";
version = "1.34";
version = "1.37";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.34.tar.gz";
hash = "sha256-ysUw5c/EE+BneXx9I3xsXNMpFcPZ+u5dlANcjzqFUOs=";
url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.37.tar.gz";
hash = "sha256-H14RnK3hRmw5xx5bw1qNT05nJjXbA9eaWg3PCMTitaM=";
};
buildInputs = [ TestRequires IPCRun3 ];
propagatedBuildInputs = [ TextParsewords ];