aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2019-10-27 08:34:41 +0100
committerRicardo Wurmus <rekado@elephly.net>2019-10-27 08:34:41 +0100
commitbdce983a25b45f9d1bfbadefb3fae870eb8974e3 (patch)
treefae5b80628e2b96f6130d7975b7f365539156f89
parentb8731d03a7caf8a2594eca90cbb509cc860994ee (diff)
downloadguix-bdce983a25b45f9d1bfbadefb3fae870eb8974e3.tar.gz
guix-bdce983a25b45f9d1bfbadefb3fae870eb8974e3.zip
gnu: r-digest: Update to 0.6.22.
* gnu/packages/statistics.scm (r-digest): Update to 0.6.22.
Diffstat
-rw-r--r--gnu/packages/statistics.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index a803993f3b..09b4e01ca5 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -805,13 +805,13 @@ effects of different types of color-blindness.")
(define-public r-digest
(package
(name "r-digest")
- (version "0.6.21")
+ (version "0.6.22")
(source
(origin
(method url-fetch)
(uri (cran-uri "digest" version))
(sha256
- (base32 "0qycqchmv59fb6jp369d82mcx9xgbv70m18qzam0vrs8zkmajb17"))))
+ (base32 "1qav52y1qmkg9j2g48mrl6bbjwhs0fs9dl55xb62lfkrihkappqh"))))
(build-system r-build-system)
;; Vignettes require r-knitr, which requires r-digest, so we have to
;; disable them and the tests.
generated by cgit
one' style='width: 92.0%;'/>
4 files changed, 5 insertions, 27 deletions
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index c0cba8076f..d6a788e21c 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -293,8 +293,7 @@ files and generates build instructions for the Ninja build system.")
(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 @@ files and generates build instructions for the Ninja build system.")
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 @@ files}, are written in a custom domain-specific language (@dfn{DSL}) that
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 @@ resembles 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")
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 3b5e306de1..c68178099b 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -134,8 +134,7 @@
(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
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 4bb8ac342d..7dd426608d 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -1081,7 +1081,7 @@ doing practical, real world data analysis in Python.")
(inputs
(list which xclip xsel))
(native-inputs
- (list meson-python/newer
+ (list meson-python
python-beautifulsoup4
python-cython-0.29.35
python-html5lib
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 236e19b59a..d88db26f00 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1296,7 +1296,7 @@ into dataclasses.")
(list python-numpy))
(native-inputs
(list cmake
- meson-python/newer
+ meson-python
pkg-config
pybind11
python-pytest
generated by cgit