about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2023-09-18 09:58:02 +0200
committerGitHub <noreply@github.com>2023-09-18 09:58:02 +0200
commit48216fda18b763bfc069a6a42600f40c723a004c (patch)
tree6f8c1933aa31f1bfb7a082698fda984dcfbfefbe /pkgs/top-level
parent25da3e556aa846ee0d0169dd067259f6653dbdac (diff)
parent527e3dc045f4e5e2da8ef092cb39e389201e888a (diff)
Merge pull request #255767 from pacien/meli-0-8-1
meli: re-introduce at 0.8.1
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1e787043d9d2b..85c66e4bbbbf5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1102,7 +1102,6 @@ mapAliases ({
   mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # Added 2020-05-23
   mcomix3 = mcomix; # Added 2022-06-05
   mediatomb = throw "mediatomb is no longer maintained upstream, use gerbera instead"; # added 2022-01-04
-  meli = throw "'meli' has been removed as it requires an outdated version of openssl"; # added 2023-05-12
   meme = meme-image-generator; # Added 2021-04-21
   memtest86 = throw "'memtest86' has been renamed to/replaced by 'memtest86plus'"; # Converted to throw 2022-02-22
   mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # Added 2021-10-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf4a39175b13d..4774c4f1b7962 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33860,6 +33860,8 @@ 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 { };