From 6e8351c80d227ef306d55bc192dab961b528a12f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sat, 17 Sep 2022 15:30:40 +0100 Subject: [PATCH] manual update --- akkoma/default.nix | 8 +++-- flake.lock | 50 +++++++++++++------------- matrix/mautrix-discord/gomod2nix.toml | 4 +-- matrix/mautrix-discord/source.nix | 4 +-- matrix/mautrix-whatsapp/gomod2nix.toml | 8 ++--- matrix/mautrix-whatsapp/source.nix | 4 +-- minecraft/paper.json | 6 ++-- python/tarballs.nix | 12 +++---- 8 files changed, 49 insertions(+), 47 deletions(-) diff --git a/akkoma/default.nix b/akkoma/default.nix index c3a022f..62625da 100644 --- a/akkoma/default.nix +++ b/akkoma/default.nix @@ -3,9 +3,11 @@ inputs, }: with pkgs; let - mkYarnPackage = (yarn2nix-moretea.override (super: { - nodejs = pkgs.nodejs-16_x; - })).mkYarnPackage; + mkYarnPackage = + (yarn2nix-moretea.override (super: { + nodejs = pkgs.nodejs-16_x; + })) + .mkYarnPackage; in rec { akkoma = beamPackages.mixRelease rec { pname = "akkoma"; diff --git a/flake.lock b/flake.lock index 010cfbb..729af93 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "akkoma": { "flake": false, "locked": { - "lastModified": 1663150807, - "narHash": "sha256-pycVgUZtoE8UW60oiwqE3TNQlTuGvdagbOhm0aaM+C8=", + "lastModified": 1663334611, + "narHash": "sha256-vTMev3jDQdqNX2uTf525CjhdItWPLddxJ9awJeasjTs=", "ref": "refs/heads/develop", - "rev": "00f840fd44d5c32a975af85ff7e3a0f6f242b903", - "revCount": 14718, + "rev": "ad1a6d3dc2b431f0d6d5cbe523093a7a3fb0308d", + "revCount": 14723, "type": "git", "url": "https://akkoma.dev/AkkomaGang/akkoma" }, @@ -242,11 +242,11 @@ "mautrix-discord": { "flake": false, "locked": { - "lastModified": 1663179219, - "narHash": "sha256-2r7254UASruTC18RT086jhzpFin//CQc5JzdkpTxq9A=", + "lastModified": 1663321613, + "narHash": "sha256-J8tANwCnOOZkEP90Nu3d7MZ9jHWVOU3nY0U5vs5ZTto=", "owner": "mautrix", "repo": "discord", - "rev": "8f6f98acce8db6a660538d495aedcb7ea5c30f65", + "rev": "b8b2eef3699719834b25968580026f3a8a1c3216", "type": "github" }, "original": { @@ -258,11 +258,11 @@ "mautrix-signal": { "flake": false, "locked": { - "lastModified": 1662300286, - "narHash": "sha256-C4t8f8FioyOv8dc4qMbmGNuqpgTaWOwSAJgc2C1szg8=", + "lastModified": 1663268101, + "narHash": "sha256-lekuVt3nLiBKriDpRutZMzUYgMjCtpcdEBxxJY0oB8Q=", "owner": "mautrix", "repo": "signal", - "rev": "c901201de1cda298fd167f1caa4ab2100497c0de", + "rev": "fcffb15c506f5b811ffc896d3cd468fdf4f7b4c2", "type": "github" }, "original": { @@ -274,11 +274,11 @@ "mautrix-telegram": { "flake": false, "locked": { - "lastModified": 1663076198, - "narHash": "sha256-kMKJpUWZwCdot6roR/b2SFIVttdAZim9E8EWzqgr9j0=", + "lastModified": 1663416049, + "narHash": "sha256-0aHLzAgCnRB6WWx/2sHXv+EV/pyJA4tdpYS2o1aUfZs=", "owner": "mautrix", "repo": "telegram", - "rev": "ad0c6cfc8d32e8411a0a948dfa3ce25417ce66ca", + "rev": "65bd7fcc49b6833c857966d59437e9426e115907", "type": "github" }, "original": { @@ -290,11 +290,11 @@ "mautrix-whatsapp": { "flake": false, "locked": { - "lastModified": 1663178976, - "narHash": "sha256-5ay147gERtF9YxTuGE65uIIxmA+6C+lKG9an4VqEUEc=", + "lastModified": 1663322613, + "narHash": "sha256-OUGFp25M8wn8eWMuQHDh8Zp67x+VHVbyvuBHq+UE+NY=", "owner": "mautrix", "repo": "whatsapp", - "rev": "bcf67b89b64e5bde4a379be243828707141654a6", + "rev": "20e6d9e65903ae9e2b91bb81aa00c6cbe2ed3731", "type": "github" }, "original": { @@ -405,11 +405,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1663067291, - "narHash": "sha256-1BTrqhLMamWf53sJobtMiUDI91PEw6xF8YEwg2VE8w4=", + "lastModified": 1663244735, + "narHash": "sha256-+EukKkeAx6ithOLM1u5x4D12ZFuoi6vpPYjhNDmLz1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d86a4619b7e80bddb6c01bc01a954f368c56d1df", + "rev": "178fea1414ae708a5704490f4c49ec3320be9815", "type": "github" }, "original": { @@ -452,11 +452,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1663178737, - "narHash": "sha256-ayOtdyoNx6BqJtTYVzdQCDz/YWb67TY/CMGacFCgNQo=", + "lastModified": 1663424456, + "narHash": "sha256-MVe+mgBAS9C8LPo0/mluK3JHf3bX934gHvhKno04Nyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1158501e7c7cba26d922723cf9f70099995eb755", + "rev": "89da717b159de94d5eb928fc1c635af4b6136f6d", "type": "github" }, "original": { @@ -468,11 +468,11 @@ "nvim-telescope-file-browser": { "flake": false, "locked": { - "lastModified": 1661178357, - "narHash": "sha256-HnALvKA4/K8T5LbITzRE0JLF4MN/o/KA3VTDC22o41Q=", + "lastModified": 1663305358, + "narHash": "sha256-25nYpWCprrisPeaXCNVucdBwBpwWLEleQIQ6bqzZ1TY=", "owner": "nvim-telescope", "repo": "telescope-file-browser.nvim", - "rev": "00a814a891de086ed446151bacc559c63682b6ee", + "rev": "60bcf4e70ecb9392445c2a2205ee8181dff964d5", "type": "github" }, "original": { diff --git a/matrix/mautrix-discord/gomod2nix.toml b/matrix/mautrix-discord/gomod2nix.toml index 3e751f0..913ef6d 100644 --- a/matrix/mautrix-discord/gomod2nix.toml +++ b/matrix/mautrix-discord/gomod2nix.toml @@ -72,5 +72,5 @@ schema = 3 version = "v2.3.2" hash = "sha256-FlrO1bogPrIzzVzDtIovYyr+1mNk0YaO5hEVv5zovM8=" [mod."maunium.net/go/mautrix"] - version = "v0.12.1-0.20220914153054-e61df9ab8b9b" - hash = "sha256-evjGYB6V6pxBF4CwjERBPFbqrCFJYXeo1EbsPhjZLLg=" + version = "v0.12.1" + hash = "sha256-nYa2Nt+Wx44ieRbJuaaI4FvyDp0PBZOg8N/XtDy4jPo=" diff --git a/matrix/mautrix-discord/source.nix b/matrix/mautrix-discord/source.nix index ba02c41..749408e 100644 --- a/matrix/mautrix-discord/source.nix +++ b/matrix/mautrix-discord/source.nix @@ -1,7 +1,7 @@ {fetchgit}: fetchgit { url = "https://github.com/mautrix/discord"; - rev = "8f6f98acce8db6a660538d495aedcb7ea5c30f65"; - sha256 = "1fmc0wqryaf6sgrigr47k5dn6igivk65d4294qs48ia3bggqii0j"; + rev = "b8b2eef3699719834b25968580026f3a8a1c3216"; + sha256 = "1swjzdx3z9s8f2qf4l4zcihs7s7kv93l9zci9i4zvv5fafw57c64"; leaveDotGit = true; } diff --git a/matrix/mautrix-whatsapp/gomod2nix.toml b/matrix/mautrix-whatsapp/gomod2nix.toml index d722f8e..3526c70 100644 --- a/matrix/mautrix-whatsapp/gomod2nix.toml +++ b/matrix/mautrix-whatsapp/gomod2nix.toml @@ -74,8 +74,8 @@ schema = 3 version = "v0.0.0-20220628090436-4d18b66b087e" hash = "sha256-H601DPysjRRWn12zM1NRozGCkLkWriR/VviVPfpd5vY=" [mod."go.mau.fi/whatsmeow"] - version = "v0.0.0-20220811191500-f650c10b0068" - hash = "sha256-PvAj1B3DprRdJVmPfWxkZqAyS1jJ16b3MN/SpMvKrn8=" + version = "v0.0.0-20220912085258-5c8577b8ac6f" + hash = "sha256-HMNqQ+9AtW8gAZIx1dWEBTbj8PiyyzVG4qTw+X/4zFc=" [mod."golang.org/x/crypto"] version = "v0.0.0-20220817201139-bc19a97f63c8" hash = "sha256-LvSArox3yRkhJLOik9DLTSBp4ldI+OHjiWWilg2t4Hs=" @@ -104,5 +104,5 @@ schema = 3 version = "v2.3.2" hash = "sha256-FlrO1bogPrIzzVzDtIovYyr+1mNk0YaO5hEVv5zovM8=" [mod."maunium.net/go/mautrix"] - version = "v0.12.1-0.20220914153054-e61df9ab8b9b" - hash = "sha256-evjGYB6V6pxBF4CwjERBPFbqrCFJYXeo1EbsPhjZLLg=" + version = "v0.12.1" + hash = "sha256-nYa2Nt+Wx44ieRbJuaaI4FvyDp0PBZOg8N/XtDy4jPo=" diff --git a/matrix/mautrix-whatsapp/source.nix b/matrix/mautrix-whatsapp/source.nix index b7e0fdf..5ce7dec 100644 --- a/matrix/mautrix-whatsapp/source.nix +++ b/matrix/mautrix-whatsapp/source.nix @@ -1,7 +1,7 @@ {fetchgit}: fetchgit { url = "https://github.com/mautrix/whatsapp"; - rev = "bcf67b89b64e5bde4a379be243828707141654a6"; - sha256 = "16r28mww76vzsi6sjj8hv7lbbqzzyyrg76iqfddsma57a7jy43h8"; + rev = "20e6d9e65903ae9e2b91bb81aa00c6cbe2ed3731"; + sha256 = "0mqq0xyjz6q9amhq2nx78kn4dd9r7badwbjyl0cx1bf8l7fms4a5"; leaveDotGit = true; } diff --git a/minecraft/paper.json b/minecraft/paper.json index 3a221ef..b66004a 100644 --- a/minecraft/paper.json +++ b/minecraft/paper.json @@ -1,6 +1,6 @@ { "version": "1.19.2", - "build": 142, - "name": "paper-1.19.2-142.jar", - "sha256": "34a084256ba7afae9bc83dbd2c763e7e069d69553e4f9ab4b729d9720e89f763" + "build": 145, + "name": "paper-1.19.2-145.jar", + "sha256": "9c9c8f344da9dff0ee96941cacd904cd121d8493efd778474ba4d1d22d562357" } diff --git a/python/tarballs.nix b/python/tarballs.nix index 706bab2..0b52b9d 100644 --- a/python/tarballs.nix +++ b/python/tarballs.nix @@ -47,15 +47,15 @@ in rec { passthru.version = "0.0.12"; }; mautrix-src = fetchurl { - url = "https://files.pythonhosted.org/packages/67/c2/e16ace515e1fbb91eac3cecb0c75db95f6916ae138a9ca9df7131d4c468b/mautrix-0.17.8.tar.gz"; - sha256 = "0c56a3003e669d72d0989191bf88f699686d223efb9d93524216deb17e2a332b"; + url = "https://files.pythonhosted.org/packages/67/fb/713647cfece9ac9f22819a9bcd32eb16be32e271d8cced0de43fc89334e8/mautrix-0.18.1.tar.gz"; + sha256 = "7e51f0c3a8ef7a51387d8910ccf17294c3c647a5b8c744c790ac33f1b5461396"; passthru.pname = "mautrix"; - passthru.version = "0.17.8"; + passthru.version = "0.18.1"; }; tulir-telethon-src = fetchurl { - url = "https://files.pythonhosted.org/packages/38/f0/8236f11154532dc0d4e2c161c5c1cff63517fe7d9c05131e92240c11f37c/tulir-telethon-1.25.0a20.tar.gz"; - sha256 = "5fda28f9808d32a42b26f41afcf222f5d16069e4316eb967c14267c2345be897"; + url = "https://files.pythonhosted.org/packages/8f/3b/bb197a597a36f0de35fc4a2885da6f5ecc284de4c741b1688d15ef421a84/tulir-telethon-1.26.0a1.tar.gz"; + sha256 = "e91e630b4122634c38a9e7ca3241f17db8b9ae73a69f0f15ef361165380c1aea"; passthru.pname = "tulir-telethon"; - passthru.version = "1.25.0a20"; + passthru.version = "1.26.0a1"; }; }