meli: 0.8.6 -> 0.8.7 (#338258)
This commit is contained in:
commit
151889cdbf
@ -1,6 +1,7 @@
|
|||||||
{ stdenv
|
{ stdenv
|
||||||
, lib
|
, lib
|
||||||
, fetchzip
|
, fetchzip
|
||||||
|
, fetchpatch
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
|
|
||||||
# native build inputs
|
# native build inputs
|
||||||
@ -23,7 +24,7 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "meli";
|
pname = "meli";
|
||||||
version = "0.8.6";
|
version = "0.8.7";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
urls = [
|
urls = [
|
||||||
@ -31,10 +32,19 @@ rustPlatform.buildRustPackage rec {
|
|||||||
"https://codeberg.org/meli/meli/archive/v${version}.tar.gz"
|
"https://codeberg.org/meli/meli/archive/v${version}.tar.gz"
|
||||||
"https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz"
|
"https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz"
|
||||||
];
|
];
|
||||||
hash = "sha256-7lSxXv2i8B6vRWIJqMiXlMqHH6fmgACy9X5qNKuj+IU=";
|
hash = "sha256-2+JIehi2wuWdARbhFPvNPIJ9ucZKWjNSORszEG9lyjw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-vZkMfaALnRBK9ZwMB2uvvJgQq+BdUX7enNnr9t5H+MY=";
|
cargoHash = "sha256-ZVhUkpiiPKbWcf56cXFgn3Nyr63STHLlD7mpYEetNIY=";
|
||||||
|
|
||||||
|
cargoPatches = [
|
||||||
|
(fetchpatch {
|
||||||
|
# https://github.com/NixOS/nixpkgs/issues/332957#issuecomment-2278578811
|
||||||
|
name = "fix-rust-1.80-compat.patch";
|
||||||
|
url = "https://git.meli-email.org/meli/meli/commit/6b05279a0987315c401516cac8ff0b016a8e02a8.patch";
|
||||||
|
hash = "sha256-mh8H7wmHMXAe01UTvdY8vJeeLyH6ZFwylNLFFL+4LO0=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
# Needed to get openssl-sys to use pkg-config
|
# Needed to get openssl-sys to use pkg-config
|
||||||
OPENSSL_NO_VENDOR=1;
|
OPENSSL_NO_VENDOR=1;
|
||||||
@ -55,6 +65,7 @@ rustPlatform.buildRustPackage rec {
|
|||||||
|
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
file
|
file
|
||||||
|
gnum4
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
@ -70,10 +81,9 @@ rustPlatform.buildRustPackage rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
checkFlags = [
|
checkFlags = [
|
||||||
"--skip=conf::test_config_parse" # panicking due to sandbox
|
"--skip=conf::tests::test_config_parse" # panicking due to sandbox
|
||||||
"--skip=smtp::test::test_smtp" # requiring network
|
"--skip=utils::tests::test_shellexpandtrait_impls" # panicking due to sandbox
|
||||||
"--skip=utils::xdg::query_default_app" # doesn't build
|
"--skip=utils::tests::test_shellexpandtrait" # panicking due to sandbox
|
||||||
"--skip=utils::xdg::query_mime_info" # doesn't build
|
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
Loading…
Reference in New Issue
Block a user