branch master updated (aa2e989 - ad12c43)
rekado pushed a change to branch master in repository guix. from aa2e989 gnu: linux-libre: Update to 4.0.2. new ad12c43 gnu: gcj: Add $libdir to RUNPATH. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/gcc.scm | 76 +++-- 1 files changed, 42 insertions(+), 34 deletions(-)
01/01: gnu: gcj: Add $libdir to RUNPATH.
rekado pushed a commit to branch master in repository guix. commit ad12c43e972482dc9d38c7214fee751bad290ea7 Author: Ricardo Wurmus ricardo.wur...@mdc-berlin.de Date: Fri May 8 12:36:58 2015 +0200 gnu: gcj: Add $libdir to RUNPATH. * gnu/packages/gcc.scm (gcj)[arguments]: Add build phase to add library output directory to RUNPATH. --- gnu/packages/gcc.scm | 76 +++-- 1 files changed, 42 insertions(+), 34 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 4512e54..b652521 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -415,38 +415,47 @@ Go. It also includes runtime support libraries for these languages.) --enable-languages=java ,@(remove (cut string-match --enable-languages.* ) ,flags -((#:phases phases) - `(alist-cons-after - 'install 'install-javac-and-javap-wrappers - (lambda _ - (let* ((javac (assoc-ref %build-inputs javac.in)) -(ecj(assoc-ref %build-inputs ecj-bootstrap)) -(gcj(assoc-ref %outputs out)) -(gcjbin (string-append gcj /bin/)) -(jvm(string-append gcj /lib/jvm/)) -(target (string-append jvm /bin/javac))) - - (symlink (string-append gcjbin jcf-dump) -(string-append jvm /bin/javap)) - - (copy-file ecj (string-append gcj /share/java/ecj.jar)) - - ;; Create javac wrapper from the template javac.in by - ;; replacing the @VARIABLES@ with paths. - (copy-file javac target) - (patch-shebang target) - (substitute* target - ((@JAVA@) - (string-append jvm /bin/java)) - ((@ECJ_JAR@) - (string-append gcj /share/java/ecj.jar)) - ((@RT_JAR@) - (string-append jvm /jre/lib/rt.jar)) - ((@TOOLS_JAR@) - (string-append jvm /lib/tools.jar))) - (chmod target #o755) - #t)) - (alist-cons-after + ((#:phases phases) +`(modify-phases ,phases + (add-after +'unpack 'add-lib-output-to-rpath +(lambda _ + (substitute* libjava/Makefile.in +((libgcj_bc_dummy_LINK = .* -shared line) + (string-append line -Wl,-rpath=$(libdir))) +((libgcj(_bc)?_la_LDFLAGS = ldflags _) + (string-append ldflags -Wl,-rpath=$(libdir)) + (add-after +'install 'install-javac-and-javap-wrappers +(lambda _ + (let* ((javac (assoc-ref %build-inputs javac.in)) + (ecj(assoc-ref %build-inputs ecj-bootstrap)) + (gcj(assoc-ref %outputs out)) + (gcjbin (string-append gcj /bin/)) + (jvm(string-append gcj /lib/jvm/)) + (target (string-append jvm /bin/javac))) + +(symlink (string-append gcjbin jcf-dump) + (string-append jvm /bin/javap)) + +(copy-file ecj (string-append gcj /share/java/ecj.jar)) + +;; Create javac wrapper from the template javac.in by +;; replacing the @VARIABLES@ with paths. +(copy-file javac target) +(patch-shebang target) +(substitute* target + ((@JAVA@) + (string-append jvm /bin/java)) + ((@ECJ_JAR@) + (string-append gcj /share/java/ecj.jar)) + ((@RT_JAR@) + (string-append jvm /jre/lib/rt.jar)) + ((@TOOLS_JAR@) + (string-append jvm /lib/tools.jar))) +(chmod target #o755) +#t))) + (add-after 'install 'remove-broken-or-conflicting-files (lambda _ (let ((out (assoc-ref %outputs out))) @@ -456,8 +465,7 @@ Go. It also includes runtime support libraries for these languages.) libjawt.so) (find-files (string-append out /bin) .*(c\\+\\+|cpp|g\\+\\+|gcc.*) - #t) -,phases))) + #t (define ecj-bootstrap-4.8 (origin
01/05: nss: Add '%mdns-host-lookup-nss'.
civodul pushed a commit to branch master
in repository guix.
commit 15137a29c23e4beab7641b6c6191fdff9716dea4
Author: Ludovic Courtès l...@gnu.org
Date: Fri May 8 14:59:00 2015 +0200
nss: Add '%mdns-host-lookup-nss'.
* gnu/system/nss.scm (%mdns-host-lookup-nss): New variable.
* doc/guix.texi (Name Service Switch): Document it.
---
doc/guix.texi | 24 +++-
gnu/system/nss.scm | 23 +++
2 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 2d02a04..8e36ce3 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -5180,6 +5180,10 @@ for host names ending in @code{.local}:
(name mdns)
@end example
+Don't worry: the @code{%mdns-host-lookup-nss} variable (see below)
+contains this configuration, so you won't have to type it if all you
+want is to have @code{.local} host lookup working.
+
Note that, in this case, in addition to setting the
@code{name-service-switch} of the @code{operating-system} declaration,
@code{nscd-service} must be told where to find the @code{nss-mdns}
@@ -5207,6 +5211,21 @@ configuration file:
@noindent
@dots{} and then refer to @var{%my-base-services} instead of
@var{%base-services} in the @code{operating-system} declaration.
+Lastly, this relies on the availability of the Avahi service
+(@pxref{Desktop Services, @code{avahi-service}}).
+
+For convenience, the following variables provide typical NSS
+configurations.
+
+@defvr {Scheme Variable} %default-nss
+This is the default name service switch configuration, a
+@code{name-service-switch} object.
+@end defvr
+
+@defvr {Scheme Variable} %mdns-host-lookup-nss
+This is the name service switch configuration with support for host name
+lookup over multicast DNS (mDNS) for host names ending in @code{.local}.
+@end defvr
The reference for name service switch configuration is given below. It
is a direct mapping of the C library's configuration file format, so
@@ -5217,11 +5236,6 @@ not only of adding this warm parenthetic feel that we
like, but also
static checks: you'll know about syntax errors and typos as soon as you
run @command{guix system}.
-@defvr {Scheme Variable} %default-nss
-This is the default name service switch configuration, a
-@code{name-service-switch} object.
-@end defvr
-
@deftp {Data Type} name-service-switch
This is the data type representation the configuration of libc's name
diff --git a/gnu/system/nss.scm b/gnu/system/nss.scm
index ec2d251..f4d2855 100644
--- a/gnu/system/nss.scm
+++ b/gnu/system/nss.scm
@@ -29,6 +29,8 @@
lookup-specification
%default-nss
+%mdns-host-lookup-nss
+
%files
%compat
%dns
@@ -148,6 +150,27 @@
;; Default NSS configuration.
(name-service-switch))
+(define %mdns-host-lookup-nss
+ (name-service-switch
+(hosts (list %files ;first, check /etc/hosts
+
+ ;; If the above did not succeed, try with 'mdns_minimal'.
+ (name-service
+ (name mdns_minimal)
+
+ ;; 'mdns_minimal' is authoritative for '.local'. When it
+ ;; returns not found, no need to try the next methods.
+ (reaction (lookup-specification
+ (not-found = return
+
+ ;; Then fall back to DNS.
+ (name-service
+ (name dns))
+
+ ;; Finally, try with the full 'mdns'.
+ (name-service
+ (name mdns))
+
;;;
;;; Serialization.
03/05: services: Add '%desktop-services'.
civodul pushed a commit to branch master
in repository guix.
commit 4467be213a93bab8f38ad5e4214dc947b8ca0bd1
Author: Ludovic Courtès l...@gnu.org
Date: Fri May 8 15:58:59 2015 +0200
services: Add '%desktop-services'.
* gnu/services/desktop.scm (%desktop-services): New variable.
* doc/guix.texi (Desktop Services): Document it.
---
doc/guix.texi| 23 +++
gnu/services/desktop.scm | 32 +++-
2 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 8e36ce3..7504dea 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -5005,6 +5005,29 @@ usually useful in the context of a ``desktop''
setup---that is, on a
machine running a graphical display server, possibly with graphical user
interfaces, etc.
+To simplify things, the module defines a variable containing the set of
+services that users typically expect on a machine with a graphical
+environment and networking:
+
+@defvr {Scheme Variable} %desktop-services
+This is a list of services that builds upon @var{%base-services} and
+adds or adjust services for a typical ``desktop'' setup.
+
+In particular, it adds a graphical login manager (@pxref{X Window,
+@code{slim-service}}), a network management tool (@pxref{Networking
+Services, @code{wicd-service}}), energy and color management services,
+an NTP client and an SSH server (@pxref{Networking Services}), the Avahi
+daemon, and has the name service switch service configured to be able to
+use @code{nss-mdns} (@pxref{Name Service Switch, mDNS}).
+@end defvr
+
+The @var{%desktop-services} variable can be used as the @code{services}
+field of an @code{operating-system} declaration (@pxref{operating-system
+Reference, @code{services}}).
+
+The actual service definitions provided by @code{(gnu services desktop)}
+are described below.
+
@deffn {Monadic Procedure} dbus-service @var{services} @
[#:dbus @var{dbus}]
Return a service that runs the ``system bus'', using @var{dbus}, with
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 5945f7a..910dc1f 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -19,17 +19,25 @@
(define-module (gnu services desktop)
#:use-module (gnu services)
+ #:use-module (gnu services base)
+ #:use-module (gnu services avahi)
+ #:use-module (gnu services xorg)
+ #:use-module (gnu services networking)
+ #:use-module (gnu services ssh)
#:use-module (gnu system shadow)
#:use-module (gnu packages glib)
#:use-module (gnu packages admin)
#:use-module (gnu packages gnome)
+ #:use-module (gnu packages avahi)
+ #:use-module (gnu packages wicd)
#:use-module (guix monads)
#:use-module (guix store)
#:use-module (guix gexp)
#:use-module (ice-9 match)
#:export (dbus-service
upower-service
-colord-service))
+colord-service
+%desktop-services))
;;; Commentary:
;;;
@@ -267,4 +275,26 @@ site} for more information.
(shell
#~(string-append #$shadow /sbin/nologin)
+(define %desktop-services
+ ;; List of services typically useful for a desktop use case.
+ (cons* (slim-service)
+
+ (avahi-service)
+ (wicd-service)
+ (upower-service)
+ (colord-service)
+ (dbus-service (list avahi wicd upower colord))
+
+ (ntp-service)
+ (lsh-service)
+
+ (map (lambda (mservice)
+;; Provide an nscd ready to use nss-mdns.
+(mlet %store-monad ((service mservice))
+ (if (memq 'nscd (service-provision service))
+ (nscd-service (nscd-configuration)
+#:name-services (list nss-mdns))
+ mservice)))
+ %base-services)))
+
;;; desktop.scm ends here
04/05: doc: Document sessions and ~/.xsession for SLiM.
civodul pushed a commit to branch master
in repository guix.
commit 04e4e6ab51f271298f9a001ba5c8c6ae6426fd64
Author: Ludovic Courtès l...@gnu.org
Date: Fri May 8 16:26:53 2015 +0200
doc: Document sessions and ~/.xsession for SLiM.
* gnu/services/xorg.scm (slim-service): Document session types and
~/.xsession.
* doc/guix.texi (X Window): Adjust accordingly.
---
doc/guix.texi | 13 +
gnu/services/xorg.scm | 13 +
2 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 7504dea..b44811f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -4968,6 +4968,19 @@ Return a service that spawns the SLiM graphical login
manager, which in
turn starts the X display server with @var{startx}, a command as returned by
@code{xorg-start-command}.
+@cindex X session
+
+SLiM automatically looks for session types described by the @file{.desktop}
+files in @file{/run/current-system/profile/share/xsessions} and allows users
+to choose a session from the log-in screen using @kbd{F1}. Packages such as
+@var{xfce}, @var{sawfish}, and @var{ratpoison} provide @file{.desktop} files;
+adding them to the system-wide set of packages automatically makes them
+available at the log-in screen.
+
+In addition, @file{~/.xsession} files are honored. When available,
+@file{~/.xsession} must be an executable that starts a window manager
+and/or other X clients.
+
When @var{allow-empty-passwords?} is true, allow logins with an empty
password. When @var{auto-login?} is true, log in automatically as
@var{default-user}.
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 8fd003f..4821614 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -207,6 +207,19 @@ which should be passed to this script as the first
argument. If not, the
turn starts the X display server with @var{startx}, a command as returned by
@code{xorg-start-command}.
+@cindex X session
+
+SLiM automatically looks for session types described by the @file{.desktop}
+files in @file{/run/current-system/profile/share/xsessions} and allows users
+to choose a session from the log-in screen using @kbd{F1}. Packages such as
+@var{xfce}, @var{sawfish}, and @var{ratpoison} provide @file{.desktop} files;
+adding them to the system-wide set of packages automatically makes them
+available at the log-in screen.
+
+In addition, @file{~/.xsession} files are honored. When available,
+@file{~/.xsession} must be an executable that starts a window manager
+and/or other X clients.
+
When @var{allow-empty-passwords?} is true, allow logins with an empty
password. When @var{auto-login?} is true, log in automatically as
@var{default-user} with @var{auto-login-session}.
branch master updated (ad12c43 - 6b888ef)
iyzsong pushed a change to branch master in repository guix. from ad12c43 gnu: gcj: Add $libdir to RUNPATH. new 6b888ef gnu: Add aisleriot. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/gnome.scm | 36 1 files changed, 36 insertions(+), 0 deletions(-)
05/05: doc: Document 'avahi-service'.
civodul pushed a commit to branch master
in repository guix.
commit 965a7332201af37059bdaf97dc2ec21249bc9d32
Author: Ludovic Courtès l...@gnu.org
Date: Fri May 8 16:33:52 2015 +0200
doc: Document 'avahi-service'.
* gnu/services/avahi.scm (avahi-service): Add URL in docstring.
* doc/guix.texi (Networking Services): Document it.
(Name Service Switch): Fix cross-reference.
---
doc/guix.texi | 26 +-
gnu/services/avahi.scm |2 +-
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index b44811f..e2465ee 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -4952,6 +4952,30 @@ This mechanism can prevent programs running locally,
such as Web
browsers, from accessing Facebook.
@end defvr
+The @code{(gnu services avahi)} provides the following definition.
+
+@deffn {Monadic Procedure} avahi-service [#:avahi @var{avahi}] @
+ [#:host-name #f] [#:publish? #t] [#:ipv4? #t] @
+ [#:ipv6? #t] [#:wide-area? #f] @
+ [#:domains-to-browse '()]
+Return a service that runs @command{avahi-daemon}, a system-wide
+mDNS/DNS-SD responder that allows for service discovery and
+zero-configuration host name lookups (see @uref{http://avahi.org/}).
+
+If @var{host-name} is different from @code{#f}, use that as the host name to
+publish for this machine; otherwise, use the machine's actual host name.
+
+When @var{publish?} is true, publishing of host names and services is allowed;
+in particular, avahi-daemon will publish the machine's host name and IP
+address via mDNS on the local network.
+
+When @var{wide-area?} is true, DNS-SD over unicast DNS is enabled.
+
+Boolean values @var{ipv4?} and @var{ipv6?} determine whether to use IPv4/IPv6
+sockets.
+@end deffn
+
+
@node X Window
@subsubsection X Window
@@ -5248,7 +5272,7 @@ configuration file:
@dots{} and then refer to @var{%my-base-services} instead of
@var{%base-services} in the @code{operating-system} declaration.
Lastly, this relies on the availability of the Avahi service
-(@pxref{Desktop Services, @code{avahi-service}}).
+(@pxref{Networking Services, @code{avahi-service}}).
For convenience, the following variables provide typical NSS
configurations.
diff --git a/gnu/services/avahi.scm b/gnu/services/avahi.scm
index 0a56f3d..a3ca5ab 100644
--- a/gnu/services/avahi.scm
+++ b/gnu/services/avahi.scm
@@ -63,7 +63,7 @@
(domains-to-browse '()))
Return a service that runs @command{avahi-daemon}, a system-wide
mDNS/DNS-SD responder that allows for service discovery and
-\zero-configuration\ host name lookups.
+\zero-configuration\ host name lookups (see @uref{http://avahi.org/}).
If @var{host-name} is different from @code{#f}, use that as the host name to
publish for this machine; otherwise, use the machine's actual host name.
branch master updated (6b888ef - 965a733)
civodul pushed a change to branch master in repository guix. from 6b888ef gnu: Add aisleriot. new 15137a2 nss: Add '%mdns-host-lookup-nss'. new a0dac7a profiles: Ensure the profile's etc/ directory is writable. new 4467be2 services: Add '%desktop-services'. new 04e4e6a doc: Document sessions and ~/.xsession for SLiM. new 965a733 doc: Document 'avahi-service'. The 5 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: doc/guix.texi| 84 +++--- gnu/services/avahi.scm |2 +- gnu/services/desktop.scm | 32 +- gnu/services/xorg.scm| 13 +++ gnu/system/nss.scm | 23 guix/build/profiles.scm | 74 tests/profiles.scm | 29 7 files changed, 235 insertions(+), 22 deletions(-)
01/01: gnu: gimp: Enable Python scripting support.
rekado pushed a commit to branch master in repository guix. commit 9c8bd626a1e531e65ca9d5262924ff027b8a60cf Author: Ricardo Wurmus rek...@elephly.net Date: Fri May 8 09:35:07 2015 +0200 gnu: gimp: Enable Python scripting support. * gnu/packages/gimp.scm (gimp): Enable Python scripting support. --- gnu/packages/gimp.scm |7 +++ 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 25a4169..35c55dc 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -32,6 +32,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages xml) #:use-module (gnu packages photo) + #:use-module (gnu packages python) #:use-module (gnu packages xorg) #:use-module (gnu packages imagemagick)) @@ -127,10 +128,6 @@ buffers.) (base32 0bdj0l7a94jqhjnj40m9rqaf622wj905iximivb55iy98639aanq (build-system gnu-build-system) -(arguments - `(#:configure-flags - ;; We don't have pygtk which seems to be needed for this feature - `(--disable-python))) (inputs `((babl ,babl) (glib ,glib) @@ -141,6 +138,8 @@ buffers.) (exif ,libexif) ;optional, EXIF + XMP support (lcms ,lcms);optional, color management (librsvg ,librsvg) ;optional, SVG support + (python ,python-2) ;optional, Python support + (python2-pygtk ,python2-pygtk) ;optional, Python support (gegl ,gegl))) (native-inputs `((pkg-config ,pkg-config)
branch master updated (9c8bd62 - 85bafc3)
mhw pushed a change to branch master in repository guix. from 9c8bd62 gnu: gimp: Enable Python scripting support. new 85bafc3 gnu: mariadb: Update to 10.0.18. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/databases.scm |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
02/03: gnu: sqlite: Update to 3.8.9.
mhw pushed a commit to branch libtasn1-update in repository guix. commit 26f8c53b5073f9fb211e08bd673a444f2d6ba4f7 Author: Mark H Weaver m...@netris.org Date: Wed May 6 19:16:38 2015 -0400 gnu: sqlite: Update to 3.8.9. * gnu/packages/databases.scm (sqlite): Update to 3.8.9. --- gnu/packages/databases.scm |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 6fcfca0..a0d9f88 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -289,7 +289,7 @@ types are supported, as is encryption.) (define-public sqlite (package (name sqlite) - (version 3.8.8.3) + (version 3.8.9) (source (origin (method url-fetch) ;; TODO: Download from sqlite.org once this bug : @@ -309,7 +309,7 @@ types are supported, as is encryption.) /sqlite-autoconf- numeric-version .tar.gz))) (sha256 (base32 - 04dl53iv5q0srv4jcgjfzsrdzkq6dg1sgmlmpw9lrd4xrmj6jmvl + 18k90bbfvvgc5204nm1hzw0vsj9ygzv7zbq3z6zrya6j5hwvdsvn (build-system gnu-build-system) (inputs `((readline ,readline))) (arguments
01/03: gnu: subversion: Add fix for sqlite-3.8.9.
mhw pushed a commit to branch libtasn1-update
in repository guix.
commit e146f03957dc91cbfb7315e977b5d62f3fd6e8a5
Author: Mark H Weaver m...@netris.org
Date: Thu May 7 05:32:47 2015 -0400
gnu: subversion: Add fix for sqlite-3.8.9.
* gnu/packages/patches/subversion-sqlite-3.8.9-fix.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/version-control.scm (subversion): Add patch.
---
gnu-system.am |1 +
.../patches/subversion-sqlite-3.8.9-fix.patch | 59
gnu/packages/version-control.scm |5 +-
3 files changed, 64 insertions(+), 1 deletions(-)
diff --git a/gnu-system.am b/gnu-system.am
index 95378a7..77c7836 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -544,6 +544,7 @@ dist_patch_DATA =
\
gnu/packages/patches/slim-config.patch \
gnu/packages/patches/slim-sigusr1.patch \
gnu/packages/patches/soprano-find-clucene.patch \
+ gnu/packages/patches/subversion-sqlite-3.8.9-fix.patch \
gnu/packages/patches/superlu-dist-scotchmetis.patch \
gnu/packages/patches/tcsh-fix-autotest.patch \
gnu/packages/patches/teckit-cstdio.patch \
diff --git a/gnu/packages/patches/subversion-sqlite-3.8.9-fix.patch
b/gnu/packages/patches/subversion-sqlite-3.8.9-fix.patch
new file mode 100644
index 000..92d8a85
--- /dev/null
+++ b/gnu/packages/patches/subversion-sqlite-3.8.9-fix.patch
@@ -0,0 +1,59 @@
+This upstream patch (r1672295) is needed to fix a test failure when built
+against sqlite 3.8.9. See:
+
+
https://mail-archives.apache.org/mod_mbox/subversion-dev/201504.mbox/%3c5526d197.6020...@gmx.de%3E
+
+
+r1672295 | rhuijben | 2015-04-09 07:31:12 -0400 (Thu, 09 Apr 2015) | 15 lines
+
+Optimize STMT_SELECT_EXTERNALS_DEFINED when using Sqlite 3.8.9, by
+adding two more rows to the sqlite_stat1 table.
+
+This fixes a test failure in wc-queries-test.c, but actual users most
+likely don't notice a difference as a tablescan on an EXTERNALS tables
+index is not that expensive, given that most working copies don't have
+many externals.
+
+* subversion/libsvn_wc/wc-metadata.sql
+ (STMT_INSTALL_SCHEMA_STATISTICS): Add two rows.
+
+* subversion/tests/libsvn_wc/wc-queries-test.c
+ (test_schema_statistics): Add a dummy externals row to allow
+verifying schema.
+
+Index: subversion/tests/libsvn_wc/wc-queries-test.c
+===
+--- subversion/tests/libsvn_wc/wc-queries-test.c (revision 1672294)
subversion/tests/libsvn_wc/wc-queries-test.c (revision 1672295)
+@@ -927,6 +927,15 @@
+VALUES (1, '', ''),
+NULL, NULL, NULL));
+
++ SQLITE_ERR(
++ sqlite3_exec(sdb,
++ INSERT INTO EXTERNALS (wc_id, local_relpath,
++ parent_relpath, repos_id,
++ presence, kind, def_local_relpath,
++ def_repos_relpath)
++ VALUES (1, 'subdir', '', 1, 'normal', 'dir', '', ''),
++ NULL, NULL, NULL));
++
+ /* These are currently not necessary for query optimization, but it's better
+ to tell Sqlite how we intend to use this table anyway */
+ SQLITE_ERR(
+Index: subversion/libsvn_wc/wc-metadata.sql
+===
+--- subversion/libsvn_wc/wc-metadata.sql (revision 1672294)
subversion/libsvn_wc/wc-metadata.sql (revision 1672295)
+@@ -619,6 +619,11 @@
+ INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('WC_LOCK', 'sqlite_autoindex_WC_LOCK_1', '100 100 1');
+
++INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++('EXTERNALS','sqlite_autoindex_EXTERNALS_1','100 100 1');
++INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++('EXTERNALS','I_EXTERNALS_DEFINED', '100 100 3 1');
++
+ /* sqlite_autoindex_WORK_QUEUE_1 doesn't exist because WORK_QUEUE is
+a INTEGER PRIMARY KEY AUTOINCREMENT table */
+
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 96cab1e..0d153fa 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -547,7 +547,10 @@ property manipulation.)
subversion- version .tar.bz2))
(sha256
(base32
- 0ybmc0yq83jhblp42wdqvn2cryra3sypx8mkxn5b8lq7hilcr68h
+ 0ybmc0yq83jhblp42wdqvn2cryra3sypx8mkxn5b8lq7hilcr68h))
+ (patches
+ (list (search-patch subversion-sqlite-3.8.9-fix.patch)))
+ (patch-flags '(-p0
(build-system gnu-build-system)
(arguments
'(#:phases (alist-cons-after
03/03: gnu: libtasn1: Update to 4.5.
mhw pushed a commit to branch libtasn1-update in repository guix. commit 1a1d0e0cd7a8aeabd51af6641016e19e97546266 Author: Mark H Weaver m...@netris.org Date: Fri May 8 20:22:38 2015 -0400 gnu: libtasn1: Update to 4.5. * gnu/packages/gnutls.scm (libtasn1): Update to 4.5. --- gnu/packages/gnutls.scm |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnutls.scm b/gnu/packages/gnutls.scm index 17cd458..c549ff3 100644 --- a/gnu/packages/gnutls.scm +++ b/gnu/packages/gnutls.scm @@ -39,7 +39,7 @@ (define-public libtasn1 (package (name libtasn1) -(version 4.4) +(version 4.5) (source (origin (method url-fetch) @@ -47,7 +47,7 @@ version .tar.gz)) (sha256 (base32 -0p8c5s1gm3z3nn4s9qc6gs18grbk45mx44byqw2l2qzynjqrsd7q +1nhvnznhg2aqfrfjxc8v008hjlzkh5831jsfahqk89qrw7fbbcw9 (build-system gnu-build-system) (native-inputs `((perl ,perl)
branch libtasn1-update created (now 1a1d0e0)
mhw pushed a change to branch libtasn1-update in repository guix. at 1a1d0e0 gnu: libtasn1: Update to 4.5. This branch includes the following new commits: new e146f03 gnu: subversion: Add fix for sqlite-3.8.9. new 26f8c53 gnu: sqlite: Update to 3.8.9. new 1a1d0e0 gnu: libtasn1: Update to 4.5. The 3 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference.
branch master updated (85bafc3 - 57e95b2)
mhw pushed a change to branch master in repository guix. from 85bafc3 gnu: mariadb: Update to 10.0.18. new cbf71ea gnu: subversion: Add fix for sqlite-3.8.9. new 57e95b2 gnu: sqlite: Update to 3.8.9. The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: gnu-system.am |1 + gnu/packages/databases.scm |4 +- .../patches/subversion-sqlite-3.8.9-fix.patch | 59 gnu/packages/version-control.scm |5 +- 4 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/subversion-sqlite-3.8.9-fix.patch
branch sqlite-update deleted (was 808355c)
mhw pushed a change to branch sqlite-update in repository guix. was 808355c Merge branch 'master' into sqlite-update This change permanently discards the following revisions: discards 808355c Merge branch 'master' into sqlite-update discards c84fd4a gnu: sqlite: Update to 3.8.9. discards b51b555 gnu: subversion: Add fix for sqlite-3.8.9. discards 8cf5582 gnu: mesa: Build gallium drivers for nouveau.
02/02: gnu: sqlite: Update to 3.8.9.
mhw pushed a commit to branch master in repository guix. commit 57e95b261bf316caf784e74dd3f838a6ef59c344 Author: Mark H Weaver m...@netris.org Date: Wed May 6 19:16:38 2015 -0400 gnu: sqlite: Update to 3.8.9. * gnu/packages/databases.scm (sqlite): Update to 3.8.9. --- gnu/packages/databases.scm |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 6fcfca0..a0d9f88 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -289,7 +289,7 @@ types are supported, as is encryption.) (define-public sqlite (package (name sqlite) - (version 3.8.8.3) + (version 3.8.9) (source (origin (method url-fetch) ;; TODO: Download from sqlite.org once this bug : @@ -309,7 +309,7 @@ types are supported, as is encryption.) /sqlite-autoconf- numeric-version .tar.gz))) (sha256 (base32 - 04dl53iv5q0srv4jcgjfzsrdzkq6dg1sgmlmpw9lrd4xrmj6jmvl + 18k90bbfvvgc5204nm1hzw0vsj9ygzv7zbq3z6zrya6j5hwvdsvn (build-system gnu-build-system) (inputs `((readline ,readline))) (arguments
01/02: gnu: subversion: Add fix for sqlite-3.8.9.
mhw pushed a commit to branch master
in repository guix.
commit cbf71ea25ebf4291ce379003f8df9f2dbcc4f3b9
Author: Mark H Weaver m...@netris.org
Date: Thu May 7 05:32:47 2015 -0400
gnu: subversion: Add fix for sqlite-3.8.9.
* gnu/packages/patches/subversion-sqlite-3.8.9-fix.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/version-control.scm (subversion): Add patch.
---
gnu-system.am |1 +
.../patches/subversion-sqlite-3.8.9-fix.patch | 59
gnu/packages/version-control.scm |5 +-
3 files changed, 64 insertions(+), 1 deletions(-)
diff --git a/gnu-system.am b/gnu-system.am
index 95378a7..77c7836 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -544,6 +544,7 @@ dist_patch_DATA =
\
gnu/packages/patches/slim-config.patch \
gnu/packages/patches/slim-sigusr1.patch \
gnu/packages/patches/soprano-find-clucene.patch \
+ gnu/packages/patches/subversion-sqlite-3.8.9-fix.patch \
gnu/packages/patches/superlu-dist-scotchmetis.patch \
gnu/packages/patches/tcsh-fix-autotest.patch \
gnu/packages/patches/teckit-cstdio.patch \
diff --git a/gnu/packages/patches/subversion-sqlite-3.8.9-fix.patch
b/gnu/packages/patches/subversion-sqlite-3.8.9-fix.patch
new file mode 100644
index 000..92d8a85
--- /dev/null
+++ b/gnu/packages/patches/subversion-sqlite-3.8.9-fix.patch
@@ -0,0 +1,59 @@
+This upstream patch (r1672295) is needed to fix a test failure when built
+against sqlite 3.8.9. See:
+
+
https://mail-archives.apache.org/mod_mbox/subversion-dev/201504.mbox/%3c5526d197.6020...@gmx.de%3E
+
+
+r1672295 | rhuijben | 2015-04-09 07:31:12 -0400 (Thu, 09 Apr 2015) | 15 lines
+
+Optimize STMT_SELECT_EXTERNALS_DEFINED when using Sqlite 3.8.9, by
+adding two more rows to the sqlite_stat1 table.
+
+This fixes a test failure in wc-queries-test.c, but actual users most
+likely don't notice a difference as a tablescan on an EXTERNALS tables
+index is not that expensive, given that most working copies don't have
+many externals.
+
+* subversion/libsvn_wc/wc-metadata.sql
+ (STMT_INSTALL_SCHEMA_STATISTICS): Add two rows.
+
+* subversion/tests/libsvn_wc/wc-queries-test.c
+ (test_schema_statistics): Add a dummy externals row to allow
+verifying schema.
+
+Index: subversion/tests/libsvn_wc/wc-queries-test.c
+===
+--- subversion/tests/libsvn_wc/wc-queries-test.c (revision 1672294)
subversion/tests/libsvn_wc/wc-queries-test.c (revision 1672295)
+@@ -927,6 +927,15 @@
+VALUES (1, '', ''),
+NULL, NULL, NULL));
+
++ SQLITE_ERR(
++ sqlite3_exec(sdb,
++ INSERT INTO EXTERNALS (wc_id, local_relpath,
++ parent_relpath, repos_id,
++ presence, kind, def_local_relpath,
++ def_repos_relpath)
++ VALUES (1, 'subdir', '', 1, 'normal', 'dir', '', ''),
++ NULL, NULL, NULL));
++
+ /* These are currently not necessary for query optimization, but it's better
+ to tell Sqlite how we intend to use this table anyway */
+ SQLITE_ERR(
+Index: subversion/libsvn_wc/wc-metadata.sql
+===
+--- subversion/libsvn_wc/wc-metadata.sql (revision 1672294)
subversion/libsvn_wc/wc-metadata.sql (revision 1672295)
+@@ -619,6 +619,11 @@
+ INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('WC_LOCK', 'sqlite_autoindex_WC_LOCK_1', '100 100 1');
+
++INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++('EXTERNALS','sqlite_autoindex_EXTERNALS_1','100 100 1');
++INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
++('EXTERNALS','I_EXTERNALS_DEFINED', '100 100 3 1');
++
+ /* sqlite_autoindex_WORK_QUEUE_1 doesn't exist because WORK_QUEUE is
+a INTEGER PRIMARY KEY AUTOINCREMENT table */
+
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 96cab1e..0d153fa 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -547,7 +547,10 @@ property manipulation.)
subversion- version .tar.bz2))
(sha256
(base32
- 0ybmc0yq83jhblp42wdqvn2cryra3sypx8mkxn5b8lq7hilcr68h
+ 0ybmc0yq83jhblp42wdqvn2cryra3sypx8mkxn5b8lq7hilcr68h))
+ (patches
+ (list (search-patch subversion-sqlite-3.8.9-fix.patch)))
+ (patch-flags '(-p0
(build-system gnu-build-system)
(arguments
'(#:phases (alist-cons-after
branch master updated (965a733 - 9c8bd62)
rekado pushed a change to branch master in repository guix. from 965a733 doc: Document 'avahi-service'. new 9c8bd62 gnu: gimp: Enable Python scripting support. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/gimp.scm |7 +++ 1 files changed, 3 insertions(+), 4 deletions(-)
