[PATCH] import: hackage: default to https urls.

[PATCH] import: hackage: default to https urls.

[ng0]

[-- Attachment #1: Type: text/plain, Size: 388 bytes --]

This patch updates the hackage importer so that `guix import hackage
name' writes out a package definition which includes
https://hackage.haskell.org by default. The home-page field was not
fixed, but this is less important than the download.
I know that tls/ssl itself has a problem, but some people can't just use
tor, so the default should be to use tls when available at the source.


[-- Attachment #2: 0001-import-hackage-default-to-https-urls.patch --]
[-- Type: text/x-patch, Size: 1771 bytes --]

From 07809dea5ea3b2bddad67c8f14f512ab40e42817 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Tue, 30 Aug 2016 12:08:21 +0000
Subject: [PATCH 1/2] import: hackage: default to https urls.

* guix/import/hackage.scm (hackage-source-url, hackage-cabal-url): Use https for
hackage.haskell.org.
---
 guix/import/hackage.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index f07f453..9af78ea 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
 ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
+;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -74,7 +75,7 @@
 (define (hackage-source-url name version)
   "Given a Hackage package NAME and VERSION, return a url to the source
 tarball."
-  (string-append "http://hackage.haskell.org/package/" name
+  (string-append "https://hackage.haskell.org/package/" name
                  "/" name "-" version ".tar.gz"))
 
 (define* (hackage-cabal-url name #:optional version)
@@ -82,9 +83,9 @@ tarball."
 .cabal file on Hackage.  If VERSION is #f or missing, the url for the latest
 version is returned."
   (if version
-      (string-append "http://hackage.haskell.org/package/"
+      (string-append "https://hackage.haskell.org/package/"
                      name "-" version "/" name ".cabal")
-      (string-append "http://hackage.haskell.org/package/"
+      (string-append "https://hackage.haskell.org/package/"
                      name "/" name ".cabal")))
 
 (define (hackage-name->package-name name)
-- 
2.9.3


[-- Attachment #3: Type: text/plain, Size: 372 bytes --]


Imported Adaptive with this from hackage. It is a broken build (fails
with errors which are in the build process, not within the package
definition), the download succeeds. I have no idea about haskell, this
is just to proof that it works, the hello-world kind of package.
If someone wants to fix this package or tell me how this can be fixed,
you are welcome to do so.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0002-gnu-Add-ghc-adaptive.patch --]
[-- Type: text/x-patch, Size: 1534 bytes --]

From f251f54d2c6078426d0fa20e914da7d1a4cada59 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Tue, 30 Aug 2016 12:22:51 +0000
Subject: [PATCH 2/2] gnu: Add ghc-adaptive.

* gnu/packages/haskell.scm (ghc-adaptive): New variable.
---
 gnu/packages/haskell.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 87628b5..d7dccc5 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -6432,4 +6432,26 @@ can be specified precisely in the type.  The language is closely related to
 Epigram and Agda.")
     (license license:bsd-3)))
 
+(define-public ghc-adaptive
+  (package
+    (name "ghc-adaptive")
+    (version "0.23")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://hackage.haskell.org/package/"
+                           "Adaptive/Adaptive-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0n27d8dvk0qq68zp4l5bsj5y9xqmrk9d25psrrf29mmw1f43wp8c"))))
+    (build-system haskell-build-system)
+    (home-page "http://hackage.haskell.org/package/Adaptive")
+    (synopsis "Library for incremental computing.")
+    (description
+     "This is a Haskell (plus some extensions) implementation of a library for
+incremental computing.  It closely follows the implementation in the nice
+POPL 2002 paper \"Adaptive Functional Programming\", by Umut Acar,
+Guy Blelloch and Bob Harper.")
+    (license license:bsd-3)))
+
 ;;; haskell.scm ends here
-- 
2.9.3


[-- Attachment #5: Type: text/plain, Size: 70 bytes --]


-- 
ng0
For non-prism friendly talk find me on http://www.psyced.org

Re: [PATCH] import: hackage: default to https urls.

[ng0]

ng0 <ng0@we.make.ritual.n0.is> writes:

> This patch updates the hackage importer so that `guix import hackage
> name' writes out a package definition which includes
> https://hackage.haskell.org by default. The home-page field was not
> fixed, but this is less important than the download.
> I know that tls/ssl itself has a problem, but some people can't just use
> tor, so the default should be to use tls when available at the source.
>
> From 07809dea5ea3b2bddad67c8f14f512ab40e42817 Mon Sep 17 00:00:00 2001
> From: ng0 <ng0@we.make.ritual.n0.is>
> Date: Tue, 30 Aug 2016 12:08:21 +0000
> Subject: [PATCH 1/2] import: hackage: default to https urls.

For the commiter, could you be so kind and change "default" to
"Default"? thanks.

> * guix/import/hackage.scm (hackage-source-url, hackage-cabal-url): Use https for
> hackage.haskell.org.
> ---
>  guix/import/hackage.scm | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
> index f07f453..9af78ea 100644
> --- a/guix/import/hackage.scm
> +++ b/guix/import/hackage.scm
> @@ -1,6 +1,7 @@
>  ;;; GNU Guix --- Functional package management for GNU
>  ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
>  ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
> +;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -74,7 +75,7 @@
>  (define (hackage-source-url name version)
>    "Given a Hackage package NAME and VERSION, return a url to the source
>  tarball."
> -  (string-append "http://hackage.haskell.org/package/" name
> +  (string-append "https://hackage.haskell.org/package/" name
>                   "/" name "-" version ".tar.gz"))
>  
>  (define* (hackage-cabal-url name #:optional version)
> @@ -82,9 +83,9 @@ tarball."
>  .cabal file on Hackage.  If VERSION is #f or missing, the url for the latest
>  version is returned."
>    (if version
> -      (string-append "http://hackage.haskell.org/package/"
> +      (string-append "https://hackage.haskell.org/package/"
>                       name "-" version "/" name ".cabal")
> -      (string-append "http://hackage.haskell.org/package/"
> +      (string-append "https://hackage.haskell.org/package/"
>                       name "/" name ".cabal")))
>  
>  (define (hackage-name->package-name name)
> -- 
> 2.9.3
>
>
> Imported Adaptive with this from hackage. It is a broken build (fails
> with errors which are in the build process, not within the package
> definition), the download succeeds. I have no idea about haskell, this
> is just to proof that it works, the hello-world kind of package.
> If someone wants to fix this package or tell me how this can be fixed,
> you are welcome to do so.
>
> From f251f54d2c6078426d0fa20e914da7d1a4cada59 Mon Sep 17 00:00:00 2001
> From: ng0 <ng0@we.make.ritual.n0.is>
> Date: Tue, 30 Aug 2016 12:22:51 +0000
> Subject: [PATCH 2/2] gnu: Add ghc-adaptive.
>
> * gnu/packages/haskell.scm (ghc-adaptive): New variable.
> ---
>  gnu/packages/haskell.scm | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
>
> diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
> index 87628b5..d7dccc5 100644
> --- a/gnu/packages/haskell.scm
> +++ b/gnu/packages/haskell.scm
> @@ -6432,4 +6432,26 @@ can be specified precisely in the type.  The language is closely related to
>  Epigram and Agda.")
>      (license license:bsd-3)))
>  
> +(define-public ghc-adaptive
> +  (package
> +    (name "ghc-adaptive")
> +    (version "0.23")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://hackage.haskell.org/package/"
> +                           "Adaptive/Adaptive-" version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "0n27d8dvk0qq68zp4l5bsj5y9xqmrk9d25psrrf29mmw1f43wp8c"))))
> +    (build-system haskell-build-system)
> +    (home-page "http://hackage.haskell.org/package/Adaptive")
> +    (synopsis "Library for incremental computing.")
> +    (description
> +     "This is a Haskell (plus some extensions) implementation of a library for
> +incremental computing.  It closely follows the implementation in the nice
> +POPL 2002 paper \"Adaptive Functional Programming\", by Umut Acar,
> +Guy Blelloch and Bob Harper.")
> +    (license license:bsd-3)))
> +
>  ;;; haskell.scm ends here
> -- 
> 2.9.3
>
>
> -- 
> ng0
> For non-prism friendly talk find me on http://www.psyced.org

-- 
ng0
For non-prism friendly talk find me on http://www.psyced.org

Re: [PATCH] import: hackage: default to https urls.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1149 bytes --]

On Tue, Aug 30, 2016 at 01:17:37PM +0000, ng0 wrote:
> ng0 <ng0@we.make.ritual.n0.is> writes:
> 
> > This patch updates the hackage importer so that `guix import hackage
> > name' writes out a package definition which includes
> > https://hackage.haskell.org by default. The home-page field was not
> > fixed, but this is less important than the download.
> > I know that tls/ssl itself has a problem, but some people can't just use
> > tor, so the default should be to use tls when available at the source.
> >
> > From 07809dea5ea3b2bddad67c8f14f512ab40e42817 Mon Sep 17 00:00:00 2001
> > From: ng0 <ng0@we.make.ritual.n0.is>
> > Date: Tue, 30 Aug 2016 12:08:21 +0000
> > Subject: [PATCH 1/2] import: hackage: default to https urls.
> 
> For the commiter, could you be so kind and change "default" to
> "Default"? thanks.
> 
> ng0
> For non-prism friendly talk find me on http://www.psyced.org
> 

Patch pushed

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]