From e44a9cc1b61d43c3b054ba3ad4c8bc11f8e66e54 Mon Sep 17 00:00:00 2001 From: toastal Date: Thu, 2 May 2024 16:11:05 +0700 Subject: meli: mv to by-name --- .../networking/mailreaders/meli/default.nix | 83 ---------------------- pkgs/by-name/me/meli/package.nix | 83 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 83 insertions(+), 85 deletions(-) delete mode 100644 pkgs/applications/networking/mailreaders/meli/default.nix create mode 100644 pkgs/by-name/me/meli/package.nix diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix deleted file mode 100644 index 3dc373a09024f..0000000000000 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ stdenv -, lib -, fetchgit -, rustPlatform - -# native build inputs -, pkg-config -, installShellFiles -, makeWrapper -, mandoc -, rustfmt -, file - -# build inputs -, openssl -, dbus -, sqlite - -# runtime deps -, gnum4 -}: - -rustPlatform.buildRustPackage rec { - pname = "meli"; - version = "0.8.4"; - - src = fetchgit { - url = "https://git.meli-email.org/meli/meli.git"; - rev = "v${version}"; - hash = "sha256-wmIlYgXB17/i9Q+6C7pbcEjVlEuvhmqrSH+cDmaBKLs="; - }; - - cargoHash = "sha256-gYS/dxNMz/HkCmRXH5AdHPXJ2giqpAHc4eVXJGOpMDM="; - - # Needed to get openssl-sys to use pkg-config - OPENSSL_NO_VENDOR=1; - - nativeBuildInputs = [ - pkg-config - installShellFiles - makeWrapper - mandoc - (rustfmt.override { asNightly = true; }) - ]; - - buildInputs = [ - openssl - dbus - sqlite - ]; - - nativeCheckInputs = [ - file - ]; - - postInstall = '' - installManPage meli/docs/*.{1,5,7} - - wrapProgram $out/bin/meli \ - --prefix PATH : ${lib.makeBinPath [ gnum4 ]} - ''; - - preCheck = '' - export HOME=$(mktemp -d) - ''; - - checkFlags = [ - "--skip=conf::test_config_parse" # panicking due to sandbox - "--skip=smtp::test::test_smtp" # requiring network - "--skip=utils::xdg::query_default_app" # doesn't build - "--skip=utils::xdg::query_mime_info" # doesn't build - ]; - - meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); - description = "Terminal e-mail client and e-mail client library"; - mainProgram = "meli"; - homepage = "https://meli.delivery"; - license = licenses.gpl3; - maintainers = with maintainers; [ _0x4A6F matthiasbeyer ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/me/meli/package.nix b/pkgs/by-name/me/meli/package.nix new file mode 100644 index 0000000000000..3dc373a09024f --- /dev/null +++ b/pkgs/by-name/me/meli/package.nix @@ -0,0 +1,83 @@ +{ stdenv +, lib +, fetchgit +, rustPlatform + +# native build inputs +, pkg-config +, installShellFiles +, makeWrapper +, mandoc +, rustfmt +, file + +# build inputs +, openssl +, dbus +, sqlite + +# runtime deps +, gnum4 +}: + +rustPlatform.buildRustPackage rec { + pname = "meli"; + version = "0.8.4"; + + src = fetchgit { + url = "https://git.meli-email.org/meli/meli.git"; + rev = "v${version}"; + hash = "sha256-wmIlYgXB17/i9Q+6C7pbcEjVlEuvhmqrSH+cDmaBKLs="; + }; + + cargoHash = "sha256-gYS/dxNMz/HkCmRXH5AdHPXJ2giqpAHc4eVXJGOpMDM="; + + # Needed to get openssl-sys to use pkg-config + OPENSSL_NO_VENDOR=1; + + nativeBuildInputs = [ + pkg-config + installShellFiles + makeWrapper + mandoc + (rustfmt.override { asNightly = true; }) + ]; + + buildInputs = [ + openssl + dbus + sqlite + ]; + + nativeCheckInputs = [ + file + ]; + + postInstall = '' + installManPage meli/docs/*.{1,5,7} + + wrapProgram $out/bin/meli \ + --prefix PATH : ${lib.makeBinPath [ gnum4 ]} + ''; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + checkFlags = [ + "--skip=conf::test_config_parse" # panicking due to sandbox + "--skip=smtp::test::test_smtp" # requiring network + "--skip=utils::xdg::query_default_app" # doesn't build + "--skip=utils::xdg::query_mime_info" # doesn't build + ]; + + meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); + description = "Terminal e-mail client and e-mail client library"; + mainProgram = "meli"; + homepage = "https://meli.delivery"; + license = licenses.gpl3; + maintainers = with maintainers; [ _0x4A6F matthiasbeyer ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0054b6f0a942..087093da254d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32824,8 +32824,6 @@ with pkgs; meld = callPackage ../applications/version-management/meld { }; - meli = callPackage ../applications/networking/mailreaders/meli { }; - melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { }; melody = callPackage ../tools/misc/melody { }; -- cgit 1.4.1 From b285b744ac6edfd17a8620a707e42f1eb3a5363c Mon Sep 17 00:00:00 2001 From: toastal Date: Thu, 2 May 2024 16:22:34 +0700 Subject: meli: support mirrors Servers go down. We can support mirrors for resilience. --- pkgs/by-name/me/meli/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/me/meli/package.nix b/pkgs/by-name/me/meli/package.nix index 3dc373a09024f..a4ff654ad892c 100644 --- a/pkgs/by-name/me/meli/package.nix +++ b/pkgs/by-name/me/meli/package.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchgit +, fetchzip , rustPlatform # native build inputs @@ -24,9 +24,12 @@ rustPlatform.buildRustPackage rec { pname = "meli"; version = "0.8.4"; - src = fetchgit { - url = "https://git.meli-email.org/meli/meli.git"; - rev = "v${version}"; + src = fetchzip { + urls = [ + "https://git.meli-email.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" + ]; hash = "sha256-wmIlYgXB17/i9Q+6C7pbcEjVlEuvhmqrSH+cDmaBKLs="; }; -- cgit 1.4.1