Merge pull request #554 from DarkKirb/create-pull-request/patch

Run automatic update
DarkKirb · Oct 7, 2024 · 4b25a13 · 4b25a13
2 parents 293377b + c1add0a
commit 4b25a13
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 43 deletions.
diff --git a/config/desktop.nix b/config/desktop.nix
@@ -23,11 +23,14 @@ in {
       ./kde.nix
       ./sway.nix
     ]
-    ++ (
+    /*
+      ++ (
       if system == "x86_64-linux"
       then [./programs/virtualbox.nix]
       else []
-    );
+    )
+    */
+    ;
   fonts = {
     fontDir.enable = true;
     fontconfig = {

diff --git a/flake.lock b/flake.lock
diff --git a/packages/fonts/kreative/source.json b/packages/fonts/kreative/source.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/kreativekorp/open-relay.git",
-  "rev": "41d886b744ba7dfa9dfea5130e61b8974a56302d",
-  "date": "2024-09-27T17:33:33-07:00",
+  "rev": "f1bd332b518fe44cd8ccf975fbae7aa242be9cba",
+  "date": "2024-10-04T17:45:56-07:00",
   "path": "/nix/store/0c9m0xyj7a1hirayxlhk5spccamz7ysy-open-relay",
   "sha256": "106ls1h75pfz3568xy6bizhin0pp2a4giqlkr3wj5njdl23zmsvi",
   "hash": "sha256-cev6h6BN2iL5yJPi+IgS9wIb4Y/L+I5MGd/dcmDQ1IA=",

diff --git a/packages/matrix/mautrix-whatsapp/default.nix b/packages/matrix/mautrix-whatsapp/default.nix
@@ -16,6 +16,9 @@ in
       repo = "whatsapp";
       inherit (source) rev sha256;
     };
+    postPatch = ''
+      substituteInPlace go.mod --replace 'go1.23.2' 'go${go.version}'
+    '';
     go = go_1_23;
     modules = ./gomod2nix.toml;
     buildInputs = [

diff --git a/packages/matrix/mautrix-whatsapp/gomod2nix.toml b/packages/matrix/mautrix-whatsapp/gomod2nix.toml
@@ -47,8 +47,8 @@ schema = 3
     version = "v0.0.0-20200617195104-da1b6568686e"
     hash = "sha256-ST9t4/b7WFXUb8wra4ZYVDNZJGrEykw8dkWhLrxp8F0="
   [mod."github.com/tidwall/gjson"]
-    version = "v1.17.3"
-    hash = "sha256-zui8S4qlfFXNLartKynJbYqeM/MW3f3eDbojIvh/KS8="
+    version = "v1.18.0"
+    hash = "sha256-CO6hqDu8Y58Po6A01e5iTpwiUBQ5khUZsw7czaJHw0I="
   [mod."github.com/tidwall/match"]
     version = "v1.1.1"
     hash = "sha256-M2klhPId3Q3T3VGkSbOkYl/2nLHnsG+yMbXkPkyrRdg="
@@ -65,8 +65,8 @@ schema = 3
     version = "v0.1.1"
     hash = "sha256-KegSskYAq2MFiOvB28WG0j0VPzfbXqivapLHwsIEYNc="
   [mod."go.mau.fi/util"]
-    version = "v0.8.1-0.20240927174413-000d30f9a02a"
-    hash = "sha256-8w6G6BxW5JuhLDCne9DXwU4PwtMs6jVJAOZxvfoGoPI="
+    version = "v0.8.1-0.20241003092848-3b49d3e0b9ee"
+    hash = "sha256-in0tzCWILrs2lSdfJmXW9wQsFO/am0235+AgUtp9xcc="
   [mod."go.mau.fi/webp"]
     version = "v0.1.0"
     hash = "sha256-KIP/Onw0t/o10oBuvmRQDff7GF8G5lsMaDXpe0fjvNg="
@@ -113,5 +113,5 @@ schema = 3
     version = "v1.0.0"
     hash = "sha256-fYc/WwqE0ev0dvnu5qGmHJsYiSTuWeOTiAVzmQIKWyY="
   [mod."maunium.net/go/mautrix"]
-    version = "v0.21.1-0.20241001172103-260f642bf063"
-    hash = "sha256-5ma9YcSWZ93+q6eY18KTAa93m2uNe0G2KNOJSEbQTWk="
+    version = "v0.21.1-0.20241004114110-d48a5ca61567"
+    hash = "sha256-St29cNdEmitgnXILY0xNvmFioQyhqY/y/v9F+hXc0h4="
diff --git a/packages/matrix/mautrix-whatsapp/source.json b/packages/matrix/mautrix-whatsapp/source.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/mautrix/whatsapp",
-  "rev": "291d87c7902ddda6572dd32c36d28b9878cf8f95",
-  "date": "2024-10-01T20:22:21+03:00",
-  "path": "/nix/store/lf38c0rmkyaczqpnspqp2dbb5b3q4s9f-whatsapp",
-  "sha256": "1fk0yngl6ppjzrc0jbnpbqyyy6xn6dl11zqnd4zwm1dvca557rd9",
-  "hash": "sha256-qeVTimK7hco/aRb/EGgzthvvPV7XLglY/vJeQ5/1YLo=",
+  "rev": "1f454a821af527d9a2439166c2b7b929400722ff",
+  "date": "2024-10-04T14:43:09+03:00",
+  "path": "/nix/store/jf7l6a4s8av7mxy5kf1nm720ia2hw21i-whatsapp",
+  "sha256": "111jnhsg5bpdhiiqykzb8576iadhacsjw5d379bcc11mdv2bg7fv",
+  "hash": "sha256-2523xG41BMZWOqMVLjVTsKloTkHrT49jhO2u8jS0MoQ=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,