[arguments]: Delete patch-node-shebang phase inherited from node. --- The build for libnode fails when it tries to run this phase. gnu/packages/node.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 9e07cd906e..687b5590ab 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2021 Tim Howes <timhowes@lavabit.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -238,4 +239,5 @@ devices.") `(cons* "--shared" "--without-npm" ,flags)) ((#:phases phases '%standard-phases) `(modify-phases ,phases - (delete 'patch-npm-shebang))))))) + (delete 'patch-npm-shebang) + (delete 'patch-node-shebang))))))) base-commit: f40ddf95a34944673cd6262b7aae0c643e653ff9 -- 2.30.0
* gnu/packages/emacs-xyz.scm (emacs-calibredb): Update to 2.8.0. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 08cbb70b0a..99c186ad6b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -62,7 +62,7 @@ ;;; Copyright © 2020 Evan Straw <evan.straw99@gmail.com> ;;; Copyright © 2020 Masaya Tojo <masaya@tojo.tokyo> ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> -;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> +;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 6033fe7de85d <6033fe7de85d@airmail.cc> ;;; Copyright © 2020 John Soo <jsoo1@asu.edu> @@ -22572,7 +22572,7 @@ through Dash docsets.") (define-public emacs-calibredb (package (name "emacs-calibredb") - (version "2.7.0") + (version "2.8.0") (source (origin (method git-fetch) @@ -22581,7 +22581,7 @@ through Dash docsets.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1w3kz9iny72gk54jdafz8sy5sv6hnpm3rw4fn1r8aznx4p00f9dy")))) + (base32 "19gc05k2p1l8wlkrqij9cw6d61hzknd6a9n64kzlpi87cpbav3lv")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- 2.30.0
[-- Attachment #1: Type: text/plain, Size: 39 bytes --] Fixed the commit message formatting. [-- Attachment #2: 0001-libnode-Delete-patch-node-shebang.patch --] [-- Type: text/x-patch, Size: 1343 bytes --] From 4237b0f79b50f6783f6389e82b28a6daefec0a47 Mon Sep 17 00:00:00 2001 From: Tim Howes <timhowes@lavabit.com> Date: Wed, 6 Jan 2021 09:20:00 -0800 Subject: [PATCH] gnu: libnode: Delete patch-node-shebang. * gnu/packages/node.scm (libnode): Delete patch-node-shebang. [arguments]: Delete patch-node-shebang phase inherited from node. --- The build for libnode fails when it tries to run this phase. gnu/packages/node.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 9e07cd906e..687b5590ab 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2021 Tim Howes <timhowes@lavabit.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -238,4 +239,5 @@ devices.") `(cons* "--shared" "--without-npm" ,flags)) ((#:phases phases '%standard-phases) `(modify-phases ,phases - (delete 'patch-npm-shebang))))))) + (delete 'patch-npm-shebang) + (delete 'patch-node-shebang))))))) base-commit: f40ddf95a34944673cd6262b7aae0c643e653ff9 -- 2.30.0
Hello,
Michael Rohleder <mike@rohleder.de> writes:
> * gnu/packages/emacs-xyz.scm (emacs-calibredb): Update to 2.8.0.
Applied. Thank you.
Regards,
--
Nicolas Goaziou