Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
This commit is contained in:
@@ -0,0 +1,60 @@
|
||||
{ stdenv, fetchurl, file, which, intltool, findutils, xdg_utils, pycairo,
|
||||
gnome3, pythonPackages, wrapGAppsHook }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
majorver = "1.4";
|
||||
minorver = "1";
|
||||
version = "${majorver}.${minorver}";
|
||||
name = "catfish-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/catfish-search/${majorver}/${version}/+download/${name}.tar.bz2";
|
||||
sha256 = "0dc9xq1l1w22xk1hg63mgwr0920jqxrwfzmkhif01yms1m7vfdv8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonPackages.distutils_extra
|
||||
file
|
||||
which
|
||||
intltool
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gnome3.gtk
|
||||
gnome3.dconf
|
||||
pythonPackages.pyxdg
|
||||
pythonPackages.ptyprocess
|
||||
pycairo
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pythonPackages.pygobject3
|
||||
pythonPackages.pexpect
|
||||
xdg_utils
|
||||
findutils
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
for f in \
|
||||
"$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.py" \
|
||||
"$out/share/applications/catfish.desktop"
|
||||
do
|
||||
substituteInPlace $f --replace "${pythonPackages.python}" "$out"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A handy file search tool";
|
||||
longDescription = ''
|
||||
Catfish is a handy file searching tool. The interface is
|
||||
intentionally lightweight and simple, using only GTK+3.
|
||||
You can configure it to your needs by using several command line
|
||||
options.
|
||||
'';
|
||||
homepage = https://launchpad.net/catfish-search;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
{ stdenv, fetchurl, perlPackages, mutt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "grepm-${version}";
|
||||
version = "0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.barsnick.net/sw/grepm";
|
||||
sha256 = "0ppprhfw06779hz1b10qvq62gsw73shccsav982dyi6xmqb6jqji";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
buildInputs = [ perlPackages.grepmail mutt ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -a $src $out/bin/grepm
|
||||
chmod +x $out/bin/grepm
|
||||
sed -i \
|
||||
-e "s:^grepmail:${perlPackages.grepmail}/bin/grepmail:" \
|
||||
-e "s:^\( *\)mutt:\1${mutt}/bin/mutt:" \
|
||||
$out/bin/grepm
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Wrapper for grepmail utilizing mutt";
|
||||
homepage = http://www.barsnick.net/sw/grepm.html;
|
||||
license = licenses.free;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user