gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

{break-time,cargo-dephell,dogdns}: don't vendor Cargo.lock, use patch for openssl3 (#408770)

Browse Source
This commit is contained in:
dish
2025-08-17 16:34:11 -04:00
committed by GitHub
parent 0872c50fd9 da34532d17
commit ca79114141
9 changed files with 1686 additions and 5300 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/br/break-time/Cargo.lock
Generated
-1621
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/br/break-time/openssl3-support.patch
+1402
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/br/break-time/package.nix
+6 -8
View File
@@ -21,9 +21,12 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-q79JXaBwd/oKtJPvK2+72pY2YvaR3of2CMC8cF6wwQ8=";
};
cargoLock = {
lockFile = ./Cargo.lock;
};
cargoPatches = [
# update Cargo.lock to work with openssl 3
./openssl3-support.patch
];
cargoHash = "sha256-HthrPtIWvYLAQDpW12r250OWP7CF4SORlqFbxIq/Dzo=";
nativeBuildInputs = [
pkg-config
@@ -37,11 +40,6 @@ rustPlatform.buildRustPackage rec {
openssl
];
# update Cargo.lock to work with openssl
postPatch = ''
ln -sf ${./Cargo.lock} Cargo.lock
'';
meta = with lib; {
description = "Break timer that forces you to take a break";
mainProgram = "break-time";
pkgs/by-name/ca/cargo-dephell/Cargo.lock
Generated
-2548
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/ca/cargo-dephell/openssl3-support.patch
+135
View File
@@ -0,0 +1,135 @@
diff --git a/Cargo.lock b/Cargo.lock
index 714986f..60697bc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
-version = 3
+version = 4
[[package]]
name = "adler32"
@@ -113,6 +113,12 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+[[package]]
+name = "bitflags"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+
[[package]]
name = "bitmaps"
version = "2.1.0"
@@ -273,11 +279,12 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.52"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d"
+checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7"
dependencies = [
"jobserver",
+ "libc",
]
[[package]]
@@ -320,7 +327,7 @@ checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
dependencies = [
"ansi_term",
"atty",
- "bitflags",
+ "bitflags 1.2.1",
"strsim",
"textwrap",
"unicode-width",
@@ -580,7 +587,7 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
dependencies = [
- "bitflags",
+ "bitflags 1.2.1",
"fuchsia-zircon-sys",
]
@@ -670,7 +677,7 @@ version = "0.13.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d250f5f82326884bd39c2853577e70a121775db76818ffa452ed1e80de12986"
dependencies = [
- "bitflags",
+ "bitflags 1.2.1",
"libc",
"libgit2-sys",
"log",
@@ -1000,7 +1007,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374"
dependencies = [
"arrayvec",
- "bitflags",
+ "bitflags 1.2.1",
"cfg-if 1.0.0",
"ryu",
"static_assertions",
@@ -1265,18 +1272,30 @@ dependencies = [
[[package]]
name = "openssl"
-version = "0.10.29"
+version = "0.10.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
dependencies = [
- "bitflags",
- "cfg-if 0.1.10",
+ "bitflags 2.9.1",
+ "cfg-if 1.0.0",
"foreign-types",
- "lazy_static",
"libc",
+ "once_cell",
+ "openssl-macros",
"openssl-sys",
]
+[[package]]
+name = "openssl-macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "openssl-probe"
version = "0.1.2"
@@ -1285,11 +1304,10 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
[[package]]
name = "openssl-sys"
-version = "0.9.55"
+version = "0.9.108"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7717097d810a0f2e2323f9e5d11e71608355e24828410b55b9d4f18aa5f9a5d8"
+checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
dependencies = [
- "autocfg",
"cc",
"libc",
"pkg-config",
@@ -1606,7 +1624,7 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f331b9025654145cd425b9ded0caf8f5ae0df80d418b326e2dc1c3dc5eb0620"
dependencies = [
- "bitflags",
+ "bitflags 1.2.1",
"core-foundation 0.7.0",
"core-foundation-sys 0.7.0",
"libc",
pkgs/by-name/ca/cargo-dephell/package.nix
+6 -8
View File
@@ -20,9 +20,12 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-NOjkKttA+mwPCpl4uiRIYD58DlMomVFpwnM9KGfWd+w=";
};
cargoLock = {
lockFile = ./Cargo.lock;
};
cargoPatches = [
# update Cargo.lock to work with openssl 3
./openssl3-support.patch
];
cargoHash = "sha256-+5ElAfYuUfosXzR3O2QIFGy4QJuPrWDMg5LacZKi3c8=";
nativeBuildInputs = [
pkg-config
@@ -39,11 +42,6 @@ rustPlatform.buildRustPackage rec {
libgit2
];
# update Cargo.lock to work with openssl 3
postPatch = ''
ln -sf ${./Cargo.lock} Cargo.lock
'';
env = {
LIBGIT2_NO_VENDOR = 1;
};
pkgs/by-name/do/dogdns/Cargo.lock
Generated
-1103
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/do/dogdns/openssl3-support.patch
+130
View File
@@ -0,0 +1,130 @@
diff --git a/Cargo.lock b/Cargo.lock
index b5fe1bb..5d1d055 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
+version = 4
+
[[package]]
name = "addr2line"
version = "0.14.1"
@@ -67,6 +69,12 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+[[package]]
+name = "bitflags"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+
[[package]]
name = "bumpalo"
version = "3.7.0"
@@ -81,9 +89,12 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "cc"
-version = "1.0.67"
+version = "1.2.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
+checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766"
+dependencies = [
+ "shlex",
+]
[[package]]
name = "cfg-if"
@@ -390,18 +401,30 @@ checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
[[package]]
name = "openssl"
-version = "0.10.33"
+version = "0.10.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
dependencies = [
- "bitflags",
+ "bitflags 2.9.1",
"cfg-if",
"foreign-types",
"libc",
"once_cell",
+ "openssl-macros",
"openssl-sys",
]
+[[package]]
+name = "openssl-macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "openssl-probe"
version = "0.1.2"
@@ -410,20 +433,19 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
[[package]]
name = "openssl-src"
-version = "111.15.0+1.1.1k"
+version = "300.5.0+3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a5f6ae2ac04393b217ea9f700cd04fa9bf3d93fae2872069f3d15d908af70a"
+checksum = "e8ce546f549326b0e6052b649198487d91320875da901e7bd11a06d1ee3f9c2f"
dependencies = [
"cc",
]
[[package]]
name = "openssl-sys"
-version = "0.9.61"
+version = "0.9.108"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f"
+checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
dependencies = [
- "autocfg",
"cc",
"libc",
"openssl-src",
@@ -534,7 +556,7 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
dependencies = [
- "bitflags",
+ "bitflags 1.2.1",
]
[[package]]
@@ -612,7 +634,7 @@ version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84"
dependencies = [
- "bitflags",
+ "bitflags 1.2.1",
"core-foundation",
"core-foundation-sys",
"libc",
@@ -660,6 +682,12 @@ dependencies = [
"serde",
]
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
[[package]]
name = "socket2"
version = "0.3.19"
pkgs/by-name/do/dogdns/package.nix
+7 -12
View File
@@ -21,6 +21,13 @@ rustPlatform.buildRustPackage {
sha256 = "sha256-y3T0vXg7631FZ4bzcbQjz3Buui/DFxh9LG8BZWwynp0=";
};
cargoPatches = [
# update Cargo.lock to work with openssl 3
./openssl3-support.patch
];
cargoHash = "sha256-UY7+AhsVw/p+FDfzJWj9A6VRntceIDCWzJ5Zim8euAE=";
patches = [
# remove date info to make the build reproducible
# remove commit hash to avoid dependency on git and the need to keep `.git`
@@ -40,22 +47,10 @@ rustPlatform.buildRustPackage {
"man"
];
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"mutagen-0.2.0" = "sha256-FnSeNI9lAcxonRFTu7wnP/M/d5UbMzSZ97w+mUqoEg8=";
};
};
dontUseJustBuild = true;
dontUseJustCheck = true;
dontUseJustInstall = true;
postPatch = ''
# update Cargo.lock to work with openssl 3
ln -sf ${./Cargo.lock} Cargo.lock
'';
postBuild = ''
just man
'';