diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2016-06-10 21:52:47 -0300 |
|---|---|---|
| committer | José Romildo Malaquias <malaquias@gmail.com> | 2016-06-11 15:25:59 -0300 |
| commit | 205ec15d1eef46e944b60a2ba1860812997be6e3 (patch) | |
| tree | 1b0c503cef74e02af5c9f2731fb3fab132d0bedc | |
| parent | 47d400a1ccfc1bd98fd6d95f4cf1590f0d427197 (diff) | |
| download | nixpkgs-205ec15d1eef46e944b60a2ba1860812997be6e3.tar nixpkgs-205ec15d1eef46e944b60a2ba1860812997be6e3.tar.gz nixpkgs-205ec15d1eef46e944b60a2ba1860812997be6e3.tar.bz2 nixpkgs-205ec15d1eef46e944b60a2ba1860812997be6e3.tar.lz nixpkgs-205ec15d1eef46e944b60a2ba1860812997be6e3.tar.xz nixpkgs-205ec15d1eef46e944b60a2ba1860812997be6e3.tar.zst nixpkgs-205ec15d1eef46e944b60a2ba1860812997be6e3.zip | |
catfish: 1.4.1 -> 1.4.2
| -rw-r--r-- | pkgs/applications/search/catfish/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix index 795d804038d..bad10a8607a 100644 --- a/pkgs/applications/search/catfish/default.nix +++ b/pkgs/applications/search/catfish/default.nix @@ -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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75fdb3c2ea3..6b3a9f477da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12048,7 +12048,7 @@ in carddav-util = callPackage ../tools/networking/carddav-util { }; catfish = callPackage ../applications/search/catfish { - pythonPackages = python3Packages; + pythonPackages = python2Packages; }; cava = callPackage ../applications/audio/cava { }; |