about summary refs log tree commit diff
path: root/pkgs/servers/pleroma
diff options
context:
space:
mode:
authormisuzu <bakalolka@gmail.com>2022-10-18 22:57:54 +0300
committerGitHub <noreply@github.com>2022-10-18 21:57:54 +0200
commitd0f67f4266a25ac02603409e17ff46c01e7c5f4f (patch)
tree40054ab247060fb5687c238d6bf61b386f5e40fa /pkgs/servers/pleroma
parentf1b89edf1ed163917cee2b3cfbbf19b5e65aff65 (diff)
pleroma: 2.4.3 -> 2.4.4 (#196625)
https://pleroma.social/announcements/2022/10/08/pleroma-security-release-2.4.4/
Diffstat (limited to 'pkgs/servers/pleroma')
-rw-r--r--pkgs/servers/pleroma/default.nix14
-rw-r--r--pkgs/servers/pleroma/mix.nix15
2 files changed, 22 insertions, 7 deletions
diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix
index e4204f28f1d5c..0b8cd34dcdd82 100644
--- a/pkgs/servers/pleroma/default.nix
+++ b/pkgs/servers/pleroma/default.nix
@@ -7,14 +7,14 @@
 
 beamPackages.mixRelease rec {
   pname = "pleroma";
-  version = "2.4.3";
+  version = "2.4.4";
 
   src = fetchFromGitLab {
     domain = "git.pleroma.social";
     owner = "pleroma";
     repo = "pleroma";
     rev = "v${version}";
-    sha256 = "sha256-x8j/2Eot/EEHsedgZntB5MPxlYMNDlFyZtmiMdhcS7U=";
+    sha256 = "sha256-0I1Hh2KDpUsjRe/qwIWhQBMWPr/c2RkUQk/Mxti+6ZU=";
   };
   stripDebug = false;
 
@@ -119,11 +119,13 @@ beamPackages.mixRelease rec {
         name = "crypt";
         version = "0.4.3";
 
-        src = fetchFromGitHub {
-          owner = "msantos";
+        src = fetchFromGitLab {
+          domain = "git.pleroma.social";
+          group = "pleroma";
+          owner = "elixir-libraries";
           repo = "crypt";
-          rev = "f75cd55325e33cbea198fb41fe41871392f8fb76";
-          sha256 = "sha256-ZYhZTe7cTITkl8DZ4z2IOlxTX5gnbJImu/lVJ2ZjR1o=";
+          rev = "cf2aa3f11632e8b0634810a15b3e612c7526f6a3";
+          sha256 = "sha256-48QIsgyEaDzvnihdsFy7pYURLFcb9G8DXIrf5Luk3zo=";
         };
 
         postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{source,crypt}.so";
diff --git a/pkgs/servers/pleroma/mix.nix b/pkgs/servers/pleroma/mix.nix
index 9c512889531cc..4f57f0eadfbdf 100644
--- a/pkgs/servers/pleroma/mix.nix
+++ b/pkgs/servers/pleroma/mix.nix
@@ -1380,7 +1380,7 @@ let
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "sha256-aJTmihIPRUU02ZBF6jMl93QOpxJgvDFfguKXMdVwpug=";
+        sha256 = "1s56f3ak35z2h9gk3g302akhwx7p4lrylichv4s4ai8g2a5fd538";
       };
 
       beamDeps = [];
@@ -1515,5 +1515,18 @@ let
 
       beamDeps = [];
     };
+
+    websockex = buildMix rec {
+      name = "websockex";
+      version = "0.4.3";
+
+      src = fetchHex {
+        pkg = "${name}";
+        version = "${version}";
+        sha256 = "1r2kmi2pcmdzvgbd08ci9avy0g5p2lhx80jn736a98w55c3ygwlm";
+      };
+
+      beamDeps = [];
+    };
   };
 in self