diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index a6fb33c31b..54266cd8bb 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Brian Leung +;;; Copyright © 2021 EuAndreh ;;; ;;; This file is part of GNU Guix. ;;; @@ -690,6 +691,35 @@ (define-public kmonad Wayland, and Linux console environments alike.") (license license:expat))) +(define-public nixfmt + (package + (name "ghc-nixfmt") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/nixfmt/nixfmt-" + version + ".tar.gz")) + (sha256 + (base32 "1ispgl8rc2scr6v8bb6sks7px856jf61x74zj2iyddrn5qamkb3n")))) + (build-system haskell-build-system) + (inputs + `(("ghc-megaparsec" ,ghc-megaparsec) + ("ghc-parser-combinators" ,ghc-parser-combinators) + ("ghc-cmdargs" ,ghc-cmdargs) + ("ghc-safe-exceptions" ,ghc-safe-exceptions))) + (arguments + `(#:cabal-revision + ("1" "1hsj0jh6siph3afd9c2wii09sffl48rzqv653n4clpd8qy0rn48d"))) + (home-page "https://github.com/serokell/nixfmt") + (synopsis "Opinionated formatter for Nix") + (description + "Nixfmt is a formatter for Nix that ensures consistent and clear +formatting by forgetting all existing formatting during parsing.") + (license license:mpl2.0))) + (define-public raincat (package (name "raincat") diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index c4440d4778..d6c50ade71 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -28,7 +28,6 @@ ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Carlo Holl ;;; Copyright © 2020 Christopher Lemmer Webber -;;; Copyright © 2021 EuAndreh ;;; ;;; This file is part of GNU Guix. ;;; @@ -8694,35 +8693,6 @@ (define-public ghc-newtype-generics and an alternative to newtype-th.") (license license:bsd-3))) -(define-public ghc-nixfmt - (package - (name "ghc-nixfmt") - (version "0.4.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/nixfmt/nixfmt-" - version - ".tar.gz")) - (sha256 - (base32 "1ispgl8rc2scr6v8bb6sks7px856jf61x74zj2iyddrn5qamkb3n")))) - (build-system haskell-build-system) - (inputs - `(("ghc-megaparsec" ,ghc-megaparsec) - ("ghc-parser-combinators" ,ghc-parser-combinators) - ("ghc-cmdargs" ,ghc-cmdargs) - ("ghc-safe-exceptions" ,ghc-safe-exceptions))) - (arguments - `(#:cabal-revision - ("1" "1hsj0jh6siph3afd9c2wii09sffl48rzqv653n4clpd8qy0rn48d"))) - (home-page "https://github.com/serokell/nixfmt") - (synopsis "Opinionated formatter for Nix") - (description - "Nixfmt is a formatter for Nix that ensures consistent and clear -formatting by forgetting all existing formatting during parsing.") - (license license:mpl2.0))) - (define-public ghc-non-negative (package (name "ghc-non-negative")