* [PATCH] change zsh to shells.scm in POTFILES.in, [PATCH] change gnu packages tcsh to gnu packages shells.
@ 2016-08-03 9:12 ng0
2016-08-03 12:35 ` ng0
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: ng0 @ 2016-08-03 9:12 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 62 bytes --]
This Fixed broken master build.
One typo in commit message.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Change-module-gnu-packages-tcsh-to-gnu-packages-.patch --]
[-- Type: text/x-patch, Size: 2873 bytes --]
From 5c38ff595f03f3afcd8b0f78f3abb2ef7bf2a00f Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Wed, 3 Aug 2016 09:01:56 +0000
Subject: [PATCH 1/2] gnu: Change module (gnu packages tcsh) to (gnu packages
shells).
* Change module (gnu packages tcsh) to (gnu packages shells) in:
* gnu/packages/algebra.scm and
* gnu/packages/boost.scm and
* gnu/packages/maths.scm and
* gnu/packages/tex.scm and
* gnu/packages/vim.scm and.#
---
gnu/packages/algebra.scm | 2 +-
gnu/packages/boost.scm | 2 +-
gnu/packages/maths.scm | 2 +-
gnu/packages/tex.scm | 2 +-
gnu/packages/vim.scm | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 92b4d4c..4fb15c6 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -36,7 +36,7 @@
#:use-module (gnu packages readline)
#:use-module (gnu packages flex)
#:use-module (gnu packages python)
- #:use-module (gnu packages tcsh)
+ #:use-module (gnu packages shells)
#:use-module (gnu packages tex)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xorg)
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index fd8f4e8..8fe8c8e 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -28,7 +28,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages compression)
#:use-module (gnu packages python)
- #:use-module (gnu packages tcsh)
+ #:use-module (gnu packages shells)
#:use-module (gnu packages perl))
(define-public boost
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index ea7575a..fcea0bc 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -79,7 +79,7 @@
#:use-module (gnu packages python)
#:use-module (gnu packages readline)
#:use-module (gnu packages tbb)
- #:use-module (gnu packages tcsh)
+ #:use-module (gnu packages shells)
#:use-module (gnu packages tcl)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages tex)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8501792..9dde8a9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -45,7 +45,7 @@
#:use-module (gnu packages python)
#:use-module (gnu packages qt)
#:use-module (gnu packages ruby)
- #:use-module (gnu packages tcsh)
+ #:use-module (gnu packages shells)
#:use-module (gnu packages base)
#:use-module (gnu packages xorg)
#:use-module (gnu packages xdisorg)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 73433e9..44f94ff 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -26,7 +26,7 @@
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages admin) ; For GNU hostname
- #:use-module (gnu packages tcsh))
+ #:use-module (gnu packages shells))
(define-public vim
(package
--
2.9.2
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-po-packages-Change-zsh.scm-to-shells.scm.patch --]
[-- Type: text/x-patch, Size: 704 bytes --]
From 81f1ac19b11c93bab7f25e227af6976b1ab47567 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Wed, 3 Aug 2016 09:06:14 +0000
Subject: [PATCH 2/2] po: packages: Change zsh.scm to shells.scm.
* po/packages/POTFILES.in (gnu/packages/zsh.scm): Change it to
gnu/packages/shells.scm.
---
po/packages/POTFILES.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/packages/POTFILES.in b/po/packages/POTFILES.in
index 29816f8..f630cd1 100644
--- a/po/packages/POTFILES.in
+++ b/po/packages/POTFILES.in
@@ -58,4 +58,4 @@ gnu/packages/web.scm
gnu/packages/wordnet.scm
gnu/packages/xiph.scm
gnu/packages/zip.scm
-gnu/packages/zsh.scm
+gnu/packages/shells.scm
--
2.9.2
[-- Attachment #4: Type: text/plain, Size: 128 bytes --]
--
♥Ⓐ ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] change zsh to shells.scm in POTFILES.in, [PATCH] change gnu packages tcsh to gnu packages shells.
2016-08-03 9:12 [PATCH] change zsh to shells.scm in POTFILES.in, [PATCH] change gnu packages tcsh to gnu packages shells ng0
@ 2016-08-03 12:35 ` ng0
2016-08-03 14:27 ` Ricardo Wurmus
2016-08-03 15:41 ` Tobias Geerinckx-Rice
2 siblings, 0 replies; 5+ messages in thread
From: ng0 @ 2016-08-03 12:35 UTC (permalink / raw)
To: guix-devel
> This Fixed broken master build.
With fix I mean this issue, thought I append it:
unpacking
'/gnu/store/046j4hidrh89m6b7nsd2flc397ark2s8-guix-latest.tar.gz'...
substitute: updating list of substitutes from
'https://mirror.hydra.gnu.org'...substitute: updating list of
substitutes from 'https://mirror.hydra.gnu.org'... 100.0%
The following derivation will be built:
/gnu/store/62pw0fpbkn87ywlgj878lb8vp55pp40f-guix-latest.drv
process 22871 acquired build slot '/var/guix/offload/192.168.1.198/0'
Cannot open display "default display"
load on machine '192.168.1.198' is 0.0 (normalized: 0.0)
Cannot open display "default display"
Cannot open display "default display"
warning: failed to install locale: Invalid argument
sending 3 store files to '192.168.1.198'...
Cannot open display "default display"
exporting path
`/gnu/store/1jnb2kqa7yxaa3bxdcbi8m2dcnc02fr0-guix-latest-builder'
warning: failed to install locale: Invalid argument
exporting path
`/gnu/store/zjxpgvrkzn9cqldyc537fc8pasgzymyp-guix-source'
exporting path
`/gnu/store/62pw0fpbkn87ywlgj878lb8vp55pp40f-guix-latest.drv'
offloading
'/gnu/store/62pw0fpbkn87ywlgj878lb8vp55pp40f-guix-latest.drv' to
'192.168.1.198'...
@ build-remote
/gnu/store/62pw0fpbkn87ywlgj878lb8vp55pp40f-guix-latest.drv
192.168.1.198
Cannot open display "default display"
warning: failed to install locale: Invalid argument
substitute: updating list of substitutes from
'https://mirror.hydra.gnu.org'...substitute: updating list of
substitutes from 'https://mirror.hydra.gnu.org'... 100.0%
The following derivation will be built:
/gnu/store/62pw0fpbkn87ywlgj878lb8vp55pp40f-guix-latest.drv
@ build-started
/gnu/store/62pw0fpbkn87ywlgj878lb8vp55pp40f-guix-latest.drv -
x86_64-linux
/var/log/guix/drvs/62//pw0fpbkn87ywlgj878lb8vp55pp40f-guix-latest.drv.bz2
copying and compiling to
'/gnu/store/lk77j7fri0sii8q8nm53sdi1z9c0m04v-guix-latest'...
loading... 14.1% of 509 filesBacktrace:
In ice-9/psyntax.scm:
989: 19 [scan ((define-module (gnu packages image) #:use-module
...)) () ...]
279: 18 [scan ((#(syntax-object let # ...) (#) (# #) ...)) ()
...]
In ice-9/eval.scm:
411: 17 [eval # ()]
In ice-9/boot-9.scm:
2951: 16 [define-module* (gnu packages image) #:filename ...]
2926: 15 [resolve-imports ((#) (#) (#) (#) ...)]
2864: 14 [resolve-interface (gnu packages boost) #:select ...]
2789: 13 [#<procedure 84d300 at ice-9/boot-9.scm:2777:4 (name
#:optional autoload version #:key ensure)> # ...]
3065: 12 [try-module-autoload (gnu packages boost) #f]
2401: 11 [save-module-excursion #<procedure 4d7e540 at
ice-9/boot-9.scm:3066:17 ()>]
3085: 10 [#<procedure 4d7e540 at ice-9/boot-9.scm:3066:17 ()>]
In unknown file:
?: 9 [primitive-load-path "gnu/packages/boost" ...]
In ice-9/eval.scm:
505: 8 [#<procedure 79a6a0 at ice-9/eval.scm:499:4 (exp)>
(define-module # # ...)]
In ice-9/psyntax.scm:
1106: 7 [expand-top-sequence ((define-module # # # ...)) ()
((top)) ...]
989: 6 [scan ((define-module (gnu packages boost)
#:use-module ...)) () ...]
279: 5 [scan ((#(syntax-object let # ...) (#) (# #) ...))
() ...]
In ice-9/eval.scm:
411: 4 [eval # ()]
In ice-9/boot-9.scm:
2951: 3 [define-module* (gnu packages boost) #:filename
...]
2926: 2 [resolve-imports ((# # license:) (#) (#) (#)
...)]
2867: 1 [resolve-interface (gnu packages tcsh) #:select
...]
In unknown file:
?: 0 [scm-error misc-error #f ...]
ERROR: In procedure scm-error:
ERROR: no code for module (gnu packages tcsh)
builder for
`/gnu/store/62pw0fpbkn87ywlgj878lb8vp55pp40f-guix-latest.drv' failed
with exit code 1
@ build-failed
/gnu/store/62pw0fpbkn87ywlgj878lb8vp55pp40f-guix-latest.drv - 1 builder
for `/gnu/store/62pw0fpbkn87ywlgj878lb8vp55pp40f-guix-latest.drv' failed
with exit code 1
guix build: error: build failed: build of
`/gnu/store/62pw0fpbkn87ywlgj878lb8vp55pp40f-guix-latest.drv' failed
Cannot open display "default display"
derivation '/gnu/store/62pw0fpbkn87ywlgj878lb8vp55pp40f-guix-latest.drv'
offloaded to '192.168.1.198' failed with exit code 1
guix pull: error: build failed: build of
`/gnu/store/62pw0fpbkn87ywlgj878lb8vp55pp40f-guix-latest.drv' failed
--
♥Ⓐ ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] change zsh to shells.scm in POTFILES.in, [PATCH] change gnu packages tcsh to gnu packages shells.
2016-08-03 9:12 [PATCH] change zsh to shells.scm in POTFILES.in, [PATCH] change gnu packages tcsh to gnu packages shells ng0
2016-08-03 12:35 ` ng0
@ 2016-08-03 14:27 ` Ricardo Wurmus
2016-08-04 19:00 ` ng0
2016-08-03 15:41 ` Tobias Geerinckx-Rice
2 siblings, 1 reply; 5+ messages in thread
From: Ricardo Wurmus @ 2016-08-03 14:27 UTC (permalink / raw)
To: ng0; +Cc: guix-devel
ng0 <ng0@we.make.ritual.n0.is> writes:
> This Fixed broken master build.
>
> One typo in commit message.
Thanks. I pushed the module renaming patch to master as
b7194849ad9d059956d287396a4587a896113d20 after rewording the commit
message.
~~ Ricardo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] change zsh to shells.scm in POTFILES.in, [PATCH] change gnu packages tcsh to gnu packages shells.
2016-08-03 9:12 [PATCH] change zsh to shells.scm in POTFILES.in, [PATCH] change gnu packages tcsh to gnu packages shells ng0
2016-08-03 12:35 ` ng0
2016-08-03 14:27 ` Ricardo Wurmus
@ 2016-08-03 15:41 ` Tobias Geerinckx-Rice
2 siblings, 0 replies; 5+ messages in thread
From: Tobias Geerinckx-Rice @ 2016-08-03 15:41 UTC (permalink / raw)
To: ng0; +Cc: guix-devel, Guix-devel
ng0,
On 2016-08-03 11:12, ng0 wrote:
> This Fixed broken master build.
Grr. Thanks.
Kind regards,
T G-R
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] change zsh to shells.scm in POTFILES.in, [PATCH] change gnu packages tcsh to gnu packages shells.
2016-08-03 14:27 ` Ricardo Wurmus
@ 2016-08-04 19:00 ` ng0
0 siblings, 0 replies; 5+ messages in thread
From: ng0 @ 2016-08-04 19:00 UTC (permalink / raw)
To: Ricardo Wurmus; +Cc: guix-devel
Ricardo Wurmus <rekado@elephly.net> writes:
> ng0 <ng0@we.make.ritual.n0.is> writes:
>
>> This Fixed broken master build.
>>
>> One typo in commit message.
>
> Thanks. I pushed the module renaming patch to master as
> b7194849ad9d059956d287396a4587a896113d20 after rewording the commit
> message.
>
> ~~ Ricardo
>
Second patch part can be considered done with commit
44210f84e274a3dd59da15d7bd2bd5f30f97efb4, which closes this thread.
--
♥Ⓐ ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-08-04 19:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-03 9:12 [PATCH] change zsh to shells.scm in POTFILES.in, [PATCH] change gnu packages tcsh to gnu packages shells ng0
2016-08-03 12:35 ` ng0
2016-08-03 14:27 ` Ricardo Wurmus
2016-08-04 19:00 ` ng0
2016-08-03 15:41 ` Tobias Geerinckx-Rice
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).