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

Merge pull request #16139 from romildo/upd.catfish

Browse Source 
catfish: 1.4.1 -> 1.4.2
This commit is contained in:
Arseniy Seroka 2016-06-11 22:33:02 +03:00 committed by GitHub
commit 5347a118c2
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,13 +3,13 @@
pythonPackages.buildPythonApplication rec {
majorver = "1.4";
minorver = "1";
minorver = "2";
version = "${majorver}.${minorver}";
name = "catfish-${version}";
src = fetchurl {
url = "https://launchpad.net/catfish-search/${majorver}/${version}/+download/${name}.tar.bz2";
sha256 = "0dc9xq1l1w22xk1hg63mgwr0920jqxrwfzmkhif01yms1m7vfdv8";
sha256 = "0j3by9yfs4j9za3s5qdxrsm7idmps69pimc9d0mjyakvviy0izm3";
};
nativeBuildInputs = [
@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec {
gnome3.dconf
pythonPackages.pyxdg
pythonPackages.ptyprocess
pycairo
pythonPackages.pycairo
];
propagatedBuildInputs = [
@ -34,8 +34,9 @@ pythonPackages.buildPythonApplication rec {
xdg_utils
findutils
];
preFixup = ''
rm "$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.pyc"
for f in \
"$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.py" \
"$out/share/applications/catfish.desktop"

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

@ -12026,7 +12026,7 @@ in
carddav-util = callPackage ../tools/networking/carddav-util { };
catfish = callPackage ../applications/search/catfish {
pythonPackages = python3Packages;
pythonPackages = python2Packages;
};
cava = callPackage ../applications/audio/cava { };