paperoni: update Cargo.lock and unpin openssl

This commit is contained in:
figsoda
2023-05-12 22:45:20 -04:00
parent 1e5e280dec
commit 244cd96c7d
3 changed files with 3039 additions and 11 deletions
+3014
View File
File diff suppressed because it is too large Load Diff
+24 -7
View File
@@ -1,10 +1,11 @@
{ 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 = lib.optionals stdenv.isLinux [ pkg-config ];
nativeBuildInputs = [
curl
] ++ lib.optionals stdenv.isLinux [
pkg-config
];
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security ];
buildInputs = [
curl
zlib
] ++ lib.optionals stdenv.isLinux [
openssl
];
# 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
View File
@@ -10961,10 +10961,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 { };