mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 13:58:15 -05:00
gnu: emacs-nix-mode: Fix build by switching upstream source.
'nix' version 2 doesn't provide Emacs libraries anymore. * gnu/packages/package-management.scm (emacs-nix-mode): Do not inherit 'nix'. Switch upstream source to <https://github.com/nixos/nix-mode>. Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
This commit is contained in:
parent
7a3772b374
commit
49d9fce827
1 changed files with 18 additions and 10 deletions
|
@ -2,7 +2,7 @@
|
||||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
|
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||||
;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis@gmail.com>
|
;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis@gmail.com>
|
||||||
;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
|
;;; Copyright © 2017, 2018 Oleg Pykhalov <go.wigust@gmail.com>
|
||||||
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
|
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
|
||||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
|
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
|
||||||
|
@ -41,6 +41,7 @@ (define-module (gnu packages package-management)
|
||||||
#:use-module (gnu packages curl)
|
#:use-module (gnu packages curl)
|
||||||
#:use-module (gnu packages databases)
|
#:use-module (gnu packages databases)
|
||||||
#:use-module (gnu packages docbook)
|
#:use-module (gnu packages docbook)
|
||||||
|
#:use-module (gnu packages emacs)
|
||||||
#:use-module (gnu packages file)
|
#:use-module (gnu packages file)
|
||||||
#:use-module (gnu packages gettext)
|
#:use-module (gnu packages gettext)
|
||||||
#:use-module (gnu packages glib)
|
#:use-module (gnu packages glib)
|
||||||
|
@ -433,20 +434,27 @@ (define-public nix
|
||||||
|
|
||||||
(define-public emacs-nix-mode
|
(define-public emacs-nix-mode
|
||||||
(package
|
(package
|
||||||
(inherit nix)
|
|
||||||
(name "emacs-nix-mode")
|
(name "emacs-nix-mode")
|
||||||
|
(version "1.2.2")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "https://github.com/NixOS/nix-mode/archive/v"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"06aqz0czznsj8835jqnk794sy2p6pa8kxfqwh0nl5d5vxivria6z"))))
|
||||||
(build-system emacs-build-system)
|
(build-system emacs-build-system)
|
||||||
(arguments
|
(inputs
|
||||||
`(#:phases
|
`(("emacs-company" ,emacs-company)
|
||||||
(modify-phases %standard-phases
|
("emacs-mmm-mode" ,emacs-mmm-mode)))
|
||||||
(add-after 'unpack 'chdir-elisp
|
(home-page "https://github.com/NixOS/nix-mode")
|
||||||
;; Elisp directory is not in root of the source.
|
|
||||||
(lambda _
|
|
||||||
(chdir "misc/emacs"))))))
|
|
||||||
(synopsis "Emacs major mode for editing Nix expressions")
|
(synopsis "Emacs major mode for editing Nix expressions")
|
||||||
(description "@code{nixos-mode} provides an Emacs major mode for editing
|
(description "@code{nixos-mode} provides an Emacs major mode for editing
|
||||||
Nix expressions. It supports syntax highlighting, indenting and refilling of
|
Nix expressions. It supports syntax highlighting, indenting and refilling of
|
||||||
comments.")))
|
comments.")
|
||||||
|
(license license:lgpl2.1+)))
|
||||||
|
|
||||||
(define-public stow
|
(define-public stow
|
||||||
(package
|
(package
|
||||||
|
|
Loading…
Reference in a new issue