From 74c43337175dd3cbee7414bae7b2e970ff53f3ed Mon Sep 17 00:00:00 2001 From: Herman Rimm Date: Thu, 11 Dec 2025 19:54:56 +0100 Subject: [PATCH] gnu: hugs: Move to (gnu packages haskell). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/hugs.scm (hugs): Move from here ... * gnu/packages/haskell.scm: ... to here. Merges: guix/guix!4793 Relates-to: guix/guix#1134 Change-Id: I81b15e3215293420369b40c7a531c555db20ba63 Reviewed-by: Nguyễn Gia Phong Signed-off-by: Sharlatan Hellseher --- gnu/packages/haskell.scm | 62 +++++++++++++++++++++++++++++++++- gnu/packages/hugs.scm | 72 +++------------------------------------- 2 files changed, 65 insertions(+), 69 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4aa17d1718d..7639731edfc 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015, 2019 Eric Bavier ;;; Copyright © 2016, 2018, 2019, 2021, 2026 Ludovic Courtès -;;; Copyright © 2016, 2017 Nikita +;;; Copyright © 2013, 2016, 2017 Nikita ;;; Copyright © 2016, 2022, 2024 Efraim Flashner ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2022 Ricardo Wurmus ;;; Copyright © 2016, 2017 David Craven @@ -116,6 +116,66 @@ top of CLISP.") (license license:bsd-4)))) +(define-public hugs + (package + (name "hugs") + (version "Sep2006") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.haskell.org/hugs/downloads/2006-09/" + name "98-plus-" version ".tar.gz")) + (sha256 + (base32 + "1mdy4aq4campgmnpc2qwq7bsbfhaxfsqdghbyyz2wms4lnfcmyma")) + (patches (search-patches "hugs-fix-build.patch")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-sh-n-cp + (lambda _ + (substitute* + '("configure" + "libraries/configure" + "packages/time/configure" + "packages/base/configure" + "packages/X11/configure" + "packages/HGL/configure" + "packages/OpenAL/configure" + "packages/OpenGL/configure" + "packages/network/configure" + "packages/unix/configure" + "packages/Cabal/tests/HSQL/configure" + "packages/ALUT/configure" + "packages/GLUT/configure" + "packages/base/cbits/execvpe.c" + "packages/base/System/Process/Internals.hs" + "packages/Cabal/Distribution/attic" + "packages/Cabal/Distribution/Simple/Register.hs" + "packages/Cabal/Distribution/Simple/Hugs.hs" + "tools/hugs-hc" + "src/machdep.c" + "libraries/Makefile.in") + (("/bin/sh") (which "sh"))) + (substitute* '("demos/Makefile.in" + "libraries/Makefile.in") + (("/bin/cp") (which "cp"))) + #t))) + #:tests? #f)) ; no test target + (native-inputs (list gcc-13)) + (home-page "https://www.haskell.org/hugs/") + (synopsis "Functional programming system based on Haskell 98") + (description + "Hugs 98 is an interpreter and programming environment for developing +Haskell programs. It provides an almost complete implementation of Haskell +98, which includes expression and pattern syntax, primitives for monadic I/O, +with support for simple interactive programs, handle-based I/O, and exception +handling. Hugs has a nearly complete implementation of the Haskell module +system and supports a number of advanced extensions.") + (license (license:non-copyleft "file://License" + "See License in the distribution.")))) + ;; This package contains lots of generated .hc files containing C code to ;; bootstrap the compiler without a Haskell compiler. The included .hc files ;; cover not just the compiler sources but also all Haskell libraries. diff --git a/gnu/packages/hugs.scm b/gnu/packages/hugs.scm index c82c089b743..3bbfacd606f 100644 --- a/gnu/packages/hugs.scm +++ b/gnu/packages/hugs.scm @@ -1,7 +1,4 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Nikita Karetnikov -;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2017 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,69 +16,8 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages hugs) - #:use-module (guix licenses) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu) - #:use-module (gnu packages) - #:use-module (gnu packages gcc)) + #:use-module (guix deprecation) + #:use-module (gnu packages haskell)) -(define-public hugs - (package - (name "hugs") - (version "Sep2006") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.haskell.org/hugs/downloads/2006-09/" - name "98-plus-" version ".tar.gz")) - (sha256 - (base32 - "1mdy4aq4campgmnpc2qwq7bsbfhaxfsqdghbyyz2wms4lnfcmyma")) - (patches (search-patches "hugs-fix-build.patch")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-sh-n-cp - (lambda _ - (substitute* - '("configure" - "libraries/configure" - "packages/time/configure" - "packages/base/configure" - "packages/X11/configure" - "packages/HGL/configure" - "packages/OpenAL/configure" - "packages/OpenGL/configure" - "packages/network/configure" - "packages/unix/configure" - "packages/Cabal/tests/HSQL/configure" - "packages/ALUT/configure" - "packages/GLUT/configure" - "packages/base/cbits/execvpe.c" - "packages/base/System/Process/Internals.hs" - "packages/Cabal/Distribution/attic" - "packages/Cabal/Distribution/Simple/Register.hs" - "packages/Cabal/Distribution/Simple/Hugs.hs" - "tools/hugs-hc" - "src/machdep.c" - "libraries/Makefile.in") - (("/bin/sh") (which "sh"))) - (substitute* '("demos/Makefile.in" - "libraries/Makefile.in") - (("/bin/cp") (which "cp"))) - #t))) - #:tests? #f)) ; no test target - (native-inputs (list gcc-13)) - (home-page "https://www.haskell.org/hugs/") - (synopsis "Functional programming system based on Haskell 98") - (description - "Hugs 98 is an interpreter and programming environment for developing -Haskell programs. It provides an almost complete implementation of Haskell -98, which includes expression and pattern syntax, primitives for monadic I/O, -with support for simple interactive programs, handle-based I/O, and exception -handling. Hugs has a nearly complete implementation of the Haskell module -system and supports a number of advanced extensions.") - (license (non-copyleft "file://License" - "See License in the distribution.")))) +;; XXX: Deprecated on <2026-05-17>. +(define-deprecated/public-alias hugs (@ (gnu packages haskell) hugs))