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

Merge pull request #16139 from romildo/upd.catfish 

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
parent d4876168e2 205ec15d1e
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

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

@ -3,13 +3,13 @@
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
majorver = "1.4"; majorver = "1.4";
minorver = "1"; minorver = "2";
version = "${majorver}.${minorver}"; version = "${majorver}.${minorver}";
name = "catfish-${version}"; name = "catfish-${version}";
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/${name}.tar.bz2";
sha256 = "0dc9xq1l1w22xk1hg63mgwr0920jqxrwfzmkhif01yms1m7vfdv8"; sha256 = "0j3by9yfs4j9za3s5qdxrsm7idmps69pimc9d0mjyakvviy0izm3";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec {
gnome3.dconf gnome3.dconf
pythonPackages.pyxdg pythonPackages.pyxdg
pythonPackages.ptyprocess pythonPackages.ptyprocess
pycairo pythonPackages.pycairo
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -36,6 +36,7 @@ pythonPackages.buildPythonApplication rec {
]; ];
preFixup = '' preFixup = ''
rm "$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.pyc"
for f in \ for f in \
"$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.py" \ "$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.py" \
"$out/share/applications/catfish.desktop" "$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 { }; carddav-util = callPackage ../tools/networking/carddav-util { };
catfish = callPackage ../applications/search/catfish { catfish = callPackage ../applications/search/catfish {
pythonPackages = python3Packages; pythonPackages = python2Packages;
}; };
cava = callPackage ../applications/audio/cava { }; cava = callPackage ../applications/audio/cava { };