Unverified Commit c3cfb476 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #231577 from figsoda/break-time 

break-time: update Cargo.lock and unpin openssl
parents 9fd13fa9 a74cd3a1

pkgs/applications/misc/break-time/Cargo.lock

0 → 100644
+1621 −0

File added.

Preview size limit exceeded, changes collapsed.

pkgs/applications/misc/break-time/default.nix

+8 −1
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ rustPlatform.buildRustPackage rec { 
    sha256 = "sha256-q79JXaBwd/oKtJPvK2+72pY2YvaR3of2CMC8cF6wwQ8=";

  };



  cargoSha256 = "sha256-DpX5tcIWt/pPGujufivmAGonVIiHERfa8Yb1JZpu3WA=";

  cargoLock = {

    lockFile = ./Cargo.lock;

  };



  nativeBuildInputs = [

    pkg-config
@@ -34,6 +36,11 @@ 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";

    homepage    = "https://github.com/cdepillabout/break-time";

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -29351,9 +29351,7 @@ with pkgs; 














  brave = callPackage ../applications/networking/browsers/brave { };



























  break-time = callPackage ../applications/misc/break-time {













    openssl = openssl_1_1;













  };













  break-time = callPackage ../applications/misc/break-time { };





























  breezy = with python3Packages; toPythonApplication breezy;