From 0529b27d180bc3a1666fa0e7fe236f18d2f147ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 22 Dec 2019 16:03:12 -0300
Subject: [PATCH] catfish: move to pkgs/desktops/xfce/applications

Since release 1.4.6 catfish is an Xfce Project. See https://bluesabre.org/2018/07/15/catfish-1-4-6-released-now-an-xfce-project

Makes an alias for catfish.
---
 .../search => desktops/xfce/applications}/catfish/default.nix   | 0
 pkgs/desktops/xfce/default.nix                                  | 2 ++
 pkgs/top-level/aliases.nix                                      | 1 +
 pkgs/top-level/all-packages.nix                                 | 2 --
 4 files changed, 3 insertions(+), 2 deletions(-)
 rename pkgs/{applications/search => desktops/xfce/applications}/catfish/default.nix (100%)

diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix
similarity index 100%
rename from pkgs/applications/search/catfish/default.nix
rename to pkgs/desktops/xfce/applications/catfish/default.nix
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 793142fdc18..7442ff478f5 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -56,6 +56,8 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   #### APPLICATIONS
 
+  catfish = callPackage ./applications/catfish { };
+
   gigolo = callPackage ./applications/gigolo { };
 
   mousepad = callPackage ./applications/mousepad { };
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8e13ab7be79..8ce5d12bd68 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -61,6 +61,7 @@ mapAliases ({
   buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12
   bundler_HEAD = bundler; # added 2015-11-15
   cantarell_fonts = cantarell-fonts; # added 2018-03-03
+  catfish = xfce.catfish; # added 2019-12-22
   checkbashism = checkbashisms; # added 2016-08-16
   cide = throw "deprecated in 2019-09-11: abandoned by upstream";
   cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab75e4dca42..388b602f121 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18200,8 +18200,6 @@ in
 
   carla = qt5.callPackage ../applications/audio/carla { };
 
-  catfish = callPackage ../applications/search/catfish { };
-
   catimg = callPackage ../tools/misc/catimg { };
 
   catt = python3Packages.callPackage ../applications/video/catt { };