diff options
| author | Marius Bakke <marius@gnu.org> | 2021-05-23 14:07:34 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-05-23 17:49:56 +0200 |
| commit | dbcf2b61b1f48cbe84d51873f4e4de60897b914c (patch) | |
| tree | 92dc5d19b2899a91d22a53fb1a6e6f3ffedd8d2c /gnu/packages/emacs.scm | |
| parent | 9351b2a48145a690484ff38ace0ccb828c204c09 (diff) | |
| download | guix-patches-dbcf2b61b1f48cbe84d51873f4e4de60897b914c.tar guix-patches-dbcf2b61b1f48cbe84d51873f4e4de60897b914c.tar.gz | |
gnu: Fix erroneous uses of 'package/inherit'.
These packages use a different source/version from the inherited package, and
thus should not inherit replacements.
* gnu/packages/check.scm (googletest-1.8, python-pytest-runner-2): Use record
inheritance instead of PACKAGE/INHERIT.
* gnu/packages/crates-io.scm (rust-bindgen-0.49, rust-bytes-0.4,
rust-colored-1.9.1, rust-difference-1, rust-docopt-0.8, rust-html5ever-0.23,
rust-http-0.1, rust-http-body-0.1, rust-loom-0.2, rust-loom-0.1,
rust-pulldown-cmark-0.0.8, rust-ring-0.13, rust-rustls-0.12, rust-sct-0.3,
rust-term-0.2, rust-untrusted-0.6, rust-webpki-0.18, rust-webpki-roots-0.17,
rust-webpki-roots-0.14): Likewise.
* gnu/packages/emacs.scm (emacs-next, emacs-next-pgtk, guile-emacs): Likewise.
* gnu/packages/guile.scm (guile-2.2.4): Likewise.
* gnu/packages/maths.scm (hdf5-1.10, hdf5-1.12): Likewise.
* gnu/packages/protobuf.scm (protobuf-3.6, protobuf-3.5, python-protobuf-3.6):
Likewise.
* gnu/packages/python-web.scm (python2-html2text): Likewise.
* gnu/packages/python-xyz.scm (python-pygments/fixed, python2-numpy,
python2-urwid, python2-markdown, python2-fonttools): Likewise.
* gnu/packages/racket.scm (racket): Likewise.
* gnu/packages/sequoia.scm (sequoia4pEp): Likewise.
Diffstat (limited to 'gnu/packages/emacs.scm')
| -rw-r--r-- | gnu/packages/emacs.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 5316d25151..1a2b98bec2 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -305,7 +305,8 @@ languages.") (define-public emacs-next (let ((commit "2ea34662c20f71d35dd52a5ed996542c7386b9cb") (revision "0")) - (package/inherit emacs + (package + (inherit emacs) (name "emacs-next") (version (git-version "28.0.50" revision commit)) (source @@ -326,7 +327,8 @@ languages.") (define-public emacs-next-pgtk (let ((commit "ae18c8ec4f0ef37c8c9cda473770ff47e41291e2") (revision "1")) - (package/inherit emacs-next + (package + (inherit emacs-next) (name "emacs-next-pgtk") (version (git-version "28.0.50" revision commit)) (source @@ -450,7 +452,8 @@ editor (with wide ints)" ) (define-public guile-emacs (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b") (revision "0")) - (package/inherit emacs + (package + (inherit emacs) (name "guile-emacs") (version (git-version "0.0.0" revision commit)) (source (origin |