From af05a4e395267fdcc1bb432f61d24891288bcbe6 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 7 Jun 2024 10:08:22 +0800 Subject: [PATCH] ricochet-refresh: 3.0.23 -> 3.0.24 --- pkgs/by-name/ri/ricochet-refresh/package.nix | 9 +++------ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ri/ricochet-refresh/package.nix b/pkgs/by-name/ri/ricochet-refresh/package.nix index 1dcff630f5e5..6072f05e06c1 100644 --- a/pkgs/by-name/ri/ricochet-refresh/package.nix +++ b/pkgs/by-name/ri/ricochet-refresh/package.nix @@ -3,24 +3,21 @@ , fetchFromGitHub , qt5 , openssl -, protobuf3_20 # https://github.com/blueprint-freespeech/ricochet-refresh/issues/178 +, protobuf , pkg-config , cmake }: -let - protobuf = protobuf3_20; -in stdenv.mkDerivation (finalAttrs: { pname = "ricochet-refresh"; - version = "3.0.23"; + version = "3.0.24"; src = fetchFromGitHub { owner = "blueprint-freespeech"; repo = "ricochet-refresh"; rev = "v${finalAttrs.version}-release"; - hash = "sha256-Wz53KeI3t12MqnvGuGS8Jd9gDY4eCTc5wcXBDHp5m0U="; fetchSubmodules = true; + hash = "sha256-xz1cyNQgmXUIZc56OHwWZCGVNpp7CFFyCd0EvAas4zw="; }; sourceRoot = "${finalAttrs.src.name}/src"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06a9b63930ae..8b5e0514d9ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29027,6 +29027,10 @@ with pkgs; redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; + ricochet-refresh = callPackage ../by-name/ri/ricochet-refresh/package.nix { + protobuf = protobuf_21; # https://github.com/blueprint-freespeech/ricochet-refresh/issues/178 + }; + rime-data = callPackage ../data/misc/rime-data { }; roapi-http = callPackage ../servers/roapi/http.nix { };