* [PATCH 1/2] gnu: network-manager: Disable failing tests.
@ 2016-03-07 15:32 Andy Wingo
2016-03-07 15:32 ` [PATCH 2/2] gnu: network-manager: Update to 1.0.10 Andy Wingo
2016-03-07 16:30 ` [PATCH 1/2] gnu: network-manager: Disable failing tests Ludovic Courtès
0 siblings, 2 replies; 4+ messages in thread
From: Andy Wingo @ 2016-03-07 15:32 UTC (permalink / raw)
To: guix-devel
* gnu/packages/gnome.scm (network-manager): Disable tests that don't
work in a GuixSD buildroot.
---
gnu/packages/gnome.scm | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d68633e..155d7ad 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4194,6 +4194,19 @@ users.")
(string-append "--with-dhclient=" dhclient)))
#:phases
(modify-phases %standard-phases
+ (add-before 'configure 'pre-configure
+ (lambda _
+ ;; These tests try to test aspects of network-manager's
+ ;; functionality within restricted containers, but they don't
+ ;; cope with being already in the Guix build jail as that jail
+ ;; lacks some features that they would like to proxy over (like
+ ;; a /sys mount).
+ (substitute* '("src/platform/Makefile.in")
+ (("SUBDIRS = tests") ""))
+ (substitute* '("src/tests/Makefile.in")
+ (("\ttest-route-manager-linux") "\t")
+ (("\ttest-route-manager-fake") "\t"))
+ #t))
(add-before 'check 'pre-check
(lambda _
;; For the missing /etc/machine-id.
--
2.6.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] gnu: network-manager: Update to 1.0.10.
2016-03-07 15:32 [PATCH 1/2] gnu: network-manager: Disable failing tests Andy Wingo
@ 2016-03-07 15:32 ` Andy Wingo
2016-03-07 16:31 ` Ludovic Courtès
2016-03-07 16:30 ` [PATCH 1/2] gnu: network-manager: Disable failing tests Ludovic Courtès
1 sibling, 1 reply; 4+ messages in thread
From: Andy Wingo @ 2016-03-07 15:32 UTC (permalink / raw)
To: guix-devel
* gnu/packages/gnome.scm (network-manager): Update to 1.0.10.
(network-manager-applet): Likewise.
---
gnu/packages/gnome.scm | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 155d7ad..66d3df1 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4147,22 +4147,10 @@ Evolution (hence the name), but is now used by other packages as well.")
users.")
(license license:lgpl2.1)))
-(define %network-manager-glib-duplicate-test-patch
- (origin
- (method url-fetch)
- (uri (string-append
- "http://cgit.freedesktop.org/NetworkManager/NetworkManager/"
- "patch/libnm-core/tests/test-general.c"
- "?id=874f455d6d47c5a34ed9861a6710f4b78202e0d6"))
- (file-name "network-manager-glib-duplicate-test.patch")
- (sha256
- (base32
- "1v0vpxzf0p0b1y5lmq8w7rjndp216gr60nbf2dpdz5rgxx3p3ml6"))))
-
(define-public network-manager
(package
(name "network-manager")
- (version "1.0.6")
+ (version "1.0.10")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/NetworkManager/"
@@ -4170,8 +4158,7 @@ users.")
"NetworkManager-" version ".tar.xz"))
(sha256
(base32
- "1galh9j95yw33iv1jj8zz0h88ahx8gm5mqmam7zq9f730cj01siq"))
- (patches (list %network-manager-glib-duplicate-test-patch))))
+ "1g4z2wg036n0njqp8fycrisj46l3yda6pl00l4rg9nfz862cxkqv"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ; 8 MiB of gtk-doc HTML
@@ -4255,7 +4242,7 @@ services.")
(define-public network-manager-applet
(package
(name "network-manager-applet")
- (version "1.0.6")
+ (version "1.0.10")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -4263,7 +4250,7 @@ services.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1yj0m6fb9v12d0di0rfmk3hx1vmygjkiff2c476rf792sbh56kax"))))
+ "1szh5jyijxm6z55irkp5s44pwah0nikss40mx7pvpk38m8zaqidh"))))
(build-system glib-or-gtk-build-system)
(arguments '(#:configure-flags '("--disable-migration")))
(native-inputs
--
2.6.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] gnu: network-manager: Disable failing tests.
2016-03-07 15:32 [PATCH 1/2] gnu: network-manager: Disable failing tests Andy Wingo
2016-03-07 15:32 ` [PATCH 2/2] gnu: network-manager: Update to 1.0.10 Andy Wingo
@ 2016-03-07 16:30 ` Ludovic Courtès
1 sibling, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2016-03-07 16:30 UTC (permalink / raw)
To: Andy Wingo; +Cc: guix-devel
Andy Wingo <wingo@igalia.com> skribis:
> * gnu/packages/gnome.scm (network-manager): Disable tests that don't
> work in a GuixSD buildroot.
Rather “Add 'pre-configure' phase.”
Otherwise LGTM, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] gnu: network-manager: Update to 1.0.10.
2016-03-07 15:32 ` [PATCH 2/2] gnu: network-manager: Update to 1.0.10 Andy Wingo
@ 2016-03-07 16:31 ` Ludovic Courtès
0 siblings, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2016-03-07 16:31 UTC (permalink / raw)
To: Andy Wingo; +Cc: guix-devel
Andy Wingo <wingo@igalia.com> skribis:
> * gnu/packages/gnome.scm (network-manager): Update to 1.0.10.
> (network-manager-applet): Likewise.
Please mention the removal of
‘%network-manager-glib-duplicate-test-patch’.
Otherwise LGTM, thank you!
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-03-07 16:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-07 15:32 [PATCH 1/2] gnu: network-manager: Disable failing tests Andy Wingo
2016-03-07 15:32 ` [PATCH 2/2] gnu: network-manager: Update to 1.0.10 Andy Wingo
2016-03-07 16:31 ` Ludovic Courtès
2016-03-07 16:30 ` [PATCH 1/2] gnu: network-manager: Disable failing tests Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).