diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-12-28 11:29:12 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-01-08 07:37:45 +0000 |
| commit | 31031577c1a0c763ae05f9533d408dcc0ea6e82f (patch) | |
| tree | 12751873b7580b41685cc36f25e806b2503a0837 /pkgs/applications/version-management/meld/default.nix | |
| parent | 63ede30cc403a1a05c462573ce85df63737739f9 (diff) | |
| download | nixpkgs-31031577c1a0c763ae05f9533d408dcc0ea6e82f.tar nixpkgs-31031577c1a0c763ae05f9533d408dcc0ea6e82f.tar.gz nixpkgs-31031577c1a0c763ae05f9533d408dcc0ea6e82f.tar.bz2 nixpkgs-31031577c1a0c763ae05f9533d408dcc0ea6e82f.tar.lz nixpkgs-31031577c1a0c763ae05f9533d408dcc0ea6e82f.tar.xz nixpkgs-31031577c1a0c763ae05f9533d408dcc0ea6e82f.tar.zst nixpkgs-31031577c1a0c763ae05f9533d408dcc0ea6e82f.zip | |
meld: 3.16.4 -> 3.18.0
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 05db6d964c3..d5bd24cf938 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/; |