From e83f12f6a2cf47f6c0a09fedcf6f432a072f4a04 Mon Sep 17 00:00:00 2001
From: KokaKiwi <kokakiwi+git@kokakiwi.net>
Date: Fri, 26 Jul 2024 16:42:20 +0200
Subject: [PATCH 1/2] cluster(prod): Upgrade crytptpad to 2024.6.1

---
 cluster/prod/app/cryptpad/build/default.nix   | 10 +++++-----
 cluster/prod/app/cryptpad/deploy/cryptpad.hcl |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cluster/prod/app/cryptpad/build/default.nix b/cluster/prod/app/cryptpad/build/default.nix
index 83296d5..5239be1 100644
--- a/cluster/prod/app/cryptpad/build/default.nix
+++ b/cluster/prod/app/cryptpad/build/default.nix
@@ -31,8 +31,8 @@
       hash = "sha256-BZdExj2q/bqUD3k9uluOot2dlrWKA+vpad49EdgXKww=";
     };
     v7 = {
-      rev = "ba82142ff242ce385804bcb4287126de52d329f3";
-      hash = "sha256-3WX3dTWJoeApon1AH3XplBIvEosVNzchkjgi2C808B4=";
+      rev = "e1267803ea749cd93e9d5f81438011ea620d04af";
+      hash = "sha256-iIds0GnCHAyeIEdSD4aCCgDtnnwARh3NE470CywseS0=";
     };
   };
   mkOnlyOffice = {
@@ -71,16 +71,16 @@
   });
 in buildNpmPackage rec {
   pname = "cryptpad";
-  version = "2024.6.0";
+  version = "2024.6.1";
 
   src = fetchFromGitHub {
     owner = "cryptpad";
     repo = "cryptpad";
     rev = version;
-    hash = "sha256-huIhhnjatkaVfm1zDeqi88EX/nAUBQ0onPNOwn7hrX4=";
+    hash = "sha256-qwyXpTY8Ds7R5687PVGZa/rlEyrAZjNzJ4+VQZpF8v0=";
   };
 
-  npmDepsHash = "sha256-Oh1fBvP7OXC+VDiH3D+prHmi8pRrxld06n30sqw5apY=";
+  npmDepsHash = "sha256-GSTPsXqe/rxiDh5OW2t+ZY1YRNgRSDxkJ0pvcLIFtFw=";
 
   inherit nodejs;
 
diff --git a/cluster/prod/app/cryptpad/deploy/cryptpad.hcl b/cluster/prod/app/cryptpad/deploy/cryptpad.hcl
index b14a093..048345d 100644
--- a/cluster/prod/app/cryptpad/deploy/cryptpad.hcl
+++ b/cluster/prod/app/cryptpad/deploy/cryptpad.hcl
@@ -26,7 +26,7 @@ job "cryptpad" {
       }
 
       config {
-        image = "kokakiwi/cryptpad:2024.6.0"
+        image = "kokakiwi/cryptpad:2024.6.1"
         ports = [ "http" ]
 
         volumes = [

From 093951af05ddca2c97c42d7f43c1bbb8217caba4 Mon Sep 17 00:00:00 2001
From: KokaKiwi <kokakiwi+git@kokakiwi.net>
Date: Fri, 26 Jul 2024 16:43:06 +0200
Subject: [PATCH 2/2] cluster(prod): cryptpad, update pinned sources

---
 cluster/prod/app/cryptpad/build/npins/sources.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cluster/prod/app/cryptpad/build/npins/sources.json b/cluster/prod/app/cryptpad/build/npins/sources.json
index b750283..ad47dde 100644
--- a/cluster/prod/app/cryptpad/build/npins/sources.json
+++ b/cluster/prod/app/cryptpad/build/npins/sources.json
@@ -3,8 +3,8 @@
     "nixpkgs": {
       "type": "Channel",
       "name": "nixos-24.05",
-      "url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.2355.d032c1a6dfad/nixexprs.tar.xz",
-      "hash": "1fynyfjsmrxs383mygzlbkb3yhzmlnnpf8x84mikaiqc3ngszsv8"
+      "url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.3311.a1cc729dcbc3/nixexprs.tar.xz",
+      "hash": "13al93fac4xdxj0jllfby2v9klwqdhsf3yg10mnsm9ys84v7gsnn"
     }
   },
   "version": 3