[PATCH 0/4] kdevelop updates

[PATCH 0/4] kdevelop updates

[Thomas Danckaert]

Hi Guix,

This patchseries updates kdevelop & kdevplatform, sets a few more paths in the
kdevelop wrapper, and adds the kdevelop Python plugin.  The kdevelop package
is still a bit rough around the edges (still have to think of a satisfying
solution to the QT_PLUGIN_PATH issues, see
https://lists.gnu.org/archive/html/guix-devel/2016-12/msg00652.html), but
usable.

There is one issue: when I apply this patch series on current master (after
commit e10872c gnu: gpgme: Patch CMake files), `guix build kdevelop` seems to
get stuck after completing the build (at least it doesn't return after running
at ~100%cpu for over 40minutes, with no output).  When I apply the patch
series on commit 4d0a3d8 (system: grub: Load relevant EFI modules on EFI
systems), I don't have this problem.  I'm not sure if this is an issue just on
my system, or not (I upgraded guix-daemon to lastest master, but the problem
remains). Hints on how to investigate this are welcome!

best,

Thomas Danckaert (4):
  gnu: kdevelop: Update to 5.0.3.
  gnu: kdevelop: Set more paths in wrapper script.
  gnu: Add kdev-python.
  gnu: Add python-autopep8.

 gnu/packages/kde.scm    | 68 ++++++++++++++++++++++++++++++++++++++++++-------
 gnu/packages/python.scm | 30 ++++++++++++++++++++++
 2 files changed, 89 insertions(+), 9 deletions(-)

-- 
2.7.4

[PATCH 1/4] gnu: kdevelop: Update to 5.0.3.

[Thomas Danckaert]

* gnu/packages/kde.scm (kdevelop, kdevplatform): Update to 5.0.3.
---
 gnu/packages/kde.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index db8609a..5f227ac 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
+;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -39,7 +39,7 @@
 (define-public kdevelop
   (package
     (name "kdevelop")
-    (version "5.0.2")
+    (version "5.0.3")
     (source
       (origin
         (method url-fetch)
@@ -48,7 +48,7 @@
                             version ".tar.xz"))
         (sha256
          (base32
-          "0rl6csmzf14gf0r0mk7z2lj7cq8fggf5qmlbxq6j68vp2q0pj0cv"))))
+          "00gn2c66pyd9qaa0zhn2lqam0zsg7fbyi13hk32wclxq73y8v98p"))))
     (build-system cmake-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
@@ -145,14 +145,14 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).")
 (define-public kdevplatform
   (package
     (name "kdevplatform")
-    (version "5.0.2")
+    (version "5.0.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/KDE/kdevplatform/archive/v"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1m8c0ixv91diyy9bvq53d4jik4zrnf7bix7clad4ywxnlpcs4ahr"))
+                "1k40wg08iwyswnpbs4bfh4yq38pp0qi78shjh4pf7yfa2kbid30j"))
               (file-name (string-append name "-" version ".tar.gz"))))
     (build-system cmake-build-system)
     (native-inputs
-- 
2.7.4

Re: [PATCH 1/4] gnu: kdevelop: Update to 5.0.3.

[Ludovic Courtès]

Thomas Danckaert <thomas.danckaert@gmail.com> skribis:

> * gnu/packages/kde.scm (kdevelop, kdevplatform): Update to 5.0.3.

Applied, thanks!

[PATCH 2/4] gnu: kdevelop: Set more paths in wrapper script.

[Thomas Danckaert]

* gnu/packages/kde.scm (kdevelop)[arguments]: Add more paths in
 wrap-executable: add "/share" output of kdevplatform and kcmutils to
 $XDG_DATA_DIRS; add "lib/plugins" from user profile to $QT_PLUGIN_PATH.
---
 gnu/packages/kde.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 5f227ac..aef56bb 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -98,15 +98,18 @@
              (let* ((out  (assoc-ref outputs "out"))
                     (kdevplatform (assoc-ref inputs "kdevplatform"))
                     (kio (assoc-ref inputs "kio"))
+                    (kcmutils (assoc-ref inputs "kcmutils"))
                     (qtquickcontrols (assoc-ref inputs "qtquickcontrols"))
                     (qtdeclarative (assoc-ref inputs "qtdeclarative"))
-                    (plugins "/lib/plugins")
+                    (profile "$HOME/.guix-profile")
                     (qml "/qml"))
                (wrap-program (string-append out "/bin/kdevelop")
+                 `("XDG_DATA_DIRS" ":" prefix
+                   ,(map (lambda (s) (string-append s "/share"))
+                         (list profile out kdevplatform kcmutils)))
                  `("QT_PLUGIN_PATH" ":" prefix
-                   (,(string-append out plugins)
-                    ,(string-append kdevplatform plugins)
-                    ,(string-append kio plugins)))
+                   ,(map (lambda (s) (string-append s "/lib/plugins"))
+                         (list profile out kdevplatform kio)))
                  `("QML2_IMPORT_PATH" ":" prefix
                    (,(string-append qtquickcontrols qml)
                     ,(string-append qtdeclarative qml))))))))))
-- 
2.7.4

Re: [PATCH 2/4] gnu: kdevelop: Set more paths in wrapper script.

[Ludovic Courtès]

Thomas Danckaert <thomas.danckaert@gmail.com> skribis:

> * gnu/packages/kde.scm (kdevelop)[arguments]: Add more paths in
>  wrap-executable: add "/share" output of kdevplatform and kcmutils to
>  $XDG_DATA_DIRS; add "lib/plugins" from user profile to $QT_PLUGIN_PATH.

Applied, thanks!

[PATCH 3/4] gnu: Add kdev-python.

[Thomas Danckaert]

* gnu/packages/kde.scm (kdev-python): New variable.
---
 gnu/packages/kde.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index aef56bb..902038f 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -31,6 +31,7 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages llvm)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages qt)
@@ -122,6 +123,52 @@ build systems (CMake, QMake, custom Makefiles) and version control
 software (Git, Subversion, Mercurial, CVS and Bazaar).")
     (license license:lgpl2.1+)))
 
+(define-public kdev-python
+  (package
+    (name "kdev-python")
+    (version "5.0.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "mirror://kde/stable/kdevelop"
+                            "/" version "/src/kdev-python-"
+                            version ".tar.xz"))
+        (sha256
+         (base32
+          "1sh5k3il985f991vzlqdkihn588bz14p5dl7kymwcrgc52cp0h7i"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("extra-cmake-modules" ,extra-cmake-modules)))
+    (inputs
+     `(("kdevplatform" ,kdevplatform)
+       ("python" ,python) ; only supports Python3
+       ("grantlee" ,grantlee)
+       ("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)
+       ("ki18n" ,ki18n)
+       ("karchive" ,karchive)
+       ("kguiaddons" ,kguiaddons)
+       ("knewstuff" ,knewstuff)
+       ("kiconthemes" ,kiconthemes)
+       ("kitemmodels" ,kitemmodels)
+       ("knotifications" ,knotifications)
+       ("knotifyconfig" ,knotifyconfig)
+       ("kparts" ,kparts)
+       ("kcrash" ,kcrash)
+       ("kwindowsystem" ,kwindowsystem)
+       ("threadweaver" ,threadweaver)
+       ("ktexteditor" ,ktexteditor)
+       ("kcmutils" ,kcmutils)
+       ("kdevelop" ,kdevelop)))
+    (arguments
+     `(#:tests? #f)) ; tests fail, require display
+    (home-page "https://kdevelop.org")
+    (synopsis "Python language support for KDevelop")
+    (description "The KDevelop Python plugin provides semantic syntax
+highlighting, code navigation, completion, documentation integration and more
+for Python3 in KDevelop.")
+    (license license:lgpl2.1+)))
+
 (define-public kdevelop-pg-qt
   (package
     (name "kdevelop-pg-qt")
-- 
2.7.4

Re: [PATCH 3/4] gnu: Add kdev-python.

[Ludovic Courtès]

Thomas Danckaert <thomas.danckaert@gmail.com> skribis:

> * gnu/packages/kde.scm (kdev-python): New variable.

[...]

> +    (arguments
> +     `(#:tests? #f)) ; tests fail, require display

Could you check if running Xvfb is enough to run the tests?

Apart from that LGTM!

Thanks,
Ludo’.

Re: [PATCH 3/4] gnu: Add kdev-python.

[Danny Milosavljevic]

On Mon, 16 Jan 2017 22:10:42 +0100
ludo@gnu.org (Ludovic Courtès) wrote:

> Thomas Danckaert <thomas.danckaert@gmail.com> skribis:
> 
> > * gnu/packages/kde.scm (kdev-python): New variable.  
> 
> [...]
> 
> > +    (arguments
> > +     `(#:tests? #f)) ; tests fail, require display  
> 
> Could you check if running Xvfb is enough to run the tests?

To add to that, maybe even (setenv "QT_QPA_PLATFORM" "offscreen") would be enough.

Re: [PATCH 3/4] gnu: Add kdev-python.

[Thomas Danckaert]

From: Danny Milosavljevic <dannym@scratchpost.org>
Subject: Re: [PATCH 3/4] gnu: Add kdev-python.
Date: Mon, 16 Jan 2017 23:39:19 +0100

> On Mon, 16 Jan 2017 22:10:42 +0100
> ludo@gnu.org (Ludovic Courtès) wrote:
>
>>> +    (arguments
>>> +     `(#:tests? #f)) ; tests fail, require display
>>
>> Could you check if running Xvfb is enough to run the tests?
>
> To add to that, maybe even (setenv "QT_QPA_PLATFORM" "offscreen")
> would be enough.

Hi,

setting QT_QPA_PLATFORM doesn't seem to help (looks like the process 
hangs indefinitely on the first test).  Running Xvfb seems to get the 
tests started, but I get a warning

> _XSERVTransmkdir: ERROR: euid != 0,directory /tmp/.X11-unix will not
> be created.

and all 5 tests immediately fail with a dbus-related error like the 
following:

> process 1051: D-Bus library appears to be incorrectly set up; failed
> to read machine uuid: Failed to open "/etc/machine-id": No such file
> or directory See the manual page for dbus-uuidgen to correct this
> issue.
>
>   D-Bus not built with -rdynamic so unable to print a backtrace

Any ideas on how to continue?

cheers,

Thomas

Re: [PATCH 3/4] gnu: Add kdev-python.

[Ludovic Courtès]

Thomas Danckaert <post@thomasdanckaert.be> skribis:

>> process 1051: D-Bus library appears to be incorrectly set up; failed
>> to read machine uuid: Failed to open "/etc/machine-id": No such file
>> or directory See the manual page for dbus-uuidgen to correct this
>> issue.
>>
>>   D-Bus not built with -rdynamic so unable to print a backtrace
>
> Any ideas on how to continue?

Probably:

  (setenv "DBUS_FATAL_WARNINGS" "0")

There are several packages using that.

HTH!

Ludo’.

[PATCH 4/4] gnu: Add python-autopep8.

[Thomas Danckaert]

* gnu/packages/python.scm (python-autopep8, python2-autopep8): New variables.
---
 gnu/packages/python.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index fce6217..78532e1 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4159,6 +4159,36 @@ SQLAlchemy Database Toolkit for Python.")
 (define-public python2-alembic
   (package-with-python2 python-alembic))
 
+(define-public python-autopep8
+  (package
+  (name "python-autopep8")
+  (version "1.2.4")
+  (source
+   (origin
+     (method url-fetch)
+     (uri (pypi-uri "autopep8" version))
+     (sha256
+      (base32
+       "18parm383lfn42a00wklv3qf20p4v277f1x3cn58x019dqk1xqrq"))))
+  (build-system python-build-system)
+  (propagated-inputs
+    `(("python-pep8" ,python-pep8)))
+  (home-page "https://github.com/hhatto/autopep8")
+  (synopsis
+    "Automatically format Python code according to the PEP 8 style
+guide")
+  (description
+    "@code{autopep8} automatically formats Python code to conform to
+the PEP 8 style guide.  It uses the pycodestyle utility to determine
+what parts of the code needs to be formatted.  @code{autopep8} is
+capable of fixing most of the formatting issues that can be reported
+by pycodestyle.")
+  (license (license:non-copyleft
+            "https://github.com/hhatto/autopep8/blob/master/LICENSE"))))
+
+(define-public python2-autopep8
+  (package-with-python2 python-autopep8))
+
 (define-public python-distutils-extra
   (package
     (name "python-distutils-extra")
-- 
2.7.4

Re: [PATCH 4/4] gnu: Add python-autopep8.

[Ludovic Courtès]

Thomas Danckaert <thomas.danckaert@gmail.com> skribis:

> * gnu/packages/python.scm (python-autopep8, python2-autopep8): New variables.

[...]

> +  (synopsis
> +    "Automatically format Python code according to the PEP 8 style
> +guide")

I removed “Automatically” so that it would fit on one line and
committed.

Thank you!

Ludo’.

Graft slowness fixed

[Ludovic Courtès]

Hi Thomas,

Thomas Danckaert <thomas.danckaert@gmail.com> skribis:

> There is one issue: when I apply this patch series on current master (after
> commit e10872c gnu: gpgme: Patch CMake files), `guix build kdevelop` seems to
> get stuck after completing the build (at least it doesn't return after running
> at ~100%cpu for over 40minutes, with no output).  When I apply the patch
> series on commit 4d0a3d8 (system: grub: Load relevant EFI modules on EFI
> systems), I don't have this problem.  I'm not sure if this is an issue just on
> my system, or not (I upgraded guix-daemon to lastest master, but the problem
> remains). Hints on how to investigate this are welcome!

You found a terrrrrible issue that somehow went unnoticed for two weeks!

This cute commit:

  http://git.savannah.gnu.org/cgit/guix.git/commit/?id=d38bc9a9f6feefc465964531520fee5663a12f48

had the effect of disabling caching in the DAG traversal performed by
‘graft-derivation’.  For big DAGs like that of kdevelop, you could
really feel it.  :-)

This is fixed by this one-liner:

  http://git.savannah.gnu.org/cgit/guix.git/commit/?id=90ad5c8836138b7fd4d1bd0243dfa8b30ae0cf21

This other one fixes a related issue that had always been there apparently:

  http://git.savannah.gnu.org/cgit/guix.git/commit/?id=0aeed5e310504a9ef2cf6a2b2a7e76086eb8c2fc

Thanks for the heads-up!

Ludo’.