Update mautrix-whatsapp

ipfs/kubo/default.nix

@@ -23,7 +23,7 @@
       cd $out
       cp ${./go.mod} go.mod
       cp ${./go.sum} go.sum
-      cp ${./preload.go} plugin/loader/preload.go 
+      cp ${./preload.go} plugin/loader/preload.go
       echo -e "\nstorjds storj.io/ipfs-go-ds-storj/plugin 0" >> plugin/loader/preload_list
       patchShebangs .
     '';
@@ -48,7 +48,7 @@ in
     outputs = ["out" "systemd_unit" "systemd_unit_hardened"];
 
     buildPhase = ''
-        make build
+      make build
     '';
 
     installPhase = ''

linux/bcachefs/default.nix

@@ -1,21 +1,22 @@
-{ lib,
+{
+  lib,
   fetchFromGitHub,
   buildLinux,
   ...
-} @ args:
+} @ args: let
-
+  modDirVersion = "6.3.0";
-let 
+  source = builtins.fromJSON (builtins.readFile ./source.json);
-    modDirVersion = "6.3.0";
+in
-    source = builtins.fromJSON (builtins.readFile ./source.json);
+  buildLinux (args
-in buildLinux (args // {
+    // {
-    inherit modDirVersion;
+      inherit modDirVersion;
-    version = "6.3.0+${source.rev}";
+      version = "6.3.0+${source.rev}";
-    src = fetchFromGitHub {
+      src = fetchFromGitHub {
         owner = "koverstreet";
         repo = "bcachefs";
         inherit (source) rev sha256;
-    };
+      };
-    structuredExtraConfig = with lib.kernel; {
+      structuredExtraConfig = with lib.kernel; {
         BCACHEFS_FS = module;
         BCACHEFS_DEBUG = yes;
         KALLSYMS = yes;
@@ -23,10 +24,10 @@ in buildLinux (args // {
         DEBUG_FS = yes;
         DYNAMIC_FTRACE = yes;
         FTRACE = yes;
-    };
+      };
-    passthru.updateScript = [
+      passthru.updateScript = [
         ../../scripts/update-git.sh
         "github.com/koverstreet/bcachefs"
         "linux/bcachefs/source.json"
-    ];
+      ];
-})
+    })

matrix/mautrix-whatsapp/gomod2nix.toml

@@ -29,8 +29,8 @@ schema = 3
     version = "v0.2.0"
     hash = "sha256-fadcWxZOORv44oak3jTxm6YcITcFxdGt4bpn869HxUE="
   [mod."github.com/lib/pq"]
-    version = "v1.10.8"
+    version = "v1.10.9"
-    hash = "sha256-GWC1cpN3nxE+9HnffjUqOLhP3J1TSwtAQoII00zR8gs="
+    hash = "sha256-Gl6dLtL+yk6UrTTWfas43aM4lP/pNa2l7+ITXnjQyKs="
   [mod."github.com/mattn/go-colorable"]
     version = "v0.1.12"
     hash = "sha256-Y1vCt0ShrCz4wSmwsppCfeLPLKrWusc2zM2lUFwDMyI="
@@ -44,8 +44,8 @@ schema = 3
     version = "v1.0.4"
     hash = "sha256-uovu7OycdeZ2oYQ7FhVxLey5ZX3T0FzShaRldndyGvc="
   [mod."github.com/prometheus/client_golang"]
-    version = "v1.15.0"
+    version = "v1.15.1"
-    hash = "sha256-VryrURMVF85tDcyo/mDryOmJ7P2auzCfBYYDCxC082s="
+    hash = "sha256-9DCIuhmOYrfp0d2Y8g4m8vLRwAy0+pf0bkpLD/HObJo="
   [mod."github.com/prometheus/client_model"]
     version = "v0.3.0"
     hash = "sha256-vP+miJfsoK5UG9eug8z/bhAMj3bwg66T2vIh8WHoOKU="
@@ -83,23 +83,26 @@ schema = 3
     version = "v0.1.0"
     hash = "sha256-hSZQkw/0eV5Y0pj1N+idYuKb/jtiw/qTfaOGdYCXmn0="
   [mod."go.mau.fi/whatsmeow"]
-    version = "v0.0.0-20230424211606-8ef68cdfb9b1"
+    version = "v0.0.0-20230516145702-d5485ef06d61"
-    hash = "sha256-HWKIAEciUPPFhagaR1V6noKnxTL0CbPp69mlIHTH7b4="
+    hash = "sha256-PMVZSINs6P6oDz9tboz3Z83hQWQiZd7kvh+vxu8W8A0="
   [mod."go.mau.fi/zeroconfig"]
     version = "v0.1.2"
     hash = "sha256-xf4p2Z5Pl9In3ne9BVmy7YvtooSRBzqxP4Pl2jdVN8w="
   [mod."golang.org/x/crypto"]
-    version = "v0.8.0"
+    version = "v0.9.0"
-    hash = "sha256-gZ225jF4mxRLlba6OzdTvrsP6kLYf/xOjWMFavCF6tY="
+    hash = "sha256-RpGvWrx96GBXpu1zsWxdv9/+WcRmjBxOC7fvSgOJGL0="
+  [mod."golang.org/x/exp"]
+    version = "v0.0.0-20230510235704-dd950f8aeaea"
+    hash = "sha256-ufjPZXn2/Hn3jUnS4OkE9dpfqq3a+2cO2NU+5t7VnRc="
   [mod."golang.org/x/image"]
     version = "v0.7.0"
     hash = "sha256-8ymOoG5nFlSCJOgn/apVzP4Zk5jtoYNLwd5TJKlP2X8="
   [mod."golang.org/x/net"]
-    version = "v0.9.0"
+    version = "v0.10.0"
-    hash = "sha256-EG5GRDq282twyce8uugsDTjMz1pNn6zPcyVTZmSiJ14="
+    hash = "sha256-HkGiUYBZOBdOtt7mYo3N3swFjjAXzW++pG2JeWGJR9Q="
   [mod."golang.org/x/sys"]
-    version = "v0.7.0"
+    version = "v0.8.0"
-    hash = "sha256-GotRHJaas/q3L+tFam0q3oQ1rc8GDStt7wnz9h8MTEU="
+    hash = "sha256-wLPPnoFkHM1HPUaFIfRyQZOJjrqXVZimB0nMySly7Xg="
   [mod."golang.org/x/text"]
     version = "v0.9.0"
     hash = "sha256-tkhDeMsSQZr3jo7vmKehWs3DvWetwXR0IB+DCLbQ4nk="
@@ -119,5 +122,5 @@ schema = 3
     version = "v2.4.1"
     hash = "sha256-OstOCC7Bib6mbcUG2X3YafEBikFhPQ8lN6jPK5c/Ah8="
   [mod."maunium.net/go/mautrix"]
-    version = "v0.15.2-0.20230425124429-33e696f02c15"
+    version = "v0.15.2"
-    hash = "sha256-iONDn8XAEeDibDtREVHHQDJd7NEAxMVbNaPiuYj1GIQ="
+    hash = "sha256-6/rYaShsP31erVOJZfIQW5vez72v5pgpfggCXx32CKQ="

matrix/mautrix-whatsapp/source.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/mautrix/whatsapp",
-  "rev": "fd9cde29dcfa4e6b4e0c38c1f49b299902af4716",
+  "rev": "7aa0cc1b7a69b5db23720867caf91ab6786de35e",
-  "date": "2023-05-15T12:30:57+03:00",
+  "date": "2023-05-16T17:58:15+03:00",
-  "path": "/nix/store/18mxh7slfzrd9vyjkkx7kpik98cpskkr-whatsapp",
+  "path": "/nix/store/4agqr4y6b6jg1x7ajxvbys7srkq0zhqv-whatsapp",
-  "sha256": "19qkmnfa9xpbdy78nh1m7p45nn4fzqc3i280lgnl2d8bw4wjjmg2",
+  "sha256": "12chknkxq6m7jg9np6dngqj6lbfv0akp423c9xdhijmrhlgyw82y",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

overlay.nix

@@ -85,7 +85,7 @@ system: self: super: let
       wordpress-plugins = self.callPackage ./web/wordpress-plugins {};
       wordpress-themes = self.callPackage ./web/wordpress-themes {};
       kubo = self.callPackage ./ipfs/kubo {};
-      linux-bcachefs = self.callPackage ./linux/bcachefs { kernelPatches = []; };
+      linux-bcachefs = self.callPackage ./linux/bcachefs {kernelPatches = [];};
     })
     riscv-overlay
   ];