From 44d10b1f722856ab8e9b942804aa7ef33e2ef739 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 15 Jan 2019 14:21:30 +0100 Subject: gnu: Separate Python core packages from the rest. * gnu/packages/python.scm: Move hundreds of package definitions from here... * gnu/packages/python-xyz.scm: ...to this new module. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/ada.scm, gnu/packages/admin.scm, gnu/packages/android.scm, gnu/packages/audio.scm, gnu/packages/backup.scm, gnu/packages/benchmark.scm, gnu/packages/bioinformatics.scm, gnu/packages/bittorrent.scm, gnu/packages/calendar.scm, gnu/packages/check.scm, gnu/packages/chemistry.scm, gnu/packages/cluster.scm, gnu/packages/compression.scm, gnu/packages/connman.scm, gnu/packages/crypto.scm, gnu/packages/cups.scm, gnu/packages/databases.scm, gnu/packages/dav.scm, gnu/packages/direct-connect.scm, gnu/packages/disk.scm, gnu/packages/django.scm, gnu/packages/dlang.scm, gnu/packages/docker.scm, gnu/packages/ebook.scm, gnu/packages/elf.scm, gnu/packages/emacs.scm, gnu/packages/emulators.scm, gnu/packages/engineering.scm, gnu/packages/enlightenment.scm, gnu/packages/finance.scm, gnu/packages/fltk.scm, gnu/packages/fontutils.scm, gnu/packages/freedesktop.scm, gnu/packages/game-development.scm, gnu/packages/games.scm, gnu/packages/geo.scm, gnu/packages/gl.scm, gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/graph.scm, gnu/packages/graphics.scm, gnu/packages/graphviz.scm, gnu/packages/gtk.scm, gnu/packages/ham-radio.scm, gnu/packages/image-processing.scm, gnu/packages/image-viewers.scm, gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/jrnl.scm, gnu/packages/julia.scm, gnu/packages/kde-frameworks.scm, gnu/packages/key-mon.scm, gnu/packages/libffi.scm, gnu/packages/libreoffice.scm, gnu/packages/libusb.scm, gnu/packages/lirc.scm, gnu/packages/logging.scm, gnu/packages/machine-learning.scm, gnu/packages/mail.scm, gnu/packages/mate.scm, gnu/packages/maths.scm, gnu/packages/medical.scm, gnu/packages/messaging.scm, gnu/packages/monitoring.scm, gnu/packages/mp3.scm, gnu/packages/mpd.scm, gnu/packages/music.scm, gnu/packages/networking.scm, gnu/packages/nutrition.scm, gnu/packages/openldap.scm, gnu/packages/openstack.scm, gnu/packages/package-management.scm, gnu/packages/password-utils.scm, gnu/packages/patchutils.scm, gnu/packages/pdf.scm, gnu/packages/photo.scm, gnu/packages/polkit.scm, gnu/packages/protobuf.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/qt.scm, gnu/packages/rdf.scm, gnu/packages/ruby.scm, gnu/packages/search.scm, gnu/packages/selinux.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/simulation.scm, gnu/packages/ssh.scm, gnu/packages/statistics.scm, gnu/packages/storage.scm, gnu/packages/sync.scm, gnu/packages/terminals.scm, gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tls.scm, gnu/packages/tor.scm, gnu/packages/tryton.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/virtualization.scm, gnu/packages/vpn.scm, gnu/packages/web-browsers.scm, gnu/packages/web.scm, gnu/packages/wicd.scm, gnu/packages/xdisorg.scm, gnu/packages/xorg.scm: Update module references. --- gnu/packages/patchutils.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/patchutils.scm') diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index b655399345..ea4705507f 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -37,6 +37,7 @@ (define-module (gnu packages patchutils) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages version-control) #:use-module (gnu packages xml)) -- cgit v1.2.3 From be0be3dee0ec30b9b00a223deedfe1b877b829ee Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 16 Jan 2019 10:40:39 +0100 Subject: gnu: Add meld. * gnu/packages/patchutils.scm (meld): New variable. --- gnu/packages/patchutils.scm | 68 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) (limited to 'gnu/packages/patchutils.scm') diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index ea4705507f..09f5afbb28 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -19,6 +19,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages patchutils) + #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix licenses) #:use-module (guix download) @@ -29,9 +30,13 @@ (define-module (gnu packages patchutils) #:use-module (gnu packages ed) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages check) #:use-module (gnu packages file) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gtk) #:use-module (gnu packages less) #:use-module (gnu packages mail) #:use-module (gnu packages ncurses) @@ -121,7 +126,7 @@ (define-public quilt (lambda _ (substitute* '("test/run" - "test/edit.test") + "test/edit.test") (("/bin/sh") (which "sh"))) #t)) (add-after 'install 'wrap-program @@ -239,3 +244,64 @@ (define-public vbindiff highlight the differences between them. It works well with large files (up to 4 GiB).") (license gpl2+))) + +(define-public meld + (package + (name "meld") + (version "3.20.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/meld/" + (version-major+minor version) + "/meld-" version ".tar.xz")) + (sha256 + (base32 + "11khi1sg02k3b9qdag3r939cwi27cql4kjim7jhxf9ckfhpzwh6b")))) + (build-system python-build-system) + (native-inputs + `(("intltool" ,intltool) + ("xmllint" ,libxml2) + ("glib-compile-schemas" ,glib "bin") + ("python-pytest" ,python-pytest))) + (inputs + `(("python-cairo" ,python-pycairo) + ("python-gobject" ,python-pygobject) + ("gtksourceview" ,gtksourceview))) + (propagated-inputs + `(("dconf" ,dconf))) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; This setup.py script does not support one of the Python build + ;; system's default flags, "--single-version-externally-managed". + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "python" "setup.py" + ;; This setup.py runs gtk-update-icon-cache which we don't want. + "--no-update-icon-cache" + ;; "--no-compile-schemas" + "install" + (string-append "--prefix=" (assoc-ref outputs "out")) + "--root=/"))) + ;; The tests need to be run after installation. + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Tests look for installed package + (add-installed-pythonpath inputs outputs) + ;; The tests fail when HOME=/homeless-shelter. + (setenv "HOME" "/tmp") + (invoke "py.test" "-v" "-k" + ;; TODO: Those tests fail, why? + "not test_classify_change_actions")))))) + (home-page "https://meldmerge.org/") + (synopsis "Compare files, directories and working copies") + (description "Meld is a visual diff and merge tool targeted at +developers. Meld helps you compare files, directories, and version controlled +projects. It provides two- and three-way comparison of both files and +directories, and has support for many popular version control systems. + +Meld helps you review code changes and understand patches. It might even help +you to figure out what is going on in that merge you keep avoiding.") + (license gpl2))) -- cgit v1.2.3