* [PATCH 2/8] gnu: Use define-public to export packages.
2016-07-29 8:23 [PATCH 1/8] gnu: qt: Update to 5.6.1-1 David Craven
@ 2016-07-29 8:23 ` David Craven
2016-07-29 15:35 ` Ludovic Courtès
2016-07-29 8:23 ` [PATCH 3/8] gnu: Remove trailing periods from synopsis David Craven
` (7 subsequent siblings)
8 siblings, 1 reply; 35+ messages in thread
From: David Craven @ 2016-07-29 8:23 UTC (permalink / raw)
To: guix-devel; +Cc: David Craven
* gnu/packages/bison.scm (bison): Define public.
* gnu/packages/flex.scm (flex): Define public.
* gnu/packages/pulseaudio.scm (libsndfile, libsamplerate, pulseaudio): Define
public.
* gnu/packages/sdl.scm (sdl, sdl2, libmikmod, sdl-gfx, sdl-image, sdl-mixer,
sdl-net, sdl-ttf): Define public.
* gnu/packages/search.scm (xapian): Remove unnecessary #:export.
* gnu/packages/swig.scm (swig): Define public.
---
gnu/packages/bison.scm | 6 ++----
gnu/packages/flex.scm | 6 ++----
gnu/packages/pulseaudio.scm | 11 ++++-------
gnu/packages/sdl.scm | 26 +++++++++-----------------
gnu/packages/search.scm | 3 +--
gnu/packages/swig.scm | 7 +++----
6 files changed, 21 insertions(+), 38 deletions(-)
diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm
index c8ec8cc..178a99d 100644
--- a/gnu/packages/bison.scm
+++ b/gnu/packages/bison.scm
@@ -24,10 +24,9 @@
#:use-module (gnu packages m4)
#:use-module (gnu packages perl)
#:use-module (gnu packages flex)
- #:use-module (srfi srfi-1)
- #:export (bison))
+ #:use-module (srfi srfi-1))
-(define bison
+(define-public bison
(package
(name "bison")
(version "3.0.4")
@@ -65,4 +64,3 @@ simple tools through complex programming languages.")
(sha256
(base32
"1zd77ilmpv5mi3kr55jrj6ncqlcnyhpianhrwzak2q28cv2cbn23"))))))
-
diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm
index f8d5ccd..20aff19 100644
--- a/gnu/packages/flex.scm
+++ b/gnu/packages/flex.scm
@@ -26,10 +26,9 @@
#:use-module (gnu packages m4)
#:use-module (gnu packages bison)
#:use-module (gnu packages indent)
- #:use-module (srfi srfi-1)
- #:export (flex))
+ #:use-module (srfi srfi-1))
-(define flex
+(define-public flex
(package
(name "flex")
(version "2.6.0")
@@ -79,4 +78,3 @@ regular expressions for each rule. Whenever it finds a match, it
executes the corresponding C code.")
(license (non-copyleft "file://COPYING"
"See COPYING in the distribution."))))
-
diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm
index b2b0508..5d36dbe 100644
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@ -36,12 +36,9 @@
#:use-module (gnu packages linux)
#:use-module (gnu packages m4)
#:use-module (gnu packages pkg-config)
- #:use-module (gnu packages xiph)
- #:export (libsndfile
- libsamplerate
- pulseaudio))
+ #:use-module (gnu packages xiph))
-(define libsndfile
+(define-public libsndfile
(package
(name "libsndfile")
(version "1.0.26")
@@ -74,7 +71,7 @@ SPARC. Hopefully the design of the library will also make it easy to extend
for reading and writing new sound file formats.")
(license l:gpl2+)))
-(define libsamplerate
+(define-public libsamplerate
(package
(name "libsamplerate") ; aka. Secret Rabbit Code (SRC)
(version "0.1.8")
@@ -112,7 +109,7 @@ the theoretical best bandwidth for a given pair of input and output sample
rates.")
(license l:gpl2+)))
-(define pulseaudio
+(define-public pulseaudio
(package
(name "pulseaudio")
(version "8.0")
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 49b9dea..161689b 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -38,17 +38,9 @@
#:use-module (gnu packages gl)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xorg)
- #:export (sdl
- sdl2
- libmikmod
- sdl-gfx
- sdl-image
- sdl-mixer
- sdl-net
- sdl-ttf
- sdl-union))
+ #:export (sdl-union))
-(define sdl
+(define-public sdl
(package
(name "sdl")
(version "1.2.15")
@@ -92,7 +84,7 @@ joystick, and graphics hardware.")
(home-page "http://libsdl.org/")
(license lgpl2.1)))
-(define sdl2
+(define-public sdl2
(package (inherit sdl)
(name "sdl2")
(version "2.0.4")
@@ -106,7 +98,7 @@ joystick, and graphics hardware.")
"0jqp46mxxbh9lhpx1ih6sp93k752j2smhpc0ad0q4cb3px0famfs"))))
(license bsd-3)))
-(define libmikmod
+(define-public libmikmod
(package
(name "libmikmod")
(version "3.3.7")
@@ -131,7 +123,7 @@ system, such as sound redirection over the network.")
(license lgpl2.1)
(home-page "http://mikmod.sourceforge.net/")))
-(define sdl-gfx
+(define-public sdl-gfx
(package
(name "sdl-gfx")
(version "2.0.24")
@@ -155,7 +147,7 @@ other supporting functions for SDL.")
;; MIPS, at least.
(supported-systems '("i686-linux" "x86_64-linux"))))
-(define sdl-image
+(define-public sdl-image
(package
(name "sdl-image")
(version "1.2.12")
@@ -191,7 +183,7 @@ WEBP, XCF, XPM, and XV.")
(home-page "http://www.libsdl.org/projects/SDL_image/")
(license zlib)))
-(define sdl-mixer
+(define-public sdl-mixer
(package
(name "sdl-mixer")
(version "1.2.12")
@@ -229,7 +221,7 @@ MIDI, Ogg Vorbis, and MP3.")
(home-page "http://www.libsdl.org/projects/SDL_mixer/")
(license zlib)))
-(define sdl-net
+(define-public sdl-net
(package
(name "sdl-net")
(version "1.2.8")
@@ -250,7 +242,7 @@ SDL.")
(home-page "http://www.libsdl.org/projects/SDL_net/")
(license zlib)))
-(define sdl-ttf
+(define-public sdl-ttf
(package
(name "sdl-ttf")
(version "2.0.11")
diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index d34d70b..9b01909 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -26,8 +26,7 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages check)
#:use-module (gnu packages databases)
- #:use-module (gnu packages linux)
- #:export (xapian))
+ #:use-module (gnu packages linux))
(define-public xapian
(package
diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm
index 01137d8..096cfd5 100644
--- a/gnu/packages/swig.scm
+++ b/gnu/packages/swig.scm
@@ -26,10 +26,9 @@
#:use-module (gnu packages guile)
#:use-module (gnu packages boost)
#:use-module (gnu packages python)
- #:use-module (gnu packages perl)
- #:export (swig))
+ #:use-module (gnu packages perl))
-(define swig
+(define-public swig
(package
(name "swig")
(version "3.0.5")
@@ -49,7 +48,7 @@
("guile" ,guile-2.0)
("perl" ,perl)))
;; FIXME: reactivate input python as soon as the test failures
- ;; fatal error: Python.h: No such file or directory
+ ;; fatal error: Python.h: No such file or directory
;; # include <Python.h>
;; are fixed.
;; The python part probably never worked and does not seem to
--
2.9.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 2/8] gnu: Use define-public to export packages.
2016-07-29 8:23 ` [PATCH 2/8] gnu: Use define-public to export packages David Craven
@ 2016-07-29 15:35 ` Ludovic Courtès
0 siblings, 0 replies; 35+ messages in thread
From: Ludovic Courtès @ 2016-07-29 15:35 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
David Craven <david@craven.ch> skribis:
> * gnu/packages/bison.scm (bison): Define public.
> * gnu/packages/flex.scm (flex): Define public.
> * gnu/packages/pulseaudio.scm (libsndfile, libsamplerate, pulseaudio): Define
> public.
> * gnu/packages/sdl.scm (sdl, sdl2, libmikmod, sdl-gfx, sdl-image, sdl-mixer,
> sdl-net, sdl-ttf): Define public.
> * gnu/packages/search.scm (xapian): Remove unnecessary #:export.
> * gnu/packages/swig.scm (swig): Define public.
Applied, thanks.
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 3/8] gnu: Remove trailing periods from synopsis.
2016-07-29 8:23 [PATCH 1/8] gnu: qt: Update to 5.6.1-1 David Craven
2016-07-29 8:23 ` [PATCH 2/8] gnu: Use define-public to export packages David Craven
@ 2016-07-29 8:23 ` David Craven
2016-07-29 15:38 ` Ludovic Courtès
2016-07-29 8:23 ` [PATCH 4/8] gnu: freedesktop: Add libinput-minimal David Craven
` (6 subsequent siblings)
8 siblings, 1 reply; 35+ messages in thread
From: David Craven @ 2016-07-29 8:23 UTC (permalink / raw)
To: guix-devel; +Cc: David Craven
* gnu/packages/emacs.scm (emacs-smart-mode-line): Update synopsis.
* gnu/packages/gnustep.scm (wmfire): Update synopsis.
* gnu/packages/haskell.scm (ghc-socks): Update synopsis.
* gnu/packages/kde-frameworks.scm (oxygen-icons): Update synopsis.
* gnu/packages/openstack.scm (python-bandit): Update synopsis.
* gnu/packages/perl.scm (perl-test-trap): Update synopsis.
* gnu/packages/python.scm (python-backports-abc): Update synopsis.
* gnu/packages/ruby.scm (python-cryptography-vectors): Update synopsis.
---
gnu/packages/emacs.scm | 2 +-
gnu/packages/gnustep.scm | 2 +-
gnu/packages/haskell.scm | 2 +-
gnu/packages/kde-frameworks.scm | 2 +-
gnu/packages/openstack.scm | 2 +-
gnu/packages/perl.scm | 2 +-
gnu/packages/python.scm | 6 +++---
gnu/packages/ruby.scm | 3 +--
8 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 61f906d..80086c2 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -1571,7 +1571,7 @@ mode-line.")
(propagated-inputs
`(("emacs-rich-minority" ,emacs-rich-minority)))
(home-page "http://github.com/Malabarba/smart-mode-line")
- (synopsis "Color-coded smart mode-line.")
+ (synopsis "Color-coded smart mode-line")
(description
"Smart Mode Line is a mode-line theme for Emacs. It aims to be easy to
read from small to large monitors by using colors, a prefix feature, and smart
diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm
index 30574fc..888af8d 100644
--- a/gnu/packages/gnustep.scm
+++ b/gnu/packages/gnustep.scm
@@ -244,7 +244,7 @@ display, and can run a user-specified program on mouse click.")
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://www.improbability.net/")
- (synopsis "Display flames to represent CPU usage, memory usage, etc.")
+ (synopsis "Display flames to represent CPU usage, memory usage, etc")
(description
"wmfire is an applet for Window Maker that can monitor the average cpu
load, or individual cpu load on SMP computers. Additionally it can monitor the
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index f411573..87628b5 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -6205,7 +6205,7 @@ extensions.")
`(("ghc-cereal" ,ghc-cereal)
("ghc-network" ,ghc-network)))
(home-page "https://github.com/vincenthz/hs-socks")
- (synopsis "SOCKS proxy (version 5) implementation.")
+ (synopsis "SOCKS proxy (version 5) implementation")
(description
"This library provides a SOCKS proxy (version 5) implementation.")
(license license:bsd-3)))
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index dc7c27e..74fbac2 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -112,6 +112,6 @@ lower level classes for interaction with the X Windowing System.")
`(("extra-cmake-modules" ,extra-cmake-modules)
("qtbase" ,qtbase)))
(home-page "https://community.kde.org/Frameworks")
- (synopsis "Oxygen provides the standard icon theme for the KDE desktop.")
+ (synopsis "Oxygen provides the standard icon theme for the KDE desktop")
(description "Oxygen icon theme for the KDE desktop")
(license license:lgpl3+)))
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index a316af9..6ae1275 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -56,7 +56,7 @@
("python-testscenarios" ,python-testscenarios)
("python-testtools" ,python-testtools)))
(home-page "https://wiki.openstack.org/wiki/Security/Projects/Bandit")
- (synopsis "Security oriented static analyser for python code.")
+ (synopsis "Security oriented static analyser for python code")
(description
"Bandit is a tool designed to find common security issues in Python code.
To do this Bandit processes each file, builds an AST from it, and runs
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 15fea52..8509210 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -5713,7 +5713,7 @@ a minimum of effort.")
`(("perl-test-tester" ,perl-test-tester)
("perl-data-dump" ,perl-data-dump)))
(home-page "http://search.cpan.org/dist/Test-Trap")
- (synopsis "Trap exit codes, exceptions, output, etc.")
+ (synopsis "Trap exit codes, exceptions, output, etc")
(description "This module is primarily (but not exclusively) for use in
test scripts: A block eval configurable and extensible but by default trapping
STDOUT, STDERR, warnings, exceptions, would-be exit codes, and return values
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0a4ceca..b5518b0 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4997,7 +4997,7 @@ connection to each user.")
(inputs
`(("python-setuptools" ,python-setuptools)))
(home-page "https://github.com/cython/backports_abc")
- (synopsis "Backport of additions to the 'collections.abc' module.")
+ (synopsis "Backport of additions to the 'collections.abc' module")
(description
"Python-backports-abc provides a backport of additions to the
'collections.abc' module in Python-3.5.")
@@ -5972,7 +5972,7 @@ responses, rather than doing any computation.")
(native-inputs
`(("python-setuptools" ,python-setuptools)))
(home-page "https://github.com/pyca/cryptography")
- (synopsis "Test vectors for the cryptography package.")
+ (synopsis "Test vectors for the cryptography package")
(description
"This package contains test vectors for the cryptography package.")
;; Distributed under either BSD-3 or ASL2.0
@@ -9271,7 +9271,7 @@ are optionally backed by a C extension built on librdkafka.")
"02wjrpf001gjdjsaxxbzcwfg19crlk2dbddayrfc2v06f53yrcyw"))))
(build-system python-build-system)
(home-page "https://github.com/jquast/wcwidth")
- (synopsis "Measure number of terminal column cells of wide-character codes.")
+ (synopsis "Measure number of terminal column cells of wide-character codes")
(description "Wcwidth measures the number of terminal column cells of
wide-character codes. It is useful for those implementing a terminal emulator,
or programs that carefully produce output to be interpreted by one. It is a
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 877f229..028b82d 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -4050,7 +4050,7 @@ associated records.")
("ruby-minitest-rg" ,ruby-minitest-rg)
("ruby-mocha" ,ruby-mocha)
("ruby-activesupport" ,ruby-activesupport)))
- (synopsis "Test mocks for time-dependent functions.")
+ (synopsis "Test mocks for time-dependent functions")
(description
"Timecop provides \"time travel\" and \"time freezing\" capabilities,
making it easier to test time-dependent code. It provides a unified method to
@@ -4116,4 +4116,3 @@ inspired by Erlang, Clojure, Go, JavaScript, actors and classic concurrency
patterns.")
(home-page "http://www.concurrent-ruby.com")
(license license:expat)))
-
--
2.9.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 3/8] gnu: Remove trailing periods from synopsis.
2016-07-29 8:23 ` [PATCH 3/8] gnu: Remove trailing periods from synopsis David Craven
@ 2016-07-29 15:38 ` Ludovic Courtès
0 siblings, 0 replies; 35+ messages in thread
From: Ludovic Courtès @ 2016-07-29 15:38 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
David Craven <david@craven.ch> skribis:
> * gnu/packages/emacs.scm (emacs-smart-mode-line): Update synopsis.
> * gnu/packages/gnustep.scm (wmfire): Update synopsis.
> * gnu/packages/haskell.scm (ghc-socks): Update synopsis.
> * gnu/packages/kde-frameworks.scm (oxygen-icons): Update synopsis.
> * gnu/packages/openstack.scm (python-bandit): Update synopsis.
> * gnu/packages/perl.scm (perl-test-trap): Update synopsis.
> * gnu/packages/python.scm (python-backports-abc): Update synopsis.
> * gnu/packages/ruby.scm (python-cryptography-vectors): Update synopsis.
Applied except:
> - (synopsis "Display flames to represent CPU usage, memory usage, etc.")
> + (synopsis "Display flames to represent CPU usage, memory usage, etc")
and:
> - (synopsis "Trap exit codes, exceptions, output, etc.")
> + (synopsis "Trap exit codes, exceptions, output, etc")
… where I used another trick. ;-)
Thanks for the cleanup!
Ludo’.
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 4/8] gnu: freedesktop: Add libinput-minimal.
2016-07-29 8:23 [PATCH 1/8] gnu: qt: Update to 5.6.1-1 David Craven
2016-07-29 8:23 ` [PATCH 2/8] gnu: Use define-public to export packages David Craven
2016-07-29 8:23 ` [PATCH 3/8] gnu: Remove trailing periods from synopsis David Craven
@ 2016-07-29 8:23 ` David Craven
2016-07-29 11:25 ` Vincent Legoll
2016-07-29 15:40 ` Ludovic Courtès
2016-07-29 8:23 ` [PATCH 5/8] gnu: xorg: Add xf86-video-qxl David Craven
` (5 subsequent siblings)
8 siblings, 2 replies; 35+ messages in thread
From: David Craven @ 2016-07-29 8:23 UTC (permalink / raw)
To: guix-devel; +Cc: David Craven
* gnu/packages/freedesktop.scm: New variable.
---
gnu/packages/freedesktop.scm | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 458331d..fb7717b 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -86,7 +86,7 @@ freedesktop.org project.")
(source (origin
(method url-fetch)
(uri (string-append "https://freedesktop.org/software/libinput/"
- name "-" version ".tar.xz"))
+ "libinput-" version ".tar.xz"))
(sha256
(base32
"085lcxy111j8r1lwyghsc6zrysqh0vg8xip5axxsdl8r8n3i1vvn"))))
@@ -97,8 +97,8 @@ freedesktop.org project.")
`(("libudev" ,eudev))) ; required by libinput.pc
(inputs
`(("libevdev" ,libevdev)
- ("mtdev" ,mtdev)
- ("libwacom" ,libwacom)))
+ ("libwacom" ,libwacom)
+ ("mtdev" ,mtdev)))
(home-page "https://www.freedesktop.org/wiki/Software/libinput/")
(synopsis "Input devices handling library")
(description
@@ -106,6 +106,16 @@ freedesktop.org project.")
other applications that need to directly deal with input devices.")
(license license:x11)))
+(define-public libinput-minimal
+ (package (inherit libinput)
+ (name "libinput-minimal")
+ (inputs
+ `(("libevdev" ,libevdev)
+ ("mtdev" ,mtdev)))
+ (arguments
+ `(#:configure-flags
+ '("--disable-libwacom")))))
+
(define-public libxdg-basedir
(package
(name "libxdg-basedir")
--
2.9.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 4/8] gnu: freedesktop: Add libinput-minimal.
2016-07-29 8:23 ` [PATCH 4/8] gnu: freedesktop: Add libinput-minimal David Craven
@ 2016-07-29 11:25 ` Vincent Legoll
2016-07-29 12:53 ` David Craven
2016-07-29 15:40 ` Ludovic Courtès
1 sibling, 1 reply; 35+ messages in thread
From: Vincent Legoll @ 2016-07-29 11:25 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
> @@ -97,8 +97,8 @@ freedesktop.org project.")
> `(("libudev" ,eudev))) ; required by libinput.pc
> (inputs
> `(("libevdev" ,libevdev)
> - ("mtdev" ,mtdev)
> - ("libwacom" ,libwacom)))
> + ("libwacom" ,libwacom)
> + ("mtdev" ,mtdev)))
> (home-page "https://www.freedesktop.org/wiki/Software/libinput/")
> (synopsis "Input devices handling library")
> (description
Is this kind of reordering wanted ?
I ask, because this is a major source of unneeded merge conflicts, for
a dubious reason, IMHO.
Or is there a real incentive to do that ?
I know a lot of projects that would simply ask you to resend the patch
without those modifications...
Why not doing it scripted, all at once, a flag-day...
--
Vincent Legoll
^ permalink raw reply [flat|nested] 35+ messages in thread* Re: [PATCH 4/8] gnu: freedesktop: Add libinput-minimal.
2016-07-29 8:23 ` [PATCH 4/8] gnu: freedesktop: Add libinput-minimal David Craven
2016-07-29 11:25 ` Vincent Legoll
@ 2016-07-29 15:40 ` Ludovic Courtès
1 sibling, 0 replies; 35+ messages in thread
From: Ludovic Courtès @ 2016-07-29 15:40 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
David Craven <david@craven.ch> skribis:
> * gnu/packages/freedesktop.scm: New variable.
Applied minus the unwanted changes that Vincent pointed out.
Ludo’.
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 5/8] gnu: xorg: Add xf86-video-qxl.
2016-07-29 8:23 [PATCH 1/8] gnu: qt: Update to 5.6.1-1 David Craven
` (2 preceding siblings ...)
2016-07-29 8:23 ` [PATCH 4/8] gnu: freedesktop: Add libinput-minimal David Craven
@ 2016-07-29 8:23 ` David Craven
2016-07-29 15:42 ` Ludovic Courtès
2016-07-29 8:23 ` [PATCH 6/8] gnu: Order module imports in (gnu packages qemu) alphabetically David Craven
` (4 subsequent siblings)
8 siblings, 1 reply; 35+ messages in thread
From: David Craven @ 2016-07-29 8:23 UTC (permalink / raw)
To: guix-devel; +Cc: David Craven
* gnu/packages/xorg.scm: New variable.
---
gnu/packages/xorg.scm | 36 +++++++++++++++++++++++++++++++++---
1 file changed, 33 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 090f661..b0a6fd6 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -38,6 +38,7 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
@@ -46,13 +47,13 @@
#:use-module (gnu packages image)
#:use-module (gnu packages linux)
#:use-module (gnu packages m4)
+ #:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages spice)
#:use-module (gnu packages xml)
- #:use-module (gnu packages ncurses)
- #:use-module (gnu packages xdisorg)
- #:use-module (gnu packages freedesktop))
+ #:use-module (gnu packages xdisorg))
@@ -3076,6 +3077,35 @@ UniChrome Pro and Chrome9 integrated graphics processors.")
(license license:x11)))
+(define-public xf86-video-qxl
+ (package
+ (name "xf86-video-qxl")
+ (version "0.1.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://xorg/individual/driver/"
+ "xf86-video-qxl-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "018ic9ddxfnjcv2yss0mwk1gq6rmip1hrgi2wxwqkbqx1cpx4yp5"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("fontsproto" ,fontsproto)
+ ("libxfont" ,libxfont)
+ ("spice-protocol" ,spice-protocol)
+ ("xf86dgaproto" ,xf86dgaproto)
+ ("xorg-server" ,xorg-server)
+ ("xproto" ,xproto)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (synopsis "Qxl video driver for X server")
+ (description "xf86-video-qxl is a video driver for the Xorg X server.
+This driver is intended for the spice qxl virtio device.")
+ (home-page "http://www.spice-space.org")
+ (license license:x11)))
+
+
(define-public xf86-video-r128
(package
(name "xf86-video-r128")
--
2.9.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 6/8] gnu: Order module imports in (gnu packages qemu) alphabetically.
2016-07-29 8:23 [PATCH 1/8] gnu: qt: Update to 5.6.1-1 David Craven
` (3 preceding siblings ...)
2016-07-29 8:23 ` [PATCH 5/8] gnu: xorg: Add xf86-video-qxl David Craven
@ 2016-07-29 8:23 ` David Craven
2016-07-29 15:44 ` Ludovic Courtès
2016-07-29 8:23 ` [PATCH 7/8] gnu: qemu: Enable spice support David Craven
` (3 subsequent siblings)
8 siblings, 1 reply; 35+ messages in thread
From: David Craven @ 2016-07-29 8:23 UTC (permalink / raw)
To: guix-devel; +Cc: David Craven
* gnu/packages/qemu.scm: Order module imports alphabetically.
---
gnu/packages/qemu.scm | 67 +++++++++++++++++++++++++--------------------------
1 file changed, 33 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm
index 4d78f9b..6b5a41b 100644
--- a/gnu/packages/qemu.scm
+++ b/gnu/packages/qemu.scm
@@ -19,27 +19,27 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages qemu)
- #:use-module (guix download)
- #:use-module (guix packages)
- #:use-module (guix utils)
- #:use-module ((guix licenses) #:select (gpl2))
- #:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
- #:use-module (gnu packages texinfo)
- #:use-module (gnu packages pkg-config)
- #:use-module (gnu packages glib)
- #:use-module (gnu packages python)
- #:use-module (gnu packages ncurses)
+ #:use-module (gnu packages attr)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages gl)
+ #:use-module (gnu packages glib)
#:use-module (gnu packages image)
- #:use-module (gnu packages attr)
- #:use-module (gnu packages linux)
#:use-module (gnu packages libusb)
- #:use-module (gnu packages xdisorg)
- #:use-module (gnu packages gl)
- #:use-module (gnu packages sdl)
+ #:use-module (gnu packages linux)
+ #:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages sdl)
+ #:use-module (gnu packages texinfo)
+ #:use-module (gnu packages xdisorg)
+ #:use-module (guix build-system gnu)
+ #:use-module (guix download)
+ #:use-module ((guix licenses) #:select (gpl2))
+ #:use-module (guix packages)
+ #:use-module (guix utils)
#:use-module (srfi srfi-1))
(define (qemu-patch commit file-name sha256)
@@ -118,29 +118,28 @@
(string-append "# " all)))
#t)))))
(inputs ; TODO: Add optional inputs.
- `(("sdl" ,sdl)
- ("mesa" ,mesa)
- ("libusb" ,libusb) ;USB pass-through support
-
- ;; ("libaio" ,libaio)
+ `(("alsa-lib" ,alsa-lib)
+ ("attr" ,attr)
("glib" ,glib)
- ("ncurses" ,ncurses)
- ("libpng" ,libpng)
+ ;; ("libaio" ,libaio)
+ ("libattr" ,attr)
+ ("libcap" ,libcap) ; virtfs support requires libcap & libattr
("libjpeg" ,libjpeg-8)
+ ("libpng" ,libpng)
+ ("libusb" ,libusb) ;USB pass-through support
+ ("mesa" ,mesa)
+ ("ncurses" ,ncurses)
+ ;; ("pciutils" ,pciutils)
("pixman" ,pixman)
- ;; ("vde2" ,vde2)
+ ("sdl" ,sdl)
("util-linux" ,util-linux)
- ("libcap" ,libcap) ; virtfs support requires libcap & libattr
- ("libattr" ,attr)
- ;; ("pciutils" ,pciutils)
- ("alsa-lib" ,alsa-lib)
- ("zlib" ,zlib)
- ("attr" ,attr)))
- (native-inputs `(("pkg-config" ,pkg-config)
+ ;; ("vde2" ,vde2)
+ ("zlib" ,zlib)))
+ (native-inputs `(("glib:bin" ,glib "bin") ; gtester, etc.
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
("python" ,python-2) ; incompatible with Python 3 according to error message
- ("glib" ,glib "bin") ; gtester, etc.
- ("texinfo" ,texinfo)
- ("perl" ,perl)))
+ ("texinfo" ,texinfo)))
(home-page "http://www.qemu-project.org")
(synopsis "Machine emulator and virtualizer")
(description
@@ -175,4 +174,4 @@ server and embedded PowerPC, and S390 guests.")
;; Remove dependencies on optional libraries, notably GUI libraries.
(inputs (fold alist-delete (package-inputs qemu)
- '("sdl" "mesa" "libusb")))))
+ '("libusb" "mesa" "sdl")))))
--
2.9.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 7/8] gnu: qemu: Enable spice support.
2016-07-29 8:23 [PATCH 1/8] gnu: qt: Update to 5.6.1-1 David Craven
` (4 preceding siblings ...)
2016-07-29 8:23 ` [PATCH 6/8] gnu: Order module imports in (gnu packages qemu) alphabetically David Craven
@ 2016-07-29 8:23 ` David Craven
2016-07-29 19:10 ` Ludovic Courtès
2016-07-29 8:23 ` [PATCH 8/8] services: Add spice vdagent service David Craven
` (2 subsequent siblings)
8 siblings, 1 reply; 35+ messages in thread
From: David Craven @ 2016-07-29 8:23 UTC (permalink / raw)
To: guix-devel; +Cc: David Craven
* gnu/packages/qemu.scm (qemu): Enable spice.
---
gnu/packages/qemu.scm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm
index 6b5a41b..97642af 100644
--- a/gnu/packages/qemu.scm
+++ b/gnu/packages/qemu.scm
@@ -33,6 +33,7 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages sdl)
+ #:use-module (gnu packages spice)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages xdisorg)
#:use-module (guix build-system gnu)
@@ -91,6 +92,7 @@
,(string-append "--cc=" (which "gcc"))
"--disable-debug-info" ; save build space
"--enable-virtfs" ; just to be sure
+ "--enable-spice"
,(string-append "--prefix=" out)
,@configure-flags))))))
(add-after 'install 'install-info
@@ -132,8 +134,10 @@
;; ("pciutils" ,pciutils)
("pixman" ,pixman)
("sdl" ,sdl)
+ ("spice" ,spice)
("util-linux" ,util-linux)
;; ("vde2" ,vde2)
+ ("virglrenderer" ,virglrenderer)
("zlib" ,zlib)))
(native-inputs `(("glib:bin" ,glib "bin") ; gtester, etc.
("perl" ,perl)
--
2.9.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 8/8] services: Add spice vdagent service.
2016-07-29 8:23 [PATCH 1/8] gnu: qt: Update to 5.6.1-1 David Craven
` (5 preceding siblings ...)
2016-07-29 8:23 ` [PATCH 7/8] gnu: qemu: Enable spice support David Craven
@ 2016-07-29 8:23 ` David Craven
2016-07-29 19:16 ` Ludovic Courtès
2016-07-29 19:20 ` [PATCH 1/8] gnu: qt: Update to 5.6.1-1 Ludovic Courtès
[not found] ` <20160729101510.GA30683@solar>
8 siblings, 1 reply; 35+ messages in thread
From: David Craven @ 2016-07-29 8:23 UTC (permalink / raw)
To: guix-devel; +Cc: David Craven
* gnu/services/spice.scm: New file.
* gnu/packages/spice.scm (spice-vdagent): Set Exec path in
spice-vdagent.desktop.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
---
gnu/local.mk | 1 +
gnu/packages/spice.scm | 5 +++++
gnu/services/spice.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 61 insertions(+)
create mode 100644 gnu/services/spice.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index c789b19..0fce83a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -384,6 +384,7 @@ GNU_SYSTEM_MODULES = \
%D%/services/networking.scm \
%D%/services/shepherd.scm \
%D%/services/herd.scm \
+ %D%/services/spice.scm \
%D%/services/ssh.scm \
%D%/services/web.scm \
%D%/services/xorg.scm \
diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index 1a356b0..1b538fc 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -235,6 +235,11 @@ Internet and from a wide variety of machine architectures.")
(((string-append "\\$\\(mkdir_p\\) \\$\\(DESTDIR\\)"
"\\$\\(localstatedir\\)/run/spice-vdagentd"))
"-$(mkdir_p) $(DESTDIR)$(localstatedir)/run/spice-vdagentd"))
+ #t))
+ (add-after 'unpack 'patch-spice-vdagent.desktop
+ (lambda _
+ (substitute* "data/spice-vdagent.desktop"
+ (("Exec=/usr/bin/spice-vdagent\n") "Exec=spice-vdagent\n"))
#t)))))
(inputs
`(("alsa-lib" ,alsa-lib)
diff --git a/gnu/services/spice.scm b/gnu/services/spice.scm
new file mode 100644
index 0000000..ff8f2a2
--- /dev/null
+++ b/gnu/services/spice.scm
@@ -0,0 +1,55 @@
+(define-module (gnu services spice)
+ #:use-module (gnu packages spice)
+ #:use-module (gnu services)
+ #:use-module (gnu services shepherd)
+ #:use-module (guix gexp)
+ #:use-module (guix records)
+ #:export (spice-vdagent-configuration
+ spice-vdagent-configuration?
+ spice-vdagent-service-type
+ spice-vdagent-service))
+
+(define-record-type* <spice-vdagent-configuration>
+ spice-vdagent-configuration make-spice-vdagent-configuration
+ spice-vdagent-configuration?
+ (spice-vdagent spice-vdagent-configuration-spice-vdagent
+ (default spice-vdagent)))
+
+(define (spice-vdagent-activation config)
+ "Return the activation gexp for CONFIG."
+ #~(mkdir-p "/var/run/spice-vdagentd"))
+
+(define (spice-vdagent-shepherd-service config)
+ "Return a <shepherd-service> for spice-vdagentd with CONFIG."
+ (define spice-vdagent (spice-vdagent-configuration-spice-vdagent config))
+
+ (define spice-vdagentd-command
+ (list
+ #~(string-append #$spice-vdagent "/sbin/spice-vdagentd")
+ "-x"))
+
+ (list
+ (shepherd-service
+ (documentation "Spice vdagentd service")
+ (requirement '(udev))
+ (provision '(spice-vdagentd))
+ (start #~(make-forkexec-constructor #$@spice-vdagentd-command))
+ (stop #~(make-kill-destructor)))))
+
+(define spice-vdagent-service-type
+ (service-type (name 'spice-vdagent)
+ (extensions
+ (list (service-extension shepherd-root-service-type
+ spice-vdagent-shepherd-service)
+ (service-extension activation-service-type
+ spice-vdagent-activation)
+ (service-extension profile-service-type
+ (compose list
+ spice-vdagent-configuration-spice-vdagent))))))
+
+(define* (spice-vdagent-service
+ #:optional (config (spice-vdagent-configuration)))
+ "Start the @command{vdagentd} and @command{vdagent} deamons
+from @var{spice-vdagent} to enable guest window resizing and
+clipboard sharing."
+ (service spice-vdagent-service-type config))
--
2.9.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 8/8] services: Add spice vdagent service.
2016-07-29 8:23 ` [PATCH 8/8] services: Add spice vdagent service David Craven
@ 2016-07-29 19:16 ` Ludovic Courtès
2016-07-29 19:20 ` David Craven
0 siblings, 1 reply; 35+ messages in thread
From: Ludovic Courtès @ 2016-07-29 19:16 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
David Craven <david@craven.ch> skribis:
> * gnu/services/spice.scm: New file.
> * gnu/packages/spice.scm (spice-vdagent): Set Exec path in
> spice-vdagent.desktop.
> * gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
[...]
> --- a/gnu/packages/spice.scm
> +++ b/gnu/packages/spice.scm
> @@ -235,6 +235,11 @@ Internet and from a wide variety of machine architectures.")
> (((string-append "\\$\\(mkdir_p\\) \\$\\(DESTDIR\\)"
> "\\$\\(localstatedir\\)/run/spice-vdagentd"))
> "-$(mkdir_p) $(DESTDIR)$(localstatedir)/run/spice-vdagentd"))
> + #t))
> + (add-after 'unpack 'patch-spice-vdagent.desktop
> + (lambda _
> + (substitute* "data/spice-vdagent.desktop"
> + (("Exec=/usr/bin/spice-vdagent\n") "Exec=spice-vdagent\n"))
What about:
(lambda* (#:key outputs #:allow-other-keys)
(substitute* …
(…
(string-append "Exec=" (assoc-ref outputs "out")
"/bin/spice-vdagent")))
#t)
?
Also, I think this should be a separate patch as it seems to be
unrelated.
> diff --git a/gnu/services/spice.scm b/gnu/services/spice.scm
> new file mode 100644
> index 0000000..ff8f2a2
> --- /dev/null
> +++ b/gnu/services/spice.scm
> @@ -0,0 +1,55 @@
Please add a license header.
> + (list
> + (shepherd-service
> + (documentation "Spice vdagentd service")
> + (requirement '(udev))
> + (provision '(spice-vdagentd))
> + (start #~(make-forkexec-constructor #$@spice-vdagentd-command))
If spice-vdagend produces a PID file, make sure to use #:pid-file here
(there are several examples in the tree), which often provides more
reliable startup notification.
> +(define* (spice-vdagent-service
> + #:optional (config (spice-vdagent-configuration)))
> + "Start the @command{vdagentd} and @command{vdagent} deamons
> +from @var{spice-vdagent} to enable guest window resizing and
> +clipboard sharing."
> + (service spice-vdagent-service-type config))
Could you add documentation to doc/guix.texi under “Services”, either in
an existing subsection or in a new one if that seems appropriate. Make
sure to add one or two sentences to give context, and an @uref link to
the relevant Spice documentation.
Could you send updated patches?
Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 35+ messages in thread* Re: [PATCH 8/8] services: Add spice vdagent service.
2016-07-29 19:16 ` Ludovic Courtès
@ 2016-07-29 19:20 ` David Craven
2016-07-30 10:29 ` David Craven
0 siblings, 1 reply; 35+ messages in thread
From: David Craven @ 2016-07-29 19:20 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
> Also, I think this should be a separate patch as it seems to be
unrelated.
It's related to:
> (service-extension profile-service-type
+ (compose list
+
spice-vdagent-configuration-spice-vdagent))))))
But ok. I'll do it first thing tomorrow =)
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PATCH 8/8] services: Add spice vdagent service.
2016-07-29 19:20 ` David Craven
@ 2016-07-30 10:29 ` David Craven
2016-07-30 22:41 ` Ludovic Courtès
0 siblings, 1 reply; 35+ messages in thread
From: David Craven @ 2016-07-30 10:29 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
> If spice-vdagend produces a PID file, make sure to use #:pid-file here
> (there are several examples in the tree), which often provides more
> reliable startup notification.
I'm passing the -x flag which prevents spice-vdagentd from
daemonizing. I thought that make-forkexec-constructor took care of
setting the correct stdout stderr stdin user process-parent and pid
file automatically. Is that not the way it's intended to be used?
Because otherwise a (system*) call would be enough wouldn't it?
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PATCH 8/8] services: Add spice vdagent service.
2016-07-30 10:29 ` David Craven
@ 2016-07-30 22:41 ` Ludovic Courtès
2016-07-31 18:14 ` David Craven
0 siblings, 1 reply; 35+ messages in thread
From: Ludovic Courtès @ 2016-07-30 22:41 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
David Craven <david@craven.ch> skribis:
>> If spice-vdagend produces a PID file, make sure to use #:pid-file here
>> (there are several examples in the tree), which often provides more
>> reliable startup notification.
>
> I'm passing the -x flag which prevents spice-vdagentd from
> daemonizing. I thought that make-forkexec-constructor took care of
> setting the correct stdout stderr stdin user process-parent and pid
> file automatically. Is that not the way it's intended to be used?
It is, but it can also wait until a PID file is created:
https://www.gnu.org/software/shepherd/manual/html_node/Service-De_002d-and-Constructors.html
HTH!
Ludo’.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PATCH 8/8] services: Add spice vdagent service.
2016-07-30 22:41 ` Ludovic Courtès
@ 2016-07-31 18:14 ` David Craven
2016-08-01 12:01 ` Ludovic Courtès
0 siblings, 1 reply; 35+ messages in thread
From: David Craven @ 2016-07-31 18:14 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
> If spice-vdagend produces a PID file, make sure to use #:pid-file here
> (there are several examples in the tree), which often provides more
> reliable startup notification.
spice-vdagentd doesn't create a pid file itself. [0] [1]
I haven't updated the documentation yet because I'm running into
issues building guix, haven't figured out why yet.
guix environment guix && make
Complains about not finding sqlite3. The pc file is and the libraries
are in the profile, so it might just be guix and nixos getting at it
again. I haven't had time to investigate this further yet.
[0] https://github.com/SPICE/linux-vd_agent/blob/master/data/spice-vdagentd#L43
[1] https://github.com/SPICE/linux-vd_agent/blob/master/data/spice-vdagentd.service#L13
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PATCH 8/8] services: Add spice vdagent service.
2016-07-31 18:14 ` David Craven
@ 2016-08-01 12:01 ` Ludovic Courtès
0 siblings, 0 replies; 35+ messages in thread
From: Ludovic Courtès @ 2016-08-01 12:01 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
David Craven <david@craven.ch> skribis:
>> If spice-vdagend produces a PID file, make sure to use #:pid-file here
>> (there are several examples in the tree), which often provides more
>> reliable startup notification.
>
> spice-vdagentd doesn't create a pid file itself. [0] [1]
OK. In that case, ‘make-forkexec-constructor’ like your patch uses it
is perfect.
> I haven't updated the documentation yet because I'm running into
> issues building guix, haven't figured out why yet.
>
> guix environment guix && make
>
> Complains about not finding sqlite3. The pc file is and the libraries
> are in the profile, so it might just be guix and nixos getting at it
> again. I haven't had time to investigate this further yet.
If you used ./configure -C (to create a cache file), then you probably
have to “rm config.cache” and rerun ./configure.
Otherwise you can post config.log or stop by on IRC for a live debugging
session. :-)
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PATCH 1/8] gnu: qt: Update to 5.6.1-1.
2016-07-29 8:23 [PATCH 1/8] gnu: qt: Update to 5.6.1-1 David Craven
` (6 preceding siblings ...)
2016-07-29 8:23 ` [PATCH 8/8] services: Add spice vdagent service David Craven
@ 2016-07-29 19:20 ` Ludovic Courtès
2016-07-29 19:23 ` David Craven
2016-07-30 8:57 ` Andreas Enge
[not found] ` <20160729101510.GA30683@solar>
8 siblings, 2 replies; 35+ messages in thread
From: Ludovic Courtès @ 2016-07-29 19:20 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
David Craven <david@craven.ch> skribis:
> * gnu/packages/qt.scm (qt): Update to 5.6.1-1.
I think there are 3 patches here: the update, the switch to
‘modify-phases’, and the thing that disables examples. Could you
separate them?
> + (modify-phases %standard-phases
> + (add-after 'configure 'patch-bin-sh
> + (lambda _
> + (substitute* '("qtbase/config.status"
> + "qtbase/configure"
> + "qtbase/mkspecs/features/qt_functions.prf"
> + "qtbase/qmake/library/qmakebuiltins.cpp")
> + (("/bin/sh") (which "sh")))
^
This should be aligned with the ‘u’ of ‘substitute*’.
It seems like these substitutions could be added to the existing ones
int the ‘configure’ phase.
Otherwise LGTM.
Could you send updated patches?
Thank you!
Ludo’.
^ permalink raw reply [flat|nested] 35+ messages in thread* Re: [PATCH 1/8] gnu: qt: Update to 5.6.1-1.
2016-07-29 19:20 ` [PATCH 1/8] gnu: qt: Update to 5.6.1-1 Ludovic Courtès
@ 2016-07-29 19:23 ` David Craven
2016-07-30 8:57 ` Andreas Enge
1 sibling, 0 replies; 35+ messages in thread
From: David Craven @ 2016-07-29 19:23 UTC (permalink / raw)
To: Ludovic Courtès, Andreas Enge; +Cc: guix-devel
Andreas said exactly the same thing!! Wow.
I think he's already taking care of this, our conversation went off
the mailing list...
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PATCH 1/8] gnu: qt: Update to 5.6.1-1.
2016-07-29 19:20 ` [PATCH 1/8] gnu: qt: Update to 5.6.1-1 Ludovic Courtès
2016-07-29 19:23 ` David Craven
@ 2016-07-30 8:57 ` Andreas Enge
2016-07-30 22:44 ` Code formatting Ludovic Courtès
1 sibling, 1 reply; 35+ messages in thread
From: Andreas Enge @ 2016-07-30 8:57 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel, David Craven
On Fri, Jul 29, 2016 at 09:20:48PM +0200, Ludovic Courtès wrote:
> > + (modify-phases %standard-phases
> > + (add-after 'configure 'patch-bin-sh
> > + (lambda _
> > + (substitute* '("qtbase/config.status"
> > + "qtbase/configure"
> > + "qtbase/mkspecs/features/qt_functions.prf"
> > + "qtbase/qmake/library/qmakebuiltins.cpp")
> > + (("/bin/sh") (which "sh")))
> ^
> This should be aligned with the ‘u’ of ‘substitute*’.
I need indentation help again! I thought we either indented like this:
(function 1
2
3)
with the first argument following the procedure name; or like this:
(function
1
2
3)
with the first argument on the next line.
So I misunderstood, and it is actually
(function 1
2
3)
in the first case?
Andreas
^ permalink raw reply [flat|nested] 35+ messages in thread* Code formatting
2016-07-30 8:57 ` Andreas Enge
@ 2016-07-30 22:44 ` Ludovic Courtès
2016-07-31 10:34 ` Danny Milosavljevic
0 siblings, 1 reply; 35+ messages in thread
From: Ludovic Courtès @ 2016-07-30 22:44 UTC (permalink / raw)
To: Andreas Enge; +Cc: guix-devel, David Craven
Andreas Enge <andreas@enge.fr> skribis:
> On Fri, Jul 29, 2016 at 09:20:48PM +0200, Ludovic Courtès wrote:
>> > + (modify-phases %standard-phases
>> > + (add-after 'configure 'patch-bin-sh
>> > + (lambda _
>> > + (substitute* '("qtbase/config.status"
>> > + "qtbase/configure"
>> > + "qtbase/mkspecs/features/qt_functions.prf"
>> > + "qtbase/qmake/library/qmakebuiltins.cpp")
>> > + (("/bin/sh") (which "sh")))
>> ^
>> This should be aligned with the ‘u’ of ‘substitute*’.
>
> I need indentation help again! I thought we either indented like this:
>
> (function 1
> 2
> 3)
Good.
> with the first argument following the procedure name; or like this:
>
> (function
> 1
> 2
> 3)
> with the first argument on the next line.
Works as well, but aligned with ‘f’; the first option is preferred.
> So I misunderstood, and it is actually
> (function 1
> 2
> 3)
> in the first case?
Bad.
See
<https://www.gnu.org/software/guix/manual/html_node/Formatting-Code.html>
and the rest of the code base.
Bonus to whoever posts indentation rules for their favorite editor! :-)
Ludo’.
^ permalink raw reply [flat|nested] 35+ messages in thread* Re: Code formatting
2016-07-30 22:44 ` Code formatting Ludovic Courtès
@ 2016-07-31 10:34 ` Danny Milosavljevic
2016-07-31 10:37 ` Andreas Enge
2016-07-31 10:59 ` Ludovic Courtès
0 siblings, 2 replies; 35+ messages in thread
From: Danny Milosavljevic @ 2016-07-31 10:34 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel, David Craven
> Bonus to whoever posts indentation rules for their favorite editor! :-)
Is there a standalone program that reformats Scheme code to what we want it to be?
It would be best if such a program just automatically normalized all the files for us. There's no reason this needs to stay a degree of freedom where every single person has to manually make sure it's the same regardless.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: Code formatting
2016-07-31 10:34 ` Danny Milosavljevic
@ 2016-07-31 10:37 ` Andreas Enge
2016-07-31 10:59 ` Ludovic Courtès
1 sibling, 0 replies; 35+ messages in thread
From: Andreas Enge @ 2016-07-31 10:37 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: guix-devel, David Craven
On Sun, Jul 31, 2016 at 12:34:12PM +0200, Danny Milosavljevic wrote:
> Is there a standalone program that reformats Scheme code to what we want it to be?
> It would be best if such a program just automatically normalized all the files for us. There's no reason this needs to stay a degree of freedom where every single person has to manually make sure it's the same regardless.
That would be great, especially to run it once over all our source files.
I tend to program by copy-paste, which also pastes random indentation errors
from random packages.
Andreas
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: Code formatting
2016-07-31 10:34 ` Danny Milosavljevic
2016-07-31 10:37 ` Andreas Enge
@ 2016-07-31 10:59 ` Ludovic Courtès
2016-09-11 16:35 ` Andreas Enge
1 sibling, 1 reply; 35+ messages in thread
From: Ludovic Courtès @ 2016-07-31 10:59 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: guix-devel, David Craven
Danny Milosavljevic <dannym@scratchpost.org> skribis:
>> Bonus to whoever posts indentation rules for their favorite editor! :-)
>
> Is there a standalone program that reformats Scheme code to what we want it to be?
There’s Emacs, which can be invoked for batch processing. I’m not sure
what the right incantation is.
Though to me, it sounds more productive to have $EDITOR do the right
thing.
Ludo’.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: Code formatting
2016-07-31 10:59 ` Ludovic Courtès
@ 2016-09-11 16:35 ` Andreas Enge
0 siblings, 0 replies; 35+ messages in thread
From: Andreas Enge @ 2016-09-11 16:35 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
On Sun, Jul 31, 2016 at 12:59:02PM +0200, Ludovic Courtès wrote:
> Danny Milosavljevic <dannym@scratchpost.org> skribis:
> >> Bonus to whoever posts indentation rules for their favorite editor! :-)
> > Is there a standalone program that reformats Scheme code to what we want it to be?
> There’s Emacs, which can be invoked for batch processing. I’m not sure
> what the right incantation is.
>
> Though to me, it sounds more productive to have $EDITOR do the right
> thing.
Well, that would be optimal, but there are so many editors in the wild...
So I still think it would be good to have a batch processor, or at least
a recipe for non-emacs users on which keys to press to obtain correct
indentation, like so (from my vague memory of emacs):
run "emacs module.scm"
press "n" or "arrow down" until you arrive on the package recipe
alternate "tab" and "n" until you arrive at the end of the recipe
press "ctrl-x ctrl-somethingelse"
Also, it might be good to do one commit that fixes all indentations,
since I tend to copy wrongly indented code (from my own and other people's
recipes).
Andreas
^ permalink raw reply [flat|nested] 35+ messages in thread
[parent not found: <20160729101510.GA30683@solar>]