JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

catfish: 1.4.2 -> 1.4.4

Browse Source
This commit is contained in:
José Romildo Malaquias 2018-02-12 14:43:12 -02:00
parent cc0f942aec
commit 23e0d7de52
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/applications/search/catfish/default.nix
View File

@ -1,15 +1,17 @@
{ stdenv, fetchurl, file, which, intltool, findutils, xdg_utils, { stdenv, fetchurl, file, which, intltool, gobjectIntrospection,
gnome3, pythonPackages, wrapGAppsHook }: findutils, xdg_utils, gnome3, pythonPackages, hicolor_icon_theme,
wrapGAppsHook
}:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
majorver = "1.4"; majorver = "1.4";
minorver = "2"; minorver = "4";
version = "${majorver}.${minorver}"; version = "${majorver}.${minorver}";
name = "catfish-${version}"; pname = "catfish";
src = fetchurl { src = fetchurl {
url = "https://launchpad.net/catfish-search/${majorver}/${version}/+download/${name}.tar.bz2"; url = "https://launchpad.net/catfish-search/${majorver}/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "0j3by9yfs4j9za3s5qdxrsm7idmps69pimc9d0mjyakvviy0izm3"; sha256 = "1mw7py6si6y88jblmzm04hf049bpww7h87k2wypq07zm1dw55m52";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -17,6 +19,7 @@ pythonPackages.buildPythonApplication rec {
file file
which which
intltool intltool
gobjectIntrospection
wrapGAppsHook wrapGAppsHook
]; ];
@ -26,6 +29,7 @@ pythonPackages.buildPythonApplication rec {
pythonPackages.pyxdg pythonPackages.pyxdg
pythonPackages.ptyprocess pythonPackages.ptyprocess
pythonPackages.pycairo pythonPackages.pycairo
hicolor_icon_theme
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -35,17 +39,20 @@ pythonPackages.buildPythonApplication rec {
findutils findutils
]; ];
preFixup = '' # Explicitly set the prefix dir in "setup.py" because setuptools is
rm "$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.pyc" # not using "$out" as the prefix when installing catfish data. In
for f in \ # particular the variable "__catfish_data_directory__" in
"$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.py" \ # "catfishconfig.py" is being set to a subdirectory in the python
"$out/share/applications/catfish.desktop" # path in the store.
do postPatch = ''
substituteInPlace $f --replace "${pythonPackages.python}" "$out" sed -i "/^ if self.root/i\\ self.prefix = \"$out\"" setup.py
done
''; '';
# Disable check because there is no test in the source distribution
doCheck = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://launchpad.net/catfish-search;
description = "A handy file search tool"; description = "A handy file search tool";
longDescription = '' longDescription = ''
Catfish is a handy file searching tool. The interface is Catfish is a handy file searching tool. The interface is
@ -53,7 +60,6 @@ pythonPackages.buildPythonApplication rec {
You can configure it to your needs by using several command line You can configure it to your needs by using several command line
options. options.
''; '';
homepage = https://launchpad.net/catfish-search;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

4
pkgs/top-level/all-packages.nix
View File

@ -14466,9 +14466,7 @@ with pkgs;
carddav-util = callPackage ../tools/networking/carddav-util { }; carddav-util = callPackage ../tools/networking/carddav-util { };
catfish = callPackage ../applications/search/catfish { catfish = callPackage ../applications/search/catfish { };
pythonPackages = python2Packages;
};
cava = callPackage ../applications/audio/cava { }; cava = callPackage ../applications/audio/cava { };