git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #76183 from romildo/upd.catfish

catfish: 1.4.10 -> 1.4.11

commit73a2107bc0b12e60157d7b9debcde3aa4cf9f31e authorworldofpeace <worldofpeace@protonmail.ch> dateMon 23 Dec 2019, 09:12 (7 years ago) parent25293670529b27
4 files changed+15−16
pkgs/applications/search/catfish/default.nix → pkgs/desktops/xfce/applications/catfish/default.nix+12−14 pkgs/desktops/xfce/default.nix+2 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix−2
pkgs/applications/search/catfish/default.nix → pkgs/desktops/xfce/applications/catfish/default.nixrenamed+12−14
@@ -1,21 +1,19 @@
11{ stdenv, fetchurl, file, which, intltool, gobject-introspection,
2− findutils, xdg_utils, dconf, gtk3, pythonPackages,
2+ findutils, xdg_utils, dconf, gtk3, python3Packages,
33 wrapGAppsHook
44}:
55
6−pythonPackages.buildPythonApplication rec {
7− majorver = "1.4";
8− minorver = "10";
9− version = "${majorver}.${minorver}";
6+python3Packages.buildPythonApplication rec {
107 pname = "catfish";
8+ version = "1.4.11";
119
1210 src = fetchurl {
13− url = "https://archive.xfce.org/src/apps/${pname}/${majorver}/${pname}-${version}.tar.bz2";
14− sha256 = "0g9l5sv5d7wmyb23cvpz5mpvjnxiqjh25v9gr5qzhcah202a0wr5";
11+ url = "https://archive.xfce.org/src/apps/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
12+ sha256 = "11fdzz3l5mydscs4a398siphxwr6xf3cfyimr0hgpkg3169syyv1";
1513 };
1614
1715 nativeBuildInputs = [
18− pythonPackages.distutils_extra
16+ python3Packages.distutils_extra
1917 file
2018 which
2119 intltool
@@ -26,16 +24,16 @@ pythonPackages.buildPythonApplication rec {
2624 buildInputs = [
2725 gtk3
2826 dconf
29− pythonPackages.pyxdg
30− pythonPackages.ptyprocess
31− pythonPackages.pycairo
27+ python3Packages.pyxdg
28+ python3Packages.ptyprocess
29+ python3Packages.pycairo
3230 gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
3331 ];
3432
3533 propagatedBuildInputs = [
36− pythonPackages.dbus-python
37− pythonPackages.pygobject3
38− pythonPackages.pexpect
34+ python3Packages.dbus-python
35+ python3Packages.pygobject3
36+ python3Packages.pexpect
3937 xdg_utils
4038 findutils
4139 ];
pkgs/desktops/xfce/default.nix+2
@@ -56,6 +56,8 @@ lib.makeScope pkgs.newScope (self: with self; {
5656
5757 #### APPLICATIONS
5858
59+ catfish = callPackage ./applications/catfish { };
60+
5961 gigolo = callPackage ./applications/gigolo { };
6062
6163 mousepad = callPackage ./applications/mousepad { };
pkgs/top-level/aliases.nix+1
@@ -61,6 +61,7 @@ mapAliases ({
6161 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12
6262 bundler_HEAD = bundler; # added 2015-11-15
6363 cantarell_fonts = cantarell-fonts; # added 2018-03-03
64+ catfish = xfce.catfish; # added 2019-12-22
6465 checkbashism = checkbashisms; # added 2016-08-16
6566 cide = throw "deprecated in 2019-09-11: abandoned by upstream";
6667 cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10
pkgs/top-level/all-packages.nix−2
@@ -18211,8 +18211,6 @@ in
1821118211
1821218212 carla = qt5.callPackage ../applications/audio/carla { };
1821318213
18214− catfish = callPackage ../applications/search/catfish { };
18215−
1821618214 catimg = callPackage ../tools/misc/catimg { };
1821718215
1821818216 catt = python3Packages.callPackage ../applications/video/catt { };