1 files changed, 37 insertions, 58 deletions

diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix
index 233cafcc9e3cc..5503a6a78f33a 100644
--- a/pkgs/servers/pleroma/default.nix
+++ b/pkgs/servers/pleroma/default.nix
@@ -1,5 +1,5 @@
 { lib, beamPackages
-, fetchFromGitHub, fetchFromGitLab
+, fetchFromGitHub, fetchFromGitLab, fetchHex
 , file, cmake
 , libxcrypt
 , nixosTests, writeText
@@ -8,14 +8,14 @@
 
 beamPackages.mixRelease rec {
   pname = "pleroma";
-  version = "2.4.4";
+  version = "2.5.0";
 
   src = fetchFromGitLab {
     domain = "git.pleroma.social";
     owner = "pleroma";
     repo = "pleroma";
     rev = "v${version}";
-    sha256 = "sha256-0I1Hh2KDpUsjRe/qwIWhQBMWPr/c2RkUQk/Mxti+6ZU=";
+    sha256 = "sha256-Pry3eEUvrGUXK+x4et7DMbSxz9Mh/o5L0/Mh728mv1U=";
   };
   stripDebug = false;
 
@@ -24,17 +24,26 @@ beamPackages.mixRelease rec {
     overrides = (final: prev: {
       # mix2nix does not support git dependencies yet,
       # so we need to add them manually
+      gettext = beamPackages.buildMix rec {
+        name = "gettext";
+        version = "0.19.1";
+
+        src = fetchFromGitHub {
+          owner = "tusooa";
+          repo = "gettext";
+          rev = "72fb2496b6c5280ed911bdc3756890e7f38a4808";
+          sha256 = "sha256-V0qmE+LcAbVoWsJmWE4fwrduYFIZ5BzK/sGzgLY3eH0=";
+        };
+      };
       prometheus_ex = beamPackages.buildMix rec {
         name = "prometheus_ex";
         version = "3.0.5";
 
-        src = fetchFromGitLab {
-          domain = "git.pleroma.social";
-          group = "pleroma";
-          owner = "elixir-libraries";
+        src = fetchFromGitHub {
+          owner = "lanodan";
           repo = "prometheus.ex";
-          rev = "a4e9beb3c1c479d14b352fd9d6dd7b1f6d7deee5";
-          sha256 = "1v0q4bi7sb253i8q016l7gwlv5562wk5zy3l2sa446csvsacnpjk";
+          rev = "31f7fbe4b71b79ba27efc2a5085746c4011ceb8f";
+          sha256 = "sha256-2PZP+YnwnHt69HtIAQvjMBqBbfdbkRSoMzb1AL2Zsyc=";
         };
         beamDeps = with final; [ prometheus ];
       };
@@ -68,20 +77,6 @@ beamPackages.mixRelease rec {
         };
         beamDeps = with final; [ combine plug inet_cidr ];
       };
-      concurrent_limiter = beamPackages.buildMix rec {
-        name = "concurrent_limiter";
-        version = "0.1.0";
-
-        src = fetchFromGitLab {
-          domain = "git.pleroma.social";
-          group = "pleroma";
-          owner = "elixir-libraries";
-          repo = "concurrent_limiter";
-          rev = "d81be41024569330f296fc472e24198d7499ba78";
-          sha256 = "1nci8zz1gy7dnvxf5ydjqbagf4g9f7z5x1v9kdyy7jz9f37z6qw9";
-        };
-        beamDeps = with final; [ telemetry ];
-      };
       prometheus_phx = beamPackages.buildMix rec {
         name = "prometheus_phx";
         version = "0.1.1";
@@ -99,36 +94,18 @@ beamPackages.mixRelease rec {
         };
         beamDeps = with final; [ prometheus_ex ];
       };
-      majic = beamPackages.buildMix rec {
-        name = "majic";
-        version = "1.0.0";
-
-        src = fetchFromGitLab {
-          domain = "git.pleroma.social";
-          group = "pleroma";
-          owner = "elixir-libraries";
-          repo = "majic";
-          rev = "289cda1b6d0d70ccb2ba508a2b0bd24638db2880";
-          sha256 = "15605lsdd74bmsp5z96f76ihn7m2g3p1hjbhs2x7v7309n1k108n";
-        };
-        patchPhase = ''
-          substituteInPlace lib/majic/server.ex --replace "erlang.now" "erlang.time"
-        '';
+      majic = prev.majic.override {
         buildInputs = [ file ];
-
-        beamDeps = with final; [ nimble_pool mime plug elixir_make ];
       };
       crypt = beamPackages.buildRebar3 rec {
         name = "crypt";
-        version = "0.4.3";
+        version = "1.0.0";
 
-        src = fetchFromGitLab {
-          domain = "git.pleroma.social";
-          group = "pleroma";
-          owner = "elixir-libraries";
+        src = fetchFromGitHub {
+          owner = "msantos";
           repo = "crypt";
-          rev = "cf2aa3f11632e8b0634810a15b3e612c7526f6a3";
-          sha256 = "sha256-48QIsgyEaDzvnihdsFy7pYURLFcb9G8DXIrf5Luk3zo=";
+          rev = "f75cd55325e33cbea198fb41fe41871392f8fb76";
+          sha256 = "sha256-ZYhZTe7cTITkl8DZ4z2IOlxTX5gnbJImu/lVJ2ZjR1o=";
         };
 
         postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{source,crypt}.so";
@@ -137,17 +114,6 @@ beamPackages.mixRelease rec {
 
         buildInputs = [ libxcrypt ];
       };
-      web_push_encryption = beamPackages.buildMix rec {
-        name = "web_push_encryption";
-        version = "0.3.0";
-        src = fetchFromGitHub {
-          owner = "lanodan";
-          repo = "elixir-web-push-encryption";
-          rev = "026a043037a89db4da8f07560bc8f9c68bcf0cc0";
-          sha256 = "0a4x6njqp8v579bc965c9ipsr1z3klrc0pvgj8x1xf69r77gs6sj";
-        };
-        beamDeps = with final; [ httpoison jose ];
-      };
 
       # Some additional build inputs and build fixes
       http_signatures = prev.http_signatures.override {
@@ -182,6 +148,19 @@ beamPackages.mixRelease rec {
 
         beamDeps = with final; [ p1_utils ];
       };
+      # Required by eimp
+      p1_utils = beamPackages.buildRebar3 rec {
+        name = "p1_utils";
+        version = "1.0.18";
+
+        src = fetchHex {
+          pkg = "${name}";
+          version = "${version}";
+          sha256 = "120znzz0yw1994nk6v28zql9plgapqpv51n9g6qm6md1f4x7gj0z";
+        };
+
+        beamDeps = [];
+      };
 
       mime = prev.mime.override {
         patchPhase = let