diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2022-06-26 16:38:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-26 16:38:57 -0500 |
| commit | b861459f18c500f735dd1150f0b1eb504c877faa (patch) | |
| tree | b051853f82bf4feb074ad0f678280d1f4dff8a3c | |
| parent | 94acd826b8bdf73842e02dba472226a924167366 (diff) | |
| parent | 2b67d5995285d532e434a9cb2f6aa7414e35423c (diff) | |
Merge pull request #179079 from k3a/diffuse
diffuse: init at 0.7.5
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/misc/diffuse/default.nix | 68 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 76 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8ca06ace33780..e16266061af80 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6520,6 +6520,12 @@ githubId = 66669; name = "Jeff Zellner"; }; + k3a = { + email = "git+nix@catmail.app"; + name = "Mario Hros"; + github = "k3a"; + githubId = 966992; + }; k4leg = { name = "k4leg"; email = "python.bogdan@gmail.com"; diff --git a/pkgs/applications/misc/diffuse/default.nix b/pkgs/applications/misc/diffuse/default.nix new file mode 100644 index 0000000000000..fb1646dbbcca5 --- /dev/null +++ b/pkgs/applications/misc/diffuse/default.nix @@ -0,0 +1,68 @@ +{ lib, gitUpdater +, fetchFromGitHub +, meson +, ninja +, gettext +, wrapGAppsHook +, gobject-introspection +, pango +, gdk-pixbuf +, python3 +, atk +}: + +python3.pkgs.buildPythonApplication rec { + pname = "diffuse"; + version = "0.7.5"; + + src = fetchFromGitHub { + owner = "MightyCreak"; + repo = "diffuse"; + rev = "v${version}"; + sha256 = "0nd1fyl40wyc98jclcxv8zlnm744lrr51fahh5h9v4ksk184h4z8"; + }; + + format = "other"; + + nativeBuildInputs = [ + wrapGAppsHook + meson + ninja + gettext + gobject-introspection + ]; + + buildInputs = [ + gobject-introspection + pango + gdk-pixbuf + atk + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pycairo + pygobject3 + ]; + + mesonFlags = [ + "-Db_ndebug=true" + ]; + + # to avoid running gtk-update-icon-cache, update-desktop-database and glib-compile-schemas + DESTDIR = "/"; + + passthru = { + updateScript = gitUpdater { + inherit pname version; + rev-prefix = "v"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/MightyCreak/diffuse"; + description = "Graphical tool for merging and comparing text files"; + license = licenses.gpl2; + maintainers = with maintainers; [ k3a ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8c48f0414c18..6b396cf561893 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28862,6 +28862,8 @@ with pkgs; diff-pdf = callPackage ../applications/misc/diff-pdf { wxGTK = wxGTK31; }; + diffuse = callPackage ../applications/misc/diffuse { }; + mlocate = callPackage ../tools/misc/mlocate { }; plocate = callPackage ../tools/misc/plocate { }; |