From db1eb632be0b9ccbae53a6c4cc684ecd86d34d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 7 Jan 2019 14:00:32 +0100 Subject: [PATCH] gnu: Move Emacs modes for Dedukti to ocaml.scm. This removes OCaml-related modules from the closure of (gnu packages emacs). * gnu/packages/emacs.scm (emacs-dedukti-mode, emacs-flycheck-dedukti): Move to ... * gnu/packages/ocaml.scm: ... here. --- gnu/packages/emacs.scm | 58 ------------------------------------------ gnu/packages/ocaml.scm | 57 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 58 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index df0d6144bc..0c80d21b4c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -41,7 +41,6 @@ ;;; Copyright © 2018 Alex Branham ;;; Copyright © 2018 Thorsten Wilms ;;; Copyright © 2018 Pierre Langlois -;;; Copyright © 2018 Gabriel Hondet ;;; ;;; This file is part of GNU Guix. ;;; @@ -124,7 +123,6 @@ (define-module (gnu packages emacs) #:use-module (gnu packages video) #:use-module (gnu packages haskell) #:use-module (gnu packages wordnet) - #:use-module (gnu packages ocaml) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (ice-9 match)) @@ -12863,62 +12861,6 @@ (define-public emacs-wordnut too ambiguous and navigation in the result buffer.") (license license:gpl3+)))) -(define-public emacs-dedukti-mode - (let ((commit "d7c3505a1046187de3c3aeb144455078d514594e")) - (package - (name "emacs-dedukti-mode") - (version (git-version "0" "0" commit)) - (home-page "https://github.com/rafoo/dedukti-mode") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit commit))) - (sha256 - (base32 - "1842wikq24c8rg0ac84vb1qby9ng1nssxswyyni4kq85lng5lcrp")) - (file-name (git-file-name name version)))) - (inputs - `(("dedukti" ,dedukti))) - (build-system emacs-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'install 'patch-dkpath - (lambda _ - (let ((dkcheck-path (which "dkcheck"))) - (substitute* "dedukti-mode.el" - (("dedukti-path \"(.*)\"") - (string-append "dedukti-path \"" dkcheck-path "\""))))))))) - (synopsis "Emacs major mode for Dedukti files") - (description "This package provides an Emacs major mode for editing -Dedukti files.") - (license license:cecill-b)))) - -(define-public emacs-flycheck-dedukti - (let ((commit "3dbff5646355f39d57a3ec514f560a6b0082a1cd")) - (package - (name "emacs-flycheck-dedukti") - (version (git-version "0" "0" commit)) - (home-page "https://github.com/rafoo/flycheck-dedukti") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit commit))) - (sha256 - (base32 - "1ffpxnwl3wx244n44mbw81g00nhnykd0lnid29f4aw1av7w6nw8l")) - (file-name (git-file-name name version)))) - (build-system emacs-build-system) - (inputs - `(("dedukti-mode" ,emacs-dedukti-mode) - ("flycheck-mode" ,emacs-flycheck))) - (synopsis "Flycheck integration for the dedukti language") - (description "This package provides a frontend for Flycheck to perform -syntax checking on dedukti files.") - (license license:cecill-b)))) - (define-public emacs-frame-purpose (package (name "emacs-frame-purpose") diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1ef9c9c142..8fe8ac86f0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -67,6 +67,7 @@ (define-module (gnu packages ocaml) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build-system dune) + #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) #:use-module (guix build-system ocaml) #:use-module (guix download) @@ -5047,6 +5048,62 @@ (define-public dedukti developed in other systems. In particular, it enjoys a minimalistic syntax.") (license license:cecill-c))) +(define-public emacs-dedukti-mode + (let ((commit "d7c3505a1046187de3c3aeb144455078d514594e")) + (package + (name "emacs-dedukti-mode") + (version (git-version "0" "0" commit)) + (home-page "https://github.com/rafoo/dedukti-mode") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (sha256 + (base32 + "1842wikq24c8rg0ac84vb1qby9ng1nssxswyyni4kq85lng5lcrp")) + (file-name (git-file-name name version)))) + (inputs + `(("dedukti" ,dedukti))) + (build-system emacs-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'install 'patch-dkpath + (lambda _ + (let ((dkcheck-path (which "dkcheck"))) + (substitute* "dedukti-mode.el" + (("dedukti-path \"(.*)\"") + (string-append "dedukti-path \"" dkcheck-path "\""))))))))) + (synopsis "Emacs major mode for Dedukti files") + (description "This package provides an Emacs major mode for editing +Dedukti files.") + (license license:cecill-b)))) + +(define-public emacs-flycheck-dedukti + (let ((commit "3dbff5646355f39d57a3ec514f560a6b0082a1cd")) + (package + (name "emacs-flycheck-dedukti") + (version (git-version "0" "0" commit)) + (home-page "https://github.com/rafoo/flycheck-dedukti") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (sha256 + (base32 + "1ffpxnwl3wx244n44mbw81g00nhnykd0lnid29f4aw1av7w6nw8l")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (inputs + `(("dedukti-mode" ,emacs-dedukti-mode) + ("flycheck-mode" ,emacs-flycheck))) + (synopsis "Flycheck integration for the dedukti language") + (description "This package provides a frontend for Flycheck to perform +syntax checking on dedukti files.") + (license license:cecill-b)))) + (define-public ocaml-biniou (package (name "ocaml-biniou")