Unverified Commit a157e830 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #231584 from figsoda/paperoni

paperoni: update Cargo.lock and unpin openssl
parents abbebee2 244cd96c
Loading
Loading
Loading
Loading
+3014 −0

File added.

Preview size limit exceeded, changes collapsed.

+24 −7
Original line number Diff line number Diff line
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, curl
, stdenv
, pkg-config
, zlib
, openssl
, Security
}:

rustPlatform.buildRustPackage rec {
@@ -18,17 +19,33 @@ rustPlatform.buildRustPackage rec {
    sha256 = "sha256-vTylnDtoPpiRtk/vew1hLq3g8pepWRVqBEBnvSif4Zw=";
  };

  cargoSha256 = "sha256-iLEIGuVB9ykNcwbXk/donDdBuMvitM54Ax6bszVGaO0=";
  cargoLock = {
    lockFile = ./Cargo.lock;
  };

  nativeBuildInputs = [
    curl
  ] ++ lib.optionals stdenv.isLinux [
    pkg-config
  ];

  nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
  buildInputs = [
    curl
    zlib
  ] ++ lib.optionals stdenv.isLinux [
    openssl
  ];

  buildInputs = lib.optionals stdenv.isLinux [ openssl ]
    ++ lib.optionals stdenv.isDarwin [ Security ];
  # update Cargo.lock to work with openssl 3
  postPatch = ''
    ln -sf ${./Cargo.lock} Cargo.lock
  '';

  meta = with lib; {
    description = "An article extractor in Rust";
    homepage = "https://github.com/hipstermojo/paperoni";
    changelog = "https://github.com/hipstermojo/paperoni/releases/tag/${src.rev}";
    license = licenses.mit;
    maintainers = [ maintainers.marsam ];
    maintainers = with maintainers; [ marsam ];
  };
}
+1 −4
Original line number Diff line number Diff line
@@ -10960,10 +10960,7 @@ with pkgs;
  paperless-ngx = callPackage ../applications/office/paperless-ngx { };
  paperoni = callPackage ../tools/text/paperoni {
    inherit (darwin.apple_sdk.frameworks) Security;
    openssl = openssl_1_1;
  };
  paperoni = callPackage ../tools/text/paperoni { };
  paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { };