Remove custom company package
The changes I made to the package have been accepted upstream, so I don't need to maintain my own anymore. Commit: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=55c94d68df Discussion: https://issues.guix.gnu.org/68839
This commit is contained in:
parent
92113db65e
commit
5225562fe0
2 changed files with 10 additions and 48 deletions
|
@ -24,7 +24,6 @@
|
||||||
#:select (emacs-org-roam
|
#:select (emacs-org-roam
|
||||||
emacs-guix
|
emacs-guix
|
||||||
emacs-org-contacts
|
emacs-org-contacts
|
||||||
emacs-company
|
|
||||||
emacs-fennel-mode))
|
emacs-fennel-mode))
|
||||||
#:use-module ((gnu packages file-systems)
|
#:use-module ((gnu packages file-systems)
|
||||||
#:select (tmsu))
|
#:select (tmsu))
|
||||||
|
@ -141,7 +140,6 @@
|
||||||
#:select (count-emails))
|
#:select (count-emails))
|
||||||
#:use-module ((oni packages emacs)
|
#:use-module ((oni packages emacs)
|
||||||
#:select (emacs-inkplate
|
#:select (emacs-inkplate
|
||||||
oni-emacs-company
|
|
||||||
emacs-outli
|
emacs-outli
|
||||||
emacs-syncthing-status
|
emacs-syncthing-status
|
||||||
emacs-nginx-mode))
|
emacs-nginx-mode))
|
||||||
|
@ -222,9 +220,6 @@
|
||||||
`((with-branch . ,(string-append (package-name package) "=master"))))
|
`((with-branch . ,(string-append (package-name package) "=master"))))
|
||||||
package))
|
package))
|
||||||
|
|
||||||
(define with-my-emacs-company-package
|
|
||||||
(package-input-rewriting `((,emacs-company . ,oni-emacs-company))))
|
|
||||||
|
|
||||||
(define rincewind-picom-service
|
(define rincewind-picom-service
|
||||||
(service home-picom-service-type
|
(service home-picom-service-type
|
||||||
(home-picom-configuration
|
(home-picom-configuration
|
||||||
|
@ -277,12 +272,12 @@
|
||||||
emacs-fennel-mode
|
emacs-fennel-mode
|
||||||
|
|
||||||
(emacs-oni-org-roam my-emacs)
|
(emacs-oni-org-roam my-emacs)
|
||||||
(with-my-emacs-company-package emacs-oni-elisp)
|
emacs-oni-elisp
|
||||||
emacs-oni-core
|
emacs-oni-core
|
||||||
emacs-oni-elfeed
|
emacs-oni-elfeed
|
||||||
(with-my-emacs-company-package emacs-oni-eshell)
|
emacs-oni-eshell
|
||||||
emacs-oni-compilation
|
emacs-oni-compilation
|
||||||
(with-my-emacs-company-package emacs-oni-common-lisp)
|
emacs-oni-common-lisp
|
||||||
emacs-oni-gui
|
emacs-oni-gui
|
||||||
emacs-oni-magit
|
emacs-oni-magit
|
||||||
emacs-oni-notmuch
|
emacs-oni-notmuch
|
||||||
|
@ -293,12 +288,12 @@
|
||||||
emacs-oni-browse-url
|
emacs-oni-browse-url
|
||||||
emacs-oni-c
|
emacs-oni-c
|
||||||
emacs-oni-circe
|
emacs-oni-circe
|
||||||
(with-my-emacs-company-package emacs-oni-clojure)
|
emacs-oni-clojure
|
||||||
(with-my-emacs-company-package emacs-oni-cmake)
|
emacs-oni-cmake
|
||||||
emacs-oni-conf
|
emacs-oni-conf
|
||||||
(with-my-emacs-company-package emacs-oni-cpp)
|
emacs-oni-cpp
|
||||||
(with-my-emacs-company-package emacs-oni-csharp)
|
emacs-oni-csharp
|
||||||
(with-my-emacs-company-package emacs-oni-css)
|
emacs-oni-css
|
||||||
emacs-oni-diff-hl
|
emacs-oni-diff-hl
|
||||||
emacs-oni-ediff
|
emacs-oni-ediff
|
||||||
emacs-oni-elm
|
emacs-oni-elm
|
||||||
|
@ -318,12 +313,12 @@
|
||||||
emacs-oni-nxml
|
emacs-oni-nxml
|
||||||
emacs-oni-package
|
emacs-oni-package
|
||||||
emacs-oni-projectile
|
emacs-oni-projectile
|
||||||
(with-my-emacs-company-package emacs-oni-scheme)
|
emacs-oni-scheme
|
||||||
emacs-oni-sh
|
emacs-oni-sh
|
||||||
emacs-oni-shr
|
emacs-oni-shr
|
||||||
emacs-oni-tramp
|
emacs-oni-tramp
|
||||||
emacs-oni-yaml
|
emacs-oni-yaml
|
||||||
(with-my-emacs-company-package emacs-oni-python)
|
emacs-oni-python
|
||||||
emacs-nginx-mode
|
emacs-nginx-mode
|
||||||
emacs-oni-git-commit
|
emacs-oni-git-commit
|
||||||
|
|
||||||
|
|
|
@ -642,36 +642,3 @@ faster and I highly recommend its usage if your Emacs version permits.")
|
||||||
(description "My cat is named Yoshi and I was just working on a random new theme, which was
|
(description "My cat is named Yoshi and I was just working on a random new theme, which was
|
||||||
new-theme for a while. I couldn't think of a name so I named it after him.")
|
new-theme for a while. I couldn't think of a name so I named it after him.")
|
||||||
(license license:gpl3+))))
|
(license license:gpl3+))))
|
||||||
|
|
||||||
(define-public oni-emacs-company
|
|
||||||
(package
|
|
||||||
(name "oni-emacs-company")
|
|
||||||
(version "0.10.2")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (string-append "https://elpa.gnu.org/packages/"
|
|
||||||
"company-" version ".tar"))
|
|
||||||
(sha256
|
|
||||||
(base32 "0j2qrnx2w2al4f2n37b89q0pkabh5ccv00gsknvgaylhy0za5gq9"))))
|
|
||||||
(build-system emacs-build-system)
|
|
||||||
(arguments
|
|
||||||
(list
|
|
||||||
#:include #~(cons* "icons/" %default-include)
|
|
||||||
#:phases
|
|
||||||
#~(modify-phases %standard-phases
|
|
||||||
(add-after 'move-doc 'install-doc-images
|
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
|
||||||
(let ((images (find-files "./images/small/" ".*\\.png$")))
|
|
||||||
(for-each (lambda (image)
|
|
||||||
(install-file image
|
|
||||||
(string-append #$output "/share/info/images/small")))
|
|
||||||
images)))))))
|
|
||||||
(home-page "https://company-mode.github.io/")
|
|
||||||
(synopsis "Modular text completion framework")
|
|
||||||
(description
|
|
||||||
"Company is a modular completion mechanism. Modules for retrieving
|
|
||||||
completion candidates are called back-ends, modules for displaying them are
|
|
||||||
front-ends. Company comes with many back-ends, e.g., @code{company-elisp}.
|
|
||||||
These are distributed in separate files and can be used individually.")
|
|
||||||
(license license:gpl3+)))
|
|
||||||
|
|
Loading…
Reference in a new issue