alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

Merge pull request #33605 from vbgl/meld-3.18

Browse source 
meld: 3.16.4 -> 3.18.0
This commit is contained in:
Jan Tojnar 2018-01-16 15:17:38 +01:00 • committed by GitHub
commit d02d062c9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/version-management/meld/default.nix
View file

@ -1,18 +1,18 @@
{ stdenv, fetchurl, itstool, python2Packages, intltool, wrapGAppsHook { stdenv, fetchurl, itstool, python3Packages, intltool, wrapGAppsHook
, libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file , libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file
}: }:
let let
minor = "3.16"; minor = "3.18";
version = "${minor}.4"; version = "${minor}.0";
inherit (python2Packages) python buildPythonApplication pycairo pygobject3; inherit (python3Packages) python buildPythonApplication pycairo pygobject3;
in buildPythonApplication rec { in buildPythonApplication rec {
name = "meld-${version}"; name = "meld-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz"; url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";
sha256 = "0rwflfkfnb9ydnk4k591x0il29d4dvz95cjs2f279blx64lgki4k"; sha256 = "0gi2jzgsrd5q2icyp6wphbn532ddg82nxhfxlffkniy7wnqmi0c4";
}; };
buildInputs = [ buildInputs = [
@ -41,6 +41,8 @@ in buildPythonApplication rec {
pythonPath = [ gtk3 ]; pythonPath = [ gtk3 ];
doCheck = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Visual diff and merge tool"; description = "Visual diff and merge tool";
homepage = http://meldmerge.org/; homepage = http://meldmerge.org/;

2
pkgs/applications/version-management/rabbitvcs/default.nix
View file

@ -30,6 +30,8 @@ python2Packages.buildPythonApplication rec {
wrapPythonProgramsIn $cli "$out $pythonPath" wrapPythonProgramsIn $cli "$out $pythonPath"
''; '';
doCheck = false;
meta = { meta = {
description = "Graphical tools for working with version control systems"; description = "Graphical tools for working with version control systems";
homepage = http://rabbitvcs.org/; homepage = http://rabbitvcs.org/;