From 6f4b5bf2e71edf48fe1efa7756e54f4f38bb91eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 22 Dec 2019 15:51:50 -0300 Subject: [PATCH 1/2] catfish: 1.4.10 -> 1.4.11 --- pkgs/applications/search/catfish/default.nix | 26 +++++++++----------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix index 3190c5e5d10..3c0fbafc784 100644 --- a/pkgs/applications/search/catfish/default.nix +++ b/pkgs/applications/search/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 ]; From 0529b27d180bc3a1666fa0e7fe236f18d2f147ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 22 Dec 2019 16:03:12 -0300 Subject: [PATCH 2/2] 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 { };