Unverified Commit ca791141 authored by dish's avatar dish Committed by GitHub
Browse files

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

parents 0872c50f da34532d

pkgs/by-name/br/break-time/Cargo.lock

deleted100644 → 0
+0 −1621

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/br/break-time/openssl3-support.patch

0 → 100644
+1402 −0

File added.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/br/break-time/package.nix

+6 −8
Original line number Diff line number Diff line
@@ -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

deleted100644 → 0
+0 −2548

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/ca/cargo-dephell/openssl3-support.patch

0 → 100644
+135 −0
Original line number Diff line number Diff line 
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",