mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-07 13:33:12 +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.
36 lines
998 B
Diff
36 lines
998 B
Diff
diff --git a/src/http.c b/src/http.c
|
|
index bd08562..3a3592c 100644
|
|
--- a/src/http.c
|
|
+++ b/src/http.c
|
|
@@ -327,10 +327,12 @@ static int op_poll_win32(struct pollfd *_fds,nfds_t _nfds,int _timeout){
|
|
typedef ptrdiff_t ssize_t;
|
|
# endif
|
|
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
/*Load certificates from the built-in certificate store.*/
|
|
int SSL_CTX_set_default_verify_paths_win32(SSL_CTX *_ssl_ctx);
|
|
# define SSL_CTX_set_default_verify_paths \
|
|
SSL_CTX_set_default_verify_paths_win32
|
|
+#endif
|
|
|
|
# else
|
|
/*Normal Berkeley sockets.*/
|
|
diff --git a/src/wincerts.c b/src/wincerts.c
|
|
index 409a4e0..c355952 100644
|
|
--- a/src/wincerts.c
|
|
+++ b/src/wincerts.c
|
|
@@ -33,6 +33,8 @@
|
|
# include <openssl/err.h>
|
|
# include <openssl/x509.h>
|
|
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+
|
|
static int op_capi_new(X509_LOOKUP *_lu){
|
|
HCERTSTORE h_store;
|
|
h_store=CertOpenStore(CERT_STORE_PROV_SYSTEM_A,0,0,
|
|
@@ -171,3 +173,4 @@ int SSL_CTX_set_default_verify_paths_win32(SSL_CTX *_ssl_ctx){
|
|
}
|
|
|
|
#endif
|
|
+#endif
|