From 0883f34c5152b249f8aa05ba7deb0400ea150628 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Mar 2020 09:09:47 +0100 Subject: gnu: ungoogled-chromium: Update to 80.0.3987.149-0.516e2d9 [security fixes]. This releases fixes CVE-2020-6422, CVE-2020-6424, CVE-2020-6425, CVE-2020-6426, CVE-2020-6427, CVE-2020-6428, CVE-2020-6429, CVE-2019-20503, and CVE-2020-6449. * gnu/packages/chromium.scm (%chromium-version): Set to 80.0.3987.149. (%ungoogled-revision): Set to 516e2d990a50a4bbeb8c583e56333c2935e2af95. (%chromium-origin, %ungoogled-origin): Update hashes. --- gnu/packages/chromium.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index bb0993a4b4..e90d4e7184 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -247,8 +247,8 @@ (define* (computed-origin-method gexp-promise hash-algo hash #:system system #:guile-for-build guile))) -(define %chromium-version "80.0.3987.132") -(define %ungoogled-revision "7e68f18f1d16a132fe7d913a176daf79897eaa58") +(define %chromium-version "80.0.3987.149") +(define %ungoogled-revision "516e2d990a50a4bbeb8c583e56333c2935e2af95") (define %debian-revision "debian/80.0.3987.116-1") (define package-revision "0") (define %package-version (string-append %chromium-version "-" @@ -263,7 +263,7 @@ (define %chromium-origin %chromium-version ".tar.xz")) (sha256 (base32 - "00f2hpi2d0n15yw29dv3dli566cgi7qh55bfpziag9a6j02i401c")))) + "07icl3hgg1wjkmz88lbpjf6ll4xyi64spki1nmsy6899jgkxvgjh")))) (define %ungoogled-origin (origin @@ -274,7 +274,7 @@ (define %ungoogled-origin (string-take %ungoogled-revision 7))) (sha256 (base32 - "196rr3nly42pzl2bap22vzw4d8x87yl3zy1wq2fla5z8iy4x8ym1")))) + "0nm55qq4ahw9haf5g7hmzic4mr2xjgpay7lxps7xjp7s1pda4g0q")))) (define %debian-origin (origin -- cgit v1.2.3 From f7100edaf69222bd0c38c51ff84df44348b1bf90 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 09:58:25 +0100 Subject: gnu: r-biosigner: Update to 1.14.2. * gnu/packages/bioconductor.scm (r-biosigner): Update to 1.14.2. [native-inputs]: Remove r-rmarkdown, pandoc, and pandoc-citeproc. --- gnu/packages/bioconductor.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index bc7623eac3..7470fd4b29 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5316,14 +5316,14 @@ (define-public r-ropls (define-public r-biosigner (package (name "r-biosigner") - (version "1.14.0") + (version "1.14.2") (source (origin (method url-fetch) (uri (bioconductor-uri "biosigner" version)) (sha256 (base32 - "1kdfhw629qczrfms0jmphqz0ksjzi8js00xj92h1lnv092npfk0j")))) + "184vbbd010yzqv0qn1prxiazibxwiacvlpg9yzcgyhamcx9bvq73")))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) @@ -5332,10 +5332,7 @@ (define-public r-biosigner ("r-randomforest" ,r-randomforest) ("r-ropls" ,r-ropls))) (native-inputs - `(("r-knitr" ,r-knitr) - ("r-rmarkdown" ,r-rmarkdown) - ("pandoc" ,ghc-pandoc) - ("pandoc-citeproc" ,ghc-pandoc-citeproc))) ; all for vignettes + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/biosigner/") (synopsis "Signature discovery from omics data") (description -- cgit v1.2.3 From 2d6a7bca9e196bea3a13ebf90ed4b18c6e781117 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 09:59:05 +0100 Subject: gnu: r-biocpkgtools: Update to 1.4.6. * gnu/packages/bioconductor.scm (r-biocpkgtools): Update to 1.4.6. [propagated-inputs]: Add r-biocfilecache, r-rappdirs, r-rlang, and r-tidyselect. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7470fd4b29..6ec74140e3 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7399,18 +7399,19 @@ (define-public r-biocor (define-public r-biocpkgtools (package (name "r-biocpkgtools") - (version "1.4.0") + (version "1.4.6") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocPkgTools" version)) (sha256 (base32 - "0gyhb3071pxmvaxla7cxy9k97s3z3ynl62jnqz9jnkd53c7jnd53")))) + "0grwnmncmpqcplbfw3j210m1a8f7mmdizklh4zksg4ic21dpjj1a")))) (properties `((upstream-name . "BiocPkgTools"))) (build-system r-build-system) (propagated-inputs - `(("r-biocmanager" ,r-biocmanager) + `(("r-biocfilecache" ,r-biocfilecache) + ("r-biocmanager" ,r-biocmanager) ("r-biocviews" ,r-biocviews) ("r-dplyr" ,r-dplyr) ("r-dt" ,r-dt) @@ -7422,14 +7423,19 @@ (define-public r-biocpkgtools ("r-igraph" ,r-igraph) ("r-jsonlite" ,r-jsonlite) ("r-magrittr" ,r-magrittr) + ("r-rappdirs" ,r-rappdirs) ("r-rbgl" ,r-rbgl) ("r-readr" ,r-readr) ("r-rex" ,r-rex) + ("r-rlang" ,r-rlang) ("r-rvest" ,r-rvest) ("r-stringr" ,r-stringr) ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr) + ("r-tidyselect" ,r-tidyselect) ("r-xml2" ,r-xml2))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/seandavi/BiocPkgTools") (synopsis "Collection of tools for learning about Bioconductor packages") (description -- cgit v1.2.3 From 30c56e67f7bbad2501fc855b404bd30c5bf68524 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 09:59:45 +0100 Subject: gnu: r-crosstalk: Update to 1.1.0.1. * gnu/packages/cran.scm (r-crosstalk): Update to 1.1.0.1. [propagated-inputs]: Remove r-ggplot2 and r-shiny. --- gnu/packages/cran.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4c18275eaa..f0f6c9e8be 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1157,22 +1157,20 @@ (define-public r-sankeyd3 (define-public r-crosstalk (package (name "r-crosstalk") - (version "1.0.0") + (version "1.1.0.1") (source (origin (method url-fetch) (uri (cran-uri "crosstalk" version)) (sha256 (base32 - "0lfa89vhrzi7a1rghmygcjr8gzddw35sinb3jx6g49mc9jias7mk")))) + "03ihj7cimkklrbad9zic78xsrfcisygmgy859hqnx0hiph80p9rn")))) (build-system r-build-system) (propagated-inputs - `(("r-ggplot2" ,r-ggplot2) - ("r-htmltools" ,r-htmltools) + `(("r-htmltools" ,r-htmltools) ("r-jsonlite" ,r-jsonlite) ("r-lazyeval" ,r-lazyeval) - ("r-r6" ,r-r6) - ("r-shiny" ,r-shiny))) + ("r-r6" ,r-r6))) (home-page "https://rstudio.github.io/crosstalk/") (synopsis "Inter-widget interactivity for HTML widgets") (description -- cgit v1.2.3 From 07764987407d2faf22686e932ae170b34e9554ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:00:07 +0100 Subject: gnu: r-glue: Update to 1.3.2. * gnu/packages/cran.scm (r-glue): Update to 1.3.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f0f6c9e8be..273f47c1b9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1521,14 +1521,14 @@ (define-public r-colorspace (define-public r-glue (package (name "r-glue") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (cran-uri "glue" version)) (sha256 (base32 - "1a1ycg9r3gd91visp49q49rsrdgyf8kr9dxdy3hk99kikn4z5hag")))) + "0alklqcf68kmccssp4j7a7fv553pyqyy6mkkfslav83inppm4d3g")))) (build-system r-build-system) (home-page "https://github.com/tidyverse/glue") (synopsis "Interpreted string literals") -- cgit v1.2.3 From cabdfeab76e777497f9a1cc4fa6b7e6b58497c86 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:00:14 +0100 Subject: gnu: r-rcpp: Update to 1.0.4. * gnu/packages/cran.scm (r-rcpp): Update to 1.0.4. [native-inputs]: Remove r-knitr. --- gnu/packages/cran.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 273f47c1b9..ef0d3b875f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1689,16 +1689,14 @@ (define-public r-pkgload (define-public r-rcpp (package (name "r-rcpp") - (version "1.0.3") + (version "1.0.4") (source (origin (method url-fetch) (uri (cran-uri "Rcpp" version)) (sha256 - (base32 "03h3zyjq948y0hrrs95lfk4zgx6wfrg64hjlrfrzf5na7bfh0d9b")))) + (base32 "1m80pdhzi2p82db5xkbwc2m3fzv6df59955yj03nlq40fj7zx4nr")))) (build-system r-build-system) - (native-inputs - `(("r-knitr" ,r-knitr))) ; for vignettes (home-page "http://www.rcpp.org") (synopsis "Seamless R and C++ integration") (description -- cgit v1.2.3 From 1c7a4952ff728177de40d0037e8b75d9e73c412e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:00:29 +0100 Subject: gnu: r-ffbase: Update to 0.12.8. * gnu/packages/cran.scm (r-ffbase): Update to 0.12.8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ef0d3b875f..6406e167f4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2010,14 +2010,14 @@ (define-public r-ff (define-public r-ffbase (package (name "r-ffbase") - (version "0.12.7") + (version "0.12.8") (source (origin (method url-fetch) (uri (cran-uri "ffbase" version)) (sha256 (base32 - "04kxx2f3f0743c5nvpb7x1x0pcd220dazpd5ag1pidxbz3xa85nw")))) + "0mjk7dkq1ginqqfvngzny747ggf9a8fd7kblq96n5ys1jrwjyqhq")))) (build-system r-build-system) (propagated-inputs `(("r-bit" ,r-bit) -- cgit v1.2.3 From b8168e894547af5650300457810848ae8f65a357 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:00:36 +0100 Subject: gnu: r-rmysql: Update to 0.10.20. * gnu/packages/cran.scm (r-rmysql): Update to 0.10.20. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6406e167f4..350e439b41 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2796,14 +2796,14 @@ (define-public r-magic (define-public r-rmysql (package (name "r-rmysql") - (version "0.10.19") + (version "0.10.20") (source (origin (method url-fetch) (uri (cran-uri "RMySQL" version)) (sha256 (base32 - "0269pfq791qvax69lrwvvzgllyzm3cy3sdp9sakwxzvw5pxk2vhv")))) + "0lv9m6zpm8dgv7yixr6xhw379vbq45d7n7gkrmjrppdj8vcih77i")))) (properties `((upstream-name . "RMySQL"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 99de0bd1dc3e1d5d7e826a526ae1ce7d97441048 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:00:48 +0100 Subject: gnu: r-recipes: Update to 0.1.10. * gnu/packages/cran.scm (r-recipes): Update to 0.1.10. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 350e439b41..7893219a0c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3098,14 +3098,14 @@ (define-public r-broom (define-public r-recipes (package (name "r-recipes") - (version "0.1.9") + (version "0.1.10") (source (origin (method url-fetch) (uri (cran-uri "recipes" version)) (sha256 (base32 - "1fmnka583sqm6v5bhxbllb4cd5xfqbf268aij2xgxiwckv3c0ynm")))) + "11f96aanrzi2v6cn49fhvf9y4cmhra63wcy6nvpv6hcfaqqmwd2g")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) @@ -3123,6 +3123,8 @@ (define-public r-recipes ("r-tidyselect" ,r-tidyselect) ("r-timedate" ,r-timedate) ("r-withr" ,r-withr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/topepo/recipes") (synopsis "Preprocessing tools to create design matrices") (description -- cgit v1.2.3 From e6f4f314ba55b9236689d130e146e64224db8f9d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:01:04 +0100 Subject: gnu: r-officer: Update to 0.3.8. * gnu/packages/cran.scm (r-officer): Update to 0.3.8. [propagated-inputs]: Remove r-digest. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7893219a0c..ab47103c04 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6198,22 +6198,23 @@ (define-public r-rdpack (define-public r-officer (package (name "r-officer") - (version "0.3.7") + (version "0.3.8") (source (origin (method url-fetch) (uri (cran-uri "officer" version)) (sha256 (base32 - "1zyrcf0xxm67bskynjac8dhil2as7rb0mmqaq30zp9lrgfwiycpz")))) + "0xhx5n6qksyh2s9hvwhnc8y0hn362asc5y94ld06snad786hz0rw")))) (build-system r-build-system) (propagated-inputs - `(("r-digest" ,r-digest) - ("r-magrittr" ,r-magrittr) + `(("r-magrittr" ,r-magrittr) ("r-r6" ,r-r6) ("r-uuid" ,r-uuid) ("r-xml2" ,r-xml2) ("r-zip" ,r-zip))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://davidgohel.github.io/officer") (synopsis "Manipulation of Word and PowerPoint documents") (description -- cgit v1.2.3 From 5cef0ef018ec113e24b32d85c4f5108e9584e6c1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:01:29 +0100 Subject: gnu: r-pwr: Update to 1.3-0. * gnu/packages/cran.scm (r-pwr): Update to 1.3-0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ab47103c04..cb8e95fa24 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8276,14 +8276,14 @@ (define-public r-emmeans (define-public r-pwr (package (name "r-pwr") - (version "1.2-2") + (version "1.3-0") (source (origin (method url-fetch) (uri (cran-uri "pwr" version)) (sha256 (base32 - "0r5g781lr677vp3zyhgmi7r68c87l8gd05l1s3ffnxgn5wf043sm")))) + "1kfzy73v3z6ipc3kdfkcjrp4b4p5k54nwk796gqi36srm93hgc2v")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From bd1a2cb2c47adb37c2403a785b975a11563b4158 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:01:40 +0100 Subject: gnu: r-glmmtmb: Update to 1.0.1. * gnu/packages/cran.scm (r-glmmtmb): Update to 1.0.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cb8e95fa24..449c2adafc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8449,14 +8449,14 @@ (define-public r-sjstats (define-public r-glmmtmb (package (name "r-glmmtmb") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "glmmTMB" version)) (sha256 (base32 - "1md4yw4kbng953rz1n9g1v2xffk3cxx1qmp0kvbdayg1s82l1rgx")))) + "0sdx1q7wc7895xh8747r4p0wkij0xjgn5ij62ipi9423zd0sr0mm")))) (properties `((upstream-name . "glmmTMB"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 49b68b64f703aaec04c2a4e89ef65050d890547b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:01:48 +0100 Subject: gnu: r-ggeffects: Update to 0.14.2. * gnu/packages/cran.scm (r-ggeffects): Update to 0.14.2. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 449c2adafc..6617208351 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8533,19 +8533,21 @@ (define-public r-performance (define-public r-ggeffects (package (name "r-ggeffects") - (version "0.14.1") + (version "0.14.2") (source (origin (method url-fetch) (uri (cran-uri "ggeffects" version)) (sha256 (base32 - "07pvs18vlybp96zz1wjr7cwiwi1cvjwkb9ahxzq0vd6adnd6ya59")))) + "1y3yfb07jrr6vkc8hk6rp52l70dj7042jvqgjzllslzy7hx2jhyw")))) (build-system r-build-system) (propagated-inputs `(("r-insight" ,r-insight) ("r-mass" ,r-mass) ("r-sjlabelled" ,r-sjlabelled))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/strengejacke/ggeffects") (synopsis "Create tidy data frames of marginal effects for ggplot") (description -- cgit v1.2.3 From ef1443928eb814a7ea9f96f97ba0295f44f276bf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:02:05 +0100 Subject: gnu: r-waveslim: Update to 1.8.2. * gnu/packages/cran.scm (r-waveslim): Update to 1.8.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6617208351..4eac5a02cf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9756,14 +9756,14 @@ (define-public r-tm (define-public r-waveslim (package (name "r-waveslim") - (version "1.7.5.2") + (version "1.8.2") (source (origin (method url-fetch) (uri (cran-uri "waveslim" version)) (sha256 (base32 - "166ai4q3mlh3v338si952z7fbgph80h0l4ws6bna8ig5jx81rnmz")))) + "0ibivnhz0l06sss5rrrcvyiwg3qpbyk3qn4vx4pp90kj09x4yg0k")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From dacebbf066a87634c5b771c55fbbb2deca951b81 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:02:13 +0100 Subject: gnu: r-nonnest2: Update to 0.5-3. * gnu/packages/cran.scm (r-nonnest2): Update to 0.5-3. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4eac5a02cf..3c6dc5f597 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12345,20 +12345,22 @@ (define-public r-lavaan (define-public r-nonnest2 (package (name "r-nonnest2") - (version "0.5-2") + (version "0.5-3") (source (origin (method url-fetch) (uri (cran-uri "nonnest2" version)) (sha256 (base32 - "1bq44qqmm59j91m0sny4xnqmxqlga4cm48qdsw8xfs3x19xwmxk6")))) + "1mnv4pa583ir9s03h952hk40lwdywr3g88g76sk1zsa54rcmn82c")))) (build-system r-build-system) (propagated-inputs `(("r-compquadform" ,r-compquadform) ("r-lavaan" ,r-lavaan) ("r-mvtnorm" ,r-mvtnorm) ("r-sandwich" ,r-sandwich))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://cran.r-project.org/web/packages/nonnest2/") (synopsis "Tests of non-nested models") (description -- cgit v1.2.3 From 999204f7f79fde7ee53ba6f27e1179d00d02d8e5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:02:29 +0100 Subject: gnu: r-units: Update to 0.6-6. * gnu/packages/cran.scm (r-units): Update to 0.6-6. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3c6dc5f597..c621da6fd6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13017,19 +13017,21 @@ (define-public r-seqinr (define-public r-units (package (name "r-units") - (version "0.6-5") + (version "0.6-6") (source (origin (method url-fetch) (uri (cran-uri "units" version)) (sha256 (base32 - "02nls8m0r1r7kljs4x35naz3szq62hyqyd5vracf1xwi1kz5kdsh")))) + "11x6xz1fbml28xmrhgn4sii9vfyj3gyfc1dfxahdg9cszdmcgdnh")))) (build-system r-build-system) (inputs `(("udunits" ,udunits))) (propagated-inputs `(("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/r-quantities/units/") (synopsis "Measurement Units for R Vectors") (description -- cgit v1.2.3 From ac9bdd4c68ce25e618b03b52187a600501514db9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:02:45 +0100 Subject: gnu: r-ggraph: Update to 2.0.2. * gnu/packages/cran.scm (r-ggraph): Update to 2.0.2. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c621da6fd6..d9cfc6072b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14284,14 +14284,14 @@ (define-public r-europepmc (define-public r-ggraph (package (name "r-ggraph") - (version "2.0.1") + (version "2.0.2") (source (origin (method url-fetch) (uri (cran-uri "ggraph" version)) (sha256 (base32 - "0q2yqsb981a2arf9j530kqs61vw38ixyxbhb6yvv7skgbck02r6y")))) + "1ckq82hg52vr2wydkqv2wrppgjyvddd6bwqzrngqlm7j71xapjl0")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) @@ -14308,6 +14308,8 @@ (define-public r-ggraph ("r-scales" ,r-scales) ("r-tidygraph" ,r-tidygraph) ("r-viridis" ,r-viridis))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://cran.r-project.org/web/packages/ggraph/") (synopsis "Implementation of grammar of graphics for graphs and networks") (description -- cgit v1.2.3 From 69e260c54205eb660687779fb17b6a3fb2780956 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:03:02 +0100 Subject: gnu: r-uwot: Update to 0.1.8. * gnu/packages/cran.scm (r-uwot): Update to 0.1.8. [propagated-inputs]: Remove r-rcppparallel. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d9cfc6072b..3ac71e26b3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15379,14 +15379,14 @@ (define-public r-umap (define-public r-uwot (package (name "r-uwot") - (version "0.1.5") + (version "0.1.8") (source (origin (method url-fetch) (uri (cran-uri "uwot" version)) (sha256 (base32 - "0pz9wa89xq4d119q86lskrznf979m0r1db8iaprcz7kxbi6b8lrj")))) + "1jzh8r1h6f7pw7pb1fr32vn6ai9g10s56ahkq0vi77iznihy1rpd")))) (build-system r-build-system) (propagated-inputs `(("r-dqrng" ,r-dqrng) @@ -15395,7 +15395,6 @@ (define-public r-uwot ("r-matrix" ,r-matrix) ("r-rcpp" ,r-rcpp) ("r-rcppannoy" ,r-rcppannoy) - ("r-rcppparallel" ,r-rcppparallel) ("r-rcppprogress" ,r-rcppprogress) ("r-rspectra" ,r-rspectra))) (home-page "https://github.com/jlmelville/uwot") -- cgit v1.2.3 From c7eb52e64c935e8c9c3f1dec67613b001a542a69 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:03:20 +0100 Subject: gnu: r-accept: Update to 0.7.1. * gnu/packages/cran.scm (r-accept): Update to 0.7.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3ac71e26b3..88237f1a06 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16696,14 +16696,14 @@ (define-public r-abtest (define-public r-accept (package (name "r-accept") - (version "0.7.0") + (version "0.7.1") (source (origin (method url-fetch) (uri (cran-uri "accept" version)) (sha256 (base32 - "1r4mhy9g4wjcjgdd0gwdarmr09292il3vdkmx0hz7vh9mffyr9kx")))) + "0pn8q0jsi0nb2mm2kv6sjczflflshhy55y7nqqnk70yx9f6wm83y")))) (properties `((upstream-name . "accept"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 40e5102449e7c5ea1b6c9a78fd8528e4862c1251 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:03:27 +0100 Subject: gnu: r-isocodes: Update to 2020.03.16. * gnu/packages/cran.scm (r-isocodes): Update to 2020.03.16. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 88237f1a06..34bc104960 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19390,14 +19390,14 @@ (define-public r-proxyc (define-public r-isocodes (package (name "r-isocodes") - (version "2019.12.22") + (version "2020.03.16") (source (origin (method url-fetch) (uri (cran-uri "ISOcodes" version)) (sha256 (base32 - "1k2f2258bwzs0b3nxma9kcw395qkljvk514a7047rx4dn0iwd874")))) + "1hz1sj57qkkkrgn8slsz2n4jv1fkyp40503j9rg30lxy4gmb83hn")))) (properties `((upstream-name . "ISOcodes"))) (build-system r-build-system) (home-page "https://cran.r-project.org/package=ISOcodes") -- cgit v1.2.3 From ecf34a91015280f4055f2c23665b6421a828bb7a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:03:43 +0100 Subject: gnu: r-quanteda: Update to 2.0.1. * gnu/packages/cran.scm (r-quanteda): Update to 2.0.1. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 34bc104960..2fc62edb4b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19479,14 +19479,14 @@ (define-public r-snowballc (define-public r-quanteda (package (name "r-quanteda") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (cran-uri "quanteda" version)) (sha256 (base32 - "0snr610vahbdqkmma0zy5mg5qbb6n1b8sgsclqb2sccn1gg38vyy")))) + "0pym6vdzqbkyj87m3pla229092xvvx4j830x67qflxzzdmc9dzhz")))) (properties `((upstream-name . "quanteda"))) (build-system r-build-system) (propagated-inputs @@ -19509,6 +19509,8 @@ (define-public r-quanteda ("r-stringi" ,r-stringi) ("r-xml2" ,r-xml2) ("r-yaml" ,r-yaml))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://quanteda.io") (synopsis "Quantitative analysis of textual data") (description -- cgit v1.2.3 From f3a64b9960a64e10eca20483857eaa2021018a1a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:04:01 +0100 Subject: gnu: r-matrixstats: Update to 0.56.0. * gnu/packages/statistics.scm (r-matrixstats): Update to 0.56.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index fa2b8d6ed5..8b21ac31a2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3573,13 +3573,13 @@ (define-public r-mvtnorm (define-public r-matrixstats (package (name "r-matrixstats") - (version "0.55.0") + (version "0.56.0") (source (origin (method url-fetch) (uri (cran-uri "matrixStats" version)) (sha256 (base32 - "06fvx0rlaz80k0lkqq2n7v0309xpz7h7ss0m9kgyikp4xs8bvmhn")))) + "09qgfv9x32x6ncgf19iy7yjp26fwy6p5wm8spc2xzfc0qhylmqrr")))) (properties `((upstream-name . "matrixStats"))) (build-system r-build-system) (native-inputs -- cgit v1.2.3 From 2ceb2ed99f4a1b7ee15313c81b0429998ab5d0c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:04:11 +0100 Subject: gnu: r-modelmetrics: Update to 1.2.2.2. * gnu/packages/statistics.scm (r-modelmetrics): Update to 1.2.2.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 8b21ac31a2..be6eb9f9ed 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5029,14 +5029,14 @@ (define-public r-rcppeigen (define-public r-modelmetrics (package (name "r-modelmetrics") - (version "1.2.2.1") + (version "1.2.2.2") (source (origin (method url-fetch) (uri (cran-uri "ModelMetrics" version)) (sha256 (base32 - "17yw46yr0n9hddvlhh73jdpmpdlpa581n5xjpwkr6cpr2f7xxpqc")))) + "0mrlsw4c5y1vdsqynxr2dcvmhh5h37pnd71jw5a5djpbda9g21jy")))) (properties `((upstream-name . "ModelMetrics"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ea2a180f68156ac05b435e953cd1231274244b9c Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Thu, 19 Mar 2020 10:19:37 +0100 Subject: gnu: gpa: Add phase wrap-program. Fixes * gnu/packages/gnupg.scm (gpa)[arguments]: Add phase wrap-program. Signed-off-by: Marius Bakke --- gnu/packages/gnupg.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index c5c3d5263f..9075978719 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -975,6 +975,16 @@ (define-public gpa (base32 "1cbpc45f8qbdkd62p12s3q2rdq6fa5xdzwmcwd3xrj55bzkspnwm")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gnupg (assoc-ref inputs "gnupg"))) + (wrap-program (string-append out "/bin/gpa") + `("PATH" ":" prefix (,(string-append gnupg "/bin")))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 83a4ab4e4213eaf10289f0abd8a43979178701d7 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 18 Jan 2020 21:47:00 +0100 Subject: gnu: Add libksieve. * gnu/packages/kde-pim.scm (libksieve): New variable. * gnu/packages/patches/libksieve-Fix-missing-link-libraries.patch: New file. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/kde-pim.scm | 58 +++++++++++++++++++++ .../libksieve-Fix-missing-link-libraries.patch | 59 ++++++++++++++++++++++ 3 files changed, 118 insertions(+) create mode 100644 gnu/packages/patches/libksieve-Fix-missing-link-libraries.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index caa73d44d4..aa5dcd7c39 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1108,6 +1108,7 @@ dist_patch_DATA = \ %D%/packages/patches/libjxr-fix-function-signature.patch \ %D%/packages/patches/libjxr-fix-typos.patch \ %D%/packages/patches/libotr-test-auth-fix.patch \ + %D%/packages/patches/libksieve-Fix-missing-lInk-libraries.patch \ %D%/packages/patches/libmad-armv7-thumb-pt1.patch \ %D%/packages/patches/libmad-armv7-thumb-pt2.patch \ %D%/packages/patches/libmad-length-check.patch \ diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 07293b6bd1..fbe9bc2e94 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1132,3 +1132,61 @@ (define-public libkleo KDE using certificate-based crypto.") (license ;; GPL for programs, LGPL for libraries (list license:gpl2+ license:lgpl2.0+)))) + +(define-public libksieve + (package + (name "libksieve") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/libksieve-" version ".tar.xz")) + (sha256 + (base32 "0q6f6lc4yvlq0vsfml10lz844z6zxxf7yivk7l3vglap58ci20x1")) + (patches (search-patches "libksieve-Fix-missing-link-libraries.patch")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools))) + (inputs + `(("akonadi" ,akonadi) + ("cyrus-sasl" ,cyrus-sasl) + ("karchive" ,karchive) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kimap" ,kimap) + ("kio" ,kio) + ("kmailtransport" ,kmailtransport) + ("kmime" ,kmime) + ("knewstuff" ,knewstuff) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("ksyntaxhighlighting" ,ksyntaxhighlighting) + ("ktextwidgets" ,ktextwidgets) + ("kwallet" ,kwallet) + ("kwindowsystem" ,kwindowsystem) + ("libkdepim" ,libkdepim) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtwebchannel" ,qtwebchannel) + ("qtwebengine" ,qtwebengine))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'substitute + (lambda _ + ;; Disable a failing test + ;; sieveeditorhelphtmlwidgettest fails with `sigtrap` + (substitute* + "src/ksieveui/editor/webengine/autotests/CMakeLists.txt" + (("^\\s*(add_test|ecm_mark_as_test)\\W" line) + (string-append "# " line))) + #t))))) + (home-page "https://cgit.kde.org/libksieve.git") + (synopsis "KDE Sieve library") + (description "Sieve is a language that can be used filter emails. KSieve +is a Sieve parser and interpreter library for KDE.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) diff --git a/gnu/packages/patches/libksieve-Fix-missing-link-libraries.patch b/gnu/packages/patches/libksieve-Fix-missing-link-libraries.patch new file mode 100644 index 0000000000..238c4ec46c --- /dev/null +++ b/gnu/packages/patches/libksieve-Fix-missing-link-libraries.patch @@ -0,0 +1,59 @@ +From 732861dda9c466841a09329a0b2c992f2b78c40a Mon Sep 17 00:00:00 2001 +From: Hartmut Goebel +Date: Tue, 21 Jan 2020 23:15:23 +0100 +Subject: [PATCH] Fix missing link libraries. + +See + +These are only actually missing if the libraries reside in different +prefixes, as it is the case in Guix or Nix. +--- + src/ksieveui/autocreatescripts/tests/CMakeLists.txt | 2 ++ + src/ksieveui/scriptsparsing/autotests/CMakeLists.txt | 2 +- + src/ksieveui/scriptsparsing/tests/CMakeLists.txt | 8 ++++++-- + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/ksieveui/autocreatescripts/tests/CMakeLists.txt b/src/ksieveui/autocreatescripts/tests/CMakeLists.txt +index 8a482b4..c43216c 100644 +--- a/src/ksieveui/autocreatescripts/tests/CMakeLists.txt ++++ b/src/ksieveui/autocreatescripts/tests/CMakeLists.txt +@@ -15,6 +16,7 @@ set(parsingscript_gui_SRCS parsingscript_gui.cpp ../../tests/capability.cpp) + add_executable(parsingscript_gui ${parsingscript_gui_SRCS}) + target_link_libraries(parsingscript_gui + KF5::KIOCore ++ KF5::SyntaxHighlighting + KF5::KSieveUi + KF5::KSieve + KF5::PimCommon +diff --git a/src/ksieveui/scriptsparsing/autotests/CMakeLists.txt b/src/ksieveui/scriptsparsing/autotests/CMakeLists.txt +index e41a74e..31703ef 100644 +--- a/src/ksieveui/scriptsparsing/autotests/CMakeLists.txt ++++ b/src/ksieveui/scriptsparsing/autotests/CMakeLists.txt +@@ -5,7 +5,7 @@ macro(add_sieveeditor_xmlprintingscriptbuilding _source _extrasource) + ecm_add_test(${_test} + TEST_NAME ${_name} + NAME_PREFIX "sieveeditor-xmlprintingscriptbuilding-" +- LINK_LIBRARIES Qt5::Test KF5::I18n KF5::KSieveUi ++ LINK_LIBRARIES Qt5::Test KF5::I18n KF5::KSieveUi KF5::SyntaxHighlighting + ) + endmacro() + add_sieveeditor_xmlprintingscriptbuilding(xmlprintingscriptbuildertest.cpp "" "") +diff --git a/src/ksieveui/scriptsparsing/tests/CMakeLists.txt b/src/ksieveui/scriptsparsing/tests/CMakeLists.txt +index a252039..99a1aaa 100644 +--- a/src/ksieveui/scriptsparsing/tests/CMakeLists.txt ++++ b/src/ksieveui/scriptsparsing/tests/CMakeLists.txt +@@ -9,5 +9,9 @@ set(xmlsieveparsing_SRCS + ) + + add_executable(xmlsieveparsing ${xmlsieveparsing_SRCS} ) +-target_link_libraries(xmlsieveparsing KF5::KSieveUi KF5::KSieve KF5::I18n) +- ++target_link_libraries(xmlsieveparsing ++ KF5::KSieveUi ++ KF5::SyntaxHighlighting ++ KF5::KSieve ++ KF5::I18n ++) +-- +2.21.1 + -- cgit v1.2.3 From a146c18ca43f4f4aea79ab67eb8863014d23afa9 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 18 Jan 2020 21:47:53 +0100 Subject: gnu: Add kmessagelib. * gnu/packages/kde-pim.scm (kmessagelib): New variable. --- gnu/packages/kde-pim.scm | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index fbe9bc2e94..8d18ea5b2e 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -32,6 +32,7 @@ (define-module (gnu packages kde-pim) #:use-module (gnu packages gnupg) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages kde-internet) #:use-module (gnu packages openldap) #:use-module (gnu packages qt) #:use-module (gnu packages search) @@ -769,6 +770,84 @@ (define-public kmbox using a Qt/KMime C++ API.") (license license:lgpl2.0+ ))) +(define-public kmessagelib + (package + (name "kmessagelib") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/messagelib-" version ".tar.xz")) + (sha256 + (base32 "0a378aqkdjzyzlxxha2qxa6vzrj92l1fplzb6fajz4l7ipj4hbnv")))) + (properties `((upstream-name . "messagelib"))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("gnupg" ,gnupg) + ("libxml2" ,libxml2))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("akonadi-notes" ,akonadi-notes) + ("akonadi-search" ,akonadi-search) + ("boost" ,boost) + ("gpgme" ,gpgme) + ("grantlee" ,grantlee) + ("grantleetheme" ,grantleetheme) + ("karchive" ,karchive) + ("kcalendarcore" ,kcalendarcore) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kdbusaddons" ,kdbusaddons) + ("kdepim-apps-libs" ,kdepim-apps-libs) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kimap" ,kimap) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kitemviews" ,kitemviews) + ("kjobwidgets" ,kjobwidgets) + ("kldap" ,kldap) + ("kmailtransport" ,kmailtransport) + ("kmbox" ,kmbox) + ("kmime" ,kmime) + ("knewstuff" ,knewstuff) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("kservice" ,kservice) + ("ksyntaxhighlighting" ,ksyntaxhighlighting) + ("ktextwidgets" ,ktextwidgets) + ("kwallet" ,kwallet) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libgravatar" ,libgravatar) + ("libkdepim" ,libkdepim) + ("libkleo" ,libkleo) + ("qgpgme" ,qgpgme) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtwebchannel" ,qtwebchannel) + ("qtwebengine" ,qtwebengine) + ("qtwebkit" ,qtwebkit) + ("sonnet" ,sonnet))) + (arguments + `(#:tests? #f)) ;; TODO many test fail for quite different reasons + (home-page "https://cgit.kde.org/messagelib.git") + (synopsis "KDE PIM messaging libraries") + (description "This packages provides several libraries for messages, +e.g. a message list, a mime tree parse, a template parser and the +kwebengineviewer.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kmime (package (name "kmime") -- cgit v1.2.3 From d3b543a1fd46870ce102071d683c0698fb61b124 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 19 Jan 2020 16:52:12 +0100 Subject: gnu: Add kmailcommon. * gnu/packages/kde-pim.scm (kmailcommon): New variable. --- gnu/packages/kde-pim.scm | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 8d18ea5b2e..42a02f2e63 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -665,6 +665,73 @@ (define-public kleopatra (license ;; GPL for programs, FDL for documentation (list license:gpl2+ license:fdl1.2+)))) +(define-public kmailcommon + (package + (name "kmailcommon") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/mailcommon-" version ".tar.xz")) + (sha256 + (base32 "1gsj89kgq4457mnfjlys4wiixpzwlbwhj4zpd7r4fdhbyihz3k2m")))) + (properties `((upstream-name . "mailcommon"))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("dbus" ,dbus) + ("gnupg" ,gnupg) + ("qttools" ,qttools))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("boost" ,boost) + ("gpgme" ,gpgme) + ("karchive" ,karchive) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kdbusaddons" ,kdbusaddons) + ("kdesignerplugin" ,kdesignerplugin) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kimap" ,kimap) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kitemviews" ,kitemviews) + ("kldap" ,kldap) + ("kmailimporter" ,kmailimporter) + ("kmailtransport" ,kmailtransport) + ("kmessagelib" ,kmessagelib) + ("kmime" ,kmime) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("ksyntaxhighlighting" ,ksyntaxhighlighting) + ("ktextwidgets" ,ktextwidgets) + ("kwallet" ,kwallet) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libkdepim" ,libkdepim) + ("libkleo" ,libkleo) + ("libxslt" ,libxslt) + ("phonon" ,phonon) + ("qgpgme" ,qgpgme) + ("qtbase" ,qtbase))) + (arguments + `(#:tests? #f)) ;; TODO: 4/56 tests fail, even with "offscreen" and dbus + (home-page "https://cgit.kde.org/mailcommon.git") + (synopsis "KDE email utility library") + (description "The mail common library provides utility functions for +dealing with email.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kmailimporter (package (name "kmailimporter") -- cgit v1.2.3 From 7a0bb02db42585c8670170bb1a73f6efda155f66 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 19 Jan 2020 17:13:30 +0100 Subject: gnu: Add kblog. * gnu/packages/kde-pim.scm (kblog): New variable. --- gnu/packages/kde-pim.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 42a02f2e63..1fb281e1ea 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -376,6 +376,40 @@ (define-public kalarmcal calendar data.") (license license:lgpl2.0+))) +(define-public kblog + (package + (name "kblog") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kblog-" version ".tar.xz")) + (sha256 + (base32 "0r3ik3df444kzg2mnzckkh4kk6v08zil1f26dwmxsslsqw9hl0vv")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kcalendarcore" ,kcalendarcore) + ("kcoreaddons" ,kcoreaddons) + ("ki18n" ,ki18n) + ("kio" ,kio) + ("kxmlrpcclient" ,kxmlrpcclient) + ("qtbase" ,qtbase) + ("syndication" ,syndication))) + ;; Note: Some tests take up to 90 sec. + (home-page "https://cgit.kde.org/kblog.git") + (synopsis "Client-side support library for web application remote blogging +APIs") + (description "KBlog is a library for calling functions on Blogger 1.0, +MetaWeblog, MovableType and GData compatible blogs. It calls the APIs using +KXmlRpcClient and Syndication. It supports asynchronous sending and fetching +of posts and, if supported on the server, multimedia files. Almost every +modern blogging web application that provides an XML data interface supports +one of the APIs mentioned above.") + (license license:lgpl2.0+))) + (define-public kcalutils (package (name "kcalutils") -- cgit v1.2.3 From 49e247efccb46a9808a2662489857ec9f0fb6664 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 19 Jan 2020 18:07:27 +0100 Subject: gnu: Add kdav. This is in kde-pim.scm since it explicitly offers the "KPimKDAV". * gnu/package/kde-pim.scm (kdav): New variable. --- gnu/packages/kde-pim.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 1fb281e1ea..755cf316c5 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -449,6 +449,34 @@ (define-public kcalutils functions for accessing calendar data using the kcalcore API.") (license license:lgpl2.0+))) +(define-public kdav + (package + (name "kdav") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kdav-" version ".tar.xz")) + (sha256 + (base32 "1w59n17lridglphnm4mnmmzq1ijpbp269qxfmz01vk6wry6hlnp8")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kcoreaddons" ,kcoreaddons) + ("ki18n" ,ki18n) + ("kio" ,kio) + ("qtbase" ,qtbase) + ("qtxmlpatterns" ,qtxmlpatterns))) + (home-page "https://cgit.kde.org/kdav.git") + (synopsis "DAV protocol implementation with KJobs") + (description "This is a DAV protocol implemention with KJobs. Calendars +and todos are supported, using either GroupDAV or CalDAV, and contacts are +supported using GroupDAV or CardDAV.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kdepim-apps-libs (package (name "kdepim-apps-libs") -- cgit v1.2.3 From de6b78220475e604fa105ccf98aabb92e86658f3 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 19 Jan 2020 17:39:09 +0100 Subject: gnu: Add kdepim-runtime. * gnu/packages/kde-pim.scm (kdepim-runtime): New variable. * gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch: New file. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/kde-pim.scm | 79 ++++++++++++++++++++++ ...kdepim-runtime-Fix-missing-link-libraries.patch | 42 ++++++++++++ 3 files changed, 122 insertions(+) create mode 100644 gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index aa5dcd7c39..56f1903f0c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1052,6 +1052,7 @@ dist_patch_DATA = \ %D%/packages/patches/libvirt-create-machine-cgroup.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ + %D%/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch \ %D%/packages/patches/kiki-level-selection-crash.patch \ %D%/packages/patches/kiki-makefile.patch \ %D%/packages/patches/kiki-missing-includes.patch \ diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 755cf316c5..0956deece3 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -523,6 +523,85 @@ (define-public kdepim-apps-libs (license ;; GPL for programs, LGPL for libraries (list license:gpl2+ license:lgpl2.0+)))) +(define-public kdepim-runtime + (package + (name "kdepim-runtime") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kdepim-runtime-" version ".tar.xz")) + (sha256 + (base32 "1skid9v6viw379mwhmb4xjh6bylv8wg7cy56kkbcpsmpars9cwr6")) + (patches (search-patches + "kdepim-runtime-Fix-missing-link-libraries.patch")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("dbus" ,dbus) + ("kdoctools" ,kdoctools) + ("libxslt" ,libxslt) + ("shared-mime-info" ,shared-mime-info))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-calendar" ,akonadi-calendar) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("akonadi-notes" ,akonadi-notes) + ("boost" ,boost) + ("cyrus-sasl" ,cyrus-sasl) + ("kalarmcal" ,kalarmcal) + ("kcalendarcore" ,kcalendarcore) + ("kcalutils" ,kcalutils) + ("kcodecs" ,kcodecs) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kdav" ,kdav) + ("kdbusaddons" ,kdbusaddons) + ("kholidays" ,kholidays) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kimap" ,kimap) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kmailtransport" ,kmailtransport) + ("kmbox" ,kmbox) + ("kmime" ,kmime) + ("knotifications" ,knotifications) + ("knotifyconfig" ,knotifyconfig) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("kross" ,kross) + ("ktextwidgets" ,ktextwidgets) + ("kwallet" ,kwallet) + ("kwindowsystem" ,kwindowsystem) + ("libkgapi" ,libkgapi) + ;; TODO: libkolab + ("qca" ,qca) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtnetworkauth" ,qtnetworkauth) + ("qtspeech" ,qtspeech) + ("qtwebchannel" ,qtwebchannel) + ("qtwebengine" ,qtwebengine) + ("qtxmlpatterns" ,qtxmlpatterns))) + (arguments + ;; TODO: 5/45 tests fail for quite different reasons, even with + ;; "offscreen" and dbus + `(#:tests? #f)) + (home-page "https://cgit.kde.org/kdepim-runtime.git") + (synopsis "Runtime components for Akonadi KDE") + (description "This package contains Akonadi agents written using KDE +Development Platform libraries. Any package that uses Akonadi should probably +pull this in as a dependency. The kres-bridges is also parts of this +package.") + (license ;; Files vary a lot regarding the license. GPL2+ and LGPL2.1+ + ;; have been used in those I checked. But the archive also includes + ;; license texts for GPL3 and AGPL3. + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kgpg (package (name "kgpg") diff --git a/gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch b/gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch new file mode 100644 index 0000000000..13345c0038 --- /dev/null +++ b/gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch @@ -0,0 +1,42 @@ +From b84c4ba97cecf7304e99cafdd8a9c5866ce27050 Mon Sep 17 00:00:00 2001 +From: Hartmut Goebel +Date: Tue, 21 Jan 2020 23:33:50 +0100 +Subject: [PATCH] Fix missing link libraries. + +See + +These are only actually missing if the libraries reside in different +prefixes, as it is the case in Guix or Nix. +--- + resources/ews/test/CMakeLists.txt | 1 + + resources/facebook/CMakeLists.txt | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/resources/ews/test/CMakeLists.txt b/resources/ews/test/CMakeLists.txt +index b20eddcb8..6355eb994 100644 +--- a/resources/ews/test/CMakeLists.txt ++++ b/resources/ews/test/CMakeLists.txt +@@ -35,6 +35,7 @@ qt5_add_resources(isolatestestcommon_RSRCS isolatedtestcommon.qrc) + add_library(isolatedtestcommon STATIC ${isolatestestcommon_SRCS}) + target_link_libraries(isolatedtestcommon + KF5::AkonadiCore ++ KF5::AkonadiMime + Qt5::Core + Qt5::Network + Qt5::Test +diff --git a/resources/facebook/CMakeLists.txt b/resources/facebook/CMakeLists.txt +index bdd5eeaa7..27a9c83c1 100644 +--- a/resources/facebook/CMakeLists.txt ++++ b/resources/facebook/CMakeLists.txt +@@ -21,7 +21,8 @@ add_library(facebookresourcelib STATIC ${fbresource_SRCS}) + + target_link_libraries(facebookresourcelib + KF5::KIOWidgets ++ KF5::AkonadiCore + KF5::IconThemes + KF5::I18n + KF5::ConfigGui + KF5::CalendarCore +-- +2.21.1 + -- cgit v1.2.3 From 86633b2218ea8a1eb3573cea5b76b49f71667eba Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 19 Jan 2020 23:58:11 +0100 Subject: gnu: Add kaddressbook. * gnu/packages/kde-pim.scm (kaddressbook): New variable. --- gnu/packages/kde-pim.scm | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 0956deece3..661962bb46 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -335,6 +335,63 @@ (define-public akonadi-search (license ;; GPL for programs, LGPL for libraries (list license:gpl2+ license:lgpl2.0+)))) +(define-public kaddressbook + (package + (name "kaddressbook") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kaddressbook-" version ".tar.xz")) + (sha256 + (base32 "1bpl9cqjv7s6pnsaa266jqmny2s6ldkylxviri162jxg51v1hhz3")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("akonadi-search" ,akonadi-search) + ("boost" ,boost) + ("gpgme" ,gpgme) + ("grantlee" ,grantlee) + ("grantleetheme" ,grantleetheme) + ("kcalendarcore" ,kcalendarcore) + ("kcmutils" ,kcmutils) + ("kcompletion" ,kcompletion) + ("kcontacts" ,kcontacts) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kdepim-apps-libs" ,kdepim-apps-libs) + ("kdoctools" ,kdoctools) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kimap" ,kimap) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kmime" ,kmime) + ("kontactinterface" ,kontactinterface) + ("kparts" ,kparts) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("ktextwidgets" ,ktextwidgets) + ("kxmlgui" ,kxmlgui) + ("libkdepim" ,libkdepim) + ("libkleo" ,libkleo) + ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests + ("prison" ,prison) + ("qgpgme" ,qgpgme) + ("qtbase" ,qtbase))) + (home-page "https://kontact.kde.org/components/kaddressbook.html") + (synopsis "Address Book application to manage your contacts") + (description "KAddressBook stores all the personal details of your family, +friends and other contacts. It supports large variety of services, including +NextCloud, Kolab, Google Contacts, Microsoft Exchange (EWS) or any standard +CalDAV server.") + (license (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) + (define-public kalarmcal (package (name "kalarmcal") -- cgit v1.2.3 From dd80d13bea8239dc77518204cfaa8aee8c8ac097 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 20 Jan 2020 00:38:11 +0100 Subject: gnu: Add knotes. * gnu/packages/kde-pim.scm (knotes): NEw variable. --- gnu/packages/kde-pim.scm | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 661962bb46..137176e481 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1151,6 +1151,80 @@ (define-public kmime information in non-ASCII character sets.") (license license:lgpl2.0+))) +(define-public knotes + (package + (name "knotes") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/knotes-" version ".tar.xz")) + (sha256 + (base32 "128qpfqjn5zwl5550srmbjyxns242q6a3b0jy70jjx2yixy3rb87")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("libxslt" ,libxslt))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("akonadi-notes" ,akonadi-notes) + ("akonadi-search" ,akonadi-search) + ("boost" ,boost) + ("grantlee" ,grantlee) + ("grantleetheme" ,grantleetheme) + ("kcalendarcore" ,kcalendarcore) + ("kcalutils" ,kcalutils) + ("kcmutils" ,kcmutils) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kdnssd" ,kdnssd) + ("kdoctools" ,kdoctools) + ("kglobalaccel" ,kglobalaccel) + ("kiconthemes" ,kiconthemes) + ("kimap" ,kimap) + ("kitemmodels" ,kitemmodels) + ("kitemviews" ,kitemviews) + ("kmime" ,kmime) + ("kmime" ,kmime) + ("knewstuff" ,knewstuff) + ("knotifications" ,knotifications) + ("knotifyconfig" ,knotifyconfig) + ("kontactinterface" ,kontactinterface) + ("kparts" ,kparts) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("ktextwidgets" ,ktextwidgets) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("kxmlgui" ,kxmlgui) + ("libkdepim" ,libkdepim) + ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras))) + (home-page "https://kontact.kde.org/components/knotes.html") + (synopsis "Note-taking utility") + (description "KNotes lets you write the computer equivalent of sticky +notes. The notes are saved automatically when you exit the program, and they +display when you open the program. + +Features: +@itemize +@item Write notes in your choice of font and background color +@item Use drag and drop to email your notes +@item Can be dragged into Calendar to book a time-slot +@item Notes can be printed +@end itemize") + (license (list license:gpl2+ license:lgpl2.0+)))) + (define-public kontactinterface (package (name "kontactinterface") -- cgit v1.2.3 From 639b6ead0c96916ac47eefd03861c023a3026148 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 20 Jan 2020 00:48:32 +0100 Subject: gnu: Add kmail. * gnu/packages/kde-pim.scm (kmail): New variable. * gnu/packages/patches/kmail-Fix-missing-link-libraries.patch: New file. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/kde-pim.scm | 94 ++++++++++++++++++++++ .../patches/kmail-Fix-missing-link-libraries.patch | 41 ++++++++++ 3 files changed, 136 insertions(+) create mode 100644 gnu/packages/patches/kmail-Fix-missing-link-libraries.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 56f1903f0c..f3bc77d1de 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1060,6 +1060,7 @@ dist_patch_DATA = \ %D%/packages/patches/kinit-kdeinit-extra_libs.patch \ %D%/packages/patches/kinit-kdeinit-libpath.patch \ %D%/packages/patches/kio-search-smbd-on-PATH.patch \ + %D%/packages/patches/kmail-Fix-missing-link-libraries.patch \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kmscon-runtime-keymap-switch.patch \ %D%/packages/patches/kpackage-allow-external-paths.patch \ diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 137176e481..a9ceac591f 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -863,6 +863,100 @@ (define-public kleopatra (license ;; GPL for programs, FDL for documentation (list license:gpl2+ license:fdl1.2+)))) +(define-public kmail + (package + (name "kmail") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kmail-" version ".tar.xz")) + (sha256 + (base32 "0gsdpv9pf4h031zcawc4qv78a5kl9hxp2amd0spjhs7wc7nl17fk")) + (patches (search-patches "kmail-Fix-missing-link-libraries.patch")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("dbus" ,dbus) + ("kdoctools" ,kdoctools))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("akonadi-search" ,akonadi-search) + ("boost" ,boost) + ("gpgme" ,gpgme) + ("kbookmarks" ,kbookmarks) + ("kcalendarcore" ,kcalendarcore) + ("kcalutils" ,kcalutils) + ("kcmutils" ,kcmutils) + ("kcodecs" ,kcodecs) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kdepim-apps-libs" ,kdepim-apps-libs) + ("kguiaddons" ,kguiaddons) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kimap" ,kimap) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kitemviews" ,kitemviews) + ("kjobwidgets" ,kjobwidgets) + ("kldap" ,kldap) + ("kmailcommon" ,kmailcommon) + ("kmailtransport" ,kmailtransport) + ("kmessagelib" ,kmessagelib) + ("kmime" ,kmime) + ("kmime" ,kmime) + ("knotifications" ,knotifications) + ("knotifyconfig" ,knotifyconfig) + ("kontactinterface" ,kontactinterface) + ("kparts" ,kparts) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("kservice" ,kservice) + ("ksyntaxhighlighting" ,ksyntaxhighlighting) + ("ktextwidgets" ,ktextwidgets) + ("ktnef" ,ktnef) + ("kwallet" ,kwallet) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libgravatar" ,libgravatar) + ("libkdepim" ,libkdepim) + ("libkleo" ,libkleo) + ("libksieve" ,libksieve) + ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests + ("qgpgme" ,qgpgme) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtwebchannel" ,qtwebchannel) + ("qtwebengine" ,qtwebengine) + ("sonnet" ,sonnet))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "dbus-launch" "ctest" ".") + #t))))) + (home-page "https://kontact.kde.org/components/kmail.html") + (synopsis "Full featured graphical email client") + (description "KMail supports multiple accounts, mail filtering and email +encryption. The program let you configure your workflow and it has good +integration into KDE (Plasma Desktop) but is also useable with other Desktop +Envionments. + +KMail is the email component of Kontact, the integrated personal information +manager from KDE.") + (license ;; GPL for programs, LGPL for libraries, FDL for documentation + (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) + (define-public kmailcommon (package (name "kmailcommon") diff --git a/gnu/packages/patches/kmail-Fix-missing-link-libraries.patch b/gnu/packages/patches/kmail-Fix-missing-link-libraries.patch new file mode 100644 index 0000000000..fc784d63dd --- /dev/null +++ b/gnu/packages/patches/kmail-Fix-missing-link-libraries.patch @@ -0,0 +1,41 @@ +From 6b0a3a60870499b20ce9ae2ea07cbc5ee53cbdd2 Mon Sep 17 00:00:00 2001 +From: Hartmut Goebel +Date: Tue, 21 Jan 2020 23:23:38 +0100 +Subject: [PATCH] Fix missing link libraries. + +See + +These are only actually missing if the libraries reside in different +prefixes, as it is the case in Guix or Nix. +--- + agents/archivemailagent/CMakeLists.txt | 1 + + agents/followupreminderagent/CMakeLists.txt | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/agents/archivemailagent/CMakeLists.txt b/agents/archivemailagent/CMakeLists.txt +index 95c6249de..d0ddcd475 100644 +--- a/agents/archivemailagent/CMakeLists.txt ++++ b/agents/archivemailagent/CMakeLists.txt +@@ -22,6 +22,7 @@ ki18n_wrap_ui(libarchivemailagent_SRCS ui/archivemailwidget.ui ) + add_library(archivemailagent STATIC ${libarchivemailagent_SRCS}) + target_link_libraries(archivemailagent + KF5::MailCommon ++ KF5::Libkdepim + KF5::I18n + KF5::Notifications + KF5::KIOWidgets +diff --git a/agents/followupreminderagent/CMakeLists.txt b/agents/followupreminderagent/CMakeLists.txt +index 9ae7eaa29..527044807 100644 +--- a/agents/followupreminderagent/CMakeLists.txt ++++ b/agents/followupreminderagent/CMakeLists.txt +@@ -27,6 +27,7 @@ target_link_libraries(followupreminderagent + KF5::AkonadiMime + KF5::AkonadiAgentBase + KF5::DBusAddons ++ KF5::FollowupReminder + KF5::XmlGui + KF5::KIOWidgets + KF5::Notifications +-- +2.21.1 + -- cgit v1.2.3 From 9d95d8bd120072cb3b983da86baa645c5b2ecd89 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 20 Jan 2020 01:45:38 +0100 Subject: gnu: Add kdiagram. * gnu/packages/kde.scm (kdiagram): New variable. * packages/patches/kdiagram-Fix-missing-link-libraries.patch: New file. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/kde.scm | 31 ++++++++++++++++++++++ .../kdiagram-Fix-missing-link-libraries.patch | 23 ++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 gnu/packages/patches/kdiagram-Fix-missing-link-libraries.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index f3bc77d1de..ddd89ba018 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1053,6 +1053,7 @@ dist_patch_DATA = \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ %D%/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch \ + %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \ %D%/packages/patches/kiki-level-selection-crash.patch \ %D%/packages/patches/kiki-makefile.patch \ %D%/packages/patches/kiki-missing-includes.patch \ diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 8a612bfe5b..c4576c8ba7 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -325,6 +325,37 @@ (define-public kdevelop-pg-qt ;; kdevplatform was merged into kdevelop as of 5.2.x (define-deprecated kdevplatform kdevelop) +(define-public kdiagram + (package + (name "kdiagram") + (version "2.6.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/kdiagram/" version + "/kdiagram-" version ".tar.xz")) + (sha256 + (base32 "1c6dbp9gssjrx59z8yxzq1ay56pnw7h28symjrv0gcvhxyjirrxx")) + (patches (search-patches + "kdiagram-Fix-missing-link-libraries.patch")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) + (inputs + `(("qtbase" ,qtbase) + ("qtsvg" ,qtsvg))) + (home-page "https://cgit.kde.org/kdiagram.git/") + (synopsis "Libraries for creating business diagrams") + (description "This package provides libraries for integrating business +diagrams in Qt-based applications. + +@code{KCharts} provides an implementation of the ODF Chart specification. It +supports stock charts, box charts, and whisker charts. @code{KGantt} provides +a module for implementing ODF Gantt charts, which are bar charts that +illustrate project schedules.") + (license license:gpl2+))) + (define-public krita (package (name "krita") diff --git a/gnu/packages/patches/kdiagram-Fix-missing-link-libraries.patch b/gnu/packages/patches/kdiagram-Fix-missing-link-libraries.patch new file mode 100644 index 0000000000..cdfb608d9b --- /dev/null +++ b/gnu/packages/patches/kdiagram-Fix-missing-link-libraries.patch @@ -0,0 +1,23 @@ +From c59acf1f54a2cd760e55082a01593a31a690d786 Mon Sep 17 00:00:00 2001 +From: Hartmut Goebel +Date: Wed, 22 Jan 2020 00:56:27 +0100 +Subject: [PATCH] Fix missing link libraries. + +These are only actually missing if the libraries reside in different +prefixes, as it is the case in Guix or Nix. +--- + examples/Bars/Simple/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/Bars/Simple/CMakeLists.txt b/examples/Bars/Simple/CMakeLists.txt +index be2a6fc..b13befb 100644 +--- a/examples/Bars/Simple/CMakeLists.txt ++++ b/examples/Bars/Simple/CMakeLists.txt +@@ -1,3 +1,3 @@ + add_executable(BarsSimple main.cpp) + +-target_link_libraries(BarsSimple KChart Qt5::Widgets) ++target_link_libraries(BarsSimple KChart Qt5::Widgets Qt5::Svg) +-- +2.21.1 + -- cgit v1.2.3 From d9491d5053ea856fe4fadc84d73d6979e9463a96 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 2 Feb 2020 15:34:14 +0100 Subject: gnu: Add kcalendarsupport. * gnu/packages/kde-pim.scm (kcalendarsupport): New variable. --- gnu/packages/kde-pim.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index a9ceac591f..27ec2825ae 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -467,6 +467,52 @@ (define-public kblog one of the APIs mentioned above.") (license license:lgpl2.0+))) +(define-public kcalendarsupport + (package + (name "kcalendarsupport") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/calendarsupport-" version ".tar.xz")) + (sha256 + (base32 "1hwfh5njq4614ypwdilna33hdcn11kshpwg6n27cag1qhwrxs1i4")))) + (properties `((upstream-name . "calendarsupport"))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-calendar" ,akonadi-calendar) + ("akonadi-mime" ,akonadi-mime) + ("boost" ,boost) + ("kcalendarcore" ,kcalendarcore) + ("kcalutils", kcalutils) + ("kcompletion" ,kcompletion) + ("kdbusaddons" ,kdbusaddons) + ("kdepim-apps-libs" ,kdepim-apps-libs) + ("kguiaddons" ,kguiaddons) + ("kholidays" ,kholidays) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kmime" ,kmime) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("ktextwidgets" ,ktextwidgets) + ("kxmlgui" ,kxmlgui) + ("qtbase" ,qtbase))) + (home-page "https://api.kde.org/stable/calendarsupport/") + (synopsis "Calendar Support library for KDE PIM") + (description "The Calendar Support library provides helper utilities for +calendaring applications.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kcalutils (package (name "kcalutils") -- cgit v1.2.3 From b3359b85985bf64061ace2154e2414fb482443bf Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 22 Jan 2020 13:03:13 +0100 Subject: gnu: Add keventviews. * gnu/package/kde-pim.scm (keventviews): New variable. --- gnu/packages/kde-pim.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 27ec2825ae..966cf5fa84 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -705,6 +705,56 @@ (define-public kdepim-runtime ;; license texts for GPL3 and AGPL3. (list license:gpl2+ license:lgpl2.0+)))) +(define-public keventviews + (package + (name "keventviews") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/eventviews-" version ".tar.xz")) + (sha256 + (base32 "190vx074ligzysc9w5pf2b51dfy0i4v9mc53m9jdcw8y02shy49w")))) + (properties `((upstream-name . "eventviews"))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-calendar" ,akonadi-calendar) + ("akonadi-contacts" ,akonadi-contacts) + ("boost" ,boost) + ("kcalendarcore" ,kcalendarcore) + ("kcalendarsupport" ,kcalendarsupport) + ("kcalutils" ,kcalutils) + ("kcodecs", kcodecs) + ("kcompletion" ,kcompletion) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kdbusaddons" ,kdbusaddons) + ("kdiagram" ,kdiagram) + ("kguiaddons" ,kguiaddons) + ("kholidays" ,kholidays) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kmime" ,kmime) + ("kpimtextedit" ,kpimtextedit) + ("kservice" ,kservice) + ("ktextwidgets" ,ktextwidgets) + ("kxmlgui" ,kxmlgui) + ("libkdepim" ,libkdepim) + ("qtbase" ,qtbase))) + (home-page "https://cgit.kde.org/eventviews.git") + (synopsis "KDE PIM library for creating events") + (description "This library provides an event creator for KDE PIM.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kgpg (package (name "kgpg") -- cgit v1.2.3 From 992c6d29bbdb3663d9b5fa1ddf3fdd25e2944360 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 20 Jan 2020 01:28:55 +0100 Subject: gnu: Add kincidenceeditor. * gnu/packages/kde-pim.scm (kincidenceeditor): New variable. --- gnu/packages/kde-pim.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 966cf5fa84..048a465e86 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -335,6 +335,55 @@ (define-public akonadi-search (license ;; GPL for programs, LGPL for libraries (list license:gpl2+ license:lgpl2.0+)))) +(define-public kincidenceeditor + (package + (name "kincidenceeditor") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/incidenceeditor-" version ".tar.xz")) + (sha256 + (base32 "0v962v2ihawndg39ypkfawa449vpbdyg00ib7avb19a153y3wxg6")))) + (properties `((upstream-name . "incidenceeditor"))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-calendar" ,akonadi-calendar) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("boost" ,boost) + ("kcalendarcore" ,kcalendarcore) + ("kcalendarsupport" ,kcalendarsupport) + ("kcalutils" ,kcalutils) + ("kcodecs" ,kcodecs) + ("kcontacts" ,kcontacts) + ("kdbusaddons" ,kdbusaddons) + ("kdepim-apps-libs" ,kdepim-apps-libs) + ("kdiagram" ,kdiagram) + ("keventviews" ,keventviews) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kldap" ,kldap) + ("kmailtransport" ,kmailtransport) + ("kmime" ,kmime) + ("kpimtextedit" ,kpimtextedit) + ("ktextwidgets" ,ktextwidgets) + ("kwallat" ,kwallet) + ("libkdepim" ,libkdepim) + ("qtbase" ,qtbase))) + (home-page "https://cgit.kde.org/incidenceeditor.git") + (synopsis "KDE PIM library for editing incidences") + (description "This library provides an incidence editor for KDE PIM.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kaddressbook (package (name "kaddressbook") -- cgit v1.2.3 From d3d8be5281d6a69f67608b051e4ffde8dcfc1301 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 20 Jan 2020 01:14:36 +0100 Subject: gnu: Add korganizer. * gnu/packages/kde-pim.scm (korganizer): New variable. --- gnu/packages/kde-pim.scm | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 048a465e86..bf962859b9 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1492,6 +1492,93 @@ (define-public kontactinterface application \"Parts\" to be embedded as a Kontact component (or plugin).") (license license:lgpl2.0+))) +(define-public korganizer + (package + (name "korganizer") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/korganizer-" version ".tar.xz")) + (sha256 + (base32 "1ixdmmczccvwr7a6vvzv0kyjay0mjnbwcwkq6yym32m2lb3vcxdn")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("dbus" ,dbus) + ("qttools" ,qttools) + ("kdoctools" ,kdoctools))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-calendar" ,akonadi-calendar) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("akonadi-notes" ,akonadi-notes) + ("akonadi-search" ,akonadi-search) + ("boost" ,boost) + ("kcalendarcore" ,kcalendarcore) + ("kcalendarsupport" ,kcalendarsupport) + ("kcalutils" ,kcalutils) + ("kcmutils" ,kcmutils) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kdepim-apps-libs" ,kdepim-apps-libs) + ("keventviews" ,keventviews) + ("kholidays" ,kholidays) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kimap" ,kimap) + ("kincidenceeditor" ,kincidenceeditor) + ("kitemmodels" ,kitemmodels) + ("kitemviews" ,kitemviews) + ("kjobwidgets" ,kjobwidgets) + ("kldap" ,kldap) + ("kmailtransport" ,kmailtransport) + ("kmime" ,kmime) + ("knewstuff" ,knewstuff) + ("knotifications" ,knotifications) + ("kontactinterface" ,kontactinterface) + ("kparts" ,kparts) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("kservice" ,kservice) + ("kwallet" ,kwallet) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libkdepim" ,libkdepim) + ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests + ("phonon" ,phonon) + ("qtbase" ,qtbase))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "dbus-launch" "ctest" ".") + #t))))) + (home-page "https://kontact.kde.org/components/korganizer.html") + (synopsis "Organizational assistant, providing calendars and other similar +functionality to help you organize your life.") + (description "KOrganizer is the calendar and scheduling component of +Kontact. It provides management of events and tasks, alarm notification, web +export, network transparent handling of data, group scheduling, import and +export of calendar files and more. It is able to work together with a wide +variety of clanedaring services, including NextCloud, Kolab, Google Calendar +and others. KOrganizer is fully customizable to your needs and is an integral +part of the Kontact suite, which aims to be a complete solution for organizing +your personal data. KOrganizer supports the two dominant standards for storing +and exchanging calendar data, vCalendar and iCalendar.") + (license ;; GPL for programs, LGPL for libraries, FDL for documentation + (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) + (define-public kpimcommon (package (name "kpimcommon") -- cgit v1.2.3 From 1afd98dc93fed7c5fd7824abbd9ba650835877ff Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 15 Mar 2020 16:28:50 +1100 Subject: gnu: Add date. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (date): New variable. * gnu/packages/patches/date-output-pkg-config-files.patch: New file. * gnu/local.mk: Add patch. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 2 + gnu/packages/calendar.scm | 58 +++++++++++++++++++++ .../patches/date-output-pkg-config-files.patch | 60 ++++++++++++++++++++++ 3 files changed, 120 insertions(+) create mode 100644 gnu/packages/patches/date-output-pkg-config-files.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 93a1b680d1..ca3f2664aa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -26,6 +26,7 @@ # Copyright © 2019 Evan Straw # Copyright © 2019 Brett Gilio # Copyright © 2019 Amin Bandali +# Copyright © 2020 Brendan Tildesley # # This file is part of GNU Guix. # @@ -805,6 +806,7 @@ dist_patch_DATA = \ %D%/packages/patches/cube-nocheck.patch \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ + %D%/packages/patches/date-output-pkg-config-files.patch \ %D%/packages/patches/darkice-workaround-fpermissive-error.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 060e4d18ad..bd47800d1d 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Stefan Reichoer ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ (define-module (gnu packages calendar) #:use-module (gnu packages) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) @@ -48,6 +50,62 @@ (define-module (gnu packages calendar) #:use-module (gnu packages xml) #:use-module (srfi srfi-26)) +(define-public date + ;; We make the same choice as the Arch package maintainer by choosing a + ;; recent commit to fix some bugs. + ;; https://github.com/Alexays/Waybar/issues/565 + (let ((commit "9a0ee2542848ab8625984fc8cdbfb9b5414c0082")) + (package + (name "date") + (version (string-append "2.4.1-" (string-take commit 8))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/HowardHinnant/date.git") + (commit "9a0ee2542848ab8625984fc8cdbfb9b5414c0082"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yxsn0hj22n61bjywysxqgfv7hj5xvsl6isma95fl8xrimpny083")) + (patches + ;; Install pkg-config files + ;; https://github.com/HowardHinnant/date/pull/538 + (search-patches "date-output-pkg-config-files.patch")))) + (inputs `(("tzdata" ,tzdata))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags (list "-DUSE_SYSTEM_TZ_DB=ON" + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_TZ_LIB=ON" + "-DENABLE_DATE_TESTING=ON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-bin-bash + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "compile_fail.sh" + (("/bin/bash") (which "bash"))) + #t)) + (add-after 'unpack 'patch-zoneinfo-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/tz.cpp" + (("/usr/share/zoneinfo") + (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))) + #t)) + (replace 'check + (lambda _ + ;; Disable test that requires checking timezone that + ;; isn't set in the build environment. + (substitute* "CTestTestfile.cmake" + (("add_test.tz_test_pass_zoned_time_deduction_test.*") "") + (("set_tests_properties.tz_test_pass_zoned_time_deduction_test.*") "")) + (invoke "make" "testit")))))) + (synopsis "Date and time library for C++11 and C++14") + (description "Date is a header only C++ library that extends the chrono +date algorithms library for calendar dates and durations. It also provides +the library for handling time zones and leap seconds.") + (home-page "https://howardhinnant.github.io/date/date.html") + (license license:expat)))) + (define-public libical (package (name "libical") diff --git a/gnu/packages/patches/date-output-pkg-config-files.patch b/gnu/packages/patches/date-output-pkg-config-files.patch new file mode 100644 index 0000000000..3fd1d54b36 --- /dev/null +++ b/gnu/packages/patches/date-output-pkg-config-files.patch @@ -0,0 +1,60 @@ +From e56b2dce7e89a92e1b9b35caa13b3e938c4cedea Mon Sep 17 00:00:00 2001 +From: Cole Mickens +Date: Sun, 26 Jan 2020 01:27:08 -0800 +Subject: [PATCH] CMakeLists.txt: output date.pc for pkg-config + +--- + CMakeLists.txt | 15 +++++++++++++++ + date.pc.in | 10 ++++++++++ + 2 files changed, 25 insertions(+) + create mode 100644 date.pc.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f30c473..fe778e8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -128,6 +128,15 @@ if( BUILD_TZ_LIB ) + endif( ) + endif( ) + ++if ( BUILD_TZ_LIB ) ++ # Cflags: -I${includedir} @TZ_COMPILE_DEFINITIONS@ ++ set( TZ_COMPILE_DEFINITIONS "$,-D$, -D>,>" ) ++ configure_file(date.pc.in date.pc.cf @ONLY) ++ file( GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/date.pc" ++ INPUT "${CMAKE_CURRENT_BINARY_DIR}/date.pc.cf" ) ++ ++endif( ) ++ + #[===================================================================[ + installation + #]===================================================================] +@@ -171,6 +180,12 @@ install ( + FILES cmake/dateConfig.cmake "${version_config}" + DESTINATION ${CONFIG_LOC}) + ++if ( BUILD_TZ_LIB ) ++ install( ++ FILES ${CMAKE_BINARY_DIR}/date.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++endif( ) ++ + #[===================================================================[ + testing + #]===================================================================] +diff --git a/date.pc.in b/date.pc.in +new file mode 100644 +index 0000000..b9c4623 +--- /dev/null ++++ b/date.pc.in +@@ -0,0 +1,10 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=@CMAKE_INSTALL_BINDIR@ ++libdir=@CMAKE_INSTALL_LIB@ ++includedir=@CMAKE_INSTALL_INCLUDE@ ++ ++Name: date ++Description: A date and time library based on the C++11/14/17 header ++Version: @PACKAGE_VERSION@ ++Libs: -L${libdir} -ltz ++Cflags: -I${includedir} @TZ_COMPILE_DEFINITIONS@ -- cgit v1.2.3 From 5ea20584090b950c53502ef92c63d0c1949568d8 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 15 Mar 2020 16:28:51 +1100 Subject: gnu: spdlog: Update to 1.5.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/logging.scm (spdlog): Update to 1.5.0 Signed-off-by: Ludovic Courtès --- gnu/packages/logging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index d75c44aea6..8496b6256d 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -179,7 +179,7 @@ (define-public multitail (define-public spdlog (package (name "spdlog") - (version "1.3.1") + (version "1.5.0") (source (origin (method git-fetch) @@ -189,7 +189,7 @@ (define-public spdlog (file-name (git-file-name name version)) (sha256 (base32 - "1rd4zmrlkcdjx0m0wpmjm1g9srj7jak6ai08qkhbn2lsn0niifzd")))) + "0dn44r3xbw1w0bk9yflnxkh3rzdq2bpxkks44skfmqig0rsj1f1x")))) (build-system cmake-build-system) ;; TODO run benchmark. Currently not possible, as adding ;; (gnu packages benchmark) forms a dependency cycle -- cgit v1.2.3 From d2793ed696094adb7a91d8f542e395d145edf26a Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 15 Mar 2020 16:28:52 +1100 Subject: gnu: Add gtk-layer-shell. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gtk.scm (gtk-layer-shell): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gtk.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d9bd15824b..d52dc41e7e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2019 Giacomo Leidi +;;; Copyright © 2020 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -1892,3 +1893,30 @@ (define-public libdbusmenu ;; Dual-licensed under either LGPLv2.1 or LGPLv3. (license (list license:lgpl2.1 license:lgpl3)))) + +(define-public gtk-layer-shell + (package + (name "gtk-layer-shell") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/wmww/gtk-layer-shell/releases/download/v" + version "/gtk-layer-shell-" version ".tar.xz")) + (sha256 + (base32 "0ncklk3z0fzlz6p76jdcrr1ykyp1f4ykjjch4x2hfp9bwsnl4a3m")))) + (build-system meson-build-system) + (native-inputs `(("pkg-config" ,pkg-config) + ("gobject-introspection" ,gobject-introspection))) + (inputs `(("wayland" ,wayland) + ("gtk+" ,gtk+))) + (home-page "https://github.com/wmww/gtk-layer-shell") + (synopsis "Library to create Wayland desktop components using the Layer +Shell protocol") + (description "Layer Shell is a Wayland protocol for desktop shell +components, such as panels, notifications and wallpapers. It can be used to +anchor windows to a corner or edge of the output, or stretch them across the +entire output. It supports all Layer Shell features including popups and +popovers.") + (license license:expat))) -- cgit v1.2.3 From 5e78a87bb99ca8f0c56ece90b871791abcd79b68 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 15 Mar 2020 16:28:53 +1100 Subject: gnu: waybar: Update to 0.9.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (waybar): Update to 0.9.1. [inputs]: Add date and gtk-layer-shell dependencies. [synopsis]:Remove period. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f5b9e62afe..7fee167185 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -66,6 +66,7 @@ (define-module (gnu packages wm) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bison) + #:use-module (gnu packages calendar) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) @@ -1485,7 +1486,7 @@ (define-public swaybg (define-public waybar (package (name "waybar") - (version "0.8.0") + (version "0.9.1") (source (origin (method git-fetch) @@ -1494,12 +1495,14 @@ (define-public waybar (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0s8ck7qxka0l91ayma6amp9sc8cidi43byqgzcavi3a6id983r1z")))) + (base32 "0drlv8im5phz39jxp3gxkc40b6f85bb3piff2v3hmnfzh7ib915s")))) (build-system meson-build-system) (arguments `(#:configure-flags (list (string-append "-Dout=" (assoc-ref %outputs "out"))))) - (inputs `(("fmt" ,fmt) + (inputs `(("date" ,date) + ("fmt" ,fmt) + ("gtk-layer-shell" ,gtk-layer-shell) ("gtkmm" ,gtkmm) ("jsoncpp" ,jsoncpp) ("libdbusmenu" ,libdbusmenu) @@ -1513,7 +1516,7 @@ (define-public waybar ("pkg-config" ,pkg-config) ("wayland-protocols" ,wayland-protocols))) (home-page "https://github.com/Alexays/Waybar") - (synopsis "Wayland bar for Sway and Wlroots based compositors.") + (synopsis "Wayland bar for Sway and Wlroots based compositors") (description "Waybar is a highly customisable Wayland bar for Sway and Wlroots based compositors.") (license license:expat))) ; MIT license -- cgit v1.2.3 From 06ab895e8ccad6ad9e3131b863cba14924fc149a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 29 Feb 2020 09:34:40 -0500 Subject: gnu: emacs-magit-svn: Use the emacs-build-system. * gnu/packages/emacs-xyz.scm (emacs-magit-svn)[build-system]: Use the emacs-build-system. [arguments]: Remove. --- gnu/packages/emacs-xyz.scm | 41 ++--------------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6682403ebc..cb216f536d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -414,7 +414,7 @@ (define-public emacs-magit-svn (let ((commit "9e33ceee32f665db59909e1c00a667ccdd04178f")) (package (name "emacs-magit-svn") - (version (git-version "2.2.1" "1" commit)) + (version (git-version "2.2.1" "2" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -424,48 +424,11 @@ (define-public emacs-magit-svn (sha256 (base32 "1mlqz8dh6jy5rv72lgkxv253dgh73fmbaidskicypapvbl3lr6xy")))) - (build-system trivial-build-system) - (native-inputs `(("emacs" ,emacs-minimal))) + (build-system emacs-build-system) (propagated-inputs `(("dash" ,emacs-dash) ("with-editor" ,emacs-with-editor) ("magit" ,emacs-magit) ("transient" ,emacs-transient))) - (arguments - `(#:modules ((guix build utils) - (guix build emacs-utils)) - - #:builder - (begin - (use-modules (guix build utils) - (guix build emacs-utils)) - - (let ((emacs (string-append (assoc-ref %build-inputs "emacs") - "/bin/emacs")) - (magit (string-append (assoc-ref %build-inputs "magit") - "/share/emacs/site-lisp")) - (transient (string-append (assoc-ref %build-inputs "transient") - "/share/emacs/site-lisp/guix.d/transient-" - ,(package-version emacs-transient))) - (dash (string-append (assoc-ref %build-inputs "dash") - "/share/emacs/site-lisp/guix.d/dash-" - ,(package-version emacs-dash))) - (with-editor (string-append (assoc-ref %build-inputs "with-editor") - "/share/emacs/site-lisp/guix.d/with-editor-" - ,(package-version emacs-with-editor))) - (source (assoc-ref %build-inputs "source")) - (lisp-dir (string-append %output "/share/emacs/site-lisp"))) - - (install-file (string-append source "/magit-svn.el") - lisp-dir) - - (with-directory-excursion lisp-dir - (parameterize ((%emacs emacs)) - (emacs-generate-autoloads ,name lisp-dir) - (setenv "EMACSLOADPATH" - (string-append ":" magit ":" transient - ":" dash ":" with-editor)) - (emacs-batch-eval '(byte-compile-file "magit-svn.el")))) - #t)))) (home-page "https://github.com/magit/magit-svn") (synopsis "Git-SVN extension to Magit") (description -- cgit v1.2.3 From 93f606b343dab7e1eb1fe0c2f8eb4b11fc7767b6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 29 Feb 2020 09:48:55 -0500 Subject: gnu: emacs-guix: Remove unnecessary configure flags. * gnu/packages/emacs-xyz.scm (emacs-guix)[arguments]: Remove. --- gnu/packages/emacs-xyz.scm | 41 ----------------------------------------- 1 file changed, 41 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cb216f536d..2bba0eb129 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2127,47 +2127,6 @@ (define-public emacs-guix (base32 "0yz64c0z4ygi2k4af18k4r1ncgys18jb8icywkp2g5pgmpn5l7ps")))) (build-system gnu-build-system) - (arguments - `(#:configure-flags - (let ((guix (assoc-ref %build-inputs "guix")) - (gcrypt (assoc-ref %build-inputs "guile-gcrypt")) - (geiser (assoc-ref %build-inputs "geiser")) - (dash (assoc-ref %build-inputs "dash")) - (bui (assoc-ref %build-inputs "bui")) - (magit-popup (assoc-ref %build-inputs "magit-popup")) - (edit-indirect (assoc-ref %build-inputs "edit-indirect")) - (site-lisp "/share/emacs/site-lisp") - (site-scm "/share/guile/site") - (site-go "/lib/guile") - (guile-dir (lambda (dir) - (car (find-files dir - (lambda (file stat) - (string-prefix? - "2." (basename file))) - #:directories? #t))))) - (list (string-append "--with-guix-site-dir=" - (guile-dir (string-append guix site-scm))) - (string-append "--with-guix-site-ccache-dir=" - (guile-dir (string-append guix site-go)) - "/site-ccache") - (string-append "--with-guile-gcrypt-site-dir=" - (guile-dir (string-append gcrypt site-scm))) - (string-append "--with-guile-gcrypt-site-ccache-dir=" - (guile-dir (string-append gcrypt site-go)) - "/site-ccache") - (string-append "--with-geiser-lispdir=" geiser site-lisp) - (string-append "--with-dash-lispdir=" - dash site-lisp "/guix.d/dash-" - ,(package-version emacs-dash)) - (string-append "--with-bui-lispdir=" - bui site-lisp "/guix.d/bui-" - ,(package-version emacs-bui)) - (string-append "--with-editindirect-lispdir=" - edit-indirect site-lisp "/guix.d/edit-indirect-" - ,(package-version emacs-edit-indirect)) - (string-append "--with-popup-lispdir=" - magit-popup site-lisp "/guix.d/magit-popup-" - ,(package-version emacs-magit-popup)))))) (native-inputs `(("pkg-config" ,pkg-config) ("emacs" ,emacs-minimal))) -- cgit v1.2.3 From 092cdae90b57ec6a6bd4047f37d8a5d8526bc191 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 29 Feb 2020 12:38:33 -0500 Subject: gnu: emacs-forge: Use the emacs-build-system. This streamlines the package definition nicely and bring benefits, such as having the Elisp files scanned for potential /bin/ programs and patched, compressing the info manual, being able to compile the autoload file, and installing the byte compiled files to the correct location (under site-lisp/). * gnu/packages/emacs-xyz.scm (emacs-forge)[build-system]: Switch from the gnu-build-system to the emacs-build-system. [arguments]: Remove the #:modules and #:imported-modules arguments. Delete all the custom phases except the 'chdir-lisp one, and add a new 'build-info-manual phase. --- gnu/packages/emacs-xyz.scm | 53 +++++++++++----------------------------------- 1 file changed, 12 insertions(+), 41 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2bba0eb129..0e7131faf3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18303,7 +18303,7 @@ (define-public emacs-forge (let ((commit "63cbf81f166fc71861d8e3d246df8e5ccedcb9bb")) (package (name "emacs-forge") - (version (git-version "0.1.0" "2" commit)) + (version (git-version "0.1.0" "3" commit)) (source (origin (method git-fetch) @@ -18314,7 +18314,7 @@ (define-public emacs-forge (sha256 (base32 "1yf2xjx3459py6rji740jm8bmh2pv66ghnbjxsvjd4jf9kcdav83")))) - (build-system gnu-build-system) + (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo) ("emacs" ,emacs-minimal))) @@ -18329,51 +18329,22 @@ (define-public emacs-forge ("emacs-transient" ,emacs-transient))) (arguments `(#:tests? #f ;no tests - #:modules ((srfi srfi-26) - (guix build gnu-build-system) - ((guix build emacs-build-system) #:prefix emacs:) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-build-system) - (guix build emacs-utils)) #:phases (modify-phases %standard-phases - (delete 'configure) - (delete 'install) - (add-after 'unpack 'delete-doc-targets + (add-after 'unpack 'build-info-manual (lambda _ - (substitute* "./Makefile" - (("lisp docs") "lisp")))) - (add-after 'delete-doc-targets 'chdir-lisp + (invoke "make" "info") + ;; Move the info file to lisp so that it gets installed by the + ;; emacs-build-system. + (rename-file "docs/forge.info" "lisp/forge.info"))) + (add-after 'build-info-manual 'chdir-lisp (lambda _ - (chdir "lisp"))) - (add-after 'chdir-lisp 'emacs-install - (assoc-ref emacs:%standard-phases 'install)) - (add-after 'emacs-install 'emacs-make-autoloads - (assoc-ref emacs:%standard-phases 'make-autoloads)) - (add-after 'build 'install-elc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (el-dir (string-append - out "/share/emacs/site-lisp/guix.d/forge-" - ,version))) - (for-each (cut install-file <> el-dir) - (find-files "." "\\.elc")) - #t))) - (add-after 'install-elc 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (info (string-append out "/share/info"))) - (with-directory-excursion "../docs" - (invoke "makeinfo" "forge.texi") - (install-file "forge.info" info) - #t))))))) + (chdir "lisp") + #t))))) (home-page "https://github.com/magit/forge/") (synopsis "Access Git forges from Magit") - (description - "Work with Git forges, such as Github and Gitlab, from the comfort of -Magit and the rest of Emacs.") + (description "Work with Git forges, such as Github and Gitlab, from the +comfort of Magit and the rest of Emacs.") (license license:gpl3+)))) (define-public emacs-matcha -- cgit v1.2.3 From d53e87cf11b5a5a1d794f6ef15fe7213c5b60546 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 Mar 2020 21:52:37 -0500 Subject: gnu: ghc-hindent: Remove guix.d from the Elisp installation directory. * gnu/packages/haskell-xyz.scm (ghc-hindent)[phases]{emacs-install}: Update the installation prefix directory. --- gnu/packages/haskell-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 418eb7cc46..01fecae850 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5286,8 +5286,7 @@ (define-public ghc-hindent (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (elisp-file "elisp/hindent.el") - (dest (string-append out "/share/emacs/site-lisp" - "/guix.d/hindent-" ,version)) + (dest (string-append out "/share/emacs/site-lisp")) (emacs (string-append (assoc-ref inputs "emacs") "/bin/emacs"))) (make-file-writable elisp-file) -- cgit v1.2.3 From 0a3ce07784c74ff27b864884499deca41c3d4d0e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 Mar 2020 22:11:47 -0500 Subject: gnu: cedille: Remove guix.d from the Elisp installation directory. * gnu/packages/cedille.scm (cedille)[phases]{patch-cedille-path-el}: Update the Elisp installation prefix used. {copy-cedille-mode}: Likewise. --- gnu/packages/cedille.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cedille.scm b/gnu/packages/cedille.scm index d3a6850f9f..d9cf66c501 100644 --- a/gnu/packages/cedille.scm +++ b/gnu/packages/cedille.scm @@ -56,17 +56,12 @@ (define-public cedille (let ((out (assoc-ref outputs "out"))) (substitute* "cedille-mode.el" (("/usr/share/emacs/site-lisp/cedille-mode") - (string-append - out "/share/emacs/site-lisp/guix.d/cedille-" - ,version))) + (string-append out "/share/emacs/site-lisp"))) #t))) (add-after 'unpack 'copy-cedille-mode (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (lisp - (string-append - out "/share/emacs/site-lisp/guix.d/cedille-" - ,version "/"))) + (lisp (string-append out "/share/emacs/site-lisp"))) (mkdir-p (string-append lisp "cedille-mode")) (copy-recursively "cedille-mode" -- cgit v1.2.3 From d5195020d2b2909a6199fe2a93a109b2967e6d88 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 Mar 2020 22:34:41 -0500 Subject: gnu: emacs-mew: Remove guix.d from the Elisp installation directory. * gnu/packages/mail.scm (emacs-mew)[arguments]: Update the Elisp installation prefix. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 03383180b0..092bb8be0f 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -673,7 +673,7 @@ (define-public emacs-mew ("ruby" ,ruby))) ; to set GEM_PATH so ruby-sqlite3 is found at runtime (build-system gnu-build-system) (arguments - (let ((elisp-dir "/share/emacs/site-lisp/guix.d/mew") + (let ((elisp-dir "/share/emacs/site-lisp") (icon-dir "/share/mew")) `(#:modules ((guix build gnu-build-system) (guix build utils) -- cgit v1.2.3 From cc96c9504d22c0a0a4a146436a74c24d348241ae Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 28 Feb 2020 23:42:59 -0500 Subject: gnu: emacs-magit: Remove obsolete make flags. * gnu/packages/emacs-xyz.scm (emacs-magit): Remove make flags that were jadis required to reference external Elisp libraries. These are now made available through EMACSLOADPATH. --- gnu/packages/emacs-xyz.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0e7131faf3..62d1adcf74 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -295,7 +295,7 @@ (define-public emacs-magit (let ((commit "c761d28d49e5238037512b898db0ec9b40d85770")) (package (name "emacs-magit") - (version (git-version "2.90.1" "2" commit)) + (version (git-version "2.90.1" "3" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -335,24 +335,10 @@ (define-public emacs-magit (guix build emacs-utils)) #:test-target "test" #:tests? #f ; tests are not included in the release - #:make-flags (list (string-append "PREFIX=" %output) ;; Don't put .el files in a sub-directory. - (string-append "lispdir=" %output "/share/emacs/site-lisp") - (string-append "DASH_DIR=" - (assoc-ref %build-inputs "dash") - "/share/emacs/site-lisp/guix.d/dash-" - ,(package-version emacs-dash)) - (string-append "WITH_EDITOR_DIR=" - (assoc-ref %build-inputs "with-editor") - "/share/emacs/site-lisp/guix.d/with-editor-" - ,(package-version emacs-with-editor)) - (string-append "TRANSIENT_DIR=" - (assoc-ref %build-inputs "transient") - "/share/emacs/site-lisp/guix.d/transient-" - ,(package-version emacs-transient))) - + (string-append "lispdir=" %output "/share/emacs/site-lisp")) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch -- cgit v1.2.3 From 15c3aa091100160bbe9c81650f9ab7a12bd7964e Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 19 Mar 2020 19:54:46 +0100 Subject: gnu: docker-compose: Update to 1.25.4. Fixes . * gnu/packages/docker.scm (docker-compose): Update to 1.25.4. Signed-off-by: Danny Milosavljevic --- gnu/packages/docker.scm | 11 +++++------ gnu/packages/python-xyz.scm | 26 -------------------------- 2 files changed, 5 insertions(+), 32 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 7524a0dc1b..69dee2b856 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Maxim Cournoyer +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -98,19 +99,17 @@ (define-public python-dockerpty client.") (license license:asl2.0))) -;; When updating, check whether python-jsonschema-2.6 can be removed from Guix -;; entirely. (define-public docker-compose (package (name "docker-compose") - (version "1.24.1") + (version "1.25.4") (source (origin (method url-fetch) (uri (pypi-uri "docker-compose" version)) (sha256 (base32 - "0lx7bx6jvhydbab8vwry0bclhdf0dfj6jrns1m5y45yp9ybqxmd5")))) + "1ww8ckpj3n5jdg63qvmiqx3gk0fsrnynnnqj17fppymbwjzf5fps")))) (build-system python-build-system) ;; TODO: Tests require running Docker daemon. (arguments '(#:tests? #f)) @@ -120,9 +119,9 @@ (define-public docker-compose ("python-docker-py" ,python-docker-py) ("python-dockerpty" ,python-dockerpty) ("python-docopt" ,python-docopt) - ("python-jsonschema" ,python-jsonschema-2.6) + ("python-jsonschema" ,python-jsonschema) ("python-pyyaml" ,python-pyyaml) - ("python-requests" ,python-requests-2.20) + ("python-requests" ,python-requests) ("python-six" ,python-six) ("python-texttable" ,python-texttable) ("python-websocket-client" ,python-websocket-client))) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 07199aa7ca..8271e1ff7e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2306,32 +2306,6 @@ (define-public python2-jsonschema `(("python2-functools32" ,python2-functools32) ,@(package-propagated-inputs jsonschema)))))) -;; This old version is still required by docker-compose as of 1.24.0. -(define-public python-jsonschema-2.6 - (package - (name "python-jsonschema") - (version "2.6.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "jsonschema" version)) - (sha256 - (base32 - "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg")))) - (build-system python-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check (lambda _ (invoke "nosetests")))))) - (native-inputs - `(("python-nose" ,python-nose) - ("python-vcversioner" ,python-vcversioner))) - (home-page "https://github.com/Julian/jsonschema") - (synopsis "Implementation of JSON Schema for Python") - (description - "Jsonschema is an implementation of JSON Schema for Python.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-jsonschema)))))) - (define-public python-schema (package (name "python-schema") -- cgit v1.2.3 From 0b06a0199fe4f028f707cf77fc8ae73a1b367d4b Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Thu, 19 Mar 2020 21:02:34 +0100 Subject: gnu: rust-bindgen: Add missing space to synopsis. * gnu/packages/crates-io.scm (rust-bindgen-0.50)[synopsis]: Add a space between "C++" and "libraries". --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1e1e9bf5db..a164b25570 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -966,7 +966,7 @@ (define-public rust-bindgen-0.50 (home-page "https://rust-lang.github.io/rust-bindgen/") (synopsis - "Automatically generates FFI bindings to C and C++libraries") + "Automatically generates FFI bindings to C and C++ libraries") (description "Automatically generates Rust FFI bindings to C and C++ libraries.") -- cgit v1.2.3 From 355dd7135cdcdcd4c589bbb7f0f6ab5a2f26ca65 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Fri, 20 Mar 2020 01:24:38 +1100 Subject: gnu: grim: Move scdoc to native-inputs. * gnu/packages/image.scm (scdoc)[inputs]: Remove scdoc. [native-inputs]: Add scdoc. Signed-off-by: Danny Milosavljevic --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index ad288b87ec..b665740ca2 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1776,10 +1776,10 @@ (define-public grim (sha256 (base32 "0brljl4zfbn5mh9hkfrfkvd27c5y9vdkgap9r1hrfy9r1x20sskn")))) (build-system meson-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) + (native-inputs `(("pkg-config" ,pkg-config) + ("scdoc" ,scdoc))) (inputs `(("cairo" ,cairo) ("libjpeg-turbo" ,libjpeg-turbo) - ("scdoc" ,scdoc) ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (home-page "https://github.com/emersion/grim") -- cgit v1.2.3 From d105cc52f9f6bf6e721ec88f9f60bc906d320853 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 21:18:20 +0200 Subject: gnu: Add rust-cairo-sys-rs-0.9. * gnu/packages/crates-io.scm (rust-cairo-sys-rs-0.9): New variable. --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a164b25570..62d4c63349 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32,6 +32,7 @@ (define-module (gnu packages crates-io) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) + #:use-module (gnu packages gtk) #:use-module (gnu packages jemalloc) #:use-module (gnu packages llvm) #:use-module (gnu packages pcre) @@ -1677,6 +1678,34 @@ (define-public rust-c2-chacha-0.2 "The ChaCha family of stream ciphers.") (license (list license:asl2.0 license:expat)))) +(define-public rust-cairo-sys-rs-0.9 + (package + (name "rust-cairo-sys-rs") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "cairo-sys-rs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qsdy6s57yvscg2rfm7wdqrlhzbn1aq9lhk3dy1vw5f7r81blrgz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-x11" ,rust-x11-2) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (inputs + `(("cairo" ,cairo))) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libcairo") + (description "This package provides FFI bindings to libcairo.") + (license license:expat))) + (define-public rust-calloop-0.4 (package (name "rust-calloop") -- cgit v1.2.3 From a3ea699eb3fcaa5051872dcb22a6937b6e8be295 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 21:31:40 +0200 Subject: gnu: Add rust-gtk-pixbuf-sys-0.9. * gnu/packages/crates-io.scm (rust-gdk-pixbuf-sys-0.9): New variable. --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 62d4c63349..61c932751a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6019,6 +6019,38 @@ (define-public rust-gdi32-sys-0.2 API library @code{gdi32}.") (license license:expat))) +(define-public rust-gdk-pixbuf-sys-0.9 + (package + (name "rust-gdk-pixbuf-sys") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gdk-pixbuf-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1c2andpjb10y7bahh6nxnksh9m3g5qh4mgq9znx634cy1831p6fq")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; tests not included in release + #:cargo-inputs + (("rust-gio-sys" ,rust-gio-sys-0.9) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-0.1) + ("rust-tempfile" ,rust-tempfile-3.1)))) + (inputs + `(("gdk-pixbuf" ,gdk-pixbuf))) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libgdk_pixbuf-2.0") + (description "This package provides FFI bindings to @code{libgdk_pixbuf-2.0}.") + (license license:expat))) + (define-public rust-generator-0.6 (package (name "rust-generator") -- cgit v1.2.3 From 1386cad154bcef019468f8a1e45d9b84d18a2e4d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 21:45:36 +0200 Subject: gnu: Add rust-pango-sys-0.9. * gnu/packages/crates-io.scm (rust-pango-sys-0.9): New variable. --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 61c932751a..f6c56039ef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11422,6 +11422,37 @@ (define-public rust-pad-0.1 "This package provides a library for padding strings at runtime.") (license license:expat))) +(define-public rust-pango-sys-0.9 + (package + (name "rust-pango-sys") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "pango-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0zdynikh6jrfa31fpmbrwnz46a57idci73zzkf0z0g3vj223vfc6")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Some test files not included in release. + #:cargo-inputs + (("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-0.1) + ("rust-tempfile" ,rust-tempfile-3.1)))) + (inputs + `(("pango" ,pango))) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libpango-1.0") + (description "This package provides FFI bindings to @code{libpango-1.0}.") + (license license:expat))) + (define-public rust-parity-wasm-0.40 (package (name "rust-parity-wasm") -- cgit v1.2.3 From f06961ea356352565c840e77d71b3a0028e45bd0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 21:55:55 +0200 Subject: gnu: Add rust-pangocairo-sys-0.10. * gnu/packages/crates-io.scm (rust-pangocairo-sys-0.10): New variable. --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f6c56039ef..5a099b0ed0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11453,6 +11453,37 @@ (define-public rust-pango-sys-0.9 (description "This package provides FFI bindings to @code{libpango-1.0}.") (license license:expat))) +(define-public rust-pangocairo-sys-0.10 + (package + (name "rust-pangocairo-sys") + (version "0.10.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "pangocairo-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1zlyf5vajarnxg5034b8qa5w5zajv96lfvlgiki26svpmcqip4m3")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.9) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango-sys" ,rust-pango-sys-0.9) + ("rust-pkg-config" ,rust-pkg-config-0.3)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-0.1) + ("rust-tempfile" ,rust-tempfile-3.1)))) + (inputs + `(("gtk+" ,gtk+))) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libgtk-3") + (description "This package provides FFI bindings to libgtk-3.") + (license license:expat))) + (define-public rust-parity-wasm-0.40 (package (name "rust-parity-wasm") -- cgit v1.2.3 From 34d0c1e7dd25acc43385f4cb91b928b437503a9d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 22:04:22 +0200 Subject: gnu: Add rust-edit-distance-2.1. * gnu/packages/crates-io.scm (rust-edit-distance-2.1): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5a099b0ed0..071e2619fa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4175,6 +4175,29 @@ (define-public rust-dwrote-0.9 "This package provides lightweight binding to DirectWrite.") (license license:mpl2.0))) +(define-public rust-edit-distance-2.1 + (package + (name "rust-edit-distance") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "edit-distance" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0yq3wlmd7ly22qxhfysi77qp31yvpx2ll9waa75bkpiih7rsmfmv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.9)))) + (home-page "https://github.com/febeling/edit-distance") + (synopsis "Levenshtein edit distance between strings") + (description + "Levenshtein edit distance between strings, a measure for similarity.") + (license license:asl2.0))) + (define-public rust-either-1.5 (package (name "rust-either") -- cgit v1.2.3 From 44b748e4f5dd2b026a861f2b6411c74a64863b28 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 22:10:56 +0200 Subject: gnu: Add rust-alga-derive-0.9. * gnu/packages/crates-io.scm (rust-alga-derive-0.9): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 071e2619fa..b29b11cb81 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -219,6 +219,33 @@ (define-public rust-aho-corasick-0.5 ("rust-rand" ,rust-rand-0.3) ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)))))) +(define-public rust-alga-derive-0.9 + (package + (name "rust-alga-derive") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "alga-derive" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0a2594j6blczz18vfg85agr7vsjrbq6900d3xwxw0zzbqj9j2adz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-edit-distance" ,rust-edit-distance-2.1) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quickcheck" ,rust-quickcheck-0.9) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0)))) + (home-page "https://github.com/rustsim/alga") + (synopsis "Dutomatic deriving of abstract algebra traits") + (description "Derive attribute for implementing algebraic traits from the +@code{alga} crate.") + (license license:asl2.0))) + (define-public rust-andrew-0.2 (package (name "rust-andrew") -- cgit v1.2.3 From 8ae8478a711acb866b03099d2ed8577446c50cfb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 22:14:46 +0200 Subject: gnu: Add rust-ord-subset-3. * gnu/packages/crates-io.scm (rust-ord-subset-3): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b29b11cb81..70ea6a515d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11287,6 +11287,27 @@ (define-public rust-openssl-sys-extras-0.7 "Extra FFI bindings to OpenSSL that require a C shim.") (license license:expat))) +(define-public rust-ord-subset-3 + (package + (name "rust-ord-subset") + (version "3.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "ord-subset" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vvb6zmz279nb59dki7kbsvixbk8zpg2gxvgcpsjfnxg9ik19knp")))) + (build-system cargo-build-system) + (home-page "https://github.com/emerentius/ord_subset") + (synopsis "Tools for working with the Ord subset of certain PartialOrd types") + (description + "This package provides tools for working with the Ord subset of certain +PartialOrd types, like floats.") + (license (list license:expat license:asl2.0)))) + (define-public rust-ordered-float-1.0 (package (name "rust-ordered-float") -- cgit v1.2.3 From e036be30c543449b459a3d0e0928d89ab372e8aa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 22:18:05 +0200 Subject: gnu: Add rust-decimal-2.0. * gnu/packages/crates-io.scm (rust-decimal-2.0): New variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 70ea6a515d..1a15222bac 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3651,6 +3651,36 @@ (define-public rust-datetime-0.4 and arithmetic.") (license license:expat))) +(define-public rust-decimal-2.0 + (package + (name "rust-decimal") + (version "2.0.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "decimal" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vb3i8vg1dxrw3kzbfiag3gg7rdjd73z80mwbwkq60vnphiqfig6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-ord-subset" ,rust-ord-subset-3) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-cc" ,rust-cc-1.0)) + #:cargo-development-inputs + (("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://github.com/alkis/decimal") + (synopsis "Decimal floating point arithmetic for Rust") + (description + "Decimal floating point arithmetic for Rust.") + (license license:asl2.0))) + (define-public rust-deflate-0.7 (package (name "rust-deflate") -- cgit v1.2.3 From 818794ee2832aa4c8395d758916e7c057cb02cfd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 22:27:18 +0200 Subject: gnu: Add rust-alga-0.9. * gnu/packages/crates-io.scm (rust-alga-0.9): New variable. --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1a15222bac..aaa3b2be2d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -219,6 +219,40 @@ (define-public rust-aho-corasick-0.5 ("rust-rand" ,rust-rand-0.3) ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)))))) +(define-public rust-alga-0.9 + (package + (name "rust-alga") + (version "0.9.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "alga" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wl4z8ini9269x04g8wwdz1nn3hmmvaaysq4jwhymikyg81kv0jg")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-approx" ,rust-approx-0.3) + ("rust-decimal" ,rust-decimal-2.0) + ("rust-num-complex" ,rust-num-complex-0.2) + ("rust-num-traits" ,rust-num-traits-0.2)) + #:cargo-development-inputs + (("rust-alga-derive" ,rust-alga-derive-0.9) + ("rust-quickcheck" ,rust-quickcheck-0.8)))) + (home-page "https://github.com/rustsim/alga") + (synopsis "Abstract algebra for Rust") + (description "Alga aims to provide solid mathematical abstractions to +algebra-focused applications. It defines and organizes through trait +inheritance the basic building blocks of general algebraic structures. +Specific implementations of algebraic structure traits are left to other +crates. Higher-level traits for specialized domains of algebra (like linear +algebra) are also provided and will prove useful for applications that include +code that is generic with regard to the algebraic entity types.") + (license license:asl2.0))) + (define-public rust-alga-derive-0.9 (package (name "rust-alga-derive") -- cgit v1.2.3 From 87a3a185fe433d3497f08083c6ec7e5eb78c5fef Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 22:32:39 +0200 Subject: gnu: Add rust-rustdoc-stripper-0.1. * gnu/packages/crates-io.scm (rust-rustdoc-stripper-0.1): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aaa3b2be2d..59d153dc22 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14750,6 +14750,29 @@ (define-public rust-rustc-version-0.2 rustc compiler.") (license (list license:expat license:asl2.0)))) +(define-public rust-rustdoc-stripper-0.1 + (package + (name "rust-rustdoc-stripper") + (version "0.1.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustdoc-stripper" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "13rf65a0xk1zyb92jd8p12x529rsbfchwk9zvjr0snr9savpxw19")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.1)))) + (home-page "https://github.com/GuillaumeGomez/rustdoc-stripper") + (synopsis "Nanipulate rustdoc comments") + (description + "This package provides a tool to manipulate rustdoc comments.") + (license license:asl2.0))) + (define-public rust-rustfix-0.4 (package (name "rust-rustfix") -- cgit v1.2.3 From 6de81dd2d89289114d3bc6a93e79fac2a8c2a455 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 22:35:11 +0200 Subject: gnu: Add rust-gtk-rs-lgpl-docs-0.1. * gnu/packages/crates-io.scm (rust-gtk-rs-lgpl-docs-0.1): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 59d153dc22..112018d2e5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7166,6 +7166,29 @@ (define-public rust-grep-searcher-0.1 "Fast line oriented regex searching as a library.") (license (list license:unlicense license:expat)))) +(define-public rust-gtk-rs-lgpl-docs-0.1 + (package + (name "rust-gtk-rs-lgpl-docs") + (version "0.1.15") + (source + (origin + (method url-fetch) + (uri (crate-uri "gtk-rs-lgpl-docs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06b1j64zg0xmhwfkyhzh3y0apclg6qihn3f7s1bd7kgjmkia4jlr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rustdoc-stripper" ,rust-rustdoc-stripper-0.1)))) + (home-page "https://gtk-rs.org/") + (synopsis "LGPL-licensed docs for Gtk-rs crates") + (description + "LGPL-licensed docs for Gtk-rs crates.") + (license license:lgpl2.0))) + (define-public rust-gzip-header-0.3 (package (name "rust-gzip-header") -- cgit v1.2.3 From 07bf6cbc49adf2aa0835b84793c30463a66178d8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 22:50:02 +0200 Subject: gnu: rust-futures-util-preview-0.3: Don't skip build. * gnu/packages/crates-io.scm (rust-futures-util-preview-0.3)[arguments]: Don't skip build. Skip tests. Replace rust-rand-0.4 with 0.7 in cargo-inputs. Remove rust-rand-core-0.5. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 112018d2e5..187f15dc49 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6031,7 +6031,7 @@ (define-public rust-futures-util-preview-0.3 "0kizm86wgr5qldyavskfi0r1msg6m4x2pkj0d4r04br2ig29i0dg")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f #:cargo-inputs (("rust-futures" ,rust-futures-0.1) ("rust-futures-channel-preview" ,rust-futures-channel-preview-0.3) @@ -6044,8 +6044,7 @@ (define-public rust-futures-util-preview-0.3 ("rust-pin-utils" ,rust-pin-utils-0.1) ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) ("rust-proc-macro-nested" ,rust-proc-macro-nested-0.1) - ("rust-rand" ,rust-rand-0.4) - ("rust-rand-core" ,rust-rand-core-0.5) + ("rust-rand" ,rust-rand-0.7) ("rust-slab" ,rust-slab-0.4) ("rust-tokio-io" ,rust-tokio-io-0.1)))) (home-page "https://github.com/rust-lang/futures-rs") -- cgit v1.2.3 From 8f000e87a2276ee89ee6d192d8e61899a9a680ef Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 22:51:54 +0200 Subject: gnu: Add rust-futures-preview-0.3. * gnu/packages/crates-io.scm (rust-futures-preview-0.3): New variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 187f15dc49..8fd0433c9e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5889,6 +5889,36 @@ (define-public rust-futures-macro-0.3 "This package provides the @code{futures-rs} procedural macro implementations.") (license (list license:expat license:asl2.0)))) +(define-public rust-futures-preview-0.3 + (package + (name "rust-futures-preview") + (version "0.3.0-alpha.17") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures-preview" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rsq8d1ciyg37i5ysd9dynwmklwy4sx466z9a72687wsi8fgj9dz")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-inputs + (("rust-futures-channel-preview" ,rust-futures-channel-preview-0.3) + ("rust-futures-core-preview" ,rust-futures-core-preview-0.3) + ("rust-futures-executor-preview" ,rust-futures-executor-preview-0.3) + ("rust-futures-io-preview" ,rust-futures-io-preview-0.3) + ("rust-futures-sink-preview" ,rust-futures-sink-preview-0.3) + ("rust-futures-util-preview" ,rust-futures-util-preview-0.3)))) + (home-page "https://rust-lang-nursery.github.io/futures-rs") + (synopsis "An implementation of futures and streams") + (description + "An implementation of futures and streams featuring zero allocations, +composability, and iterator-like interfaces.") + (license (list license:expat license:asl2.0)))) + (define-public rust-futures-select-macro-preview-0.3 (package (name "rust-futures-select-macro-preview") -- cgit v1.2.3 From 2832731589bf7c9de0f5136b07b0218a34053ad7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 23:04:24 +0200 Subject: gnu: Add rust-glib-0.9. * gnu/packages/crates-io.scm (rust-glib-0.9): New variable. --- gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8fd0433c9e..35aa27f0b2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6595,6 +6595,43 @@ (define-public rust-gleam-0.6 "Generated OpenGL bindings and wrapper for Servo.") (license (list license:asl2.0 license:expat)))) +(define-public rust-glib-0.9 + (package + (name "rust-glib") + (version "0.9.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "glib" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1h3100mf7kdfxibjz5na0sqzbd2mcsyd8pzivn3666w414x5gys0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-executor" ,rust-futures-executor-0.3) + ("rust-futures-preview" ,rust-futures-preview-0.3) + ("rust-futures-task" ,rust-futures-task-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.1)))) + (inputs + `(("glib" ,glib))) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the GLib library") + (description + "Rust bindings for the GLib library.") + (license license:expat))) + (define-public rust-glib-sys-0.9 (package (name "rust-glib-sys") -- cgit v1.2.3 From 85cb4da813f25ebaac112d9f3e9c26f4b64dd985 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 23:16:27 +0200 Subject: gnu: Add rust-cairo-rs-0.8. * gnu/packages/crates-io.scm (rust-cairo-rs-0.8): New variable. --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 35aa27f0b2..2a3c424c4a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1739,6 +1739,39 @@ (define-public rust-c2-chacha-0.2 "The ChaCha family of stream ciphers.") (license (list license:asl2.0 license:expat)))) +(define-public rust-cairo-rs-0.8 + (package + (name "rust-cairo-rs") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cairo-rs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11303v1fv6hsc9n70ak380gknkf0098phpcxqdhkmahqjsx4jw0m")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.9) + ("rust-glib" ,rust-glib-0.9) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1) + ("rust-tempfile" ,rust-tempfile-3.1)))) + (inputs + `(("cairo" ,cairo))) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the Cairo library") + (description + "Rust bindings for the Cairo library.") + (license license:expat))) + (define-public rust-cairo-sys-rs-0.9 (package (name "rust-cairo-sys-rs") -- cgit v1.2.3 From 9acfbaf39d09557848593284fb1bbaf5a55d695c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 23:30:05 +0200 Subject: gnu: Add rust-num-bigint-0.1. * gnu/packages/crates-io.scm (rust-num-bigint-0.1): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2a3c424c4a..1075c14617 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10758,6 +10758,30 @@ (define-public rust-num-bigint-0.2 "Big integer implementation for Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-num-bigint-0.1 + (package + (inherit rust-num-bigint-0.2) + (name "rust-num-bigint") + (version "0.1.44") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-bigint" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1hg80xd7vd5yqzks1h0zk2fcgqnf84m2cdj9q4cffk581nnrjf76")))) + (arguments + `(#:cargo-inputs + (("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.4) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-serde" ,rust-serde-0.8)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.4)))))) + (define-public rust-num-complex-0.2 (package (name "rust-num-complex") -- cgit v1.2.3 From fbe6dbb69e6600972b8d8f95760abf3a2e107cfd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 23:41:03 +0200 Subject: gnu: Add rust-num-complex-0.1. * gnu/packages/crates-io.scm (rust-num-complex-0.1): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1075c14617..b2be043833 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10810,6 +10810,27 @@ (define-public rust-num-complex-0.2 "Complex numbers implementation for Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-num-complex-0.1 + (package + (inherit rust-num-complex-0.2) + (name "rust-num-complex") + (version "0.1.43") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-complex" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0mln3h018lar511hadjwfkbyq1561s8kdzfg8aagbakqg0fn725j")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-serde" ,rust-serde-0.8)))))) + (define-public rust-num-cpus-1.11 (package (name "rust-num-cpus") -- cgit v1.2.3 From 74f44bf74fd2b48ab18b4af2c849798d4eae15ce Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 23:45:55 +0200 Subject: gnu: Add rust-num-rational-0.1. * gnu/packages/crates-io.scm (rust-num-rational-0.1): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b2be043833..6fee45d9aa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10981,6 +10981,28 @@ (define-public rust-num-rational-0.2 "Rational numbers implementation for Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-num-rational-0.1 + (package + (inherit rust-num-rational-0.2) + (name "rust-num-rational") + (version "0.1.42") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-rational" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kkqb8j3b3nis9hs4ww4hkrmb4a6v9sr9al08xmwhgvmpms4qcgf")))) + (arguments + `(#:cargo-inputs + (("rust-num-bigint" ,rust-num-bigint-0.1) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-serde" ,rust-serde-0.8)))))) + (define-public rust-num-traits-0.2 (package (name "rust-num-traits") -- cgit v1.2.3 From 6fee63e6d9c58569937e56151d7084ea7ee6e6cd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 23:47:53 +0200 Subject: gnu: Add rust-num-0.1. * gnu/packages/crates-io.scm (rust-num-0.1): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6fee45d9aa..5de673475d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10727,6 +10727,29 @@ (define-public rust-num-0.2 including bigint, complex, rational, range iterators, generic integers, and more.") (license (list license:expat license:asl2.0)))) +(define-public rust-num-0.1 + (package + (inherit rust-num-0.2) + (name "rust-num") + (version "0.1.42") + (source + (origin + (method url-fetch) + (uri (crate-uri "num" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0vhmyvfan380f86895z0f8rjscjc6qvwcmyvm15370ik2mjas0s7")))) + (arguments + `(#:cargo-inputs + (("rust-num-bigint" ,rust-num-bigint-0.1) + ("rust-num-complex" ,rust-num-complex-0.1) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-iter" ,rust-num-iter-0.1) + ("rust-num-rational" ,rust-num-rational-0.1) + ("rust-num-traits" ,rust-num-traits-0.2)))))) + (define-public rust-num-bigint-0.2 (package (name "rust-num-bigint") -- cgit v1.2.3 From ee7ef9cb8c3f340508fbfa1abab78bd07b0865e8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 23:49:53 +0200 Subject: gnu: Add rust-float-cmp-0.3. * gnu/packages/crates-io.scm (rust-float-cmp-0.3): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5de673475d..258c4ebc62 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5202,6 +5202,28 @@ (define-public rust-flate2-1.0 streams.") (license (list license:expat license:asl2.0)))) +(define-public rust-float-cmp-0.3 + (package + (name "rust-float-cmp") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "float-cmp" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1c0hmj46xma5aysz0qb49padhc26aw875whx6q6rglsj5dqpds1b")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-num" ,rust-num-0.1)))) + (home-page "https://github.com/mikedilger/float-cmp") + (synopsis "Floating point approximate comparison traits") + (description + "Floating point approximate comparison traits in Rust.") + (license license:expat))) + (define-public rust-float-ord-0.2 (package (name "rust-float-ord") -- cgit v1.2.3 From 2d6fa1839993e381b4c9d6d3287f6be98af2847a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 23:59:29 +0200 Subject: gnu: Add rust-dtoa-short-0.3. * gnu/packages/crates-io.scm (rust-dtoa-short-0.3): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 258c4ebc62..eb98877725 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4239,6 +4239,31 @@ (define-public rust-dtoa-0.2 (base32 "0g96cap6si1g6wi62hsdk2fnj3sf5vd4i97zj6163j8hhnsl3n0d")))))) +(define-public rust-dtoa-short-0.3 + (package + (name "rust-dtoa-short") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "dtoa-short" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wkn7ziqffq8hj0a411lgn7674ackzdk734ikp230rmp2f2hn0jr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-dtoa" ,rust-dtoa-0.4)) + #:cargo-development-inputs + (("rust-float-cmp" ,rust-float-cmp-0.3)))) + (home-page "https://github.com/upsuper/dtoa-short") + (synopsis "Serialize float number and truncate to certain precision") + (description + "Serialize float number and truncate to certain precision in Rust.") + (license license:mpl2.0))) + (define-public rust-duct-0.13 (package (name "rust-duct") -- cgit v1.2.3 From f90a306d1f694f15f7b0c165fe7ef102bb3cfa99 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 00:01:59 +0200 Subject: gnu: Add rust-float-cmp-0.5. * gnu/packages/crates-io.scm (rust-float-cmp-0.5): New variable. (rust-float-cmp-0.3): Inherit from rust-float-cmp-0.5. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index eb98877725..b08324b243 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5227,10 +5227,10 @@ (define-public rust-flate2-1.0 streams.") (license (list license:expat license:asl2.0)))) -(define-public rust-float-cmp-0.3 +(define-public rust-float-cmp-0.5 (package (name "rust-float-cmp") - (version "0.3.0") + (version "0.5.3") (source (origin (method url-fetch) @@ -5239,16 +5239,33 @@ (define-public rust-float-cmp-0.3 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1c0hmj46xma5aysz0qb49padhc26aw875whx6q6rglsj5dqpds1b")))) + "03hmx3n48hjm0x1ig84n1j87kzp75lzr6cj1sgi6a6pykgn4n8km")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-num" ,rust-num-0.1)))) + `(#:cargo-inputs (("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://github.com/mikedilger/float-cmp") (synopsis "Floating point approximate comparison traits") (description "Floating point approximate comparison traits in Rust.") (license license:expat))) +(define-public rust-float-cmp-0.3 + (package + (inherit rust-float-cmp-0.5) + (name "rust-float-cmp") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "float-cmp" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1c0hmj46xma5aysz0qb49padhc26aw875whx6q6rglsj5dqpds1b")))) + (arguments + `(#:cargo-inputs (("rust-num" ,rust-num-0.1)))))) + (define-public rust-float-ord-0.2 (package (name "rust-float-ord") -- cgit v1.2.3 From c9d0d4d4ead7098d279823bce883899a14bed910 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 08:32:19 +0200 Subject: gnu: Add rust-procedural-masquerade-0.1. * gnu/packages/crates-io.scm (rust-procedural-masquerade-0.1): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b08324b243..47da68f75b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13045,6 +13045,27 @@ (define-public rust-proc-macro2-0.4 #:cargo-development-inputs (("rust-quote" ,rust-quote-0.6)))))) +(define-public rust-procedural-masquerade-0.1 + (package + (name "rust-procedural-masquerade") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "procedural-masquerade" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1l098px1hwdzqnxl376a9hfxb9q8kmj2n0y0s8k7plrz3jjp85cs")))) + (build-system cargo-build-system) + (home-page "https://github.com/servo/rust-cssparser") + (synopsis "Macro rules for proc-macro-derive") + (description + "This package provides @code{macro_rules} for making +@code{proc_macro_derive} pretend to be @code{proc_macro}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-proptest-0.9 (package (name "rust-proptest") -- cgit v1.2.3 From 55ca8748df4a5d2915f1abf22012d308f856ba34 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 08:43:48 +0200 Subject: gnu: Add rust-glib-0.8. * gnu/packages/crates-io.scm (rust-glib-0.8): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 47da68f75b..c694863379 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6729,6 +6729,31 @@ (define-public rust-glib-0.9 "Rust bindings for the GLib library.") (license license:expat))) +(define-public rust-glib-0.8 + (package + (inherit rust-glib-0.9) + (name "rust-glib") + (version "0.8.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "glib" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ysy87zrwyzhfpf3d8rkyyr3amwj85wky05fsl7kx95s84l269xy")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-futures-preview" ,rust-futures-preview-0.3) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.1)))))) + (define-public rust-glib-sys-0.9 (package (name "rust-glib-sys") -- cgit v1.2.3 From 57beeed7040171667ce35d7012b900c2780293a3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 09:17:59 +0200 Subject: gnu: Add rust-cairo-rs-0.7. * gnu/packages/crates-io.scm (rust-cairo-rs-0.7): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c694863379..07cb744fd8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1772,6 +1772,32 @@ (define-public rust-cairo-rs-0.8 "Rust bindings for the Cairo library.") (license license:expat))) +(define-public rust-cairo-rs-0.7 + (package + (inherit rust-cairo-rs-0.8) + (name "rust-cairo-rs") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cairo-rs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "171m98g41avp5mmshqir4ka21napp7ma5fx45wi9mw5hwdyv8pg0")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.9) + ("rust-glib" ,rust-glib-0.8) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.1)))))) + (define-public rust-cairo-sys-rs-0.9 (package (name "rust-cairo-sys-rs") -- cgit v1.2.3 From ed72b99d8cee22e3da627fecf5faee3ffb53e044 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 10:20:43 +0200 Subject: gnu: Add rust-cssparser-macros-0.3. * gnu/packages/crates-io.scm (rust-cssparser-macros-0.3): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 07cb744fd8..a253d4ef56 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3527,6 +3527,33 @@ (define-public rust-crypto-mac-0.7 Code} (MAC) algorithms.") (license (list license:expat license:asl2.0)))) +(define-public rust-cssparser-macros-0.3 + (package + (name "rust-cssparser-macros") + (version "0.3.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "cssparser-macros" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vqyc5xm8a4va92vs1nn0cc46c930l2n21gccijnc5y7hx7cicav")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-phf-codegen" ,rust-phf-codegen-0.7) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-procedural-masquerade" ,rust-procedural-masquerade-0.1) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0)))) + (home-page "https://github.com/servo/rust-cssparser") + (synopsis "Procedural macros for cssparser") + (description + "This package provides the procedural macros for rust-cssparser.") + (license license:mpl2.0))) + (define-public rust-csv-1.1 (package (name "rust-csv") -- cgit v1.2.3 From f58145287469a12806eb08b60cf14fa41c7fdc62 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 10:40:01 +0200 Subject: gnu: Add rust-cssparser-0.25. * gnu/packages/crates-io.scm (rust-cssparser-0.25): New variable. --- gnu/packages/crates-io.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a253d4ef56..ccd95f1fd5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3527,6 +3527,46 @@ (define-public rust-crypto-mac-0.7 Code} (MAC) algorithms.") (license (list license:expat license:asl2.0)))) +(define-public rust-cssparser-0.25 + (package + (name "rust-cssparser") + (version "0.25.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "cssparser" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03klvpdzsk4cyh8k0dbnlngzafv7gqywqrnsqqb3gfmrxyj8rqgv")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Some test files missing. + #:cargo-inputs + (("rust-cssparser-macros" ,rust-cssparser-macros-0.3) + ("rust-dtoa-short" ,rust-dtoa-short-0.3) + ("rust-heapsize" ,rust-heapsize-0.4) + ("rust-itoa" ,rust-itoa-0.4) + ("rust-matches" ,rust-matches-0.1) + ("rust-phf" ,rust-phf-0.7) + ("rust-procedural-masquerade" ,rust-procedural-masquerade-0.1) + ("rust-serde" ,rust-serde-1.0) + ("rust-smallvec" ,rust-smallvec-0.6) + ("rust-autocfg" ,rust-autocfg-0.1) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0)) + #:cargo-development-inputs + (("rust-difference" ,rust-difference-2.0) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://github.com/servo/rust-cssparser") + (synopsis "Rust implementation of CSS Syntax Level 3") + (description + "This package contains a Rust implementation of CSS Syntax Level 3.") + (license license:mpl2.0))) + (define-public rust-cssparser-macros-0.3 (package (name "rust-cssparser-macros") -- cgit v1.2.3 From 930d8c5a2107a85a76c302d2f1440b37f077fff7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 10:51:36 +0200 Subject: gnu: Add rust-data-url-0.1. * gnu/packages/crates-io.scm (rust-data-url-0.1): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ccd95f1fd5..5efa6b8e6e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3778,6 +3778,33 @@ (define-public rust-data-encoding-2.1 hexadecimal, base32, and base64.") (license license:expat))) +(define-public rust-data-url-0.1 + (package + (name "rust-data-url") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "data-url" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "176wa1n8h71iwyaxhar4sqwrgrvb5sxk26az0fy88vnxrsffjgyk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-matches" ,rust-matches-0.1)) + #:cargo-development-inputs + (("rust-rustc-test" ,rust-rustc-test-0.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://github.com/servo/rust-url") + (synopsis "Processing of data: URL according to WHATWG's Fetch Standard") + (description + "Processing of data: URL according to WHATWG's Fetch Standard.") + (license (list license:expat license:asl2.0)))) + (define-public rust-datetime-0.4 (package (name "rust-datetime") -- cgit v1.2.3 From 40b9f388767c9cae409277194724dad708a18d95 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 10:54:29 +0200 Subject: gnu: Add rust-fragile-0.3. * gnu/packages/crates-io.scm (rust-fragile-0.3): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5efa6b8e6e..4391b46376 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5562,6 +5562,26 @@ (define-public rust-foreign-types-shared-0.1 (base32 "0jxgzd04ra4imjv8jgkmdq59kj8fsz6w4zxsbmlai34h26225c00")))))) +(define-public rust-fragile-0.3 + (package + (name "rust-fragile") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "fragile" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yf2hmkw52x2dva3c9km1x8c2z5kwby7qqn8kz5ms3gs480i9y05")))) + (build-system cargo-build-system) + (home-page "https://github.com/mitsuhiko/rust-fragile") + (synopsis "Wrapper types for sending non-send values to other threads") + (description "This package provides wrapper types for sending non-send +values to other threads.") + (license license:asl2.0))) + (define-public rust-freetype-rs-0.23 (package (name "rust-freetype-rs") -- cgit v1.2.3 From 8985755a915acdfb281b8691f318bfd051e29d01 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 10:57:16 +0200 Subject: gnu: Add rust-gir-format-check-0.1. * gnu/packages/crates-io.scm (rust-gir-format-check-0.1): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4391b46376..56fbb71d54 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6679,6 +6679,25 @@ (define-public rust-gio-sys-0.9 (description "This package provides FFI bindings to libgio-2.0.") (license license:expat))) +(define-public rust-gir-format-check-0.1 + (package + (name "rust-gir-format-check") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gir-format-check" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0znl4qcgmg0656zk9vjkwdn9wj1zpkd0m0l5jnzmahd80ii7vf4b")))) + (build-system cargo-build-system) + (home-page "https://github.com/gtk-rs/gir-format-check") + (synopsis "File format checker") + (description "File format checker in Rust.") + (license license:expat))) + (define-public rust-git2-0.11 (package (name "rust-git2") -- cgit v1.2.3 From ad2c51088f14074c94809f9e5923ff3f15f38f0b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 11:10:30 +0200 Subject: gnu: Add rust-gio-0.7. * gnu/packages/crates-io.scm (rust-gio-0.7): New variable. --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 56fbb71d54..c71717e6c5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6648,6 +6648,41 @@ (define-public rust-gimli-0.18 DWARF debugging format.") (license (list license:asl2.0 license:expat)))) +(define-public rust-gio-0.7 + (package + (name "rust-gio") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gio" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1qv0wc1hqyb81c03h81s3xrl9jslrw23fr4yhygxbhih9k9vaqb2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-fragile" ,rust-fragile-0.3) + ("rust-futures-preview" ,rust-futures-preview-0.3) + ("rust-gio-sys" ,rust-gio-sys-0.9) + ("rust-glib" ,rust-glib-0.8) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (inputs + `(("glib" ,glib))) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the Gio library") + (description "Rust bindings for the Gio library.") + (license license:expat))) + (define-public rust-gio-sys-0.9 (package (name "rust-gio-sys") -- cgit v1.2.3 From 8511b516504602c5bf5230673967a1b349fa38f7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 11:21:31 +0200 Subject: gnu: Add rust-gdk-pixbuf-0.7. * gnu/packages/crates-io.scm (rust-gdk-pixbuf-0.7): New variable. --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c71717e6c5..0ac2fa4dec 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6399,6 +6399,42 @@ (define-public rust-gdi32-sys-0.2 API library @code{gdi32}.") (license license:expat))) +(define-public rust-gdk-pixbuf-0.7 + (package + (name "rust-gdk-pixbuf") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gdk-pixbuf" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1k2g3w2p57m68bi5sldvkmgjgslgqswrjsijjhqaibdvw67409lp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-fragile" ,rust-fragile-0.3) + ("rust-futures-preview" ,rust-futures-preview-0.3) + ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.9) + ("rust-gio" ,rust-gio-0.7) + ("rust-gio-sys" ,rust-gio-sys-0.9) + ("rust-glib" ,rust-glib-0.8) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (inputs + `(("gdk-pixbuf" ,gdk-pixbuf))) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the GdkPixbuf library") + (description + "Rust bindings for the GdkPixbuf library.") + (license license:expat))) + (define-public rust-gdk-pixbuf-sys-0.9 (package (name "rust-gdk-pixbuf-sys") -- cgit v1.2.3 From c450d81a16786e658b1e0bb3651673206ef96e91 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 11:23:34 +0200 Subject: gnu: Add rust-rawpointer-0.2. * gnu/packages/crates-io.scm (rust-rawpointer-0.2):New variable. (rust-rawpointer-0.1): Inherit from rust-rawpointer-0.2. --- gnu/packages/crates-io.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0ac2fa4dec..521974c8cc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14412,10 +14412,10 @@ (define-public rust-raw-window-handle-0.3 "Interoperability library for Rust Windowing applications.") (license license:expat))) -(define-public rust-rawpointer-0.1 +(define-public rust-rawpointer-0.2 (package (name "rust-rawpointer") - (version "0.1.0") + (version "0.2.1") (source (origin (method url-fetch) @@ -14423,7 +14423,7 @@ (define-public rust-rawpointer-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "06ghpm9y7gacks78s3maakha07kbnwrxif5q37r2l7z1sali3b7b")))) + "1qy1qvj17yh957vhffnq6agq0brvylw27xgks171qrah75wmg8v0")))) (build-system cargo-build-system) (home-page "https://github.com/bluss/rawpointer/") (synopsis "Extra methods for raw pointers") @@ -14433,6 +14433,20 @@ (define-public rust-rawpointer-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-rawpointer-0.1 + (package + (inherit rust-rawpointer-0.2) + (name "rust-rawpointer") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rawpointer" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "06ghpm9y7gacks78s3maakha07kbnwrxif5q37r2l7z1sali3b7b")))))) + (define-public rust-rawslice-0.1 (package (name "rust-rawslice") -- cgit v1.2.3 From eef9de5fed7046e8e2d3e3019615e2af220ee79c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 11:26:37 +0200 Subject: gnu: Add rust-matrixmultiply-0.2. * gnu/packages/crates-io.scm (rust-matrixmultiply-0.2): New variable. (rust-matrixmultiply-0.1): Inherit from rust-matrixmultiply-0.2. --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 521974c8cc..d789d91dea 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9944,10 +9944,10 @@ (define-public rust-matches-0.1 whether an expression matches a pattern.") (license license:expat))) -(define-public rust-matrixmultiply-0.1 +(define-public rust-matrixmultiply-0.2 (package (name "rust-matrixmultiply") - (version "0.1.15") + (version "0.2.3") (source (origin (method url-fetch) @@ -9955,12 +9955,14 @@ (define-public rust-matrixmultiply-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "00p0fpjhm45qdzi37mgv7ggsy8b9gqvq4999yrbgyn1dxkf6gbfw")))) + "13s7nfd3dfcsrixld2lk8c563ih5xzczl2w36hprfc016rkfrxyl")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-rawpointer" ,rust-rawpointer-0.1)) - #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1)))) + `(#:cargo-inputs + (("rust-rawpointer" ,rust-rawpointer-0.2)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1) + ("rust-itertools" ,rust-itertools-0.7)))) (home-page "https://github.com/bluss/matrixmultiply/") (synopsis "General matrix multiplication for f32 and f64 matrices") (description "General matrix multiplication for f32 and f64 matrices. @@ -9971,6 +9973,24 @@ (define-public rust-matrixmultiply-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-matrixmultiply-0.1 + (package + (inherit rust-matrixmultiply-0.2) + (name "rust-matrixmultiply") + (version "0.1.15") + (source + (origin + (method url-fetch) + (uri (crate-uri "matrixmultiply" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "00p0fpjhm45qdzi37mgv7ggsy8b9gqvq4999yrbgyn1dxkf6gbfw")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-rawpointer" ,rust-rawpointer-0.1)) + #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1)))))) + (define-public rust-maybe-uninit-2.0 (package (name "rust-maybe-uninit") -- cgit v1.2.3 From 5f29a63f10084320193a1403990f8f5038128735 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 11:27:46 +0200 Subject: gnu: rust-matrixmultiply-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-matrixmultiply-0.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d789d91dea..193a203995 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9987,8 +9987,7 @@ (define-public rust-matrixmultiply-0.1 (base32 "00p0fpjhm45qdzi37mgv7ggsy8b9gqvq4999yrbgyn1dxkf6gbfw")))) (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-rawpointer" ,rust-rawpointer-0.1)) + `(#:cargo-inputs (("rust-rawpointer" ,rust-rawpointer-0.1)) #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1)))))) (define-public rust-maybe-uninit-2.0 -- cgit v1.2.3 From 5df93528644ff955b15d8e5c1d311aa9f2f733b3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 11:47:12 +0200 Subject: gnu: Add rust-recycler-0.1. * gnu/packages/crates-io.scm (rust-recycler-0.1): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 193a203995..9083f454c1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14640,6 +14640,27 @@ (define-public rust-rdrand-0.4 @code{rdrand} and @code{rdseed} instructions") (license license:isc))) +(define-public rust-recycler-0.1 + (package + (name "rust-recycler") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "recycler" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yll0sqswy6afk9ik7r22djqafa3wfgvgdzqqh7jbczyiqr2gp4q")))) + (build-system cargo-build-system) + (home-page "https://github.com/frankmcsherry/recycler") + (synopsis "Rust library for recycling types containing owned memory") + (description + "This package provides a small Rust library for recycling types containing +owned memory.") + (license license:expat))) + ;; This package requires features which are unavailable ;; on the stable releases of Rust. (define-public rust-redox-syscall-0.1 -- cgit v1.2.3 From f87fa003617fe990bef4005800a9f40726494b25 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 11:47:45 +0200 Subject: gnu: Add rust-abomonation-0.7. * gnu/packages/crates-io.scm (rust-abomonation-0.7): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9083f454c1..451c0ce31e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -48,6 +48,30 @@ (define-module (gnu packages crates-io) ;;; Please: Try to add new module packages in alphabetic order. ;;; +(define-public rust-abomonation-0.7 + (package + (name "rust-abomonation") + (version "0.7.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "abomonation" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1cjg3hjf028n447pdj7zcdgrkngx30as8ndxlxx947wvr49jkrsn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-recycler" ,rust-recycler-0.1)))) + (home-page "https://github.com/TimelyDataflow/abomonation") + (synopsis "High performance and very unsafe serialization library") + (description + "This package provides a high performance and very unsafe serialization +library in Rust.") + (license license:expat))) + (define-public rust-addr2line-0.9 (package (name "rust-addr2line") -- cgit v1.2.3 From 4bf3167de2d47c1b0f5fd4eede63e7e0ebe015d7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 11:48:13 +0200 Subject: gnu: Add rust-nalgebra-0.18. * gnu/packages/crates-io.scm (rust-nalgebra-0.18): New variable. --- gnu/packages/crates-io.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 451c0ce31e..7eb93a6197 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10650,6 +10650,48 @@ (define-public rust-modifier-0.1 "Chaining APIs for both self -> Self and &mut self methods.") (license license:expat))) +(define-public rust-nalgebra-0.18 + (package + (name "rust-nalgebra") + (version "0.18.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "nalgebra" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "18i1npny8s45ff67p5qpdwwsn36fp23mal8847fkb32cqgdzvada")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-abomonation" ,rust-abomonation-0.7) + ("rust-alga" ,rust-alga-0.9) + ("rust-approx" ,rust-approx-0.3) + ("rust-generic-array" ,rust-generic-array-0.12) + ("rust-matrixmultiply" ,rust-matrixmultiply-0.2) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-complex" ,rust-num-complex-0.2) + ("rust-num-rational" ,rust-num-rational-0.2) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-pest" ,rust-pest-2.1) + ("rust-pest-derive" ,rust-pest-derive-2.1) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-rand" ,rust-rand-0.6) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-typenum" ,rust-typenum-1.10)) + #:cargo-development-inputs + (("rust-rand-xorshift" ,rust-rand-xorshift-0.1) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://nalgebra.org") + (synopsis "Linear algebra library") + (description + "This package provides a linear algebra library with transformations and +statically-sized or dynamically-sized matrices.") + (license license:bsd-3))) + (define-public rust-named-pipe-0.4 (package (name "rust-named-pipe") -- cgit v1.2.3 From d23c34727ff3d6e8822f228f48a3e70390c34254 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 11:51:19 +0200 Subject: gnu: Add rust-rctree-0.3. * gnu/packages/crates-io.scm (rust-rctree-0.3): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7eb93a6197..8622ac3ea7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14682,6 +14682,26 @@ (define-public rust-rayon-core-1.5 ("rust-rand-xorshift" ,rust-rand-xorshift-0.2) ("rust-scoped-tls" ,rust-scoped-tls-1.0)))))) +(define-public rust-rctree-0.3 + (package + (name "rust-rctree") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "rctree" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1a54z2b850albiqx9vw009p9xg363vqzh1ybkwb89zn8375jk7my")))) + (build-system cargo-build-system) + (home-page "https://github.com/RazrFalcon/rctree") + (synopsis "DOM-like tree implemented using reference counting") + (description "This package provides a @code{DOM-like} tree implemented using +reference counting.") + (license license:expat))) + (define-public rust-rdrand-0.4 (package (name "rust-rdrand") -- cgit v1.2.3 From 2d1cc3a4c9db6edbc80df788102f573bd34c733e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 12:02:00 +0200 Subject: gnu: Add rust-pango-0.7. * gnu/packages/crates-io.scm (rust-pango-0.7): New variable. --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8622ac3ea7..13f36f120c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12173,6 +12173,40 @@ (define-public rust-pad-0.1 "This package provides a library for padding strings at runtime.") (license license:expat))) +(define-public rust-pango-0.7 + (package + (name "rust-pango") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pango" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11np7nxb69g3kid2l78b7k519x1wk1c3f9yy7swgzy24n5qs0grr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-glib" ,rust-glib-0.8) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango-sys" ,rust-pango-sys-0.9) + ("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (inputs + `(("pango" ,pango))) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the Pango library") + (description + "Rust bindings for the Pango library.") + (license license:expat))) + (define-public rust-pango-sys-0.9 (package (name "rust-pango-sys") -- cgit v1.2.3 From b9affb662bab8238ed8b5cf9a8e7e19adfbe78ca Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 12:08:08 +0200 Subject: gnu: Add rust-pangocairo-0.8. * gnu/packages/crates-io.scm (rust-pangocairo-0.8): New variable. --- gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 13f36f120c..a90d28d102 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12238,6 +12238,43 @@ (define-public rust-pango-sys-0.9 (description "This package provides FFI bindings to @code{libpango-1.0}.") (license license:expat))) +(define-public rust-pangocairo-0.8 + (package + (name "rust-pangocairo") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pangocairo" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qjiwsp73x3w0493dzycyjzxnzwq7ixwmf1ccr5r41pjhxbnk1kl")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cairo-rs" ,rust-cairo-rs-0.7) + ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.9) + ("rust-glib" ,rust-glib-0.8) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango" ,rust-pango-0.7) + ("rust-pango-sys" ,rust-pango-sys-0.9) + ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.10) + ("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (inputs + `(("gtk+" ,gtk+))) + (home-page "http://gtk-rs.org/") + (synopsis "Rust bindings for the PangoCairo library") + (description + "Rust bindings for the PangoCairo library.") + (license license:expat))) + (define-public rust-pangocairo-sys-0.10 (package (name "rust-pangocairo-sys") -- cgit v1.2.3 From 18cef6547b0ba632b18636bb5f6f8ac0a41a1195 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 12:15:47 +0200 Subject: gnu: Add rust-markup5ever-0.9. * gnu/packages/crates-io.scm (rust-markup5ever-0.9): New variable. (rust-markup5ever-0.8): Inherit from rust-markup-0.9. --- gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a90d28d102..64c170df73 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9916,19 +9916,19 @@ (define-public rust-maplit-1.0 (license (list license:asl2.0 license:expat)))) -(define-public rust-markup5ever-0.8 +(define-public rust-markup5ever-0.9 (package (name "rust-markup5ever") - (version "0.8.1") + (version "0.9.0") (source - (origin - (method url-fetch) - (uri (crate-uri "markup5ever" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "08ayl9aqjnmf7ly1ipy6dk3wjvyfn4w51l40jzh1fh984ykldbzi")))) + (origin + (method url-fetch) + (uri (crate-uri "markup5ever" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "00wxigkiw8f777pjp7q5kfq77xpwda9zskkwp698assh8yfisf35")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -9940,14 +9940,28 @@ (define-public rust-markup5ever-0.8 ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0) - ("rust-string-cache-codegen" - ,rust-string-cache-codegen-0.4)))) + ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.4)))) (home-page "https://github.com/servo/html5ever") (synopsis "Common code for xml5ever and html5ever") (description "Common code for xml5ever and html5ever.") (license (list license:asl2.0 license:expat)))) +(define-public rust-markup5ever-0.8 + (package + (inherit rust-markup5ever-0.9) + (name "rust-markup5ever") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "markup5ever" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08ayl9aqjnmf7ly1ipy6dk3wjvyfn4w51l40jzh1fh984ykldbzi")))))) + (define-public rust-matches-0.1 (package (name "rust-matches") -- cgit v1.2.3 From abca147f208052fae784a373c939c272e5d3d008 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 12:19:49 +0200 Subject: gnu: librsvg-next-source: Replace all crates. * gnu/packages/gnome.scm (librsvg-next-source): Replace all remaining vendored crates with packaged ones. --- gnu/packages/gnome.scm | 52 +++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0fb474046d..c6800809fc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2242,17 +2242,17 @@ (define librsvg-next-source (delete-file-recursively (string-append "vendor/" (car crate))) (invoke "tar" "xvf" (cdr crate) "-C" "vendor")) '(("aho-corasick" . #+(package-source rust-aho-corasick-0.7)) -;; alga 0.9 + ("alga" . #+(package-source rust-alga-0.9)) ("approx" . #+(package-source rust-approx-0.3)) ("arrayvec" . #+(package-source rust-arrayvec-0.4)) ("atty" . #+(package-source rust-atty-0.2)) ("autocfg" . #+(package-source rust-autocfg-1.0)) ("bitflags" . #+(package-source rust-bitflags-1)) -;; block 0.1 + ("block" . #+(package-source rust-block-0.1)) ("bstr" . #+(package-source rust-bstr-0.2)) ("byteorder" . #+(package-source rust-byteorder-1.3)) -;; cairo-rs 0.7 -;; cairo-sys-rs 0.9 + ("cairo-rs" . #+(package-source rust-cairo-rs-0.7)) + ("cairo-sys-rs" . #+(package-source rust-cairo-sys-rs-0.9)) ("cast" . #+(package-source rust-cast-0.2)) ("cfg-if" . #+(package-source rust-cfg-if-0.1)) ("clap" . #+(package-source rust-clap-2)) @@ -2263,14 +2263,14 @@ (define librsvg-next-source ("crossbeam-epoch" . #+(package-source rust-crossbeam-epoch-0.8)) ("crossbeam-queue" . #+(package-source rust-crossbeam-queue-0.2)) ("crossbeam-utils" . #+(package-source rust-crossbeam-utils-0.7)) -;; cssparser 0.25 -;; cssparser-macros 0.3 + ("cssparser" . #+(package-source rust-cssparser-0.25)) + ("cssparser-macros" . #+(package-source rust-cssparser-macros-0.3)) ("csv" . #+(package-source rust-csv-1.1)) ("csv-core" . #+(package-source rust-csv-core-0.1)) -;; data-url 0.1 -;; downcast-rs 1.0 + ("data-url" . #+(package-source rust-data-url-0.1)) + ("downcast-rs" . #+(package-source rust-downcast-rs-1.1)) ("dtoa" . #+(package-source rust-dtoa-0.4)) -;; dtoa-short 0.3 + ("dtoa-short" . #+(package-source rust-dtoa-short-0.3)) ("either" . #+(package-source rust-either-1.5)) ("encoding" . #+(package-source rust-encoding-0.2)) ("encoding-index-japanese" . #+(package-source rust-encoding-index-japanese-1.20141219)) @@ -2279,16 +2279,16 @@ (define librsvg-next-source ("encoding-index-singlebyte" . #+(package-source rust-encoding-index-singlebyte-1.20141219)) ("encoding-index-tradchinese" . #+(package-source rust-encoding-index-tradchinese-1.20141219)) ("encoding_index_tests" . #+(package-source rust-encoding-index-tests-0.1)) -;; float-cmp 0.5 -;; fragile 0.3 + ("float-cmp" . #+(package-source rust-float-cmp-0.5)) + ("fragile" . #+(package-source rust-fragile-0.3)) ("fuchsia-cprng" . #+(package-source rust-fuchsia-cprng-0.1)) ("futf" . #+(package-source rust-futf-0.1)) -;; gdk-pixbuf 0.7 -;; gdk-pixbuf-sys 0.9 + ("gdk-pixbuf" . #+(package-source rust-gdk-pixbuf-0.7)) + ("gdk-pixbuf-sys" . #+(package-source rust-gdk-pixbuf-sys-0.9)) ("generic-array" . #+(package-source rust-generic-array-0.12)) -;; gio 0.7 + ("gio" . #+(package-source rust-gio-0.7)) ("gio-sys" . #+(package-source rust-gio-sys-0.9)) -;; glib 0.8 + ("glib" . #+(package-source rust-glib-0.8)) ("glib-sys" . #+(package-source rust-glib-sys-0.9)) ("gobject-sys" . #+(package-source rust-gobject-sys-0.9)) ("idna" . #+(package-source rust-idna-0.2)) @@ -2297,17 +2297,17 @@ (define librsvg-next-source ("language-tags" . #+(package-source rust-language-tags-0.2)) ("lazy_static" . #+(package-source rust-lazy-static-1)) ("libc" . #+(package-source rust-libc-0.2)) - ("libm" . #+(package-source rust-libm-0.1)) + ("libm" . #+(package-source rust-libm-0.2)) ("locale_config" . #+(package-source rust-locale-config-0.3)) ("log" . #+(package-source rust-log-0.4)) ("mac" . #+(package-source rust-mac-0.1)) ("malloc_buf" . #+(package-source rust-malloc-buf-0.0)) -;; markup5ever 0.9 + ("markup5ever" . #+(package-source rust-markup5ever-0.9)) ("matches" . #+(package-source rust-matches-0.1)) -;; matrixmultiply 0.2 + ("matrixmultiply" . #+(package-source rust-matrixmultiply-0.2)) ("memchr" . #+(package-source rust-memchr-2.2)) ("memoffset" . #+(package-source rust-memoffset-0.5)) -;; nalgebra 0.18 + ("nalgebra" . #+(package-source rust-nalgebra-0.18)) ("new_debug_unreachable" . #+(package-source rust-new-debug-unreachable-1.0)) ("nodrop" . #+(package-source rust-nodrop-0.1)) ("num-complex" . #+(package-source rust-num-complex-0.2)) @@ -2318,10 +2318,10 @@ (define librsvg-next-source ("objc" . #+(package-source rust-objc-0.2)) ("objc-foundation" . #+(package-source rust-objc-foundation-0.1)) ("objc_id" . #+(package-source rust-objc-id-0.1)) -;; pango 0.7 -;; pango-sys 0.9 -;; pangocairo 0.8 -;; pangocairo-sys 0.10 + ("pango" . #+(package-source rust-pango-0.7)) + ("pango-sys" . #+(package-source rust-pango-sys-0.9)) + ("pangocairo" . #+(package-source rust-pangocairo-0.8)) + ("pangocairo-sys" . #+(package-source rust-pangocairo-sys-0.10)) ("percent-encoding" . #+(package-source rust-percent-encoding-2.1)) ("phf" . #+(package-source rust-phf-0.7)) ("phf_codegen" . #+(package-source rust-phf-codegen-0.7)) @@ -2330,7 +2330,7 @@ (define librsvg-next-source ("pkg-config" . #+(package-source rust-pkg-config-0.3)) ("precomputed-hash" . #+(package-source rust-precomputed-hash-0.1)) ("proc-macro2" . #+(package-source rust-proc-macro2-1.0)) -;; procedural-masquerade 0.1 + ("procedural-masquerade" . #+(package-source rust-procedural-masquerade-0.1)) ("quote" . #+(package-source rust-quote-1.0)) ("rand" . #+(package-source rust-rand-0.6)) ("rand_chacha" . #+(package-source rust-rand-chacha-0.1)) @@ -2343,10 +2343,10 @@ (define librsvg-next-source ("rand_pcg" . #+(package-source rust-rand-pcg-0.1)) ("rand_xorshift" . #+(package-source rust-rand-xorshift-0.1)) ("rand_xoshiro" . #+(package-source rust-rand-xoshiro-0.1)) -;; rawpointer 0.2 + ("rawpointer" . #+(package-source rust-rawpointer-0.2)) ("rayon" . #+(package-source rust-rayon-1.3)) ("rayon-core" . #+(package-source rust-rayon-core-1.7)) -;; rctree 0.3 + ("rctree" . #+(package-source rust-rctree-0.3)) ("rdrand" . #+(package-source rust-rdrand-0.4)) ("regex" . #+(package-source rust-regex-1.3)) ("regex-automata" . #+(package-source rust-regex-automata-0.1)) -- cgit v1.2.3 From 6956867056148e897f737c2a44c520290a709e84 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 20:52:32 +0200 Subject: gnu: librsvg-next: Use cargo-build-system. * gnu/packages/gnome.scm (librsvg-next)[source]: Don't use computed source. Add snippet to remove vendored crates. [build-system]: Switch to cargo-build-system. [arguments]: Remove configure-flags, make-flags, imported modules. Add modules and vendor fields. Add crates to cargo-inputs and cargo-development-inputs. Add 'prepare-for-build phase to adjust the source before building. Add 'gnu-configure phase to add the configure phase from the gnu-build-system. Replace the 'build, 'check and 'install phases from the gnu-build-system. [native-inputs]: Remove rust-1.34, rust-1.34:cargo. (computed-origin-method, librsvg-next-source): Remove variables. --- gnu/packages/gnome.scm | 324 ++++++++++++++----------------------------------- 1 file changed, 90 insertions(+), 234 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c6800809fc..6415171904 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2185,245 +2185,83 @@ (define librsvg/fixed (base32 "1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp")))))) -(define* (computed-origin-method gexp-promise hash-algo hash - #:optional (name "source") - #:key (system (%current-system)) - (guile (default-guile))) - "Return a derivation that executes the G-expression that results -from forcing GEXP-PROMISE." - (mlet %store-monad ((guile (package->derivation guile system))) - (gexp->derivation (or name "computed-origin") - (force gexp-promise) - #:graft? #f ;nothing to graft - #:system system - #:guile-for-build guile))) - -(define librsvg-next-source - (let* ((version "2.46.4") - (upstream-source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/librsvg/" - (version-major+minor version) "/" - "librsvg-" version ".tar.xz")) - (sha256 - (base32 - "0afc82nsxc6kw136xid4vcq9kmq4rmgzzk8bh2pvln2cnvirwnxl"))))) - (origin - (method computed-origin-method) - (file-name (string-append "librsvg-" version ".tar.xz")) - (sha256 #f) - (uri - (delay - (with-imported-modules '((guix build utils)) - #~(begin - (use-modules (guix build utils)) - (set-path-environment-variable - "PATH" '("bin") - (list "/tmp" - #+(canonical-package xz) - #+(canonical-package gzip) - #+(canonical-package tar))) - (invoke "tar" "xvf" #+upstream-source) - (with-directory-excursion (string-append "librsvg-" #$version) - ;; The following crate(s) are needed in addition to the ones replaced: - (begin - (invoke - "tar" "xvf" #+(package-source rust-autocfg-0.1) "-C" "vendor") - (invoke - "tar" "xvf" #+(package-source rust-proc-macro2-0.4) "-C" "vendor") - (invoke - "tar" "xvf" #+(package-source rust-quote-0.6) "-C" "vendor") - (invoke - "tar" "xvf" #+(package-source rust-unicode-xid-0.1) "-C" "vendor") - (invoke - "tar" "xvf" #+(package-source rust-maybe-uninit-2.0) "-C" "vendor")) - (for-each - (lambda (crate) - (delete-file-recursively (string-append "vendor/" (car crate))) - (invoke "tar" "xvf" (cdr crate) "-C" "vendor")) - '(("aho-corasick" . #+(package-source rust-aho-corasick-0.7)) - ("alga" . #+(package-source rust-alga-0.9)) - ("approx" . #+(package-source rust-approx-0.3)) - ("arrayvec" . #+(package-source rust-arrayvec-0.4)) - ("atty" . #+(package-source rust-atty-0.2)) - ("autocfg" . #+(package-source rust-autocfg-1.0)) - ("bitflags" . #+(package-source rust-bitflags-1)) - ("block" . #+(package-source rust-block-0.1)) - ("bstr" . #+(package-source rust-bstr-0.2)) - ("byteorder" . #+(package-source rust-byteorder-1.3)) - ("cairo-rs" . #+(package-source rust-cairo-rs-0.7)) - ("cairo-sys-rs" . #+(package-source rust-cairo-sys-rs-0.9)) - ("cast" . #+(package-source rust-cast-0.2)) - ("cfg-if" . #+(package-source rust-cfg-if-0.1)) - ("clap" . #+(package-source rust-clap-2)) - ("cloudabi" . #+(package-source rust-cloudabi-0.0)) - ("criterion" . #+(package-source rust-criterion-0.2)) - ("criterion-plot" . #+(package-source rust-criterion-plot-0.3)) - ("crossbeam-deque" . #+(package-source rust-crossbeam-deque-0.7)) - ("crossbeam-epoch" . #+(package-source rust-crossbeam-epoch-0.8)) - ("crossbeam-queue" . #+(package-source rust-crossbeam-queue-0.2)) - ("crossbeam-utils" . #+(package-source rust-crossbeam-utils-0.7)) - ("cssparser" . #+(package-source rust-cssparser-0.25)) - ("cssparser-macros" . #+(package-source rust-cssparser-macros-0.3)) - ("csv" . #+(package-source rust-csv-1.1)) - ("csv-core" . #+(package-source rust-csv-core-0.1)) - ("data-url" . #+(package-source rust-data-url-0.1)) - ("downcast-rs" . #+(package-source rust-downcast-rs-1.1)) - ("dtoa" . #+(package-source rust-dtoa-0.4)) - ("dtoa-short" . #+(package-source rust-dtoa-short-0.3)) - ("either" . #+(package-source rust-either-1.5)) - ("encoding" . #+(package-source rust-encoding-0.2)) - ("encoding-index-japanese" . #+(package-source rust-encoding-index-japanese-1.20141219)) - ("encoding-index-korean" . #+(package-source rust-encoding-index-korean-1.20141219)) - ("encoding-index-simpchinese" . #+(package-source rust-encoding-index-simpchinese-1.20141219)) - ("encoding-index-singlebyte" . #+(package-source rust-encoding-index-singlebyte-1.20141219)) - ("encoding-index-tradchinese" . #+(package-source rust-encoding-index-tradchinese-1.20141219)) - ("encoding_index_tests" . #+(package-source rust-encoding-index-tests-0.1)) - ("float-cmp" . #+(package-source rust-float-cmp-0.5)) - ("fragile" . #+(package-source rust-fragile-0.3)) - ("fuchsia-cprng" . #+(package-source rust-fuchsia-cprng-0.1)) - ("futf" . #+(package-source rust-futf-0.1)) - ("gdk-pixbuf" . #+(package-source rust-gdk-pixbuf-0.7)) - ("gdk-pixbuf-sys" . #+(package-source rust-gdk-pixbuf-sys-0.9)) - ("generic-array" . #+(package-source rust-generic-array-0.12)) - ("gio" . #+(package-source rust-gio-0.7)) - ("gio-sys" . #+(package-source rust-gio-sys-0.9)) - ("glib" . #+(package-source rust-glib-0.8)) - ("glib-sys" . #+(package-source rust-glib-sys-0.9)) - ("gobject-sys" . #+(package-source rust-gobject-sys-0.9)) - ("idna" . #+(package-source rust-idna-0.2)) - ("itertools" . #+(package-source rust-itertools-0.8)) - ("itoa" . #+(package-source rust-itoa-0.4)) - ("language-tags" . #+(package-source rust-language-tags-0.2)) - ("lazy_static" . #+(package-source rust-lazy-static-1)) - ("libc" . #+(package-source rust-libc-0.2)) - ("libm" . #+(package-source rust-libm-0.2)) - ("locale_config" . #+(package-source rust-locale-config-0.3)) - ("log" . #+(package-source rust-log-0.4)) - ("mac" . #+(package-source rust-mac-0.1)) - ("malloc_buf" . #+(package-source rust-malloc-buf-0.0)) - ("markup5ever" . #+(package-source rust-markup5ever-0.9)) - ("matches" . #+(package-source rust-matches-0.1)) - ("matrixmultiply" . #+(package-source rust-matrixmultiply-0.2)) - ("memchr" . #+(package-source rust-memchr-2.2)) - ("memoffset" . #+(package-source rust-memoffset-0.5)) - ("nalgebra" . #+(package-source rust-nalgebra-0.18)) - ("new_debug_unreachable" . #+(package-source rust-new-debug-unreachable-1.0)) - ("nodrop" . #+(package-source rust-nodrop-0.1)) - ("num-complex" . #+(package-source rust-num-complex-0.2)) - ("num-integer" . #+(package-source rust-num-integer-0.1)) - ("num-rational" . #+(package-source rust-num-rational-0.2)) - ("num-traits" . #+(package-source rust-num-traits-0.2)) - ("num_cpus" . #+(package-source rust-num-cpus-1.10)) - ("objc" . #+(package-source rust-objc-0.2)) - ("objc-foundation" . #+(package-source rust-objc-foundation-0.1)) - ("objc_id" . #+(package-source rust-objc-id-0.1)) - ("pango" . #+(package-source rust-pango-0.7)) - ("pango-sys" . #+(package-source rust-pango-sys-0.9)) - ("pangocairo" . #+(package-source rust-pangocairo-0.8)) - ("pangocairo-sys" . #+(package-source rust-pangocairo-sys-0.10)) - ("percent-encoding" . #+(package-source rust-percent-encoding-2.1)) - ("phf" . #+(package-source rust-phf-0.7)) - ("phf_codegen" . #+(package-source rust-phf-codegen-0.7)) - ("phf_generator" . #+(package-source rust-phf-generator-0.7)) - ("phf_shared" . #+(package-source rust-phf-shared-0.7)) - ("pkg-config" . #+(package-source rust-pkg-config-0.3)) - ("precomputed-hash" . #+(package-source rust-precomputed-hash-0.1)) - ("proc-macro2" . #+(package-source rust-proc-macro2-1.0)) - ("procedural-masquerade" . #+(package-source rust-procedural-masquerade-0.1)) - ("quote" . #+(package-source rust-quote-1.0)) - ("rand" . #+(package-source rust-rand-0.6)) - ("rand_chacha" . #+(package-source rust-rand-chacha-0.1)) - ("rand_core-0.3.1" . #+(package-source rust-rand-core-0.3)) - ("rand_core" . #+(package-source rust-rand-core-0.4)) - ("rand_hc" . #+(package-source rust-rand-hc-0.1)) - ("rand_isaac" . #+(package-source rust-rand-isaac-0.1)) - ("rand_jitter" . #+(package-source rust-rand-jitter-0.1)) - ("rand_os" . #+(package-source rust-rand-os-0.1)) - ("rand_pcg" . #+(package-source rust-rand-pcg-0.1)) - ("rand_xorshift" . #+(package-source rust-rand-xorshift-0.1)) - ("rand_xoshiro" . #+(package-source rust-rand-xoshiro-0.1)) - ("rawpointer" . #+(package-source rust-rawpointer-0.2)) - ("rayon" . #+(package-source rust-rayon-1.3)) - ("rayon-core" . #+(package-source rust-rayon-core-1.7)) - ("rctree" . #+(package-source rust-rctree-0.3)) - ("rdrand" . #+(package-source rust-rdrand-0.4)) - ("regex" . #+(package-source rust-regex-1.3)) - ("regex-automata" . #+(package-source rust-regex-automata-0.1)) - ("regex-syntax" . #+(package-source rust-regex-syntax-0.6)) - ("rustc_version" . #+(package-source rust-rustc-version-0.2)) - ("ryu" . #+(package-source rust-ryu-1.0)) - ("same-file" . #+(package-source rust-same-file-1.0)) - ("scopeguard" . #+(package-source rust-scopeguard-1.0)) - ("semver" . #+(package-source rust-semver-0.9)) - ("semver-parser" . #+(package-source rust-semver-parser-0.7)) - ("serde" . #+(package-source rust-serde-1.0)) - ("serde_derive" . #+(package-source rust-serde-derive-1.0)) - ("serde_json" . #+(package-source rust-serde-json-1.0)) - ("siphasher" . #+(package-source rust-siphasher-0.2)) - ("smallvec" . #+(package-source rust-smallvec-0.6)) - ("string_cache" . #+(package-source rust-string-cache-0.7)) - ("string_cache_codegen" . #+(package-source rust-string-cache-codegen-0.4)) - ("string_cache_shared" . #+(package-source rust-string-cache-shared-0.3)) - ("syn" . #+(package-source rust-syn-1.0)) - ("tendril" . #+(package-source rust-tendril-0.4)) - ("textwrap" . #+(package-source rust-textwrap-0.11)) - ("thread_local" . #+(package-source rust-thread-local-1.0)) - ("tinytemplate" . #+(package-source rust-tinytemplate-1.0)) - ("typenum" . #+(package-source rust-typenum-1.10)) - ("unicode-bidi" . #+(package-source rust-unicode-bidi-0.3)) - ("unicode-normalization" . #+(package-source rust-unicode-normalization-0.1)) - ("unicode-width" . #+(package-source rust-unicode-width-0.1)) - ("unicode-xid" . #+(package-source rust-unicode-xid-0.2)) - ("url" . #+(package-source rust-url-2.1)) - ("utf-8" . #+(package-source rust-utf-8-0.7)) - ("walkdir" . #+(package-source rust-walkdir-2.2)) - ("winapi" . #+(package-source rust-winapi-0.3)) - ("winapi-i686-pc-windows-gnu" . #+(package-source rust-winapi-i686-pc-windows-gnu-0.4)) - ("winapi-util" . #+(package-source rust-winapi-util-0.1)) - ("winapi-x86_64-pc-windows-gnu" . #+(package-source rust-winapi-x86-64-pc-windows-gnu-0.4)) - ("xml-rs" . #+(package-source rust-xml-rs-0.8))))) - (format #t "Replacing vendored crates in the tarball and repacking ...~%") - (force-output) - (invoke "tar" "cfa" #$output - ;; Avoid non-determinism in the archive. We set the - ;; mtime of files in the archive to early 1980 because - ;; the build process fails if the mtime of source - ;; files is pre-1980, due to the creation of zip - ;; archives. - "--mtime=@315619200" ; 1980-01-02 UTC - "--owner=root:0" - "--group=root:0" - "--sort=name" - (string-append "librsvg-" #$version)) - #t))))))) - (define-public librsvg-next (package (name "librsvg") (version "2.46.4") - (source librsvg-next-source) - (build-system gnu-build-system) - (arguments - `(#:configure-flags - (list "--disable-static" - "--enable-vala") ; needed for e.g. gnome-mines - #:make-flags '("CC=gcc") - #:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums' + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/librsvg/" + (version-major+minor version) "/" + "librsvg-" version ".tar.xz")) + (sha256 + (base32 + "0afc82nsxc6kw136xid4vcq9kmq4rmgzzk8bh2pvln2cnvirwnxl")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "vendor") + ;; Don't demand an exact version for string_cache + (substitute* "rsvg_internals/Cargo.toml" + (("\"=") "\"")) + #t)))) + (build-system cargo-build-system) + (arguments + `(#:modules ((guix build cargo-build-system) + (guix build utils) + ((guix build gnu-build-system) #:prefix gnu:)) + #:vendor-dir "vendor" + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cairo-rs" ,rust-cairo-rs-0.7) + ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.9) + ("rust-cssparser" ,rust-cssparser-0.25) + ("rust-data-url" ,rust-data-url-0.1) + ("rust-downcast-rs" ,rust-downcast-rs-1.1) + ("rust-encoding" ,rust-encoding-0.2) + ("rust-float-cmp" ,rust-float-cmp-0.5) + ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.7) + ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.9) + ("rust-gio" ,rust-gio-0.7) + ("rust-gio-sys" ,rust-gio-sys-0.9) + ("rust-glib" ,rust-glib-0.8) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-itertools" ,rust-itertools-0.8) + ("rust-language-tags" ,rust-language-tags-0.2) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-locale-config" ,rust-locale-config-0.3) + ("rust-markup5ever" ,rust-markup5ever-0.9) + ("rust-nalgebra" ,rust-nalgebra-0.18) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3) + ("rust-pango" ,rust-pango-0.7) + ("rust-pango-sys" ,rust-pango-sys-0.9) + ("rust-pangocairo" ,rust-pangocairo-0.8) + ("rust-phf" ,rust-phf-0.7) + ("rust-rayon" ,rust-rayon-1.3) + ("rust-rctree" ,rust-rctree-0.3) + ("rust-string-cache" ,rust-string-cache-0.7) + ("rust-regex" ,rust-regex-1.3) + ("rust-url" ,rust-url-2.1) + ("rust-xml-rs" ,rust-xml-rs-0.8)) + #:cargo-development-inputs + (("rust-cairo-rs" ,rust-cairo-rs-0.7) + ("rust-criterion" ,rust-criterion-0.2)) #:phases (modify-phases %standard-phases - (add-after 'configure 'patch-cargo-checksums + (add-after 'unpack 'prepare-for-build (lambda _ - (use-modules (guix build cargo-utils)) - (substitute* "librsvg/Cargo.toml" - (("bitflags .*") "bitflags = \"1\"\n")) ; 1.2 is vendored - (substitute* "rsvg_internals/Cargo.toml" - (("\"=") "\"")) - (generate-all-checksums "vendor") - (delete-file "Cargo.lock") - (invoke "cargo" "generate-lockfile"))) + ;; In lieu of #:make-flags + (setenv "CC" "gcc") + ;; Something about the build environment resists building + ;; successfully with the '--locked' flag. + (substitute* '("Makefile.am" + "Makefile.in") + (("--locked") "")) + #t)) (add-before 'configure 'pre-configure - (lambda* (#:key inputs #:allow-other-keys) + (lambda _ (substitute* "gdk-pixbuf-loader/Makefile.in" ;; By default the gdk-pixbuf loader is installed under ;; gdk-pixbuf's prefix. Work around that. @@ -2435,6 +2273,27 @@ (define-public librsvg-next (("gdk_pixbuf_cache_file = .*$") "gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n")) #t)) + (add-after 'configure 'gnu-configure + (assoc-ref gnu:%standard-phases 'configure)) + ;(lambda* (#:key outputs #:allow-other-keys) + ; ((assoc-ref gnu:%standard-phases 'configure) + ; #:outputs outputs + ; #:configure-flags ("--disable-static" + ; "--enable-vala")))) + (add-after 'configure 'dont-vendor-self + (lambda* (#:key vendor-dir #:allow-other-keys) + ;; Don't keep the whole tarball in the vendor directory + (delete-file-recursively + (string-append vendor-dir "/" ,name "-" ,version ".tar.xz")) + #t)) + (replace 'build + (assoc-ref gnu:%standard-phases 'build)) + (replace 'check + (lambda* args + ((assoc-ref gnu:%standard-phases 'check) + #:test-target "check"))) + (replace 'install + (assoc-ref gnu:%standard-phases 'install)) (add-before 'check 'remove-failing-tests (lambda _ (with-directory-excursion "tests/fixtures/reftests" @@ -2458,9 +2317,6 @@ (define-public librsvg-next #t))))) (native-inputs `(("pkg-config" ,pkg-config) - ;; This is the minimum supported Rust version in Librsvg 2.46. - ("rust" ,rust-1.34) - ("cargo" ,rust-1.34 "cargo") ("vala" ,vala) ("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. -- cgit v1.2.3 From 25d39a2a2c3bc9b67f948004923bf7fe6ce8336f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 20:55:13 +0200 Subject: gnu: librsvg-next: Inherit from librsvg. * gnu/packages/gnome.scm (librsvg-next)[inherit]: New field, inherit from librsvg. --- gnu/packages/gnome.scm | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6415171904..c39b4467b9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2187,6 +2187,7 @@ (define librsvg/fixed (define-public librsvg-next (package + (inherit librsvg) (name "librsvg") (version "2.46.4") (source (origin @@ -2315,27 +2316,6 @@ (define-public librsvg-next ;; This test fails on aarch64: "bugs/777834-empty-text-children.svg"))) #t))))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("vala" ,vala) - ("glib" ,glib "bin") ; glib-mkenums, etc. - ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. - (inputs - `(("pango" ,pango) - ("libcroco" ,libcroco) - ("bzip2" ,bzip2) - ("libgsf" ,libgsf) - ("libxml2" ,libxml2))) - (propagated-inputs - ;; librsvg-2.0.pc refers to all of that. - `(("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib))) - (home-page "https://wiki.gnome.org/LibRsvg") - (synopsis "Render SVG files using Cairo") - (description - "Librsvg is a C library to render SVG files using the Cairo 2D graphics -library.") (license license:lgpl2.1+))) (define-public libidl -- cgit v1.2.3 From f08b6726611ec9391814fe540821a3964baeb0ba Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 21:02:31 +0200 Subject: gnu: vim: Update to 8.2.0411. * gnu/packages/vim.scm (vim): Update to 8.2.0411. --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 7bea7fa791..75e8f0bb2e 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -70,7 +70,7 @@ (define-module (gnu packages vim) (define-public vim (package (name "vim") - (version "8.2.0343") + (version "8.2.0411") (source (origin (method git-fetch) (uri (git-reference @@ -79,7 +79,7 @@ (define-public vim (file-name (git-file-name name version)) (sha256 (base32 - "063i52h8v7f87zamrw2ph057f0x2nzwf1s0izrm2psy41cyf4wa3")))) + "0idjbf15yqk5jz2dqbh2lzj7glxcwn1jl5pp9kk908ps02vzqyai")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 29a2f61e9704949cd6cda57aba11f0213104db6b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 21 Feb 2020 09:32:01 +0100 Subject: gnu: Add foobillard++. * gnu/packages/games.scm (foobillard++): New variable. * gnu/packages/patches/foobillard++-pkg-config.patch: New file. * gnu/local.mk: Reference new file. --- gnu/local.mk | 1 + gnu/packages/games.scm | 130 +++++++++++++++++++++ gnu/packages/patches/foobillard++-pkg-config.patch | 34 ++++++ 3 files changed, 165 insertions(+) create mode 100644 gnu/packages/patches/foobillard++-pkg-config.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index ca3f2664aa..4fc1818ed4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -873,6 +873,7 @@ dist_patch_DATA = \ %D%/packages/patches/findutils-test-xargs.patch \ %D%/packages/patches/flann-cmake-3.11.patch \ %D%/packages/patches/flint-ldconfig.patch \ + %D%/packages/patches/foobillard++-pkg-config.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \ %D%/packages/patches/fribidi-CVE-2019-18397.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 59639a0138..7391851c87 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -598,6 +598,136 @@ (define-public lolcat characters and lines resulting in a rainbow effect.") (license license:wtfpl2)))) +(define-public foobillard++ + ;; Even though this latest revision is old already, stable release is + ;; lagging way behind it, and has issues with textures rendering. + (let ((svn-revision 170)) + (package + (name "foobillard++") + (version (string-append "3.43-r" (number->string svn-revision))) + (source + (origin + (method svn-fetch) + (uri (svn-reference + (url "svn://svn.code.sf.net/p/foobillardplus/code/") + (revision svn-revision))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00b693ys5zvzjbjzzj3dqfzm5xw64gwjf9m8qv6bkmf0klbhmayk")) + (patches + (search-patches "foobillard++-pkg-config.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Unfortunately, the game includes background music with + ;; a non-commercial clause. Delete it. + (for-each delete-file (find-files "data/music" "\\.ogg$")) + #t)))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + ;; Install data in a less exotic location. + (string-append "--prefix=" (assoc-ref %outputs "out") "/share") + ;; Prevent a build error about undefined trigonometric functions. + "--enable-fastmath=no") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-makefile + ;; Remove hard-coded directories. Also fix installation + ;; rule: it tries to move around non-existent files or + ;; files already moved. + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile.am" + (("/usr") (assoc-ref outputs "out")) + (("cp .*?/foobillardplus\\.desktop.*") "") + (("cp .*?/foobillardplus\\.(png|xbm) \\$\\(datarootdir\\).*") + "")) + #t)) + (add-after 'unpack 'unbundle-font + ;; XXX: The package ships with LinBiolinum_aSB.ttf and + ;; LinBiolinum_aS.ttf, which are not provided by + ;; `font-linuxlibertine' package. Therefore, we cannot replace + ;; them yet. + (lambda* (#:key inputs #:allow-other-keys) + (let ((dejavu (string-append (assoc-ref inputs "font-dejavu") + "/share/fonts/truetype/"))) + (with-directory-excursion "data" + (for-each (lambda (f) + (delete-file f) + (symlink (string-append dejavu f) f)) + '("DejaVuSans-Bold.ttf" "DejaVuSans.ttf")))) + #t)) + (replace 'bootstrap + (lambda _ + (invoke "aclocal" "--force") + (invoke "autoconf" "-f") + (invoke "autoheader" "-f") + (invoke "automake" "-a" "-c" "-f"))) + (add-before 'build 'prepare-build + ;; Set correct environment for SDL. + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CPATH" + (string-append (assoc-ref inputs "sdl") + "/include/SDL:" + (or (getenv "CPATH") ""))) + #t)) + (add-before 'build 'fix-settings-directory + ;; Hide foobillardplus settings directory in $HOME. + (lambda _ + (substitute* "src/history.c" + (("/foobillardplus-data") "/.foobillardplus")) + #t)) + (add-before 'install 'create-directories + ;; Install process does not create directories before + ;; trying to move file in it. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/share/icons")) + (mkdir-p (string-append out "/share/applications"))) + #t)) + (add-after 'install 'symlink-executable + ;; Symlink executable to $out/bin. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (with-directory-excursion bin + (symlink "../share/foobillardplus/bin/foobillardplus" + "foobillardplus")) + #t)))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("font-dejavu" ,font-dejavu) + ("freetype" ,freetype) + ("glu" ,glu) + ("libpng" ,libpng) + ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net))))) + (home-page "http://foobillardplus.sourceforge.net/") + (synopsis "3D billiard game") + (description "FooBillard++ is an advanced 3D OpenGL billiard game +based on the original foobillard 3.0a sources from Florian Berger. +You can play it with one or two players or against the computer. + +The game features: + +@itemize +@item Wood paneled table with gold covers and gold diamonds. +@item Reflections on balls. +@item Zoom in and out, rotation, different angles and bird's eye view. +@item Different game modes: 8 or 9-ball, Snooker or Carambole. +@item Tournaments. Compete against other players. +@item Animated cue with strength and eccentric hit adjustment. +@item Jump shots and snipping. +@item Realistic gameplay and billiard sounds. +@item Red-Green stereo. +@item And much more. +@end itemize") + (license (list license:gpl2 license:silofl1.1))))) + (define-public freedoom (package (name "freedoom") diff --git a/gnu/packages/patches/foobillard++-pkg-config.patch b/gnu/packages/patches/foobillard++-pkg-config.patch new file mode 100644 index 0000000000..7cc40a4777 --- /dev/null +++ b/gnu/packages/patches/foobillard++-pkg-config.patch @@ -0,0 +1,34 @@ +From: Markus Koschany +Date: Thu, 8 Mar 2018 17:49:24 +0100 +Subject: pkg-config + +Use pkg-config instead of the deprecated freetype-config command. + +Bug-Debian: https://bugs.debian.org/892338 +Forwarded: no +--- + src/Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 3b7d0fe..0f5a5dd 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -158,8 +158,8 @@ endif + SDL_CFLAGS = `sdl-config --cflags` + SDL_LIBS = `sdl-config --libs` + +-FREETYPE_CFLAGS = `freetype-config --cflags` +-FREETYPE_LIBS = `freetype-config --libs` ++FREETYPE_CFLAGS = `pkg-config --cflags freetype2` ++FREETYPE_LIBS = `pkg-config --libs freetype2` + + if USE_MATHSINGLE + MATH_CFLAGS = -DVMATH_SINGLE_PRECISION +@@ -233,4 +233,4 @@ AM_CFLAGS = -Wall ${FREETYPE_CFLAGS} ${SDL_CFLAGS} ${NVIDIA_CFLAGS} ${SOUND_CFLA + ${OPTIMIZATION_CFLAGS} ${USESSE_CFLAGS} ${USEWIN_CFLAGS} ${FASTMATH_CFLAGS} ${DEBIAN_CFLAGS} -lm + + AM_LDFLAGS = ${all_libraries} ${FREETYPE_LIBS} ${SDL_LIBS} +-LDADD = ${LDADD_FLAGS} +\ No newline at end of file ++LDADD = ${LDADD_FLAGS} -- cgit v1.2.3 From 9ae3e79172ad0435bf47afee3ed707d56bb28907 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 19 Mar 2020 23:47:50 +0000 Subject: gnu: Add python-easy-thumbnails. * gnu/packages/django.scm (python-easy-thumbnails): New variable. --- gnu/packages/django.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 0652ea15e6..70b6662a9e 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -223,6 +223,30 @@ (define-public python-django-taggit "Django-taggit is a reusable Django application for simple tagging.") (license license:bsd-3))) +(define-public python-easy-thumbnails + (package + (name "python-easy-thumbnails") + (version "2.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "easy-thumbnails" version)) + (sha256 + (base32 + "14gzp5cv24z0qhxb7f7k7v9jgzpaj4n8yhjq83ynpx8183fs1rz4")))) + (build-system python-build-system) + (propagated-inputs + `(("python-django" ,python-django) + ("python-pillow" ,python-pillow))) + (home-page "https://github.com/SmileyChris/easy-thumbnails") + (synopsis "Easy thumbnails for Django") + (description + "Easy thumbnails is a Django plugin to dynamically create thumbnails +based on source images. Multiple thumbnails can be created from a single +source image, using different options to control parameters like the image +size and quality.") + (license license:bsd-3))) + (define-public python-pytest-django (package (name "python-pytest-django") -- cgit v1.2.3 From d82160134a48d01ad56b5b326b8f2020d60a1eab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 19 Mar 2020 02:06:33 +0100 Subject: gnu: php: Update to 7.4.4. * gnu/packages/php.scm (php): Update to 7.4.4. --- gnu/packages/php.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 7bb88a7270..e58d82dab1 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Julien Lepiller ;;; Copyright © 2016 Marius Bakke -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Oleg Pykhalov ;;; @@ -59,7 +59,7 @@ (define-module (gnu packages php) (define-public php (package (name "php") - (version "7.4.3") + (version "7.4.4") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -67,7 +67,7 @@ (define-public php "php-" version ".tar.xz")) (sha256 (base32 - "0alqqs5hn4jmz1adrbysbw92n55nkw6f9vfivqj829kwhxnqa7yg")) + "0k57zj1z8kf8403rd72wymj08bswpa5ikcpzviw9mpykzp7c8wqq")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" -- cgit v1.2.3 From 1f0e7e0d596fb9abe5b77d06d61813d0d3aa0085 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Mar 2020 19:21:53 +0100 Subject: gnu: bs1770gain: Update to 0.6.7. * gnu/packages/audio.scm (bs1770gain): Update to 0.6.7. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 6880e74cce..f3edd21c69 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3271,14 +3271,14 @@ (define-public dcadec (define-public bs1770gain (package (name "bs1770gain") - (version "0.6.5") + (version "0.6.7") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/bs1770gain/bs1770gain/" version "/bs1770gain-" version ".tar.gz")) (sha256 - (base32 "15nvlh9bg0a52cpg2mii17mlzmxszwivjjalbb4np1v5nj8l5fk6")) + (base32 "13hsbqj1dkpz1gbclnjxv50kr7b4gcjai6c1l38g01433h217qjc")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 268dc4720c2a9e068233e66eba8598a145865ed0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:29:55 +0100 Subject: gnu: java-plexus-classworlds: Use HTTPS home page. * gnu/packages/java.scm (java-plexus-classworlds)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 76a0c6234c..3fe765c955 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3669,7 +3669,7 @@ (define-public java-plexus-classworlds #:tests? #f));; FIXME: we need to generate some resources as in pom.xml (native-inputs `(("java-junit" ,java-junit))) - (home-page "http://codehaus-plexus.github.io/plexus-classworlds/") + (home-page "https://codehaus-plexus.github.io/plexus-classworlds/") (synopsis "Java class loader framework") (description "Plexus classworlds replaces the native @code{ClassLoader} mechanism of Java. It is especially useful for dynamic loading of application -- cgit v1.2.3 From e799400d4b0561c3f713397af347729bb650cc3e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:29:06 +0100 Subject: gnu: java-jmh: Use HTTPS home page. * gnu/packages/java.scm (java-jmh)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3fe765c955..b68fc9f715 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4753,7 +4753,7 @@ (define-public java-jmh (native-inputs `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core))) - (home-page "http://openjdk.java.net/projects/code-tools/jmh/") + (home-page "https://openjdk.java.net/projects/code-tools/jmh/") (synopsis "Benchmark harness for the JVM") (description "JMH is a Java harness for building, running, and analysing nano/micro/milli/macro benchmarks written in Java and other languages -- cgit v1.2.3 From 14544d2f99775c0dcf8715695890cd15b036726f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:53:19 +0100 Subject: gnu: java-joda-time: Use HTTPS home page. * gnu/packages/java.scm (java-joda-time)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b68fc9f715..470f584ffb 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10363,7 +10363,7 @@ (define-public java-joda-time `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core) ("tzdata" ,tzdata))) - (home-page "http://www.joda.org/joda-time/") + (home-page "https://www.joda.org/joda-time/") (synopsis "Replacement for the Java date and time classes") (description "Joda-Time is a replacement for the Java date and time classes prior to Java SE 8.") -- cgit v1.2.3 From 27c0eadef9f8e4b3b9d24f4060f3dbdca6833e60 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:14:17 +0100 Subject: gnu: java-aqute-bnd-annotation: Use HTTPS home page. * gnu/packages/java.scm (java-aqute-bnd-annotation)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 470f584ffb..ec5b6183d3 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -8040,7 +8040,7 @@ (define-public java-aqute-bnd-annotation `(#:jar-name "java-aqute-bnd-annotation.jar" #:source-dir "biz.aQute.bnd.annotation/src" #:tests? #f)); empty test dir - (home-page "http://bnd.bndtools.org/") + (home-page "https://bnd.bndtools.org/") (synopsis "Tools for OSGi") (description "Bnd is a swiss army knife for OSGi, it creates manifest headers based on analyzing the class code, it verifies the project settings, -- cgit v1.2.3 From 7942a129b190dcb16be463c7af8ce6d60b3325f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:53:26 +0100 Subject: gnu: java-modello-plugins-xpp3: Use HTTPS home page. * gnu/packages/java.scm (java-modello-plugins-xpp3)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ec5b6183d3..5154dc124e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4179,7 +4179,7 @@ (define-public java-modello-core ("java-plexus-classworlds" ,java-plexus-classworlds) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) ("java-guava" ,java-guava))) - (home-page "http://codehaus-plexus.github.io/modello/") + (home-page "https://codehaus-plexus.github.io/modello/") (synopsis "Framework for code generation from a simple model") (description "Modello is a framework for code generation from a simple model. -- cgit v1.2.3 From 23518188fde04b7574ca43a0312e03f0282daf04 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:06:38 +0100 Subject: gnu: emacs-ebib: Use HTTPS home page. * gnu/packages/emacs-xyz.scm (emacs-ebib)[home-page]: Use HTTPS. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 62d1adcf74..60ee97e4f9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12618,7 +12618,7 @@ (define-public emacs-ebib (build-system emacs-build-system) (propagated-inputs `(("emacs-parsebib" ,emacs-parsebib))) - (home-page "http://joostkremers.github.io/ebib/") + (home-page "https://joostkremers.github.io/ebib/") (synopsis "BibTeX database manager for Emacs") (description "Ebib is a BibTeX database manager that runs in GNU Emacs. -- cgit v1.2.3 From c7a2e64574c6254ef423fa38c2fde1174fed06b9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:56:16 +0100 Subject: gnu: emacs-mit-scheme-doc: Use HTTPS home page. * gnu/packages/emacs-xyz.scm (emacs-mit-scheme-doc)[home-page]: Use HTTPS. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 60ee97e4f9..f5f20b1389 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4254,7 +4254,7 @@ (define-public emacs-mit-scheme-doc (substitute* "mit-scheme-doc.el" (("http://www\\.gnu\\.org/software/mit-scheme/documentation/mit-scheme-ref/") (string-append "file:" doc-dir "/mit-scheme-ref/"))))))))) - (home-page "http://groups.csail.mit.edu/mac/users/gjs/6.945/dont-panic/") + (home-page "https://groups.csail.mit.edu/mac/users/gjs/6.945/dont-panic/") (synopsis "MIT-Scheme documentation lookup for Emacs") (description "This package provides a set of Emacs functions to search definitions of -- cgit v1.2.3 From 837644b48a5107a28acbdb6d172aff0040a8247d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:25:58 +0100 Subject: gnu: emacs-company: Use HTTPS home page. * gnu/packages/emacs-xyz.scm (emacs-company)[home-page]: Use HTTPS. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f5f20b1389..9cfb5e68ab 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3658,7 +3658,7 @@ (define-public emacs-company #t))) #:tests? #t #:test-command '("make" "test-batch"))) - (home-page "http://company-mode.github.io/") + (home-page "https://company-mode.github.io/") (synopsis "Modular text completion framework") (description "Company is a modular completion mechanism. Modules for retrieving -- cgit v1.2.3 From e2303e8e375ed2e07c1fd760c86a204eb51fbc6e Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Fri, 20 Mar 2020 07:44:18 +0100 Subject: gnu: Add v86d. * gnu/packages/xorg.scm (v86d): New variable. --- gnu/packages/xorg.scm | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index fac114fb82..f4c7329e06 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2019 nee ;;; Copyright © 2019 Yoshinori Arai ;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Florian Pelz ;;; ;;; This file is part of GNU Guix. ;;; @@ -3447,6 +3448,105 @@ (define-public xf86-video-vesa X server.") (license license:x11))) +(define-public v86d + (package + (name "v86d") + (version "0.1.10") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mjanusz/v86d.git") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1c4iiggb5r9i2hxhk8c6q1m2vpfva39l1w33fsfkrz6fav6x34pp")) + (modules '((guix build utils))) + (snippet + '(begin + ;; remove bundled x86emu + (for-each delete-file + (filter (lambda (name) ;keep customized Makefile + (not (string-suffix? "Makefile" name))) + (find-files "libs/x86emu"))) + ;; remove non-working vbetest utility program (it is unnecessary) + (delete-file "libs/lrmi-0.10/vbe.h") + (delete-file "libs/lrmi-0.10/vbetest.c") + #t)))) + + ;; We keep the bundled copy of the Linux Real Mode Interface lrmi-0.10, + ;; because it includes fixes missing from upstream lrmi. We do not use + ;; libx86, because we already use x86emu with the more current lrmi. + + (inputs `(("xorg-server-sources" ,(package-source xorg-server)) ;for x86emu + ("xorgproto" ,xorgproto))) ;upstream x86emu uses X11/Xfuncproto.h + (outputs '("out" ;main v86d helper + "testvbe")) ;test program for listing video modes + (supported-systems '("i686-linux" "x86_64-linux")) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;there are no tests + #:modules ((guix build utils) + (guix build gnu-build-system) + (ice-9 popen)) + #:phases + (modify-phases %standard-phases + ;; Replace the bundled x86emu with its upstream copy from Xorg-server: + (add-after 'unpack 'unpack-x86emu-sources + (lambda* (#:key inputs #:allow-other-keys) + (begin + (format #t "decompressing x86emu source code~%") + (with-directory-excursion "libs" + (let ((srcs (assoc-ref inputs "xorg-server-sources")) + (tar-binary (string-append (assoc-ref inputs "tar") + "/bin/tar"))) + (invoke tar-binary "xvf" srcs "--strip-components=3" + "--wildcards" "*/hw/xfree86/x86emu/") + ;; extract license: + (with-directory-excursion "x86emu" + (invoke tar-binary "xvf" srcs "--strip-components=1" + "--wildcards" "*/COPYING")) + #t))))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "CC" (which "gcc")) + (setenv "DESTDIR" out) + (invoke "./configure" "--with-x86emu")))) + (add-after 'build 'build-testvbe + (lambda _ + (invoke "make" "testvbe"))) + (add-after 'install 'install-testvbe + (lambda* (#:key outputs #:allow-other-keys) + (let ((testvbe (assoc-ref outputs "testvbe")) + (olddest (getenv "DESTDIR"))) + (setenv "DESTDIR" testvbe) + (invoke "make" "install_testvbe") + (setenv "DESTDIR" olddest) + #t))) + (add-after 'install 'install-docs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc-dir (string-append out "/share/doc/v86d"))) + (mkdir-p doc-dir) + (copy-file "README" + (string-append doc-dir "/README")) + (copy-file "libs/lrmi-0.10/README" + (string-append doc-dir "/README.lrmi")) + (copy-file "libs/x86emu/COPYING" + (string-append doc-dir "/COPYING.xorg-server.x86emu")) + #t)))))) + (home-page "https://github.com/mjanusz/v86d") + (synopsis "Userspace helper for uvesafb") + (description + "v86d provides a backend for kernel drivers that need to execute x86 BIOS +code. The code is executed in a controlled environment and the results are +passed back to the kernel via the netlink interface. v86d is required by the +uvesafb Linux kernel module that provides an fbdev framebuffer when Kernel +Mode Setting is unavailable. It can be a last resort when no other Xorg X +server driver works.") + (license (list license:gpl2 + license:x11)))) ;for bundled lrmi and x86emu (define-public xf86-video-vmware (package -- cgit v1.2.3 From e84490346d8dac3720a57a331f533ce67ff0da1c Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Fri, 20 Mar 2020 07:28:07 +0100 Subject: gnu: nginx-accept-language-module: Simplify decompression phase. See where a similar change was found to be sufficient. * gnu/packages/web.scm (nginx-accept-language-module)[arguments]: In 'unpack-nginx-sources' phase, extract the compressed tarball using tar's auto-decompression instead of decompressing manually. --- gnu/packages/web.scm | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0f5f4d2d69..10cbf6165b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -35,7 +35,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2019 Jakob L. Kreuze -;;; Copyright © 2019 Florian Pelz +;;; Copyright © 2019, 2020 Florian Pelz ;;; Copyright © 2020 Timotej Lazar ;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020 Pierre Neidhardt @@ -441,20 +441,10 @@ (define-public nginx-accept-language-module (begin ;; The nginx source code is part of the module’s source. (format #t "decompressing nginx source code~%") - (call-with-output-file "nginx.tar" - (lambda (out) - (let* ((gzip (assoc-ref inputs "gzip")) - (nginx-srcs (assoc-ref inputs "nginx-sources")) - (pipe (open-pipe* OPEN_READ - (string-append gzip "/bin/gzip") - "-cd" - nginx-srcs))) - (dump-port pipe out) - (unless (= (status:exit-val (close-pipe pipe)) 0) - (error "gzip decompress failed"))))) - (invoke (string-append (assoc-ref inputs "tar") "/bin/tar") - "xvf" "nginx.tar" "--strip-components=1") - (delete-file "nginx.tar") + (let ((tar (assoc-ref inputs "tar")) + (nginx-srcs (assoc-ref inputs "nginx-sources"))) + (invoke (string-append tar "/bin/tar") + "xvf" nginx-srcs "--strip-components=1")) #t))) (add-after 'unpack 'convert-to-dynamic-module (lambda _ -- cgit v1.2.3 From 819c0df2ee02e69265e087703da5f2272e47c99b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 20 Mar 2020 10:05:59 +0100 Subject: gnu: emacs-company: Update to 0.9.12. * gnu/packages/emacs-xyz.scm (emacs-company): Update to 0.9.12. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9cfb5e68ab..a56cbb860e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3633,7 +3633,7 @@ (define-public emacs-butler (define-public emacs-company (package (name "emacs-company") - (version "0.9.11") + (version "0.9.12") (source (origin (method git-fetch) @@ -3642,7 +3642,7 @@ (define-public emacs-company (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0x7ag716jp4xb7kmcmr8pqlxx1v0f2gkjx5gx34wxxqfrndwyx8i")))) + (base32 "0c31amc6gyfkmb1ii6mm56c75za1yxkj2iyhrjc45nn2mrh7yj7a")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From 7ba300ee6ed55eac61e46aa1c0b7de1a65a69ac3 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 20 Mar 2020 17:44:06 +0100 Subject: gnu: libosmium: Update to 2.15.4. * gnu/packages/geo.scm (libosmium): Update to 2.15.4. [inputs]: Add bzip2 and utfcpp. --- gnu/packages/geo.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 590da69934..0f22443cbb 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -81,6 +81,7 @@ (define-module (gnu packages geo) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sqlite) + #:use-module (gnu packages textutils) #:use-module (gnu packages web) #:use-module (gnu packages webkit) #:use-module (gnu packages wxwidgets) @@ -839,7 +840,7 @@ (define-public imposm3 (define-public libosmium (package (name "libosmium") - (version "2.14.2") + (version "2.15.4") (source (origin (method git-fetch) @@ -848,16 +849,18 @@ (define-public libosmium (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "123ri1l0a2b9fljgpwsl7z2w4i3kmgxz79d4ns9z4mwbp8sw0250")))) + (base32 "0mlcvqrhp40bzj5r5j9nfc5vbis8hmzcq9xi8jylkciyydaynhz4")))) (build-system cmake-build-system) (propagated-inputs `(("boost" ,boost) + ("bzip2" ,bzip2) ("expat" ,expat) ("gdal" ,gdal) ("geos" ,geos) - ("proj.4" ,proj.4) + ("proj" ,proj) ("protozero" ,protozero) ("sparsehash" ,sparsehash) + ("utfcpp" ,utfcpp) ("zlib" ,zlib))) (native-inputs `(("doxygen" ,doxygen))) -- cgit v1.2.3 From 6145b16778aec8b22daebd9779d65a22cd8843b5 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 20 Mar 2020 17:57:35 +0100 Subject: gnu: osm2pgsql: Update to 1.2.1. * gnu/packages/geo.scm (osm2pgsql): Update to 1.2.1. [inputs]: Add bzip2 and replace proj.4 by proj. [native-inputs]: Replace python-2 by python and python2-psycopg2 by python-psycopg2. --- gnu/packages/geo.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0f22443cbb..bc870f9620 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -873,7 +873,7 @@ (define-public libosmium (define-public osm2pgsql (package (name "osm2pgsql") - (version "0.96.0") + (version "1.2.1") (source (origin (method git-fetch) @@ -882,7 +882,7 @@ (define-public osm2pgsql (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "032cydh8ynaqfhdzmkvgbmqyjql668y6qln1l59l2s3ni9963bbl")) + (base32 "1ysan01lpqzjxlq3y2kdminfjs5d9zksicpf9vvzpdk3fzq51fc9")) (modules '((guix build utils))) (snippet '(begin @@ -901,16 +901,17 @@ (define-public osm2pgsql "/include")))) (inputs `(("boost" ,boost) + ("bzip2" ,bzip2) ("expat" ,expat) ("libosmium" ,libosmium) ("lua" ,lua) ("postgresql" ,postgresql) - ("proj.4" ,proj.4) + ("proj" ,proj) ("protozero" ,protozero) ("zlib" ,zlib))) (native-inputs - `(("python-2" ,python-2) - ("python2-psycopg2" ,python2-psycopg2))) + `(("python" ,python) + ("python-psycopg2" ,python-psycopg2))) (home-page "https://github.com/openstreetmap/osm2pgsql") (synopsis "OSM data importer to postgresql") (description "Osm2pgsql is a tool for loading OpenStreetMap data into a -- cgit v1.2.3 From 0f6651344f4bf1736d9efc3b5523b2cec70f8ede Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 18:45:42 +0100 Subject: gnu: libiberty: Do not inherit properties from GCC. * gnu/packages/gcc.scm (make-libiberty)[properties]: New field. --- gnu/packages/gcc.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 08afd80358..589e9367da 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -598,6 +598,7 @@ (define (make-libiberty gcc) (outputs '("out")) (native-inputs '()) (propagated-inputs '()) + (properties '()) (synopsis "Collection of subroutines used by various GNU programs"))) (define-public libiberty -- cgit v1.2.3 From 3861fb1c1f0e33ea714093e98da828d03acf21e5 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Tue, 25 Feb 2020 15:59:10 +0100 Subject: gnu: gsettings-desktop-schemas: patch monospace font. * gnu/packages/gnome.scm (gsettings-desktop-schemas)[arguments]: Rename `set-adwaita-theme-file-name' to the more generic `patch-schemas'. Add patch for the monospace font (Source Code Pro 10 -> Monospace 11). Adjust comments. Signed-off-by: Marius Bakke --- gnu/packages/gnome.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c39b4467b9..bc78910c64 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -44,7 +44,7 @@ ;;; Copyright © 2019 David Wilson ;;; Copyright © 2019, 2020 Raghav Gururajan ;;; Copyright © 2019 Jonathan Brielmaier -;;; Copyright © 2019 Leo Prikler +;;; Copyright © 2019, 2020 Leo Prikler ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 raingloom @@ -1607,15 +1607,17 @@ (define-public gsettings-desktop-schemas (build-system meson-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'set-adwaita-theme-file-name + (add-after 'unpack 'patch-schemas (lambda* (#:key inputs #:allow-other-keys) - ;; Provide the correct file name of the default GNOME - ;; background, 'adwaita-timed.xml'. (let ((theme (assoc-ref inputs "gnome-backgrounds"))) (substitute* (find-files "schemas" "\\.gschema\\.xml\\.in$") + ;; Provide the correct file name of the default GNOME + ;; background, 'adwaita-timed.xml'. (("@datadir@/backgrounds/gnome") - (string-append theme "/share/backgrounds/gnome"))) + (string-append theme "/share/backgrounds/gnome")) + ;; Do not reference fonts, that may not exist. + (("'Source Code Pro 10'") "'Monospace 11'")) #t)))))) (inputs `(("glib" ,glib) -- cgit v1.2.3 From fcafee61bf26fcd3a16fb02aff500a328f5a33ac Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sun, 15 Mar 2020 01:52:37 +0100 Subject: gnu: add premake5. * gnu/packages/build-tools.scm (premake5): New variable. Signed-off-by: Marius Bakke --- gnu/packages/build-tools.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 63dc72e1a7..8cfd26fec0 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2019 Jonathan Brielmaier +;;; Copyright © 2020 Leo Prikler ;;; ;;; This file is part of GNU Guix. ;;; @@ -245,6 +246,31 @@ (define-public premake4 (home-page "https://premake.github.io") (license license:bsd-3))) +(define-public premake5 + (package + (inherit premake4) + (version "5.0.0-alpha14") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/premake/premake-core/" + "releases/download/v" version + "/premake-" version "-src.zip")) + (sha256 + (base32 + "0236s7bjvxf7x1l5faywmfzjywflpx42ngyhkn0mqqjnh54a97vw")))) + (arguments + (substitute-keyword-arguments (package-arguments premake4) + ((#:phases phases) + `(modify-phases ,phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "../../bin/release/premake5" + (string-append (assoc-ref outputs "out") "/bin")) + #t)))))) + (description "@code{premake5} is a command line utility that reads a +scripted definition of a software project and outputs @file{Makefile}s or +other lower-level build files."))) + (define-public osc (package (name "osc") -- cgit v1.2.3 From ad64b09df4bcf0a57753c9ad2cdd442b78e205d3 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 15 Mar 2020 20:36:16 +1100 Subject: gnu: Add wev. * gnu/packages/freedesktop.scm (wev): New variable. Signed-off-by: Marius Bakke --- gnu/packages/freedesktop.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 1244da4fa0..b9811fb60e 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2017, 2018 Mark H Weaver ;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Rutger Helling -;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017, 2020 Brendan Tildesley ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Stefan Stefanović @@ -72,6 +72,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages libunwind) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) + #:use-module (gnu packages man) #:use-module (gnu packages m4) #:use-module (gnu packages nss) #:use-module (gnu packages perl) @@ -804,6 +805,43 @@ (define-public weston multiplexer to the KMS/DRM Linux kernel devices.") (license license:expat))) +(define-public wev + ;; There simple tool has no version or release yet. + (let ((commit "cee3dfb2a8b40ee303611018c68ae182d84a7f46")) + (package + (name "wev") + (version (string-append "2020-02-06-" (string-take commit 8))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~sircmpwn/wev") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0l71v3fzgiiv6xkk365q1l08qvaymxd4kpaya6r2g8yzkr7i2hms")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:make-flags + (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("scdoc" ,scdoc))) + (inputs + `(("libxkbcommon" ,libxkbcommon) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols))) + (home-page "https://git.sr.ht/~sircmpwn/wev") + (synopsis "Wayland event viewer") + (description "Wev is a tool that opens a window, printing all events +sent to a Wayland window, such as key presses. It is analogous to the X11 tool +XEv.") + (license license:expat)))) + (define-public exempi (package (name "exempi") -- cgit v1.2.3 From 12eb7bb8af3272bb1f16a9b73a3232e1294bd56f Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 15 Mar 2020 21:25:54 +0100 Subject: gnu: Add blktrace. * gnu/packages/linux.scm (blktrace): New variable. * gnu/packages/patches/blktrace-use-rmtree.patch: Add file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Marius Bakke --- gnu/local.mk | 2 ++ gnu/packages/linux.scm | 43 ++++++++++++++++++++++++++ gnu/packages/patches/blktrace-use-rmtree.patch | 32 +++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 gnu/packages/patches/blktrace-use-rmtree.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 4fc1818ed4..0207c7547d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -27,6 +27,7 @@ # Copyright © 2019 Brett Gilio # Copyright © 2019 Amin Bandali # Copyright © 2020 Brendan Tildesley +# Copyright © 2020 Vincent Legoll # # This file is part of GNU Guix. # @@ -766,6 +767,7 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ + %D%/packages/patches/blktrace-use-rmtree.patch \ %D%/packages/patches/bluez-CVE-2020-0556.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0e649d0fe3..12da3c8f63 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4012,6 +4012,49 @@ (define-public libaio applications.") (license license:lgpl2.1+))) +(define-public blktrace + ;; Take a newer commit to get the fix for CVE-2018-10689. + (let ((commit "f4f8ef7cdea138cfaa2f3ca0ee31fa23d3bcf1cc") + (revision "0")) + (package + (name "blktrace") + (version (git-version "1.2.0" revision commit)) + (home-page + "https://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (sha256 + (base32 "1ihdfimg7mfcgdm6l09xfqx5kdyv42x743dxp3z3w65q5vd7xy89")) + (file-name (git-file-name name version)) + (patches (search-patches "blktrace-use-rmtree.patch")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags + (list "CC=gcc" (string-append "prefix=" %output)) + #:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-after 'unpack 'fix-gnuplot-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((gnuplot (assoc-ref inputs "gnuplot"))) + (substitute* "btt/bno_plot.py" + (("gnuplot %s") + (string-append gnuplot "/bin/gnuplot %s"))) + #t)))))) + (inputs + `(("libaio" ,libaio) + ("gnuplot" ,gnuplot) + ("python" ,python-wrapper))) ;for 'bno_plot.py' + (synopsis "Block layer IO tracing mechanism") + (description "Blktrace is a block layer IO tracing mechanism which provides +detailed information about request queue operations to user space. It extracts +event traces from the kernel (via the relaying through the debug file system).") + (license license:gpl2)))) + (define-public sbc (package (name "sbc") diff --git a/gnu/packages/patches/blktrace-use-rmtree.patch b/gnu/packages/patches/blktrace-use-rmtree.patch new file mode 100644 index 0000000000..bb0a10da72 --- /dev/null +++ b/gnu/packages/patches/blktrace-use-rmtree.patch @@ -0,0 +1,32 @@ +From 6d1ce4a3a1a561644695a50c00cbd28494728061 Mon Sep 17 00:00:00 2001 +From: Vincent Legoll +Date: Mon, 16 Mar 2020 11:43:19 +0100 +Subject: [PATCH 02/10] bno_plot.py: Use shutil.rmtree() instead of + os.system('/bin/rm') + +--- + btt/bno_plot.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/btt/bno_plot.py b/btt/bno_plot.py +index f05cfdc..36fc524 100644 +--- a/btt/bno_plot.py ++++ b/btt/bno_plot.py +@@ -40,7 +40,7 @@ To exit the plotter, enter 'quit' or ^D at the 'gnuplot> ' prompt. + + from __future__ import absolute_import + from __future__ import print_function +-import getopt, glob, os, sys, tempfile ++import getopt, glob, os, sys, tempfile, shutil + + verbose = 0 + cmds = """ +@@ -125,4 +125,4 @@ if __name__ == '__main__': + sys.exit(1) + + os.waitpid(pid, 0) +- os.system('/bin/rm -rf ' + tmpdir) ++ shutil.rmtree(tmpdir) +-- +2.20.1 + -- cgit v1.2.3 From 0f7e6964c7b0daa715ebbd8ef6fe6f875ba47b85 Mon Sep 17 00:00:00 2001 From: guy fleury iteriteka Date: Wed, 18 Mar 2020 09:54:57 +0200 Subject: gnu: make-libiberty: Use install-file. * gnu/packages/gcc.scm(make-libiberty): In phase install use install-file helper function to install file. --- gnu/packages/gcc.scm | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 589e9367da..3d1ae25dc9 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2020 Joseph LaFreniere +;;; Copyright © 2020 Guy Fleury Iteriteka ;;; ;;; This file is part of GNU Guix. ;;; @@ -578,22 +579,17 @@ (define (make-libiberty gcc) #:phases (modify-phases %standard-phases (add-before 'configure 'chdir - (lambda _ - (chdir "libiberty") - #t)) - (replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib/")) - (include (string-append out "/include/"))) - (mkdir-p lib) - (mkdir-p include) - (copy-file "libiberty.a" - (string-append lib "libiberty.a")) - (copy-file "../include/libiberty.h" - (string-append include "libiberty.h")) - #t)))))) + (lambda _ + (chdir "libiberty") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/")) + (include (string-append out "/include/"))) + (install-file "libiberty.a" lib) + (install-file "../include/libiberty.h" include)) + #t))))) (inputs '()) (outputs '("out")) (native-inputs '()) -- cgit v1.2.3 From fe2b134cf960c5dd1d077c29cf3b4dca8e154e2f Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 20 Mar 2020 02:02:39 +0100 Subject: gnu: emacs-projectile: Update to 2.1.0. * gnu/packages/emacs-xyz.scm (emacs-projectile): Update to 2.1.0. Signed-off-by: Marius Bakke --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a56cbb860e..62217e37f5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6394,7 +6394,7 @@ (define-public emacs-edit-indirect (define-public emacs-projectile (package (name "emacs-projectile") - (version "2.0.0") + (version "2.1.0") (source (origin (method url-fetch) (uri (string-append "https://raw.githubusercontent.com/bbatsov" @@ -6402,7 +6402,7 @@ (define-public emacs-projectile (file-name (string-append "projectile-" version ".el")) (sha256 (base32 - "149hablms6n9b4wp78dz4pjz1rzyylfw9ayghq5p9d7k661mvyby")))) + "1jj9wk91clyph3zmxkd7y7d6gdqmjd1vndhyq5fxp7i7dy013571")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit v1.2.3 From baf45671374d4142a96437b75ef9953dccff214c Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Fri, 20 Mar 2020 11:45:11 +0100 Subject: gnu: Add squid. * gnu/packages/networking.scm (squid): New variable. Signed-off-by: Marius Bakke --- gnu/packages/networking.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index e9abac2991..7d81b449c1 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -82,6 +82,7 @@ (define-module (gnu packages networking) #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) + #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages dejagnu) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) @@ -98,6 +99,7 @@ (define-module (gnu packages networking) #:use-module (gnu packages kerberos) #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) + #:use-module (gnu packages openldap) #:use-module (gnu packages password-utils) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) @@ -862,6 +864,47 @@ (define-public httpstat TCP connection, TLS handshake and so on) in the terminal.") (license license:expat))) +(define-public squid + (package + (name "squid") + (version "4.10") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.squid-cache.org/Versions/v4/squid-" + version ".tar.xz")) + (sha256 + (base32 "07sz0adv8nkhy797675bpra7lvdkwjq9isw1ddgylhlazl511w4q")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'build 'fix-true-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "test-suite/testheaders.sh" + (("/bin/true") + (string-append (assoc-ref inputs "coreutils") + "/bin/true"))) + #t))))) + (inputs + `(("perl" ,perl) + ("openldap" ,openldap) + ("linux-pam" ,linux-pam) + ("libcap" ,libcap) + ("cyrus-sasl" ,cyrus-sasl) + ("expat" ,expat) + ("libxml2" ,libxml2) + ("openssl" ,openssl))) + (native-inputs + `(("cppunit" ,cppunit) + ("pkg-config" ,pkg-config))) + (synopsis "Web caching proxy") + (description "Squid is a caching proxy for the Web supporting HTTP, HTTPS, +FTP, and more. It reduces bandwidth and improves response times by caching and +reusing frequently-requested web pages.") + (home-page "http://www.squid-cache.org/") + (license license:gpl2+))) + (define-public bwm-ng (package (name "bwm-ng") -- cgit v1.2.3 From 830dab870ab1d4a4ec1127a877a43d19f86c4f7f Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Fri, 20 Mar 2020 12:18:57 +0100 Subject: gnu: ansible: Update to 2.9.6. * gnu/packages/admin.scm (ansible): Update to 2.9.6. Signed-off-by: Marius Bakke --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 382f631ebd..4d3425d039 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1916,13 +1916,13 @@ (define-public graphios (define-public ansible (package (name "ansible") - (version "2.9.5") + (version "2.9.6") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 - (base32 "19fav6rs58zdc3gfhh1lxhki36jn4252183rrd769sv46b9m1bji")))) + (base32 "1jfbp1i3nl4yvqwd5ssy43dz3pq2x03mn875vb8r56gqh43kmksr")))) (build-system python-build-system) (native-inputs `(("python-bcrypt" ,python-bcrypt) -- cgit v1.2.3 From 0266a6a23b880474d7234add38e528963f5b7c34 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 21:08:43 +0100 Subject: gnu: python-clikit: Declare Python 2 variant. * gnu/packages/python-xyz.scm (python-clikit)[properties]: New field. (python2-clikit): New public variable. --- gnu/packages/python-xyz.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8271e1ff7e..c3b06a58aa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11125,8 +11125,18 @@ (define-public python-clikit (description "CliKit is a group of utilities to build testable command line interfaces.") + (properties `((python2-variant . ,(delay python2-clikit)))) (license license:expat))) +(define-public python2-clikit + (let ((base (package-with-python2 (strip-python2-variant python-clikit)))) + (package/inherit + base + (propagated-inputs + `(("python-enum34" ,python2-enum34) + ("python-typing" ,python2-typing) + ,@(package-propagated-inputs base)))))) + (define-public python-msgpack-python (package (name "python-msgpack-python") -- cgit v1.2.3 From 463e98357bda9ce33aa3cc149418108b25bd1c16 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 21:11:54 +0100 Subject: gnu: python-pytzdata: Update to 2019.3. * gnu/packages/time.scm (python-pytzdata): Update to 2019.3. [native-inputs]: Remove. [arguments]: New field. [propagated-inputs]: Add PYTHON-CLEO. --- gnu/packages/time.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 0ec9a102a5..bb5351e900 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2016 Danny Milosavljevic -;;; Copyright © 2016 Marius Bakke +;;; Copyright © 2016, 2020 Marius Bakke ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017 ng0 @@ -89,18 +89,20 @@ (define-public python-pytimeparse (define-public python-pytzdata (package (name "python-pytzdata") - (version "2017.3.1") + (version "2019.3") (source (origin (method url-fetch) (uri (pypi-uri "pytzdata" version)) (sha256 (base32 - "1wi3jh39zsa9iiyyhynhj7w5b2p9wdyd0ppavpsrmf3wxvr7cwz8")))) + "0ppfc6kz4p41mxyqxq1g1zp6gvns99g6b344qj6ih0x9vxy6zh7s")))) (build-system python-build-system) - (native-inputs - `(("python-pytest" ,python-pytest) - ("python-nose" ,python-nose))) + ;; XXX: The PyPI distribution contains no tests, and the upstream + ;; repository lacks a setup.py! How to build from git? + (arguments '(#:tests? #f)) + (propagated-inputs + `(("python-cleo" ,python-cleo))) (home-page "https://github.com/sdispater/pytzdata") (synopsis "Timezone database for Python") (description -- cgit v1.2.3 From e5023bfd2a0a51f84c5f9c59fda724db59c97cc8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 21:13:12 +0100 Subject: gnu: python-pendulum: Update to 2.1.0. * gnu/packages/time.scm (python-pendulum): Update to 2.1.0. [native-inputs]: Remove. [arguments]: New field. [propagated-inputs]: Remove PYTHON-TZLOCAL. --- gnu/packages/time.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index bb5351e900..f4dc8a2ffd 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -138,22 +138,21 @@ (define-public python2-pytz (define-public python-pendulum (package (name "python-pendulum") - (version "1.2.4") + (version "2.1.0") (source (origin (method url-fetch) (uri (pypi-uri "pendulum" version)) (sha256 (base32 - "1fj36yxi2f4lzchzd8ny1qjl67dbypnk0gn8qwad2w78579m8m8z")))) + "1zhzk0ai8is8zclw4v73dllf0hx0l5nmm4sbwrh6cl8h5qsang09")))) (build-system python-build-system) - (native-inputs - `(("python-pytest" ,python-pytest) - ("python-nose" ,python-nose))) + ;; XXX: The PyPI distribution lacks tests, and the upstream repository + ;; lacks a setup.py! + (arguments '(#:tests? #f)) (propagated-inputs `(("python-dateutil" ,python-dateutil) - ("python-pytzdata" ,python-pytzdata) - ("python-tzlocal" ,python-tzlocal))) + ("python-pytzdata" ,python-pytzdata))) (home-page "https://github.com/sdispater/pendulum") (synopsis "Alternate API for Python datetimes") (description "Pendulum is a drop-in replacement for the standard -- cgit v1.2.3 From 9f9335277f0262af89d5d33fff4a0f09892efb3e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 21:39:24 +0100 Subject: gnu: Add python-text-unidecode. * gnu/packages/python-xyz.scm (python-text-unidecode, python2-text-unidecode): New public variables. --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c3b06a58aa..ed5fba5282 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2398,6 +2398,40 @@ (define-public python-unidecode (define-public python2-unidecode (package-with-python2 python-unidecode)) +(define-public python-text-unidecode + (package + (name "python-text-unidecode") + (version "1.3") + (source (origin + (method url-fetch) + (uri (pypi-uri "text-unidecode" version)) + (sha256 + (base32 + "14xb99fdv52j21dsljgsbmbaqv10ps4b453p229r29sdn4xn1mms")))) + (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "PYTHONPATH" + (string-append "./build/lib:" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-vv")))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/kmike/text-unidecode/") + (synopsis "Decode Unicode data") + (description + "@code{text-unidecode} is a basic Python port of the @code{Text::Unidecode} +Perl library. It can create ASCII representations of Unicode data. In general +users should prefer the @code{python-unidecode} package which offers better +memory usage and transliteration quality.") + ;; The user can choose either license. + (license (list license:clarified-artistic license:gpl2+)))) + +(define-public python2-text-unidecode + (package-with-python2 python-text-unidecode)) + (define-public python-pyjwt (package (name "python-pyjwt") -- cgit v1.2.3 From 28030d290a9f690800d6ed7c7d0b217d7452b321 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 22:00:51 +0100 Subject: gnu: Add python-validators. * gnu/packages/python-xyz.scm (python-validators, python2-validators): New public variables. --- gnu/packages/python-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ed5fba5282..93b735f1c9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14062,6 +14062,41 @@ (define-public python-rfc3987 (define-public python2-rfc3987 (package-with-python2 python-rfc3987)) +(define-public python-validators + (package + (name "python-validators") + (version "0.14.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "validators" version)) + (sha256 + (base32 + "024m15j33szd0v8k5l4ccish6n0b4knq81gmb4fq25ynwyyyd4mi")))) + (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "pytest" "-vv")))))) + (propagated-inputs + `(("python-decorator" ,python-decorator) + ("python-six" ,python-six))) + (native-inputs + `(("python-flake8" ,python-flake8) + ("python-isort" ,python-isort) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/kvesteri/validators") + (synopsis "Data validation library") + (description + "This package contains validators for different things such as email +addresses, IP addresses, URLs, hashes and more. It has been designed to +be easy to use and not require defining a schema or form just to validate +some input.") + (license license:expat))) + +(define-public python2-validators + (package-with-python2 python-validators)) + (define-public python-validate-email (package (name "python-validate-email") -- cgit v1.2.3 From fe36fdb206be6b189fa0bb5b4eb8074379431612 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 22:03:35 +0100 Subject: gnu: Add python-random2. * gnu/packages/python-xyz.scm (python-random2, python2-random2): New public variables. --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 93b735f1c9..0c7e9e4599 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12163,6 +12163,34 @@ (define-public python-nautilus focus on building massively scalable web applications.") (license license:expat))) +(define-public python-random2 + (package + (name "python-random2") + (version "1.0.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "random2" version ".zip")) + (sha256 + (base32 + "01y0s4747plsx8fdnxy0nz83dp69naddz58m81r9h0s1qfm31b9l")))) + (build-system python-build-system) + (native-inputs `(("unzip" ,unzip))) + (home-page "http://pypi.python.org/pypi/random2") + (synopsis "Python 3 version of the Python 2 @code{random} module") + (description + "This package provides a Python 3 ported version of Python 2.7’s +@code{random} module. It has also been back-ported to work in Python 2.6. + +In Python 3, the implementation of @code{randrange()} was changed, so that +even with the same seed you get different sequences in Python 2 and 3. + +This package closes that gap, allowing stable random number generation +between the different Python versions.") + (license license:psfl))) + +(define-public python2-random2 + (package-with-python2 python-random2)) + (define-public python-snowballstemmer (package (name "python-snowballstemmer") -- cgit v1.2.3 From a6a7336964da06abba9dd40ce8d7496c9c711177 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 22:09:12 +0100 Subject: gnu: Update python-faker to to 4.0.2, python2-faker to 3.0.1. * gnu/packages/patches/python-faker-fix-build-32bit.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-xyz.scm (python-faker): Update to 4.0.2. [source](patches, modules, snippet): Remove. [arguments]: Adjust check phase. [native-inputs]: Remove PYTHON-EMAIL-VALIDATOR and PYTHON-MOCK. Add PYTHON-FREEZEGUN, PYTHON-PYTEST, PYTHON-RANDOM2, and PYTHON-VALIDATORS. [propagated-inputs]: Remove PYTHON-SIX. Add PYTHON-TEXT-UNIDECODE. (python2-faker): Update to 3.0.1. [native-inputs]: Add PYTHON2-MOCK. --- gnu/local.mk | 1 - .../patches/python-faker-fix-build-32bit.patch | 36 ---------------------- gnu/packages/python-xyz.scm | 34 +++++++++++--------- 3 files changed, 20 insertions(+), 51 deletions(-) delete mode 100644 gnu/packages/patches/python-faker-fix-build-32bit.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 0207c7547d..8ada03180d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1337,7 +1337,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-cffi-x87-stack-clean.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ - %D%/packages/patches/python-faker-fix-build-32bit.patch \ %D%/packages/patches/python-flask-restful-werkzeug-compat.patch \ %D%/packages/patches/python-keras-integration-test.patch \ %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \ diff --git a/gnu/packages/patches/python-faker-fix-build-32bit.patch b/gnu/packages/patches/python-faker-fix-build-32bit.patch deleted file mode 100644 index 466b289012..0000000000 --- a/gnu/packages/patches/python-faker-fix-build-32bit.patch +++ /dev/null @@ -1,36 +0,0 @@ -These tests fail on 32-bit due to an overflow. - -Upstream bug URL: https://github.com/joke2k/faker/issues/408 - -diff --git a/tests/__init__.py b/tests/__init__.py -index 6026772..58b6b83 100644 ---- a/tests/__init__.py -+++ b/tests/__init__.py -@@ -384,7 +384,6 @@ class FactoryTestCase(unittest.TestCase): - provider = Provider - # test century - self.assertTrue(self._datetime_to_time(provider.date_time_this_century(after_now=False)) <= self._datetime_to_time(datetime.datetime.now())) -- self.assertTrue(self._datetime_to_time(provider.date_time_this_century(before_now=False, after_now=True)) >= self._datetime_to_time(datetime.datetime.now())) - # test decade - self.assertTrue(self._datetime_to_time(provider.date_time_this_decade(after_now=False)) <= self._datetime_to_time(datetime.datetime.now())) - self.assertTrue(self._datetime_to_time(provider.date_time_this_decade(before_now=False, after_now=True)) >= self._datetime_to_time(datetime.datetime.now())) -@@ -413,8 +412,6 @@ class FactoryTestCase(unittest.TestCase): - - # ensure all methods provide timezone aware datetimes - with self.assertRaises(TypeError): -- provider.date_time_this_century(before_now=False, after_now=True, tzinfo=utc) >= datetime.datetime.now() -- with self.assertRaises(TypeError): - provider.date_time_this_decade(after_now=False, tzinfo=utc) <= datetime.datetime.now() - with self.assertRaises(TypeError): - provider.date_time_this_year(after_now=False, tzinfo=utc) <= datetime.datetime.now() -@@ -423,7 +420,6 @@ class FactoryTestCase(unittest.TestCase): - - # test century - self.assertTrue(provider.date_time_this_century(after_now=False, tzinfo=utc) <= datetime.datetime.now(utc)) -- self.assertTrue(provider.date_time_this_century(before_now=False, after_now=True, tzinfo=utc) >= datetime.datetime.now(utc)) - # test decade - self.assertTrue(provider.date_time_this_decade(after_now=False, tzinfo=utc) <= datetime.datetime.now(utc)) - self.assertTrue(provider.date_time_this_decade(before_now=False, after_now=True, tzinfo=utc) >= datetime.datetime.now(utc)) --- -2.11.1 - diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0c7e9e4599..47a75bc36a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11368,34 +11368,29 @@ (define-public python2-ukpostcodeparser (define-public python-faker (package (name "python-faker") - (version "0.7.9") + (version "4.0.2") (source (origin (method url-fetch) (uri (pypi-uri "Faker" version)) (sha256 (base32 - "1fh2p2yz0fsdr4fqwxgddwbvfb6qn6vp8yx0qwqzra27yq5d1wsm")) - (patches - (search-patches "python-faker-fix-build-32bit.patch")) - (modules '((guix build utils))) - (snippet - '(begin - (for-each delete-file (find-files "." "\\.pyc$")) - #t)))) + "13qq485ydxmdnqn3xbfv1xfyqbf9qfnfw33v1vw5l6jyy9p8cgrd")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (invoke "python" "-m" "unittest" "-v" "tests")))))) + (lambda _ (invoke "python" "-m" "pytest" "-v")))))) (native-inputs `(;; For testing - ("python-email-validator" ,python-email-validator) - ("python-mock" ,python-mock) - ("python-ukpostcodeparser" ,python-ukpostcodeparser))) + ("python-freezegun" ,python-freezegun) + ("python-pytest" ,python-pytest) + ("python-random2" ,python-random2) + ("python-ukpostcodeparser" ,python-ukpostcodeparser) + ("python-validators" ,python-validators))) (propagated-inputs `(("python-dateutil" ,python-dateutil) - ("python-six" ,python-six))) + ("python-text-unidecode" ,python-text-unidecode))) (home-page "https://github.com/joke2k/faker") (synopsis "Python package that generates fake data") (description @@ -11404,11 +11399,22 @@ (define-public python-faker (license license:expat) (properties `((python2-variant . ,(delay python2-faker)))))) +;; Faker 4.0 dropped Python 2 support, so we stick with this older version here. (define-public python2-faker (let ((base (package-with-python2 (strip-python2-variant python-faker)))) (package (inherit base) + (version "3.0.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "Faker" version)) + (sha256 + (base32 + "11cr0qvspkdh6198rqy56qildk7bnp6llj8kyy1dan5sp5n4dxy7")))) + (native-inputs + `(("python-mock" ,python2-mock) + ,@(package-native-inputs base))) (propagated-inputs `(("python2-ipaddress" ,python2-ipaddress) ,@(package-propagated-inputs base)))))) -- cgit v1.2.3 From 51d42caa94515f43d677bdd76d53bf8bb8c7bc4e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 22:20:37 +0100 Subject: gnu: python-orator: Update to 0.9.9. * gnu/packages/databases.scm (python-orator): Update to 0.9.9. [arguments]: Remove #:phases. Add #:tests?. [native-inputs]: Remove. [propagated-inputs]: Add PYTHON-PYYAML. --- gnu/packages/databases.scm | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 130aaa2653..a347467ad1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016 Danny Milosavljevic -;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017, 2018 Julien Lepiller ;;; Copyright © 2017, 2020 Thomas Danckaert ;;; Copyright © 2017 Jelle Licht @@ -2391,32 +2391,17 @@ (define-public python2-lmdb (define-public python-orator (package (name "python-orator") - (version "0.9.7") + (version "0.9.9") (source (origin (method url-fetch) (uri (pypi-uri "orator" version)) (sha256 (base32 - "14r58z64fdp76ixnvmi4lni762b405ynmsx6chr1qihs3yl9zn6c")))) + "0mbgybz63ryhr9p1f4glnls5c57jp6il3dw0kf97f3pj80687rvg")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'loosen-dependencies - ;; Tests are not actually run since they are not included with the - ;; distributed package, but dependencies are checked. - (lambda _ - (substitute* "setup.py" - ((",<.*'") "'") - (("flexmock==0.9.7") "flexmock") - ;; The pytest-mock package is out of date, so we remove minimum - ;; version requirement. - (("pytest-mock.*'") "pytest-mock'")) - #t))))) - (native-inputs - `(("python-pytest-mock" ,python-pytest-mock) - ("python-pytest" ,python-pytest) - ("python-flexmock" ,python-flexmock))) + ;; FIXME: Tests are not distributed with PyPI, and the repository + ;; does not contain setup.py. How to test? + (arguments '(#:tests? #f)) (propagated-inputs `(("python-backpack" ,python-backpack) ("python-blinker" ,python-blinker) @@ -2427,6 +2412,7 @@ (define-public python-orator ("python-pendulum" ,python-pendulum) ("python-pyaml" ,python-pyaml) ("python-pygments" ,python-pygments) + ("python-pyyaml" ,python-pyyaml) ("python-simplejson" ,python-simplejson) ("python-six" ,python-six) ("python-wrapt" ,python-wrapt))) -- cgit v1.2.3 From 85bad77facdada73d6fb1397500ed15dc288913d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 22:55:01 +0100 Subject: gnu: python2-faker: Add explicit dependency on six. This is a follow-up to commit a6a7336964da06abba9dd40ce8d7496c9c711177. * gnu/packages/python-xyz.scm (python2-faker)[propagated-inputs]: Add PYTHON2-SIX. --- gnu/packages/python-xyz.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 47a75bc36a..490580262e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11417,6 +11417,7 @@ (define-public python2-faker ,@(package-native-inputs base))) (propagated-inputs `(("python2-ipaddress" ,python2-ipaddress) + ("python2-six" ,python2-six) ,@(package-propagated-inputs base)))))) (define-public python-pyaml -- cgit v1.2.3 From e401653b515cb32650aa885dfb6db185409ccd23 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 21 Feb 2020 11:51:56 -0500 Subject: gnu: FFmpeg: Prefer dav1d over libaom. * gnu/packages/patches/ffmpeg-prefer-dav1d.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/video.scm (ffmpeg)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/patches/ffmpeg-prefer-dav1d.patch | 43 ++++++++++++++++++++++++++ gnu/packages/video.scm | 2 ++ 3 files changed, 46 insertions(+) create mode 100644 gnu/packages/patches/ffmpeg-prefer-dav1d.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 8ada03180d..d6d129c3cc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -866,6 +866,7 @@ dist_patch_DATA = \ %D%/packages/patches/fasthenry-spSolve.patch \ %D%/packages/patches/fasthenry-spFactor.patch \ %D%/packages/patches/fbreader-curl-7.62.patch \ + %D%/packages/patches/ffmpeg-prefer-dav1d.patch \ %D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \ %D%/packages/patches/fifo-map-remove-catch.hpp.patch \ %D%/packages/patches/file-CVE-2018-10360.patch \ diff --git a/gnu/packages/patches/ffmpeg-prefer-dav1d.patch b/gnu/packages/patches/ffmpeg-prefer-dav1d.patch new file mode 100644 index 0000000000..95e3712a7f --- /dev/null +++ b/gnu/packages/patches/ffmpeg-prefer-dav1d.patch @@ -0,0 +1,43 @@ +When decoding AV1 files, prefer dav1d over libaom for performance +reasons. + +Patch copied from upstream source repository: + + + +From dc0806dd25882f41f6085c8356712f95fded56c7 Mon Sep 17 00:00:00 2001 +From: James Almer +Date: Sun, 15 Sep 2019 11:29:56 -0300 +Subject: [PATCH] avcodec/allcodecs: make libdav1d the preferred AV1 decoder + +It's considerably faster than libaom in most systems. + +Reviewed-by: BBB +Signed-off-by: James Almer +--- + libavcodec/allcodecs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c +index 5130fca026..d5dfba1877 100644 +--- a/libavcodec/allcodecs.c ++++ b/libavcodec/allcodecs.c +@@ -680,7 +680,6 @@ extern AVCodec ff_pcm_mulaw_at_encoder; + extern AVCodec ff_pcm_mulaw_at_decoder; + extern AVCodec ff_qdmc_at_decoder; + extern AVCodec ff_qdm2_at_decoder; +-extern AVCodec ff_libaom_av1_decoder; + extern AVCodec ff_libaom_av1_encoder; + extern AVCodec ff_libaribb24_decoder; + extern AVCodec ff_libcelt_decoder; +@@ -738,6 +737,7 @@ extern AVCodec ff_idf_decoder; + /* external libraries, that shouldn't be used by default if one of the + * above is available */ + extern AVCodec ff_h263_v4l2m2m_encoder; ++extern AVCodec ff_libaom_av1_decoder; + extern AVCodec ff_libopenh264_encoder; + extern AVCodec ff_libopenh264_decoder; + extern AVCodec ff_h264_amf_encoder; +-- +2.20.1 + diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0c245ece6e..d0c35e8e77 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -922,6 +922,8 @@ (define-public ffmpeg (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) + ;; See + (patches (search-patches "ffmpeg-prefer-dav1d.patch")) (sha256 (base32 "176jn1lcdf0gk7sa5l2mv0faqp5dsqdhx1gqcrgymqhfmdal4xfb")))) -- cgit v1.2.3 From f08040c5f864df1e85573172aa921e42ceef6859 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 20 Feb 2020 18:28:36 -0500 Subject: gnu: VLC: Improve AV1 playback. * gnu/packages/video.scm (inputs): Add dav1d. --- gnu/packages/video.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d0c35e8e77..d18fe95b61 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1206,6 +1206,10 @@ (define-public vlc (inputs `(("alsa-lib" ,alsa-lib) ("avahi" ,avahi) + ;; XXX Try removing dav1d here and testing AV1 playback when FFmpeg 4.3 + ;; is released. + ;; + ("dav1d" ,dav1d) ("dbus" ,dbus) ("eudev" ,eudev) ("flac" ,flac) -- cgit v1.2.3 From fe4a37276b871e29a7397b0aa940aab2b842ce77 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 20 Mar 2020 23:12:36 +0100 Subject: gnu: guix: Install SysV init files to $(prefix)/etc. Fixes . Reported by Maxim Cournoyer . This is a followup to 73fbe04107d38f4561636c74d28d7a4935cbb1ef. * gnu/packages/package-management.scm (guix)[arguments]: In 'bootstrap' phase, change "sysvinitservicedir" in 'nix/local.mk'. --- gnu/packages/package-management.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b0457ba87a..c321a64751 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -170,6 +170,13 @@ (define-public guix (lambda (port) (display ,version port))) + ;; Install SysV init files to $(prefix)/etc rather + ;; than to /etc. + (substitute* "nix/local.mk" + (("^sysvinitservicedir = .*$") + (string-append "sysvinitservicedir = \ +$(prefix)/etc/init.d\n"))) + (invoke "sh" "bootstrap"))) (add-before 'check 'copy-bootstrap-guile (lambda* (#:key system inputs #:allow-other-keys) -- cgit v1.2.3 From 6b8c390f282936cad9172100c0d882f7391a6fc4 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 21 Mar 2020 00:01:19 +0000 Subject: gnu: python-botocore: Update to 1.15.26. To keep compatability with awscli. * gnu/packages/python-xyz.scm (python-botocore): Update to 1.15.26. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 490580262e..bf6393362e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9408,14 +9408,14 @@ (define-public python2-jmespath (define-public python-botocore (package (name "python-botocore") - (version "1.12.149") + (version "1.15.26") (source (origin (method url-fetch) (uri (pypi-uri "botocore" version)) (sha256 (base32 - "12597f74khp3ngwr282cb949w0gcqj20rkfc3x275dijavyy5cmf")))) + "1a87pbwkk5vlwz92hy1wizfnpiwn11bhaicr6bmji1i5ybwdhnr8")))) (build-system python-build-system) (arguments ;; FIXME: Many tests are failing. -- cgit v1.2.3 From 46a5d07ef79f7e586a3d0caa359e7117c1f1c500 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:27:48 +0100 Subject: gnu: cl-jonathan: Use HTTPS home page. * gnu/packages/lisp-xyz.scm (cl-jonathan)[home-page]: Use HTTPS. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d9986463a0..c4dea7711d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4281,7 +4281,7 @@ (define-public sbcl-jonathan ("sbcl-fast-io" ,sbcl-fast-io) ("sbcl-proc-parse" ,sbcl-proc-parse) ("sbcl-cl-ppcre" ,sbcl-cl-ppcre))) - (home-page "http://rudolph-miller.github.io/jonathan/overview.html") + (home-page "https://rudolph-miller.github.io/jonathan/overview.html") (synopsis "JSON encoder and decoder") (description "High performance JSON encoder and decoder. Currently support: SBCL, -- cgit v1.2.3 From 113c9b97b46344b5e30544ee4d2a6e85460feb02 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:18:43 +0100 Subject: gnu: sbcl-cl+ssl: Use HTTPS home page. * gnu/packages/lisp-xyz.scm (sbcl-cl+ssl)[home-page]: Use HTTPS. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c4dea7711d..a3cb070fe5 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3504,7 +3504,7 @@ (define-public sbcl-cl+ssl ("sbcl-trivial-garbage" ,sbcl-trivial-garbage) ("sbcl-alexandria" ,sbcl-alexandria) ("sbcl-trivial-features" ,sbcl-trivial-features))) - (home-page "http://common-lisp.net/project/cl-plus-ssl/") + (home-page "https://common-lisp.net/project/cl-plus-ssl/") (synopsis "Common Lisp bindings to OpenSSL") (description "This library is a fork of SSL-CMUCL. The original SSL-CMUCL source -- cgit v1.2.3 From 9ca4c65492737fbdfe342ce949b442a62575b1c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:49:52 +0100 Subject: gnu: sbcl-parse-js: Use HTTPS home page. * gnu/packages/lisp-xyz.scm (sbcl-parse-js)[home-page]: Use HTTPS. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a3cb070fe5..d025adb89c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -926,7 +926,7 @@ (define-public sbcl-parse-js (base32 "1wddrnr5kiya5s3gp4cdq6crbfy9fqcz7fr44p81502sj3bvdv39")))) (build-system asdf-build-system/sbcl) - (home-page "http://marijnhaverbeke.nl/parse-js/") + (home-page "https://marijnhaverbeke.nl/parse-js/") (synopsis "Parse JavaScript") (description "Parse-js is a Common Lisp package for parsing JavaScript (ECMAScript 3). It has basic support for ECMAScript 5.") -- cgit v1.2.3 From fed4ff33faca7f0a933f848508fb1fcf6c54c8a8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:31:29 +0100 Subject: gnu: sbcl-parse-number: Use HTTPS home page. * gnu/packages/lisp-xyz.scm (sbcl-parse-number)[home-page]: Use HTTPS. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d025adb89c..043c219e5e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -950,7 +950,7 @@ (define-public sbcl-parse-number (base32 "0sk06ib1bhqv9y39vwnnw44vmbc4b0kvqm37xxmkxd4dwchq82d7")))) (build-system asdf-build-system/sbcl) - (home-page "http://www.cliki.net/PARSE-NUMBER") + (home-page "https://www.cliki.net/PARSE-NUMBER") (synopsis "Parse numbers") (description "@code{parse-number} is a library of functions for parsing strings into one of the standard Common Lisp number types without using the -- cgit v1.2.3 From 2d1e064694ae48a90eedcde8da12a51ab4596a68 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:32:29 +0100 Subject: gnu: ocaml-tsdl: Use HTTPS home page. * gnu/packages/ocaml.scm (ocaml-tsdl)[home-page]: Use HTTPS. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c9a1037902..fae92bbf1c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3341,7 +3341,7 @@ (define-public ocaml-tsdl (package (name "ocaml-tsdl") (version "0.9.6") - (home-page "http://erratique.ch/software/tsdl") + (home-page "https://erratique.ch/software/tsdl") (source (origin (method url-fetch) (uri (string-append home-page "/releases/tsdl-" -- cgit v1.2.3 From 786886d1f575773e8c5a58e9802e805e20871a8c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 20 Mar 2020 03:01:02 +0100 Subject: gnu: ocaml-tsdl: Update to 0.9.7. * gnu/packages/ocaml.scm (ocaml-tsdl): Update to 0.9.7. [native-inputs]: Remove ocaml-ocb-stubblr. [inputs]: Remove ocaml-result. --- gnu/packages/ocaml.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index fae92bbf1c..92b28e0148 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3340,7 +3340,7 @@ (define-public ocaml-ocb-stubblr (define-public ocaml-tsdl (package (name "ocaml-tsdl") - (version "0.9.6") + (version "0.9.7") (home-page "https://erratique.ch/software/tsdl") (source (origin (method url-fetch) @@ -3349,7 +3349,7 @@ (define-public ocaml-tsdl (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "00krjhmnchsnz33h9zhh0v69xbvi86l0xf0dvy7iivylb7f7x3n4")))) + "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f")))) (build-system ocaml-build-system) (arguments `(#:build-flags '("build") @@ -3360,12 +3360,10 @@ (define-public ocaml-tsdl (native-inputs `(("ocamlbuild" ,ocamlbuild) ("ocaml-astring" ,ocaml-astring) - ("ocaml-ocb-stubblr" ,ocaml-ocb-stubblr) ("opam" ,opam) ("pkg-config" ,pkg-config))) (inputs `(("topkg" ,ocaml-topkg) - ("result" ,ocaml-result) ("sdl2" ,sdl2) ("integers" ,ocaml-integers) ("ctypes" ,ocaml-ctypes))) -- cgit v1.2.3 From d8bf501eb258f15f10f55e7b6c96b610ec55b09d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:25:19 +0100 Subject: gnu: ocaml-sedlex: Use HTTPS home page. * gnu/packages/ocaml.scm (ocaml-sedlex)[home-page]: Use HTTPS. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 92b28e0148..5181d6156b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2088,7 +2088,7 @@ (define-public ocaml4.07-sedlex (sha256 (base32 "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk")))))) - (home-page "http://www.cduce.org/download.html#side") + (home-page "https://www.cduce.org/download.html#side") (synopsis "Lexer generator for Unicode and OCaml") (description "Lexer generator for Unicode and OCaml.") (license license:expat))) -- cgit v1.2.3 From 7ea838447c3cc07c35d45ba8ae43e64ae8ff36c3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:07:28 +0100 Subject: gnu: r-maptools: Use HTTPS home page. * gnu/packages/cran.scm (r-maptools)[home-page]: Use HTTPS. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2fc62edb4b..2ef1b931a8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5516,7 +5516,7 @@ (define-public r-maptools `(("r-foreign" ,r-foreign) ("r-lattice" ,r-lattice) ("r-sp" ,r-sp))) - (home-page "http://r-forge.r-project.org/projects/maptools/") + (home-page "https://r-forge.r-project.org/projects/maptools/") (synopsis "Tools for reading and handling spatial objects") (description "This package provides a set of tools for manipulating and reading -- cgit v1.2.3 From fa2a0fd00bc1a599a34144ea2c5aedc4e41fe237 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 21:21:55 +0100 Subject: gnu: Use ‘license:’ prefix in (gnu packages libreoffice). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/libreoffice.scm: Import (guix licenses) with a #:prefix and adjust all callers. --- gnu/packages/libreoffice.scm | 72 ++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 2ef813907d..88f31c7d1a 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -35,9 +35,7 @@ (define-module (gnu packages libreoffice) #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) - #:use-module ((guix licenses) - #:select (gpl2 gpl2+ lgpl2.1+ lgpl3+ mpl1.1 mpl2.0 - non-copyleft x11-style bsd-3)) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) #:use-module (ice-9 match) @@ -110,7 +108,7 @@ (define-public ixion expressions stored in multiple named targets, or \"cells\". The cells can be referenced from each other, and the library takes care of resolving their dependencies automatically upon calculation.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public orcus (package @@ -140,7 +138,7 @@ (define-public orcus Microsoft Excel 2007 XML, Microsoft Excel 2003 XML, Open Document Spreadsheet, Plain Text, Gnumeric XML, Generic XML. It also includes low-level parsers for CSV, CSS and XML.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public unoconv (package @@ -197,7 +195,7 @@ (define-public unoconv @file{.docx}), @file{.xls} and @file{.xlsx}). All required fonts must be installed on the converting system.") - (license gpl2))) + (license license:gpl2))) (define-public librevenge (package @@ -229,7 +227,7 @@ (define-public librevenge (description "Librevenge is a base library for writing document import filters. It has interfaces for text documents, vector graphics, spreadsheets and presentations.") - (license (list mpl2.0 lgpl2.1+)))) ;dual licensed + (license (list license:mpl2.0 license:lgpl2.1+)))) ; dual-licensed (define-public libwpd (package @@ -257,7 +255,7 @@ (define-public libwpd (description "Libwpd is a C++ library designed to help process WordPerfect documents. It is most commonly used to import such documents into other word processors.") - (license (list mpl2.0 lgpl2.1+)))) ;dual licensed + (license (list license:mpl2.0 license:lgpl2.1+)))) ; dual-licensed (define-public libe-book (package @@ -294,7 +292,7 @@ (define-public libe-book PalmDoc Ebook, Plucker .pdb, QiOO (mobile format, for java-enabled cellphones), TCR (simple compressed text format), TealDoc, zTXT, ZVR (simple compressed text format).") - (license mpl2.0))) + (license license:mpl2.0))) (define-public libepubgen (package @@ -322,7 +320,7 @@ (define-public libepubgen (description "libepubgen is an EPUB generator for librevenge. It supports librevenge's text document interface and--currently in a very limited way--presentation and vector drawing interfaces.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public libwpg (package @@ -348,7 +346,7 @@ (define-public libwpg (synopsis "Library and tools for the WordPerfect Graphics format") (description "The libwpg project provides a library and tools for working with graphics in the WPG (WordPerfect Graphics) format.") - (license (list mpl2.0 lgpl2.1+)))) ;dual licensed + (license (list license:mpl2.0 license:lgpl2.1+)))) ; dual-licensed (define-public libcmis (package @@ -390,7 +388,8 @@ (define-public libcmis (description "LibCMIS is a C++ client library for the CMIS interface. It allows C++ applications to connect to any ECM behaving as a CMIS server such as Alfresco or Nuxeo.") - (license (list mpl1.1 gpl2+ lgpl2.1+)))) ; triple license + (license + (list license:mpl1.1 license:gpl2+ license:lgpl2.1+)))) ; triple license (define-public libabw (package @@ -418,7 +417,7 @@ (define-public libabw (synopsis "Library for parsing the AbiWord format") (description "Libabw is a library that parses the file format of AbiWord documents.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public libcdr (package @@ -447,7 +446,7 @@ (define-public libcdr (synopsis "Library for parsing the CorelDRAW format") (description "Libcdr is a library that parses the file format of CorelDRAW documents of all versions.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public libetonyek (package @@ -481,7 +480,7 @@ (define-public libetonyek (synopsis "Library for parsing the Apple Keynote format") (description "Libetonyek is a library that parses the file format of Apple Keynote documents. It currently supports Keynote versions 2 to 5.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public liblangtag (package @@ -507,7 +506,7 @@ (define-public liblangtag extensions described in RFC6067 and RFC6497, and Extension T for language/locale identifiers as described in the Unicode CLDR standard 21.0.2.") - (license (list lgpl3+ mpl2.0)))) ; dual license + (license (list license:lgpl3+ license:mpl2.0)))) ; dual license (define-public libexttextcat (package @@ -525,8 +524,8 @@ (define-public libexttextcat (synopsis "Text Categorization library") (description "Libexttextcat is an N-Gram-Based Text Categorization library primarily intended for language guessing.") - (license (non-copyleft "file://LICENSE" - "See LICENSE in the distribution.")))) + (license (license:non-copyleft "file://LICENSE" + "See LICENSE in the distribution.")))) (define-public libfreehand (package @@ -556,7 +555,7 @@ (define-public libfreehand (synopsis "Library for parsing the FreeHand format") (description "Libfreehand is a library that parses the file format of Aldus/Macromedia/Adobe FreeHand documents.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public libmspub (package @@ -583,7 +582,7 @@ (define-public libmspub (synopsis "Library for parsing the Microsoft Publisher format") (description "Libmspub is a library that parses the file format of Microsoft Publisher documents of all versions.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public libnumbertext (package @@ -606,7 +605,7 @@ (define-public libnumbertext "The libnumbertext library provides language-neutral @code{NUMBERTEXT} and @code{MONEYTEXT} functions for LibreOffice Calc, available for C++ and Java.") - (license (list lgpl3+ bsd-3)))) + (license (list license:lgpl3+ license:bsd-3)))) (define-public libpagemaker (package @@ -635,7 +634,7 @@ (define-public libpagemaker (description "Libpagemaker is a library that parses the file format of Aldus/Adobe PageMaker documents. Currently it only understands documents created by PageMaker version 6.x and 7.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public libvisio (package @@ -665,7 +664,7 @@ (define-public libvisio (synopsis "Library for parsing the Microsoft Visio format") (description "Libvisio is a library that parses the file format of Microsoft Visio documents of all versions.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public libodfgen (package @@ -696,7 +695,7 @@ (define-public libodfgen Open Document Format (ODF). It provides generator implementations for all document interfaces supported by librevenge: text documents, vector drawings, presentations and spreadsheets.") - (license (list mpl2.0 lgpl2.1+)))) ; dual license + (license (list license:mpl2.0 license:lgpl2.1+)))) ; dual license (define-public libmwaw (package @@ -723,7 +722,7 @@ (define-public libmwaw (description "Libmwaw contains some import filters for old Macintosh text documents (MacWrite, ClarisWorks, ... ) and for some graphics and spreadsheet documents.") - (license (list mpl2.0 lgpl2.1+)))) ; dual license + (license (list license:mpl2.0 license:lgpl2.1+)))) ; dual license (define-public libstaroffice (package @@ -746,7 +745,7 @@ (define-public libstaroffice (synopsis "Provides LibreOffice support for old StarOffice documents") (description "@code{libstaroffice} is an import filter for the document formats from the old StarOffice (.sdc, .sdw, ...).") - (license (list mpl2.0 lgpl2.1+)))) ; dual license + (license (list license:mpl2.0 license:lgpl2.1+)))) ; dual license (define-public libwps (package @@ -772,7 +771,7 @@ (define-public libwps (synopsis "Import library for Microsoft Works text documents") (description "Libwps is a library for importing files in the Microsoft Works word processor file format.") - (license (list mpl2.0 lgpl2.1+)))) ; dual license + (license (list license:mpl2.0 license:lgpl2.1+)))) ; dual license (define-public libzmf (package @@ -804,7 +803,7 @@ (define-public libzmf (description "Libzmf is a library that parses the file format of Zoner Callisto/Draw documents. Currently it only understands documents created by Zoner Draw version 4 and 5.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public hunspell (package @@ -836,7 +835,7 @@ (define-public hunspell library and program designed for languages with rich morphology and complex word compounding or character encoding.") ;; Triple license, including "mpl1.1 or later". - (license (list mpl1.1 gpl2+ lgpl2.1+)))) + (license (list license:mpl1.1 license:gpl2+ license:lgpl2.1+)))) (define (dicollecte-french-dictionary variant synopsis) ;; Return a French dictionary package from dicollecte.org, for the given @@ -884,7 +883,7 @@ (define (dicollecte-french-dictionary variant synopsis) "This package provides a dictionary for the Hunspell spell-checking library.") (home-page "https://www.dicollecte.org/home.php?prj=fr") - (license mpl2.0))) + (license license:mpl2.0))) (define-syntax define-french-dictionary (syntax-rules (synopsis) @@ -929,8 +928,9 @@ (define-public hyphen (synopsis "Hyphenation library") (description "Hyphen is a hyphenation library using TeX hyphenation patterns, which are pre-processed by a perl script.") - ;; triple license, including "mpl1.1 or later" - (license (list mpl1.1 mpl2.0 gpl2+ lgpl2.1+)))) + ;; Triple license, including "mpl1.1 or later". + (license + (list license:mpl1.1 license:mpl2.0 license:gpl2+ license:lgpl2.1+)))) (define-public mythes (package @@ -954,8 +954,8 @@ (define-public mythes (description "MyThes is a simple thesaurus that uses a structured text data file and an index file with binary search to look up words and phrases and to return information on pronunciations, meanings and synonyms.") - (license (non-copyleft "file://COPYING" - "See COPYING in the distribution.")))) + (license (license:non-copyleft "file://COPYING" + "See COPYING in the distribution.")))) (define-public libqxp (package @@ -982,7 +982,7 @@ (define-public libqxp (synopsis "Library and tools for the QuarkXPress file format") (description "libqxp is a library and a set of tools for reading and converting QuarkXPress file format. It supports versions 3.1 to 4.1.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public libreoffice (package @@ -1203,4 +1203,4 @@ (define (install-appdata app) application; Impress, a presentation engine; Draw, a drawing and flowcharting application; Base, a database and database frontend; Math for editing mathematics.") - (license mpl2.0))) + (license license:mpl2.0))) -- cgit v1.2.3 From a7b7817dd8a4a5f71f2311029fb2e8f8bbad38f9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 20 Mar 2020 04:26:42 +0100 Subject: gnu: ruby-omniauth: Update to 1.9.1. * gnu/packages/ruby.scm (ruby-omniauth): Update to 1.9.1. --- gnu/packages/ruby.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5b6d79c3b7..1511f961dc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2017 ng0 ;;; Copyright © 2017, 2019 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Efraim Flashner -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017, 2018, 2019 Christopher Baines ;;; Copyright © 2018 Vasile Dumitrascu @@ -1279,14 +1279,13 @@ (define-public ruby-oauth2 (define-public ruby-omniauth (package (name "ruby-omniauth") - (version "1.9.0") + (version "1.9.1") (source (origin (method url-fetch) (uri (rubygems-uri "omniauth" version)) (sha256 - (base32 - "1p16h1rp8by05k8gfw17xjhgwp60dk8qmj1xalv1n23kmxfsxb1x")))) + (base32 "002vi9gwamkmhf0dsj2im1d47xw2n1jfhnzl18shxf3ampkqfmyz")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; No included tests -- cgit v1.2.3 From 2aaa09f17ddcc14a88468299bd33d8a22928ceee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:02:00 +0100 Subject: gnu: hdf-eos2: Use HTTPS home page. * gnu/packages/maths.scm (hdf-eos2)[home-page]: Use HTTPS. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 847cc4a14e..df4971aad8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1139,7 +1139,7 @@ (define-public hdf-eos2 `( #:configure-flags '("--enable-install-include" "--enable-shared" "CC=h4cc -Df2cFortran" "LIBS=-lgctp") #:parallel-tests? #f)) - (home-page "http://hdfeos.org/software/library.php#HDF-EOS2") + (home-page "https://hdfeos.org/software/library.php#HDF-EOS2") (synopsis "HDF4-based data format for NASA's Earth Observing System") (description "HDF-EOS2 is a software library built on HDF4 which supports the construction of data structures used in NASA's Earth Observing -- cgit v1.2.3 From 69669b2877da7af012a4ddca2a85cb6f54467b28 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:23:31 +0100 Subject: gnu: guile-rsvg: Use HTTPS home page. * gnu/packages/gtk.scm (guile-rsvg)[home-page]: Use HTTPS. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d52dc41e7e..df9fc05294 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -923,7 +923,7 @@ (define-public guile-rsvg (description "Guile-RSVG wraps the RSVG library for Guile, allowing you to render SVG images onto Cairo surfaces.") - (home-page "http://wingolog.org/projects/guile-rsvg/") + (home-page "https://wingolog.org/projects/guile-rsvg/") (license license:lgpl2.1+)))) (define-public guile3.0-rsvg -- cgit v1.2.3 From 02e052ba9dc363d2a6aafe04ba79334b5073f6fc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:12:08 +0100 Subject: gnu: guile3.0-syntax-highlight: Use HTTPS home page. * gnu/packages/guile-xyz.scm (guile3.0-syntax-highlight)[home-page]: Use HTTPS. --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index dbf3c8ee57..a2430b7ea3 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -597,7 +597,7 @@ (define-public guile-syntax-highlight highlighting library for GNU Guile. It can parse code written in various programming languages into a simple s-expression that can be converted to HTML (via SXML) or any other format for rendering.") - (home-page "http://dthompson.us/projects/guile-syntax-highlight.html") + (home-page "https://dthompson.us/projects/guile-syntax-highlight.html") (license license:lgpl3+))) (define-public guile3.0-syntax-highlight -- cgit v1.2.3 From f9caa6c7c1af97c9f1da3a7fd033f88cbe4a9827 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 20 Mar 2020 05:14:57 +0100 Subject: gnu: perl-archive-zip: Update to 1.68. * gnu/packages/perl-compression.scm (perl-archive-zip): Update to 1.68. --- gnu/packages/perl-compression.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl-compression.scm b/gnu/packages/perl-compression.scm index af6d575435..6bb67bcb59 100644 --- a/gnu/packages/perl-compression.scm +++ b/gnu/packages/perl-compression.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Eric Bavier -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Petter ;;; Copyright © 2017, 2019 Efraim Flashner ;;; @@ -130,7 +130,7 @@ (define-public perl-archive-extract (define-public perl-archive-zip (package (name "perl-archive-zip") - (version "1.67") + (version "1.68") (source (origin (method url-fetch) @@ -138,7 +138,7 @@ (define-public perl-archive-zip "mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-" version ".tar.gz")) (sha256 - (base32 "0x17b7s5c3bqy9gx7psdqxbzkilylnwwd3c3i68vynbn9hs788my")))) + (base32 "0l663s3a68p8r2qjy4pn1g05lx0i8js8wpz7qqln3bsvg1fihklq")))) (build-system perl-build-system) (native-inputs ;; For tests. -- cgit v1.2.3 From acf2b20069b1f74b59185292d981024eea4d7055 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 01:08:08 +0100 Subject: gnu: rsync: Use system zlib and popt libraries. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reduce our likelihood of contracting security bugs at the expense of compression ratio (in some cases) and compatibility with rsync≤3.1.1. rsync@3.1.2 was released in 2014. Time to upgrade your CentOS box. * gnu/packages/rsync.scm (rsync)[inputs]: Add popt and zlib. [arguments]: Use them. --- gnu/packages/rsync.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rsync.scm b/gnu/packages/rsync.scm index 74efae753c..0d8217ee20 100644 --- a/gnu/packages/rsync.scm +++ b/gnu/packages/rsync.scm @@ -34,7 +34,6 @@ (define-module (gnu packages rsync) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu)) - (define-public rsync (package (name "rsync") @@ -47,10 +46,17 @@ (define-public rsync (base32 "1h0011dj6jgqpgribir4anljjv7bbrdcs8g91pbsmzf5zr75bk2m")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags + ;; The bundled copies are preferred by default. + (list "--without-included-zlib" + "--without-included-popt"))) (native-inputs `(("perl" ,perl))) (inputs - `(("acl" ,acl))) + `(("acl" ,acl) + ("popt" ,popt) + ("zlib" ,zlib))) (synopsis "Remote (and local) file copying tool") (description "Rsync is a fast and versatile file copying tool. It can copy locally, -- cgit v1.2.3 From fa7efe1798b187f832a9d9d6f83497a0886bf1b3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:17:13 +0100 Subject: gnu: python2-s3cmd: Use HTTPS home page. * gnu/packages/python-xyz.scm (python2-s3cmd)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bf6393362e..eaa17f3736 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10251,7 +10251,7 @@ (define-public python2-s3cmd ;; without libmagic bindings at all: ;; https://github.com/s3tools/s3cmd/issues/198 ("python2-magic" ,python2-magic))) - (home-page "http://s3tools.org/s3cmd") + (home-page "https://s3tools.org/s3cmd") (synopsis "Command line tool for S3-compatible storage services") (description "S3cmd is a command line tool for uploading, retrieving and managing data -- cgit v1.2.3 From 8198c19c127a02eb238a59a15c17aa2100ce9574 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:05:03 +0100 Subject: gnu: python-django: Use HTTPS home page. * gnu/packages/django.scm (python-django)[home-page]: Use HTTPS. --- gnu/packages/django.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 70b6662a9e..8e72139a07 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -99,7 +99,7 @@ (define-public python-django ("python-tblib" ,python-tblib))) (propagated-inputs `(("python-pytz" ,python-pytz))) - (home-page "http://www.djangoproject.com/") + (home-page "https://www.djangoproject.com/") (synopsis "High-level Python Web framework") (description "Django is a high-level Python Web framework that encourages rapid -- cgit v1.2.3 From dcff9bda97d088a717d6f7c01bdf7c0e68d62b9b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 11:58:26 +0100 Subject: gnu: python-language-server: Build with python-jedi@0.15.2. * gnu/packages/python-xyz.scm (python-language-server)[propagated-inputs]: Remove PYTHON-JEDI. Add PYTHON-JEDI-0.15. (python-jedi-0.15, python-parso-0.5): New public variables. --- gnu/packages/python-xyz.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index eaa17f3736..3937bad5c3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3459,7 +3459,9 @@ (define-public python-language-server (propagated-inputs `(("python-pluggy" ,python-pluggy) ("python-jsonrpc-server" ,python-jsonrpc-server) - ("python-jedi" ,python-jedi) + ;; Note: Remove the special versions of Jedi and Parso when updating + ;; this package. + ("python-jedi" ,python-jedi-0.15) ("python-yapf" ,python-yapf) ("python-pyflakes" ,python-pyflakes) ("python-pydocstyle" ,python-pydocstyle) @@ -11566,6 +11568,20 @@ (define-public python-jedi (define-public python2-jedi (package-with-python2 python-jedi)) +;; python-language-server requires 0.15 specifically. Remove once unused. +(define-public python-jedi-0.15 + (package + (inherit python-jedi) + (version "0.15.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "jedi" version)) + (sha256 + (base32 + "01zqasl690x1i6dq4mvh13pz0cw8i276xsivsrnn00x90iqm42g9")))) + (propagated-inputs + `(("python-parso" ,python-parso-0.5))))) + (define-public ptpython (package (name "ptpython") @@ -15885,6 +15901,19 @@ (define-public python-parso (define-public python2-parso (package-with-python2 python-parso)) +;; This version is required for Jedi@0.15, which in turn is needed for +;; python-language-server. +(define-public python-parso-0.5 + (package + (inherit python-parso) + (version "0.5.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "parso" version)) + (sha256 + (base32 + "1qgvrkpma7vylrk047mxxvqd66nwqk978n3ig2w8iz9m3bgjbksm")))))) + (define-public python-async-generator (package (name "python-async-generator") -- cgit v1.2.3 From c61557b1b642b61abdb665527e6a34b97e3d064f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 12:17:11 +0100 Subject: gnu: gRPC: Move to (gnu packages rpc). * gnu/packages/machine-learning.scm (grpc): Move to ... * gnu/packages/rpc.scm: ... here. New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. * gnu/packages/hyperledger.scm: Adjust module imports. --- gnu/local.mk | 1 + gnu/packages/hyperledger.scm | 1 + gnu/packages/machine-learning.scm | 76 +--------------------------- gnu/packages/rpc.scm | 103 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 75 deletions(-) create mode 100644 gnu/packages/rpc.scm (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index d6d129c3cc..f2f096c51c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -441,6 +441,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/rednotebook.scm \ %D%/packages/regex.scm \ %D%/packages/robotics.scm \ + %D%/packages/rpc.scm \ %D%/packages/rrdtool.scm \ %D%/packages/rsync.scm \ %D%/packages/ruby.scm \ diff --git a/gnu/packages/hyperledger.scm b/gnu/packages/hyperledger.scm index f0b33e0deb..1aed8e23d8 100644 --- a/gnu/packages/hyperledger.scm +++ b/gnu/packages/hyperledger.scm @@ -39,6 +39,7 @@ (define-module (gnu packages hyperledger) #:use-module (gnu packages popt) #:use-module (gnu packages pretty-print) #:use-module (gnu packages protobuf) + #:use-module (gnu packages rpc) #:use-module (gnu packages tbb) #:use-module (gnu packages version-control) #:use-module (gnu packages web)) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 7deb6ee29a..faf4bacfe3 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -73,12 +73,12 @@ (define-module (gnu packages machine-learning) #:use-module (gnu packages python-science) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages rpc) #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) #:use-module (gnu packages statistics) #:use-module (gnu packages sqlite) #:use-module (gnu packages swig) - #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -1296,80 +1296,6 @@ (define-public kaldi-gstreamer-server Python.") (license license:bsd-2)))) -(define-public grpc - (package - (name "grpc") - (version "1.16.1") - (outputs '("out" "static")) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/grpc/grpc.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; no test target - #:configure-flags - (list "-DgRPC_ZLIB_PROVIDER=package" - "-DgRPC_CARES_PROVIDER=package" - "-DgRPC_SSL_PROVIDER=package" - "-DgRPC_PROTOBUF_PROVIDER=package" - (string-append "-DCMAKE_INSTALL_PREFIX=" - (assoc-ref %outputs "out")) - "-DCMAKE_INSTALL_LIBDIR=lib" - (string-append "-DCMAKE_INSTALL_RPATH=" - (assoc-ref %outputs "out") "/lib") - "-DCMAKE_VERBOSE_MAKEFILE=ON") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'configure-shared - (lambda* (#:key (configure-flags '()) #:allow-other-keys) - (mkdir "../build-shared") - (with-directory-excursion "../build-shared" - (apply invoke - "cmake" "../source" - "-DBUILD_SHARED_LIBS=ON" - configure-flags) - (apply invoke "make" - `("-j" ,(number->string (parallel-job-count))))))) - (add-after 'install 'install-shared-libraries - (lambda _ - (with-directory-excursion "../build-shared" - (invoke "make" "install")))) - (add-before 'strip 'move-static-libs - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (static (assoc-ref outputs "static"))) - (mkdir-p (string-append static "/lib")) - (with-directory-excursion - (string-append out "/lib") - (for-each - (lambda (file) - (rename-file file - (string-append static "/lib/" file))) - (find-files "." "\\.a$")))) - #t))))) - (inputs - `(("c-ares" ,c-ares/cmake) - ("openssl" ,openssl) - ("zlib" ,zlib))) - (native-inputs - `(("protobuf" ,protobuf) - ("python" ,python-wrapper))) - (home-page "https://grpc.io") - (synopsis "High performance universal RPC framework") - (description "gRPC is a modern high performance @dfn{Remote Procedure Call} -(RPC) framework that can run in any environment. It can efficiently connect -services in and across data centers with pluggable support for load balancing, -tracing, health checking and authentication. It is also applicable in last -mile of distributed computing to connect devices, mobile applications and -browsers to backend services.") - (license license:asl2.0))) - ;; Note that Tensorflow includes a "third_party" directory, which seems to not ;; only contain modified subsets of upstream library source code, but also ;; adapter headers provided by Google (such as the fft.h header, which is not diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm new file mode 100644 index 0000000000..f37a660fc7 --- /dev/null +++ b/gnu/packages/rpc.scm @@ -0,0 +1,103 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2020 Efraim Flashner +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages rpc) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix build-system cmake) + #:use-module (gnu packages adns) + #:use-module (gnu packages compression) + #:use-module (gnu packages protobuf) + #:use-module (gnu packages python) + #:use-module (gnu packages tls)) + +(define-public grpc + (package + (name "grpc") + (version "1.16.1") + (outputs '("out" "static")) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/grpc/grpc.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; no test target + #:configure-flags + (list "-DgRPC_ZLIB_PROVIDER=package" + "-DgRPC_CARES_PROVIDER=package" + "-DgRPC_SSL_PROVIDER=package" + "-DgRPC_PROTOBUF_PROVIDER=package" + (string-append "-DCMAKE_INSTALL_PREFIX=" + (assoc-ref %outputs "out")) + "-DCMAKE_INSTALL_LIBDIR=lib" + (string-append "-DCMAKE_INSTALL_RPATH=" + (assoc-ref %outputs "out") "/lib") + "-DCMAKE_VERBOSE_MAKEFILE=ON") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'configure-shared + (lambda* (#:key (configure-flags '()) #:allow-other-keys) + (mkdir "../build-shared") + (with-directory-excursion "../build-shared" + (apply invoke + "cmake" "../source" + "-DBUILD_SHARED_LIBS=ON" + configure-flags) + (apply invoke "make" + `("-j" ,(number->string (parallel-job-count))))))) + (add-after 'install 'install-shared-libraries + (lambda _ + (with-directory-excursion "../build-shared" + (invoke "make" "install")))) + (add-before 'strip 'move-static-libs + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static"))) + (mkdir-p (string-append static "/lib")) + (with-directory-excursion + (string-append out "/lib") + (for-each + (lambda (file) + (rename-file file + (string-append static "/lib/" file))) + (find-files "." "\\.a$")))) + #t))))) + (inputs + `(("c-ares" ,c-ares/cmake) + ("openssl" ,openssl) + ("zlib" ,zlib))) + (native-inputs + `(("protobuf" ,protobuf) + ("python" ,python-wrapper))) + (home-page "https://grpc.io") + (synopsis "High performance universal RPC framework") + (description "gRPC is a modern high performance @dfn{Remote Procedure Call} +(RPC) framework that can run in any environment. It can efficiently connect +services in and across data centers with pluggable support for load balancing, +tracing, health checking and authentication. It is also applicable in last +mile of distributed computing to connect devices, mobile applications and +browsers to backend services.") + (license license:asl2.0))) -- cgit v1.2.3 From f2c7513d1604076049d1834580d218d764e6b85b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 12:20:14 +0100 Subject: gnu: python-grpcio: Move to (gnu packages rpc). * gnu/packages/python-xyz.scm (python-grpcio): Move from here ... * gnu/packages/rpc.scm (python-grpcio): ... to here. --- gnu/packages/python-xyz.scm | 20 -------------------- gnu/packages/rpc.scm | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3937bad5c3..d0da9b36c3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17022,26 +17022,6 @@ (define-public python-astor (define-public python2-astor (package-with-python2 python-astor)) -(define-public python-grpcio - (package - (name "python-grpcio") - (version "1.17.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "grpcio" version)) - (sha256 - (base32 - "0qb9y6j83nxa6d4kc60i8yfgdm7a8ms7b54kncjzf5y7nsxp8rzx")))) - (build-system python-build-system) - (propagated-inputs - `(("python-six" ,python-six))) - (home-page "https://grpc.io") - (synopsis "HTTP/2-based RPC framework") - (description "This package provides a Python library for communicating -with the HTTP/2-based RPC framework gRPC.") - (license license:asl2.0))) - (define-public python-astunparse (package (name "python-astunparse") diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm index f37a660fc7..991dc89324 100644 --- a/gnu/packages/rpc.scm +++ b/gnu/packages/rpc.scm @@ -21,11 +21,14 @@ (define-module (gnu packages rpc) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix git-download) + #:use-module (guix download) #:use-module (guix build-system cmake) + #:use-module (guix build-system python) #:use-module (gnu packages adns) #:use-module (gnu packages compression) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages tls)) (define-public grpc @@ -101,3 +104,23 @@ (define-public grpc mile of distributed computing to connect devices, mobile applications and browsers to backend services.") (license license:asl2.0))) + +(define-public python-grpcio + (package + (name "python-grpcio") + (version "1.17.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "grpcio" version)) + (sha256 + (base32 + "0qb9y6j83nxa6d4kc60i8yfgdm7a8ms7b54kncjzf5y7nsxp8rzx")))) + (build-system python-build-system) + (propagated-inputs + `(("python-six" ,python-six))) + (home-page "https://grpc.io") + (synopsis "HTTP/2-based RPC framework") + (description "This package provides a Python library for communicating +with the HTTP/2-based RPC framework gRPC.") + (license license:asl2.0))) -- cgit v1.2.3 From bbeb710de70521010b3d432cb5b4b14ce6e45ca6 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 20 Mar 2020 20:31:59 +0100 Subject: gnu: Add hash-extender. * gnu/packages/crypto.scm (hash-extender): New variable. * gnu/packages/patches/hash-extender-test-suite.patch: New file. * gnu/local.mk (dist_patch_DATA): Register the new file. --- gnu/local.mk | 1 + gnu/packages/crypto.scm | 45 ++++++++++++++++++++++ .../patches/hash-extender-test-suite.patch | 13 +++++++ 3 files changed, 59 insertions(+) create mode 100644 gnu/packages/patches/hash-extender-test-suite.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index f2f096c51c..1c4a0b4231 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1005,6 +1005,7 @@ dist_patch_DATA = \ %D%/packages/patches/gtksourceview-2-add-default-directory.patch \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \ %D%/packages/patches/gzdoom-find-system-libgme.patch \ + %D%/packages/patches/hash-extender-test-suite.patch \ %D%/packages/patches/haskell-mode-unused-variables.patch \ %D%/packages/patches/haskell-mode-make-check.patch \ %D%/packages/patches/hdf4-architectures.patch \ diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index b808211b2d..afe85ae497 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019 Tanguy Le Carrour +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -1072,3 +1073,47 @@ (define-public libolm API.") (home-page "https://matrix.org/docs/projects/other/olm/") (license license:asl2.0))) + +(define-public hash-extender + (let ((commit "9ecef26809a1ceea2a455f6f591b004298df551b") + (revision "1")) + (package + (name "hash-extender") + (version (git-version "0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/iagox86/hash_extender") + (commit commit))) + (sha256 + (base32 + "0fqy3d559zgf71w39py0931d8na0ylils45r8zs6r79wgr6qn78c")) + (file-name (git-file-name name version)) + (patches + (search-patches "hash-extender-test-suite.patch")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'check + (lambda _ + (invoke "./hash_extender_test"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((outdir (assoc-ref outputs "out")) + (bindir (string-append outdir "/bin")) + (docdir (string-append outdir + "/share/doc/hash-extender-" + ,version))) + (install-file "hash_extender" bindir) + (install-file "README.md" docdir) + #t)))))) + (inputs + `(("openssl" ,openssl))) + (synopsis "Tool for hash length extension attacks") + (description "@command{hash_extender} is a utility for performing hash +length extension attacks supporting MD4, MD5, RIPEMD-160, SHA-0, SHA-1, +SHA-256, SHA-512, and WHIRLPOOL hashes.") + (home-page "https://github.com/iagox86/hash_extender") + (license license:bsd-3)))) diff --git a/gnu/packages/patches/hash-extender-test-suite.patch b/gnu/packages/patches/hash-extender-test-suite.patch new file mode 100644 index 0000000000..59de52dad4 --- /dev/null +++ b/gnu/packages/patches/hash-extender-test-suite.patch @@ -0,0 +1,13 @@ +Make the test suite exit with a non-zero exit code if some tests failed. +Pull request pending upstream: https://github.com/iagox86/hash_extender/pull/13 +--- a/test.c ++++ b/test.c +@@ -79,5 +79,9 @@ void test_report(void) + printf("TESTS PASSED: %d / %d [%2.4f%%]\n", tests_passed, tests_run, 100 * (float)tests_passed / tests_run); + printf("--------------------------------------------------------------------------------\n"); + } ++ ++ if (tests_passed != tests_run) { ++ exit(1); ++ } + } -- cgit v1.2.3 From 1163dacd4b4d9d274be5e8393072323435e9236a Mon Sep 17 00:00:00 2001 From: Naga Malleswari Date: Thu, 19 Mar 2020 13:29:05 +0530 Subject: gnu: Add r-crochet. * gnu/packages/cran.scm (r-crochet): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2ef1b931a8..a001e135e6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20802,3 +20802,24 @@ (define-public r-hrbrthemes scales and utilities, including a spell check function for plot label fields and an overall emphasis on typography.") (license license:expat))) + +(define-public r-crochet + (package + (name "r-crochet") + (version "2.2.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "crochet" version)) + (sha256 + (base32 + "1cbv79nyycxk6f8ldcsnn2pvgxqlnrj0qs19nhafnq2clxy863k6")))) + (build-system r-build-system) + (home-page "https://github.com/agrueneberg/crochet") + (synopsis "Implementation Helper for Matrix-Like Types") + (description + "Functions to help implement the extraction / subsetting / indexing +function @code{[} and replacement function @code{[<-} of custom matrix-like +types (based on S3, S4, etc.), modeled as closely to the base matrix class +as possible (with tests to prove it).") + (license license:expat))) -- cgit v1.2.3 From ba2a1436d8fd8bedb596d792a65517facd2815cc Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 19 Mar 2020 23:52:50 +0100 Subject: gnu: Add r-boa. * gnu/packages/cran.scm (r-boa): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a001e135e6..e022651616 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20823,3 +20823,24 @@ (define-public r-crochet types (based on S3, S4, etc.), modeled as closely to the base matrix class as possible (with tests to prove it).") (license license:expat))) + +(define-public r-boa + (package + (name "r-boa") + (version "1.1.8-2") + (source + (origin + (method url-fetch) + (uri (cran-uri "boa" version)) + (sha256 + (base32 + "04lhqk5qfvaz1jk90glr2yi5vq7cdy0w8m6g2lnzk359l9y41zhp")))) + (properties `((upstream-name . "boa"))) + (build-system r-build-system) + (home-page "http://www.jstatsoft.org/v21/i11") + (synopsis "Library for @dfn{Bayesian Output Analysis Program} (BOA) for MCMC") + (description + "This package provides a menu-driven program and library of functions for +carrying out convergence diagnostics and statistical and graphical analysis of +@dfn{Markov chain Monte Carlo} (MCMC) sampling output.") + (license license:gpl2+))) -- cgit v1.2.3 From 2eb39cd26c58b6ccca38ea9f7514207fe04eb1fd Mon Sep 17 00:00:00 2001 From: Vitaliy Shatrov Date: Sat, 21 Mar 2020 15:03:01 +0100 Subject: gnu: coreutils: Improve description. * gnu/packages/base.scm (coreutils): Improve description and state that there is no shell included. Signed-off-by: Mathieu Othacehe --- gnu/packages/base.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index e8150708c0..a49ea25196 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Ricardo Wurmus +;;; Copyright © 2020 Vitaliy Shatrov ;;; ;;; This file is part of GNU Guix. ;;; @@ -353,10 +354,11 @@ (define-public coreutils #t))))) (synopsis "Core GNU utilities (file, text, shell)") (description - "GNU Coreutils includes all of the basic command-line tools that are -expected in a POSIX system. These provide the basic file, shell and text -manipulation functions of the GNU system. Most of these tools offer extended -functionality beyond that which is outlined in the POSIX standard.") + "GNU Coreutils package includes all of the basic command-line tools that +are expected in a POSIX system, excluding shell. This package is the union of +the GNU fileutils, sh-utils, and textutils packages. Most of these tools +offer extended functionality beyond that which is outlined in the POSIX +standard.") (license gpl3+) (home-page "https://www.gnu.org/software/coreutils/"))) -- cgit v1.2.3 From 93a267b7a40a762a66fa5149336f2c5545cbed30 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sat, 21 Mar 2020 13:08:25 +0100 Subject: gnu: blktrace: Update to db4f634. * gnu/packages/linux.scm (blktrace): Update to db4f634. [revision]: Increment variable. [patches]: Remove variable. * gnu/packages/patches/blktrace-use-rmtree.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Mathieu Othacehe --- gnu/local.mk | 1 - gnu/packages/linux.scm | 9 ++++---- gnu/packages/patches/blktrace-use-rmtree.patch | 32 -------------------------- 3 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 gnu/packages/patches/blktrace-use-rmtree.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 1c4a0b4231..e391903473 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -768,7 +768,6 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ - %D%/packages/patches/blktrace-use-rmtree.patch \ %D%/packages/patches/bluez-CVE-2020-0556.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 12da3c8f63..a1973c1e60 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4014,8 +4014,8 @@ (define-public libaio (define-public blktrace ;; Take a newer commit to get the fix for CVE-2018-10689. - (let ((commit "f4f8ef7cdea138cfaa2f3ca0ee31fa23d3bcf1cc") - (revision "0")) + (let ((commit "db4f6340e04716285ea56fe26d76381c3adabe58") + (revision "1")) (package (name "blktrace") (version (git-version "1.2.0" revision commit)) @@ -4027,9 +4027,8 @@ (define-public blktrace (url home-page) (commit commit))) (sha256 - (base32 "1ihdfimg7mfcgdm6l09xfqx5kdyv42x743dxp3z3w65q5vd7xy89")) - (file-name (git-file-name name version)) - (patches (search-patches "blktrace-use-rmtree.patch")))) + (base32 "0ah7xn4qnx09k6bm39p69av7d0c8cl6863drv6a1nf914sq1kpgp")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments '(#:make-flags diff --git a/gnu/packages/patches/blktrace-use-rmtree.patch b/gnu/packages/patches/blktrace-use-rmtree.patch deleted file mode 100644 index bb0a10da72..0000000000 --- a/gnu/packages/patches/blktrace-use-rmtree.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6d1ce4a3a1a561644695a50c00cbd28494728061 Mon Sep 17 00:00:00 2001 -From: Vincent Legoll -Date: Mon, 16 Mar 2020 11:43:19 +0100 -Subject: [PATCH 02/10] bno_plot.py: Use shutil.rmtree() instead of - os.system('/bin/rm') - ---- - btt/bno_plot.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/btt/bno_plot.py b/btt/bno_plot.py -index f05cfdc..36fc524 100644 ---- a/btt/bno_plot.py -+++ b/btt/bno_plot.py -@@ -40,7 +40,7 @@ To exit the plotter, enter 'quit' or ^D at the 'gnuplot> ' prompt. - - from __future__ import absolute_import - from __future__ import print_function --import getopt, glob, os, sys, tempfile -+import getopt, glob, os, sys, tempfile, shutil - - verbose = 0 - cmds = """ -@@ -125,4 +125,4 @@ if __name__ == '__main__': - sys.exit(1) - - os.waitpid(pid, 0) -- os.system('/bin/rm -rf ' + tmpdir) -+ shutil.rmtree(tmpdir) --- -2.20.1 - -- cgit v1.2.3 From 6a65ec0945ef5a39073ffe06f51cbacd641883aa Mon Sep 17 00:00:00 2001 From: 6033fe7de85d <6033fe7de85d@airmail.cc> Date: Wed, 18 Mar 2020 18:56:33 +0100 Subject: gnu: Add emacs-objed. *gnu/packages/emacs-xyz.scm (emacs-objed): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 62217e37f5..1ea3155807 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -64,6 +64,7 @@ ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 6033fe7de85d <6033fe7de85d@airmail.cc> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21711,3 +21712,25 @@ (define-public emacs-ddskk "Daredevil SKK is a version of @acronym{SKK, Simple Kana to Kanji conversion program}, a Japanese input method on Emacs.") (license license:gpl2+)))) + +(define-public emacs-objed + (package + (name "emacs-objed") + (version "0.8.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://elpa.gnu.org/packages/objed-" version ".tar")) + (sha256 + (base32 + "1s38d6bvggdk5p45ww1jb4gxifzgjwgw1m6ar920nlg0j4fgbcvr")))) + (build-system emacs-build-system) + (home-page "https://github.com/clemera/objed") + (synopsis "Navigate and edit text objects") + (description + "@code{emacs-objed} allows to navigate and edit text objects. It +enables modal editing and composition of commands, too. It combines ideas of +other Editors like Vim or Kakoune and tries to align them with regular Emacs +conventions.") + (license license:gpl3+))) -- cgit v1.2.3 From 7e0f9df9020b184e4f9ceddf953c4b985bda433b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 16:19:01 +0100 Subject: gnu: gnupg: Update to 2.2.20 [security fix]. * gnu/packages/gnupg.scm (gnupg): Update to 2.2.20. --- gnu/packages/gnupg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 9075978719..c15cabc032 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016 Troy Sankey ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Petter -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Marius Bakke ;;; Copyright © 2018 Björn Höfling ;;; @@ -247,14 +247,14 @@ (define-public npth (define-public gnupg (package (name "gnupg") - (version "2.2.19") + (version "2.2.20") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "1h6yx6sdpz3lf9gdppgxqcf73baynr8gflmh43286fkgw3058994")))) + "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From c6be7eeddf3a98ab354826f8b33d402e0548a3e0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:33:58 +0100 Subject: gnu: opencl-clhpp: Use HTTPS home page. * gnu/packages/opencl.scm (opencl-clhpp)[home-page]: Use HTTPS. --- gnu/packages/opencl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index 32eb360e04..f14d5df130 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -130,7 +130,7 @@ (define-public opencl-clhpp ;; The regression tests require a lot more dependencies. #:tests? #f)) (build-system cmake-build-system) - (home-page "http://github.khronos.org/OpenCL-CLHPP/") + (home-page "https://github.khronos.org/OpenCL-CLHPP/") (synopsis "Khronos OpenCL-CLHPP") (description "This package provides the @dfn{host API} C++ headers for OpenCL.") -- cgit v1.2.3 From 35739712092d6ac7b30c2b7162da4d048731c6b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:13:19 +0100 Subject: gnu: ruby-rspec: Use HTTPS home page. * gnu/packages/ruby.scm (ruby-rspec)[home-page]: Use HTTPS. --- gnu/packages/ruby.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1511f961dc..e988953628 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -719,7 +719,7 @@ (define-public ruby-rspec (description "RSpec is a behavior-driven development (BDD) framework for Ruby. This meta-package includes the RSpec test runner, along with the expectations and mocks frameworks.") - (home-page "http://rspec.info/") + (home-page "https://rspec.info/") (license license:expat))) (define-public ruby-rspec-2 -- cgit v1.2.3 From e2b70d90ca741eb7eca4371f19f930cc12cdeb58 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:03:43 +0100 Subject: gnu: ruby-sequel: Use HTTPS home page. * gnu/packages/ruby.scm (ruby-sequel)[home-page]: Use HTTPS. --- gnu/packages/ruby.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e988953628..a31f177349 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7138,7 +7138,7 @@ (define-public ruby-sequel concise DSL for constructing SQL queries and table schemas. It includes a comprehensive ORM layer for mapping records to Ruby objects and handling associated records.") - (home-page "http://sequel.jeremyevans.net") + (home-page "https://sequel.jeremyevans.net") (license license:expat))) (define-public ruby-timecop -- cgit v1.2.3 From 05fe0f5648a75fbf71f3de596512791bc6b83b89 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:12:00 +0100 Subject: gnu: ogre: Use HTTPS home page. * gnu/packages/graphics.scm (ogre)[home-page]: Use HTTPS. --- gnu/packages/graphics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 2d50a5f539..f4bb62857c 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -326,7 +326,7 @@ (define-public ogre flexible 3D engine written in C++ designed to make it easier and more intuitive for developers to produce applications utilising hardware-accelerated 3D graphics.") - (home-page "http://www.ogre3d.org/") + (home-page "https://www.ogre3d.org/") (license license:expat))) (define-public openexr -- cgit v1.2.3 From de94865859eaca2dd2b8997e4ca11f26b0d78354 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:35:05 +0100 Subject: gnu: git-test-sequence: Use HTTPS home page. * gnu/packages/version-control.scm (git-test-sequence)[home-page]: Use HTTPS. --- gnu/packages/version-control.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d25df4c63d..5049d45f1c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1256,7 +1256,7 @@ (define-public git-test-sequence (install-file (string-append source "/" script) bindir) #t)))) - (home-page "http://dustin.sallings.org/2010/03/28/git-test-sequence.html") + (home-page "https://dustin.sallings.org/2010/03/28/git-test-sequence.html") (synopsis "Run a command over a sequence of commits") (description "git-test-sequence is similar to an automated git bisect except it’s -- cgit v1.2.3 From aa033c8e493ff4a6868fcf2f3acd424b636b4e6f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:00:24 +0100 Subject: gnu: lua5.2-expat: Use HTTPS home page. * gnu/packages/lua.scm (lua5.2-expat)[home-page]: Use HTTPS. --- gnu/packages/lua.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 45e08e066a..181ce76559 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -182,7 +182,7 @@ (define (make-lua-expat name lua) (inputs `(("lua" ,lua) ("expat" ,expat))) - (home-page "http://matthewwild.co.uk/projects/luaexpat/") + (home-page "https://matthewwild.co.uk/projects/luaexpat/") (synopsis "SAX XML parser based on the Expat library") (description "LuaExpat is a SAX XML parser based on the Expat library.") (license (package-license lua-5.1)))) -- cgit v1.2.3 From de1d778ef50304e00d8c339b6be6be66f860d7e9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:43:31 +0100 Subject: gnu: go-gopkg.in-mgo.v2: Use HTTPS home page. * gnu/packages/databases.scm (go-gopkg.in-mgo.v2)[home-page]: Use HTTPS. --- gnu/packages/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index a347467ad1..0ac15c8312 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -217,7 +217,7 @@ (define-public go-gopkg.in-mgo.v2 "@code{mgo} (pronounced as mango) is a MongoDB driver for the Go language. It implements a rich selection of features under a simple API following standard Go idioms.") - (home-page "http://labix.org/mgo") + (home-page "https://labix.org/mgo") (license license:bsd-2))) (define-public ephemeralpg -- cgit v1.2.3 From c28a8855f1ab2a07680cd1639b4636033815dd7a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 09:56:05 +0100 Subject: gnu: python-gast: Update to 0.3.3. * gnu/packages/python-xyz.scm (python-gast): Update to 0.3.3. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d0da9b36c3..973acce822 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17047,13 +17047,13 @@ (define-public python-astunparse (define-public python-gast (package (name "python-gast") - (version "0.2.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (pypi-uri "gast" version)) (sha256 - (base32 "1w5dzdb3gpcfmd2s0b93d8gff40a1s41rv31458z14inb3s9v4zy")))) + (base32 "0mrvvfzqafj1wzd0xxfmjf4vphnlxypbhpic1m283aj9i8lfz0dq")))) (build-system python-build-system) (propagated-inputs `(("python-astunparse" ,python-astunparse))) -- cgit v1.2.3 From 447fafe3d7ca1cad0f3dd91da8410c9b9d1ecd5a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 12:33:15 +0100 Subject: gnu: gRPC: Update to 1.27.3. * gnu/packages/rpc.scm (grpc): Update to 1.27.3. [arguments]: Add "-DgRPC_ABSL_PROVIDER=package" in #:configure-flags. [inputs]: Add ABSEIL-CPP. (grpc-1.16.1): New public variable. * gnu/packages/hyperledger.scm (hyperledger-iroha)[inputs]: Change from GRPC to GRPC-1.16. * gnu/packages/machine-learning.scm (tensorflow)[native-inputs, inputs]: Likewise. --- gnu/packages/hyperledger.scm | 2 +- gnu/packages/machine-learning.scm | 4 ++-- gnu/packages/rpc.scm | 25 ++++++++++++++++++++++--- 3 files changed, 25 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/hyperledger.scm b/gnu/packages/hyperledger.scm index 1aed8e23d8..86eb86d3b5 100644 --- a/gnu/packages/hyperledger.scm +++ b/gnu/packages/hyperledger.scm @@ -190,7 +190,7 @@ (define-public hyperledger-iroha (inputs `(("boost" ,boost-1.69) ("gflags" ,gflags) - ("grpc" ,grpc) + ("grpc" ,grpc-1.16.1) ("hyperledger-iroha-ed25519" ,hyperledger-iroha-ed25519) ("postgresql" ,postgresql) ("protobuf" ,protobuf) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index faf4bacfe3..8ff68123d1 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1708,7 +1708,7 @@ (define-public tensorflow (sha256 (base32 "161g9841rjfsy5pn52fcis0s9hdr7rxvb06pad38j5rppfihvign"))))) - ("grpc" ,grpc "static") + ("grpc" ,grpc-1.16.1 "static") ("googletest" ,googletest) ("swig" ,swig) ("unzip" ,unzip))) @@ -1730,7 +1730,7 @@ (define-public tensorflow ("libjpeg" ,libjpeg) ("libpng" ,libpng) ("giflib" ,giflib) - ("grpc:bin" ,grpc) + ("grpc:bin" ,grpc-1.16.1) ("jsoncpp" ,jsoncpp-for-tensorflow) ("snappy" ,snappy) ("sqlite" ,sqlite) diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm index 991dc89324..3691440590 100644 --- a/gnu/packages/rpc.scm +++ b/gnu/packages/rpc.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ (define-module (gnu packages rpc) #:use-module (guix build-system python) #:use-module (gnu packages adns) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -34,7 +36,7 @@ (define-module (gnu packages rpc) (define-public grpc (package (name "grpc") - (version "1.16.1") + (version "1.27.3") (outputs '("out" "static")) (source (origin (method git-fetch) @@ -44,12 +46,13 @@ (define-public grpc (file-name (git-file-name name version)) (sha256 (base32 - "1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2")))) + "0czmbwnafc7jnrrq2fnac2av83vs2q7q0wy4k11w9zbpld7j5h6d")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no test target #:configure-flags (list "-DgRPC_ZLIB_PROVIDER=package" + "-DgRPC_ABSL_PROVIDER=package" "-DgRPC_CARES_PROVIDER=package" "-DgRPC_SSL_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package" @@ -89,7 +92,8 @@ (define-public grpc (find-files "." "\\.a$")))) #t))))) (inputs - `(("c-ares" ,c-ares/cmake) + `(("abseil-cpp" ,abseil-cpp) + ("c-ares" ,c-ares/cmake) ("openssl" ,openssl) ("zlib" ,zlib))) (native-inputs @@ -105,6 +109,21 @@ (define-public grpc browsers to backend services.") (license license:asl2.0))) +;; Some packages require this older version. +(define-public grpc-1.16.1 + (package + (inherit grpc) + (version "1.16.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/grpc/grpc.git") + (commit (string-append "v" version)))) + (file-name (git-file-name "grpc" version)) + (sha256 + (base32 + "1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2")))))) + (define-public python-grpcio (package (name "python-grpcio") -- cgit v1.2.3 From 80a8583a6b4417a771086e9efeeb6fa3effb27bd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 15:19:03 +0100 Subject: gnu: TensorFlow: Correct gRPC input. * gnu/packages/machine-learning.scm (tensorflow)[native-inputs]: Move GRPC:STATIC ... [inputs]: ... here. --- gnu/packages/machine-learning.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 8ff68123d1..2f82ed565c 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1708,7 +1708,6 @@ (define-public tensorflow (sha256 (base32 "161g9841rjfsy5pn52fcis0s9hdr7rxvb06pad38j5rppfihvign"))))) - ("grpc" ,grpc-1.16.1 "static") ("googletest" ,googletest) ("swig" ,swig) ("unzip" ,unzip))) @@ -1730,6 +1729,7 @@ (define-public tensorflow ("libjpeg" ,libjpeg) ("libpng" ,libpng) ("giflib" ,giflib) + ("grpc" ,grpc-1.16.1 "static") ("grpc:bin" ,grpc-1.16.1) ("jsoncpp" ,jsoncpp-for-tensorflow) ("snappy" ,snappy) -- cgit v1.2.3 From 9dec91229b428a8b6c81354fa7cc68df17dcb724 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 12:46:13 +0100 Subject: gnu: python-grpcio: Update to 1.27.2. * gnu/packages/rpc.scm (python-grpcio): Update to 1.27.2. [source](modules, snippet): New fields. [arguments]: Add phases to use system libraries and the correct compiler. [inputs]: Add C-ARES, OPENSSL, and ZLIB. --- gnu/packages/rpc.scm | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm index 3691440590..e73695b613 100644 --- a/gnu/packages/rpc.scm +++ b/gnu/packages/rpc.scm @@ -127,15 +127,47 @@ (define-public grpc-1.16.1 (define-public python-grpcio (package (name "python-grpcio") - (version "1.17.1") + (version "1.27.2") (source (origin (method url-fetch) (uri (pypi-uri "grpcio" version)) (sha256 (base32 - "0qb9y6j83nxa6d4kc60i8yfgdm7a8ms7b54kncjzf5y7nsxp8rzx")))) + "0zl89jwcff9hkd8mi4yf3qbhns9vbv1s4x4vahm5mkpr7jwk5ras")) + (modules '((guix build utils) (ice-9 ftw))) + (snippet + '(begin + (with-directory-excursion "third_party" + ;; Delete the bundled source code of libraries that are possible + ;; to provide as inputs. + (for-each delete-file-recursively + (scandir "." + (lambda (file) + (not (member file + '("." ".." + "abseil-cpp" + "address_sorting" + "upb"))))))) + #t)))) (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-before 'build 'use-system-libraries + (lambda _ + (setenv "GRPC_PYTHON_BUILD_SYSTEM_CARES" "1") + (setenv "GRPC_PYTHON_BUILD_SYSTEM_OPENSSL" "1") + (setenv "GRPC_PYTHON_BUILD_SYSTEM_ZLIB" "1") + #t)) + (add-before 'build 'configure-compiler + (lambda _ + (substitute* '("setup.py" "src/python/grpcio/commands.py") + (("'cc'") "'gcc'")) + #t))))) + (inputs + `(("c-ares" ,c-ares) + ("openssl" ,openssl) + ("zlib" ,zlib))) (propagated-inputs `(("python-six" ,python-six))) (home-page "https://grpc.io") -- cgit v1.2.3 From f142c0775a3ee2d9bf629c8f8a4513d4b8b051a1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 15:13:28 +0100 Subject: gnu: GRUB: Build with the latest version of Flex. * gnu/packages/bootloaders.scm (grub)[native-inputs]: Change from FLEX-2.6.1 to FLEX. --- gnu/packages/bootloaders.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 770647935a..b8d68b3c89 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -173,10 +173,7 @@ (define-public grub `(("pkg-config" ,pkg-config) ("unifont" ,unifont) ("bison" ,bison) - ;; Due to a bug in flex >= 2.6.2, GRUB must be built with an older flex: - ;; - ;; TODO Try building with flex > 2.6.4. - ("flex" ,flex-2.6.1) + ("flex" ,flex) ("texinfo" ,texinfo) ("help2man" ,help2man) -- cgit v1.2.3 From a67c4ff369c103baa8574f1ffd1e66f969a7b330 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 15:14:08 +0100 Subject: gnu: GRUB: Use the latest version of QEMU for tests. * gnu/packages/bootloaders.scm (grub)[native-inputs]: Change from QEMU-MINIMAL-2.10 to QEMU-MINIMAL. --- gnu/packages/bootloaders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b8d68b3c89..cadcc937e1 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -196,7 +196,7 @@ (define-public grub ;; Dependencies for the test suite. The "real" QEMU is needed here, ;; because several targets are used. ("parted" ,parted) - ("qemu" ,qemu-minimal-2.10) + ("qemu" ,qemu-minimal) ("xorriso" ,xorriso))) (home-page "https://www.gnu.org/software/grub/") (synopsis "GRand Unified Boot loader") -- cgit v1.2.3 From ee38d87c58aaf8f8c1b7599a598a56b94f09f711 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 20:15:48 +0100 Subject: gnu: Remove flex@2.6.1. * gnu/packages/flex.scm (flex-2.6.1): Remove variable. --- gnu/packages/flex.scm | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index f9a21204d9..9e52f3bb38 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -74,16 +74,3 @@ (define-public flex executes the corresponding C code.") (license (non-copyleft "file://COPYING" "See COPYING in the distribution.")))) - -(define-public flex-2.6.1 - (package - (inherit flex) - (version "2.6.1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/westes/flex" - "/releases/download/v" version "/" - "flex-" version ".tar.xz")) - (sha256 - (base32 - "0gqhk4vkwy4gl9xbpgkljph8c0a5kpijz6wd0p5r9q202qn42yic")))))) -- cgit v1.2.3 From 559f37328851fc1ae1d90f27fab7beff3d804421 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 20:16:34 +0100 Subject: gnu: Remove qemu-minimal@2.10. * gnu/packages/virtualization.scm (qemu-minimal-2.10): Remove variable. --- gnu/packages/virtualization.scm | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 03f0ceaeee..b7e2c415fe 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -284,34 +284,6 @@ (define-public qemu-minimal '("libusb" "mesa" "sdl2" "spice" "virglrenderer" "gtk+" "usbredir" "libdrm" "libepoxy" "pulseaudio" "vde2"))))) -;; The GRUB test suite fails with later versions of Qemu, so we -;; keep it at 2.10 for now. See -;; . -;; This package is hidden since we do not backport updates to it. -(define-public qemu-minimal-2.10 - (hidden-package - (package - (inherit qemu-minimal) - (version "2.10.2") - (source (origin - (method url-fetch) - (uri (string-append "https://download.qemu.org/qemu-" - version ".tar.xz")) - (sha256 - (base32 - "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw")) - (patches - (search-patches "qemu-glibc-2.27.patch")))) - ;; qemu-minimal-2.10 needs Python 2. Remove below once no longer necessary. - (native-inputs `(("python-2" ,python-2) - ,@(fold alist-delete (package-native-inputs qemu-minimal) - '("python-wrapper" "python-sphinx")))) - (inputs - (fold alist-delete (package-inputs qemu-minimal) - ;; Disable seccomp support, because it's not required for the GRUB - ;; test suite, and because it fails with libseccomp 2.4.2 and later. - '("libseccomp")))))) - (define-public libosinfo (package (name "libosinfo") -- cgit v1.2.3 From 0cec5c4eb1b4ac9a3fbe3f11cffff92e01ff4c58 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Sat, 21 Mar 2020 09:10:57 +0200 Subject: gnu: ghc-extra: Downgrade to 1.6.21. * gnu/packages/haskell-xyz.scm (ghc-extra): Downgrade to 1.6.21. Signed-off-by: Marius Bakke --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 01fecae850..261bc57305 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3774,7 +3774,7 @@ (define-public ghc-extensible-exceptions (define-public ghc-extra (package (name "ghc-extra") - (version "1.7.1") + (version "1.6.21") (source (origin (method url-fetch) @@ -3784,7 +3784,7 @@ (define-public ghc-extra ".tar.gz")) (sha256 (base32 - "0zshxv9dnd8vksncmb8dj4wvq2wdybzwxyhmy2zp6a81icm4azx4")))) + "1gjx98w4w61g043k6rzc8i34cbxpcigi8lb6i7pp1vwp8w8jm5vl")))) (build-system haskell-build-system) (inputs `(("ghc-clock" ,ghc-clock) -- cgit v1.2.3 From e7c7912573111d5e86f3e3012a6edab948f7b302 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Fri, 20 Mar 2020 19:34:51 +0000 Subject: gnu: Add gnome-shell-extension-topicons-redux. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-topicons-redux): New variable. Signed-off-by: Marius Bakke --- gnu/packages/gnome-xyz.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index aeeced42bd..d9d757e614 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2020 Alex Griffin ;;; Copyright © 2020 Jack Hill +;;; Copyright © 2020 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. ;;; @@ -146,6 +147,47 @@ (define-public gnome-shell-extension-appindicator (home-page "https://github.com/ubuntu/gnome-shell-extension-appindicator/") (license license:gpl2+))) +(define-public gnome-shell-extension-topicons-redux + (package + (name "gnome-shell-extension-topicons-redux") + (version "6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/pop-planet/TopIcons-Redux.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dli9xb545n3xlj6q4wl0y5gzkm903zs47p8fiq71pdvbr6v38rj")))) + (build-system gnu-build-system) + (native-inputs + `(("glib" ,glib "bin"))) + (arguments + `(#:tests? #f ;no test defined in the project + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "make" + "install" + (string-append + "INSTALL_PATH=" + out + "/share/gnome-shell/extensions")))))))) + (home-page "https://gitlab.com/pop-planet/TopIcons-Redux") + (synopsis "Display legacy tray icons in the GNOME Shell top panel") + (description "Many applications, such as chat clients, downloaders, and +some media players, are meant to run long-term in the background even after you +close their window. These applications remain accessible by adding an icon to +the GNOME Shell Legacy Tray. However, the Legacy Tray was removed in GNOME +3.26. TopIcons Redux brings those icons back into the top panel so that it's +easier to keep track of apps running in the backround.") + (license license:gpl2+))) + (define-public gnome-shell-extension-dash-to-dock (package (name "gnome-shell-extension-dash-to-dock") -- cgit v1.2.3 From 3d2d9cc7b54fde24bcc86888f238faf32146c8b3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:50:22 +0100 Subject: gnu: python-kivy: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-kivy)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 973acce822..faa8f60669 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11712,7 +11712,7 @@ (define-public python-kivy ("mesa" ,mesa) ("sdl-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))))) - (home-page "http://kivy.org") + (home-page "https://kivy.org") (synopsis "Multitouch application framework") (description -- cgit v1.2.3 From 012d2950af36c20189e2c6dfae05eaebba6ad14b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:29:14 +0100 Subject: gnu: python-cheetah: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-cheetah)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index faa8f60669..7bb621ac31 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12577,7 +12577,7 @@ (define-public python-cheetah (invoke "python" "Cheetah/Tests/Test.py"))))))) (propagated-inputs `(("python-markdown" ,python-markdown))) ;optional - (home-page "http://cheetahtemplate.org/") + (home-page "https://cheetahtemplate.org/") (synopsis "Template engine") (description "Cheetah is a text-based template engine and Python code generator. -- cgit v1.2.3 From 8c9b6f3299d8f1219286cb835ad187c418e69585 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:22:11 +0100 Subject: gnu: python2-element-tree: Use HTTPS home page. * gnu/packages/python-xyz.scm (python2-element-tree)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7bb621ac31..f08698532b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1600,7 +1600,7 @@ (define-public python2-element-tree (synopsis "Toolkit for XML processing in Python") (description "ElementTree is a Python library supporting lightweight XML processing.") - (home-page "http://effbot.org/zone/element-index.htm") + (home-page "https://effbot.org/zone/element-index.htm") (license (license:x11-style "http://docs.python.org/2/license.html" "Like \"CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\".")))) -- cgit v1.2.3 From 26be188f35e93868dac4b899dd128c553a74558b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:57:00 +0100 Subject: gnu: python2-pyro: Use HTTPS home page. * gnu/packages/python-xyz.scm (python2-pyro)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f08698532b..58e77900a5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15135,7 +15135,7 @@ (define-public python2-pyro `(#:python ,python-2 ;; Pyro has no test cases for automatic execution #:tests? #f)) - (home-page "http://pythonhosted.org/Pyro/") + (home-page "https://pythonhosted.org/Pyro/") (synopsis "Distributed object manager for Python") (description "Pyro is a Distributed Object Technology system written in Python that is designed to be easy to use. It resembles -- cgit v1.2.3 From e51b34bb9062f530f9850ceed5eae72a38896869 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:21:20 +0100 Subject: gnu: python-scikit-learn: Use HTTPS home page. * gnu/packages/machine-learning.scm (python-scikit-learn)[home-page]: Use HTTPS. --- gnu/packages/machine-learning.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 2f82ed565c..beb13a81bf 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -842,7 +842,7 @@ (define-public python-scikit-learn (propagated-inputs `(("python-numpy" ,python-numpy) ("python-scipy" ,python-scipy))) - (home-page "http://scikit-learn.org/") + (home-page "https://scikit-learn.org/") (synopsis "Machine Learning in Python") (description "Scikit-learn provides simple and efficient tools for data mining and -- cgit v1.2.3 From 20c604c54e122d09880c75568d48fae58cbb8785 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:07:12 +0100 Subject: gnu: python-scrypt: Use HTTPS home page. * gnu/packages/python-crypto.scm (python-scrypt)[home-page]: Use HTTPS. --- gnu/packages/python-crypto.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 23c06267a7..1286693fc2 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1043,7 +1043,7 @@ (define-public python-scrypt (build-system python-build-system) (inputs `(("openssl" ,openssl))) - (home-page "http://bitbucket.org/mhallin/py-scrypt") + (home-page "https://bitbucket.org/mhallin/py-scrypt") (synopsis "Bindings for the scrypt key derivation function library") (description "This is a set of Python bindings for the scrypt key derivation function.") -- cgit v1.2.3 From 02d1fd03ad476c1f37a2a4b8ff55426ed25059f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:01:24 +0100 Subject: gnu: python-future: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-future)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 58e77900a5..9361d6664a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10345,7 +10345,7 @@ (define-public python-future ;; https://github.com/PythonCharmers/python-future/issues/210 (arguments `(#:tests? #f)) - (home-page "http://python-future.org") + (home-page "https://python-future.org") (synopsis "Single-source support for Python 3 and 2") (description "@code{python-future} is the missing compatibility layer between Python 2 and -- cgit v1.2.3 From d7ee58ccd22ffe6f4ccf78a9fcf4f9e3612b131c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:59:12 +0100 Subject: gnu: python-tables: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-tables)[home-page]: Use HTTPS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9361d6664a..c47dac8245 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7686,7 +7686,7 @@ (define-public python-tables `(("hdf5" ,hdf5-1.10) ("bzip2" ,bzip2) ("zlib" ,zlib))) - (home-page "http://www.pytables.org/") + (home-page "https://www.pytables.org/") (synopsis "Hierarchical datasets for Python") (description "PyTables is a package for managing hierarchical datasets and designed to efficiently cope with extremely large amounts of data.") -- cgit v1.2.3 From b1ebda07cb475c18d7812cf846141ac50a8fa5f1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:45:44 +0100 Subject: gnu: python-pygraphviz: Use HTTPS home page. * gnu/packages/graphviz.scm (python-pygraphviz)[home-page]: Use HTTPS. --- gnu/packages/graphviz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 06216418fe..2d2bb11130 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -228,7 +228,7 @@ (define-public python-pygraphviz `(("python-nose" ,python-nose) ("python-mock" ,python-mock) ("python-doctest-ignore-unicode" ,python-doctest-ignore-unicode))) - (home-page "http://pygraphviz.github.io") + (home-page "https://pygraphviz.github.io") (synopsis "Python interface to Graphviz") (description "PyGraphviz is a Python interface to the Graphviz graph layout and visualization package. With PyGraphviz you can create, edit, read, -- cgit v1.2.3 From dde3f551568bb7157b61eb8415b0fef94bfe8eb4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 20:41:28 +0100 Subject: gnu: gpgme: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by joshuaBPMan on #guix. * gnu/packages/gnupg.scm (gpgme)[arguments]: Add ‘disable-failing-test’ phase. --- gnu/packages/gnupg.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index c15cabc032..856c01a6d8 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -400,6 +400,15 @@ (define-public gpgme (sha256 (base32 "0imyjfryvvjdbai454p70zcr95m94j9xnzywrlilqdw2fqi0pqy4")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'disable-failing-test + ;; XXX gnupg@2.2.20 breaks the expected JSON response for this test. + (lambda _ + (substitute* "tests/json/t-json.c" + (("\"t-keylist-secret\", ") "")) + #t))))) (native-inputs `(("gnupg" ,gnupg))) (propagated-inputs -- cgit v1.2.3 From 18401bdf69b2540b13db86aed199d1ebc585a844 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 21:24:28 +0100 Subject: Revert "gnu: Remove qemu-minimal@2.10." This package was still in use by american-fuzzy-lop. This reverts commit 559f37328851fc1ae1d90f27fab7beff3d804421. --- gnu/packages/virtualization.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index b7e2c415fe..03f0ceaeee 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -284,6 +284,34 @@ (define-public qemu-minimal '("libusb" "mesa" "sdl2" "spice" "virglrenderer" "gtk+" "usbredir" "libdrm" "libepoxy" "pulseaudio" "vde2"))))) +;; The GRUB test suite fails with later versions of Qemu, so we +;; keep it at 2.10 for now. See +;; . +;; This package is hidden since we do not backport updates to it. +(define-public qemu-minimal-2.10 + (hidden-package + (package + (inherit qemu-minimal) + (version "2.10.2") + (source (origin + (method url-fetch) + (uri (string-append "https://download.qemu.org/qemu-" + version ".tar.xz")) + (sha256 + (base32 + "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw")) + (patches + (search-patches "qemu-glibc-2.27.patch")))) + ;; qemu-minimal-2.10 needs Python 2. Remove below once no longer necessary. + (native-inputs `(("python-2" ,python-2) + ,@(fold alist-delete (package-native-inputs qemu-minimal) + '("python-wrapper" "python-sphinx")))) + (inputs + (fold alist-delete (package-inputs qemu-minimal) + ;; Disable seccomp support, because it's not required for the GRUB + ;; test suite, and because it fails with libseccomp 2.4.2 and later. + '("libseccomp")))))) + (define-public libosinfo (package (name "libosinfo") -- cgit v1.2.3 From 2e59a63b41b5c0a7ee70e45b2e6538cfded2e758 Mon Sep 17 00:00:00 2001 From: wednesday Date: Wed, 24 Apr 2019 16:27:36 +0100 Subject: gnu: global: Add 'python-wrapper' as input. * gnu/packages/code.scm (global)[inputs]: Add 'python-wrapper' to fix tagging python code. --- gnu/packages/code.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index c1eaaf1aab..ff30fbd86f 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -125,7 +125,8 @@ (define-public global ; a global variable (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) ("libltdl" ,libltdl) - ("sqlite" ,sqlite))) + ("sqlite" ,sqlite) + ("python-wrapper" ,python-wrapper))) (arguments `(#:configure-flags (list (string-append "--with-ncurses=" -- cgit v1.2.3 From ae105119812bca8e9f2d74dcf11be95a293c0cc6 Mon Sep 17 00:00:00 2001 From: Wiktor Żelazny Date: Thu, 3 Oct 2019 15:46:37 +0200 Subject: gnu: Add r-httpcode. * gnu/packages/cran.scm (r-httpcode): New variable. Signed-off-by: Marius Bakke --- gnu/packages/cran.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e022651616..1e55606ef9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20844,3 +20844,22 @@ (define-public r-boa carrying out convergence diagnostics and statistical and graphical analysis of @dfn{Markov chain Monte Carlo} (MCMC) sampling output.") (license license:gpl2+))) + +(define-public r-httpcode + (package + (name "r-httpcode") + (version "0.2.0") + (source (origin + (method url-fetch) + (uri (cran-uri "httpcode" version)) + (sha256 + (base32 + "06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv")))) + (build-system r-build-system) + (home-page "https://github.com/sckott/httpcode") + (synopsis "HTTP status code helper") + (description "@code{httpcode} provides functionality for finding and +explaining the meaning of @code{HTTP} status codes. Functions are included for +searching for codes by full or partial number, by message, and to get +appropriate dog and cat images for many status codes.") + (license license:expat))) -- cgit v1.2.3 From 069554dc240078febab777c525a346594d02512e Mon Sep 17 00:00:00 2001 From: Wiktor Żelazny Date: Thu, 3 Oct 2019 15:49:13 +0200 Subject: gnu: Add r-latex2exp. * gnu/packages/cran.scm (r-latex2exp): new variable. Signed-off-by: Marius Bakke --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1e55606ef9..f56c3882c3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20863,3 +20863,24 @@ (define-public r-httpcode searching for codes by full or partial number, by message, and to get appropriate dog and cat images for many status codes.") (license license:expat))) + +(define-public r-latex2exp + (package + (name "r-latex2exp") + (version "0.4.0") + (source (origin + (method url-fetch) + (uri (cran-uri "latex2exp" version)) + (sha256 + (base32 + "12nbcgfmv13k6sc6m326ras9bcvy380b7rxcxphn06r3cfkby0zw")))) + (build-system r-build-system) + (propagated-inputs + `(("r-stringr" ,r-stringr) + ("r-magrittr", r-magrittr))) + (home-page "https://github.com/stefano-meschiari/latex2exp/") + (synopsis "Use LaTeX expressions in plots") + (description "@code{latex2exp} parses and converts LaTeX math formulas to +R's plotmath expressions, used to enter mathematical formulas and symbols to be +rendered as text, axis labels, etc. throughout R's plotting system.") + (license license:expat))) -- cgit v1.2.3 From 3ac12ca61bbe887f2ebc8cfbf9b09a179f30a849 Mon Sep 17 00:00:00 2001 From: Wiktor Żelazny Date: Thu, 3 Oct 2019 15:51:30 +0200 Subject: gnu: Add r-oai. * gnu/packages/cran.scm (r-oai): new variable. Signed-off-by: Marius Bakke --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f56c3882c3..4c2ea9f130 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20884,3 +20884,29 @@ (define-public r-latex2exp R's plotmath expressions, used to enter mathematical formulas and symbols to be rendered as text, axis labels, etc. throughout R's plotting system.") (license license:expat))) + +(define-public r-oai + (package + (name "r-oai") + (version "0.3.0") + (source (origin + (method url-fetch) + (uri (cran-uri "oai" version)) + (sha256 + (base32 + "1ipw9bq3ra66d1ddj1rylyyd20mlcb2i7phzhywra53s1fdifq1g")))) + (build-system r-build-system) + (propagated-inputs + `(("r-xml2" ,r-xml2) + ("r-httr" ,r-httr) + ("r-plyr" ,r-plyr) + ("r-stringr" ,r-stringr) + ("r-tibble" ,r-tibble))) + (home-page "https://github.com/ropensci/oai/") + (synopsis "General purpose OAI-PMH services client") + (description "@code{oai} provides a general purpose client to work with +any @dfn{Open Archives Initiative Protocol for 'Metadata' Harvesting} (OAI-PMH) +service. Functions are provided to work with the OAI-PMH verbs: +@code{GetRecord}, @code{Identify}, @code{ListIdentifiers}, +@code{ListMetadataFormats}, @code{ListRecords}, and @code{ListSets}.") + (license license:expat))) -- cgit v1.2.3 From 156b08bd2fcd7dc66d59f2312ddce3f04a28007c Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 06:29:27 -0800 Subject: gnu: stylish-haskell: Update description. * gnu/packages/haskell-apps.scm (stylish-haskell): Update description. Signed-off-by: Marius Bakke --- gnu/packages/haskell-apps.scm | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index f5b45d0bfb..12cb857cbb 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -754,8 +754,26 @@ (define-public stylish-haskell ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) (home-page "https://github.com/jaspervdj/stylish-haskell") (synopsis "Haskell code prettifier") - (description - "A simple Haskell code prettifier. The goal is not to format all of the -code in a file, just clean up import statements and a few other tedious -items. This tool tries to help where necessary without getting in the way.") + (description "Stylish-haskell is a Haskell code prettifier. The goal is +not to format all of the code in a file, to avoid \"getting in the way\". +However, this tool can e.g. clean up import statements and help doing various +tasks that get tedious very quickly. It can +@itemize +@item +Align and sort @code{import} statements +@item +Group and wrap @code{{-# LANGUAGE #-}} pragmas, remove (some) redundant +pragmas +@item +Remove trailing whitespaces +@item +Align branches in @code{case} and fields in records +@item +Convert line endings (customisable) +@item +Replace tabs by four spaces (turned off by default) +@item +Replace some ASCII sequences by their Unicode equivalent (turned off by +default) +@end itemize") (license license:bsd-3))) -- cgit v1.2.3 From 08c62ac7bdd7c8c90bfa21dfb02008e4c2662e51 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 06:32:00 -0800 Subject: gnu: ghc-stylish-haskell: Deprecate older duplicate package. * gnu/packages/haskell-xyz.scm (ghc-stylish-haskell): Deprecate it. Signed-off-by: Marius Bakke --- gnu/packages/haskell-xyz.scm | 63 +------------------------------------------- 1 file changed, 1 insertion(+), 62 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 261bc57305..0828dc93c6 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11119,68 +11119,7 @@ (define-public ghc-stringsearch (license license:bsd-3))) (define-public ghc-stylish-haskell - (package - (name "ghc-stylish-haskell") - (version "0.9.2.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://hackage/package/stylish-haskell/stylish-haskell-" - version - ".tar.gz")) - (sha256 - (base32 - "1ls11fdx6snvfx8yykpidz142zzxwi5bazl49hgfqlwx50rqcp7w")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "stylish-haskell.cabal" - (("haskell-src-exts >= 1\\.18 && < 1\\.21,") - "haskell-src-exts >= 1.18 && < 1.22,")) - #t))))) - (inputs - `(("ghc-aeson" ,ghc-aeson) - ("ghc-file-embed" ,ghc-file-embed) - ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-syb" ,ghc-syb) - ("ghc-yaml" ,ghc-yaml) - ("ghc-strict" ,ghc-strict) - ("ghc-optparse-applicative" - ,ghc-optparse-applicative))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) - (home-page "https://github.com/jaspervdj/stylish-haskell") - (synopsis "Haskell code prettifier") - (description "Stylish-haskell is a Haskell code prettifier. The goal is -not to format all of the code in a file, to avoid \"getting in the way\". -However, this tool can e.g. clean up import statements and help doing various -tasks that get tedious very quickly. It can -@itemize -@item -Align and sort @code{import} statements -@item -Group and wrap @code{{-# LANGUAGE #-}} pragmas, remove (some) redundant -pragmas -@item -Remove trailing whitespaces -@item -Align branches in @code{case} and fields in records -@item -Convert line endings (customisable) -@item -Replace tabs by four spaces (turned off by default) -@item -Replace some ASCII sequences by their Unicode equivalent (turned off by -default) -@end itemize") - (license license:bsd-3))) + (deprecated-package "ghc-stylish-haskell" stylish-haskell)) (define-public ghc-svg-builder (package -- cgit v1.2.3 From d1b3c6c746e4a574651b2d7d52f87a928da59127 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Mar 2020 16:31:51 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.217. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.217. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a1973c1e60..c0a5445464 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -394,10 +394,10 @@ (define-public linux-libre-4.9-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.216") +(define-public linux-libre-4.4-version "4.4.217") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "1hjgh9brvxzi6ypgfnk07l3j28xsxgz88sdshnz19vj96bn1w70q"))) + (hash (base32 "0vsjchywznmjn01flgvm9vsja5zqni319rfwgy997afcbz0c9spx"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 3e13d780b81d3005e2c7f36ccc75f7c1e2cc00a0 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Mar 2020 16:32:48 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.217. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.217. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c0a5445464..15abba8849 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -386,10 +386,10 @@ (define-public linux-libre-4.14-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.216") +(define-public linux-libre-4.9-version "4.9.217") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0lgv5k8v5xz9z2z4k42566bh0akyk1gr0dx6s1m1rjrzsf9k86l6"))) + (hash (base32 "06b8av9f9pk2yp95nzv4322k0d5wsg40sxd9kfim1xzb093abckg"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From f120eab056537a083b5710cc42d7126755711c52 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Mar 2020 16:33:13 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.174. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.174. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 15abba8849..5929d98558 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -378,10 +378,10 @@ (define-public linux-libre-4.19-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.173") +(define-public linux-libre-4.14-version "4.14.174") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0kxp3mgiags8hdax15masab9zr89xraqvl9ri7zwgksx8ixav0m2"))) + (hash (base32 "12ai2lc2ny38s93d0m5ngrv030vwv1h2hhzp0fs6fhjxasikq8jc"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 0d624f1fd85f329372a9b61a295ee7b36c4cd97d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Mar 2020 16:34:33 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.112. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.112. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5929d98558..3a42c19699 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,10 +370,10 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.111") +(define-public linux-libre-4.19-version "4.19.112") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0cjjf3wbvbkjy4mss8c74afx8ng31i22km66ydh9f9mz182piyy6"))) + (hash (base32 "0yiyqwgh6wcyshpdj98s7dc4ahyx47y6whvnww6sjmzdq0fb3hi4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From ee4c927f33a1d3b01cf36be3c74227f6b7fd69ff Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Mar 2020 16:35:12 -0400 Subject: gnu: linux-libre: Update to 5.4.27. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.27. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3a42c19699..ffc4776f94 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -362,10 +362,10 @@ (define (%upstream-linux-source version hash) "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.26") +(define-public linux-libre-5.4-version "5.4.27") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1bqdiw4pjzwm7pxml2dl09bj85ijs82rq788c58681zgmvs796k6"))) + (hash (base32 "0szc1p9y6z8gs2f1nj45nrz52sxcabg2xh7zqlljazv45lvcvf8r"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3