From 7297ebb28759b57db684be8cb4423e3221571401 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 27 Nov 2019 21:46:14 -0500 Subject: gnu: Blender: Update to 2.81. * gnu/packages/graphics.scm (blender): Update to 2.81. [inputs]: Add libxi, libxrender, and tbb. --- gnu/packages/graphics.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 8795107dcb..3ef420cf05 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -71,6 +71,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages sdl) #:use-module (gnu packages swig) + #:use-module (gnu packages tbb) #:use-module (gnu packages video) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -87,14 +88,14 @@ (define-public blender (package (name "blender") - (version "2.80") + (version "2.81") (source (origin (method url-fetch) (uri (string-append "https://download.blender.org/source/" - "blender-" version ".tar.gz")) + "blender-" version ".tar.xz")) (sha256 (base32 - "1h550jisdbis50hxwk5kxrvrk1a6sh2fsri3yyj66vhzbi87x7fd")))) + "1prp0f2152f1sz23jlc86vndfvmplb7qhllikkirq7hgpykrshna")))) (build-system cmake-build-system) (arguments (let ((python-version (version-major+minor (package-version python)))) @@ -145,6 +146,8 @@ `(("boost" ,boost) ("jemalloc" ,jemalloc) ("libx11" ,libx11) + ("libxi" ,libxi) + ("libxrender" ,libxrender) ("openimageio" ,openimageio) ("openexr" ,openexr) ("opensubdiv" ,opensubdiv) @@ -162,6 +165,7 @@ ("openal" ,openal) ("python" ,python) ("python-numpy" ,python-numpy) + ("tbb" ,tbb) ("zlib" ,zlib))) (home-page "https://blender.org/") (synopsis "3D graphics creation suite") -- cgit v1.2.3 From 37515553b5678c61f59dd0efb2504c0ccc5152f2 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 28 Nov 2019 08:55:20 +0300 Subject: gnu: tome4: Update to 1.6.4. * gnu/packages/games.scm (tome4): Update to 1.6.4. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 613b3acfeb..dcb8aaf9d2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5139,7 +5139,7 @@ Crowther & Woods, its original authors, in 1995. It has been known as (define-public tome4 (package (name "tome4") - (version "1.6.1") + (version "1.6.4") (synopsis "Single-player, RPG roguelike game set in the world of Eyal") (source (origin @@ -5148,7 +5148,7 @@ Crowther & Woods, its original authors, in 1995. It has been known as version ".tar.bz2")) (sha256 (base32 - "0c5a2bdyfccwkqnb6yqvzggyi2nk032v01kfc00zlgpdfzljcb9i")) + "1hrh79aqmvwwd7idlr3lzpdpc9dgm1k5p7w2462chcjvd8vhfhb7")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From efec58e7ff3df1ccb287afd1a3d5ecd414b1514a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Nov 2019 09:58:07 +0100 Subject: gnu: r-factominer: Update to 2.0. * gnu/packages/cran.scm (r-factominer): Update to 2.0. [propagated-inputs]: Add r-ggplot2 and ggrepel. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f2da9ca88a..5c232f97fb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5812,14 +5812,14 @@ clustering.") (define-public r-factominer (package (name "r-factominer") - (version "1.42") + (version "2.0") (source (origin (method url-fetch) (uri (cran-uri "FactoMineR" version)) (sha256 (base32 - "1yl16inb2m89l1czgaf0pgy9655dpr751hyx92yw6rqpd2ryznac")))) + "0qiw60ypf3bf5xsqz2b9l82i4jvprjm8lzpp12lhl8d9j5s8m0j8")))) (properties `((upstream-name . "FactoMineR"))) (build-system r-build-system) (propagated-inputs @@ -5827,6 +5827,8 @@ clustering.") ("r-cluster" ,r-cluster) ("r-ellipse" ,r-ellipse) ("r-flashclust" ,r-flashclust) + ("r-ggplot2" ,r-ggplot2) + ("r-ggrepel" ,r-ggrepel) ("r-lattice" ,r-lattice) ("r-leaps" ,r-leaps) ("r-mass" ,r-mass) -- cgit v1.2.3 From fda807da904a74febc0d31890701237056026992 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Nov 2019 09:58:47 +0100 Subject: gnu: r-writexl: Update to 1.2. * gnu/packages/cran.scm (r-writexl): Update to 1.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5c232f97fb..f2c2930616 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6420,14 +6420,14 @@ documents.") (define-public r-writexl (package (name "r-writexl") - (version "1.1") + (version "1.2") (source (origin (method url-fetch) (uri (cran-uri "writexl" version)) (sha256 (base32 - "0w4wnpl3yhaqp63p32bk60xrbmd7xd11kxifjbzrghi7d4483a46")))) + "09fhdip6igcg97fjx4c7727cx2lb49l4d74l4i8rg2bag2s5lrj3")))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) (home-page "https://github.com/ropensci/writexl") -- cgit v1.2.3 From ad6ab1a88160e46bb91cd73545b589c261f407f9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Nov 2019 09:59:23 +0100 Subject: gnu: r-emmeans: Update to 1.4.3. * gnu/packages/cran.scm (r-emmeans): Update to 1.4.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f2c2930616..b12e89eea9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8069,14 +8069,14 @@ Hothorn, Westfall, 2010, CRC Press).") (define-public r-emmeans (package (name "r-emmeans") - (version "1.4.2") + (version "1.4.3") (source (origin (method url-fetch) (uri (cran-uri "emmeans" version)) (sha256 (base32 - "1sxwbh6sym2shrj7gva8q96ca2csqz3081q4d84avpxz15dfz1z1")))) + "15d78jhpil9p98cy3aac6svbkjsml1dh0z8hm8cka5l6nik8x0k9")))) (build-system r-build-system) (propagated-inputs `(("r-estimability" ,r-estimability) -- cgit v1.2.3 From 04c3fd85eaa2ddb27aba6c695a6fe81b3886f13c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Nov 2019 09:59:46 +0100 Subject: gnu: r-rnifti: Update to 1.0.1. * gnu/packages/cran.scm (r-rnifti): Update to 1.0.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b12e89eea9..5610cd890a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10045,14 +10045,14 @@ Touzet and Varre (2007).") (define-public r-rnifti (package (name "r-rnifti") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "RNifti" version)) (sha256 (base32 - "0l61hjnzv043ibpkgrhc0yngaqmc58lkvii8j1dzh022z5wbqrj8")))) + "0hfid40pgfi1ykqka8y3v0m7h0iyd6fbvycvqlad3ibmbg621f0w")))) (properties `((upstream-name . "RNifti"))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp))) -- cgit v1.2.3 From e2448b4b14871ee3449af61d306a6fadb1ac2f95 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Nov 2019 10:00:21 +0100 Subject: gnu: r-grimport: Update to 0.9-3. * gnu/packages/cran.scm (r-grimport): Update to 0.9-3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5610cd890a..b7f543390f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10158,14 +10158,14 @@ handling.") (define-public r-grimport (package (name "r-grimport") - (version "0.9-2") + (version "0.9-3") (source (origin (method url-fetch) (uri (cran-uri "grImport" version)) (sha256 (base32 - "0n3y6dzy8s0ifvyrgwbly6cl14lmgd54dyi74s5i984apszpsp16")))) + "109mrdvq06xq3zgn9ngz0c7zzgqkv5zbpvsb2i636vmlk6y4dpkd")))) (properties `((upstream-name . "grImport"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From bb180e8a7a50c78f971375577d6ea9e2680f40c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Nov 2019 10:00:44 +0100 Subject: gnu: r-grimport2: Update to 0.2-0. * gnu/packages/cran.scm (r-grimport2): Update to 0.2-0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b7f543390f..67c481e487 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10182,14 +10182,14 @@ PostScript pictures in R plots.") (define-public r-grimport2 (package (name "r-grimport2") - (version "0.1-5") + (version "0.2-0") (source (origin (method url-fetch) (uri (cran-uri "grImport2" version)) (sha256 (base32 - "0dyb3nrrvxnkk9q5b136bdivcz1jj3ajx1kscm3k0kkpqjif0pls")))) + "19q0dd8fpp1g4xf6sg5f8dxybwxjfw553ra6wgjd8b74fzca40m1")))) (properties `((upstream-name . "grImport2"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 7dcd8239782dd5f6419e33dcde835132030a260a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Nov 2019 10:01:27 +0100 Subject: gnu: r-kohonen: Update to 3.0.10. * gnu/packages/cran.scm (r-kohonen): Update to 3.0.10. [propagated-inputs]: Remove r-mass. --- gnu/packages/cran.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 67c481e487..ff89315cde 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10213,18 +10213,17 @@ be imported and then exported via the @code{gridSVG} package.") (define-public r-kohonen (package (name "r-kohonen") - (version "3.0.8") + (version "3.0.10") (source (origin (method url-fetch) (uri (cran-uri "kohonen" version)) (sha256 (base32 - "1zbfqa1qdlry8w6xhypkiknc5gn98v1ijhlsfka8zjg8ajhqgn1q")))) + "1ck7j13x701g67bx81x7plszz804jfhl1yg42krcj9x88vm5cscr")))) (build-system r-build-system) (propagated-inputs - `(("r-mass" ,r-mass) - ("r-rcpp" ,r-rcpp))) + `(("r-rcpp" ,r-rcpp))) (home-page "https://cran.r-project.org/web/packages/kohonen") (synopsis "Supervised and unsupervised self-organising maps") (description -- cgit v1.2.3 From 7b18e6d0006ecad7cca1b5a751e861d5e1826f52 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Nov 2019 10:01:44 +0100 Subject: gnu: r-covr: Update to 3.4.0. * gnu/packages/cran.scm (r-covr): Update to 3.4.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ff89315cde..b6adb096fe 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15432,13 +15432,13 @@ function and interfaces to external frameworks.") (define-public r-covr (package (name "r-covr") - (version "3.3.2") + (version "3.4.0") (source (origin (method url-fetch) (uri (cran-uri "covr" version)) (sha256 - (base32 "160w0m2d06kdd8dar57lpph39rxx55xwncbpl3b21l7j9drh1s5f")))) + (base32 "0p44kr6yz5sqza5zvq6divqglzkpv0if9pjpjmzhmdaaddjrqzg5")))) (properties `((upstream-name . "covr"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 28d940961cfa1ae6dc574053aec8d03095677df8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Nov 2019 10:01:57 +0100 Subject: gnu: r-rgdal: Update to 1.4-8. * gnu/packages/cran.scm (r-rgdal): Update to 1.4-8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b6adb096fe..c5f175f335 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15636,13 +15636,13 @@ effect size.") (define-public r-rgdal (package (name "r-rgdal") - (version "1.4-7") + (version "1.4-8") (source (origin (method url-fetch) (uri (cran-uri "rgdal" version)) (sha256 - (base32 "05rvqy8lr2c3phaylmc4g5761208b0xrmgwn9c4a60x7p251dzjs")))) + (base32 "1jd691amf3ghznq5im15gvhl6v6k25klpl75m4ngrqf9xlxaa3as")))) (properties `((upstream-name . "rgdal"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 6fdf3d5d997030a668dad3d6a4e07ad1287c2582 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Nov 2019 10:02:07 +0100 Subject: gnu: r-igraph: Update to 1.2.4.2. * gnu/packages/graph.scm (r-igraph): Update to 1.2.4.2. --- gnu/packages/graph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 9979b176d7..326477730b 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -107,14 +107,14 @@ more.") (define-public r-igraph (package (name "r-igraph") - (version "1.2.4.1") + (version "1.2.4.2") (source (origin (method url-fetch) (uri (cran-uri "igraph" version)) (sha256 (base32 - "1074y8mvprrqlkb4vwa2qc9l03r8d7p5vaaqacj4ljjs7dvcq6l9")))) + "0scrbqb26pam8akblb4g9rkz888s0xffw3gcly78s4ijj67barxd")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From bf5b792b0ea8f1c1083236096f39bb4b6f3a17d4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Nov 2019 10:02:46 +0100 Subject: gnu: r-matrix: Update to 1.2-18. * gnu/packages/statistics.scm (r-matrix): Update to 1.2-18. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 1c315c23ef..6358883026 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -567,14 +567,14 @@ also flexible enough to handle most nonstandard requirements.") (define-public r-matrix (package (name "r-matrix") - (version "1.2-17") + (version "1.2-18") (source (origin (method url-fetch) (uri (cran-uri "Matrix" version)) (sha256 (base32 - "1k1zf92ycqr7fz44w7bp1p354ww7jg0wm23ybb8dzmbg37qfchyv")))) + "06b1rc1vq65b271f2wpzhqkvhng8hwwnvjflzxkng50i52603zzp")))) (properties `((upstream-name . "Matrix"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ba54cb61ecc9a572ad8578423e452a37417a9173 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Nov 2019 10:02:56 +0100 Subject: gnu: r-rmarkdown: Update to 1.18. * gnu/packages/statistics.scm (r-rmarkdown): Update to 1.18. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 6358883026..f04c17f690 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2661,13 +2661,13 @@ certain criterion, e.g., it contains a certain regular file.") (define-public r-rmarkdown (package (name "r-rmarkdown") - (version "1.17") + (version "1.18") (source (origin (method url-fetch) (uri (cran-uri "rmarkdown" version)) (sha256 - (base32 "18dj6nr1m79pv1pv9w2n0rhiidwqjb2w8w1rnpcwijwbz4i8d3k2")))) + (base32 "0fykzbb5kjsqc8v6gjcdma7rmq0gailp30qij6plgna4d8nhjw3w")))) (properties `((upstream-name . "rmarkdown"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 18a5575ec530f0e7a2e27f2aa3b5addf20da0f87 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Nov 2019 10:03:03 +0100 Subject: gnu: r-e1071: Update to 1.7-3. * gnu/packages/statistics.scm (r-e1071): Update to 1.7-3. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index f04c17f690..a2ab913c6c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3332,14 +3332,14 @@ Stochastic Neighbor Embedding using a Barnes-Hut implementation.") (define-public r-e1071 (package (name "r-e1071") - (version "1.7-2") + (version "1.7-3") (source (origin (method url-fetch) (uri (cran-uri "e1071" version)) (sha256 (base32 - "0lipj692rjjw8rrhqh2k9i5dh8y2sjrw9q53rwm32irhx2f2j73j")))) + "0pf2pjb590z0jikgv1037xcp7dq06mg3dzmyffjw6gk7dd9blbdv")))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class))) -- cgit v1.2.3 From 3e68e7d2b631e32f5c4fe160d6a7f32646ffdee9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 27 Nov 2019 21:51:03 +0200 Subject: gnu: gparted: Satisfy 'guix lint'. * gnu/packages/disk.scm (gparted)[inputs]: Move itstool ... [native-inputs]: ... to here. --- gnu/packages/disk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 88a917dda7..1a6a7c40f6 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016, 2018, 2019 Tobias Geerinckx-Rice -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016, 2017 Marius Bakke @@ -364,10 +364,10 @@ and can dramatically shorten the lifespan of the drive if left unchecked.") ("glib" ,glib) ("gtkmm" ,gtkmm) ("libxml2" ,libxml2) - ("yelp-tools" ,yelp-tools) - ("itstool" ,itstool))) + ("yelp-tools" ,yelp-tools))) (native-inputs `(("intltool" ,intltool) + ("itstool" ,itstool) ("lvm2" ,lvm2) ; for tests ("pkg-config" ,pkg-config))) (home-page "https://gparted.org/") -- cgit v1.2.3 From 3c526173ddb072e031429a4c93dc3318188e8f8b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 27 Nov 2019 22:15:27 +0200 Subject: gnu: snorenotify: Update inputs. * gnu/packages/kde.scm (snorenotify)[inputs]: Move extra-cmake-modules, qttools ... [native-inputs]: ... to here. --- gnu/packages/kde.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 778873e99c..483eeeb2bc 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -517,8 +517,9 @@ cards.") (arguments `(#:tests? #f)) ; both tests fail, require display (inputs + `(("qtbase" ,qtbase))) + (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) - ("qtbase" ,qtbase) ("qttools" ,qttools))) (home-page "https://techbase.kde.org/Projects/Snorenotify") (synopsis "Qt notification framework") -- cgit v1.2.3 From 4632e7c787a0792b4d73fc5c43f7498f4b5e5e06 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 27 Nov 2019 22:30:53 +0200 Subject: gnu: avidemux: Clean up inputs. * gnu/packages/video.scm (avidemux)[inputs]: Remove sdl. Move perl, python-wrapper, qttools, yasm ... [native-inputs]: ... to here. [arguments]: Remove references to sdl. --- gnu/packages/video.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 9836f67386..fb8b0a651f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1943,7 +1943,11 @@ for use with HTML5 video.") (patches (search-patches "avidemux-install-to-lib.patch")))) (build-system cmake-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("qttools" ,qttools) + ("yasm" ,yasm))) ;; FIXME: Once packaged, add libraries not found during the build. (inputs `(("alsa-lib" ,alsa-lib) @@ -1958,14 +1962,9 @@ for use with HTML5 video.") ("libvorbis" ,libvorbis) ("libvpx" ,libvpx) ("libxv" ,libxv) - ("perl" ,perl) ("pulseaudio" ,pulseaudio) - ("python" ,python-wrapper) ("qtbase" ,qtbase) - ("qttools" ,qttools) - ("sdl" ,sdl) ("sqlite" ,sqlite) - ("yasm" ,yasm) ("zlib" ,zlib))) (arguments `(#:tests? #f ; no check target @@ -2002,7 +2001,6 @@ for use with HTML5 video.") (let* ((out (assoc-ref outputs "out")) (lib (string-append out "/lib")) (top (getcwd)) - (sdl (assoc-ref inputs "sdl")) (build_component (lambda* (component srcdir #:optional (args '())) (let ((builddir (string-append "build_" component))) @@ -2015,8 +2013,6 @@ for use with HTML5 video.") (string-append "-DCMAKE_SHARED_LINKER_FLAGS=" "\"-Wl,-rpath=" lib "\"") (string-append "-DAVIDEMUX_SOURCE_DIR=" top) - (string-append "-DSDL_INCLUDE_DIR=" - sdl "/include/SDL") (string-append "../" srcdir) "-DENABLE_QT5=True" args) -- cgit v1.2.3 From 73765c91cea305ee8582e80faed08172ecd226f8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 28 Nov 2019 12:39:33 +0100 Subject: services: nginx: Add description. * gnu/services/web.scm (nginx-service-type)[description]: New field. --- gnu/services/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 3d149a105d..372f4dc6fc 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -742,8 +742,8 @@ of index files." (server-blocks (append (nginx-configuration-server-blocks config) servers))))) - (default-value - (nginx-configuration)))) + (default-value (nginx-configuration)) + (description "Run the nginx Web server."))) (define-record-type* fcgiwrap-configuration make-fcgiwrap-configuration -- cgit v1.2.3 From c1c6650e286e02a681252433ddeaae8d73b4f0d0 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 26 Nov 2019 21:56:44 +0100 Subject: services: Add pam-mount. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/pam-mount.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * doc/guix.texi (PAM Mount Service): New subsection. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 85 ++++++++++++++++++++++++++++++++++ gnu/local.mk | 1 + gnu/services/pam-mount.scm | 111 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 197 insertions(+) create mode 100644 gnu/services/pam-mount.scm (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 23a30ce553..9219429ee0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -68,6 +68,7 @@ Copyright @copyright{} 2019 Ivan Petkov@* Copyright @copyright{} 2019 Jakob L. Kreuze@* Copyright @copyright{} 2019 Kyle Andrews@* Copyright @copyright{} 2019 Alex Griffin@* +Copyright @copyright{} 2019 Guillaume Le Vaillant@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -305,6 +306,7 @@ Services * Virtualization Services:: Virtualization services. * Version Control Services:: Providing remote access to Git repositories. * Game Services:: Game servers. +* PAM Mount Service:: Service to mount volumes when logging in. * Miscellaneous Services:: Other services. Defining Services @@ -11931,6 +11933,7 @@ declaration. * Virtualization Services:: Virtualization services. * Version Control Services:: Providing remote access to Git repositories. * Game Services:: Game servers. +* PAM Mount Service:: Service to mount volumes when logging in. * Guix Services:: Services relating specifically to Guix. * Miscellaneous Services:: Other services. @end menu @@ -24656,6 +24659,88 @@ The port to bind the server to. @end deftp +@node PAM Mount Service +@subsection PAM Mount Service +@cindex pam-mount + +The @code{(gnu services pam-mount)} module provides a service allowing +users to mount volumes when they log in. It should be able to mount any +volume format supported by the system. + +@defvar {Scheme Variable} pam-mount-service-type +Service type for PAM Mount support. +@end defvar + +@deftp {Data Type} pam-mount-configuration +Data type representing the configuration of PAM Mount. + +It takes the following parameters: + +@table @asis +@item @code{rules} +The configuration rules that will be used to generate +@file{/etc/security/pam_mount.conf.xml}. + +The configuration rules are SXML elements, and the the default ones +don't mount anything for anyone at login: + +@lisp +`((debug (@@ (enable "0"))) + (mntoptions (@@ (allow ,(string-join + '("nosuid" "nodev" "loop" + "encryption" "fsck" "nonempty" + "allow_root" "allow_other") + ",")))) + (mntoptions (@@ (require "nosuid,nodev"))) + (logout (@@ (wait "0") + (hup "0") + (term "no") + (kill "no"))) + (mkmountpoint (@@ (enable "1") + (remove "true")))) +@end lisp + +Some @code{volume} elements must be added to automatically mount volumes +at login. Here's an example allowing the user @code{alice} to mount her +encrypted @code{HOME} directory and allowing the user @code{bob} to mount +the partition where he stores his data: + +@lisp +(define pam-mount-rules +`((debug (@@ (enable "0"))) + (volume (@@ (user "alice") + (fstype "crypt") + (path "/dev/sda2") + (mountpoint "/home/alice"))) + (volume (@@ (user "bob") + (fstype "auto") + (path "/dev/sdb3") + (mountpoint "/home/bob/data") + (options "defaults,autodefrag,compress"))) + (mntoptions (@@ (allow ,(string-join + '("nosuid" "nodev" "loop" + "encryption" "fsck" "nonempty" + "allow_root" "allow_other") + ",")))) + (mntoptions (@@ (require "nosuid,nodev"))) + (logout (@@ (wait "0") + (hup "0") + (term "no") + (kill "no"))) + (mkmountpoint (@@ (enable "1") + (remove "true"))))) + +(service pam-mount-service-type + (pam-mount-configuration + (rules pam-mount-rules))) +@end lisp + +The complete list of possible options can be found in the man page for +@uref{http://pam-mount.sourceforge.net/pam_mount.conf.5.html, pam_mount.conf}. +@end table +@end deftp + + @node Guix Services @subsection Guix Services diff --git a/gnu/local.mk b/gnu/local.mk index 082465a24a..3f2e9f265f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -551,6 +551,7 @@ GNU_SYSTEM_MODULES = \ %D%/services/networking.scm \ %D%/services/nix.scm \ %D%/services/nfs.scm \ + %D%/services/pam-mount.scm \ %D%/services/security-token.scm \ %D%/services/shepherd.scm \ %D%/services/sound.scm \ diff --git a/gnu/services/pam-mount.scm b/gnu/services/pam-mount.scm new file mode 100644 index 0000000000..98611462c2 --- /dev/null +++ b/gnu/services/pam-mount.scm @@ -0,0 +1,111 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Guillaume Le Vaillant +;;; +;;; 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 services pam-mount) + #:use-module (gnu packages admin) + #:use-module (gnu services) + #:use-module (gnu services configuration) + #:use-module (gnu system pam) + #:use-module (guix gexp) + #:use-module (guix records) + #:export (pam-mount-configuration + pam-mount-configuration? + pam-mount-service-type)) + +(define %pam-mount-default-configuration + `((debug (@ (enable "0"))) + (mntoptions (@ (allow ,(string-join + '("nosuid" "nodev" "loop" + "encryption" "fsck" "nonempty" + "allow_root" "allow_other") + ",")))) + (mntoptions (@ (require "nosuid,nodev"))) + (logout (@ (wait "0") + (hup "0") + (term "no") + (kill "no"))) + (mkmountpoint (@ (enable "1") + (remove "true"))))) + +(define (make-pam-mount-configuration-file config) + (computed-file + "pam_mount.conf.xml" + #~(begin + (use-modules (sxml simple)) + (call-with-output-file #$output + (lambda (port) + (sxml->xml + '(*TOP* + (*PI* xml "version='1.0' encoding='utf-8'") + (pam_mount + #$@(pam-mount-configuration-rules config) + (pmvarrun + #$(file-append pam-mount + "/sbin/pmvarrun -u '%(USER)' -o '%(OPERATION)'")) + (cryptmount + #$(file-append pam-mount + (string-append + "/sbin/mount.crypt" + " '%(if %(CIPHER),-ocipher=%(CIPHER))'" + " '%(if %(FSKEYCIPHER)," + "-ofsk_cipher=%(FSKEYCIPHER))'" + " '%(if %(FSKEYHASH),-ofsk_hash=%(FSKEYHASH))'" + " '%(if %(FSKEYPATH),-okeyfile=%(FSKEYPATH))'" + " '%(if %(OPTIONS),-o%(OPTIONS))'" + " '%(VOLUME)' '%(MNTPT)'"))) + (cryptumount + #$(file-append pam-mount "/sbin/umount.crypt '%(MNTPT)'")))) + port)))))) + +(define-record-type* + pam-mount-configuration + make-pam-mount-configuration + pam-mount-configuration? + (rules pam-mount-configuration-rules + (default %pam-mount-default-configuration))) + +(define (pam-mount-etc-service config) + `(("security/pam_mount.conf.xml" + ,(make-pam-mount-configuration-file config)))) + +(define (pam-mount-pam-service config) + (define optional-pam-mount + (pam-entry + (control "optional") + (module #~(string-append #$pam-mount "/lib/security/pam_mount.so")))) + (list (lambda (pam) + (if (member (pam-service-name pam) + '("login" "su" "slim" "gdm-password")) + (pam-service + (inherit pam) + (auth (append (pam-service-auth pam) + (list optional-pam-mount))) + (session (append (pam-service-session pam) + (list optional-pam-mount)))) + pam)))) + +(define pam-mount-service-type + (service-type + (name 'pam-mount) + (extensions (list (service-extension etc-service-type + pam-mount-etc-service) + (service-extension pam-root-service-type + pam-mount-pam-service))) + (default-value (pam-mount-configuration)) + (description "Activate PAM-Mount support. It allows mounting volumes for +specific users when they log in."))) -- cgit v1.2.3 From f71b16e8e41b2646f9992c425d47da64c6dfb8cb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Nov 2019 14:36:24 +0100 Subject: gnu: r-emmeans: Update to 1.4.3.01. * gnu/packages/cran.scm (r-emmeans): Update to 1.4.3.01. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c5f175f335..e8728a9513 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8069,14 +8069,14 @@ Hothorn, Westfall, 2010, CRC Press).") (define-public r-emmeans (package (name "r-emmeans") - (version "1.4.3") + (version "1.4.3.01") (source (origin (method url-fetch) (uri (cran-uri "emmeans" version)) (sha256 (base32 - "15d78jhpil9p98cy3aac6svbkjsml1dh0z8hm8cka5l6nik8x0k9")))) + "16v5j31516nbqnj2zhgqvyp5yxd4zcs5zi0aspa5plr2qikvrkmg")))) (build-system r-build-system) (propagated-inputs `(("r-estimability" ,r-estimability) -- cgit v1.2.3 From 5af7378a8e27f21c409c70d5833fe430d3e7f663 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Nov 2019 15:30:29 +0200 Subject: gnu: sbcl-lack-middleware-backtrace: Provide a file-name. * gnu/packages/lisp.scm (sbcl-lack-middleware-backtrace)[source]: Use git-file-name. --- gnu/packages/lisp.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index fdde7f744c..46e81f9944 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -5111,6 +5111,7 @@ performance and simplicity in mind.") (uri (git-reference (url "https://github.com/fukamachi/lack.git") (commit commit))) + (file-name (git-file-name "lack-middleware-backtrace" version)) (sha256 (base32 "1avh4ygcj9xcx4m17nj0wnxxaisk26w4ljs2bibzxaln24x7pi85")))) (build-system asdf-build-system/sbcl) -- cgit v1.2.3 From 3b1e29ae342929e49230d50ce9e2f7e3fd1097c6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Nov 2019 15:31:25 +0200 Subject: gnu: sbcl-lack-component: Provide a file-name. * gnu/packages/lisp.scm (sbcl-lack-component)[source]: Use git-file-name. --- gnu/packages/lisp.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 46e81f9944..a5df90869a 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -5039,6 +5039,7 @@ performance and simplicity in mind.") (uri (git-reference (url "https://github.com/fukamachi/lack.git") (commit commit))) + (file-name (git-file-name "lack-component" version)) (sha256 (base32 "1avh4ygcj9xcx4m17nj0wnxxaisk26w4ljs2bibzxaln24x7pi85")))) (build-system asdf-build-system/sbcl) -- cgit v1.2.3 From c2db64caa4ebadceb8cd2b5c2a97f4837e3eae54 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Nov 2019 15:32:08 +0200 Subject: gnu: sbcl-lack: Provide a file-name. * gnu/packages/lisp.scm (sbcl-lack)[source]: Use git-file-name. --- gnu/packages/lisp.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index a5df90869a..c98f6015c1 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -5234,6 +5234,7 @@ performance and simplicity in mind.") (uri (git-reference (url "https://github.com/fukamachi/lack.git") (commit commit))) + (file-name (git-file-name "lack" version)) (sha256 (base32 "1avh4ygcj9xcx4m17nj0wnxxaisk26w4ljs2bibzxaln24x7pi85")))) (build-system asdf-build-system/sbcl) -- cgit v1.2.3 From b61fcdcae6e5e0a3ca98e8423e1558ec5aa45042 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Nov 2019 15:33:00 +0200 Subject: gnu: sbcl-lack-util: Provide a file-name. * gnu/packages/lisp.scm (sbcl-lack-util)[source]: Use git-file-name. --- gnu/packages/lisp.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index c98f6015c1..12a961c3ba 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -5075,6 +5075,7 @@ performance and simplicity in mind.") (uri (git-reference (url "https://github.com/fukamachi/lack.git") (commit commit))) + (file-name (git-file-name "lack-util" version)) (sha256 (base32 "1avh4ygcj9xcx4m17nj0wnxxaisk26w4ljs2bibzxaln24x7pi85")))) (build-system asdf-build-system/sbcl) -- cgit v1.2.3 From cfbd9b42a1921322b30de9ca90ec86667842fee6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Nov 2019 15:34:10 +0200 Subject: gnu: sbcl-lack-request: Provide a file-name. * gnu/packages/lisp.scm (sbcl-lack-request)[source]: Use git-file-name. --- gnu/packages/lisp.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 12a961c3ba..dcf3b41bc1 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -4923,6 +4923,7 @@ reset to 0 and you're able to read it again.") (uri (git-reference (url "https://github.com/fukamachi/lack.git") (commit commit))) + (file-name (git-file-name "lack-request" version)) (sha256 (base32 "1avh4ygcj9xcx4m17nj0wnxxaisk26w4ljs2bibzxaln24x7pi85")))) (build-system asdf-build-system/sbcl) -- cgit v1.2.3 From d49eb36ef2d960877dd9fa5fe935a05f7165cb57 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Nov 2019 15:35:04 +0200 Subject: gnu: sbcl-lack-middleware-static: Provide a file-name. * gnu/packages/lisp.scm (sbcl-lack-middleware-static)[source]: Use git-file-name. --- gnu/packages/lisp.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index dcf3b41bc1..9475dfbf00 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -5197,6 +5197,7 @@ mime-type of a file.") (uri (git-reference (url "https://github.com/fukamachi/lack.git") (commit commit))) + (file-name (git-file-name "lack-middleware-static" version)) (sha256 (base32 "1avh4ygcj9xcx4m17nj0wnxxaisk26w4ljs2bibzxaln24x7pi85")))) (build-system asdf-build-system/sbcl) -- cgit v1.2.3 From 040a7440d62ab526d5a79c8d59a598a9d9532198 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Nov 2019 15:38:40 +0200 Subject: gnu: sbcl-chinga: Don't use unstable tarball. * gnu/packages/lisp.scm (sbcl-chunga)[source]: Download using git-fetch. --- gnu/packages/lisp.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 9475dfbf00..52e674d11c 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016, 2017 Andy Patterson ;;; Copyright © 2017, 2019 Ricardo Wurmus -;;; Copyright © 2017, 2018 Efraim Flashner +;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong @@ -4140,11 +4140,13 @@ encoding table that uses only URI-compatible characters.") (version "1.1.7") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/edicl/chunga/archive/v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/edicl/chunga.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0ra17kyc9l7qbaw003ly111r1cbn4zixbfq1ydr9cxw10v30q1n7")))) + (base32 "0jzn3nyb3f22gm983rfk99smqs3mhb9ivjmasvhq9qla5cl9pyhd")))) (build-system asdf-build-system/sbcl) (inputs `(("sbcl-trivial-gray-streams" ,sbcl-trivial-gray-streams))) -- cgit v1.2.3 From a32e8b25507814be3c1889ca37d9439b2dc8022e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Nov 2019 15:42:02 +0200 Subject: gnu: sbcl-parse-number: Don't use unstable tarball. * gnu/packages/lisp.scm (sbcl-parse-number)[source]: Download using git-fetch. --- gnu/packages/lisp.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 52e674d11c..c4b27fbade 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1472,13 +1472,14 @@ JavaScript (ECMAScript 3). It has basic support for ECMAScript 5.") (version "1.5") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/sharplispers/parse-number/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/sharplispers/parse-number/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1k6s4v65ksc1j5i0dprvzfvj213v6nah7i0rgd0726ngfjisj9ir")))) + "046qkppyakm2pgjxgxba4q7inp6dd3g628pkdj10z7v5zbjw3da9")))) (build-system asdf-build-system/sbcl) (home-page "http://www.cliki.net/PARSE-NUMBER") (synopsis "Parse numbers") -- cgit v1.2.3 From 0089290fcd62b99a54de30886bbb5e6b96b4138c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Nov 2019 15:50:49 +0200 Subject: gnu: sbcl-parse-number: Update to 1.7. * gnu/packages/lisp.scm (sbcl-parse-number): Update to 1.7. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index c4b27fbade..9a83a1598a 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1469,7 +1469,7 @@ JavaScript (ECMAScript 3). It has basic support for ECMAScript 5.") (define-public sbcl-parse-number (package (name "sbcl-parse-number") - (version "1.5") + (version "1.7") (source (origin (method git-fetch) @@ -1479,7 +1479,7 @@ JavaScript (ECMAScript 3). It has basic support for ECMAScript 5.") (file-name (git-file-name name version)) (sha256 (base32 - "046qkppyakm2pgjxgxba4q7inp6dd3g628pkdj10z7v5zbjw3da9")))) + "0sk06ib1bhqv9y39vwnnw44vmbc4b0kvqm37xxmkxd4dwchq82d7")))) (build-system asdf-build-system/sbcl) (home-page "http://www.cliki.net/PARSE-NUMBER") (synopsis "Parse numbers") -- cgit v1.2.3 From a54980253360d9d266980ef249f4a92836225a02 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Nov 2019 15:52:49 +0200 Subject: gnu: mplayer: Adjust inputs. * gnu/packages/video.scm (mplayer)[inputs]: Move yasm ... [native-inputs]: ... to here. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index fb8b0a651f..cd367c2d68 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1266,7 +1266,8 @@ streaming protocols.") (build-system gnu-build-system) ;; FIXME: Add additional inputs once available. (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("yasm" ,yasm))) (inputs `(("alsa-lib" ,alsa-lib) ("cdparanoia" ,cdparanoia) @@ -1297,7 +1298,6 @@ streaming protocols.") ("python" ,python-wrapper) ("sdl" ,sdl) ("speex" ,speex) - ("yasm" ,yasm) ("zlib" ,zlib))) (arguments `(#:tests? #f ; no test target -- cgit v1.2.3 From ee9eafc1df043e6aacfdace1da046a86773dac67 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 Nov 2019 15:10:30 +0100 Subject: gnu: openclonk: Adjust for GCC 7. * gnu/packages/games.scm (openclonk)[arguments]: Add phase 'adjust-backward-cpp-includes'. --- gnu/packages/games.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index dcb8aaf9d2..8955b597e6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2019 nee ;;; Copyright © 2017 Clément Lassieur -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2019 Marius Bakke ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou @@ -6888,6 +6888,22 @@ a fortress beyond the forbidden swamp.") (("PATH_SUFFIXES \"src\" \"gtest\"") "PATH_SUFFIXES \"src\"")) #t)) + (add-after 'unpack 'adjust-backward-cpp-includes + (lambda _ + ;; XXX: The bundled backward-cpp exports a CMake "interface" + ;; that includes external libraries such as libdl from glibc. + ;; By default, CMake interface includes are treated as "system + ;; headers", and GCC behaves poorly when glibc is passed as a + ;; system header (causing #include_next failures). + + ;; Here we prevent targets that consume the Backward::Backward + ;; interface from treating it as "system includes". + (substitute* "CMakeLists.txt" + (("target_link_libraries\\((.+) Backward::Backward\\)" all target) + (string-append "set_property(TARGET " target " PROPERTY " + "NO_SYSTEM_FROM_IMPORTED true)\n" + all))) + #t)) (add-after 'unpack 'add-libiberty ;; Build fails upon linking executables without this. (lambda _ -- cgit v1.2.3 From 6018d26b6b4ed79e7d6b8d0b2c94e243fd9ba1c5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 Nov 2019 15:12:41 +0100 Subject: gnu: openclonk: Update description. * gnu/packages/games.scm (openclonk)[description]: Be gender neutral. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8955b597e6..b25133db78 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6955,7 +6955,7 @@ a fortress beyond the forbidden swamp.") "Multiplayer action game where you control small and nimble humanoids") (description "OpenClonk is a multiplayer action/tactics/skill game. It is often referred to as a mixture of The Settlers and Worms. In a simple 2D -antfarm-style landscape, the player controls his crew of Clonks, small but +antfarm-style landscape, the player controls a crew of Clonks, small but robust humanoid beings. The game encourages free play but the normal goal is to either exploit valuable resources from the earth by building a mine or fight each other on an arena-like map.") -- cgit v1.2.3 From 8eebde743925bd6ead0344243b2cc5b44cc98841 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 Nov 2019 15:54:10 +0100 Subject: gnu: vte/gtk+-2: Adjust for changes in inherited package. This is a follow-up to 68c47474bc8bc633fa3b13610d4f700891067bbc. * gnu/packages/gnome.scm (vte/gtk+-2)[build-system]: New field. --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 11ed035919..4e5e8cdbfd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2431,6 +2431,7 @@ selection and URL hints."))) (patches (search-patches "vte-CVE-2012-2738-pt1.patch" "vte-CVE-2012-2738-pt2.patch")))) + (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-python"))) (native-inputs -- cgit v1.2.3 From 38a404d567dbaed7c9bf3803e2580290d575f1dc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 Nov 2019 16:25:14 +0100 Subject: gnu: python2-matplotlib: Do not inherit test adjustments. This is a follow-up to commit 9e7cb2f1e16fc5b70c6c0e4187443e216767323d. * gnu/packages/python-xyz.scm (python2-matplotlib)[arguments]: Do not inherit the 'fix-and-disable-failing-tests' phase. --- gnu/packages/python-xyz.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d2efa74228..a166554f98 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4147,6 +4147,7 @@ toolkits.") (assoc-ref inputs "jquery-ui") "-d" dir)) #t)) + (delete 'fix-and-disable-failing-tests) (delete 'check))))) ; These tests weren't run the the past. ;; Make sure to use special packages for Python 2 instead ;; of those automatically rewritten by package-with-python2. -- cgit v1.2.3 From c09f598d94af81f326fe1d4cf2ab344d4e720679 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 Nov 2019 16:26:51 +0100 Subject: gnu: python-matplotlib: Do not move the 'check' phase. Running tests after install is now the default in PYTHON-BUILD-SYSTEM. * gnu/packages/python-xyz.scm (python-matplotlib)[arguments]: Replace 'check' phase, instead of deleting and adding new phase. --- gnu/packages/python-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a166554f98..fcc3972194 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4088,8 +4088,7 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. (assoc-ref inputs "jquery-ui") "-d" dir)) #t)) - (delete 'check) - (add-after 'install 'check + (replace 'check (lambda* (#:key outputs inputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) (invoke "python" "tests.py" "-v" -- cgit v1.2.3