mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-03 20:33:21 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
From 2e3e3c0b0f4e0c19e411fd46358930bf158ad3f5 Mon Sep 17 00:00:00 2001
|
|
From: Jonathan McDowell <noodles@earth.li>
|
|
Date: Wed, 1 Feb 2023 09:29:58 +0000
|
|
Subject: [PATCH] Gracefully fail FAPI init when it's not compiled in
|
|
|
|
Instead of emitting:
|
|
|
|
WARNING: Getting tokens from fapi backend failed.
|
|
|
|
errors when FAPI support is not compiled in gracefully fail the FAPI
|
|
init and don't log any warnings. We'll still produce a message
|
|
indicating this is what's happened in verbose mode, but normal operation
|
|
no longer gets an unnecessary message.
|
|
|
|
Fixes #792
|
|
|
|
Signed-off-by: Jonathan McDowell <noodles@earth.li>
|
|
---
|
|
src/lib/backend.c | 4 +++-
|
|
src/lib/backend_fapi.c | 3 ++-
|
|
2 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/lib/backend.c b/src/lib/backend.c
|
|
index ca5e2ccf..128f58b9 100644
|
|
--- a/src/lib/backend.c
|
|
+++ b/src/lib/backend.c
|
|
@@ -53,7 +53,9 @@ CK_RV backend_init(void) {
|
|
LOGE(msg);
|
|
return rv;
|
|
}
|
|
- LOGW(msg);
|
|
+ if (rv != CKR_FUNCTION_NOT_SUPPORTED) {
|
|
+ LOGW(msg);
|
|
+ }
|
|
} else {
|
|
fapi_init = true;
|
|
}
|
|
diff --git a/src/lib/backend_fapi.c b/src/lib/backend_fapi.c
|
|
index fe594f0e..3a203632 100644
|
|
--- a/src/lib/backend_fapi.c
|
|
+++ b/src/lib/backend_fapi.c
|
|
@@ -977,7 +977,8 @@ CK_RV backend_fapi_token_changeauth(token *tok, bool user, twist toldpin, twist
|
|
|
|
CK_RV backend_fapi_init(void) {
|
|
|
|
- return CKR_OK;
|
|
+ LOGV("FAPI not enabled, failing init");
|
|
+ return CKR_FUNCTION_NOT_SUPPORTED;
|
|
}
|
|
|
|
CK_RV backend_fapi_destroy(void) {
|