From d53e87cf11b5a5a1d794f6ef15fe7213c5b60546 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 Mar 2020 21:52:37 -0500 Subject: gnu: ghc-hindent: Remove guix.d from the Elisp installation directory. * gnu/packages/haskell-xyz.scm (ghc-hindent)[phases]{emacs-install}: Update the installation prefix directory. --- gnu/packages/haskell-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/haskell-xyz.scm') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 418eb7cc46..01fecae850 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5286,8 +5286,7 @@ (define-public ghc-hindent (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (elisp-file "elisp/hindent.el") - (dest (string-append out "/share/emacs/site-lisp" - "/guix.d/hindent-" ,version)) + (dest (string-append out "/share/emacs/site-lisp")) (emacs (string-append (assoc-ref inputs "emacs") "/bin/emacs"))) (make-file-writable elisp-file) -- cgit v1.2.3 From 0cec5c4eb1b4ac9a3fbe3f11cffff92e01ff4c58 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Sat, 21 Mar 2020 09:10:57 +0200 Subject: gnu: ghc-extra: Downgrade to 1.6.21. * gnu/packages/haskell-xyz.scm (ghc-extra): Downgrade to 1.6.21. Signed-off-by: Marius Bakke --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-xyz.scm') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 01fecae850..261bc57305 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3774,7 +3774,7 @@ (define-public ghc-extensible-exceptions (define-public ghc-extra (package (name "ghc-extra") - (version "1.7.1") + (version "1.6.21") (source (origin (method url-fetch) @@ -3784,7 +3784,7 @@ (define-public ghc-extra ".tar.gz")) (sha256 (base32 - "0zshxv9dnd8vksncmb8dj4wvq2wdybzwxyhmy2zp6a81icm4azx4")))) + "1gjx98w4w61g043k6rzc8i34cbxpcigi8lb6i7pp1vwp8w8jm5vl")))) (build-system haskell-build-system) (inputs `(("ghc-clock" ,ghc-clock) -- cgit v1.2.3 From 08c62ac7bdd7c8c90bfa21dfb02008e4c2662e51 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 06:32:00 -0800 Subject: gnu: ghc-stylish-haskell: Deprecate older duplicate package. * gnu/packages/haskell-xyz.scm (ghc-stylish-haskell): Deprecate it. Signed-off-by: Marius Bakke --- gnu/packages/haskell-xyz.scm | 63 +------------------------------------------- 1 file changed, 1 insertion(+), 62 deletions(-) (limited to 'gnu/packages/haskell-xyz.scm') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 261bc57305..0828dc93c6 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11119,68 +11119,7 @@ (define-public ghc-stringsearch (license license:bsd-3))) (define-public ghc-stylish-haskell - (package - (name "ghc-stylish-haskell") - (version "0.9.2.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://hackage/package/stylish-haskell/stylish-haskell-" - version - ".tar.gz")) - (sha256 - (base32 - "1ls11fdx6snvfx8yykpidz142zzxwi5bazl49hgfqlwx50rqcp7w")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "stylish-haskell.cabal" - (("haskell-src-exts >= 1\\.18 && < 1\\.21,") - "haskell-src-exts >= 1.18 && < 1.22,")) - #t))))) - (inputs - `(("ghc-aeson" ,ghc-aeson) - ("ghc-file-embed" ,ghc-file-embed) - ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-syb" ,ghc-syb) - ("ghc-yaml" ,ghc-yaml) - ("ghc-strict" ,ghc-strict) - ("ghc-optparse-applicative" - ,ghc-optparse-applicative))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) - (home-page "https://github.com/jaspervdj/stylish-haskell") - (synopsis "Haskell code prettifier") - (description "Stylish-haskell is a Haskell code prettifier. The goal is -not to format all of the code in a file, to avoid \"getting in the way\". -However, this tool can e.g. clean up import statements and help doing various -tasks that get tedious very quickly. It can -@itemize -@item -Align and sort @code{import} statements -@item -Group and wrap @code{{-# LANGUAGE #-}} pragmas, remove (some) redundant -pragmas -@item -Remove trailing whitespaces -@item -Align branches in @code{case} and fields in records -@item -Convert line endings (customisable) -@item -Replace tabs by four spaces (turned off by default) -@item -Replace some ASCII sequences by their Unicode equivalent (turned off by -default) -@end itemize") - (license license:bsd-3))) + (deprecated-package "ghc-stylish-haskell" stylish-haskell)) (define-public ghc-svg-builder (package -- cgit v1.2.3