ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 14:28:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Remove python-setuptools-scm/next.

Browse source 
* gnu/packages/python-xyz.scm (python-setuptools-scm/next): Remove
variable.
(python-pikepdf) [native-inputs]: Swap for python-setuptools-scm.
* gnu/packages/python-compression.scm (python-multivolumefile,
python-bcj-cffi, python-ppmd-cffi, python-p77zr)[native-inputs]: Same.
* gnu/packages/pep.scm (python-pep-adapter)[native-inputs]: Same.
This commit is contained in:
Efraim Flashner 2021-08-09 16:05:22 +03:00
parent e22145ed35
commit 5b6ac91ee4
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
3 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/pep.scm
View file

@ -244,7 +244,7 @@ (define-public python-pep-adapter
`(("boost-python" ,boost-with-python3) `(("boost-python" ,boost-with-python3)
("libpepadapter" ,libpepadapter) ("libpepadapter" ,libpepadapter)
("pep-engine" ,pep-engine) ("pep-engine" ,pep-engine)
("python-setuptools-scm" ,python-setuptools-scm/next) ("python-setuptools-scm" ,python-setuptools-scm)
("util-linux" ,util-linux "lib"))) ;; uuid.h ("util-linux" ,util-linux "lib"))) ;; uuid.h
(home-page "https://pep.foundation/") (home-page "https://pep.foundation/")
(synopsis "Python adapter for p≡p (pretty Easy Privacy)") (synopsis "Python adapter for p≡p (pretty Easy Privacy)")

8
gnu/packages/python-compression.scm
View file

@ -58,7 +58,7 @@ (define-public python-multivolumefile
(native-inputs (native-inputs
`(("python-pep517" ,python-pep517) `(("python-pep517" ,python-pep517)
("python-setuptools" ,python-setuptools) ("python-setuptools" ,python-setuptools)
("python-setuptools-scm" ,python-setuptools-scm/next) ("python-setuptools-scm" ,python-setuptools-scm)
("python-coverage" ,python-coverage) ("python-coverage" ,python-coverage)
("python-coveralls" ,python-coveralls) ("python-coveralls" ,python-coveralls)
("python-pyannotate" ,python-pyannotate) ("python-pyannotate" ,python-pyannotate)
@ -86,7 +86,7 @@ (define-public python-bcj-cffi
(propagated-inputs (propagated-inputs
`(("python-cffi" ,python-cffi) `(("python-cffi" ,python-cffi)
("python-toml" ,python-toml) ("python-toml" ,python-toml)
("python-setuptools-scm" ,python-setuptools-scm/next))) ("python-setuptools-scm" ,python-setuptools-scm)))
(native-inputs (native-inputs
`(("python-setuptools" ,python-setuptools) `(("python-setuptools" ,python-setuptools)
("python-coverage" ,python-coverage) ("python-coverage" ,python-coverage)
@ -114,7 +114,7 @@ (define-public python-ppmd-cffi
`(("python-cffi" ,python-cffi))) `(("python-cffi" ,python-cffi)))
(native-inputs (native-inputs
`(("python-setuptools" ,python-setuptools) `(("python-setuptools" ,python-setuptools)
("python-setuptools-scm" ,python-setuptools-scm/next) ("python-setuptools-scm" ,python-setuptools-scm)
("python-pep517" ,python-pep517) ("python-pep517" ,python-pep517)
("python-coverage" ,python-coverage) ("python-coverage" ,python-coverage)
("python-pytest" ,python-pytest) ("python-pytest" ,python-pytest)
@ -148,7 +148,7 @@ (define-public python-py7zr
("python-zstandard" ,python-zstandard))) ("python-zstandard" ,python-zstandard)))
(native-inputs (native-inputs
`(("python-setuptools" ,python-setuptools) `(("python-setuptools" ,python-setuptools)
("python-setuptools-scm" ,python-setuptools-scm/next) ("python-setuptools-scm" ,python-setuptools-scm)
("python-coverage" ,python-coverage) ("python-coverage" ,python-coverage)
("python-coveralls" ,python-coveralls) ("python-coveralls" ,python-coveralls)
("python-libarchive-c" ,python-libarchive-c) ("python-libarchive-c" ,python-libarchive-c)

14
gnu/packages/python-xyz.scm
View file

@ -6338,7 +6338,7 @@ (define-public python-pikepdf
(native-inputs (native-inputs
`(("pybind11" ,pybind11) `(("pybind11" ,pybind11)
("python-setuptools" ,python-setuptools) ("python-setuptools" ,python-setuptools)
("python-setuptools-scm" ,python-setuptools-scm/next) ("python-setuptools-scm" ,python-setuptools-scm)
("python-setuptools-scm-git-archive" ,python-setuptools-scm-git-archive) ("python-setuptools-scm-git-archive" ,python-setuptools-scm-git-archive)
("python-toml" ,python-toml) ("python-toml" ,python-toml)
("python-wheel" ,python-wheel))) ("python-wheel" ,python-wheel)))
@ -7277,18 +7277,6 @@ (define-public python-setuptools-scm
them as the version argument or in a SCM managed file.") them as the version argument or in a SCM managed file.")
(license license:expat))) (license license:expat)))
;; TODO: Merge with 'python-setuptools-scm' on the next rebuild cycle.
(define-public python-setuptools-scm/next
(package
(inherit python-setuptools-scm)
(version "5.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "setuptools_scm" version))
(sha256
(base32 "0ahlrxxkx2xhmxskx57gc96w3bdndflxx30304ihvm7ds136nny8"))))))
(define-public python2-setuptools-scm (define-public python2-setuptools-scm
(package-with-python2 python-setuptools-scm)) (package-with-python2 python-setuptools-scm))