meld: 3.21.2 -> 3.22.0
This commit is contained in:
parent
ab265225e8
commit
25accd2a11
|
@ -18,13 +18,13 @@
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "meld";
|
pname = "meld";
|
||||||
version = "3.21.2";
|
version = "3.22.0";
|
||||||
|
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "IV+odABTZ5TFllddE6nIfijxjdNyW43/mG2y4pM6cU4=";
|
sha256 = "sha256-P8EHyY7251NY/9Kw0UyF3bSP4UoR6TmpQyL6qo6QxA0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -56,6 +56,10 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
# https://github.com/NixOS/nixpkgs/issues/56943
|
||||||
strictDeps = false;
|
strictDeps = false;
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
patchShebangs meson_shebang_normalisation.py
|
||||||
|
'';
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
updateScript = gnome.updateScript {
|
updateScript = gnome.updateScript {
|
||||||
packageName = pname;
|
packageName = pname;
|
||||||
|
@ -65,7 +69,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Visual diff and merge tool";
|
description = "Visual diff and merge tool";
|
||||||
homepage = "http://meldmerge.org/";
|
homepage = "https://meld.app/";
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
platforms = platforms.linux ++ platforms.darwin;
|
platforms = platforms.linux ++ platforms.darwin;
|
||||||
maintainers = with maintainers; [ jtojnar mimame ];
|
maintainers = with maintainers; [ jtojnar mimame ];
|
||||||
|
|
Loading…
Reference in a new issue