diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c86ff2c2845..3dae1da27e9 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -76,6 +76,7 @@ ;;; Copyright © 2024 Ashvith Shetty ;;; Copyright © 2025 Dariqq ;;; Copyright © 2024 nik gaffney +;;; Copyright © 2025 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -3367,34 +3368,6 @@ virtualization environments using KVM/libvirt, Docker or LXC technologies to manage virtual machines and/or containers.") (license license:gpl3+))) -(define-public emacs-ansible-doc - (let ((commit "86083a7bb2ed0468ca64e52076b06441a2f8e9e0")) - (package - (name "emacs-ansible-doc") - (version (git-version "0.4" "1" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/lunaryorn/ansible-doc.el") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0lap404ch74w99n3xip176jr42b38xhyzkfnkyqg0g3wk2cd3aq8")))) - (build-system emacs-build-system) - ;; Unmaintained by upstream. - (home-page "https://github.com/lunaryorn/ansible-doc.el") - (synopsis "Ansible documentation for Emacs") - (description - "This package provides an Ansible documentation for GNU Emacs. - -@code{ansible-doc} allows you to view the documentation of an Ansible -module and @code{ansible-doc-mode} minor mode adds documentation -lookup to YAML Mode. You could enable the mode with @code{(add-hook -'yaml-mode-hook #'ansible-doc-mode)}.") - (license license:gpl3+)))) - (define-public cpulimit (package (name "cpulimit") diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e100ac4d624..4646a67eaf4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -119,7 +119,7 @@ ;;; Copyright © 2022, 2024, 2025 Nicolas Graves ;;; Copyright © 2022 Thiago Jung Bauermann ;;; Copyright © 2022 Joeke de Graaf -;;; Copyright © 2023 Simon Streit +;;; Copyright © 2023, 2025 Simon Streit ;;; Copyright © 2023 John Kehayias ;;; Copyright © 2023 Ivan Vilata-i-Balaguer ;;; Copyright © 2022 Demis Balbach @@ -24033,6 +24033,35 @@ literate programming tools for exporting, weaving and tangling.") "This is an Emacs minor mode for editing Ansible files.") (license license:gpl2+))) +(define-public emacs-ansible-doc + (let ((commit "648c844ab46f56c2c7ee25687ad2952a5d5eb4c7") + (revision "2") + (version "0.4")) + (package + (name "emacs-ansible-doc") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fredericgiquel/ansible-doc") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02xnkgsrq54bpk26z9cs352r5rq0scmzw2czlq2pyq1332g6lycd")))) + (build-system emacs-build-system) + (home-page "https://github.com/fredericgiquel/ansible-doc") + (synopsis "Ansible documentation for Emacs") + (description + "This package provides an Ansible documentation for GNU Emacs. + +@code{ansible-doc} allows you to view the documentation of an Ansible +module and @code{ansible-doc-mode} minor mode adds documentation +lookup to YAML Mode. You could enable the mode with @code{(add-hook +'yaml-mode-hook #'ansible-doc-mode)}.") + (license license:gpl3+)))) + (define-public emacs-polymode-ansible (package (name "emacs-polymode-ansible")