mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: meson: Update to 1.1.1 and ungraft.
* gnu/packages/build-tools.scm (meson): Update to 1.1.1. [replacement]: Remove. (meson/newer): Remove. (meson-python/newer): Remove. * gnu/packages/pdf.scm (capypdf)[arguments]: Remove #:meson. Change-Id: I77dd9203461e8dd635753ec742bd8046dd63e3f9 * gnu/packages/python-science.scm (python-pandas-2): Use regular meson-python. * gnu/packages/python-xyz.scm (python-contourpy): Same
This commit is contained in:
parent
c89d2bcceb
commit
bb5a447992
4 changed files with 5 additions and 27 deletions
|
@ -293,8 +293,7 @@ (define-public gn
|
|||
(define-public meson
|
||||
(package
|
||||
(name "meson")
|
||||
(replacement meson/newer)
|
||||
(version "1.1.0")
|
||||
(version "1.2.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/mesonbuild/meson/"
|
||||
|
@ -302,7 +301,7 @@ (define-public meson
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"17w2zymmvrffhfpqsaj7qcbjwgv9iaawcpzhz2gnhlvcrm26qqfr"))))
|
||||
"1x9rnrbwvzhnzmz4zqag44w06khks8wckcajxsbr8m4760akmnxi"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f ;disabled to avoid extra dependencies
|
||||
|
@ -330,19 +329,6 @@ (define-public meson
|
|||
resembles Python.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public meson/newer
|
||||
(package
|
||||
(inherit meson)
|
||||
(version "1.2.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/mesonbuild/meson/"
|
||||
"releases/download/" version "/meson-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1x9rnrbwvzhnzmz4zqag44w06khks8wckcajxsbr8m4760akmnxi"))))))
|
||||
|
||||
(define-public meson-python
|
||||
(package
|
||||
(name "meson-python")
|
||||
|
@ -396,13 +382,6 @@ (define-public meson-python
|
|||
(description "Meson-python is a PEP 517 build backend for Meson projects.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public meson-python/newer
|
||||
(package
|
||||
(inherit meson-python)
|
||||
(propagated-inputs
|
||||
(modify-inputs (package-propagated-inputs meson-python)
|
||||
(replace "meson" meson/newer)))))
|
||||
|
||||
(define-public premake4
|
||||
(package
|
||||
(name "premake")
|
||||
|
|
|
@ -134,8 +134,7 @@ (define-public capypdf
|
|||
(base32 "0kp1dcww5zl04wnbqbi8vjzpc5qgr8gr8rcx0s6s4xbjnzvqqw8d"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list #:meson meson/newer
|
||||
#:configure-flags #~(list "-Dcpp_std=c++23")
|
||||
(list #:configure-flags #~(list "-Dcpp_std=c++23")
|
||||
#:test-options '(list "plainc")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
|
|
|
@ -1081,7 +1081,7 @@ (define-public python-pandas-2
|
|||
(inputs
|
||||
(list which xclip xsel))
|
||||
(native-inputs
|
||||
(list meson-python/newer
|
||||
(list meson-python
|
||||
python-beautifulsoup4
|
||||
python-cython-0.29.35
|
||||
python-html5lib
|
||||
|
|
|
@ -1296,7 +1296,7 @@ (define-public python-contourpy
|
|||
(list python-numpy))
|
||||
(native-inputs
|
||||
(list cmake
|
||||
meson-python/newer
|
||||
meson-python
|
||||
pkg-config
|
||||
pybind11
|
||||
python-pytest
|
||||
|
|
Loading…
Reference in a new issue