[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#48082: [PATCH] environment: Add support for <inferior-package>.
From: |
zimoun |
Subject: |
bug#48082: [PATCH] environment: Add support for <inferior-package>. |
Date: |
Tue, 17 Aug 2021 12:01:37 +0200 |
Hi Brice,
Thanks for the fix. :-)
On Sun, 01 Aug 2021 at 23:12, Brice Waegeneire <brice@waegenei.re> wrote:
> Fix <https://issues.guix.gnu.org/48082>.
Usually, the commit message is:
Fixes <https://bugs.gnu.org/48082>.
> * guix/scripts/environment.scm (input->manifest-entry): Add support for
> <inferior-package>.
> ---
> guix/scripts/environment.scm | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> Ricardo, thank you for the links, I managed to reproduce the issue. And fixed
> it with the help of Ludovic on IRC.
>
> diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
> index 6958bd6238..c464e7cfb3 100644
> --- a/guix/scripts/environment.scm
> +++ b/guix/scripts/environment.scm
> @@ -2,6 +2,7 @@
> ;;; Copyright © 2014, 2015, 2018 David Thompson <davet@gnu.org>
> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès
> <ludo@gnu.org>
> ;;; Copyright © 2018 Mike Gerwitz <mtg@gnu.org>
> +;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -28,6 +29,7 @@
> #:use-module (guix packages)
> #:use-module (guix profiles)
> #:use-module (guix search-paths)
> + #:use-module (guix inferior)
> #:use-module (guix build utils)
> #:use-module (guix monads)
> #:use-module ((guix gexp) #:select (lower-object))
> @@ -74,6 +76,10 @@ package."
> (package->manifest-entry package))
> ((_ (? package? package) output)
> (package->manifest-entry package output))
> + ((_ (? inferior-package? package))
> + (inferior-package->manifest-entry package))
> + ((_ (? inferior-package? package) output)
> + (inferior-package->manifest-entry package output))
> (_
> #f)))
LGTM.
All the best,
simon