[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/06: gnu: Move Emacs modes for Dedukti to ocaml.scm.
From: |
guix-commits |
Subject: |
04/06: gnu: Move Emacs modes for Dedukti to ocaml.scm. |
Date: |
Mon, 7 Jan 2019 08:41:09 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit db1eb632be0b9ccbae53a6c4cc684ecd86d34d7f
Author: Ludovic Courtès <address@hidden>
Date: Mon Jan 7 14:00:32 2019 +0100
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 df0d614..0c80d21 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -41,7 +41,6 @@
;;; Copyright © 2018 Alex Branham <address@hidden>
;;; Copyright © 2018 Thorsten Wilms <address@hidden>
;;; Copyright © 2018 Pierre Langlois <address@hidden>
-;;; Copyright © 2018 Gabriel Hondet <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -124,7 +123,6 @@
#: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 @@ functions to ensure they are called with the right
arguments during testing.")
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 1ef9c9c..8fe8ac8 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -67,6 +67,7 @@
#: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 @@ rules. This system is not designed to develop proofs,
but to check proofs
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")
- branch master updated (3b45154 -> 915c6bf), guix-commits, 2019/01/07
- 01/06: Remove (guix build pull)., guix-commits, 2019/01/07
- 02/06: lint: Avoid 'dirname' call at the top level., guix-commits, 2019/01/07
- 06/06: gnu: python2-fastlmm: Move to machine-learning.scm., guix-commits, 2019/01/07
- 04/06: gnu: Move Emacs modes for Dedukti to ocaml.scm.,
guix-commits <=
- 03/06: gnu: Move OCaml packages away from maths.scm., guix-commits, 2019/01/07
- 05/06: gnu: Remove unnecessary build-side module imports., guix-commits, 2019/01/07