Merge pull request #76183 from romildo/upd.catfish

catfish: 1.4.10 -> 1.4.11

pkgs/desktops/xfce/applications/catfish/default.nix

@@ -1,21 +1,19 @@
 { stdenv, fetchurl, file, which, intltool, gobject-introspection,
-  findutils, xdg_utils, dconf, gtk3, pythonPackages,
+  findutils, xdg_utils, dconf, gtk3, python3Packages,
   wrapGAppsHook
 }:
 
-pythonPackages.buildPythonApplication rec {
-  majorver = "1.4";
-  minorver = "10";
-  version = "${majorver}.${minorver}";
+python3Packages.buildPythonApplication rec {
   pname = "catfish";
+  version = "1.4.11";
 
   src = fetchurl {
-    url = "https://archive.xfce.org/src/apps/${pname}/${majorver}/${pname}-${version}.tar.bz2";
-    sha256 = "0g9l5sv5d7wmyb23cvpz5mpvjnxiqjh25v9gr5qzhcah202a0wr5";
+    url = "https://archive.xfce.org/src/apps/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    sha256 = "11fdzz3l5mydscs4a398siphxwr6xf3cfyimr0hgpkg3169syyv1";
   };
 
   nativeBuildInputs = [
-    pythonPackages.distutils_extra
+    python3Packages.distutils_extra
     file
     which
     intltool
@@ -26,16 +24,16 @@ pythonPackages.buildPythonApplication rec {
   buildInputs = [
     gtk3
     dconf
-    pythonPackages.pyxdg
-    pythonPackages.ptyprocess
-    pythonPackages.pycairo
+    python3Packages.pyxdg
+    python3Packages.ptyprocess
+    python3Packages.pycairo
     gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
   ];
 
   propagatedBuildInputs = [
-    pythonPackages.dbus-python
-    pythonPackages.pygobject3
-    pythonPackages.pexpect
+    python3Packages.dbus-python
+    python3Packages.pygobject3
+    python3Packages.pexpect
     xdg_utils
     findutils
   ];

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 { };

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

pkgs/top-level/all-packages.nix

@@ -18211,8 +18211,6 @@ in
 
   carla = qt5.callPackage ../applications/audio/carla { };
 
-  catfish = callPackage ../applications/search/catfish { };
-
   catimg = callPackage ../tools/misc/catimg { };
 
   catt = python3Packages.callPackage ../applications/video/catt { };