diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-16 22:49:20 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-16 22:49:20 +0200 |
commit | 2e56ba6fbdd70ed6b9244df816670b9a94da0824 (patch) | |
tree | d166c8c37aae3e2856378b4526cfddb66291466d /pkgs/applications/version-management/meld/default.nix | |
parent | 782b63d06ba886d7093af764c2e3441a5e96ffc2 (diff) | |
parent | cf8643cc8e61b0482c87faf33e6310c4e15bcba1 (diff) | |
download | nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.tar nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.tar.gz nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.tar.bz2 nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.tar.lz nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.tar.xz nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.tar.zst nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/applications/version-management/meld/default.nix')
-rw-r--r-- | pkgs/applications/version-management/meld/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 05db6d964c3a..d5bd24cf9382 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, itstool, python2Packages, intltool, wrapGAppsHook +{ stdenv, fetchurl, itstool, python3Packages, intltool, wrapGAppsHook , libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file }: let - minor = "3.16"; - version = "${minor}.4"; - inherit (python2Packages) python buildPythonApplication pycairo pygobject3; + 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 = "0rwflfkfnb9ydnk4k591x0il29d4dvz95cjs2f279blx64lgki4k"; + sha256 = "0gi2jzgsrd5q2icyp6wphbn532ddg82nxhfxlffkniy7wnqmi0c4"; }; buildInputs = [ @@ -41,6 +41,8 @@ in buildPythonApplication rec { pythonPath = [ gtk3 ]; + doCheck = false; + meta = with stdenv.lib; { description = "Visual diff and merge tool"; homepage = http://meldmerge.org/; |