From c44667ccae7581cb2a18a8f25d8e867bd352194d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 4 Apr 2019 14:40:37 +0200 Subject: [PATCH] gnu: ghc-tls: Move to haskell-crypto.scm. * gnu/packages/tls.scm (ghc-tls): Move to... * gnu/packages/haskell-crypto.scm (ghc-tls): ... here. * gnu/packages/haskell-web.scm: Remove now unneeded import. --- gnu/packages/haskell-crypto.scm | 43 ++++++++++++++++++++++++++++++ gnu/packages/haskell-web.scm | 1 - gnu/packages/tls.scm | 46 --------------------------------- 3 files changed, 43 insertions(+), 47 deletions(-) diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 8f216a379d..8d28a77fc1 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -733,3 +733,46 @@ (define-public ghc-ed25519 documentation on the design and implementation, including usage guidelines.") (license license:expat))) + +(define-public ghc-tls + (package + (name "ghc-tls") + (version "1.4.1") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "tls/tls-" version ".tar.gz")) + (sha256 + (base32 + "1y083724mym28n6xfaz7pcc7zqxdhjpaxpbvzxfbs25qq2px3smv")))) + (build-system haskell-build-system) + (inputs + `(("ghc-cereal" ,ghc-cereal) + ("ghc-data-default-class" ,ghc-data-default-class) + ("ghc-memory" ,ghc-memory) + ("ghc-cryptonite" ,ghc-cryptonite) + ("ghc-asn1-types" ,ghc-asn1-types) + ("ghc-asn1-encoding" ,ghc-asn1-encoding) + ("ghc-x509" ,ghc-x509) + ("ghc-x509-store" ,ghc-x509-store) + ("ghc-x509-validation" ,ghc-x509-validation) + ("ghc-async" ,ghc-async) + ("ghc-network" ,ghc-network) + ("ghc-hourglass" ,ghc-hourglass))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://github.com/vincenthz/hs-tls") + (synopsis + "TLS/SSL protocol native implementation (Server and Client)") + (description + "Native Haskell TLS and SSL protocol implementation for server and client. +This provides a high-level implementation of a sensitive security protocol, +eliminating a common set of security issues through the use of the advanced +type system, high level constructions and common Haskell features. Currently +implement the SSL3.0, TLS1.0, TLS1.1 and TLS1.2 protocol, and support RSA and +Ephemeral (Elliptic curve and regular) Diffie Hellman key exchanges, and many +extensions.") + (license license:bsd-3))) + diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 38797e6535..555fee12d4 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -27,7 +27,6 @@ (define-module (gnu packages haskell-web) #:use-module (gnu packages haskell) #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-crypto) - #:use-module (gnu packages tls) #:use-module (guix build-system haskell) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index c0b92bab04..3d579440b0 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -38,7 +38,6 @@ (define-module (gnu packages tls) #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (guix build-system cmake) - #:use-module (guix build-system haskell) #:use-module (guix build-system trivial) #:use-module (gnu packages compression) #:use-module (gnu packages) @@ -48,9 +47,6 @@ (define-module (gnu packages tls) #:use-module (gnu packages dns) #:use-module (gnu packages gawk) #:use-module (gnu packages guile) - #:use-module (gnu packages haskell) - #:use-module (gnu packages haskell-check) - #:use-module (gnu packages haskell-crypto) #:use-module (gnu packages libbsd) #:use-module (gnu packages libffi) #:use-module (gnu packages libidn) @@ -882,48 +878,6 @@ (define-public mbedtls-for-hiawatha #t))) ,@(package-arguments mbedtls-apache))))))) -(define-public ghc-tls - (package - (name "ghc-tls") - (version "1.4.1") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "tls/tls-" version ".tar.gz")) - (sha256 - (base32 - "1y083724mym28n6xfaz7pcc7zqxdhjpaxpbvzxfbs25qq2px3smv")))) - (build-system haskell-build-system) - (inputs - `(("ghc-cereal" ,ghc-cereal) - ("ghc-data-default-class" ,ghc-data-default-class) - ("ghc-memory" ,ghc-memory) - ("ghc-cryptonite" ,ghc-cryptonite) - ("ghc-asn1-types" ,ghc-asn1-types) - ("ghc-asn1-encoding" ,ghc-asn1-encoding) - ("ghc-x509" ,ghc-x509) - ("ghc-x509-store" ,ghc-x509-store) - ("ghc-x509-validation" ,ghc-x509-validation) - ("ghc-async" ,ghc-async) - ("ghc-network" ,ghc-network) - ("ghc-hourglass" ,ghc-hourglass))) - (native-inputs - `(("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/vincenthz/hs-tls") - (synopsis - "TLS/SSL protocol native implementation (Server and Client)") - (description - "Native Haskell TLS and SSL protocol implementation for server and client. -This provides a high-level implementation of a sensitive security protocol, -eliminating a common set of security issues through the use of the advanced -type system, high level constructions and common Haskell features. Currently -implement the SSL3.0, TLS1.0, TLS1.1 and TLS1.2 protocol, and support RSA and -Ephemeral (Elliptic curve and regular) Diffie Hellman key exchanges, and many -extensions.") - (license license:bsd-3))) - (define-public dehydrated (package (name "dehydrated")