From e7d9b6883e848c11383bd29b9af5c1fbbfcdbf60 Mon Sep 17 00:00:00 2001 From: GitHub Date: Sat, 5 Oct 2024 18:10:33 +0000 Subject: [PATCH 1/3] Automatic Update --- flake.lock | 56 +++++++++---------- packages/fonts/kreative/source.json | 4 +- .../matrix/mautrix-whatsapp/gomod2nix.toml | 12 ++-- packages/matrix/mautrix-whatsapp/source.json | 10 ++-- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index e226b7a2..f24e19fe 100644 --- a/flake.lock +++ b/flake.lock @@ -160,11 +160,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728028592, - "narHash": "sha256-hyUdAVbjOLBCdNkr0SlLny1HcwUmcIDEhP450aRZLcU=", + "lastModified": 1728042115, + "narHash": "sha256-GStdbHqN9uFSJPrOrxK3nScFm/69MI0IGgAMAYfhfIg=", "owner": "DarkKirb", "repo": "chir.rs", - "rev": "c43046950758567cd8d7f78b7b9455fe04773230", + "rev": "cde586e6e2189b4af6b51134f023a7f2e99243fa", "type": "github" }, "original": { @@ -348,11 +348,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -525,11 +525,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1728041527, + "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", "type": "github" }, "original": { @@ -667,11 +667,11 @@ ] }, "locked": { - "lastModified": 1727783747, - "narHash": "sha256-fLiDo55WLgikMaaZcFEpkCkL4fQiV7RNEjRn+LxiYao=", + "lastModified": 1728149580, + "narHash": "sha256-EqtP8Ts3aPf4c3I8RU4RJjEUtb3LQt3yXcSrXaGeEHw=", "ref": "refs/heads/main", - "rev": "775292766025380d04004e42fefbdb8ca40b3fa3", - "revCount": 16299, + "rev": "86b213e6321540328fb11c3ea99c0b24becc45b0", + "revCount": 16310, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -783,11 +783,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1727574085, - "narHash": "sha256-vwERoi5pcO39raf92QMS6BjujfbRiHWA0rOb/XlQlmc=", + "lastModified": 1727833150, + "narHash": "sha256-IzgILnjvFkpurNNnDVSwsSs2vOnPgvYm9kIic3PKnuM=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "6401744e317693efe56495a863322894767277fd", + "rev": "24d805b445e3ec994f06fa071cf23b350b45a5f7", "type": "github" }, "original": { @@ -884,11 +884,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727665282, - "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", + "lastModified": 1728056216, + "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", + "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", "type": "github" }, "original": { @@ -1001,11 +1001,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1727805975, - "narHash": "sha256-HKpCTZMzso/1oZQ4ukMD8daqL05ngUeuC6wmNjUj3hM=", + "lastModified": 1728151397, + "narHash": "sha256-NPAvP+9GFfgPBsZV2DUNUXVkSP8ccsJTPVhX4n/PrXk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50806349cb321c0696f51ee2a6ac4e01c4ab24d1", + "rev": "b618b95449223ef6e3fcf38df8b98b28236fc5c5", "type": "github" }, "original": { @@ -1046,11 +1046,11 @@ ] }, "locked": { - "lastModified": 1727805723, - "narHash": "sha256-b8flytpuc4Ey/g3mcvpS/ICORcD4h56QDZeP5LogevY=", + "lastModified": 1728092656, + "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "2f5ae3fc91db865eff2c5a418da85a0fbe6238a3", + "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", "type": "github" }, "original": { @@ -1123,11 +1123,11 @@ ] }, "locked": { - "lastModified": 1727749966, - "narHash": "sha256-DUS8ehzqB1DQzfZ4bRXVSollJhu+y7cvh1DJ9mbWebE=", + "lastModified": 1728095260, + "narHash": "sha256-X62hA5ivYLY5G5+mXI6l9eUDkgi6Wu/7QUrwXhJ09oo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "00decf1b4f9886d25030b9ee4aed7bfddccb5f66", + "rev": "d1d2532ab267cfe6e40dff73fbaf34436c406d26", "type": "github" }, "original": { diff --git a/packages/fonts/kreative/source.json b/packages/fonts/kreative/source.json index 45f5910c..d713f4ab 100644 --- 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/gomod2nix.toml b/packages/matrix/mautrix-whatsapp/gomod2nix.toml index 385a472a..c5de4232 100644 --- 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 index fb198243..15982bd5 100644 --- 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, From dd597dff2f038519484c8efbd1b72a13e4c5093c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sun, 6 Oct 2024 18:28:06 +0200 Subject: [PATCH 2/3] disable virtualbox --- config/desktop.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/config/desktop.nix b/config/desktop.nix index ad58502a..1a34c3c9 100644 --- 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 = { From c1add0aa0fc4bbbd0779c07a6aa28794f30b8fc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sun, 6 Oct 2024 18:30:42 +0200 Subject: [PATCH 3/3] use latest go version --- packages/matrix/mautrix-whatsapp/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/matrix/mautrix-whatsapp/default.nix b/packages/matrix/mautrix-whatsapp/default.nix index 9e0dac13..ec10f474 100644 --- 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 = [