Merge pull request #33605 from vbgl/meld-3.18

meld: 3.16.4 -> 3.18.0

Changed files
+9 -5
pkgs
applications
version-management
meld
rabbitvcs
+7 -5
pkgs/applications/version-management/meld/default.nix
···
-
{ stdenv, fetchurl, itstool, python2Packages, intltool, wrapGAppsHook
, libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file
}:
let
-
minor = "3.16";
-
version = "${minor}.4";
-
inherit (python2Packages) python buildPythonApplication pycairo pygobject3;
in buildPythonApplication rec {
name = "meld-${version}";
src = fetchurl {
url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";
-
sha256 = "0rwflfkfnb9ydnk4k591x0il29d4dvz95cjs2f279blx64lgki4k";
};
buildInputs = [
···
'';
pythonPath = [ gtk3 ];
meta = with stdenv.lib; {
description = "Visual diff and merge tool";
···
+
{ stdenv, fetchurl, itstool, python3Packages, intltool, wrapGAppsHook
, libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file
}:
let
+
minor = "3.18";
+
version = "${minor}.0";
+
inherit (python3Packages) python buildPythonApplication pycairo pygobject3;
in buildPythonApplication rec {
name = "meld-${version}";
src = fetchurl {
url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";
+
sha256 = "0gi2jzgsrd5q2icyp6wphbn532ddg82nxhfxlffkniy7wnqmi0c4";
};
buildInputs = [
···
'';
pythonPath = [ gtk3 ];
+
+
doCheck = false;
meta = with stdenv.lib; {
description = "Visual diff and merge tool";
+2
pkgs/applications/version-management/rabbitvcs/default.nix
···
wrapPythonProgramsIn $cli "$out $pythonPath"
'';
meta = {
description = "Graphical tools for working with version control systems";
homepage = http://rabbitvcs.org/;
···
wrapPythonProgramsIn $cli "$out $pythonPath"
'';
+
doCheck = false;
+
meta = {
description = "Graphical tools for working with version control systems";
homepage = http://rabbitvcs.org/;