Skip to content

Commit 96ec04d

Browse files
committed
openssl: apply nix fmt
1 parent 917cc8e commit 96ec04d

2 files changed

Lines changed: 28 additions & 33 deletions

File tree

pkgs/by-name/op/openssl/generic.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,4 +406,3 @@ stdenv.mkDerivation (finalAttrs: {
406406
];
407407
};
408408
})
409-

pkgs/by-name/op/openssl/variants.nix

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,21 @@ let
88
v3_6 = {
99
version = "3.6.1";
1010
hash = "sha256-sb/tzVson/Iq7ofJ1gD1FXZ+v0X3cWjLbWTyMfUYqC4=";
11-
patches =
12-
[
13-
./3.0/nix-ssl-cert-file.patch
14-
./3.0/openssl-disable-kernel-detection.patch
11+
patches = [
12+
./3.0/nix-ssl-cert-file.patch
13+
./3.0/openssl-disable-kernel-detection.patch
1514

16-
(
17-
if stdenv.hostPlatform.isDarwin then
18-
./3.5/use-etc-ssl-certs-darwin.patch
19-
else
20-
./3.5/use-etc-ssl-certs.patch
21-
)
22-
]
23-
++ lib.optionals stdenv.hostPlatform.isMinGW [
24-
./3.5/fix-mingw-linking.patch
25-
]
26-
++
27-
lib.optional stdenv.hostPlatform.isCygwin ./openssl-3.0.18-skip-dllmain-detach.patch;
15+
(
16+
if stdenv.hostPlatform.isDarwin then
17+
./3.5/use-etc-ssl-certs-darwin.patch
18+
else
19+
./3.5/use-etc-ssl-certs.patch
20+
)
21+
]
22+
++ lib.optionals stdenv.hostPlatform.isMinGW [
23+
./3.5/fix-mingw-linking.patch
24+
]
25+
++ lib.optional stdenv.hostPlatform.isCygwin ./openssl-3.0.18-skip-dllmain-detach.patch;
2826
};
2927
in
3028
{
@@ -60,23 +58,21 @@ in
6058
v3_5 = {
6159
version = "3.5.5";
6260
hash = "sha256-soyRUyqLZaH5g7TCi3SIF05KAQCOKc6Oab14nyi8Kok=";
63-
patches =
64-
[
65-
./3.0/nix-ssl-cert-file.patch
66-
./3.0/openssl-disable-kernel-detection.patch
61+
patches = [
62+
./3.0/nix-ssl-cert-file.patch
63+
./3.0/openssl-disable-kernel-detection.patch
6764

68-
(
69-
if stdenv.hostPlatform.isDarwin then
70-
./3.5/use-etc-ssl-certs-darwin.patch
71-
else
72-
./3.5/use-etc-ssl-certs.patch
73-
)
74-
]
75-
++ lib.optionals stdenv.hostPlatform.isMinGW [
76-
./3.5/fix-mingw-linking.patch
77-
]
78-
++
79-
lib.optional stdenv.hostPlatform.isCygwin ./openssl-3.0.18-skip-dllmain-detach.patch;
65+
(
66+
if stdenv.hostPlatform.isDarwin then
67+
./3.5/use-etc-ssl-certs-darwin.patch
68+
else
69+
./3.5/use-etc-ssl-certs.patch
70+
)
71+
]
72+
++ lib.optionals stdenv.hostPlatform.isMinGW [
73+
./3.5/fix-mingw-linking.patch
74+
]
75+
++ lib.optional stdenv.hostPlatform.isCygwin ./openssl-3.0.18-skip-dllmain-detach.patch;
8076
};
8177

8278
inherit v3_6;

0 commit comments

Comments
 (0)