From fbe34c113c12b180d318711588c7ddf988c43f79 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sat, 15 Apr 2023 14:05:57 +0200
Subject: [PATCH 1/2] Revert "fluffychat: fix version number on package search"

This reverts commit 2741fe2ac110e33b9fd1b7713998a4dfe5dbae22.
---
 .../networking/instant-messengers/fluffychat/default.nix     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
index 7064a32365e1..28ffece57a40 100644
--- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
@@ -13,14 +13,15 @@
 }:
 
 let
+  version = "1.10.0";
   # map of nix platform -> expected url platform
   platformMap = {
     x86_64-linux = "linux-x86";
     aarch64-linux = "linux-arm64";
   };
 in
-stdenv.mkDerivation rec {
-  version = "1.10.0";
+stdenv.mkDerivation {
+  inherit version;
   name = "fluffychat";
 
   src = fetchzip {

From f91edb5e283796bd3d9bbe344418469cc71af80f Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sat, 15 Apr 2023 14:07:22 +0200
Subject: [PATCH 2/2] fluffychat: use pname + version, fix missing

version number on package search

https://github.com/NixOS/nixpkgs/pull/223117#issuecomment-1495032616
https://github.com/NixOS/nixpkgs/pull/225286#discussion_r1164489620
---
 .../networking/instant-messengers/fluffychat/default.nix        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
index 28ffece57a40..a29a5364ce7a 100644
--- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
@@ -22,7 +22,7 @@ let
 in
 stdenv.mkDerivation {
   inherit version;
-  name = "fluffychat";
+  pname = "fluffychat";
 
   src = fetchzip {
     url = "https://gitlab.com/api/v4/projects/16112282/packages/generic/fluffychat/${version}/fluffychat-${platformMap.${stdenv.hostPlatform.system}}.tar.gz";