Re: [PATCH] fix idris (was "Re: Incomplete work to upgrade Idris to 1.2.0")

2018-03-07 Thread Alex ter Weele
My mistake, here's the patch. Let me know if this should be broken up
further.

>From f31cd301804b6fc3dbf345a9e37d20814cd407ae Mon Sep 17 00:00:00 2001
From: Alex ter Weele 
Date: Tue, 6 Mar 2018 19:32:05 -0600
Subject: [PATCH] gnu: idris: fix package.

* gnu/packages/idris.scm (ghc-aeson-1.1.2.0, ghc-cheapskate-0.1.0.5,
  ghc-trifecta-1.6.2.1) new variables. (idris) [inputs] alphebetize
  ghc-vector-binary-instances and ghc-async. Use ghc-aeson-1.1.2.0,
  ghc-cheapskate-0.1.0.5, and ghc-trifecta-1.6.2.1. Remove ghc-aeson,
  ghc-cheapskate, ghc-parsers, ghc-tasty, ghc-tasty-golden, ghc-tasty-rerun,
  ghc-trifecta, and ghc-zlib.
---
 gnu/packages/idris.scm | 63 +-
 1 file changed, 52 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm
index 6eb940c9d..633b8b9d5 100644
--- a/gnu/packages/idris.scm
+++ b/gnu/packages/idris.scm
@@ -30,6 +30,52 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages))
 
+(define ghc-aeson-1.1.2.0
+  (package (inherit ghc-aeson)
+(version "1.1.2.0")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ "https://hackage.haskell.org/package/aeson/aeson-";
+ version
+ ".tar.gz"))
+   (sha256
+(base32
+ "1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p"))
+
+(define ghc-trifecta-1.6.2.1
+  (package (inherit ghc-trifecta)
+(version "1.6.2.1")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ "https://hackage.haskell.org/package/trifecta/";
+ "trifecta-" version ".tar.gz"))
+   (sha256
+(base32
+ "1rgv62dlmm4vkdymx5rw5jg3w8ifpzg1745rvs1m4kzdx16p5cxs"))
+
+;; ghc-cheapskate appeared too new. This follows LTS Haskell.
+(define ghc-cheapskate-0.1.0.5
+  (package
+(inherit ghc-cheapskate)
+(version "0.1.0.5")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ "https://hackage.haskell.org/package/cheapskate/cheapskate-";
+ version
+ ".tar.gz"))
+   (sha256
+(base32
+ "0cpsmfx5z2xykg71sv8j7pl8ga6pzyjnjdb9bxn00vcpqkzvfqvs"
+(arguments
+ ;; LTS Haskell says data-default >=0.5 && <0.8
+ `(#:configure-flags (list "--allow-newer=data-default")
+
 (define-public idris
   (package
 (name "idris")
@@ -46,15 +92,15 @@
 (inputs
  `(("gmp" ,gmp)
("ncurses" ,ncurses)
-   ("ghc-aeson" ,ghc-aeson)
-   ("ghc-async" ,ghc-async)
+   ("ghc-aeson" ,ghc-aeson-1.1.2.0)
("ghc-annotated-wl-pprint" ,ghc-annotated-wl-pprint)
("ghc-ansi-terminal" ,ghc-ansi-terminal)
("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint)
+   ("ghc-async" ,ghc-async)
("ghc-base64-bytestring" ,ghc-base64-bytestring)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-blaze-markup" ,ghc-blaze-markup)
-   ("ghc-cheapskate" ,ghc-cheapskate)
+   ("ghc-cheapskate" ,ghc-cheapskate-0.1.0.5)
("ghc-code-page" ,ghc-code-page)
("ghc-fingertree" ,ghc-fingertree)
("ghc-fsnotify" ,ghc-fsnotify)
@@ -62,23 +108,18 @@
("ghc-mtl" ,ghc-mtl)
("ghc-network" ,ghc-network)
("ghc-optparse-applicative" ,ghc-optparse-applicative)
-   ("ghc-parsers" ,ghc-parsers)
("ghc-regex-tdfa" ,ghc-regex-tdfa)
("ghc-safe" ,ghc-safe)
("ghc-split" ,ghc-split)
-   ("ghc-tasty" ,ghc-tasty)
-   ("ghc-tasty-golden" ,ghc-tasty-golden)
-   ("ghc-tasty-rerun" ,ghc-tasty-rerun)
("ghc-terminal-size" ,ghc-terminal-size)
("ghc-text" ,ghc-text)
-   ("ghc-trifecta" ,ghc-trifecta)
+   ("ghc-trifecta" ,ghc-trifecta-1.6.2.1)
("ghc-uniplate" ,ghc-uniplate)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-utf8-string" ,ghc-utf8-string)
-   ("ghc-vector-binary-instances" ,ghc-vector-binary-instances)
("ghc-vector" ,ghc-vector)
-   ("ghc-zip-archive" ,ghc-zip-archive)
-   ("ghc-zlib" ,ghc-zlib)))
+   ("ghc-vector-binary-instances" ,ghc-vector-binary-instances)
+   ("ghc-zip-archive" ,ghc-zip-archive)))
 (arguments
  `(#:tests? #f ; FIXME: Test suite doesn't run in a sandbox.
#:configure-flags
-- 
2.16.2



Re: torbrowser

2018-03-07 Thread ng0
ng0 transcribed 1.7K bytes:
> On 17-03-06 08:06:52, dian_ce...@zoho.com wrote:
> > On Mon, 6 Mar 2017 15:14:59 +
> > ng0  wrote:
> > > My idea is now to just reconstruct what torproject does, from the git
> > > checkout of torbrowser and eventually later fix Guix specific
> > > issues and fine tuning (freedom issues etc etc).
[snip]
(Don't consider this "necro-bumping".)

The maintainer of the ebuild for Gentoo in the torbrowser-overlay
just gave me the last missing pieces of information for building torbrowser.
Recent commit message subjects in the upstream torbrowser repository
make me assume there will be no issues for integration into Guix master.
As long as the final build ressembles what I have talked about with them
we can even name it torbrowser and have the official design.

I hope to be done with this by summer, but you never know with browser.
But it's just a Firefox ESR deriv., so (ideally) it should just be a matter
of 1 or 2 weekends.
-- 
A88C8ADD129828D7EAC02E52E22F9BBFEE348588
https://n0.is/~ng0



Re: [PATCH] fix idris (was "Re: Incomplete work to upgrade Idris to 1.2.0")

2018-03-07 Thread Ricardo Wurmus

Hi Alex,

> My mistake, here's the patch. Let me know if this should be broken up
> further.
>
> From f31cd301804b6fc3dbf345a9e37d20814cd407ae Mon Sep 17 00:00:00 2001
> From: Alex ter Weele 
> Date: Tue, 6 Mar 2018 19:32:05 -0600
> Subject: [PATCH] gnu: idris: fix package.
>
> * gnu/packages/idris.scm (ghc-aeson-1.1.2.0, ghc-cheapskate-0.1.0.5,
>   ghc-trifecta-1.6.2.1) new variables. (idris) [inputs] alphebetize
>   ghc-vector-binary-instances and ghc-async. Use ghc-aeson-1.1.2.0,
>   ghc-cheapskate-0.1.0.5, and ghc-trifecta-1.6.2.1. Remove ghc-aeson,
>   ghc-cheapskate, ghc-parsers, ghc-tasty, ghc-tasty-golden, ghc-tasty-rerun,
>   ghc-trifecta, and ghc-zlib.

Thanks.  Please create separate patches for adding ghc-aeson-1.1.2.0,
ghc-cheapskate-0.1.0.5, and ghc-trifecta-1.6.2.1.

--
Ricardo




Re: Where to queue patches for staging? (was: Is staging open again?)

2018-03-07 Thread Marius Bakke
Hartmut Goebel  writes:

> Am 06.03.2018 um 18:03 schrieb Marius Bakke:
>> Staging is nearly fully built, so it will have to wait until next round.
>> Generally, branches 'close' once a Hydra evaluation starts.  Check in
>> here for progress: .
>
> This sound complicated for the occasional (staging-) contributor.
>
> How should I determine when the next round is about to start? I can't
> even spot that "staging is nearly fully built" and hydra's web-front-end
> is slow. Further I do not have the time for monitoring hydra and catch
> the time-window then I can push my commit. For me this does not work out
> - and I assume for others if doesn't, too.

There are typically discussions on guix-devel when we start the branch.
Here is the previous correspondence:
.

I suppose we can make it clearer when a branch becomes 'bugfix-only'.

> Is there some queue-for-staging branch where I can commit this patch to?
> Or some other means, like setting some bug-status?

Feel free to push a 'staging-next' branch or something along those lines
to Savannah.  Then we can "promote" it once the current branch is merged.


signature.asc
Description: PGP signature


Re: torbrowser

2018-03-07 Thread Christopher Lemmer Webber
ng0 writes:

> The maintainer of the ebuild for Gentoo in the torbrowser-overlay
> just gave me the last missing pieces of information for building torbrowser.
> Recent commit message subjects in the upstream torbrowser repository
> make me assume there will be no issues for integration into Guix master.
> As long as the final build ressembles what I have talked about with them
> we can even name it torbrowser and have the official design.
>
> I hope to be done with this by summer, but you never know with browser.
> But it's just a Firefox ESR deriv., so (ideally) it should just be a matter
> of 1 or 2 weekends.

This is great, ng0!  Thank you! :)



Re: Language tag for traditional Chinese

2018-03-07 Thread Andreas Enge
Hello,

On Tue, Mar 06, 2018 at 08:35:46PM +0800, Alex Vong wrote:
> I also want to add tranditional Chinese translation to guix in the
> future (after I figure out how to use handwriting recognition). I think
> I will still use the zh_TW since I think it is an established convention
> for distro. But I am not sure if the same convention holds for web
> page.

if you look at the web page of the Translation Project, the two Chinese
language codes seem to be zh_CN and zh_TW:
   https://translationproject.org/team/index.html
There is also zh_HK, but no translation team is referenced for it.

Andreas




Re: quirky behaviour of “guix environment”

2018-03-07 Thread Ludovic Courtès
Heya,

Ricardo Wurmus  skribis:

> Aside from this issue, I find it worrying that the graft for glibc does
> not end up in the environment.  This is a serious problem for those
> who use “guix environment” on RHEL 6.

As you reported on IRC, the problem turned out to be that ‘glibc-final’
was not being grafted.  This should now be fixed by commit
7c788ed2276957ea52858d80faeca2962cd26f8d.

Hopefully substitutes for the ‘glibc-final’ replacement will be
available soon.

(Some other issues you mentioned in your message still deserve
investigation.)

Thanks,
Ludo’.



Re: Language tag for traditional Chinese

2018-03-07 Thread Ludovic Courtès
Hello,

Alex Vong  skribis:

> Tobias Geerinckx-Rice  writes:
>
>> Ludo', Alex,
>>
>> On 2018-03-05 9:45, l...@gnu.org wrote:
 The locale should be zh_TW (for Taiwan), zh_HK (for Hong Kong) and
 zh_mo
 (for Macau). Should I use a let to avoid duplication?
>>>
>>> As long as the above sentence is intelligible to people from all these
>>> regions, it’s enough to write “zh” I guess?  (It’s meant to be a
>>> language tag for humans to read, not an actual locale specification.)
>>
>> I'd definitely avoid that. For better or worse, ‘zh’ is assumed to
>> equal ‘zh_CN’ or simplified Chinese.
>>
> I agree. In written Chinese, the 2 dialects of simplified and
> traditional Chinese are quite different. Not only the characters are
> different (of course quite a few are still shared), sometimes the
> wording is different too due to cultural difference (similar to British
> vs American English).

Good to know, thanks for explaining.

> So we should at least have 2 different locales I think.

We were talking about the web site, no locales involved.  :-)

Can you send me a patch against guix-artwork.git (which contains the web
site) so I can adjust that page accordingly?

Thanks in advance,
Ludo’.



Re: [PATCH] fix idris (was "Re: Incomplete work to upgrade Idris to 1.2.0")

2018-03-07 Thread Alex ter Weele
Sure!

>From ef0dcd5a84c4f8e4331fb8f07a4e1709a577eb31 Mon Sep 17 00:00:00 2001
From: Alex ter Weele 
Date: Wed, 7 Mar 2018 18:31:22 -0600
Subject: [PATCH 3/4] gnu: Add ghc-cheapskate-0.1.0.5.

* gnu/packages/idris.scm (ghc-cheapskate-0.1.0.5): New variable.
---
 gnu/packages/idris.scm | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm
index b67fcbccf..c103055f5 100644
--- a/gnu/packages/idris.scm
+++ b/gnu/packages/idris.scm
@@ -57,6 +57,25 @@
 (base32
  "1rgv62dlmm4vkdymx5rw5jg3w8ifpzg1745rvs1m4kzdx16p5cxs"))
 
+;; ghc-cheapskate appeared too new. This follows LTS Haskell.
+(define ghc-cheapskate-0.1.0.5
+  (package
+(inherit ghc-cheapskate)
+(version "0.1.0.5")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ "https://hackage.haskell.org/package/cheapskate/cheapskate-";
+ version
+ ".tar.gz"))
+   (sha256
+(base32
+ "0cpsmfx5z2xykg71sv8j7pl8ga6pzyjnjdb9bxn00vcpqkzvfqvs"
+(arguments
+ ;; LTS Haskell says data-default >=0.5 && <0.8
+ `(#:configure-flags (list "--allow-newer=data-default")
+
 (define-public idris
   (package
 (name "idris")
-- 
2.16.2

>From 477d5f85747501c5b78597f76713fa6f87eedd6f Mon Sep 17 00:00:00 2001
From: Alex ter Weele 
Date: Wed, 7 Mar 2018 18:29:23 -0600
Subject: [PATCH 2/4] gnu: Add ghc-trifecta-1.6.2.1.

* gnu/packages/idris.scm (ghc-trifecta-1.6.2.1): New variable.
---
 gnu/packages/idris.scm | 13 +
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm
index ae90676d5..b67fcbccf 100644
--- a/gnu/packages/idris.scm
+++ b/gnu/packages/idris.scm
@@ -44,6 +44,19 @@
 (base32
  "1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p"))
 
+(define ghc-trifecta-1.6.2.1
+  (package (inherit ghc-trifecta)
+(version "1.6.2.1")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ "https://hackage.haskell.org/package/trifecta/";
+ "trifecta-" version ".tar.gz"))
+   (sha256
+(base32
+ "1rgv62dlmm4vkdymx5rw5jg3w8ifpzg1745rvs1m4kzdx16p5cxs"))
+
 (define-public idris
   (package
 (name "idris")
-- 
2.16.2

>From ef0dcd5a84c4f8e4331fb8f07a4e1709a577eb31 Mon Sep 17 00:00:00 2001
From: Alex ter Weele 
Date: Wed, 7 Mar 2018 18:31:22 -0600
Subject: [PATCH 3/4] gnu: Add ghc-cheapskate-0.1.0.5.

* gnu/packages/idris.scm (ghc-cheapskate-0.1.0.5): New variable.
---
 gnu/packages/idris.scm | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm
index b67fcbccf..c103055f5 100644
--- a/gnu/packages/idris.scm
+++ b/gnu/packages/idris.scm
@@ -57,6 +57,25 @@
 (base32
  "1rgv62dlmm4vkdymx5rw5jg3w8ifpzg1745rvs1m4kzdx16p5cxs"))
 
+;; ghc-cheapskate appeared too new. This follows LTS Haskell.
+(define ghc-cheapskate-0.1.0.5
+  (package
+(inherit ghc-cheapskate)
+(version "0.1.0.5")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ "https://hackage.haskell.org/package/cheapskate/cheapskate-";
+ version
+ ".tar.gz"))
+   (sha256
+(base32
+ "0cpsmfx5z2xykg71sv8j7pl8ga6pzyjnjdb9bxn00vcpqkzvfqvs"
+(arguments
+ ;; LTS Haskell says data-default >=0.5 && <0.8
+ `(#:configure-flags (list "--allow-newer=data-default")
+
 (define-public idris
   (package
 (name "idris")
-- 
2.16.2

>From c19d3fc198afdddefc4feeb9151b57e7f72d8303 Mon Sep 17 00:00:00 2001
From: Alex ter Weele 
Date: Wed, 7 Mar 2018 18:32:19 -0600
Subject: [PATCH 4/4] gnu: Fix idris.

* gnu/packages/idris.scm (idris)[inputs]: alphebetize
  ghc-vector-binary-instances and ghc-async. Use ghc-aeson-1.1.2.0,
  ghc-cheapskate-0.1.0.5, and ghc-trifecta-1.6.2.1. Remove ghc-aeson,
  ghc-cheapskate, ghc-parsers, ghc-tasty, ghc-tasty-golden, ghc-tasty-rerun,
  ghc-trifecta, and ghc-zlib.
---
 gnu/packages/idris.scm | 17 ++---
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm
index c103055f5..633b8b9d5 100644
--- a/gnu/packages/idris.scm
+++ b/gnu/packages/idris.scm
@@ -92,15 +92,15 @@
 (inputs
  `(("gmp" ,gmp)
("ncurses" ,ncurses)
-   ("ghc-aeson" ,ghc-aeson)
-   ("ghc-async" ,ghc-async)
+   ("ghc-aeson" ,ghc-aeson-1.1.2.0)
("ghc-annotated-wl-pprint" ,ghc-annotated-wl-pprint)
("ghc-ansi-terminal" ,ghc-ansi-terminal)
("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint)
+   ("ghc-async" ,ghc-async)
("ghc-base64-bytestring" ,ghc-base64-bytestring)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-blaze-markup" ,ghc-blaze-markup)
-   ("ghc-cheapskate" ,ghc-cheapskate)
+   ("ghc-cheapskate" ,ghc-cheapskate-0.1.0.5)
("ghc-code-page" ,ghc-code-page)
("g

Re: torbrowser

2018-03-07 Thread Catonano
2018-03-07 16:32 GMT+01:00 Christopher Lemmer Webber :

> ng0 writes:
>
> > The maintainer of the ebuild for Gentoo in the torbrowser-overlay
> > just gave me the last missing pieces of information for building
> torbrowser.
> > Recent commit message subjects in the upstream torbrowser repository
> > make me assume there will be no issues for integration into Guix master.
> > As long as the final build ressembles what I have talked about with them
> > we can even name it torbrowser and have the official design.
> >
> > I hope to be done with this by summer, but you never know with browser.
> > But it's just a Firefox ESR deriv., so (ideally) it should just be a
> matter
> > of 1 or 2 weekends.
>
> This is great, ng0!  Thank you! :)
>
>

I want to express my gratitude too

I cold even try to build your thing if I knew where it is ;-)