From 522d7a4e94384413f6433634ee83498cbf74b16a Mon Sep 17 00:00:00 2001 From: GitHub Date: Fri, 21 Jun 2024 18:18:33 +0000 Subject: [PATCH 1/2] Automatic Update --- flake.lock | 60 +++++++++---------- .../matrix/mautrix-whatsapp/gomod2nix.toml | 47 +++++++-------- packages/matrix/mautrix-whatsapp/source.json | 10 ++-- 3 files changed, 57 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index 83425fbd..f28b3ad5 100644 --- a/flake.lock +++ b/flake.lock @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1718690254, - "narHash": "sha256-NbUCDmZOoiT7IfY7XK15qVtFJuYEsCBMCnNJZOokpbc=", + "lastModified": 1718754422, + "narHash": "sha256-p6OAzslHlJcNEOkMcm1gzpAXFFAa6YmjT51ofFLlU78=", "owner": "DarkKirb", "repo": "element-web", - "rev": "204160a6731f39b46428e1b97d3417b177b4d217", + "rev": "add89e1d268c4d96786db875f3d0ab95bbbb2c14", "type": "github" }, "original": { @@ -299,11 +299,11 @@ ] }, "locked": { - "lastModified": 1718672480, - "narHash": "sha256-IAESswxcZSQjSzlmBCwaUqok37ghQ82hRjS5YvD9muU=", + "lastModified": 1718979366, + "narHash": "sha256-JKVOUY0J0ViIyT4iffgzNNXSe8StZrMpUynDQfNXTw4=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "a5057a09f48b6c263d17a9fd36081b5b4700574f", + "rev": "3d2c979eb0a209dbbe2eb4410ade3b03d299838d", "type": "github" }, "original": { @@ -492,11 +492,11 @@ ] }, "locked": { - "lastModified": 1718526747, - "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", + "lastModified": 1718788307, + "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", + "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", "type": "github" }, "original": { @@ -593,11 +593,11 @@ ] }, "locked": { - "lastModified": 1717647344, - "narHash": "sha256-m8XYt8NU2T4gvkien7H7LFGXHhSA5z4tHOeuXQ3DJi4=", + "lastModified": 1718778751, + "narHash": "sha256-DdcMvX9r29uHMlz7P1Shgs5xZw9WkZ4ObMGYzwROAiw=", "ref": "refs/heads/main", - "rev": "4e25f1ab68f2270f9cff59216056c21073db0164", - "revCount": 87, + "rev": "909e593ae9f5fe338ab19b4ed9d52bb0ea09bad8", + "revCount": 90, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -670,11 +670,11 @@ ] }, "locked": { - "lastModified": 1718609696, + "lastModified": 1718692504, "narHash": "sha256-9CZ0jlW3DZPHissVhV+bo1uVo/yzytgUq13aGFF2Jmg=", "owner": "DarkKirb", "repo": "matrix-react-sdk", - "rev": "6d8aaea05d6946e4f71f2ea489a77ab5f07ea085", + "rev": "87b8a715a76d59217dab27f9b2dce0e4350a11cc", "type": "github" }, "original": { @@ -705,11 +705,11 @@ ] }, "locked": { - "lastModified": 1717067539, - "narHash": "sha256-oIs5EF+6VpHJRvvpVWuqCYJMMVW/6h59aYUv9lABLtY=", + "lastModified": 1718727675, + "narHash": "sha256-uFsCwWYI2pUpt0awahSBorDUrUfBhaAiyz+BPTS2MHk=", "owner": "nix-community", "repo": "naersk", - "rev": "fa19d8c135e776dc97f4dcca08656a0eeb28d5c0", + "rev": "941ce6dc38762a7cfb90b5add223d584feed299b", "type": "github" }, "original": { @@ -754,11 +754,11 @@ ] }, "locked": { - "lastModified": 1718501202, - "narHash": "sha256-waFNDJ4PFrZfFP0xSKY3+/85rejNev+RO/aYRHUIHdg=", + "lastModified": 1718932815, + "narHash": "sha256-rBHjFBwcLVlLcEIHF8OOcEjxmQYwqfZtgIEt2xqpDjY=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "afc7bf542d35cccbba3263edbd40768ca63f798e", + "rev": "6748fcc3632796f0374abcfcf3c48c3790fbcf64", "type": "github" }, "original": { @@ -789,11 +789,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1718548414, - "narHash": "sha256-1obyIuQPR/Kq1j5/i/5EuAfQrDwjYnjCDG8iLtXmBhQ=", + "lastModified": 1718987887, + "narHash": "sha256-zVoDb0GkhdfrRtJbJm3QIwFAyZEv9ZBo23vfPa5cfjk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cde8f7e11f036160b0fd6a9e07dc4c8e4061cf06", + "rev": "cc634b69c8312c4e88469d3c7e8fb5ecc72e7dc6", "type": "github" }, "original": { @@ -859,11 +859,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718689318, - "narHash": "sha256-lSKhw8GqGVMwfui28sg0z42kTwT8Irm5SrX9GwaVzT8=", + "lastModified": 1718991812, + "narHash": "sha256-myw2ur7Uenh4Vj91bjsZ1kl9zUurIFNnTzN7DSTlJDI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a12b153874647520e447a3d12c96cd9da7bd43ef", + "rev": "47ea5bd4873307fc2371ae1bdf508864f6a25ee8", "type": "github" }, "original": { @@ -916,11 +916,11 @@ ] }, "locked": { - "lastModified": 1718681902, - "narHash": "sha256-E/T7Ge6ayEQe7FVKMJqDBoHyLhRhjc6u9CmU8MyYfy0=", + "lastModified": 1718936281, + "narHash": "sha256-jslEDCVFoRcNilJT0xYGSxqMjOe+USnLknpHIAZJ02A=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "16c8ad83297c278eebe740dea5491c1708960dd1", + "rev": "c9a793a5278f711a59fe77b9bf54b215667022c6", "type": "github" }, "original": { diff --git a/packages/matrix/mautrix-whatsapp/gomod2nix.toml b/packages/matrix/mautrix-whatsapp/gomod2nix.toml index a92d8ec1..9d6b7688 100644 --- a/packages/matrix/mautrix-whatsapp/gomod2nix.toml +++ b/packages/matrix/mautrix-whatsapp/gomod2nix.toml @@ -4,9 +4,6 @@ schema = 3 [mod."filippo.io/edwards25519"] version = "v1.0.0" hash = "sha256-APnPAcmItvtJ5Zsy863lzR2TjEBF9Y66TY1e4M1ap98=" - [mod."github.com/beeper/libserv"] - version = "v0.0.0-20231231202820-c7303abfc32c" - hash = "sha256-C2CT1LuaLqe2VEykqnUr9dcOzE+G+v7XBaLT0RuLfMo=" [mod."github.com/beorn7/perks"] version = "v1.0.1" hash = "sha256-h75GUqfwJKngCJQVE5Ao5wnO3cfKD9lSIteoLp/3xJ4=" @@ -74,47 +71,47 @@ schema = 3 version = "v1.2.5" hash = "sha256-OYGNolkmL7E1Qs2qrQ3IVpQp5gkcHNU/AB/z2O+Myps=" [mod."github.com/yuin/goldmark"] - version = "v1.7.1" - hash = "sha256-3EUgwoZRRs2jNBWSbB0DGNmfBvx7CeAgEwyUdaRaeR4=" + version = "v1.7.2" + hash = "sha256-0rjUJP5WJy6227Epkgm/UHU9xzvrOAvYW+Y3EC+MkTE=" [mod."go.mau.fi/libsignal"] version = "v0.1.0" hash = "sha256-hSZQkw/0eV5Y0pj1N+idYuKb/jtiw/qTfaOGdYCXmn0=" [mod."go.mau.fi/util"] - version = "v0.4.2" - hash = "sha256-o/d7Wd+2byFxmVxjl5o/AAUO/2d12vzItq6H5yUtcow=" + version = "v0.5.0" + hash = "sha256-Gpg/orzKd3emcQecqc++y3xDp43oC8owDljiiBNIxpQ=" [mod."go.mau.fi/webp"] version = "v0.1.0" hash = "sha256-KIP/Onw0t/o10oBuvmRQDff7GF8G5lsMaDXpe0fjvNg=" [mod."go.mau.fi/whatsmeow"] - version = "v0.0.0-20240603101645-64bc969fbe78" - hash = "sha256-MBDcxTHM+ZxxzIrendWWEhNdkPA7cLgkduC424+j+fU=" + version = "v0.0.0-20240619210240-329c2336a6f1" + hash = "sha256-J4taRK1xJMdrbQt9c5s6ncGvCtFpuGWGtaApY4BD49c=" [mod."go.mau.fi/zeroconfig"] version = "v0.1.2" hash = "sha256-xf4p2Z5Pl9In3ne9BVmy7YvtooSRBzqxP4Pl2jdVN8w=" [mod."golang.org/x/crypto"] - version = "v0.23.0" - hash = "sha256-6hZjb/OazWFBef0C/aH63l49YQnzCh2vpIduzyfSSG8=" + version = "v0.24.0" + hash = "sha256-wpxJApwSmmn9meVdpFdOU0gzeJbIXcKuFfYUUVogSss=" [mod."golang.org/x/exp"] - version = "v0.0.0-20240409090435-93d18d7e34b8" - hash = "sha256-yJ9KBMmck/gGGTwPx26kZzqBHlh3sn3kKVjwBI1OB0w=" + version = "v0.0.0-20240613232115-7f521ea00fb8" + hash = "sha256-QRK52QHPPhj+JIcQbd4/hI5ceEbKu3e9mR57XxocwOE=" [mod."golang.org/x/image"] - version = "v0.16.0" - hash = "sha256-+BOLefaFM/c+AV3kmnNvztbhZ+a9GCNwkEya8hZSKYg=" + version = "v0.17.0" + hash = "sha256-tH5e4+0ero5B5/r5TwzxQZhnfCecQvmoles3UW24X/c=" [mod."golang.org/x/net"] - version = "v0.25.0" - hash = "sha256-IjFfXLYNj27WLF7vpkZ6mfFXBnp+7QER3OQ0RgjxN54=" + version = "v0.26.0" + hash = "sha256-WfY33QERNbcIiDkH3+p2XGrAVqvWBQfc8neUt6TH6dQ=" [mod."golang.org/x/sync"] version = "v0.7.0" hash = "sha256-2ETllEu2GDWoOd/yMkOkLC2hWBpKzbVZ8LhjLu0d2A8=" [mod."golang.org/x/sys"] - version = "v0.20.0" - hash = "sha256-mowlaoG2k4n1c1rApWef5EMiXd3I77CsUi8jPh6pTYA=" + version = "v0.21.0" + hash = "sha256-gapzPWuEqY36V6W2YhIDYR49sEvjJRd7bSuf9K1f4JY=" [mod."golang.org/x/text"] - version = "v0.15.0" - hash = "sha256-pBnj0AEkfkvZf+3bN7h6epCD2kurw59clDP7yWvxKlk=" + version = "v0.16.0" + hash = "sha256-hMTO45upjEuA4sJzGplJT+La2n3oAfHccfYWZuHcH+8=" [mod."google.golang.org/protobuf"] - version = "v1.34.1" - hash = "sha256-qnHqY6KLZiZDbTVTN6uzF4jedxROYlPCYHoiv6XI0sc=" + version = "v1.34.2" + hash = "sha256-nMTlrDEE2dbpWz50eQMPBQXCyQh4IdjrTIccaU0F3m0=" [mod."gopkg.in/natefinch/lumberjack.v2"] version = "v2.2.1" hash = "sha256-GaXWRDxhGy4Z4mgE+bJ8OE9SVvYUa9TnNiydnp2s1Ms=" @@ -125,5 +122,5 @@ schema = 3 version = "v1.0.0" hash = "sha256-fYc/WwqE0ev0dvnu5qGmHJsYiSTuWeOTiAVzmQIKWyY=" [mod."maunium.net/go/mautrix"] - version = "v0.18.1" - hash = "sha256-H7YcwnZ+ADiKvh5QhnDtCKh+/lot6GtcNzBNds6dgGo=" + version = "v0.19.0-beta.1.0.20240619204109-68d8ab6896fd" + hash = "sha256-jvlKfDTJyctVu3Mn18wZxCm0XrnW39lLGD87h7zmeKs=" diff --git a/packages/matrix/mautrix-whatsapp/source.json b/packages/matrix/mautrix-whatsapp/source.json index f670dc80..e8acf9c6 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": "73266af07558da852f6b4b0ac5129a43a71bfa7d", - "date": "2024-06-03T13:17:51+03:00", - "path": "/nix/store/wa8v5n2m6i0xjrlfryviki9r9qsfyf7y-whatsapp", - "sha256": "021w6mmw12kvz1wi1lvbsrirvagjlsbaya9jni3s25ys1hbz2hav", - "hash": "sha256-W0HxFwzaF6FHtDIpr5am8qmdY9Zr0xB5+HuKwGs1PAg=", + "rev": "c72d7cb8d51f22a92b6b41821888490417f718ac", + "date": "2024-06-20T00:06:16+03:00", + "path": "/nix/store/3151w9b8n84pkn4gvwfbwa0wzv7i5q17-whatsapp", + "sha256": "0388gy5snw7wy8kp5wagvqdymy07w2kh5f5s671k9qnlj76s0kcf", + "hash": "sha256-jk2gzZHU4jTDMbq4AqfgB/jqG95P8XIn8vxwq4t/CA0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, -- 2.47.0 From 77f379d97ecfee3dc322bbcca7fcf31a091f217e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sat, 22 Jun 2024 09:19:27 +0200 Subject: [PATCH 2/2] fix build --- config/desktop.nix | 1 - config/nas.nix | 4 --- config/nix.nix | 4 --- flake.lock | 61 ---------------------------------------------- flake.nix | 11 --------- 5 files changed, 81 deletions(-) diff --git a/config/desktop.nix b/config/desktop.nix index 19ed56c9..e4a4e50c 100644 --- a/config/desktop.nix +++ b/config/desktop.nix @@ -109,7 +109,6 @@ in { ]; services.flatpak.enable = true; programs.java.enable = true; - hardware.opengl.driSupport = true; hardware.opengl.driSupport32Bit = lib.mkForce (system == "x86_64-linux"); home-manager.users.darkkirb = import ./home-manager/darkkirb.nix { desktop = true; diff --git a/config/nas.nix b/config/nas.nix index 0126af57..4c936473 100644 --- a/config/nas.nix +++ b/config/nas.nix @@ -124,9 +124,6 @@ nix.settings.substituters = lib.mkForce [ "https://attic.chir.rs/chir-rs/" "https://cache.nixos.org/" - "https://beam.attic.rs/riscv" - "https://cache.ztier.in" - "https://cache.lix.systems" ]; nix.daemonCPUSchedPolicy = "idle"; nix.daemonIOSchedClass = "idle"; @@ -185,7 +182,6 @@ hardware.opengl = { enable = true; - driSupport = true; driSupport32Bit = true; }; diff --git a/config/nix.nix b/config/nix.nix index 1d142f22..e8845424 100644 --- a/config/nix.nix +++ b/config/nix.nix @@ -19,15 +19,11 @@ substituters = [ "https://attic.chir.rs/chir-rs/" "https://hydra.int.chir.rs" - "https://cache.lix.systems" ]; trusted-public-keys = [ "nixcache:8KKuGz95Pk4UJ5W/Ni+pN+v+LDTkMMFV4yrGmAYgkDg=" "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" "chir-rs:rzK1Czm3RqBbZLnXYrLM6JyOhfr6Z/8lhACIPO/LNFQ=" - "riscv:TZX1ReuoIGt7QiSQups+92ym8nKJUSV0O2NkS4HAqH8=" - "cache.ztier.link-1:3P5j2ZB9dNgFFFVkCQWT3mh0E+S3rIWtZvoql64UaXM=" - "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" ]; }; extraOptions = '' diff --git a/flake.lock b/flake.lock index f28b3ad5..9c1b7bcc 100644 --- a/flake.lock +++ b/flake.lock @@ -447,21 +447,6 @@ "type": "github" } }, - "flakey-profile": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "gomod2nix": { "inputs": { "nixpkgs": [ @@ -562,50 +547,6 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1714955862, - "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=", - "ref": "refs/tags/2.90-beta.1", - "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c", - "revCount": 15501, - "type": "git", - "url": "https://git@git.lix.systems/lix-project/lix" - }, - "original": { - "ref": "refs/tags/2.90-beta.1", - "type": "git", - "url": "https://git@git.lix.systems/lix-project/lix" - } - }, - "lix-module": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "flakey-profile": "flakey-profile", - "lix": [ - "lix" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1718778751, - "narHash": "sha256-DdcMvX9r29uHMlz7P1Shgs5xZw9WkZ4ObMGYzwROAiw=", - "ref": "refs/heads/main", - "rev": "909e593ae9f5fe338ab19b4ed9d52bb0ea09bad8", - "revCount": 90, - "type": "git", - "url": "https://git.lix.systems/lix-project/nixos-module" - }, - "original": { - "type": "git", - "url": "https://git.lix.systems/lix-project/nixos-module" - } - }, "lowdown-src": { "flake": false, "locked": { @@ -893,8 +834,6 @@ "hydra": "hydra", "impermanence": "impermanence", "lib-aggregate": "lib-aggregate", - "lix": "lix", - "lix-module": "lix-module", "matrix-js-sdk": "matrix-js-sdk", "matrix-react-sdk": "matrix-react-sdk", "mozilla": "mozilla", diff --git a/flake.nix b/flake.nix index 54518c21..dc9004a4 100644 --- a/flake.nix +++ b/flake.nix @@ -110,16 +110,6 @@ rec { inputs.flake-utils.follows = "flake-utils"; inputs.nixpkgs-lib.follows = "nixpkgs"; }; - lix = { - url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1"; - flake = false; - }; - lix-module = { - url = "git+https://git.lix.systems/lix-project/nixos-module"; - inputs.lix.follows = "lix"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; matrix-react-sdk = { url = "github:DarkKirb/matrix-react-sdk"; inputs.flake-parts.follows = "flake-parts"; @@ -305,7 +295,6 @@ rec { home-manager.extraSpecialArgs = args // {inherit system;}; }) (import utils/link-input.nix args) - args.lix-module.nixosModules.default ]; }; }) -- 2.47.0