From 4ab08dc959d5d9cd97c5029f57f4e82fb0714e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sat, 20 Aug 2022 08:21:45 +0100 Subject: [PATCH] manual update --- art/source.nix | 4 +-- flake.lock | 36 +++++++++++++-------------- matrix/mautrix-discord/gomod2nix.toml | 12 ++++----- matrix/mautrix-discord/source.nix | 4 +-- matrix/mautrix-whatsapp/source.nix | 4 +-- minecraft/paper.json | 6 ++--- python/tarballs.nix | 6 ++--- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/art/source.nix b/art/source.nix index d4a8e2e..3487034 100644 --- a/art/source.nix +++ b/art/source.nix @@ -1,7 +1,7 @@ {fetchgit}: fetchgit { url = "https://git.chir.rs/darkkirb/lotte-art"; - rev = "2d4e086bdb8d20661b2e8ffa20299113af67a14d"; - sha256 = "1z62qwb1bhcm3imnbs3lkrdijz8q0yc0n6sdhg8s500442bdxrx8"; + rev = "28da5b860c7d604aee5889ede4ee7985b4386ba5"; + sha256 = "113wdw922n43q3y6p55mih2nnqsjz2asy7rmz1ak2fgd8pfd7yl1"; fetchLFS = true; } diff --git a/flake.lock b/flake.lock index ae1605e..46ddeac 100644 --- a/flake.lock +++ b/flake.lock @@ -326,11 +326,11 @@ "mautrix-discord": { "flake": false, "locked": { - "lastModified": 1660659194, - "narHash": "sha256-lv/YnU+VSt3h6jOnd9qrR11d9cN5sh6kGBCT8bE/Dek=", + "lastModified": 1660939846, + "narHash": "sha256-PM6IiC1wRVRsfolzV1f0p6caNWJ2dwi7MW3z8HowXLw=", "owner": "mautrix", "repo": "discord", - "rev": "2d1e8baf1caf74e0c6cf117a4108ca5cb9fe4312", + "rev": "522ac4e2feefe265e2e46df4e847858b1191713e", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "mautrix-signal": { "flake": false, "locked": { - "lastModified": 1660552822, - "narHash": "sha256-Zp278OpXQaoPLNqDL4Ns2JWr0edVmD8S7G0VEXbfecQ=", + "lastModified": 1660921079, + "narHash": "sha256-a2dhZuB6zQOsUash8eOj6ap8vHbJkH+go2gZGze9mxg=", "owner": "mautrix", "repo": "signal", - "rev": "e51f775f672d428f71861978948391970816e43e", + "rev": "be0b0e4d8c2bb12e28027d6dcb5519c077feb359", "type": "github" }, "original": { @@ -358,11 +358,11 @@ "mautrix-telegram": { "flake": false, "locked": { - "lastModified": 1660552828, - "narHash": "sha256-PVGY7sfCrq80MhffBVwww9vKNSHyXqrDiSlIk9JBpE8=", + "lastModified": 1660738838, + "narHash": "sha256-IOmWeDtMg2WfICKSI+JKpSigLtWnTaBHGTP8RWeGTDQ=", "owner": "mautrix", "repo": "telegram", - "rev": "952c81eadc7c4c0eeb180ad36b2276379ff44d25", + "rev": "e3a067c27aa3d9dd5e82db307218cc66c8356ddd", "type": "github" }, "original": { @@ -374,11 +374,11 @@ "mautrix-whatsapp": { "flake": false, "locked": { - "lastModified": 1660670624, - "narHash": "sha256-1AcjcE57ttjypnLU/+qpPsvApiuJfSX0qbPEQKOWfIM=", + "lastModified": 1660671349, + "narHash": "sha256-HtGN5wAE1ykCWVzhchA/TMQAfsi6tpWsoEaxIgR2KqU=", "owner": "mautrix", "repo": "whatsapp", - "rev": "a87bb67be9ab314ad8e3788044ca2e6e3d42fe03", + "rev": "e5ca572811fa8cd53ee1ebda98d1932d365fa05c", "type": "github" }, "original": { @@ -593,11 +593,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1660581366, - "narHash": "sha256-et+bi9/jlSF/pHx5AYB9ZP2XDdZEQ0vnF7xlvs4503Y=", + "lastModified": 1660926553, + "narHash": "sha256-19Ib1b7Ny+yGhnxwnH1KhhB2hvALuNuqevA6XzqkQmo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3d47bbaa26e7a771059d828eecf3bd8bf28a8b0f", + "rev": "00e376e3f3c22d991052dfeaf154c42b09deeb29", "type": "github" }, "original": { @@ -670,11 +670,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1660722407, - "narHash": "sha256-ERp5KP2dbnMWNWlVtUm594xernNNvpZx7uKOe2ips7M=", + "lastModified": 1660978578, + "narHash": "sha256-aD9CCygrdR2HDf5SZRiWsCX0jLAJ6Lw0mrGa9lSWOco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd8bbdd4fdb15f7758fd3c8df531e9d42bee239d", + "rev": "cf06fa476baea79cdbaaf103751f479ac4456eb0", "type": "github" }, "original": { diff --git a/matrix/mautrix-discord/gomod2nix.toml b/matrix/mautrix-discord/gomod2nix.toml index 4c43a21..7424b5b 100644 --- a/matrix/mautrix-discord/gomod2nix.toml +++ b/matrix/mautrix-discord/gomod2nix.toml @@ -2,9 +2,9 @@ schema = 3 [mod] [mod."github.com/bwmarrin/discordgo"] - version = "v0.23.3-0.20220708141955-6445b637ad87" + version = "v0.0.0-20220708141955-6445b637ad87" hash = "sha256-8QVvFW6sLEJ5biGXV9mIM6Sm2pZdEZFeJk1eSJilmQs=" - replaced = "gitlab.com/beeper/discordgo" + replaced = "github.com/beeper/discordgo" [mod."github.com/gorilla/mux"] version = "v1.8.0" hash = "sha256-s905hpzMH9bOLue09E2JmzPXfIS4HhAlgT7g13HCwKE=" @@ -21,8 +21,8 @@ schema = 3 version = "v0.0.14" hash = "sha256-e8zn5eCVh/B1HOP1PGXeXH0bGkIV0vKYP9KLwZni5as=" [mod."github.com/mattn/go-sqlite3"] - version = "v1.14.14" - hash = "sha256-9ih+l+JbwfjfpJEjFyO996rJIFFMg7Tfb0SAinp/01I=" + version = "v1.14.15" + hash = "sha256-fSrs2sdBKFTAiffBHNnAkN8kDTqiXgm4HNqzJAOF1RM=" [mod."github.com/rs/zerolog"] version = "v1.27.0" hash = "sha256-BxQtP2TROeSSpj9l1irocuSfxn55UL4ugzB/og7r8eE=" @@ -63,5 +63,5 @@ schema = 3 version = "v2.3.2" hash = "sha256-FlrO1bogPrIzzVzDtIovYyr+1mNk0YaO5hEVv5zovM8=" [mod."maunium.net/go/mautrix"] - version = "v0.11.1-0.20220815133425-ba1fce8fce24" - hash = "sha256-Az36Ojiv353gsI00hdQHmLX4OPOk3BmBDRMXZz1dA5o=" + version = "v0.12.0" + hash = "sha256-RNKhZ2C2YOhZD7JfL/u7RsNl9GHqJCIjfB4VfWX5hJ4=" diff --git a/matrix/mautrix-discord/source.nix b/matrix/mautrix-discord/source.nix index a7b362e..55b7d78 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 = "2d1e8baf1caf74e0c6cf117a4108ca5cb9fe4312"; - sha256 = "1c9qbna6v08rmrwp4gi6p0m0x1nyrdmn3j4ipimwqrqma0x54r47"; + rev = "522ac4e2feefe265e2e46df4e847858b1191713e"; + sha256 = "07m98ajjyn6rc50fcz7friwpyw24d05289lb6lddxrav3ajmsglx"; leaveDotGit = true; } diff --git a/matrix/mautrix-whatsapp/source.nix b/matrix/mautrix-whatsapp/source.nix index 569d10e..6104900 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 = "a87bb67be9ab314ad8e3788044ca2e6e3d42fe03"; - sha256 = "1jix6ln72p57nmayr8xpx8qk4qib53dqnbck3rgafwr6sn0q31c4"; + rev = "e5ca572811fa8cd53ee1ebda98d1932d365fa05c"; + sha256 = "179q73aa2hyq4wlrn81xpkk1wxl6pijk2p311gzw7px8wkbi5876"; leaveDotGit = true; } diff --git a/minecraft/paper.json b/minecraft/paper.json index 3414728..35233c2 100644 --- a/minecraft/paper.json +++ b/minecraft/paper.json @@ -1,6 +1,6 @@ { "version": "1.19.2", - "build": 130, - "name": "paper-1.19.2-130.jar", - "sha256": "ed6751b5aa8b2cb6ee06163724019a8288788db022c1f8f4eef7c30af453bcc7" + "build": 131, + "name": "paper-1.19.2-131.jar", + "sha256": "cbbf9b07258f73fd8a046fc3397fc216c21058d6e826cebcfbee98eb897256de" } diff --git a/python/tarballs.nix b/python/tarballs.nix index c81343d..15d8a89 100644 --- a/python/tarballs.nix +++ b/python/tarballs.nix @@ -47,10 +47,10 @@ in rec { passthru.version = "0.0.12"; }; mautrix-src = fetchurl { - url = "https://files.pythonhosted.org/packages/d7/5b/6f449e9b3813353416004f4db9cc81ea11353f4c743956de4934988da603/mautrix-0.17.5.tar.gz"; - sha256 = "954062ff053965585e4899426963fee61ba62b4b448faefcaf61bfdf8dd42489"; + url = "https://files.pythonhosted.org/packages/15/a1/98c37a3091f85c47a04daeb83bddc10d2ab6f8f30014310e8fa86cccdfcc/mautrix-0.17.6.tar.gz"; + sha256 = "659b5454203836e8f2f90ede664bcf8093bf2c9f51fba872a9c32a6700742357"; passthru.pname = "mautrix"; - passthru.version = "0.17.5"; + passthru.version = "0.17.6"; }; tulir-telethon-src = fetchurl { url = "https://files.pythonhosted.org/packages/38/f0/8236f11154532dc0d4e2c161c5c1cff63517fe7d9c05131e92240c11f37c/tulir-telethon-1.25.0a20.tar.gz";