[debbugs-tracker] bug#32015: closed ([PATCH] gnu: emacs-nix-mode: Do not inherit 'nix'.)

[GNU bug Tracking System]

Your message dated Sun, 01 Jul 2018 19:38:36 +0300
with message-id <address@hidden>
and subject line Re: [bug#32015] [PATCH] gnu: emacs-nix-mode: Do not inherit 
'nix'.
has caused the debbugs.gnu.org bug report #32015,
regarding [PATCH] gnu: emacs-nix-mode: Do not inherit 'nix'.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
32015: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=32015
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: emacs-nix-mode: Do not inherit 'nix'.
>
>
>
>
> Date: 
>
> Sat, 30 Jun 2018 06:05:56 +0300
>
>
>
>
> 'nix' version 2 doesn't provide Emacs libraries.
>
> * gnu/packages/package-management.scm (emacs-nix-mode): Do not inherit 'nix'.
> ---
>  gnu/packages/package-management.scm | 28 ++++++++++++++++++----------
>  1 file changed, 18 insertions(+), 10 deletions(-)
>
> diff --git a/gnu/packages/package-management.scm 
> b/gnu/packages/package-management.scm
> index 6a55f62ee..1c31230e5 100644
> --- a/gnu/packages/package-management.scm
> +++ b/gnu/packages/package-management.scm
> @@ -2,7 +2,7 @@
>  ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès 
> <address@hidden>
>  ;;; Copyright © 2015, 2017 Ricardo Wurmus <address@hidden>
>  ;;; Copyright © 2017 Muriithi Frederick Muriuki <address@hidden>
> -;;; Copyright © 2017 Oleg Pykhalov <address@hidden>
> +;;; Copyright © 2017, 2018 Oleg Pykhalov <address@hidden>
>  ;;; Copyright © 2017 Roel Janssen <address@hidden>
>  ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
>  ;;; Copyright © 2018 Julien Lepiller <address@hidden>
> @@ -41,6 +41,7 @@
>    #:use-module (gnu packages curl)
>    #:use-module (gnu packages databases)
>    #:use-module (gnu packages docbook)
> +  #:use-module (gnu packages emacs)
>    #:use-module (gnu packages file)
>    #:use-module (gnu packages gettext)
>    #:use-module (gnu packages glib)
> @@ -433,20 +434,27 @@ sub-directory.")
>  
>  (define-public emacs-nix-mode
>    (package
> -    (inherit nix)
>      (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)
> -    (arguments
> -     `(#:phases
> -       (modify-phases %standard-phases
> -         (add-after 'unpack 'chdir-elisp
> -           ;; Elisp directory is not in root of the source.
> -           (lambda _
> -             (chdir "misc/emacs"))))))
> +    (inputs
> +     `(("emacs-company" ,emacs-company)
> +       ("emacs-mmm-mode" ,emacs-mmm-mode)))
> +    (home-page "https://github.com/NixOS/nix-mode";)
>      (synopsis "Emacs major mode for editing Nix expressions")
>      (description "@code{nixos-mode} provides an Emacs major mode for editing
>  Nix expressions.  It supports syntax highlighting, indenting and refilling of
> -comments.")))
> +comments.")
> +    (license license:lgpl2.1+)))
>  
>  (define-public stow
>    (package
> -- 
> 2.18.0
>
>
>
>
> --- End Message ---

--- Begin Message --- Subject: Re: [bug#32015] [PATCH] gnu: emacs-nix-mode: Do not inherit 'nix'. Date: Sun, 01 Jul 2018 19:38:36 +0300 User-agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux)

Hello,

address@hidden (宋文武) writes:

> Oleg Pykhalov <address@hidden> writes:
>
>> 'nix' version 2 doesn't provide Emacs libraries.
>>
>
> Applied, thank you!

Thank you for review.

Oleg.

signature.asc
Description: PGP signature

--- End Message ---