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

Merge pull request #76183 from romildo/upd.catfish

Browse Source 
catfish: 1.4.10 -> 1.4.11
This commit is contained in:
worldofpeace 2019-12-23 09:12:21 -05:00 committed by GitHub
commit 73a2107bc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/applications/search/catfish/default.nix → pkgs/desktops/xfce/applications/catfish/default.nix
View File

@ -1,21 +1,19 @@
{ stdenv, fetchurl, file, which, intltool, gobject-introspection, { stdenv, fetchurl, file, which, intltool, gobject-introspection,
findutils, xdg_utils, dconf, gtk3, pythonPackages, findutils, xdg_utils, dconf, gtk3, python3Packages,
wrapGAppsHook wrapGAppsHook
}: }:
pythonPackages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
majorver = "1.4";
minorver = "10";
version = "${majorver}.${minorver}";
pname = "catfish"; pname = "catfish";
version = "1.4.11";
src = fetchurl { src = fetchurl {
url = "https://archive.xfce.org/src/apps/${pname}/${majorver}/${pname}-${version}.tar.bz2"; url = "https://archive.xfce.org/src/apps/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "0g9l5sv5d7wmyb23cvpz5mpvjnxiqjh25v9gr5qzhcah202a0wr5"; sha256 = "11fdzz3l5mydscs4a398siphxwr6xf3cfyimr0hgpkg3169syyv1";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pythonPackages.distutils_extra python3Packages.distutils_extra
file file
which which
intltool intltool
@ -26,16 +24,16 @@ pythonPackages.buildPythonApplication rec {
buildInputs = [ buildInputs = [
gtk3 gtk3
dconf dconf
pythonPackages.pyxdg python3Packages.pyxdg
pythonPackages.ptyprocess python3Packages.ptyprocess
pythonPackages.pycairo python3Packages.pycairo
gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
pythonPackages.dbus-python python3Packages.dbus-python
pythonPackages.pygobject3 python3Packages.pygobject3
pythonPackages.pexpect python3Packages.pexpect
xdg_utils xdg_utils
findutils findutils
]; ];

2
pkgs/desktops/xfce/default.nix
View File

@ -56,6 +56,8 @@ lib.makeScope pkgs.newScope (self: with self; {
#### APPLICATIONS #### APPLICATIONS
catfish = callPackage ./applications/catfish { };
gigolo = callPackage ./applications/gigolo { }; gigolo = callPackage ./applications/gigolo { };
mousepad = callPackage ./applications/mousepad { }; mousepad = callPackage ./applications/mousepad { };

1
pkgs/top-level/aliases.nix
View File

@ -61,6 +61,7 @@ mapAliases ({
buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12
bundler_HEAD = bundler; # added 2015-11-15 bundler_HEAD = bundler; # added 2015-11-15
cantarell_fonts = cantarell-fonts; # added 2018-03-03 cantarell_fonts = cantarell-fonts; # added 2018-03-03
catfish = xfce.catfish; # added 2019-12-22
checkbashism = checkbashisms; # added 2016-08-16 checkbashism = checkbashisms; # added 2016-08-16
cide = throw "deprecated in 2019-09-11: abandoned by upstream"; cide = throw "deprecated in 2019-09-11: abandoned by upstream";
cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10

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

@ -18211,8 +18211,6 @@ in
carla = qt5.callPackage ../applications/audio/carla { }; carla = qt5.callPackage ../applications/audio/carla { };
catfish = callPackage ../applications/search/catfish { };
catimg = callPackage ../tools/misc/catimg { }; catimg = callPackage ../tools/misc/catimg { };
catt = python3Packages.callPackage ../applications/video/catt { }; catt = python3Packages.callPackage ../applications/video/catt { };