gnu: Remove python-setuptools-scm/next.
* 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:
		
							parent
							
								
									e22145ed35
								
							
						
					
					
						commit
						5b6ac91ee4
					
				
					 3 changed files with 6 additions and 18 deletions
				
			
		|  | @ -244,7 +244,7 @@ ENGINE_INC_PATH=~a/include | |||
|      `(("boost-python" ,boost-with-python3) | ||||
|        ("libpepadapter" ,libpepadapter) | ||||
|        ("pep-engine" ,pep-engine) | ||||
|        ("python-setuptools-scm" ,python-setuptools-scm/next) | ||||
|        ("python-setuptools-scm" ,python-setuptools-scm) | ||||
|        ("util-linux" ,util-linux "lib"))) ;; uuid.h | ||||
|     (home-page "https://pep.foundation/") | ||||
|     (synopsis "Python adapter for p≡p (pretty Easy Privacy)") | ||||
|  |  | |||
|  | @ -58,7 +58,7 @@ | |||
|     (native-inputs | ||||
|      `(("python-pep517" ,python-pep517) | ||||
|        ("python-setuptools" ,python-setuptools) | ||||
|        ("python-setuptools-scm" ,python-setuptools-scm/next) | ||||
|        ("python-setuptools-scm" ,python-setuptools-scm) | ||||
|        ("python-coverage" ,python-coverage) | ||||
|        ("python-coveralls" ,python-coveralls) | ||||
|        ("python-pyannotate" ,python-pyannotate) | ||||
|  | @ -86,7 +86,7 @@ were a single file.") | |||
|     (propagated-inputs | ||||
|      `(("python-cffi" ,python-cffi) | ||||
|        ("python-toml" ,python-toml) | ||||
|        ("python-setuptools-scm" ,python-setuptools-scm/next))) | ||||
|        ("python-setuptools-scm" ,python-setuptools-scm))) | ||||
|     (native-inputs | ||||
|      `(("python-setuptools" ,python-setuptools) | ||||
|        ("python-coverage" ,python-coverage) | ||||
|  | @ -114,7 +114,7 @@ Jump conversion filter by CFFI for Python.") | |||
|      `(("python-cffi" ,python-cffi))) | ||||
|     (native-inputs | ||||
|      `(("python-setuptools" ,python-setuptools) | ||||
|        ("python-setuptools-scm" ,python-setuptools-scm/next) | ||||
|        ("python-setuptools-scm" ,python-setuptools-scm) | ||||
|        ("python-pep517" ,python-pep517) | ||||
|        ("python-coverage" ,python-coverage) | ||||
|        ("python-pytest" ,python-pytest) | ||||
|  | @ -148,7 +148,7 @@ several possible methods.") | |||
|        ("python-zstandard" ,python-zstandard))) | ||||
|     (native-inputs | ||||
|      `(("python-setuptools" ,python-setuptools) | ||||
|        ("python-setuptools-scm" ,python-setuptools-scm/next) | ||||
|        ("python-setuptools-scm" ,python-setuptools-scm) | ||||
|        ("python-coverage" ,python-coverage) | ||||
|        ("python-coveralls" ,python-coveralls) | ||||
|        ("python-libarchive-c" ,python-libarchive-c) | ||||
|  |  | |||
|  | @ -6338,7 +6338,7 @@ the OleFileIO module from PIL, the Python Image Library.") | |||
|     (native-inputs | ||||
|      `(("pybind11" ,pybind11) | ||||
|        ("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-toml" ,python-toml) | ||||
|        ("python-wheel" ,python-wheel))) | ||||
|  | @ -7277,18 +7277,6 @@ child application and control it as if a human were typing commands.") | |||
| them as the version argument or in a SCM managed file.") | ||||
|     (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 | ||||
|   (package-with-python2 python-setuptools-scm)) | ||||
| 
 | ||||
|  |  | |||
		Reference in a new issue