From 214d48b0a60039d0f40f2705ca7d041ebd18f574 Mon Sep 17 00:00:00 2001 From: Gitea Bot Date: Sat, 22 Apr 2023 09:53:29 +0000 Subject: [PATCH] Update mautrix-discord --- flake.nix | 29 +++++++++++++++++---------- matrix/mautrix-discord/gomod2nix.toml | 4 ++-- matrix/mautrix-discord/source.json | 8 ++++---- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index 9f123eb..eb6824f 100644 --- a/flake.nix +++ b/flake.nix @@ -115,17 +115,24 @@ vf2KernelPackages = pkgs.linuxPackagesFor vf2Kernel; } else {} - ) // (if system == "aarch64-linux" || system == "x86_64-linux" then { - hydra = hydra.packages.${system}.hydra.overrideAttrs (super: { - doCheck = false; - patches = (super.patches or []) ++ [ - ./ci/hydra/add-ca-support.patch - ./ci/hydra/add-gitea-push-hook.patch - ./ci/hydra/jobset-inputs-for-flakes.patch - ./ci/hydra/remove-hydra-size-limit.patch - ]; - }); - } else {}); + ) + // ( + if system == "aarch64-linux" || system == "x86_64-linux" + then { + hydra = hydra.packages.${system}.hydra.overrideAttrs (super: { + doCheck = false; + patches = + (super.patches or []) + ++ [ + ./ci/hydra/add-ca-support.patch + ./ci/hydra/add-gitea-push-hook.patch + ./ci/hydra/jobset-inputs-for-flakes.patch + ./ci/hydra/remove-hydra-size-limit.patch + ]; + }); + } + else {} + ); overlays = import ./overlays; modules = import ./modules; diff --git a/matrix/mautrix-discord/gomod2nix.toml b/matrix/mautrix-discord/gomod2nix.toml index d24429f..0975234 100644 --- a/matrix/mautrix-discord/gomod2nix.toml +++ b/matrix/mautrix-discord/gomod2nix.toml @@ -2,8 +2,8 @@ schema = 3 [mod] [mod."github.com/bwmarrin/discordgo"] - version = "v0.0.0-20230416132336-325ee6a8c961" - hash = "sha256-d3hLtzQGwQPmRAjuhFCKBXoGpNqRBojIPQyKKwog1dU=" + version = "v0.0.0-20230421223629-940c512c92de" + hash = "sha256-kYHTEzp057L3jHW8mx9jNUICVfRtsGYHmTuHNePcPdc=" replaced = "github.com/beeper/discordgo" [mod."github.com/coreos/go-systemd/v22"] version = "v22.5.0" diff --git a/matrix/mautrix-discord/source.json b/matrix/mautrix-discord/source.json index 2a69c2e..84f08f4 100644 --- a/matrix/mautrix-discord/source.json +++ b/matrix/mautrix-discord/source.json @@ -1,9 +1,9 @@ { "url": "https://github.com/mautrix/discord", - "rev": "29e0b9fa02812096579330af5f78b42c5c0a15f4", - "date": "2023-04-20T21:15:06+03:00", - "path": "/nix/store/2jbrlqbc39lchv7l3vsfapfqinbypifq-discord", - "sha256": "1q3151d6f7yzxvyfi4wwliisx2mb62j0nmracpgak6ixnrcyli69", + "rev": "049ef48fb062f2caea7fcfa02dc1d1391e7828e0", + "date": "2023-04-22T01:44:51+03:00", + "path": "/nix/store/vjm3lri8wfskqcxwzz7qa2vykhr77ckh-discord", + "sha256": "1n28n54gkmijfi2lzlayrkzpillii8i8mis9i5wm0pbf44c67r8y", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false,