amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Fix erroneous uses of 'package/inherit'.

Browse source 
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.
This commit is contained in:
Marius Bakke 2021-05-23 14:07:34 +02:00
parent 9351b2a481
commit dbcf2b61b1
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
10 changed files with 76 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/protobuf.scm
View file

@ -123,7 +123,8 @@ internal RPC protocols and file formats.")
;; Tensorflow requires version 3.6 specifically.
(define-public protobuf-3.6
(package/inherit protobuf
(package
(inherit protobuf)
(version "3.6.1")
(source (origin
(method url-fetch)
@ -136,8 +137,8 @@ internal RPC protocols and file formats.")
;; The 3.5 series are the last versions that do not require C++ 11.
(define-public protobuf-3.5
(package/inherit
protobuf
(package
(inherit protobuf)
(version "3.5.1")
(source (origin
(method url-fetch)
@ -289,7 +290,8 @@ structured data.")
;; For tensorflow.
(define-public python-protobuf-3.6
(package/inherit python-protobuf
(package
(inherit python-protobuf)
(name "python-protobuf")
(version (package-version protobuf-3.6) )
(source