diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-01-16 15:17:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-16 15:17:38 +0100 |
| commit | d02d062c9bca6cb7e4f4b103dba0e61f9adf28e4 (patch) | |
| tree | ee6a7886140133976661c5654141a250968d3fbd | |
| parent | 02393338dc8852b30f5ea04eb0307c3dc266e424 (diff) | |
| parent | 66a0ac9358de6007b2f91f39c248f44a78716724 (diff) | |
| download | nixpkgs-d02d062c9bca6cb7e4f4b103dba0e61f9adf28e4.tar nixpkgs-d02d062c9bca6cb7e4f4b103dba0e61f9adf28e4.tar.gz nixpkgs-d02d062c9bca6cb7e4f4b103dba0e61f9adf28e4.tar.bz2 nixpkgs-d02d062c9bca6cb7e4f4b103dba0e61f9adf28e4.tar.lz nixpkgs-d02d062c9bca6cb7e4f4b103dba0e61f9adf28e4.tar.xz nixpkgs-d02d062c9bca6cb7e4f4b103dba0e61f9adf28e4.tar.zst nixpkgs-d02d062c9bca6cb7e4f4b103dba0e61f9adf28e4.zip | |
Merge pull request #33605 from vbgl/meld-3.18
meld: 3.16.4 -> 3.18.0
| -rw-r--r-- | pkgs/applications/version-management/meld/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/version-management/rabbitvcs/default.nix | 2 |
2 files changed, 9 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/; diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index 01929655081..2d77a9c3265 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -30,6 +30,8 @@ python2Packages.buildPythonApplication rec { wrapPythonProgramsIn $cli "$out $pythonPath" ''; + doCheck = false; + meta = { description = "Graphical tools for working with version control systems"; homepage = http://rabbitvcs.org/; |