From 808e4c141ef270cf0787690fbfff906f36f164cc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Jan 2021 15:10:26 +0200 Subject: gnu: tipp10: Build with qt-5. * gnu/packages/education.scm (tipp10)[source]: Add new patches. [inputs]: Remove qt-4, sqlite. Add qtbase, qtmultimedia. * gnu/packages/patches/tipp10-disable-downloader.patch, gnu/packages/patches/tipp10-qt5.patch: New files. * gnu/local.mk (dist_patch_DATA): Register them. --- gnu/packages/education.scm | 11 +- .../patches/tipp10-disable-downloader.patch | 165 +++++++++++++++++++++ gnu/packages/patches/tipp10-qt5.patch | 69 +++++++++ 3 files changed, 241 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/tipp10-disable-downloader.patch create mode 100644 gnu/packages/patches/tipp10-qt5.patch (limited to 'gnu/packages') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 07862291a7..8ba673fe03 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016, 2017 Ricardo Wurmus ;;; Copyright © 2016 Hartmut Goebel -;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2020 Robert Smith @@ -230,8 +230,11 @@ Currently available boards include: (sha256 (base32 "0d387b404j88gsv6kv0rb7wxr23v5g5vl6s5l7602x8pxf7slbbx")) + ;; Apply patches in the order determined by Debian (patches (search-patches "tipp10-fix-compiling.patch" - "tipp10-remove-license-code.patch")))) + "tipp10-remove-license-code.patch" + "tipp10-disable-downloader.patch" + "tipp10-qt5.patch")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; packages has no tests @@ -256,8 +259,8 @@ Currently available boards include: ;; Recreate Makefile (invoke "qmake"))))))) (inputs - `(("qt4" ,qt-4) - ("sqlite" ,sqlite))) + `(("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia))) (home-page "https://www.tipp10.com/") (synopsis "Touch typing tutor") (description "Tipp10 is a touch typing tutor. The ingenious thing about diff --git a/gnu/packages/patches/tipp10-disable-downloader.patch b/gnu/packages/patches/tipp10-disable-downloader.patch new file mode 100644 index 0000000000..4917a927f9 --- /dev/null +++ b/gnu/packages/patches/tipp10-disable-downloader.patch @@ -0,0 +1,165 @@ +https://salsa.debian.org/debian/tipp10/-/raw/debian/2.1.0-5/debian/patches/disable_downloaders.patch + +Author: Reiner Herrmann +Description: Disable downloaders + This makes porting to Qt5 much easier, as QHttp is no longer available. + But the functionality was not enabled anyway or is no longer useful. + . + - checkversion.h/.cpp: + At startup (while loading settings), Tipp10 "phones home" to do an + update check (www.tipp10.com/update/version.tipp10v210). + For a packaged software and one that is no longer being developed, + this does not make much sense. + - updatedialog.h/.cpp: + Can download newer sqlite database (www.tipp10.com/update/sql.tipp10v210.utf), + but this file is no longer available on the server (404). + The update action has also not been enabled in the menu, so the update + functionality was currently not active: + widget/mainwindow.cpp:143: //fileMenu->addAction(updateAction); + - downloaddialog.h/.cpp: + Allows downloading lessons from user-specified location. + But the action (widget/startwidget.cpp -> lessonDownload) has not been part + of any menu, so it was also not in use. + +--- a/tipp10.pro ++++ b/tipp10.pro +@@ -15,7 +15,6 @@ + INCLUDEPATH += . + CONFIG += qt + QT += sql +-QT += network + RC_FILE += tipp10.rc + RESOURCES += tipp10.qrc + HEADERS += def/defines.h \ +@@ -36,15 +35,12 @@ + widget/settingspages.h \ + widget/lessondialog.h \ + widget/regexpdialog.h \ +- widget/downloaddialog.h \ + widget/lessonprintdialog.h \ + widget/lessonresult.h \ +- widget/updatedialog.h \ + widget/helpbrowser.h \ + widget/companylogo.h \ + widget/errormessage.h \ + widget/txtmessagedialog.h \ +- widget/checkversion.h \ + sql/connection.h \ + sql/lessontablesql.h \ + sql/chartablesql.h \ +@@ -70,15 +66,12 @@ + widget/settingspages.cpp \ + widget/lessondialog.cpp \ + widget/regexpdialog.cpp \ +- widget/downloaddialog.cpp \ + widget/lessonprintdialog.cpp \ + widget/lessonresult.cpp \ +- widget/updatedialog.cpp \ + widget/helpbrowser.cpp \ + widget/companylogo.cpp \ + widget/errormessage.cpp \ + widget/txtmessagedialog.cpp \ +- widget/checkversion.cpp \ + sql/lessontablesql.cpp \ + sql/chartablesql.cpp \ + sql/trainingsql.cpp \ +--- a/widget/mainwindow.cpp ++++ b/widget/mainwindow.cpp +@@ -41,11 +41,9 @@ + + #include "mainwindow.h" + #include "settingsdialog.h" +-#include "updatedialog.h" + #include "def/defines.h" + #include "def/errordefines.h" + #include "errormessage.h" +-#include "checkversion.h" + + MainWindow::MainWindow() { + trainingStarted = false; +@@ -214,8 +212,8 @@ + } + + void MainWindow::showUpdate() { +- UpdateDialog updateDialog(this); +- updateDialog.exec(); ++ //UpdateDialog updateDialog(this); ++ //updateDialog.exec(); + // Fill lesson list after online update + startWidget->fillLessonList(false); + } +@@ -486,6 +484,7 @@ + settings.endGroup(); + + settings.beginGroup("general"); ++#if 0 + if (settings.value("check_new_version", true).toBool()) { + + QDate lastVersionCheck = settings.value("last_version_check").toDate(); +@@ -499,6 +498,7 @@ + } + settings.setValue("last_version_check", today); + } ++#endif + settings.endGroup(); + } + +--- a/widget/settingspages.cpp ++++ b/widget/settingspages.cpp +@@ -581,7 +581,7 @@ + + // Layout of group box vertical + QVBoxLayout *layout = new QVBoxLayout; +- layout->addWidget(checkNewVersion); ++ //layout->addWidget(checkNewVersion); + layout->addSpacing(1); + layout->addWidget(checkNativeStyle); + layout->setMargin(16); +@@ -610,7 +610,6 @@ + checkIntelligence->setChecked(settings.value("check_toggle_intelligence", true).toBool()); + checkLimitLesson->setChecked(settings.value("check_limit_lesson", true).toBool()); + checkLessonPublish->setChecked(settings.value("check_lesson_publish", true).toBool()); +- checkNewVersion->setChecked(settings.value("check_new_version", true).toBool()); + checkNativeStyle->setChecked(settings.value("check_native_style", false).toBool()); + settings.endGroup(); + } +@@ -636,7 +635,6 @@ + settings.setValue("check_limit_lesson", checkLimitLesson->isChecked()); + settings.setValue("check_lesson_publish", checkLessonPublish->isChecked()); + settings.setValue("check_native_style", checkNativeStyle->isChecked()); +- settings.setValue("check_new_version", checkNewVersion->isChecked()); + settings.endGroup(); + + return requireRestart; +--- a/widget/startwidget.cpp ++++ b/widget/startwidget.cpp +@@ -43,12 +43,10 @@ + + #include "startwidget.h" + #include "sql/startsql.h" +-#include "updatedialog.h" + #include "def/defines.h" + #include "def/errordefines.h" + #include "errormessage.h" + #include "lessondialog.h" +-#include "downloaddialog.h" + #include "illustrationdialog.h" + #include "txtmessagedialog.h" + +@@ -1048,7 +1046,7 @@ + } + + void StartWidget::clickDownloadLesson() { +- ++#if 0 + QStringList lessonData; + + DownloadDialog downloadDialog(&lessonData, this); +@@ -1083,6 +1081,7 @@ + } + } + } ++#endif + } + + void StartWidget::clickEditLesson() { diff --git a/gnu/packages/patches/tipp10-qt5.patch b/gnu/packages/patches/tipp10-qt5.patch new file mode 100644 index 0000000000..34ad5cd708 --- /dev/null +++ b/gnu/packages/patches/tipp10-qt5.patch @@ -0,0 +1,69 @@ +https://salsa.debian.org/debian/tipp10/-/raw/debian/2.1.0-5/debian/patches/qt5.patch + +Author: Reiner Herrmann +Description: Port to Qt5 +Bug-Debian: https://bugs.debian.org/875207 + +--- a/tipp10.pro ++++ b/tipp10.pro +@@ -14,6 +14,7 @@ + DEPENDPATH += . + INCLUDEPATH += . + CONFIG += qt ++QT += widgets multimedia printsupport + QT += sql + RC_FILE += tipp10.rc + RESOURCES += tipp10.qrc +--- a/main.cpp ++++ b/main.cpp +@@ -24,7 +24,6 @@ + ****************************************************************/ + + #include +-#include + #include + #include + #include +@@ -212,7 +211,7 @@ + + // Set windows style + if (!useNativeStyle) { +- app.setStyle("plastique"); ++ app.setStyle("fusion"); + } + + // Translation +--- a/games/abcrainwidget.cpp ++++ b/games/abcrainwidget.cpp +@@ -235,8 +235,7 @@ + charballs.last()->wind = (qrand() % 8) + 2; + charballs.last()->rad = 0; + +- chartext.append(new QGraphicsTextItem(QString(characterTemp), +- charballs.last(), scene)); ++ chartext.append(new QGraphicsTextItem(QString(characterTemp), charballs.last())); + chartext.last()->setFont(QFont("Courier", 16, 100)); + chartext.last()->setPos(-(chartext.last()->boundingRect().width() / 2), -(chartext.last()->boundingRect().height() / 2)); + +--- a/sql/chartablesql.cpp ++++ b/sql/chartablesql.cpp +@@ -137,7 +137,7 @@ + sortColumn(4); + + headerview->setStretchLastSection(true); +- headerview->setResizeMode(QHeaderView::Interactive); ++ headerview->setSectionResizeMode(QHeaderView::Interactive); + headerview->setSortIndicatorShown(true); + + // Resize the columns +--- a/sql/lessontablesql.cpp ++++ b/sql/lessontablesql.cpp +@@ -202,7 +202,7 @@ + sortColumn(-1); + + headerview->setStretchLastSection(true); +- headerview->setResizeMode(QHeaderView::Interactive); ++ headerview->setSectionResizeMode(QHeaderView::Interactive); + headerview->setSortIndicatorShown(true); + + // Resize the columns -- cgit v1.2.3 From fcfa0490a5e89545a928e3a3beccc9206b2ef112 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 10 Jan 2021 14:44:35 +0100 Subject: gnu: augustus: Update to 2.0.1. * gnu/packages/games.scm (augustus): Update to 2.0.1. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d53583168e..c5d2ff6048 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1360,7 +1360,7 @@ does not include game data.") (package (inherit julius) (name "augustus") - (version "1.4.1a") + (version "2.0.1") (source (origin (method git-fetch) @@ -1369,7 +1369,7 @@ does not include game data.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1xqv8j8jh3f13fjhyf7hk1anrn799cwwsvsd75kpl9n5yh5s1j5y")) + (base32 "0czazw8mc3fbvdazs2nzvgxd1dpzjc8z5fwiv89vv4nd7laz3jkj")) ;; Remove unused bundled libraries. (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 86fec62f0920d619b798639cbb728e9765ebd724 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sun, 10 Jan 2021 17:42:20 +0100 Subject: gnu: nmap: Downgrade to 7.80. * gnu/packages/admin.scm (nmap): Downgrade to 7.80. --- 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 375073363f..f43daf1e02 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2611,14 +2611,14 @@ done with the @code{auditctl} utility.") (define-public nmap (package (name "nmap") - (version "7.91") + (version "7.80") (source (origin (method url-fetch) (uri (string-append "https://nmap.org/dist/nmap-" version ".tar.bz2")) (sha256 (base32 - "001kb5xadqswyw966k2lqi6jr6zz605jpp9w4kmm272if184pk0q")) + "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 2dba37e27a75c4a8ffac324d419c020f1b900d66 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sun, 10 Jan 2021 17:43:31 +0100 Subject: Revert "gnu: nmap: Update license." This reverts commit 2323a7120a0f3ed96fedfff42e86c0aee97995c0. The new license has been deemed non-free by Fedora [1] and there has not yet been a statement by the FSF claiming otherwise. See also [2]. [1] https://github.com/nmap/nmap/issues/2199 [2] https://lists.gnu.org/archive/html/guix-devel/2020-10/msg00227.html --- gnu/packages/admin.scm | 2 +- guix/licenses.scm | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f43daf1e02..23acab2110 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2696,7 +2696,7 @@ advanced netcat implementation (ncat), a utility for comparing scan results (ndiff), and a packet generation and response analysis tool (nping).") ;; This package uses nmap's bundled versions of libdnet and liblinear, which ;; both use a 3-clause BSD license. - (license (list license:npsl license:bsd-3)))) + (license (list license:nmap license:bsd-3)))) (define-public dstat (package diff --git a/guix/licenses.scm b/guix/licenses.scm index 255b755e6c..63010a7231 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -78,7 +78,7 @@ mpl1.0 mpl1.1 mpl2.0 ms-pl ncsa - npsl + nmap ogl-psi1.0 openldap2.8 openssl perl-license @@ -531,10 +531,10 @@ at URI, which may be a file:// URI pointing the package's tree." "http://directory.fsf.org/wiki/License:IllinoisNCSA" "https://www.gnu.org/licenses/license-list#NCSA")) -(define npsl - (license "Nmap Public Source License" - "https://svn.nmap.org/nmap/LICENSE" - "https://nmap.org/npsl/")) +(define nmap + (license "Nmap license" + "https://svn.nmap.org/nmap/COPYING" + "https://fedoraproject.org/wiki/Licensing/Nmap")) (define ogl-psi1.0 (license "Open Government Licence for Public Sector Information" -- cgit v1.2.3 From f40ae739bce67a6da17450cf5ce9cce39c7c4ce3 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 10 Jan 2021 19:31:58 +0100 Subject: gnu: linux: Don't timeout on blob scan. On berlin, linux-libre blob scanning timeouts after 600 seconds, increase max-silent-time to 3600 seconds. * gnu/packages/linux.scm (make-linux-libre*): Set max-silent-time property to 3600. --- gnu/packages/linux.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 46b86186e9..77277e2067 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -850,7 +850,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (description "GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel. It has been modified to remove all non-free binary blobs.") - (license license:gpl2))) + (license license:gpl2) + (properties '((max-silent-time . 3600))))) ;don't timeout on blob scan. ;;; -- cgit v1.2.3 From 473822336c716f7d0b3564429320e2dca66b438b Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sun, 10 Jan 2021 13:02:20 -0600 Subject: gnu: emacs-trashed: Update to 2.1.2. * gnu/packages/emacs-xyz.scm (emacs-trashed): Update to 2.1.2. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 81ae90ea31..76cbe7e075 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -41,7 +41,7 @@ ;;; Copyright © 2018 Alex Branham ;;; Copyright © 2018 Thorsten Wilms ;;; Copyright © 2018, 2019, 2020 Pierre Langlois -;;; Copyright © 2018, 2019, 2020 Brett Gilio +;;; Copyright © 2018, 2019, 2020, 2021 Brett Gilio ;;; Copyright © 2019, 2020 Dimakakos Dimos ;;; Copyright © 2019, 2020 Brian Leung ;;; Copyright © 2019 mikadoZero @@ -25761,7 +25761,7 @@ comments or emails.") (define-public emacs-trashed (package (name "emacs-trashed") - (version "1.9.0") + (version "2.1.2") (source (origin (method git-fetch) @@ -25770,7 +25770,7 @@ comments or emails.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "13grdi12iwlw4fiphdfmvclfpbr6ajlgfbfyi7v41z8k3rxz4ypz")))) + (base32 "0lfza55nbb62nmr27cwpcz2ad1vm95piq4nfd8zvkwqbn6klwmm6")))) (build-system emacs-build-system) (home-page "https://github.com/shingo256/trashed/") (synopsis "View and edit system trash can in Emacs") -- cgit v1.2.3 From fa6c81bbd5d1215c4074502bd65855676be5539e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 10 Jan 2021 22:59:26 +0100 Subject: gnu: rust-crypto-mac-0.8: Fix hash. * gnu/packages/crates-io.scm (rust-crypto-mac-0.8): Fix hash. The hash had been copied from rust-crypto-mac-0.7 when this variable was introduced. --- 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 38d6fe806a..260fc5ddd9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7631,7 +7631,7 @@ Code} (MAC) algorithms.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1rbrq6qy9dl0pj4ym2zy33miaaa8vpzdss60p9bdb58xy46l0d24")))) + "1axfs4zmy74rn9666p92j7nmcv11zdp2d51yrppc2dv26cqa715m")))) (arguments `(#:cargo-inputs (("rust-blobby" ,rust-blobby-0.1) -- cgit v1.2.3 From 8818bb3a3eae61571bc9bae7a2b8f9028c9a1f5c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Jan 2021 19:02:28 +0100 Subject: gnu: zutils: Update to 1.10. * gnu/packages/compression.scm (zutils): Update to 1.10. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 1eab34a517..4aa3665fe8 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2075,13 +2075,13 @@ reading from and writing to ZIP archives. ") (define-public zutils (package (name "zutils") - (version "1.9") + (version "1.10") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/zutils/zutils-" version ".tar.lz")) (sha256 - (base32 "0y2wm8wqr1wi1b1fv45dn50njv4q81p6ifx0279ji1bq56qkrn2r")))) + (base32 "15dimqp8zlqaaa2l46r22srp1py38mlmn69ph1j5fmrd54w43m0d")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 9b415c0b36c885e7899c45617a8c4e64118a6379 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Jan 2021 19:23:37 +0100 Subject: gnu: llvm: Update to 11.0.1. * gnu/packages/llvm.scm (llvm): Update to 11.0.1. (clang-runtime-11, clang-11): Update corresponding source hashes. --- gnu/packages/llvm.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 114654c628..a9265851ab 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018, 2019, 2020 Marius Bakke -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2018 Pierre Neidhardt @@ -476,14 +476,13 @@ output), and Binutils.") (define-public llvm-11 (package (name "llvm") - (version "11.0.0") + (version "11.0.1") (source (origin (method url-fetch) (uri (llvm-uri "llvm" version)) (sha256 - (base32 - "0s94lwil98w7zb7cjrbnxli0z7gklb312pkw74xs1d6zk346hgwi")))) + (base32 "0a5mb65xa5bal8q6cb37xgkqis2bip87fsafgq3wbsva9cjprn6c")))) (build-system cmake-build-system) (outputs '("out" "opt-viewer")) (native-inputs @@ -538,11 +537,11 @@ of programming tools as well as libraries with equivalent functionality.") (define-public clang-runtime-11 (clang-runtime-from-llvm llvm-11 - "0d5j5l8phwqjjscmk8rmqn0i2i0abl537gdbkagl8fjpzy1gyjip")) + "1z470r8c5aahdwkmflglx998n0i77j8b1c69d7cir1kf27qy6yq8")) (define-public clang-11 (clang-from-llvm llvm-11 clang-runtime-11 - "02ajkij85966vd150iy246mv16dsaph1kfi0y8wnncp8w6nar5hg" + "0kab4zmkxffg98a3rx95756jlwhxflalin5w05g1anpwxv175xbk" #:patches '("clang-11.0-libc-search-path.patch") #:tools-extra (origin @@ -551,7 +550,7 @@ of programming tools as well as libraries with equivalent functionality.") (package-version llvm-11))) (sha256 (base32 - "02bcwwn54661madhq4nxc069s7p7pj5gpqi8ww50w3anbpviilzy"))))) + "1j8n6n4l54k2lrdxh266y1fl4z8vy5dc76wsf0csk5n3ikfi38ic"))))) (define-public clang-toolchain-11 (make-clang-toolchain clang-11)) -- cgit v1.2.3 From 8aa66ccb554e4258c93b2d81271b71ad15651d8b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Jan 2021 20:06:14 +0100 Subject: gnu: obs: Update to 26.1.2. * gnu/packages/video.scm (obs): Update to 26.1.2. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b4a40f6ea6..b314e4903b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3078,7 +3078,7 @@ be used for realtime video capture via Linux-specific APIs.") (define-public obs (package (name "obs") - (version "26.1.1") + (version "26.1.2") (source (origin (method git-fetch) (uri (git-reference @@ -3087,7 +3087,7 @@ be used for realtime video capture via Linux-specific APIs.") (file-name (git-file-name name version)) (sha256 (base32 - "18b40ayww5isjqnjz63l05fi5xwzrcc64jvwxwq8nqsydn0b14ng")))) + "1k1asqiqw757v59ayx0w029ril947hs0lcp8n91knzjl891fr4nc")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 9ec11a5669d647f9ef7d6e01f25336f5da0aa653 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Jan 2021 20:16:58 +0100 Subject: gnu: polybar: Update to 3.5.4. * gnu/packages/wm.scm (polybar): Update to 3.5.4. --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index e1359c8539..084822f2c7 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017, 2019, 2020 Marius Bakke ;;; Copyright © 2017, 2020 Oleg Pykhalov -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018, 2019 Meiyo Peng ;;; Copyright © 2019 Rutger Helling @@ -1301,14 +1301,14 @@ its size (define-public polybar (package (name "polybar") - (version "3.5.3") + (version "3.5.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/polybar/polybar/releases/" "download/" version "/polybar-" version ".tar.gz")) (sha256 - (base32 "1016g4b981c4hl2pr0m09b4wy0ln1zf3mfp09wrxs73zgfdbngyj")))) + (base32 "0awwjp3l0y9yhmrl914710ipawp2xr43jxrvmnanahlznblg8fhk")))) (build-system cmake-build-system) (arguments ;; Test is disabled because it requires downloading googletest from the -- cgit v1.2.3 From 8498aee86cc6033ae90a262410a1fb270d88073b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Jan 2021 21:38:46 +0100 Subject: gnu: Move brlaser to (gnu packages cups). * gnu/packages/printers.scm (cups): Move from here... * gnu/packages/cups.scm (cups): ...to here. --- gnu/packages/cups.scm | 72 +++++++++++++++++++++++++++++++++++++++++++++-- gnu/packages/printers.scm | 72 ----------------------------------------------- 2 files changed, 70 insertions(+), 74 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index c8ca5db1a0..51efee5157 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -1,11 +1,11 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Ricardo Wurmus +;;; Copyright © 2015, 2019, 2021 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017, 2019 Ludovic Courtès ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Mark H Weaver -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2017–2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. @@ -47,6 +47,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages scanner) #:use-module (gnu packages tls) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix download) @@ -57,6 +58,73 @@ #:use-module (srfi srfi-1) #:use-module (ice-9 match)) +(define-public brlaser + (let ((commit "9d7ddda8383bfc4d205b5e1b49de2b8bcd9137f1") + (revision "1")) + (package + (name "brlaser") + (version (git-version "6" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pdewacht/brlaser") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1drh0nk7amn9a8wykki4l9maqa4vy7vwminypfy1712alwj31nd4")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list (string-append "-DCUPS_DATA_DIR=" + (assoc-ref %outputs "out") + "/share/cups") + (string-append "-DCUPS_SERVER_BIN=" + (assoc-ref %outputs "out") + "/lib/cups")))) + (inputs + `(("ghostscript" ,ghostscript) + ("cups" ,cups) + ("zlib" ,zlib))) + (home-page "https://github.com/pdewacht/brlaser") + (synopsis "Brother laser printer driver") + (description "Brlaser is a CUPS driver for Brother laser printers. This +driver is known to work with these printers: + +@enumerate +@item Brother DCP-1510 series +@item Brother DCP-1600 series +@item Brother DCP-7030 +@item Brother DCP-7040 +@item Brother DCP-7055 +@item Brother DCP-7055W +@item Brother DCP-7060D +@item Brother DCP-7065DN +@item Brother DCP-7080 +@item Brother DCP-L2500D series +@item Brother DCP-L2520D series +@item Brother DCP-L2540DW series +@item Brother HL-1110 series +@item Brother HL-1200 series +@item Brother HL-2030 series +@item Brother HL-2140 series +@item Brother HL-2220 series +@item Brother HL-2270DW series +@item Brother HL-5030 series +@item Brother HL-L2300D series +@item Brother HL-L2320D series +@item Brother HL-L2340D series +@item Brother HL-L2360D series +@item Brother MFC-1910W +@item Brother MFC-7240 +@item Brother MFC-7360N +@item Brother MFC-7365DN +@item Brother MFC-7840W +@item Brother MFC-L2710DW series +@item Lenovo M7605D +@end enumerate") + (license license:gpl2+)))) + (define-public cups-filters (package (name "cups-filters") diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm index e03582c47b..9ab9da37fb 100644 --- a/gnu/packages/printers.scm +++ b/gnu/packages/printers.scm @@ -1,7 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Ludovic Courtès ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2019, 2021 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,13 +20,9 @@ (define-module (gnu packages printers) #:use-module (guix packages) #:use-module (guix git-download) - #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:prefix license:) - #:use-module (gnu packages compression) - #:use-module (gnu packages cups) #:use-module (gnu packages libusb) - #:use-module (gnu packages ghostscript) #:use-module (gnu packages pkg-config) #:use-module (gnu packages qt)) @@ -73,70 +68,3 @@ with Graphtec and Sihouette plotting cutters using an SVG file as its input.") (home-page "http://robocut.org") (license license:gpl3+))) - -(define-public brlaser - (let ((commit "9d7ddda8383bfc4d205b5e1b49de2b8bcd9137f1") - (revision "1")) - (package - (name "brlaser") - (version (git-version "6" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pdewacht/brlaser") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1drh0nk7amn9a8wykki4l9maqa4vy7vwminypfy1712alwj31nd4")))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags - (list (string-append "-DCUPS_DATA_DIR=" - (assoc-ref %outputs "out") - "/share/cups") - (string-append "-DCUPS_SERVER_BIN=" - (assoc-ref %outputs "out") - "/lib/cups")))) - (inputs - `(("ghostscript" ,ghostscript) - ("cups" ,cups) - ("zlib" ,zlib))) - (home-page "https://github.com/pdewacht/brlaser") - (synopsis "Brother laser printer driver") - (description "Brlaser is a CUPS driver for Brother laser printers. This -driver is known to work with these printers: - -@enumerate -@item Brother DCP-1510 series -@item Brother DCP-1600 series -@item Brother DCP-7030 -@item Brother DCP-7040 -@item Brother DCP-7055 -@item Brother DCP-7055W -@item Brother DCP-7060D -@item Brother DCP-7065DN -@item Brother DCP-7080 -@item Brother DCP-L2500D series -@item Brother DCP-L2520D series -@item Brother DCP-L2540DW series -@item Brother HL-1110 series -@item Brother HL-1200 series -@item Brother HL-2030 series -@item Brother HL-2140 series -@item Brother HL-2220 series -@item Brother HL-2270DW series -@item Brother HL-5030 series -@item Brother HL-L2300D series -@item Brother HL-L2320D series -@item Brother HL-L2340D series -@item Brother HL-L2360D series -@item Brother MFC-1910W -@item Brother MFC-7240 -@item Brother MFC-7360N -@item Brother MFC-7365DN -@item Brother MFC-7840W -@item Brother MFC-L2710DW series -@item Lenovo M7605D -@end enumerate") - (license license:gpl2+)))) -- cgit v1.2.3 From 432cb80309f0f50d3359ed4452039066451e41f8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Jan 2021 23:38:28 +0100 Subject: gnu: bwm-ng: Update to 0.6.3. * gnu/packages/networking.scm (bwm-ng): Update to 0.6.3. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index fad917a7c0..83a99ded72 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1664,7 +1664,7 @@ reusing frequently-requested web pages.") (define-public bwm-ng (package (name "bwm-ng") - (version "0.6.2") + (version "0.6.3") (source (origin (method git-fetch) @@ -1673,7 +1673,7 @@ reusing frequently-requested web pages.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0k906wb4pw3dcqpcwnni78lahzi3bva483f8c17sjykic7as4y5n")))) + (base32 "1gpp2l3w479h1w5skjra5xy0gxd24kvmk6i4psbkafnv2399la4k")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From a25896bb7576c8232acc7a3fd4da0b1cba89569b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 10 Jan 2021 23:47:53 -0500 Subject: gnu: vigra: Raise max-silent-time timeout value to 2 hours. Fixes . * gnu/packages/image.scm (vigra)[properties]: Add a 'max-silent-time' property, with a value of 7200 seconds (2 hours). --- gnu/packages/image.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 8cba9c298b..935333dee2 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1218,7 +1218,9 @@ processing and analysis library that puts its main emphasis on customizable algorithms and data structures. It is particularly strong for multi-dimensional image processing.") (license license:expat) - (home-page "https://ukoethe.github.io/vigra/"))) + (home-page "https://ukoethe.github.io/vigra/") + (properties '((max-silent-time . 7200))))) ;2 hours, to avoid timing out + (define-public vigra-c (let* ((commit "66ff4fa5a7d4a77415caa676a45c2c6ea16562e7") -- cgit v1.2.3 From 205c4ae2f7c60a6491df7c2c598eac71d369eb08 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 11 Jan 2021 10:44:28 +0200 Subject: gnu: liferea: Add source file-name. * gnu/packages/syndication.scm (liferea)[source]: Add file-name field. --- gnu/packages/syndication.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index efe231c92f..72dbee10cf 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -191,6 +191,7 @@ file system, and many more features.") (uri (git-reference (url "https://github.com/lwindolf/liferea/") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "1g9463bvswsm899j6dfhslcg6np70m5wq143mjicr24zy8d17bm7")))) (build-system glib-or-gtk-build-system) -- cgit v1.2.3 From 5aa45d34773863d6519d4ec66318a694edafccbd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 11 Jan 2021 10:47:40 +0200 Subject: gnu: newsboat: Update to 2.22.1. * gnu/packages/syndication.scm (newsboat): Update to 2.22.1. --- gnu/packages/syndication.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 72dbee10cf..54fa221fa6 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -56,7 +56,7 @@ (define-public newsboat (package (name "newsboat") - (version "2.22") + (version "2.22.1") (source (origin (method url-fetch) @@ -64,7 +64,7 @@ "/newsboat-" version ".tar.xz")) (sha256 (base32 - "146p3j46hna1m8zlacb9q1ljnldwv6xrjbaplm94f2x0v4azi1jj")))) + "1476fmfw2hkrjwyr3f7k9316lzwnn2b1dbc51rybcxipqlfg8849")))) (build-system cargo-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 1999934c851bf5e8c0aaeea7091bdfdc2e0d81ae Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sat, 9 Jan 2021 15:39:06 +0100 Subject: gnu: glfw: Update to 3.3.2. * gnu/packages/gl.scm (glfw): Update to 3.3.2. (propagated-inputs): Add missing libxi. Signed-off-by: Efraim Flashner --- gnu/packages/gl.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index d9d83e7d32..1d44ef8ee1 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -770,7 +770,7 @@ OpenGL.") (define-public glfw (package (name "glfw") - (version "3.2.1") + (version "3.3.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/glfw/glfw" @@ -778,7 +778,7 @@ OpenGL.") "/glfw-" version ".zip")) (sha256 (base32 - "09kk5yc1zhss9add8ryqrngrr16hdmc94rszgng135bhw09mxmdp")))) + "1izgc4r0ypxwwklfzj98ab4xqsjpb1wbsfdbivvxpmr95x8km8q8")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no test target @@ -792,6 +792,7 @@ OpenGL.") ;; These are in 'Requires.private' of 'glfw3.pc'. ("libx11" ,libx11) ("libxrandr" ,libxrandr) + ("libxi" ,libxi) ("libxinerama" ,libxinerama) ("libxcursor" ,libxcursor) ("libxxf86vm" ,libxxf86vm))) -- cgit v1.2.3 From 458cb25b9e7e7c954f468023abea2bebb5d8c75b Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Sun, 10 Jan 2021 05:53:04 +0000 Subject: gnu: esbuild: Update to 0.8.31. * gnu/packages/web.scm (esbuild): Update to 0.8.31. Signed-off-by: Efraim Flashner --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0b75a27b0c..397fa387cc 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1487,7 +1487,7 @@ used to validate and fix HTML data.") (define-public esbuild (package (name "esbuild") - (version "0.8.29") + (version "0.8.31") (source (origin (method git-fetch) @@ -1496,7 +1496,7 @@ used to validate and fix HTML data.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "142gc21aaqmx0d01vmqsg7zi85pjgi3higr4ba0m52qf3mvxd6as")) + (base32 "08ixas858jlnlrgrcpjiccwb3xdaxd7dd42i7676ymi3a2421f5w")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From bd46b80aa1c82def8535ac3350dddeb98476360b Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Wed, 6 Jan 2021 13:06:00 +0100 Subject: gnu: ppp: Update to 2.4.9. * gnu/packages/samba.scm (ppp): Update to 2.4.9. Signed-off-by: Efraim Flashner --- gnu/packages/samba.scm | 87 ++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 45 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 679e2ab869..13e03d7ac7 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -443,51 +443,48 @@ key-value pair databases and a real LDAP database.") (license lgpl3+))) (define-public ppp - ;; This git commit contains unreleased fixes for CVE-2020-8597. - (let ((revision "1") - (commit "8d45443bb5c9372b4c6a362ba2f443d41c5636af")) - (package - (name "ppp") - (version (git-version "2.4.8" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/paulusmack/ppp") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "06cf8fb84l3h2zy5da4j7k2j1qjv2gfqn986sf43xgj75605aks2")))) - (build-system gnu-build-system) - (arguments - '(#:tests? #f ; no check target - #:make-flags '("CC=gcc") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-Makefile - (lambda* (#:key inputs #:allow-other-keys) - (let ((libc (assoc-ref inputs "libc")) - (openssl (assoc-ref inputs "openssl")) - (libpcap (assoc-ref inputs "libpcap"))) - (substitute* "pppd/Makefile.linux" - (("/usr/include/crypt\\.h") - (string-append libc "/include/crypt.h")) - (("/usr/include/openssl") - (string-append openssl "/include/openssl")) - (("/usr/include/pcap-bpf.h") - (string-append libpcap "/include/pcap-bpf.h"))) - #t)))))) - (inputs - `(("libpcap" ,libpcap) - ("openssl" ,(@ (gnu packages tls) openssl)))) - (synopsis "Implementation of the Point-to-Point Protocol") - (home-page "https://ppp.samba.org/") - (description - "The Point-to-Point Protocol (PPP) provides a standard way to establish + (package + (name "ppp") + (version "2.4.9") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/paulusmack/ppp") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bhhksdclsnkw54a517ndrw55q5zljjbh9pcqz1z4a2z2flxpsgk")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; no check target + #:make-flags '("CC=gcc") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-Makefile + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (assoc-ref inputs "libc")) + (openssl (assoc-ref inputs "openssl")) + (libpcap (assoc-ref inputs "libpcap"))) + (substitute* "pppd/Makefile.linux" + (("/usr/include/crypt\\.h") + (string-append libc "/include/crypt.h")) + (("/usr/include/openssl") + (string-append openssl "/include/openssl")) + (("/usr/include/pcap-bpf.h") + (string-append libpcap "/include/pcap-bpf.h"))) + #t)))))) + (inputs + `(("libpcap" ,libpcap) + ("openssl" ,(@ (gnu packages tls) openssl)))) + (synopsis "Implementation of the Point-to-Point Protocol") + (home-page "https://ppp.samba.org/") + (description + "The Point-to-Point Protocol (PPP) provides a standard way to establish a network connection over a serial link. At present, this package supports IP and IPV6 and the protocols layered above them, such as TCP and UDP.") - ;; pppd, pppstats and pppdump are under BSD-style notices. - ;; some of the pppd plugins are GPL'd. - ;; chat is public domain. - (license (list bsd-3 bsd-4 gpl2+ public-domain))))) + ;; pppd, pppstats and pppdump are under BSD-style notices. + ;; some of the pppd plugins are GPL'd. + ;; chat is public domain. + (license (list bsd-3 bsd-4 gpl2+ public-domain)))) -- cgit v1.2.3 From b54b3f5419849286611279231d8a2c61d3e935b4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Jan 2021 11:49:04 +0100 Subject: gnu: guile-picture-language: Update to 0.0.1-4.291a746. * gnu/packages/guile-xyz.scm (guile-picture-language): Update to 0.0.1-4.291a746. [propagated-inputs]: Add guile-cairo. --- gnu/packages/guile-xyz.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index c5eaa8a2ca..9775cc33f0 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2570,8 +2570,8 @@ format is also supported.") (deprecated-package "guile3.0-mcron" mcron)) (define-public guile-picture-language - (let ((commit "7e5982a2788bd79a45ad6f02db46f061f97b6e14") - (revision "3")) + (let ((commit "291a746a1d3b4784d38b05239bdd7b8e796ce761") + (revision "4")) (package (name "guile-picture-language") (version (git-version "0.0.1" revision commit)) @@ -2583,12 +2583,13 @@ format is also supported.") (file-name (git-file-name name version)) (sha256 (base32 - "1y5f14cll4jx33hr43dpgrpd0yy6g0g7lim365kmgb0h0cvja80p")))) + "0rnhf13ds92sbdicshy4sy4kl2kc431fy9vzm1divw974p7v57sd")))) (build-system gnu-build-system) (inputs `(("guile" ,guile-3.0))) (propagated-inputs - `(("guile-rsvg" ,guile-rsvg))) + `(("guile-cairo" ,guile-cairo) + ("guile-rsvg" ,guile-rsvg))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 21cf0d36db9f02b3da976088b5ab466822d16625 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 11 Jan 2021 11:29:00 +0100 Subject: gnu: guile: Fix tests on emulated architectures. The stack overflow test limits the virtual memory size using setrlimit with RLIMIT_AS argument. This is ignored when using QEMU transparent emulation, causing the test to crash. * gnu/packages/patches/guile-2.2-skip-so-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/guile.scm (guile-3.0-latest): Add it. --- gnu/local.mk | 1 + gnu/packages/guile.scm | 23 +++++++++++++---------- gnu/packages/patches/guile-2.2-skip-so-test.patch | 23 +++++++++++++++++++++++ 3 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/guile-2.2-skip-so-test.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index dea7b3a906..a41795d8aa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1126,6 +1126,7 @@ dist_patch_DATA = \ %D%/packages/patches/gspell-dash-test.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ + %D%/packages/patches/guile-2.2-skip-so-test.patch \ %D%/packages/patches/guile-default-utf8.patch \ %D%/packages/patches/guile-2.2-default-utf8.patch \ %D%/packages/patches/guile-relocatable.patch \ diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 1c983e50eb..dfba797b79 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -310,16 +310,19 @@ without requiring the source code to be rewritten.") (define-public guile-3.0-latest ;; TODO: Make this 'guile-3.0' on the next rebuild cycle. - (package - (inherit guile-3.0) - (version "3.0.5") - (source (origin - (inherit (package-source guile-3.0)) - (uri (string-append "mirror://gnu/guile/guile-" - version ".tar.xz")) - (sha256 - (base32 - "1wah6fq1h8vmbpdadjych1mq8hyqkd7p015cbxm14ri37l1gnxid")))))) + (package-with-extra-patches + (package + (inherit guile-3.0) + (version "3.0.5") + (source (origin + (inherit (package-source guile-3.0)) + (uri (string-append "mirror://gnu/guile/guile-" + version ".tar.xz")) + (sha256 + (base32 + "1wah6fq1h8vmbpdadjych1mq8hyqkd7p015cbxm14ri37l1gnxid"))))) + ;; Remove on the next rebuild cycle. + (search-patches "guile-2.2-skip-so-test.patch"))) (define-public guile-next (deprecated-package "guile-next" guile-3.0)) diff --git a/gnu/packages/patches/guile-2.2-skip-so-test.patch b/gnu/packages/patches/guile-2.2-skip-so-test.patch new file mode 100644 index 0000000000..e7c2594e91 --- /dev/null +++ b/gnu/packages/patches/guile-2.2-skip-so-test.patch @@ -0,0 +1,23 @@ +Skip 'test-stack-overflow' that crashes when using QEMU transparent emulation. + +--- a/test-suite/standalone/Makefile.in 1970-01-01 01:00:01.000000000 +0100 ++++ b/test-suite/standalone/Makefile.in 2021-01-11 10:59:31.606269449 +0100 +@@ -102,8 +102,7 @@ + test-scm-to-latin1-string$(EXEEXT) test-scm-values$(EXEEXT) \ + test-scm-c-bind-keyword-arguments$(EXEEXT) \ + test-srfi-4$(EXEEXT) $(am__append_6) $(am__EXEEXT_1) \ +- test-smob-mark$(EXEEXT) test-smob-mark-race$(EXEEXT) \ +- test-stack-overflow ++ test-smob-mark$(EXEEXT) test-smob-mark-race$(EXEEXT) + check_PROGRAMS = test-num2integral$(EXEEXT) test-round$(EXEEXT) \ + test-foreign-object-c$(EXEEXT) test-list$(EXEEXT) \ + test-unwind$(EXEEXT) test-conversion$(EXEEXT) \ +@@ -1938,7 +1937,7 @@ + test-command-line-encoding test-command-line-encoding2 \ + test-language test-guild-compile $(am__append_3) \ + test-foreign-object-scm test-fast-slot-ref test-mb-regexp \ +- test-use-srfi $(am__append_5) test-stack-overflow ++ test-use-srfi $(am__append_5) + BUILT_SOURCES = $(am__append_2) + EXTRA_DIST = test-import-order-a.scm test-import-order-b.scm \ + test-import-order-c.scm test-import-order-d.scm \ -- cgit v1.2.3 From 1a1d358f2877004125235dc57b19aaace4e2c109 Mon Sep 17 00:00:00 2001 From: Noah Evans Date: Sun, 10 Jan 2021 15:39:40 -0500 Subject: gnu: Add mcg. * gnu/packages/mpd.scm (mcg): New variable. Signed-off-by: Leo Prikler --- gnu/packages/mpd.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 6066913f16..3b76b5502a 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2020 Simon Streit +;;; Copyright © 2021 Noah Evans ;;; ;;; This file is part of GNU Guix. ;;; @@ -460,3 +461,56 @@ of the music library will be created to provide a hierarchy of albums and artists along with albumart.") (home-page "https://github.com/cdrummond/cantata") (license license:gpl3+))) + +(define-public mcg + (package + (name "mcg") + (version "2.1.2") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/coderkun/mcg") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "01iqxydssxyi4s644dwl64vm7xhn0szd99hdpywbipvb7kwp5196")))) + (build-system python-build-system) + (native-inputs + `(("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config))) + (inputs + `(("avahi" ,avahi) + ("dconf" ,dconf) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gtk+" ,gtk+) + ("python-pygobject" ,python-pygobject))) + (arguments + `(#:imported-modules ((guix build glib-or-gtk-build-system) + ,@%python-build-system-modules) + #:modules ((guix build python-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/mcg"))) + (wrap-program prog + `("PYTHONPATH" = (,(getenv "PYTHONPATH"))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) + #t))) + (add-after 'wrap-program 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (synopsis "Covergrid for the MPD") + (description + "mcg (CoverGrid) is a client for the Music Player Daemon (MPD), focusing +on albums instead of single tracks. It is not intended to be a replacement +for your favorite MPD client but an addition to get a better +album-experience.") + (home-page "https://gitlab.com/coderkun/mcg") + (license license:gpl3+))) -- cgit v1.2.3 From 58780f844b3944ae8dab292ef24de87d22bfe657 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 3 Jan 2021 19:36:50 +0100 Subject: gnu: xfce4-screensaver: Update to 4.16.0. * gnu/packages/xfce.scm (xfce4-screensaver): Update to 4.16.0. Signed-off-by: Efraim Flashner --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 2192f61dc7..6b61139157 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1285,7 +1285,7 @@ A plugin for the Xfce panel is also available.") (define-public xfce4-screensaver (package (name "xfce4-screensaver") - (version "0.1.11") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" @@ -1295,7 +1295,7 @@ A plugin for the Xfce panel is also available.") version ".tar.bz2")) (sha256 (base32 - "0xxcvvcch8bqd35ksq8l88a46xnidp59iq4ssyygki0a2vd20h41")))) + "13962rkc7nn3yigv1km8w0z7g41kj2bxmrrwx2f6gnv27qz18kbd")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From da4b830c398609d0dd4fcf41a6da1329b70abea3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 20:15:02 +0100 Subject: gnu: sudo: Update to 1.9.5 [fixes CVE-2021-23239 & CVE-2021-23240]. * gnu/packages/admin.scm (sudo): Update to 1.9.5. --- 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 23acab2110..2018a6c2e8 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1402,7 +1402,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.9.4p2") + (version "1.9.5") (source (origin (method url-fetch) (uri @@ -1412,7 +1412,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "0r0g8z289ipw0zpkhmm33cpfm42j01jds2q1wilhh3flg7xg2jn3")) + "19c39s7fgzjd655g4lgw2gvx448d7blyz8fmb1l0gmhzwxnv261p")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 1cf31ee074aee411c545e2bde2f08f37596c9d4d Mon Sep 17 00:00:00 2001 From: Brit Butler Date: Sat, 9 Jan 2021 23:18:04 -0500 Subject: gnu: Add emacs-consult. * gnu/packages/emacs-xyz.scm (emacs-consult): New variable. Signed-off-by: Leo Prikler --- gnu/packages/emacs-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 76cbe7e075..1defa61294 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -89,6 +89,7 @@ ;;; Copyright © 2020 André A. Gomes ;;; Copyright © 2020 Jonathan Rostran ;;; Copyright © 2020 Noah Evans +;;; Copyright © 2020 Brit Butler ;;; ;;; This file is part of GNU Guix. ;;; @@ -6983,6 +6984,33 @@ any one of several ways: literally, as a regexp, as an initialism, in the flex style, or as multiple word prefixes.") (license license:gpl3+))) +(define-public emacs-consult + ;; There are no tagged releases upstream on GitHub, instead we are using the + ;; most recent commit. + (let ((commit "ef6bb73a4a46e686826968fa25169e2d59b9a087") + (revision "0")) + (package + (name "emacs-consult") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minad/consult") + (commit commit))) + (sha256 + (base32 "00cnwg2knd820wwx6zg71rr0whpdhqm64gm3qx1mgklk79g7daih")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs `(("emacs-flycheck" ,emacs-flycheck) + ("emacs-selectrum" ,emacs-selectrum))) + (home-page "https://github.com/minad/consult") + (synopsis "Consulting completing-read") + (description "This package provides various handy commands based on the +Emacs completion function completing-read, which allows to quickly select from a +list of candidates.") + (license license:gpl3+)))) + (define-public emacs-smartparens (package (name "emacs-smartparens") -- cgit v1.2.3 From a8f8680b40e7dc90b08060425441d1416378cfcb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 22:08:27 +0100 Subject: gnu: libblockdev: Update to 2.25. * gnu/packages/disk.scm (libblockdev): Update to 2.25. --- gnu/packages/disk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 3cc9601d21..102b105dab 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -860,7 +860,7 @@ to create devices with respective mappings for the ATARAID sets discovered.") (define-public libblockdev (package (name "libblockdev") - (version "2.24") + (version "2.25") (source (origin (method url-fetch) (uri (string-append "https://github.com/storaged-project/" @@ -868,7 +868,7 @@ to create devices with respective mappings for the ATARAID sets discovered.") version "-1/libblockdev-" version ".tar.gz")) (sha256 (base32 - "0wq7624pnprvfzrf39bq1cybd9lqwawbdg5bm0cchlpgvdq7q86w")))) + "0s0nazkpzpn4an00qghjkk9n7gdm5a8dqfr5hfnlk5mk5lma8njm")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From bef64a7fab48cde7d61e9ce5b1e85b6555c8e21b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 22:09:19 +0100 Subject: gnu: rng-tools: Update to 6.11. * gnu/packages/linux.scm (rng-tools): Update to 6.11. --- 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 77277e2067..8656da9958 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5626,7 +5626,7 @@ The collection contains a set of bandwidth and latency benchmark such as: (package (name "rng-tools") (home-page "https://github.com/nhorman/rng-tools") - (version "6.10") + (version "6.11") (source (origin (method git-fetch) (uri (git-reference (url home-page) @@ -5634,7 +5634,7 @@ The collection contains a set of bandwidth and latency benchmark such as: (file-name (git-file-name name version)) (sha256 (base32 - "0hbml37yxs0fs69g7f2x4ixq61z0029swy99rn7ykma9mi6b7ni9")))) + "0wwvi8a8k2ahhmwln4w970b8gd3in3g13jkbsapkpnspwmlqj5xa")))) (build-system gnu-build-system) (arguments `(;; Disable support for various hardware entropy sources as they need -- cgit v1.2.3 From 7ece89fa2ba18d3f8402ed309aa0c7bfdbaff990 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 22:09:29 +0100 Subject: gnu: htop: Update to 3.0.5. * gnu/packages/admin.scm (htop): Update to 3.0.5. --- 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 2018a6c2e8..90a9c2e439 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -516,7 +516,7 @@ or via the @code{facter} Ruby library.") (define-public htop (package (name "htop") - (version "3.0.4") + (version "3.0.5") (source (origin (method git-fetch) @@ -524,7 +524,7 @@ or via the @code{facter} Ruby library.") (url "https://github.com/htop-dev/htop") (commit version))) (sha256 - (base32 "1fckfv96vzqjs3lzy0cgwsqv5vh1sxca3fhvgskmnkvr5bq6cia9")) + (base32 "10lp6cbfvigzp6pq5nwj3s3l4vs7cv92krz2r08nwrz8vl6rqdzp")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 26bd3dc9ad6ace387481e671cb1015207d80a0ce Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 22:09:56 +0100 Subject: gnu: erofs-utils: Update to 1.2.1. * gnu/packages/linux.scm (erofs-utils): Update to 1.2.1. --- 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 8656da9958..28698068b0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7857,7 +7857,7 @@ kernel side implementation.") (define-public erofs-utils (package (name "erofs-utils") - (version "1.2") + (version "1.2.1") (source (origin (method git-fetch) @@ -7866,7 +7866,7 @@ kernel side implementation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "07hvijq2hsn3gg1kb8abrfk23n83j57yx8kyv4wqgwhhvd30myjc")))) + (base32 "1vb4mxsb59g29x7l22cffsqa8x743sra4j5zbmx89hjwpwm9vvcg")))) (build-system gnu-build-system) (inputs `(("lz4" ,lz4) -- cgit v1.2.3 From aec795a5a1a6e0e3a627f40c1fdaca741bd7fd03 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 22:10:06 +0100 Subject: gnu: inxi-minimal: Update to 3.2.02-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.2.02-1. --- 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 90a9c2e439..c67910aaf6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3617,7 +3617,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.2.01-1") + (version "3.2.02-1") (source (origin (method git-fetch) @@ -3626,7 +3626,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "15bakrv3jzj5h88c3bd0cfhh6hb8b4hm79924k1ygn29sqzgyw65")))) + (base32 "1kh96093waji30ndka3i3dq9pq4f53gq8pgcbxw45mldlx2i98gv")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) -- cgit v1.2.3 From 1f2e96ad038a4b042cbad555297d06cac0ea5f17 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 22:17:01 +0100 Subject: gnu: mcelog: Update to 175. * gnu/packages/linux.scm (mcelog): Update to 175. --- 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 28698068b0..3f44253f1e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5911,14 +5911,14 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.") (define-public mcelog (package (name "mcelog") - (version "173") + (version "175") (source (origin (method url-fetch) (uri (string-append "https://git.kernel.org/cgit/utils/cpu/mce/" "mcelog.git/snapshot/v" version ".tar.gz")) (sha256 (base32 - "1a1j4lsvql3aiqbkdn10hhpvmhavhlr9qkh2scxcv1kn7rvvclih")) + "1cfx7qpyai10n0qsm7z3h3hmkssarwvvq8yb0dd3lsc97ypx96z3")) (file-name (string-append name "-" version ".tar.gz")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 0463f7d7064ad1d9a5ee3c1d05191ff8693ade84 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 22:18:10 +0100 Subject: gnu: mcelog: Cross-compile. * gnu/packages/linux.scm (mcelog)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3f44253f1e..f1dcf72515 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5933,7 +5933,7 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.") `(#:phases (modify-phases %standard-phases (delete 'configure)) ; no configure script #:make-flags (let ((out (assoc-ref %outputs "out"))) - (list "CC=gcc" + (list (string-append "CC=" ,(cc-for-target)) (string-append "prefix=" out) (string-append "DOCDIR=" out "/share/doc/" ,name "-" ,version) -- cgit v1.2.3 From b226ccf3ff036b8196bce422beb3932b5ee833d1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 22:23:49 +0100 Subject: gnu: mcelog: Don't use unstable tarball. * gnu/packages/linux.scm (mcelog)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/linux.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f1dcf72515..b16b3b7adb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5912,22 +5912,22 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.") (package (name "mcelog") (version "175") - (source (origin - (method url-fetch) - (uri (string-append "https://git.kernel.org/cgit/utils/cpu/mce/" - "mcelog.git/snapshot/v" version ".tar.gz")) - (sha256 - (base32 - "1cfx7qpyai10n0qsm7z3h3hmkssarwvvq8yb0dd3lsc97ypx96z3")) - (file-name (string-append name "-" version ".tar.gz")) - (modules '((guix build utils))) - (snippet - `(begin - ;; The snapshots lack a .git directory, - ;; breaking ‘git describe’. - (substitute* "Makefile" - (("\"unknown\"") (string-append "\"v" ,version "\""))) - #t)))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0vvrnjkh1jp7f6295syydg7lplqmcm8msdls3xyk8xfiz69xqdjz")) + (modules '((guix build utils))) + (snippet + `(begin + ;; The checkout lack a .git directory, breaking ‘git describe’. + (substitute* "Makefile" + (("\"unknown\"") (string-append "\"v" ,version "\""))) + #t)))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From df50d2a02d1fb574b13a3f89eaf061e102ceb424 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 22:25:08 +0100 Subject: gnu: podofo: Update to 0.9.7. * gnu/packages/pdf.scm (podofo): Update to 0.9.7. [source]: Remove patch. * gnu/packages/patches/podofo-cmake-3.12.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/podofo-cmake-3.12.patch | 19 ------------------- gnu/packages/pdf.scm | 7 +++---- 3 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 gnu/packages/patches/podofo-cmake-3.12.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index a41795d8aa..65fbbe8dc5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1489,7 +1489,6 @@ dist_patch_DATA = \ %D%/packages/patches/plib-CVE-2011-4620.patch \ %D%/packages/patches/plib-CVE-2012-4552.patch \ %D%/packages/patches/plotutils-spline-test.patch \ - %D%/packages/patches/podofo-cmake-3.12.patch \ %D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portmidi-modular-build.patch \ %D%/packages/patches/postgresql-disable-resolve_symlinks.patch \ diff --git a/gnu/packages/patches/podofo-cmake-3.12.patch b/gnu/packages/patches/podofo-cmake-3.12.patch deleted file mode 100644 index 0a3c19b21a..0000000000 --- a/gnu/packages/patches/podofo-cmake-3.12.patch +++ /dev/null @@ -1,19 +0,0 @@ -The build fails with cmake 3.12.0. This patch will be obsolete with the next -release. - -https://sourceforge.net/p/podofo/tickets/24/attachment/podofo-cmake-3.12.patch - - ---- a/test/TokenizerTest/CMakeLists.txt 2018-07-20 18:26:02.921494293 +0200 -+++ b/test/TokenizerTest/CMakeLists.txt 2018-07-20 18:34:53.727136443 +0200 -@@ -2,10 +2,3 @@ - TARGET_LINK_LIBRARIES(TokenizerTest ${PODOFO_LIB} ${PODOFO_LIB_DEPENDS}) - SET_TARGET_PROPERTIES(TokenizerTest PROPERTIES COMPILE_FLAGS "${PODOFO_CFLAGS}") - ADD_DEPENDENCIES(TokenizerTest ${PODOFO_DEPEND_TARGET}) -- --# Copy the test samples over to the build tree --ADD_CUSTOM_COMMAND( -- TARGET TokenizerTest -- POST_BUILD -- COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/objects" "${CMAKE_CURRENT_BINARY_DIR}/objects" -- ) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 224bd792bd..48c2158e7a 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017, 2018 Rene Saavedra -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Ben Sturmfels ;;; Copyright © 2019,2020 Hartmut Goebel @@ -648,15 +648,14 @@ interaction.") (define-public podofo (package (name "podofo") - (version "0.9.6") + (version "0.9.7") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/podofo/podofo/" version "/podofo-" version ".tar.gz")) (sha256 (base32 - "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9")) - (patches (search-patches "podofo-cmake-3.12.patch")))) + "1f0yvkx6nf99fp741w2y706d8bs9824x1z2gqm3rdy5fv8bfgwkw")))) (build-system cmake-build-system) (native-inputs `(("cppunit" ,cppunit) -- cgit v1.2.3 From 8153705512a0b5ad0a1af60437e4398c23068b5b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 22:28:58 +0100 Subject: gnu: podofo: Omit static library. * gnu/packages/pdf.scm (podofo)[arguments]: Remove explicit "-DPODOFO_BUILD_STATIC=ON" from #:configure-flags. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 48c2158e7a..d03379c113 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -670,8 +670,8 @@ interaction.") ("openssl" ,openssl) ("zlib" ,zlib))) (arguments - `(#:configure-flags '("-DPODOFO_BUILD_SHARED=ON" - "-DPODOFO_BUILD_STATIC=ON") + `(#:configure-flags + (list "-DPODOFO_BUILD_SHARED=ON") #:phases (modify-phases %standard-phases (add-before 'configure 'patch -- cgit v1.2.3 From 103b0ca3a7200664998bb7ef4d583ae18b5ecb57 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 23:49:07 +0100 Subject: gnu: serd: Update to 0.30.8. * gnu/packages/rdf.scm (serd): Update to 0.30.8. --- gnu/packages/rdf.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index be426e102a..de14a9a03e 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Andreas Enge ;;; Copyright © 2015, 2016, 2018 Ricardo Wurmus -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020 Pjotr Prins @@ -268,14 +268,14 @@ and triple stores.") (define-public serd (package (name "serd") - (version "0.30.6") + (version "0.30.8") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/serd-" version ".tar.bz2")) (sha256 (base32 - "1vrprliknw9s0mz99dk7qf8i8xx38dd173q6b60332wxcm6cg8pm")))) + "11zs53yx40mv62vxsl15mvdh7s17y5v6lgcgahdvzxgnan7w8bk7")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From ca8ac129a40aef6c05e8249ee131ff06c3851098 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 23:49:15 +0100 Subject: gnu: sord: Update to 0.16.8. * gnu/packages/rdf.scm (sord): Update to 0.16.8. --- gnu/packages/rdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index de14a9a03e..0841c1fd8d 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -302,14 +302,14 @@ ideal (e.g. in LV2 implementations or embedded applications).") (define-public sord (package (name "sord") - (version "0.16.6") + (version "0.16.8") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/sord-" version ".tar.bz2")) (sha256 (base32 - "0i4x49ckdi1d24kwp6rmnf2mz78sncdpq22xhv9kclq8frxg4yk6")))) + "052y7zllrg0bzyky2rmrrwnnf16p6bk7q40rq9mgm0mzm8p9sa3w")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From c261aa204391e91a7e27200313cfd6ca7253e0dc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 23:50:27 +0100 Subject: gnu: skalibs: Update to 2.10.0.0. * gnu/packages/skarnet.scm (skalibs): Update to 2.10.0.0. --- gnu/packages/skarnet.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 1fd7d91eb9..4a41f3a0ce 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Claes Wallin ;;; Copyright © 2016 Eric Le Bihan ;;; Copyright © 2017 Z. Ren -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. @@ -30,14 +30,14 @@ (define-public skalibs (package (name "skalibs") - (version "2.9.3.0") + (version "2.10.0.0") (source (origin (method url-fetch) (uri (string-append "https://skarnet.org/software/skalibs/skalibs-" version ".tar.gz")) (sha256 - (base32 "0i1vg3bh0w3bpj7cv0kzs6q9v2dd8wa2by8h8j39fh1qkl20f6ph")))) + (base32 "122xipbxh6awsfdfj37mjc8f3g8ndmmmps4gw5s43mya8wgzib61")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests exist -- cgit v1.2.3 From d7110d380b6c7e6a0b82338ff707123a65fd7716 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 23:51:09 +0100 Subject: gnu: execline: Update to 2.7.0.0. * gnu/packages/skarnet.scm (execline): Update to 2.7.0.0. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 4a41f3a0ce..3ed93f3ee3 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -62,14 +62,14 @@ and file system operations. It is used by all skarnet.org software.") (define-public execline (package (name "execline") - (version "2.6.1.1") + (version "2.7.0.0") (source (origin (method url-fetch) (uri (string-append "https://skarnet.org/software/execline/execline-" version ".tar.gz")) (sha256 - (base32 "0mmsnai3bkyhng0cxdz6bf7d6b7kbsxs4p39m63215lz6kq0hhrr")))) + (base32 "0kl74yix60msgw8k3shhp9ymm80n91yxxqckixj5qbbhmylpnpqd")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs))) (arguments -- cgit v1.2.3 From 11e4b17b87b424926f67a799330720e05c61a55b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 23:52:05 +0100 Subject: gnu: s6: Update to 2.10.0.0. * gnu/packages/skarnet.scm (s6): Update to 2.10.0.0. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 3ed93f3ee3..3d7a46dca3 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -104,14 +104,14 @@ complexity."))) (define-public s6 (package (name "s6") - (version "2.9.2.0") + (version "2.10.0.0") (source (origin (method url-fetch) (uri (string-append "https://skarnet.org/software/s6/s6-" version ".tar.gz")) (sha256 - (base32 "1pfxx50shncg2s47ic4kp02jh1cxfjq75j3mnxjagyzzz0mbfg9n")))) + (base32 "0xzqrd0m3wjklmw1w3gjw5dcdxnhgvxv2r5wd6m2ismw2jprr9k0")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs) ("execline" ,execline))) -- cgit v1.2.3 From 1cd45f723a4b409120574d80e0ddf43713ab5fb0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 23:52:30 +0100 Subject: gnu: s6-dns: Update to 2.3.4.0. * gnu/packages/skarnet.scm (s6-dns): Update to 2.3.4.0. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 3d7a46dca3..d92376871e 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -150,14 +150,14 @@ functionality with a very small amount of code."))) (define-public s6-dns (package (name "s6-dns") - (version "2.3.3.0") + (version "2.3.4.0") (source (origin (method url-fetch) (uri (string-append "https://skarnet.org/software/s6-dns/s6-dns-" version ".tar.gz")) (sha256 - (base32 "05l74ciflaahlgjpvy1g0slydwqclxgybxrkpvdddd2yzwc5kira")))) + (base32 "03s94bc1y2yf0i3v3gh27xz3l2ycf246nb29mrf1zm4v9kdff5fn")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs))) (arguments -- cgit v1.2.3 From f5be539c9b5a02da30ce7512c44c8561615bec08 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 23:53:14 +0100 Subject: gnu: s6-networking: Update to 2.4.0.0. * gnu/packages/skarnet.scm (s6-networking): Update to 2.4.0.0. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index d92376871e..831a483776 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -179,14 +179,14 @@ as an alternative to the BIND, djbdns or other DNS clients."))) (define-public s6-networking (package (name "s6-networking") - (version "2.3.2.0") + (version "2.4.0.0") (source (origin (method url-fetch) (uri (string-append "https://skarnet.org/software/s6-networking/s6-networking-" version ".tar.gz")) (sha256 - (base32 "04kxj579pm4n5ifc3gfmrqj74vqqfqc82d69avzkn3yrc226mqxv")))) + (base32 "1yqykwfl5jnkxgr6skfj5kzd896pknij0hi5m7lj0r18jpfs5zgq")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs) ("execline" ,execline) -- cgit v1.2.3 From 089f3ffc79fd2f27327b458fc321b0d0fbd7d2c5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 23:53:58 +0100 Subject: gnu: s6-rc: Update to 0.5.2.1. * gnu/packages/skarnet.scm (s6-rc): Update to 0.5.2.1. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 831a483776..1f01e1f5f5 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -222,14 +222,14 @@ clock synchronization."))) (define-public s6-rc (package (name "s6-rc") - (version "0.5.1.4") + (version "0.5.2.1") (source (origin (method url-fetch) (uri (string-append "https://skarnet.org/software/s6-rc/s6-rc-" version ".tar.gz")) (sha256 - (base32 "07q0ixpwsmj1v08l6vd7qywdg33zzn8vhm21kvp179bapdzs8sdg")))) + (base32 "02pszbi440wagx2qp8aqj9mv5wm2qisw9lkq7mbnbnxxw9azlhi8")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs) ("execline" ,execline) -- cgit v1.2.3 From 3edca4794c8d10cd09fc2c46dbe8dd18ce149d44 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 23:54:18 +0100 Subject: gnu: s6-portable-utils: Update to 2.2.3.1. * gnu/packages/skarnet.scm (s6-portable-utils): Update to 2.2.3.1. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 1f01e1f5f5..65696c54a9 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -263,7 +263,7 @@ environment."))) (define-public s6-portable-utils (package (name "s6-portable-utils") - (version "2.2.3.0") + (version "2.2.3.1") (source (origin (method url-fetch) @@ -271,7 +271,7 @@ environment."))) "https://skarnet.org/software/s6-portable-utils/s6-portable-utils-" version ".tar.gz")) (sha256 - (base32 "063zwifigg2b3wsixdcz4h9yvr6fkqssvx0iyfsprjfmm1yapfi9")))) + (base32 "1ks1ch5v3p2z8y8wp5fmzzgjrqn2l5sj1sgfp8vv6wy8psd8mrj3")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs))) (arguments -- cgit v1.2.3 From e2a9f0de2d3cbde37ab2b84f7892aadf33d95349 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 23:54:47 +0100 Subject: gnu: s6-linux-init: Update to 1.0.6.0. * gnu/packages/skarnet.scm (s6-linux-init): Update to 1.0.6.0. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 65696c54a9..0d830a7acd 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -295,7 +295,7 @@ systems and other constrained environments, but they work everywhere."))) (define-public s6-linux-init (package (name "s6-linux-init") - (version "1.0.5.1") + (version "1.0.6.0") (source (origin (method url-fetch) @@ -303,7 +303,7 @@ systems and other constrained environments, but they work everywhere."))) "https://skarnet.org/software/s6-linux-init/s6-linux-init-" version ".tar.gz")) (sha256 - (base32 "1gkbjldf4f7i3vmv251f9hw7ma09nh8zkwjmqi2gplpkf7z3i34p")))) + (base32 "0kzif3dqhm7h4h7c6npzdbcy7w756222g8ysw116fgb8j385dr6w")))) (build-system gnu-build-system) (inputs `(("execline" ,execline) -- cgit v1.2.3 From d2199e71383dcdae4456f39f3fdcd7af6b8a969f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 23:54:56 +0100 Subject: gnu: s6-linux-utils: Update to 2.5.1.4. * gnu/packages/skarnet.scm (s6-linux-utils): Update to 2.5.1.4. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 0d830a7acd..51be1a30e8 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -341,7 +341,7 @@ all the details."))) (define-public s6-linux-utils (package (name "s6-linux-utils") - (version "2.5.1.3") + (version "2.5.1.4") (source (origin (method url-fetch) @@ -349,7 +349,7 @@ all the details."))) "https://skarnet.org/software/s6-linux-utils/s6-linux-utils-" version ".tar.gz")) (sha256 - (base32 "0wbv02zxaami88xbj2zg63kspz05bbplswg0c6ncb5g9khf52wa4")))) + (base32 "02gxzc9igid2kf2rvm3v6kc9806mpjmdq7cpanv4cml0ip68vbfq")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs))) (arguments -- cgit v1.2.3 From 81c07be72a40c64b8d054234570982afa5590e0b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 12 Jan 2021 00:42:35 +0100 Subject: gnu: ungoogled-chromium: Update to 87.0.4280.141-0.483a1ba. * gnu/packages/chromium.scm (%chromium-version): Set to 87.0.4280.141. (%ungoogled-revision): Set to 483a1bae4eee601c7d0a4a63499380e40e4f8a44. (%ungoogled-origin, ungoogled-chromium): 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 175b1a74ef..a994b387bb 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -302,8 +302,8 @@ (string-append "ungoogled-chromium-" category "-" name)))) (sha256 (base32 hash)))) -(define %chromium-version "87.0.4280.88") -(define %ungoogled-revision "b78cb927fa8beaee0ddfb4385277edb96444c40f") +(define %chromium-version "87.0.4280.141") +(define %ungoogled-revision "483a1bae4eee601c7d0a4a63499380e40e4f8a44") (define %debian-revision "debian/84.0.4147.105-1") (define %debian-patches @@ -321,7 +321,7 @@ (string-take %ungoogled-revision 7))) (sha256 (base32 - "0w2137w8hfcgl6f938hqnb4ffp33v5r8vdzxrvs814w7dszkiqgg")))) + "0r09d27jrdz01rcwifchbq7ksh2bac15h8svq18jx426mr56dzla")))) (define %guix-patches (list (local-file @@ -443,7 +443,7 @@ %chromium-version ".tar.xz")) (sha256 (base32 - "1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy")) + "0x9k809m36pfirnw2vnr9pk93nxdbgrvna0xf1rs3q91zkbr2x8l")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) -- cgit v1.2.3 From f849b057473c6df55684d101bdd1e35f70d479e3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Jan 2021 09:08:29 +0100 Subject: gnu: sudo: Update to 1.9.5p1 [fixes setuid sudoedit]. * gnu/packages/admin.scm (sudo): Update to 1.9.5p1. --- 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 c67910aaf6..d1a3a71f99 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1402,7 +1402,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.9.5") + (version "1.9.5p1") (source (origin (method url-fetch) (uri @@ -1412,7 +1412,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "19c39s7fgzjd655g4lgw2gvx448d7blyz8fmb1l0gmhzwxnv261p")) + "10kqdfbfpf3vk5ihz5gwynv4pxdf1lg6ircrlanyygb549yg7pad")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From d766309d71322100d10ad6dc44549712cc6f5ab0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 12 Jan 2021 09:31:58 +0100 Subject: gnu: emacs-adaptive-wrap: Update to 0.8. * gnu/packages/emacs-xyz.scm (emacs-adaptive-wrap): Update to 0.8. --- 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 1defa61294..b8dd0c5f46 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11603,14 +11603,14 @@ information via a consistent and well-integrated user interface.") (define-public emacs-adaptive-wrap (package (name "emacs-adaptive-wrap") - (version "0.7") + (version "0.8") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "adaptive-wrap-" version ".el")) (sha256 - (base32 "10fb8gzvkbnrgzv28n1rczs03dvapr7rvi0kd73j6yf1zg2iz6qp")))) + (base32 "1gs1pqzywvvw4prj63vpj8abh8h14pjky11xfl23pgpk9l3ldrb0")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/adaptive-wrap.html") (synopsis "Smart line-wrapping with wrap-prefix") -- cgit v1.2.3 From dd0f99cc38b22e2ac603e7d143980e3b87395371 Mon Sep 17 00:00:00 2001 From: Noah Evans Date: Tue, 12 Jan 2021 09:39:57 +0100 Subject: gnu: Add emacs-anki-editor. * gnu/packages/emacs-xyz.scm (emacs-anki-editor): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b8dd0c5f46..81ff594754 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -88,7 +88,7 @@ ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 André A. Gomes ;;; Copyright © 2020 Jonathan Rostran -;;; Copyright © 2020 Noah Evans +;;; Copyright © 2020, 2021 Noah Evans ;;; Copyright © 2020 Brit Butler ;;; ;;; This file is part of GNU Guix. @@ -6345,6 +6345,34 @@ drill sessions to aid in memorization. In these sessions you are shown flash cards created in Org mode.") (license license:gpl3+))) +(define-public emacs-anki-editor + ;; Last release was in 2018. + (let ((commit "546774a453ef4617b1bcb0d1626e415c67cc88df") + (revision "0") + (version "0.3.3")) + (package + (name "emacs-anki-editor") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/louietan/anki-editor") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1if610hq5j8rbjh1caw5bwbgnsn231awwxqbpwvrh966kdxzl4qf")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-request" ,emacs-request))) + (home-page "https://github.com/louietan/anki-editor") + (synopsis "Minor mode for making Anki cards with Org mode") + (description + "This package is for people who use Anki as a spaced repetition system +(SRS) but would like to make cards in Org mode.") + (license license:gpl3+)))) + (define-public emacs-org-superstar (package (name "emacs-org-superstar") -- cgit v1.2.3 From ac3041e86ca586efaee60f56eff8b355d725a9a2 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 11 Jan 2021 22:17:26 +0100 Subject: gnu: emacs-goto-chg: Update to 1.7.3-2.2af6121. * gnu/packages/emacs-xyz.scm (emacs-goto-chg): Update to 1.7.3-2.2af6121. [propagated-inputs]: Remove emacs-undo-tree, because it's a soft dependency now. --- gnu/packages/emacs-xyz.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 81ff594754..02b7985ed7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10032,9 +10032,9 @@ being deleted, changed, yanked, or pasted when using evil commands") (license license:gpl3+)))) (define-public emacs-goto-chg - (let ((commit "1829a13026c597e358f716d2c7793202458120b5") + (let ((commit "2af612153bc9f5bed135d25abe62f46ddaa9027f") (version "1.7.3") - (revision "1")) + (revision "2")) (package (name "emacs-goto-chg") (version (git-version version revision commit)) @@ -10047,10 +10047,8 @@ being deleted, changed, yanked, or pasted when using evil commands") (file-name (git-file-name name version)) (sha256 (base32 - "1y603maw9xwdj3qiarmf1bp13461f9f5ackzicsbynl0i9la3qki")))) + "1awmvihqgw6kspx192bcp9xp56xqbma90wlhxfxmidx3bvxghwpv")))) (build-system emacs-build-system) - (propagated-inputs - `(("emacs-undo-tree" ,emacs-undo-tree))) (home-page "https://github.com/emacs-evil/goto-chg") (synopsis "Go to the last change in the Emacs buffer") (description -- cgit v1.2.3 From 18c624977373020878b59efcc8de0171e759b431 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 11 Jan 2021 22:16:52 +0100 Subject: gnu: emacs-evil-matchit: Update to 2.3.10. * gnu/packages/emacs-xyz.scm (emacs-evil-matchit): Update to 2.3.10. --- 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 02b7985ed7..379a6bb57b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14003,7 +14003,7 @@ Features: (define-public emacs-evil-matchit (package (name "emacs-evil-matchit") - (version "2.3.9") + (version "2.3.10") (source (origin (method git-fetch) @@ -14012,7 +14012,7 @@ Features: (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1jk5qkqz3c4fnh6d2y889k5ycz8ipbkmzk4i8bl86xv9rhis1pv9")))) + (base32 "14nrc46290q54y7wv25251f2kqc0z8i9byl09xkgjijqldl9vdxa")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) -- cgit v1.2.3 From 10f75456af57ca87008859f83acdcbf754f6c14b Mon Sep 17 00:00:00 2001 From: Brit Butler via Guix-patches via Date: Tue, 12 Jan 2021 03:58:13 +0000 Subject: gnu: Add emacs-marginalia. * gnu/packages/emacs-xyz.scm (emacs-marginalia): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 379a6bb57b..f801bac509 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7039,6 +7039,33 @@ Emacs completion function completing-read, which allows to quickly select from a list of candidates.") (license license:gpl3+)))) +(define-public emacs-marginalia + ;; There are no tagged releases upstream on GitHub, instead we are using the + ;; most recent commit. + (let ((commit "401993562dbf636054dd64988e44d19b5030867f") + (revision "0")) + (package + (name "emacs-marginalia") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minad/marginalia") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1j0k9ija5paidj7yvbagkkayz9bjwhia9yhmd2q4490ginbbxshs")))) + (build-system emacs-build-system) + (home-page "https://github.com/minad/marginalia") + (synopsis "Marginalia in the minibuffer") + (description + "This package provides Marginalia mode which adds marginalia to the +minibuffer completions. Marginalia are marks or annotations placed at the +margin of the page of a book or in this case helpful colorful annotations +placed at the margin of the minibuffer for your completion candidates.") + (license license:gpl3+)))) + (define-public emacs-smartparens (package (name "emacs-smartparens") -- cgit v1.2.3 From c577b3062a075e732c70f8d50d8d706d56aefba5 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 11 Jan 2021 23:39:29 +0100 Subject: gnu: libebml: Update to 1.4.1. * gnu/packages/xml.scm (libebml): Update to 1.4.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/xml.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 163fff60c0..9816802b64 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2020 Edouard Klein ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Pierre Langlois +;;; Copyright © 2021 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -139,14 +140,14 @@ things the parser might find in the XML document (like start tags).") (define-public libebml (package (name "libebml") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (string-append "https://dl.matroska.org/downloads/libebml/" "libebml-" version ".tar.xz")) (sha256 - (base32 "1cy4hbk8qbxn4c6pwvlsvr1rp8vhfach9rwfg4c50qa94nlckaw0")))) + (base32 "0ckhf7wcfwik1c8ilwipdr9p7b58pvqvj8x54l6slqah81lwd53f")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 38d2435fbe2057bc63991c13ca6d9dfd16202383 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 12 Jan 2021 00:00:39 +0100 Subject: gnu: reuse: Update to 0.12.1. * gnu/packages/license.scm (reuse): Update to 0.12.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/license.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/license.scm b/gnu/packages/license.scm index 975608c79b..369426768b 100644 --- a/gnu/packages/license.scm +++ b/gnu/packages/license.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020, 2021 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -169,13 +169,13 @@ belonging to various licenses.") (define-public reuse (package (name "reuse") - (version "0.11.1") + (version "0.12.1") (source (origin (method url-fetch) (uri (pypi-uri "reuse" version)) (sha256 - (base32 "09qjb4f49vr0a7zrszab8g719ilg2p6b942mr0bgyvplrjikkid5")))) + (base32 "11i1xjbwbqjipzpbrbnp110zx1m49khn6dl5z3mjkjaz9kr6bl2f")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest) -- cgit v1.2.3 From 68bee13aa7e54f9cad4525aca7d4b9a1624bb6b1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 12 Jan 2021 10:41:38 +0200 Subject: gnu: neon: Update to 0.31.2. * gnu/packages/version-control.scm (neon): Update to 0.31.2. [source]: Use new upstream URI. [home-page]: Update to new home-page. --- gnu/packages/version-control.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5eaaf2681e..86cc346ca7 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2016 Mathieu Lirzin ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2014, 2016, 2019 Eric Bavier -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2015, 2018, 2020 Kyle Meyer ;;; Copyright © 2015, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2016, 2017 Leo Famulari @@ -1683,14 +1683,14 @@ history. It implements the changeset evolution concept for Mercurial.") (define-public neon (package (name "neon") - (version "0.30.2") + (version "0.31.2") (source (origin (method url-fetch) - (uri (string-append "http://www.webdav.org/neon/neon-" + (uri (string-append "https://notroj.github.io/neon/neon-" version ".tar.gz")) (sha256 (base32 - "1jpvczcx658vimqm7c8my2q41fnmjaf1j03g7bsli6rjxk6xh2yv")))) + "0y46dbhiblcvg8k41bdydr3fivghwk73z040ki5825d24ynf67ng")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) @@ -1708,7 +1708,7 @@ history. It implements the changeset evolution concept for Mercurial.") ;; in gnutls 2.8. ; "--with-ssl=gnutls"))) "--with-ssl=openssl"))) - (home-page "http://www.webdav.org/neon/") + (home-page "https://notroj.github.io/neon/") (synopsis "HTTP and WebDAV client library") (description "Neon is an HTTP and WebDAV client library, with a C interface and the -- cgit v1.2.3 From 66c352a1fa25413690ef125a581e4257a3e7a078 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 12 Jan 2021 10:43:37 +0200 Subject: gnu: neon: Don't build static library. * gnu/packages/version-controls.scm (neon)[arguments]: Add configure-flag to skip static library. --- gnu/packages/version-control.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 86cc346ca7..4930ebb32f 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1704,6 +1704,7 @@ history. It implements the changeset evolution concept for Mercurial.") ;; https://sourceware.org/bugzilla/show_bug.cgi?id=16475 #:tests? #f #:configure-flags '("--enable-shared" + "--disable-static" ;; requires libgnutils-config, deprecated ;; in gnutls 2.8. ; "--with-ssl=gnutls"))) -- cgit v1.2.3 From 274a6399fbb72d01a50fc1db799578e583dcada0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 12 Jan 2021 11:45:52 +0200 Subject: gnu: libreoffice: Update to 6.4.7.2. * gnu/packages/libreoffice.scm (libreoffice): Update to 6.4.7.2. --- gnu/packages/libreoffice.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 714072e84b..99382c991b 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2016, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2017 Alex Griffin ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -1085,7 +1085,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (define-public libreoffice (package (name "libreoffice") - (version "6.4.6.2") + (version "6.4.7.2") (source (origin (method url-fetch) @@ -1094,7 +1094,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") "https://download.documentfoundation.org/libreoffice/src/" (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 - (base32 "0k5aq1pfw2rpq28nkx6syrgwqbbdn6my9bnlqi3fn8qf572q30mb")))) + (base32 "0i3654rmzs8aazj8j3dmxamilslfrki0y4sksg3n1zygc2ddfk83")))) (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) -- cgit v1.2.3 From 1d8e62b893b7589b7b830c0615e34ae939a3b3d2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 12 Jan 2021 12:08:45 +0200 Subject: gnu: python-userspacefs: Update to 2.0.3. * gnu/packages/python-xyz.scm (python-userspacefs): Update to 2.0.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 23e43b7e75..dcba474d82 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18768,14 +18768,14 @@ implemented using @code{ctypes}.") (define-public python-userspacefs (package (name "python-userspacefs") - (version "2.0.2") + (version "2.0.3") (source (origin (method url-fetch) (uri (pypi-uri "userspacefs" version)) (sha256 (base32 - "0ayfcz9pjwq7h3ws0qas71842s1wm7dxlmg8dccxl2j6yavpv83f")))) + "1v6saf62ml3j63adalvlkj4iavxjbsbapl20b21mn73p7kvn4ayf")))) (build-system python-build-system) (propagated-inputs `(("python-fusepyng" ,python-fusepyng))) -- cgit v1.2.3 From 09d800cb42f577d03e6e8864bbeecc2617dba6b8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 12 Jan 2021 12:09:27 +0200 Subject: gnu: dbxfs: Update to 1.0.50. * gnu/packages/file-systems.scm (dbxfs): Update to 1.0.50. --- gnu/packages/file-systems.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 2c5ad95d63..0a36b7345a 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2017 Gábor Boskovits ;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2018 Leo Famulari -;;; Copyright © 2019, 2020 Efraim Flashner +;;; Copyright © 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020 Morgan Smith ;;; Copyright © 2021 raid5atemyhoemwork @@ -1086,14 +1086,14 @@ Dropbox API v2.") (define-public dbxfs (package (name "dbxfs") - (version "1.0.48") + (version "1.0.50") (source (origin (method url-fetch) (uri (pypi-uri "dbxfs" version)) (sha256 (base32 - "07q7dgqaqqyapjl9r4lqydflrgx4dh84c1qsb0jvfmqj3i8887ak")) + "01zvk862ybz12270q0r2l1i7kdj30ib2gxrlxmwvi19b2fkf39na")) (patches (search-patches "dbxfs-remove-sentry-sdk.patch")))) (build-system python-build-system) (arguments -- cgit v1.2.3 From dd42c528dbaaaf7380a53c3eef92789bce738d89 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Jan 2021 09:26:30 +0100 Subject: gnu: scribus: Build with podofo 0.9.6. * gnu/packages/scribus.scm (podofo-for-scribus): New private variable. (scribus)[inputs]: Use it instead of the regular podofo. Reported by Vincent Legoll . --- gnu/packages/scribus.scm | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index f699824a05..9a6b75333b 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2017, 2018 Nicolas Goaziou ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2019 Marius Bakke -;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +46,26 @@ #:use-module (gnu packages tls) #:use-module (gnu packages xml)) +(define podofo-for-scribus + (package + (inherit podofo) + (version "0.9.6") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/podofo/podofo/" version + "/podofo-" version ".tar.gz")) + (sha256 + (base32 "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix the build with CMake 3.12.0. + (substitute* "test/TokenizerTest/CMakeLists.txt" + (("\\$\\{CMAKE_COMMAND\\}") + "true")) + #t)))))) + (define-public scribus (package (name "scribus") @@ -96,7 +116,9 @@ ("libxml2" ,libxml2) ("libzmf" ,libzmf) ("openssl" ,openssl) - ("podofo" ,podofo) + ;; Scribus 1.5.6.1 does not build with later versions, see + ;; . + ("podofo" ,podofo-for-scribus) ("poppler" ,poppler) ("python" ,python) ; need Python library ("qtbase" ,qtbase) -- cgit v1.2.3 From f60ef2f7a46a00da40dc19af9d409781aa700a37 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 12 Jan 2021 13:27:43 +0200 Subject: gnu: kdeconnect: Fix wayland compatibility. * gnu/packages/kde.scm (kdeconnect)[inputs]: Add qtwayland. --- gnu/packages/kde.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index d2044cd2b6..4d4a6f2c6c 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2017 Thomas Danckaert ;;; Copyright © 2017, 2018 Mark Meyer @@ -713,6 +713,7 @@ different notification systems.") ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) + ("qtwayland" ,qtwayland) ("qtx11extras" ,qtx11extras))) (home-page "https://community.kde.org/KDEConnect") (synopsis "Enable your devices to communicate with each other") -- cgit v1.2.3 From 3bd8d045fe00710e9744153f6ceb2462e1d437f7 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 12 Jan 2021 10:50:57 +0100 Subject: gnu: Add magicffi. * gnu/packages/lisp-xyz.scm (cl-magicffi, ecl-magicffi, sbcl-magicffi): New variables. --- gnu/packages/lisp-xyz.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f0881bdfb7..1f855dafae 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -56,6 +56,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages enchant) + #:use-module (gnu packages file) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages glib) @@ -12967,3 +12968,49 @@ bringing dynamism to class definition.") (define-public cl-markdown (sbcl-package->cl-source-package sbcl-cl-markdown)) + +(define-public sbcl-magicffi + (let ((commit "d88f2f280c31f639e4e05be75215d8a8dce6aef2")) + (package + (name "sbcl-magicffi") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dochang/magicffi/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0p6ysa92fk34bhxpw7bycbfgw150fv11z9x8jr9xb4lh8cm2hvp6")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("alexandria" ,sbcl-alexandria))) + (inputs + `(("cffi" ,sbcl-cffi) + ("ppcre" ,sbcl-cl-ppcre) + ("libmagic" ,file))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((magic (assoc-ref inputs "libmagic"))) + (substitute* "grovel.lisp" + (("/usr/include/magic.h") + (string-append magic "/include/magic.h"))) + (substitute* "api.lisp" + ((":default \"libmagic\"" all) + (string-append ":default \"" magic "/lib/libmagic\""))))))))) + (home-page "https://common-lisp.net/project/magicffi/") + (synopsis "Common Lisp interface to libmagic based on CFFI") + (description + "MAGICFFI is a Common Lisp CFFI interface to libmagic(3), the file type +determination library using @emph{magic} numbers.") + (license license:bsd-2)))) + +(define-public ecl-magicffi + (sbcl-package->ecl-package sbcl-magicffi)) + +(define-public cl-magicffi + (sbcl-package->cl-source-package sbcl-magicffi)) -- cgit v1.2.3 From 151dff16509ea73b283d9d3a47a73460ead14428 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 12 Jan 2021 13:46:11 +0100 Subject: gnu: lisp-repl-core-dumper: Update to 0.4.0. * gnu/packages/lisp.scm (lisp-repl-core-dumper): Update to 0.4.0. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 9ef37d706b..e357aad4e0 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1083,7 +1083,7 @@ assembler, PEG) is less than 1MB.") (define-public lisp-repl-core-dumper (package (name "lisp-repl-core-dumper") - (version "0.3.0") + (version "0.4.0") (source (origin (method git-fetch) @@ -1092,7 +1092,7 @@ assembler, PEG) is less than 1MB.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1w7x7d7bnrdj0bd04vnjy7d7sngvcx1yjr4iw429hdd9lzlg8rbg")))) + (base32 "13fq6978ivhhi5kd8w67zjkpinrrinbw4raj9f99gpgdlak7lfmj")))) (build-system copy-build-system) (arguments '(#:install-plan -- cgit v1.2.3 From b6529e189688ac8bc17c11cf24304fc554f5cb9b Mon Sep 17 00:00:00 2001 From: aecepoglu Date: Mon, 11 Jan 2021 23:55:04 +0300 Subject: ocaml: Add ocaml-ocp-indent. * gnu/packages/ocaml.scm (ocaml-ocp-indent): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2df16e7cd2..7528e9d5fe 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020 Simon Tournier ;;; Copyright © 2020 divoplade ;;; Copyright © 2020 pukkamustard +;;; Copyright © 2021 aecepoglu ;;; ;;; This file is part of GNU Guix. ;;; @@ -2362,6 +2363,44 @@ string values and to directly encode characters in OCaml Buffer.t values.") the JSON data format. It can process JSON text without blocking on IO and without a complete in-memory representation of the data.") (license license:isc))) + +(define-public ocaml-ocp-indent + (package + (name "ocaml-ocp-indent") + (version "1.8.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OCamlPro/ocp-indent") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3")))) + (build-system dune-build-system) + (arguments + `(#:test-target "tests" + #:build-flags (list "--profile=release"))) + (propagated-inputs + `(("ocaml-cmdliner" ,ocaml-cmdliner))) + (home-page "https://www.typerex.org/ocp-indent.html") + (synopsis "Tool to indent OCaml programs") + (description + "Ocp-indent is based on an approximate, tolerant OCaml parser +and a simple stack machine. Presets and configuration options are available, +with the possibility to set them project-wide. It supports the most common +syntax extensions, and it is extensible for others. + +This package includes: + +@itemize +@item An indentor program, callable from the command-line or from within editors, +@item Bindings for popular editors, +@item A library that can be directly used by editor writers, or just for + fault-tolerant and approximate parsing. +@end itemize") + (license license:lgpl2.1))) (define-public ocaml-ocurl (package -- cgit v1.2.3 From 564cbfd99fd9d5bd462b33edb2af071ca3a4a5a1 Mon Sep 17 00:00:00 2001 From: aecepoglu Date: Mon, 11 Jan 2021 23:55:33 +0300 Subject: ocaml: Add ocaml-ocp-index. * gnu/packages/ocaml.scm (ocaml-ocp-index): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7528e9d5fe..4294d25efd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2401,6 +2401,39 @@ This package includes: fault-tolerant and approximate parsing. @end itemize") (license license:lgpl2.1))) + +(define-public ocaml-ocp-index + (package + (name "ocaml-ocp-index") + (version "1.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OCamlPro/ocp-index") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08r7mxdnxmhff37fw4hmrpjgckgi5kaiiiirwp4rmdl594z0h9c8")))) + (build-system dune-build-system) + (arguments + `(#:package "ocp-index")) + (propagated-inputs + `(("ocaml-ocp-indent" ,ocaml-ocp-indent) + ("ocaml-re" ,ocaml-re) + ("ocaml-cmdliner" ,ocaml-cmdliner))) + (native-inputs + `(("ocaml-cppo" ,ocaml-cppo))) + (home-page "https://www.typerex.org/ocp-index.html") + (synopsis "Lightweight completion and documentation browsing for OCaml libraries") + (description "This package includes only the @code{ocp-index} library +and command-line tool.") + ;; All files in libs/ are GNU lgpl2.1 + ;; For static linking, clause 6 of LGPL is lifted + ;; All other files under GNU gpl3 + (license (list license:gpl3+ + license:lgpl2.1+)))) (define-public ocaml-ocurl (package -- cgit v1.2.3 From e3b71ee6dcb87452192fb4f5df9eeea31f1c1cfd Mon Sep 17 00:00:00 2001 From: aecepoglu Date: Mon, 11 Jan 2021 23:56:10 +0300 Subject: ocaml: Add ocaml-down. * gnu/packages/ocaml.scm (ocaml-down): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4294d25efd..8a91a79c36 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -391,6 +391,69 @@ repository-wide uninstallability checks.") ;; with static-linking exception (license license:lgpl2.1+))) +(define-public ocaml-down + (package + (name "ocaml-down") + (version "0.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://erratique.ch/software/down/releases/down-" + version ".tbz")) + (sha256 + (base32 + "1nz2f5j17frgr2vrslcz9klmi6w9sm2vqwwwpi33ngcm3rgmsrlg")))) + (build-system ocaml-build-system) + (arguments + `(#:tests? #f ;no tests + #:phases + (modify-phases %standard-phases + (delete 'configure)) + #:build-flags + (list "build" "--lib-dir" + (string-append (assoc-ref %outputs "out") "/lib/ocaml/site-lib")))) + (native-inputs + `(("ocaml-findlib" ,ocaml-findlib) + ("ocamlbuild" ,ocamlbuild) + ("ocaml-topkg" ,ocaml-topkg) + ("opam" ,opam))) + (home-page "https://erratique.ch/software/down") + (synopsis "OCaml toplevel (REPL) upgrade") + (description "Down is an unintrusive user experience upgrade for the +@command{ocaml} toplevel (REPL). + +Simply load the zero dependency @code{down} library in the @command{ocaml} +toplevel and you get line edition, history, session support and identifier +completion and documentation with @command{ocp-index}. + +Add this to your @file{~/.ocamlinit}: + +@example +#use \"down.top\" +@end example + +You may also need to add this to your @file{~/.ocamlinit} and declare +the environment variable @code{OCAML_TOPLEVEL_PATH}: + +@example +let () = + try Topdirs.dir_directory (Sys.getenv \"OCAML_TOPLEVEL_PATH\") + with Not_found -> () +@end example + +OR + +@example +let () = String.split_on_char ':' (Sys.getenv \"OCAMLPATH\") + |> List.filter (fun x -> Filename.check_suffix x \"/site-lib\") + |> List.map (fun x -> x ^ \"/toplevel\") + (* remove the line below if you don't want to see the text + every time you start the toplevel *) + |> List.map (fun x -> Printf.printf \"adding directory %s\\n\" x; x) + |> List.iter Topdirs.dir_directory;; +@end example") + (license license:isc))) + (define-public ocaml-opam-file-format (package (name "ocaml-opam-file-format") -- cgit v1.2.3 From e55f0aaf258c7a479b60942efa4ab757327417bc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2021 23:48:37 +0100 Subject: gnu: gpgme: Update to 1.15.1. * gnu/packages/gnupg.scm (gpgme): Update to 1.15.1. --- 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 3620efea3a..365f7d75b3 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016 Troy Sankey ;;; Copyright © 2017, 2020 Leo Famulari ;;; Copyright © 2017 Petter -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Marius Bakke ;;; Copyright © 2018 Björn Höfling ;;; Copyright © 2019 Mathieu Othacehe @@ -355,13 +355,13 @@ libskba (working with X.509 certificates and CMS data).") (define-public gpgme (package (name "gpgme") - (version "1.15.0") + (version "1.15.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gpgme/gpgme-" version ".tar.bz2")) (sha256 - (base32 "0nqfipv5s4npfidsm1rs3kpq0r0av9bfqfd5r035jibx5k0jniqb")))) + (base32 "1bg13l5s8x9p1v0jyv29n84bay27pflindpzjsc9gj7i4wdkrg7f")))) (build-system gnu-build-system) (native-inputs `(("gnupg" ,gnupg))) -- cgit v1.2.3 From 01dec9ed851383a6f7dae2e96bbc99764422abf0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Jan 2021 14:52:15 +0100 Subject: gnu: skopeo: Update to 1.2.1. * gnu/packages/virtualization.scm (skopeo): Update to 1.2.1. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 10eae8ea7d..7fd07b5533 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1604,7 +1604,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") (define-public skopeo (package (name "skopeo") - (version "1.2.0") + (version "1.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -1613,7 +1613,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") (file-name (git-file-name name version)) (sha256 (base32 - "1v7k3ki10i6082r7zswblyirx6zck674y6bw3plssw4p1l2611rd")))) + "1y9pmijazbgxzriymrm7zrifmkd1x1wad9b3zjcj7zwr6c999dhg")))) (build-system go-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 55157c90711662c24c7627189020e3a5aeafa2ba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Jan 2021 14:52:24 +0100 Subject: gnu: ispell: Update to 3.4.02. * gnu/packages/aspell.scm (ispell): Update to 3.4.02. --- gnu/packages/aspell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index 76089333ce..26c0cf4332 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -476,14 +476,14 @@ under permissive licensing terms. See the 'Copyright' file.")))) (define-public ispell (package (name "ispell") - (version "3.4.01") + (version "3.4.02") (source (origin (method url-fetch) (uri (string-append "https://www.cs.hmc.edu/~geoff/tars/ispell-" version ".tar.gz")) (sha256 - (base32 "103vscg4bc7x2q84y18x1l75k54yhkw8lpza3qh8xxhcz5b0w7jb")))) + (base32 "0b6rqzqjdhwf323sf1dv8qzx5pxa5asz618922r59zjp65660yb6")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f -- cgit v1.2.3 From b8c3fa315a4140524d71bb12961ac83f300f1e17 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 12 Jan 2021 18:48:33 +0100 Subject: gnu: icedove: Update to 78.6.1. * gnu/packages/gnuzilla.scm (icedove): Update to 78.6.1. --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index d3f9dc15b0..0ef0c7f673 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1305,11 +1305,11 @@ standards of the IceCat project.") (cpe-version . ,(first (string-split version #\-))))))) ;; Update this together with icecat! -(define %icedove-build-id "20201215000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-build-id "20210111000000") ;must be of the form YYYYMMDDhhmmss (define-public icedove (package (name "icedove") - (version "78.6.0") + (version "78.6.1") (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) @@ -1589,7 +1589,7 @@ standards of the IceCat project.") ;; in the Thunderbird release tarball. We don't use the release ;; tarball because it duplicates the Icecat sources and only adds the ;; "comm" directory, which is provided by this repository. - ,(let ((changeset "18be92a3f0388fe1b69941a50cdbadbf2c95b885")) + ,(let ((changeset "f99e82f3f3cae6af48006c39fceb3beeabccd6f6")) (origin (method hg-fetch) (uri (hg-reference @@ -1598,7 +1598,7 @@ standards of the IceCat project.") (file-name (string-append "thunderbird-" version "-checkout")) (sha256 (base32 - "1w21g19l93bcna20260cgxjsh17pznd3kdfvyrn23wjkslgpbyi3"))))) + "0mrar1qsvvlcggzz54nxi70jzk19mq42585905kb5n90ikr9q2q7"))))) ("autoconf" ,autoconf-2.13) ("cargo" ,rust-1.41 "cargo") ("clang" ,clang) -- cgit v1.2.3 From 373f808df229c12101301b766bd1810836b98481 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Tue, 12 Jan 2021 20:37:47 +0100 Subject: gnu: Add efi_analyzer. * gnu/packages/engineering.scm (efi_analyzer): New variable. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/efi.scm | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index 12cadd6036..9582e65689 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -1,7 +1,8 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Danny Milosavljevic ;;; Copyright © 2019 Efraim Flashner -;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2019–2021 Tobias Geerinckx-Rice +;;; Copyright © 2021 Vincent Legoll ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,6 +62,40 @@ environment presented by Intel's EFI.") ;; Distribution is allowed only when accepting all those licenses. (license (list license:bsd-2 license:bsd-3 license:bsd-4 license:expat)))) +(define-public efi_analyzer + (let ((commit "77c9e3a67cd7c2fca48a4292dad25a5429872f95") + (revision "0")) + (package + (name "efi_analyzer") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xypron/efi_analyzer") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1izdkzybqyvzpzqz6kx4j7y47j6aa2dsdrychzgs65466x1a4br1")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list (string-append "prefix=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'support-cross-compilation + (lambda _ + (substitute* "Makefile" + (("gcc") ,(cc-for-target))) + #t)) + (delete 'configure)))) ; no configure script + (home-page "https://github.com/xypron/efi_analyzer") + (synopsis "Analyze EFI binaries") + (description + "The EFI Analyzer checks EFI binaries and prints out header and section +information.") + (license license:bsd-2)))) + (define-public sbsigntools (package (name "sbsigntools") -- cgit v1.2.3 From 4de576e9b26ea3e634c1cd819600851ee3a5c6d6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Jan 2021 22:25:04 +0100 Subject: gnu: Fix comment typo. * gnu/packages/efi.scm: Purge spurious space. --- gnu/packages/efi.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index 9582e65689..ac330dee64 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2019 Danny Milosavljevic ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019–2021 Tobias Geerinckx-Rice -;;; Copyright © 2021 Vincent Legoll +;;; Copyright © 2021 Vincent Legoll ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From 5aa81639fff06c747a35eb3316c4d26ca830ab0f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Jan 2021 22:50:24 +0100 Subject: gnu: redis: Update to 6.0.10. * gnu/packages/databases.scm (redis): Update to 6.0.10. --- gnu/packages/databases.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 6e03724798..311a0528b5 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2017 Adriano Peluso ;;; Copyright © 2017 Arun Isaac -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018 Alex Vong ;;; Copyright © 2017, 2018 Ben Woodcroft ;;; Copyright © 2017 Rutger Helling @@ -2130,14 +2130,14 @@ similar to BerkeleyDB, LevelDB, etc.") (define-public redis (package (name "redis") - (version "6.0.9") + (version "6.0.10") (source (origin (method url-fetch) (uri (string-append "http://download.redis.io/releases/redis-" version".tar.gz")) (sha256 (base32 - "1pc6gyiylrcazlc559dp5mxqj733pk9qabnirw4ry3k23kwdqayw")) + "1gc529nfh8frk4pynyjlnmzvwa0j9r5cmqwyd7537sywz6abifvr")) (modules '((guix build utils))) (snippet ;; Delete bundled jemalloc, as the package will use the libc one -- cgit v1.2.3 From 080d80b6fe27b8631e6f0d8f4d3c9c4d2af1d225 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Jan 2021 17:06:17 -0500 Subject: gnu: beets-bandcamp: Fix formatting. * gnu/packages/music.scm (beets-bandcamp)[description]: Fix formatting. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index fc6c29855d..2fe5e2081a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3481,8 +3481,8 @@ websites such as Libre.fm.") (synopsis "Bandcamp plugin for beets") (description "This plugin for beets automatically obtains tag data from @uref{Bandcamp, - https://bandcamp.com/}. It's also capable of getting song lyrics and album art - using the beets FetchArt plugin.") +https://bandcamp.com/}. It's also capable of getting song lyrics and album art +using the beets FetchArt plugin.") (license license:gpl2))) (define-public milkytracker -- cgit v1.2.3 From 85e97c96941a2bd283faa71fdb390ff05632f254 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Mon, 11 Jan 2021 16:34:07 +0100 Subject: gnu: python-mpd2: Update to 3.0.1. * gnu/packages/mpd.scm (python-mpd2): Update to 3.0.1. [arguments]: Use pytest to run the tests. [native-inputs] Add python-pytest. Signed-off-by: Leo Famulari --- gnu/packages/mpd.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 3b76b5502a..0183dab79c 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -285,20 +285,22 @@ information about tracks being played to a scrobbler, such as Libre.FM.") (define-public python-mpd2 (package (name "python-mpd2") - (version "0.5.5") + (version "3.0.1") (source (origin (method url-fetch) (uri (pypi-uri "python-mpd2" version)) (sha256 (base32 - "0laypd7h1j14b4vrmiayqlzdsh2j5hc3zv4l0fqvbrbw9y6763ii")))) + "0fxssbmnv44m03shjyvbqslc69b0160702j2s0flgvdxjggrnbjj")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (invoke "python" "mpd_test.py")))))) - (native-inputs `(("python-mock" ,python-mock))) + (lambda _ (invoke "python" "-m" "pytest" "mpd/tests.py")))))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) (home-page "https://github.com/Mic92/python-mpd2") (synopsis "Python MPD client library") (description "Python-mpd2 is a Python library which provides a client -- cgit v1.2.3 From b1cb9e67a60b094b48c05afa992a602251d3feae Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Jan 2021 17:37:01 -0500 Subject: gnu: Sonata: Update to 1.7.0. * gnu/packages/mpd.scm (sonata): Update to 1.7.0. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 0183dab79c..d81943ed64 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -313,7 +313,7 @@ interface for the Music Player Daemon.") (define-public sonata (package (name "sonata") - (version "1.7b1") + (version "1.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -322,7 +322,7 @@ interface for the Music Player Daemon.") (file-name (git-file-name name version)) (sha256 (base32 - "1npbxlrg6k154qybfd250nq2p96kxdsdkj9wwnp93gljnii3g8wh")))) + "0rl8w7s2asff626clzfvyz987l2k4ml5dg417mqp9v8a962q0v2x")))) (build-system python-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From 8142c550f0d40489cca2d3b280784acf72d64330 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 13 Jan 2021 15:16:41 +0100 Subject: gnu: Add shlex. * gnu/packages/lisp-xyz.scm (cl-shlex, ecl-shlex, sbcl-shlex): New variables. --- gnu/packages/lisp-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 1f855dafae..dff6ddab2f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13014,3 +13014,37 @@ determination library using @emph{magic} numbers.") (define-public cl-magicffi (sbcl-package->cl-source-package sbcl-magicffi)) + +(define-public sbcl-shlex + (let ((commit "c5616dffca0d4d8ddbc1cd6f37a96d88477b2740")) + (package + (name "sbcl-shlex") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ruricolist/cl-shlex") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1nas024n4wv319bf40aal96g72bgi9nkapj2chywj2cc6r8hzkfg")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("serapeum" ,sbcl-serapeum) + ("ppcre" ,sbcl-cl-ppcre) + ("unicode" ,sbcl-cl-unicode))) + (home-page "https://github.com/ruricolist/cl-shlex") + (synopsis "Common Lisp lexical analyzer for shell-like syntaxes") + (description + "This library contains a lexer for syntaxes that use shell-like rules +for quoting and commenting. It is a port of the @code{shlex} module from Python’s +standard library.") + (license license:expat)))) + +(define-public ecl-shlex + (sbcl-package->ecl-package sbcl-shlex)) + +(define-public cl-shlex + (sbcl-package->cl-source-package sbcl-shlex)) -- cgit v1.2.3 From dc9c866f6f7b32fa20f35487746d3535d09c6382 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 13 Jan 2021 15:18:08 +0100 Subject: gnu: Add cmd. * gnu/packages/lisp-xyz.scm (cl-cmd, ecl-cmd, sbcl-cmd): New variables. --- gnu/packages/lisp-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index dff6ddab2f..56e886e258 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13048,3 +13048,37 @@ standard library.") (define-public cl-shlex (sbcl-package->cl-source-package sbcl-shlex)) + +(define-public sbcl-cmd + (let ((commit "8e68274a935ae61f38d3309c08765d8a49d09c1f")) + (package + (name "sbcl-cmd") + (version (git-version "0.0.1" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ruricolist/cmd/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06bwwhy7wmk6fpjrqj1bfscn8rnmk8z9kwc00adp8iq6w5yjsbbj")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("serapeum" ,sbcl-serapeum) + ("shlex" ,sbcl-shlex) + ("trivia" ,sbcl-trivia))) + (home-page "https://github.com/ruricolist/cmd") + (synopsis "Conveniently run external programs from Common Lisp") + (description + "A utility for running external programs, built on UIOP. +Cmd is designed to be natural to use, protect against shell interpolation and +be usable from multi-threaded programs.") + (license license:expat)))) + +(define-public ecl-cmd + (sbcl-package->ecl-package sbcl-cmd)) + +(define-public cl-cmd + (sbcl-package->ecl-package sbcl-cmd)) -- cgit v1.2.3 From 665030bdd2be1b2122d351bf66402fd4f6248e61 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 13 Jan 2021 15:49:26 +0100 Subject: gnu: emacs-posframe: Update to 0.8.4. * gnu/packages/emacs-xyz.scm (emacs-posframe): Update to 0.8.4. --- 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 f801bac509..b6dd9b8934 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12112,14 +12112,14 @@ and cangjie.") (define-public emacs-posframe (package (name "emacs-posframe") - (version "0.8.3") + (version "0.8.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "posframe-" version ".el")) (sha256 - (base32 "05m56aw2yxik0pgcvyr5c92j2mwfksxgq1syzvik6161gy8hdd0g")))) + (base32 "1sn35ibp5y4y80l1xm4b8i94ld953a9gbkk99zqd9mrq9bwjyhdp")))) (build-system emacs-build-system) ;; emacs-minimal does not include the function font-info. (arguments -- cgit v1.2.3 From fb651853795f6d75d483f515e153a67f3bfe4eef Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 13 Jan 2021 15:51:02 +0100 Subject: gnu: emacs-websocket: Update to 1.13.1. * gnu/packages/emacs-xyz.scm (emacs-websocket): Update to 1.13.1. --- 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 b6dd9b8934..1222e591c1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13593,14 +13593,14 @@ database of references on life sciences.") (define-public emacs-websocket (package (name "emacs-websocket") - (version "1.13") + (version "1.13.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "websocket-" version ".tar")) (sha256 - (base32 "0jnarx53csmx5fivzp5vhvvj3m8s03zwc6hjl0spz5zb6icqclsa")))) + (base32 "1x664zswas0fpml7zaj59zy97avrm49zb80zd69rlkqzz1m45psc")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/websocket.html") (synopsis "Emacs WebSocket client and server") -- cgit v1.2.3 From 56bfc71f0b5756ee4d654c88dfdbf77e7ace6d71 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 13 Jan 2021 15:58:47 +0100 Subject: gnu: gmp-ecm: Update source URI. * gnu/packages/algebra.scm (gmp-ecm): Update source URI from gforge.inria.fr to gitlab.inria.fr. --- gnu/packages/algebra.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 214878949e..7fed5cf53d 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -674,9 +674,11 @@ geometry and singularity theory.") (version "7.0.4") (source (origin (method url-fetch) - ;; Use the ‘Latest version’ link for a stable URI across releases. - (uri (string-append "https://gforge.inria.fr/frs/download.php/" - "latestfile/160/ecm-" version ".tar.gz")) + (uri + (let ((hash "00c4c691a1ef8605b65bdf794a71539d")) + (string-append "https://gitlab.inria.fr/zimmerma/ecm/" + "uploads/" hash "/ecm-" version + ".tar.gz"))) (sha256 (base32 "0hxs24c2m3mh0nq1zz63z3sb7dhy1rilg2s1igwwcb26x3pb7xqc")))) (build-system gnu-build-system) -- cgit v1.2.3 From 9673402d02fc9f2b341c52609b213bf199760614 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 13 Jan 2021 15:15:31 +0100 Subject: gnu: cmh: Update source code URL. Partly fixes . * gnu/packages/algebra.scm (cmh)[source, home-page]: Refer to multiprecision.org. --- gnu/packages/algebra.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 7fed5cf53d..030339c430 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge -;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès +;;; Copyright © 2013, 2015, 2017, 2018, 2021 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou ;;; Copyright © 2014, 2018 Mark H Weaver ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus @@ -327,9 +327,9 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.") (version "1.0") (source (origin (method url-fetch) - (uri (string-append - "https://gforge.inria.fr/frs/download.php/33497/cmh-" - version ".tar.gz")) + ;; Git repo at . + (uri (string-append "http://www.multiprecision.org/downloads/cmh-" + version ".tar.gz")) (sha256 (base32 "1a28xr9bs0igms0ik99x0w8lnb0jyfcmvyi26pbyh9ggcdivd33p")))) @@ -349,8 +349,7 @@ varieties, i.e. Jacobians of hyperelliptic curves. It can also be used to compute theta constants at arbitrary precision.") (license license:gpl3+) - (home-page - "https://gitlab.inria.fr/cmh/cmh#cmh-computation-of-genus-2-class-polynomials"))) + (home-page "http://www.multiprecision.org/cmh/home.html"))) (define-public giac (package -- cgit v1.2.3 From d29e09ff363bb6f8467291edc7a40180df21c5ae Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Tue, 5 Jan 2021 20:20:14 -0300 Subject: gnu: libredwg: Update to 0.12. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (libredwg): Update to 0.12. Signed-off-by: Ludovic Courtès --- gnu/packages/engineering.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5166a4635c..826e2d89b6 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Ekaitz Zarraga ;;; Copyright © 2020 B. Wilson -;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020 Morgan Smith ;;; ;;; This file is part of GNU Guix. @@ -1214,14 +1214,14 @@ use on a given system.") (define-public libredwg (package (name "libredwg") - (version "0.11.1") + (version "0.12") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libredwg/libredwg-" version ".tar.xz")) (sha256 - (base32 "1xx6y6ckm4mzqln8y8lqf5frcn2b32ypc0d0h9dzpz6363zh7pdn")))) + (base32 "0z5algzi3alq166885y0qyj2gnc7gc6vhnz7nw0kwc0d236p6md8")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-bindings"))) -- cgit v1.2.3 From 5cdae34774c6054b80ff4ea4e42fa7d564a6d660 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Tue, 5 Jan 2021 20:08:24 -0300 Subject: gnu: setzer: Update to 0.3.9. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (setzer): Update to 0.3.9. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3167b69f37..904c1c69e4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -51,7 +51,7 @@ ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Naga Malleswari ;;; Copyright © 2020 Ryan Prior -;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Michael Rohleder @@ -11381,7 +11381,7 @@ and toolbars.") (define-public setzer (package (name "setzer") - (version "0.3.8") + (version "0.3.9") (source (origin (method git-fetch) @@ -11390,7 +11390,7 @@ and toolbars.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1f5qmkz4hzn54sh56z3hw8zrvg93xlz62ggzlzyg7vgsr83kpns9")))) + (base32 "1qmy2bxl8x6pijjaaj91v6rqdipha6iyy0b6b9y1lk3r2p3azd42")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From 7c430e8763189f1bd8c6e0b3acc4bcc542f6513b Mon Sep 17 00:00:00 2001 From: Raphaël Mélotte Date: Mon, 28 Dec 2020 17:58:38 +0100 Subject: gnu: Add emacs-helm-slack. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-helm-slack): New variable. Signed-off-by: Raphaël Mélotte Signed-off-by: Ludovic Courtès --- gnu/packages/emacs-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1222e591c1..572b1af693 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13748,6 +13748,36 @@ through them using @key{C-c C-SPC}.") messaging service.") (license license:gpl3+)))) +(define-public emacs-helm-slack + (let ((commit "465f6220f3f5bee4d95492991fca1290c89534eb") + (revision "1")) + (package + (name "emacs-helm-slack") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yuya373/helm-slack") + (commit commit))) + (file-name (git-file-name name commit)) + (sha256 + (base32 + "0p1s1kl8v68qjprqkf034cz911qzbqxbscqgpn0c3mbm3yfx81f7")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; HOME needs to exist for source compilation. + (add-before 'build 'set-HOME + (lambda _ (setenv "HOME" "/tmp") #t))))) + (propagated-inputs `(("emacs-slack", emacs-slack))) + (home-page "https://github.com/yuya373/helm-slack") + (synopsis "Helm extension for emacs-slack") + (description "This package provides an helm extension for emacs-slack +Slack client.") + (license license:gpl3+)))) + + (define-public emacs-bash-completion (package (name "emacs-bash-completion") -- cgit v1.2.3 From 63a0fe4c8a526cf51493ba4c04f70eb064be4c82 Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Fri, 8 Jan 2021 17:47:07 -0800 Subject: gnu: Add pinentry-rofi. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnupg.scm (pinentry-rofi): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gnupg.scm | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 365f7d75b3..a2da166bb4 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2018, 2019 Marius Bakke ;;; Copyright © 2018 Björn Höfling ;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2020 Fredrik Salomonsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -67,6 +68,7 @@ #:use-module (gnu packages tor) #:use-module (gnu packages web) #:use-module (gnu packages xorg) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (guix packages) #:use-module (guix download) @@ -892,6 +894,77 @@ passphrase when @code{gpg} is run and needs it."))) @dfn{Enlightenment Foundation Libraries} (EFL) that allows users to enter a passphrase when @code{gpg} is run and needs it."))) +(define-public pinentry-rofi + (package + (name "pinentry-rofi") + (version "2.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/plattfot/pinentry-rofi/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "044bnldz7k74s873jwsjgff176l1jsvpbaka7d1wcj8b5pwqv2av")))) + (build-system gnu-build-system) + (arguments + `(#:modules + ((ice-9 match) + (ice-9 ftw) + ,@%gnu-build-system-modules) + #:phases + (modify-phases + %standard-phases + (add-after 'install 'hall-wrap-binaries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((compiled-dir + (lambda (out version) + (string-append out "/lib/guile/" version "/site-ccache"))) + (uncompiled-dir + (lambda (out version) + (string-append + out + "/share/guile/site" + (if (string-null? version) "" "/") + version))) + (dep-path + (lambda (env path) + (list env ":" 'prefix (list path)))) + (out (assoc-ref outputs "out")) + (bin (string-append out "/bin/")) + (site (uncompiled-dir out ""))) + (match (scandir site) + (("." ".." version) + (for-each + (lambda (file) + (wrap-program + (string-append bin file) + (dep-path + "PATH" + (string-append (assoc-ref inputs "rofi") "/bin")) + (dep-path + "GUILE_LOAD_PATH" + (uncompiled-dir out version)) + (dep-path + "GUILE_LOAD_COMPILED_PATH" + (compiled-dir out version)))) + ,''("pinentry-rofi")) + #t)))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) + (inputs `(("guile" ,guile-3.0) + ("rofi" ,rofi))) + (synopsis "Rofi GUI for GnuPG's passphrase input") + (description "Pinentry-rofi is a simple graphical user interface for +passphrase or PIN when required by @code{gpg} or other software. It is using +the Rofi application launcher as the user interface. Which makes it combined +with @code{rofi-pass} a good front end for @code{password-store}.") + (home-page "https://github.com/plattfot/pinentry-rofi/") + (license license:gpl3+))) + (define-public pinentry (package (inherit pinentry-gtk2) (name "pinentry"))) -- cgit v1.2.3 From 61d21a7e44914ae030b8805297202edeaa7241af Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Jan 2021 15:05:39 -0500 Subject: gnu: linux-libre 5.10: Update to 5.10.7. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.7. (linux-libre-5.10-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 b16b3b7adb..b209e904c6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -353,7 +353,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.10-version "5.10.6") +(define-public linux-libre-5.10-version "5.10.7") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -361,7 +361,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "02v91afra3pcwfws74wxdsm8pfc57vws659b7j6jmsxm3hnd0rvp"))) + (hash (base32 "1gpsdxq2gx40gpmm0zya0wxd7fdflbaq9j1j0hbffahgz44nxgsc"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From c2a594defab41f71bd0962e751375836785ab0af Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Jan 2021 15:06:57 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.89. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.89. (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 b209e904c6..dcbab0a580 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,7 +369,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.4-version "5.4.88") +(define-public linux-libre-5.4-version "5.4.89") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -377,7 +377,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1ci432xanm7glgg05012kh43pfi4k771kzih0816y5674v0hg02b"))) + (hash (base32 "1bqamd3z71h8jh3mxfisqiaxj5m027xjyifj9ryqdwbdgcbxb396"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From d679a78489ea074095865efc486e2b6c52fc5f75 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Jan 2021 15:17:38 -0500 Subject: gnu: linux-libre 4.9: Update to 4.9.251. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.251. (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 dcbab0a580..cdae509e0b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -408,7 +408,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.250") +(define-public linux-libre-4.9-version "4.9.251") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -416,7 +416,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "15vizxd2i2311skjank406ny3bc30c5rz2p9jvh5xz1yv12vzgcy"))) + (hash (base32 "03cn3yzyv8vwvv76nxj655i14s9avhr4hcc18mq2rh0qn6zcnkgg"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 0dc484edcf163e24f00805dae6b7a2574231a7d8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Jan 2021 15:17:53 -0500 Subject: gnu: linux-libre 4.4: Update to 4.4.251. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.251. (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 cdae509e0b..b91f36a3bd 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -421,7 +421,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.250") +(define-public linux-libre-4.4-version "4.4.251") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -429,7 +429,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "12m14j8654rawj2znkyhvcnwnf53x10zlghxd0mpl8dfzwvn2f5b"))) + (hash (base32 "13mnlwwcwvbyqn8lafjymq66qjfj7nksdiyrcgymx8s03z1why86"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 40dc597b063ff15aa9b1bbe48ea760721eb7c86c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Jan 2021 15:07:45 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.167. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.167. (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 b91f36a3bd..61a836a539 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -382,7 +382,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.166") +(define-public linux-libre-4.19-version "4.19.167") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -390,7 +390,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "03l86ykdjs5wa0n4wknpgy9dv2r6l92qfsyak373jkhs684z53mr"))) + (hash (base32 "00gddgr1jj9zkd10mbbkanfkgpqi2jqszibq80rc9bbmgiknfb1i"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From e9f3a800e25b77abd6d67228fdecd006a67cbef3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Jan 2021 15:17:20 -0500 Subject: gnu: linux-libre 4.14: Update to 4.14.251. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.251. (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 61a836a539..7ed71e9d8f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -395,7 +395,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.214") +(define-public linux-libre-4.14-version "4.14.215") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -403,7 +403,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "07ir4yw7s5c6yb3gjbgjvcqqdgpbsjxrvapgh6zs22ffd8hrchpm"))) + (hash (base32 "1ni6p485dszi365rfflrwmjl6arbkhfvl1zm7p99vcv11hllx14s"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 872aa117d29896757a7075128059bb2dcb5b2ab3 Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Wed, 13 Jan 2021 18:28:40 -0500 Subject: gnu: crawl: Update to 0.26.0. * gnu/packages/games.scm (crawl): Update to 0.26.0. Remove no-longer-needed snippet. --- gnu/packages/games.scm | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c5d2ff6048..b8f93505b3 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6196,31 +6196,15 @@ fish. The whole game is accompanied by quiet, comforting music.") (define-public crawl (package (name "crawl") - (version "0.25.0") + (version "0.26.0") (source (origin (method url-fetch) - (uri (list - ;; Older releases get moved into a versioned directory - (string-append "http://crawl.develz.org/release/" - (version-major+minor version) "/stone_soup-" - version "-nodeps.tar.xz") - ;; Only the latest release is in this directory - (string-append "http://crawl.develz.org/release/stone_soup-" - version "-nodeps.tar.xz"))) + (uri (string-append "https://github.com/crawl/crawl/releases/download/" + version "/stone_soup-" version "-nodeps.tar.xz")) (sha256 - (base32 "0rn1wjxdqw33caiwisfypm1j8cid3c9pz01ahicl17144zs29z3d")) - (patches (search-patches "crawl-upgrade-saves.patch")) - ;; The 0.25.0 -nodeps.tar.xz was built from an OSX machine; normally - ;; apparently it's built from a Debian machine before the Debian - ;; packages are made. These ._* files are binary and have the string - ;; "Mac OS X" in them... removing these seems to result in compilation - ;; again. - (modules '((guix build utils))) - (snippet - '(begin - (for-each delete-file (find-files "." "^\\._")) - #t)))) + (base32 "1m81x1sp6p2ka5w2nib3pcw5w5iv58z41c8aqn0dayi1lb3yslfb")) + (patches (search-patches "crawl-upgrade-saves.patch")))) (build-system gnu-build-system) (inputs `(("lua51" ,lua-5.1) -- cgit v1.2.3 From aeed7218a933054806edd246548346e9edc327c4 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Tue, 12 Jan 2021 22:44:18 +0100 Subject: gnu: Add ipxe. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/bootloaders.scm (ipxe): New variable. * gnu/packages/patches/ipxe-reproducible-geniso.patch: New file … * gnu/local.mk (dist_patch_DATA): … add it. Co-authored-by: Tobias Geerinckx-Rice Co-authored-by: Brice Waegeneire Signed-off-by: Danny Milosavljevic --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 125 ++++++++++++++++++++- .../patches/ipxe-reproducible-geniso.patch | 77 +++++++++++++ 3 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/ipxe-reproducible-geniso.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index bcf7ee0245..eb28104add 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1184,6 +1184,7 @@ dist_patch_DATA = \ %D%/packages/patches/intel-xed-fix-nondeterminism.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/iputils-libcap-compat.patch \ + %D%/packages/patches/ipxe-reproducible-geniso.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/json-c-CVE-2020-12762.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 9ca574a151..38dba4cebd 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -7,12 +7,14 @@ ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2016, 2017 David Craven ;;; Copyright © 2017, 2018, 2020 Efraim Flashner -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 nee ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Björn Höfling ;;; Copyright © 2018, 2019, 2020 Vagrant Cascadian ;;; Copyright © 2020 Pierre Langlois +;;; Copyright © 2021 Vincent Legoll +;;; Copyright © 2021 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -1095,3 +1097,124 @@ systems so that they can be added to the bootloader. It also works out how to boot existing GNU/Linux systems and detects what distribution is installed in order to add a suitable bootloader menu entry.") (license license:gpl2+))) + +(define-public ipxe + ;; XXX: 'BUILD_TIMESTAMP' is used to automatically select the newest version + ;; of iPXE if multiple iPXE drivers are loaded concurrently in a UEFI system. + ;; + ;; TODO: Bump this timestamp at each modifications of the package (not only + ;; for updates) by running: date +%s. + (let ((timestamp "1591706427")) + (package + (name "ipxe") + (version "1.20.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipxe/ipxe") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (patches (search-patches "ipxe-reproducible-geniso.patch")) + (sha256 + (base32 + "0w7h7y97gj9nqvbmsg1zp6zj5mpbbpckqbbx7bpp6k3ahy5fk8zp")))) + (build-system gnu-build-system) + (arguments + `(#:modules ((guix build utils) + (guix build gnu-build-system) + (guix base32) + (ice-9 string-fun) + (ice-9 regex) + (rnrs bytevectors)) + #:imported-modules ((guix base32) + ,@%gnu-build-system-modules) + #:make-flags + ;; XXX: 'BUILD_ID' is used to determine when another ROM in the + ;; system contains identical code in order to save space within the + ;; legacy BIOS option ROM area, which is extremely limited in size. + ;; It is supposed to be collision-free across all ROMs, to do so we + ;; use the truncated output hash of the package. + (let ((build-id + (lambda (out) + (let* ((nix-store (string-append + (or (getenv "NIX_STORE") "/gnu/store") + "/")) + (filename + (string-replace-substring out nix-store "")) + (hash (match:substring (string-match "[0-9a-z]{32}" + filename))) + (bv (nix-base32-string->bytevector hash))) + (format #f "0x~x" + (bytevector-u32-ref bv 0 (endianness big)))))) + (out (assoc-ref %outputs "out")) + (syslinux (assoc-ref %build-inputs "syslinux"))) + (list "ECHO_E_BIN_ECHO=echo" + "ECHO_E_BIN_ECHO_E=echo -e" + + ;; cdrtools' mkisofs will silently ignore a missing isolinux.bin! + ;; Luckily xorriso is more strict. + (string-append "ISOLINUX_BIN=" syslinux + "/share/syslinux/isolinux.bin") + (string-append "SYSLINUX_MBR_DISK_PATH=" syslinux + "/share/syslinux/isohdpfx.bin") + + ;; Build reproducibly. + (string-append "BUILD_ID_CMD=echo -n " (build-id out)) + (string-append "BUILD_TIMESTAMP=" ,timestamp) + "everything")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'enter-source-directory + (lambda _ (chdir "src") #t)) + (add-after 'enter-source-directory 'set-options + (lambda _ + (substitute* "config/general.h" + (("^//(#define PING_CMD.*)" _ uncommented) uncommented) + (("^//(#define IMAGE_TRUST_CMD.*)" _ uncommented) + uncommented) + (("^#undef.*(DOWNLOAD_PROTO_HTTPS.*)" _ option) + (string-append "#define " option)) + (("^#undef.*(DOWNLOAD_PROTO_NFS.*)" _ option) + (string-append "#define " option))) + #t)) + (delete 'configure) ; no configure script + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (ipxe (string-append out "/lib/ipxe")) + (exts-re + "\\.(efi|efirom|iso|kkpxe|kpxe|lkrn|mrom|pxe|rom|usb)$") + (dirs '("bin" "bin-i386-linux" "bin-x86_64-pcbios" + "bin-x86_64-efi" "bin-x86_64-linux" "bin-i386-efi")) + (files (apply append + (map (lambda (dir) + (find-files dir exts-re)) dirs)))) + (for-each (lambda (file) + (let* ((subdir (dirname file)) + (fn (basename file)) + (tgtsubdir (cond + ((string=? "bin" subdir) "") + ((string-prefix? "bin-" subdir) + (string-drop subdir 4))))) + (install-file file + (string-append ipxe "/" tgtsubdir)))) + files)) + #t)) + (add-after 'install 'leave-source-directory + (lambda _ (chdir "..") #t))) + #:tests? #f)) ; no test suite + (native-inputs + `(("perl" ,perl) + ("syslinux" ,syslinux) + ("xorriso" ,xorriso))) + (home-page "https://ipxe.org") + (synopsis "PXE-compliant network boot firmware") + (description "iPXE is a network boot firmware. It provides a full PXE +implementation enhanced with additional features such as booting from: a web +server via HTTP, an iSCSI SAN, a Fibre Channel SAN via FCoE, an AoE SAN, a +wireless network, a wide-area network, an Infiniband network. It allows to +control the boot process with a script. You can use iPXE to replace the +existing PXE ROM on your network card, or you can chainload into iPXE to obtain +the features of iPXE without the hassle of reflashing.") + (license license:gpl2+)))) + diff --git a/gnu/packages/patches/ipxe-reproducible-geniso.patch b/gnu/packages/patches/ipxe-reproducible-geniso.patch new file mode 100644 index 0000000000..ff6aa1da94 --- /dev/null +++ b/gnu/packages/patches/ipxe-reproducible-geniso.patch @@ -0,0 +1,77 @@ +From 052d24d8217c51c572c2f6cbb4a687be2e8ba52d Mon Sep 17 00:00:00 2001 +From: Brice Waegeneire +Date: Fri, 5 Jun 2020 14:38:43 +0200 +Subject: [PATCH] [geniso] Make it reproducible + +Some timestamps get embedded in the generated ISO, making it +unreproducible so we overwrite those timestamps to be at the UNIX epoch. +--- + src/util/geniso | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +diff --git a/src/util/geniso b/src/util/geniso +index ff090d4a..e032ffb0 100755 +--- a/src/util/geniso ++++ b/src/util/geniso +@@ -11,6 +11,13 @@ function help() { + echo " -o FILE save iso image to file" + } + ++function reset_timestamp() { ++ for f in "$1"/*; do ++ touch -t 197001010100 "$f" ++ done ++ touch -t 197001010100 "$1" ++} ++ + LEGACY=0 + FIRST="" + +@@ -37,8 +44,9 @@ if [ -z "${OUT}" ]; then + exit 1 + fi + +-# There should either be mkisofs or the compatible genisoimage program +-for command in genisoimage mkisofs; do ++# There should either be mkisofs, xorriso or the compatible genisoimage ++# program ++for command in xorriso genisoimage mkisofs; do + if ${command} --version >/dev/null 2>/dev/null; then + mkisofs=(${command}) + break +@@ -46,8 +54,10 @@ for command in genisoimage mkisofs; do + done + + if [ -z "${mkisofs}" ]; then +- echo "${0}: mkisofs or genisoimage not found, please install or set PATH" >&2 ++ echo "${0}: mkisofs, xorriso or genisoimage not found, please install or set PATH" >&2 + exit 1 ++elif [ "$mkisofs" = "xorriso" ]; then ++ mkisofs+=(-as mkisofs) + fi + + dir=$(mktemp -d bin/iso.dir.XXXXXX) +@@ -115,6 +125,8 @@ case "${LEGACY}" in + exit 1 + fi + ++ reset_timestamp "$dir" ++ + # generate the iso image + "${mkisofs[@]}" -b boot.img -output ${OUT} ${dir} + ;; +@@ -127,6 +139,12 @@ case "${LEGACY}" in + cp ${LDLINUX_C32} ${dir} + fi + ++ reset_timestamp "$dir" ++ ++ if [ "${mkisofs[0]}" = "xorriso" ]; then ++ mkisofs+=(-isohybrid-mbr "$SYSLINUX_MBR_DISK_PATH") ++ fi ++ + # generate the iso image + "${mkisofs[@]}" -b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -output ${OUT} ${dir} + +-- +2.26.2 -- cgit v1.2.3 From ca34b6f04559adc91c29fc5f7432b37c1486a0c3 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Tue, 12 Jan 2021 22:44:19 +0100 Subject: gnu: ipxe: Update to 1.21.1. * gnu/packages/bootloaders.scm (ipxe): Update to 1.21.1. Signed-off-by: Danny Milosavljevic --- gnu/packages/bootloaders.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 38dba4cebd..88abe29a1e 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1107,7 +1107,7 @@ order to add a suitable bootloader menu entry.") (let ((timestamp "1591706427")) (package (name "ipxe") - (version "1.20.1") + (version "1.21.1") (source (origin (method git-fetch) (uri (git-reference @@ -1117,7 +1117,7 @@ order to add a suitable bootloader menu entry.") (patches (search-patches "ipxe-reproducible-geniso.patch")) (sha256 (base32 - "0w7h7y97gj9nqvbmsg1zp6zj5mpbbpckqbbx7bpp6k3ahy5fk8zp")))) + "1pkf1n1c0rdlzfls8fvjvi1sd9xjd9ijqlyz3wigr70ijcv6x8i9")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) -- cgit v1.2.3 From 296156d9d1def88ccfda7d46cdcb574a4a52947b Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Thu, 14 Jan 2021 07:17:06 +0100 Subject: gnu: emacs-ivy-posframe: Fix source URL. * gnu/packages/emacs-xyz.scm (emacs-ivy-posframe)[source]: Fix URL. --- 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 572b1af693..e35a29cdc3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12117,7 +12117,7 @@ and cangjie.") (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" - "posframe-" version ".el")) + "posframe-" version ".tar")) (sha256 (base32 "1sn35ibp5y4y80l1xm4b8i94ld953a9gbkk99zqd9mrq9bwjyhdp")))) (build-system emacs-build-system) -- cgit v1.2.3 From a879e35116043d5daf3d9d175b697d10b9177fd5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 14 Jan 2021 09:10:55 +0100 Subject: gnu: guix: Update to 1w6i9z4. * gnu/packages/package-management.scm (guix): Update to 1w6i9z4. --- gnu/packages/package-management.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index d12db70aca..60d8d4b8c6 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2015, 2017, 2020 Ricardo Wurmus ;;; Copyright © 2017 Muriithi Frederick Muriuki ;;; Copyright © 2017, 2018 Oleg Pykhalov @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "db42ee65bd657bae9b1a598cbdbe86079dc85f81") - (revision 9)) + (commit "23862011c3d02814181399765a024c7fa3fadd97") + (revision 10)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "1kizkw6cxh6mhc8kal2fglnhyp1i668b4ilqbxq72slbmf9jr9jl")) + "1w6i9z4z24yl8v1gf5m7fgf0bz42gg4dpnhi25fg4a4y5qi7aahk")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -301,6 +301,7 @@ $(prefix)/etc/init.d\n"))) (sqlite (assoc-ref inputs "guile-sqlite3")) (zlib (assoc-ref inputs "guile-zlib")) (lzlib (assoc-ref inputs "guile-lzlib")) + (zstd (assoc-ref inputs "guile-zstd")) (git (assoc-ref inputs "guile-git")) (bs (assoc-ref inputs "guile-bytestructures")) @@ -308,7 +309,7 @@ $(prefix)/etc/init.d\n"))) (gnutls (assoc-ref inputs "gnutls")) (locales (assoc-ref inputs "glibc-utf8-locales")) (deps (list gcrypt json sqlite gnutls git - bs ssh zlib lzlib)) + bs ssh zlib lzlib zstd)) (deps* ,@(if (%current-target-system) '(deps) '((cons avahi deps)))) @@ -362,6 +363,7 @@ $(prefix)/etc/init.d\n"))) ("guile-sqlite3" ,guile-sqlite3) ("guile-zlib" ,guile-zlib) ("guile-lzlib" ,guile-lzlib) + ("guile-zstd" ,guile-zstd) ("guile-ssh" ,guile-ssh) ("guile-git" ,guile-git) @@ -417,7 +419,8 @@ $(prefix)/etc/init.d\n"))) ("guile-ssh" ,guile-ssh) ("guile-git" ,guile-git) ("guile-zlib" ,guile-zlib) - ("guile-lzlib" ,guile-lzlib))) + ("guile-lzlib" ,guile-lzlib) + ("guile-zstd" ,guile-zstd))) (native-search-paths (list (search-path-specification (variable "GUIX_EXTENSIONS_PATH") -- cgit v1.2.3 From 0c0a2831b0c114dc5645482dcfef7f69e8a8298f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 10 Jan 2021 22:24:17 +0000 Subject: gnu: Add freetds. * gnu/packages/databases.scm (freetds): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/databases.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 311a0528b5..de066163ef 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -46,6 +46,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2021 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -3953,3 +3954,26 @@ The drivers officially supported by @code{libdbi} are: PostreSQL, SQLite, ODBC and MySQL.") (home-page "http://soci.sourceforge.net/") (license license:boost1.0))) + +(define-public freetds + (package + (name "freetds") + (version "1.2.18") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.freetds.org/files/stable/" + "freetds-" version ".tar.gz")) + (sha256 + (base32 "1hspvwxwdd1apadsy2b40dpjik8kfwcvdamvhpg3lnm15n02fb50")))) + (build-system gnu-build-system) + (arguments + ;; NOTE: (Sharlatan-20210110213908+0000) some tests require DB connection, + ;; disabled for now. + `(#:tests? #f)) + (home-page "https://www.freetds.org/") + (synopsis "Client libraries for MS SQL and Sybase servers") + (description + "FreeTDS is an implementation of the Tabular DataStream protocol, used for +connecting to MS SQL and Sybase servers over TCP/IP.") + (license license:lgpl2.0+))) -- cgit v1.2.3 From 88eb5370ec155902ed5fe7636e91e932079b338a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 13 Jan 2021 21:43:28 +0000 Subject: gnu: Add cl-mssql. * gnu/packages/lisp-xyz.scm (cl-mssql, ecl-mssql, sbcl-mssql): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 56e886e258..da6a77b914 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1940,6 +1940,51 @@ pretty, documentation is code.") ;; TODO: Find why the tests fail on ECL. ((#:tests? _ #f) #f)))))) +(define-public sbcl-mssql + (let ((commit "045602a19a32254108f2b75871049293f49731eb") + (revision "1")) + (package + (name "sbcl-mssql") + (version (git-version "0.0.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/archimag/cl-mssql") + (commit commit))) + (file-name (git-file-name "cl-mssql" version)) + (sha256 + (base32 "09i50adppgc1ybm3ka9vbindhwa2x29f9n3n0jkrryymdhb8zknm")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cffi" ,sbcl-cffi) + ("freetds" ,freetds) + ("garbage-pools" ,sbcl-garbage-pools) + ("iterate" ,sbcl-iterate) + ("parse-number" ,sbcl-parse-number))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/mssql.lisp" + (("libsybdb" all) + (string-append (assoc-ref inputs "freetds") "/lib/" all))) + #t))))) + (home-page "https://github.com/archimag/cl-mssql") + (synopsis "Common Lisp library to interact with MS SQL Server databases") + (description + "@code{cl-mssql} provides an interface to connect to Microsoft SQL +server. It uses the @code{libsybdb} foreign library provided by the FreeTDS +project.") + (license license:llgpl)))) + +(define-public ecl-mssql + (sbcl-package->ecl-package sbcl-mssql)) + +(define-public cl-mssql + (sbcl-package->cl-source-package sbcl-mssql)) + (define-public sbcl-lisp-unit (let ((commit "89653a232626b67400bf9a941f9b367da38d3815")) (package -- cgit v1.2.3 From a34eafce27de768308769f2e894e8d40decb3884 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 28 Dec 2020 11:29:36 -0500 Subject: gnu: opensp: Move package to (gnu packages xml). * gnu/packages/finance.scm (opensp): Move to... * gnu/packages/xml.scm (opensp): ... here. --- gnu/packages/finance.scm | 50 ----------------------------------------------- gnu/packages/xml.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 50 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index e7d58bbcc0..8ead37beb3 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1380,56 +1380,6 @@ following three utilities are included with the library: @end enumerate") (license license:gpl2+))) -(define-public opensp - (package - (name "opensp") - (version "1.5.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/openjade/opensp/" - version "/OpenSP-" version ".tar.gz")) - (sha256 - (base32 - "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p")))) - (build-system gnu-build-system) - (native-inputs - `(("gettext" ,gettext-minimal))) - (inputs - `(("docbook-xml" ,docbook-xml-4.1.2) - ("docbook-xsl" ,docbook-xsl) - ("xmlto" ,xmlto))) - (arguments - `(;; TODO: Fix and enable tests. - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-docbook-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook")) - (xsldoc (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl)))) - (substitute* (find-files "docsrc" "\\.xml$") - (("/usr/share/sgml/docbook/xml-dtd-4.1.2") xmldoc) - (("http://.*/docbookx\\.dtd") - (string-append xmldoc "/docbookx.dtd"))) - ;; Directly pass the path to the stylesheet to xmlto. - (substitute* "docsrc/Makefile.in" - (("\\$\\(XMLTO\\)") - (string-append "$(XMLTO) -x " xsldoc - "/manpages/docbook.xsl"))) - #t)))))) - (home-page "http://openjade.sourceforge.net/") - (synopsis "Suite of SGML/XML processing tools") - (description "OpenSP is an object-oriented toolkit for SGML parsing and -entity management.") - (license - ;; expat license with added clause regarding advertising - (license:non-copyleft - "file://COPYING" - "See COPYING in the distribution.")))) - (define-public bitcoin-unlimited (package (name "bitcoin-unlimited") diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 9816802b64..5594a55f06 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -52,6 +52,7 @@ #:use-module (gnu packages curl) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -2208,6 +2209,56 @@ server using HTTP, and gets back the response as XML. This library provides a modular implementation of XML-RPC for C and C++.") (license (list license:psfl license:expat)))) +(define-public opensp + (package + (name "opensp") + (version "1.5.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/openjade/opensp/" + version "/OpenSP-" version ".tar.gz")) + (sha256 + (base32 + "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p")))) + (build-system gnu-build-system) + (native-inputs + `(("gettext" ,gettext-minimal))) + (inputs + `(("docbook-xml" ,docbook-xml-4.1.2) + ("docbook-xsl" ,docbook-xsl) + ("xmlto" ,xmlto))) + (arguments + `(;; TODO: Fix and enable tests. + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook")) + (xsldoc (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl)))) + (substitute* (find-files "docsrc" "\\.xml$") + (("/usr/share/sgml/docbook/xml-dtd-4.1.2") xmldoc) + (("http://.*/docbookx\\.dtd") + (string-append xmldoc "/docbookx.dtd"))) + ;; Directly pass the path to the stylesheet to xmlto. + (substitute* "docsrc/Makefile.in" + (("\\$\\(XMLTO\\)") + (string-append "$(XMLTO) -x " xsldoc + "/manpages/docbook.xsl"))) + #t)))))) + (home-page "http://openjade.sourceforge.net/") + (synopsis "Suite of SGML/XML processing tools") + (description "OpenSP is an object-oriented toolkit for SGML parsing and +entity management.") + (license + ;; expat license with added clause regarding advertising + (license:non-copyleft + "file://COPYING" + "See COPYING in the distribution.")))) + (define-public python-elementpath (package (name "python-elementpath") -- cgit v1.2.3 From de99dc48248d2249f06b7a19553247ea38d09909 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 28 Dec 2020 14:01:47 -0500 Subject: gnu: opensp: Add doc output, enable tests and add search path. * gnu/packages/xml.scm (opensp)[outputs]: Add doc output. [inputs]: Move to... [native-inputs]: ... here. Add autoconf, automake, gettext and libtool and libxml2. [arguments]: Enable tests. {make-flags}: New argument. [phases]{patch-docbook-paths}: No longer patch XMLTO command line. {delete-configure, honor-docdir, fix-tests-makefile.am}: New phases. [native-search-paths]: Define a SGML_CATALOG_FILES search path specification. [description]: Extend description. --- gnu/packages/xml.scm | 64 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 52 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 5594a55f06..6208f7826b 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Pierre Langlois ;;; Copyright © 2021 Michael Rohleder +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -2220,16 +2221,25 @@ modular implementation of XML-RPC for C and C++.") (sha256 (base32 "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p")))) + (outputs '("out" "doc")) (build-system gnu-build-system) (native-inputs - `(("gettext" ,gettext-minimal))) - (inputs `(("docbook-xml" ,docbook-xml-4.1.2) ("docbook-xsl" ,docbook-xsl) - ("xmlto" ,xmlto))) + ("libxml2" ,libxml2) ;for XML_CATALOG_DIR + ("xmlto" ,xmlto) + ;; Dependencies to regenerate the 'configure' script. + ("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) + ("libtool" ,libtool))) (arguments - `(;; TODO: Fix and enable tests. - #:tests? #f + `( ;; Note: we cannot use '--enable-full-doc-build' as this would require + ;; Openjade, which in turn requires this package. + + ;; Skip the tests that are known to fail (see: + ;; https://sourceforge.net/p/openjade/mailman/message/6182316/) + #:make-flags '("TESTS_THAT_FAIL=") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook-paths @@ -2243,16 +2253,46 @@ modular implementation of XML-RPC for C and C++.") (("/usr/share/sgml/docbook/xml-dtd-4.1.2") xmldoc) (("http://.*/docbookx\\.dtd") (string-append xmldoc "/docbookx.dtd"))) - ;; Directly pass the path to the stylesheet to xmlto. - (substitute* "docsrc/Makefile.in" - (("\\$\\(XMLTO\\)") - (string-append "$(XMLTO) -x " xsldoc - "/manpages/docbook.xsl"))) - #t)))))) + #t))) + (add-after 'patch-docbook-paths 'delete-configure + ;; The configure script in the release was made with an older + ;; Autoconf and lacks support for the `--docdir' option. + (lambda _ + (delete-file "configure") + #t)) + (add-after 'delete-configure 'honor-docdir + ;; docdir is not honored due to being hardcoded in the various + ;; Makefile.am (see: https://sourceforge.net/p/openjade/bugs/147/). + (lambda _ + (substitute* '("Makefile.am" "doc/Makefile.am" "docsrc/Makefile.am") + (("^docdir = .*") "docdir = @docdir@\n")) + #t)) + (add-after 'delete-configure 'fix-tests-makefile.am + ;; Remove the trailing $(SHELL) from the TESTS_ENVIRONMENT variable + ;; definition. Otherwise, when targets are built using + ;; "$(am__check_pre) $(LOG_DRIVER) [...]", there would be two + ;; $(SHELL) expansion which fails the build. + (lambda _ + (substitute* "tests/Makefile.am" + (("^\tOSGMLNORM=`echo osgmlnorm\\|sed '\\$\\(transform\\)'`\\\\") + "\tOSGMLNORM=`echo osgmlnorm|sed '$(transform)'`") + (("^\t\\$\\(SHELL\\)\n") "")) + #t))))) + ;; $SGML_CATALOG_FILES lists 'catalog' or 'CATALOG' or '*.cat' files found + ;; under the 'sgml' sub-directory of any given package. + (native-search-paths (list (search-path-specification + (variable "SGML_CATALOG_FILES") + (separator ":") + (files '("sgml")) + (file-pattern "^catalog$|^CATALOG$|^.*\\.cat$") + (file-type 'regular)))) (home-page "http://openjade.sourceforge.net/") (synopsis "Suite of SGML/XML processing tools") (description "OpenSP is an object-oriented toolkit for SGML parsing and -entity management.") +entity management. It is a fork of James Clark's SP suite. The tools it +contains can be used to parse, validate, and normalize SGML and XML files. +The central program included in this package is @code{onsgmls}, which replaces +@code{sgmls}, @code{ospam}, @code{ospent}, @code{osgmlnorm}, and @code{osx}.") (license ;; expat license with added clause regarding advertising (license:non-copyleft -- cgit v1.2.3 From 1729fb52abac16433c5ee07f202a71d3b64ed94e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 2 Jul 2018 11:51:36 -0400 Subject: gnu: Add openjade. * gnu/packages/xml.scm (openjade): New variable. --- gnu/packages/xml.scm | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 6208f7826b..930cd795f5 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -361,6 +361,86 @@ It uses libxml2 to access the XML files.") based on libxml for XML parsing, tree manipulation and XPath support.") (license license:x11))) +(define-public openjade + (package + (name "openjade") + (version "1.3.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/openjade/openjade/" + version "/" name "-" version ".tar.gz")) + (sha256 + (base32 + "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list (string-append "--enable-spincludedir=" + (assoc-ref %build-inputs "opensp") + "/include/OpenSP") + (string-append "--enable-splibdir=" + (assoc-ref %build-inputs "opensp") "/lib") + ;; Workaround segfaults in OpenJade (see: + ;; https://bugs.launchpad.net/ubuntu/+source/openjade/+bug/1869734). + "CXXFLAGS=-O0") + #:parallel-build? #f ;build fails otherwise + ;; The test suite fails with diff errors between the actual and + ;; expected results, like: (char Date: Tue, 3 Jul 2018 09:04:02 -0400 Subject: gnu: Add iso-8879-entities. * gnu/packages/docbook.scm (iso-8879-entities): New private variable. --- gnu/packages/docbook.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 236c7e2819..c5d8403f2a 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Mathieu Lirzin ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -214,6 +215,35 @@ by no means limited to these applications.) This package provides XML DTDs.") "This package provides XSL style sheets for DocBook.") (license (x11-style "" "See 'COPYING' file.")))) +;;; Private package referenced by docbook-sgml. +(define iso-8879-entities + (package + (name "iso-8879-entities") + (version "0.0") ;no proper version + (source (origin + (method url-fetch) + (uri "http://www.oasis-open.org/cover/ISOEnts.zip") + (sha256 + (base32 + "1clrkaqnvc1ja4lj8blr0rdlphngkcda3snm7b9jzvcn76d3br6w")))) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((source (assoc-ref %build-inputs "source")) + (unzip (string-append (assoc-ref %build-inputs "unzip") + "/bin/unzip")) + (out (string-append (assoc-ref %outputs "out")))) + (invoke unzip source "-d" out))))) + (native-inputs `(("unzip" ,unzip))) + (home-page "https://www.oasis-open.org/") + (synopsis "ISO 8879 character entities") + (description "ISO 8879 character entities that are typically used in +the in DocBook SGML DTDs.") + (license (x11-style "" "See file headers.")))) + (define-public dblatex (package (name "dblatex") -- cgit v1.2.3 From 14ac034dab923103b301d493440448e19b14d4bc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 3 Jul 2018 09:04:41 -0400 Subject: gnu: Add docbook-sgml. * gnu/packages/docbook.scm (docbook-sgml): New variable. --- gnu/packages/docbook.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index c5d8403f2a..ca9c0ec9aa 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -215,6 +215,48 @@ by no means limited to these applications.) This package provides XML DTDs.") "This package provides XSL style sheets for DocBook.") (license (x11-style "" "See 'COPYING' file.")))) +(define-public docbook-sgml + (package + (name "docbook-sgml") + (version "4.1") + (source (origin + (method url-fetch) + (uri (string-append "https://www.oasis-open.org/docbook/sgml/" + version "/docbk41.zip")) + (sha256 + (base32 + "04b3gp4zkh9c5g9kvnywdkdfkcqx3kjc04j4mpkr4xk7lgqgrany")))) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((source (assoc-ref %build-inputs "source")) + (iso-entities-dir (string-append + (assoc-ref %build-inputs "iso-8879-entities"))) + (unzip (string-append (assoc-ref %build-inputs "unzip") + "/bin/unzip")) + (dtd (string-append (assoc-ref %outputs "out") + "/sgml/dtd/docbook"))) + ;; Extract the sources. + (mkdir-p dtd) + (chdir dtd) + (invoke unzip source) + ;; Reference the ISO 8879 character entities. + ;; e.g. "iso-lat1.gml" --> "/ISOlat1" + (substitute* "docbook.cat" + (("(.*ISO 8879.*)\"iso-(.*)\\.gml\"" _ head name) + (string-append head "\"" iso-entities-dir "/ISO" name "\""))))))) + (native-inputs + `(("unzip" ,unzip))) + (inputs + `(("iso-8879-entities" ,iso-8879-entities))) + (home-page "https://docbook.org") + (synopsis "DocBook SGML style sheets for document authoring") + (description "This package provides SGML style sheets for DocBook.") + (license (x11-style "" "See file headers.")))) + ;;; Private package referenced by docbook-sgml. (define iso-8879-entities (package -- cgit v1.2.3 From 81920e6d59de6d58afddb11d7acef357533f8440 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 9 Sep 2018 11:47:41 -0400 Subject: gnu: Add docbook-dsssl. * gnu/packages/docbook.scm (docbook-dsssl): New variable. --- gnu/packages/docbook.scm | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index ca9c0ec9aa..e248f62b6b 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -215,6 +215,85 @@ by no means limited to these applications.) This package provides XML DTDs.") "This package provides XSL style sheets for DocBook.") (license (x11-style "" "See 'COPYING' file.")))) +(define-public docbook-dsssl + (package + (name "docbook-dsssl") + (version "1.79") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/docbook/" + name "/" version "/" + name "-" version ".tar.bz2")) + (sha256 + (base32 + "1g72y2yyc2k89kzs0lvrb9n7hjayw1hdskfpplpz97pf1c99wcig")))) + (build-system trivial-build-system) + (outputs '("out" "doc")) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((source (assoc-ref %build-inputs "source")) + (dtd (string-append (assoc-ref %outputs "out") + "/sgml/dtd/docbook")) + (docbook-dsssl-doc (assoc-ref %build-inputs "docbook-dsssl-doc")) + (doc (assoc-ref %outputs "doc")) + (tar (assoc-ref %build-inputs "tar")) + (bzip2 (assoc-ref %build-inputs "bzip2"))) + (setenv "PATH" (string-append tar "/bin" ":" bzip2 "/bin")) + (mkdir-p dtd) + (invoke "tar" "-xf" source "-C" dtd) + ;; The doc output contains 1.4 MiB of HTML documentation. + (symlink docbook-dsssl-doc doc))))) + (inputs + `(("docbook-dsssl-doc" ,docbook-dsssl-doc))) + (native-inputs + `(("bzip2", bzip2) + ("tar" ,tar))) + (home-page "https://docbook.org/") + (synopsis "DSSSL style sheets for DocBook") + (description "This package provides DSSSL style sheets for DocBook.") + (license (non-copyleft "file://README")))) + +;;; Private variable, used as the 'doc' output of the docbook-dsssl package. +(define docbook-dsssl-doc + (package + (name "docbook-dsssl-doc") + (version "1.79") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/docbook/" + name "/" version "/" + name "-" version ".tar.bz2")) + (sha256 + (base32 + "1plp5ngc96pbna4rwglp9glcadnirbm3hlcjb4gjvq1f8biic9lz")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((source (assoc-ref %build-inputs "source")) + (docdir (string-append (assoc-ref %outputs "out") + "/share/doc/" "docbook-dsssl-" ,version)) + (tar (assoc-ref %build-inputs "tar")) + (bzip2 (assoc-ref %build-inputs "bzip2"))) + (setenv "PATH" (string-append tar "/bin" ":" bzip2 "/bin")) + (mkdir-p docdir) + ;; Extract the "doc" subdirectory. + (invoke "tar" "-xf" source "--strip-components=2" + "--no-same-owner" "-C" docdir + (string-append "docbook-dsssl-" ,version "/doc")))))) + (native-inputs + `(("bzip2", bzip2) + ("tar" ,tar))) + (home-page "https://docbook.org/") + (synopsis "DocBook DSSSL style sheets documentation") + (description "Documentation for the DocBook DSSSL style sheets.") + (license (non-copyleft "file://doc/LEGALNOTICE.htm")))) + (define-public docbook-sgml (package (name "docbook-sgml") -- cgit v1.2.3 From b4b6f676cd35c2e45934e9f5a6346ce6265e1c40 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 28 Dec 2020 16:12:58 -0500 Subject: gnu: Add perl-sgmls. * gnu/packages/perl.scm (perl-sgmls): New variable. --- gnu/packages/perl.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 896a474bba..da05f7a95b 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -11141,6 +11141,39 @@ package takes some liberties with the SDL API, and attempts to adhere to the spirit of both the SDL and Perl.") (license license:lgpl2.1))) +(define-public perl-sgmls + (package + (name "perl-sgmls") + (version "1.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/R/RA/RAAB/SGMLSpm-" + version ".tar.gz")) + (sha256 + (base32 + "1gdjf3mcz2bxir0l9iljxiz6qqqg3a9gg23y5wjg538w552r432m")))) + (build-system perl-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'install 'wrap-script + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (site (string-append out "/lib/perl5/site_perl"))) + (with-directory-excursion out + (rename-file "bin/sgmlspl.pl" "bin/sgmlspl") + (wrap-program "bin/sgmlspl" + `("PERL5LIB" suffix (,site)))) + #t)))))) + (native-inputs + `(("perl-module-build" ,perl-module-build))) + (home-page "https://metacpan.org/release/RAAB/SGMLSpm-1.1") + (synopsis "Perl module for processing SGML parser output") + (description "This package contains @code{SGMLS.pm}, a perl5 class library +for parsing the output from an SGML parser such as OpenSP. It also includes +the @command{sgmlspl} command, an Perl script showcasing how the library can +be used.") + (license license:gpl2+))) + (define-public perl-shell-command (package (name "perl-shell-command") -- cgit v1.2.3 From 2596099c257b0be5ad5cb24e98aaa1d73c3d7a55 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 28 Dec 2020 16:52:54 -0500 Subject: gnu: Add docbook-sgml-3.1. * gnu/packages/docbook.scm (docbook-sgml-3.1): New variable. --- gnu/packages/docbook.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index e248f62b6b..889bb96010 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -336,6 +336,18 @@ by no means limited to these applications.) This package provides XML DTDs.") (description "This package provides SGML style sheets for DocBook.") (license (x11-style "" "See file headers.")))) +(define-public docbook-sgml-3.1 + (package + (inherit docbook-sgml) + (version "3.1") + (source (origin + (method url-fetch) + (uri (string-append "https://www.oasis-open.org/docbook/sgml/" + version "/docbk31.zip")) + (sha256 + (base32 + "0f25ch7bywwhdxb1qa0hl28mgq1blqdap3rxzamm585rf4kis9i0")))))) + ;;; Private package referenced by docbook-sgml. (define iso-8879-entities (package -- cgit v1.2.3 From 2c12d73a6236c56ae48c8b9df49ba36a49f76396 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 1 Jan 2021 01:29:22 -0500 Subject: gnu: Add texlive-marvosym. * gnu/packages/tex.scm (texlive-marvosym): New variable. --- gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 3c5f08196e..b51b4672ea 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018, 2020 Arun Isaac ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Paul Garlick +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -5504,6 +5505,32 @@ CM-Super family of fonts. The package also offers its own LaTeX support for OT2 encoded fonts, CM bright shaped fonts and Concrete shaped fonts.") (license license:lppl))) +(define-public texlive-marvosym + (package + (inherit (simple-texlive-package + "texlive-marvosym" + (list "/doc/fonts/marvosym/" + "/fonts/afm/public/marvosym/" + "/fonts/map/dvips/marvosym/" + "/fonts/tfm/public/marvosym/" + "/fonts/truetype/public/marvosym/" + "/fonts/type1/public/marvosym/" + "/tex/latex/marvosym/") + (base32 + "0m3bbg06cia8ni86fjhvb7x4a5qcxgnpqcvicfms91w2px9ysc46") + #:trivial? #t)) + (home-page "https://martinvogel.de/blog/index.php?\ +/archives/131-Marvosym.ttf.html") + (synopsis "Martin Vogel's Symbols (marvosym) font") + (description "The Martin Vogel’s Symbols fonts (marvosym) contains the +Euro currency symbol as defined by the European commission, along with symbols +for structural engineering, symbols for steel cross-sections, astronomy +signs (sun, moon, planets), the 12 signs of the zodiac, scissor symbols, CE +sign and others. This package contains both the original TrueType font and +the derived Type 1 font, together with support files for TeX (LaTeX).") + (license (list license:lppl ;for TeX support files + license:silofl1.1)))) ;for fonts + (define-public texlive-metapost (package (name "texlive-metapost") -- cgit v1.2.3 From 18d4d15d4a86fb948181b4eacd472a10f52242ea Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 3 Jan 2021 00:20:39 -0500 Subject: gnu: Add config. * gnu/packages/autotools.scm (config): New variable. --- gnu/packages/autotools.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 203f1bfb52..6074379c46 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Pierre-Moana Levesque ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,6 +39,7 @@ #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (ice-9 match) @@ -491,6 +493,53 @@ complexity of working with shared libraries across platforms.") (license gpl3+) (home-page "https://www.gnu.org/software/libtool/"))) +(define-public config + (let ((revision "1") + (commit "c8ddc8472f8efcadafc1ef53ca1d863415fddd5f")) + (package + (name "config") + (version (git-version "0.0.0" revision commit)) ;no release tag + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/config.git/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0x6ycvkmmhhhag97wsf0pw8n5fvh12rjvrck90rz17my4ys16qwv")))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-/bin/sh + (lambda _ + (substitute* "testsuite/config-guess.sh" + (("#!/bin/sh") + (string-append "#!" (which "sh")))) + #t)) + (replace 'build + (lambda _ + (invoke "make" "manpages"))) + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man1 (string-append out "/share/man/man1"))) + (install-file "config.guess" bin) + (install-file "config.sub" bin) + (install-file "doc/config.guess.1" man1) + (install-file "doc/config.sub.1" man1) + #t)))))) + (native-inputs + `(("help2man" ,help2man))) + (home-page "https://savannah.gnu.org/projects/config") + (synopsis "Ubiquitious config.guess and config.sub scripts") + (description "The `config.guess' script tries to guess a canonical system triple, +and `config.sub' validates and canonicalizes. These are used as part of +configuration in nearly all GNU packages (and many others).") + (license gpl2+)))) + (define-public libltdl ;; This is a libltdl package separate from the libtool package. This is ;; useful because, unlike libtool, it has zero extra dependencies (making it -- cgit v1.2.3 From 56edfeec6c69fd54a4d6035138b081c529a334a4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 4 Jan 2021 14:31:29 -0500 Subject: gnu: Add texlive-tipa. * gnu/packages/tex.scm (texlive-tipa): New variable. --- gnu/packages/tex.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b51b4672ea..aad8d91d81 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3536,6 +3536,29 @@ distribution.") (description "This is a very limited subset of the TeX Live distribution. It includes little more than the required set of LaTeX packages."))) +(define-public texlive-tipa + (package + (inherit (simple-texlive-package + "texlive-tipa" + (list "/tex4ht/ht-fonts/alias/tipa/" + "/doc/fonts/tipa/" + "/fonts/map/dvips/tipa/" + "/fonts/source/public/tipa/" + "/fonts/tfm/public/tipa/" + "/fonts/type1/public/tipa/" + "/tex/latex/tipa/") + (base32 + "1h53dscv8z6fsa0ax5dys3x11b2f1g60l22hpdf7c88cvdhcs8sn") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/tipa") + (synopsis "Fonts and macros for IPA phonetics characters") + (description "These fonts are considered the \"ultimate answer\" to IPA +typesetting. The encoding of these 8-bit fonts has been registered as LaTeX +standard encoding T3, and the set of addendum symbols as encoding +TS3. \"Times-like\" Adobe Type 1 versions are provided for both the T3 and the +TS3 fonts.") + (license license:lppl))) + (define-public texlive-latex-amsrefs (package (name "texlive-latex-amsrefs") -- cgit v1.2.3 From 7b825087ecf1e1dbacdcac6e43492e5a792d41d6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 4 Jan 2021 17:42:20 -0500 Subject: gnu: Add texlive-jknappen. * gnu/packages/tex.scm (texlive-jknappen): New variable. --- gnu/packages/tex.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index aad8d91d81..2cd93da983 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -5377,6 +5377,56 @@ alternative version of the Kurier fonts. The difference lies in the absence of ink traps which typify the Kurier font.") (license license:gfl1.0))) +(define-public texlive-jknappen + (package + (inherit (simple-texlive-package + "texlive-jknappen" + (list "/fonts/source/jknappen/" + "/fonts/tfm/jknappen/" + "/fonts/source/jknappen/" + "/fonts/tfm/jknappen/" + "/tex4ht/ht-fonts/alias/jknappen/" + "/tex4ht/ht-fonts/unicode/jknappen/") + (base32 + "1v5wk5il41bddzr81h5636h3cjz0w1qann5g9garsb7qfch9fhws") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/jknappen") + (synopsis "Miscellaneous packages by Jörg Knappen") + (description + "This package contains a collection of macros by Jörg Knappen: +@table @code +@item greekctr +New counterstyles @code{\\greek} and @code{\\Greek}. +@item holtpolt +Non-commutative fractions +@item latin1jk +@itemx latin2jk +@itemx latin3jk +Inputenc definition files that allow verbatim input in the respective ISO +Latin codes. +@item mathbol +Blackboard bold fonts for use in maths. +@item mathrsfs +Mathematical script letters, as traditionally used in physics for Lagrangian, +Hamiltonian, path integral measures, etc. +@item parboxx +New alignment options for parboxen at top and bottom of the box. +@item sans +Interchanges the roles of sans serif and roman fonts throughout the document. +@item semtrans +Support for special latin letters and diacritics used in transliteration of +semitic languages +@item smartmn +Intelligent hyphen/minus, which guesses whether to render as hyphen or minus. +@item sgmlcmpt +Commands replacing the characters <, >, and &. +@item tccompat +A compatibility package for users of the older versions of the textcomp package. +@item young +Simple Young tableaux. +@end table") + (license license:gpl2))) ;per the 00readme_txt file. + (define-public texlive-libertine (package (inherit (simple-texlive-package -- cgit v1.2.3 From 0390d786bbb92bce32281808e6a0ef246f05dc06 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 Jan 2021 13:01:48 -0500 Subject: gnu: Add texlive-courier. * gnu/packages/tex.scm (texlive-courier): New variable. --- gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2cd93da983..2e55202039 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -825,6 +825,33 @@ originals.") (define-public texlive-fonts-cm-super (deprecated-package "texlive-fonts-cm-super" texlive-cm-super)) +(define-public texlive-courier + (package + (inherit (simple-texlive-package + "texlive-courier" + (list "/dvips/courier/" + "/fonts/afm/adobe/courier/" + "/fonts/afm/urw/courier/" + "/fonts/map/dvips/courier/" + "/fonts/tfm/adobe/courier/" + "/fonts/tfm/urw35vf/courier/" + "/fonts/type1/adobe/courier/" + "/fonts/type1/urw/courier/" + "/fonts/vf/adobe/courier/" + "/fonts/vf/urw35vf/courier/" + "/tex/latex/courier/" + "/tex4ht/ht-fonts/alias/adobe/courier/" + "/tex4ht/ht-fonts/unicode/adobe/courier/") + (base32 + "1hfgisdi7mjf5156ax6d6zsbiq42zkmp1x5lg17rgzf61k6d6z1y") + #:trivial? #t)) + (home-page "https://ctan.org/pkg/urw-base35") + (synopsis "URW Base 35 font pack for LaTeX") + (description "This package provides a drop-in replacements for the Courier +font from Adobe's basic set.") + ;; No license version specified. + (license license:gpl3+))) + (define-public texlive-lm (package (inherit (simple-texlive-package -- cgit v1.2.3 From 05b282612272fd9ccb7a7c39dfd3aca04bd724df Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 Jan 2021 13:01:56 -0500 Subject: gnu: Add texlive-helvetic. * gnu/packages/tex.scm (texlive-helvetic): New variable. --- gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2e55202039..d8fbee3237 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1319,6 +1319,32 @@ described in the TeXbook, together with various supporting files (some also discussed in the book).") (license license:knuth))) +(define-public texlive-helvetic + (package + (inherit (simple-texlive-package + "texlive-helvetic" + (list "/dvips/helvetic/" + "/fonts/afm/adobe/helvetic/" + "/fonts/afm/urw/helvetic/" + "/fonts/map/dvips/helvetic/" + "/fonts/tfm/adobe/helvetic/" + "/fonts/tfm/monotype/helvetic/" + "/fonts/tfm/urw35vf/helvetic/" + "/fonts/type1/urw/helvetic/" + "/fonts/vf/adobe/helvetic/" + "/fonts/vf/monotype/helvetic/" + "/fonts/vf/urw35vf/helvetic/" + "/tex/latex/helvetic/") + (base32 + "0c3f1ly7y6404z0akbfbbfql13sz717v0n0g69qjpr69hi4n0nsl") + #:trivial? #t)) + (home-page "https://ctan.org/pkg/urw-base35") + (synopsis "URW Base 35 font pack for LaTeX") + (description "This package provides a drop-in replacements for the Helvetica +font from Adobe's basic set.") + ;; No license version specified. + (license license:gpl3+))) + (define-public texlive-hyphen-afrikaans (package (inherit (texlive-hyphen-package -- cgit v1.2.3 From 0602047ca9de4943a51f703ffc394c975e3d4b51 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 Jan 2021 21:23:18 -0500 Subject: gnu: Add texlive-wasy. * gnu/packages/tex.scm (texlive-wasy): New variable. --- gnu/packages/tex.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index d8fbee3237..4e13c62717 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -5745,6 +5745,24 @@ Association for Computing Machinery (ACM).") get a narrower “natural” width.") (license license:lppl))) +(define-public texlive-wasy + (package + (inherit (simple-texlive-package + "texlive-wasy" + (list "/fonts/source/public/wasy/" + "/fonts/tfm/public/wasy/" + "/tex/plain/wasy/" + "/doc/fonts/wasy/") + (base32 + "10dxbqgv42niybj65hj6y47x8lsl83m48rgw2v2s50k05wbghwbm") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/wasy") + (synopsis "Waldi symbol fonts") + (description "This package provides the @code{wasy} (Waldi symbol) fonts, +in the Metafont and Adobe Type 1 formats. Support under LaTeX is provided by +the @code{wasysym} package.") + (license license:public-domain))) + (define-public texlive-latex-wasysym (package (name "texlive-latex-wasysym") -- cgit v1.2.3 From e45dcf4990654934d1efd4073e12add3256cb422 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 Jan 2021 21:23:40 -0500 Subject: gnu: texlive-wasysym: Update synopsis and description. * gnu/packages/tex.scm (texlive-wasysym)[synopsis]: Refer to the font by 'wasy', not WASY2. [description]: Likewise. Use code ornaments for the LaTeX package names. --- gnu/packages/tex.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 4e13c62717..bdf881f643 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -5777,12 +5777,12 @@ the @code{wasysym} package.") (build-system texlive-build-system) (arguments '(#:tex-directory "latex/wasysym")) (home-page "https://www.ctan.org/pkg/wasysym") - (synopsis "LaTeX support file to use the WASY2 fonts") + (synopsis "LaTeX support file to use the @code{wasy} fonts") (description - "The wasy2WASY2 (Waldi Symbol) font by Roland Waldi provides many glyphs -like male and female symbols and astronomical symbols, as well as the complete -lasy font set and other odds and ends. The wasysym package implements an easy -to use interface for these symbols.") + "The @code{wasy} (Waldi Symbol) font by Roland Waldi provides many glyphs like +male and female symbols and astronomical symbols, as well as the complete +@code{lasy} font set and other odds and ends. The @code{wasysym} package +implements an easy to use interface for these symbols.") (license license:lppl))) (define-public texlive-latex-wrapfig -- cgit v1.2.3 From 231c70b14b0e9903577de984d424f667018ba448 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Jan 2021 09:39:50 +0100 Subject: gnu: eolie: Update to 0.9.101. * gnu/packages/gnome.scm (eolie): Update to 0.9.101. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 904c1c69e4..829e97c8bc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6497,14 +6497,14 @@ almost all of them.") (define-public eolie (package (name "eolie") - (version "0.9.100") + (version "0.9.101") (source (origin (method url-fetch) (uri (string-append "https://adishatz.org/eolie/eolie-" version ".tar.xz")) (sha256 (base32 - "1vzhfp8j1z3jvd5ndqfyn7nqrx3zdvx9mv1byjl36nnd9g63ji62")))) + "1v8n21y75abdzsnx5idyd0q6yfb6cd0sqbknlbkwh5fdgvjzyvwn")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From 21c74211802f47ceaf641ccf961787c6adccd661 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Jan 2021 09:40:03 +0100 Subject: gnu: system-config-printer: Update to 1.5.15. * gnu/packages/gnome.scm (system-config-printer): Update to 1.5.15. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 829e97c8bc..f4a98ab266 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2841,7 +2841,7 @@ database is translated at Transifex.") (define-public system-config-printer (package (name "system-config-printer") - (version "1.5.14") + (version "1.5.15") (source (origin (method url-fetch) @@ -2850,7 +2850,7 @@ database is translated at Transifex.") "download/v" version "/system-config-printer-" version ".tar.xz")) (sha256 - (base32 "1l79lj44kl079sk308m42x3py1yvcxk5x5bs2vqfmqv26zm8qyqf")))) + (base32 "12d6xx51vizc476zfnsga9q09nflp51ipn6y7lhi9w2v4772dlpv")))) (build-system glib-or-gtk-build-system) (arguments `(#:imported-modules ((guix build python-build-system) -- cgit v1.2.3 From ee858defb2a16f31d9cf10dbaa2b6a5fb54e0747 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Jan 2021 09:40:18 +0100 Subject: gnu: acpica: Update to 20210105. * gnu/packages/admin.scm (acpica): Update to 20210105. --- 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 d1a3a71f99..1b88cddb9c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1862,7 +1862,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") (define-public acpica (package (name "acpica") - (version "20201217") + (version "20210105") (source (origin (method url-fetch) (uri (string-append @@ -1870,7 +1870,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") version ".tar.gz")) (sha256 (base32 - "06rdpfjmij5nni1x2wi1gnalhsza5yxq1viskjm9r11wmsjnxm2a")))) + "1gi7qzfywg118g5nlqn5lawxk25pg2sz01gmbz40vvmikks4ri9r")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) -- cgit v1.2.3 From bcf2f79c06e9c9ddc32af3ef2af468209dd9a634 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Jan 2021 10:22:35 +0100 Subject: gnu: xsettingsd: Update to 1.0.2. * gnu/packages/xdisorg.scm (xsettingsd): Update to 1.0.2. --- gnu/packages/xdisorg.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 793150cc5f..26660b8bfa 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2265,7 +2265,7 @@ Xwrits hides itself until you should take another break.") (define-public xsettingsd (package (name "xsettingsd") - (version "1.0.0") + (version "1.0.2") (source (origin (method git-fetch) @@ -2274,8 +2274,7 @@ Xwrits hides itself until you should take another break.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "05m4jlw0mgwp24cvyklncpziq1prr2lg0cq9c055sh4n9d93d07v")))) + (base32 "14gnkz18dipsa2v24f4nm9syxaa7g21iqjm7y65jn849ka2jr1h8")))) (build-system scons-build-system) (inputs `(("libx11" ,libx11))) -- cgit v1.2.3 From 00275eacb0619ce621acaf22dd19add2073058a9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Jan 2021 11:42:02 +0100 Subject: gnu: diffstat: Update to 1.64. * gnu/packages/version-control.scm (diffstat): Update to 1.64. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 4930ebb32f..f53ca9b11b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2015, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2017, 2018 Nikita -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017, 2020 EuAndreh @@ -1938,7 +1938,7 @@ standards-compliant ChangeLog entries based on the changes that it detects.") (define-public diffstat (package (name "diffstat") - (version "1.63") + (version "1.64") (source (origin (method url-fetch) (uri @@ -1949,7 +1949,7 @@ standards-compliant ChangeLog entries based on the changes that it detects.") "diffstat-" version ".tgz"))) (sha256 (base32 - "0vyw200s5dv1257pmrh6c6fdkmw3slyz5szpqfx916xr04sdbpby")))) + "1z7pwcv48fjnhxrjcsjdy83x8b9ckl582mbbds90a79fkn6y7bmq")))) (build-system gnu-build-system) (home-page "https://invisible-island.net/diffstat/") (synopsis "Make histograms from the output of @command{diff}") -- cgit v1.2.3 From 1fb0c5ac9f5a4318a375a9f11d3b41356e5ce336 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Jan 2021 11:42:13 +0100 Subject: gnu: perl-net-http: Update to 6.20. * gnu/packages/web.scm (perl-net-http): Update to 6.20. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 397fa387cc..492308fc18 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4004,7 +4004,7 @@ is limited to http and https.") (define-public perl-net-http (package (name "perl-net-http") - (version "6.19") + (version "6.20") (source (origin (method url-fetch) (uri (string-append @@ -4012,7 +4012,7 @@ is limited to http and https.") "Net-HTTP-" version ".tar.gz")) (sha256 (base32 - "1i1gbcwdzx74whn5vn6xbr2cp7frldfz2rfrcjp2qljr770nxdsj")))) + "07lzfycza7qqxli18xgsnqwiwxapl0b64z33wfw62aai4hm7nllj")))) (build-system perl-build-system) (propagated-inputs `(("perl-io-socket-ssl" ,perl-io-socket-ssl) -- cgit v1.2.3 From 8eb5f097b134f8ee703404bf3773b6a8d09d4829 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Jan 2021 11:42:36 +0100 Subject: gnu: lxc: Update to 4.0.6. * gnu/packages/virtualization.scm (lxc): Update to 4.0.6. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 7fd07b5533..77f85029cb 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -952,7 +952,7 @@ all common programming languages. Vala bindings are also provided.") (define-public lxc (package (name "lxc") - (version "4.0.5") + (version "4.0.6") (source (origin (method url-fetch) (uri (string-append @@ -960,7 +960,7 @@ all common programming languages. Vala bindings are also provided.") version ".tar.gz")) (sha256 (base32 - "1976l9308rx1ria1gazasypk5rmmf5jiqdh54dfrws5bslbdcb5g")))) + "0qz4l7mlhq7hx53q606qgvkyzyr01glsw290v8ppzvxn1fydlrci")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 526fff3de0ae3085043d7ce67f06486ea3e4f093 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Jan 2021 11:42:49 +0100 Subject: gnu: elementary-xfce-icon-theme: Update to 0.15.2. * gnu/packages/xfce.scm (elementary-xfce-icon-theme): Update to 0.15.2. --- gnu/packages/xfce.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 6b61139157..d5f68a321d 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2017 Petter ;;; Copyright © 2017 Nikita -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pkill -9 ;;; Copyright © 2019 L p R n d n ;;; Copyright © 2019 Ingo Ruhnke @@ -268,7 +268,7 @@ it to your needs by using several command line options.") (define-public elementary-xfce-icon-theme (package (name "elementary-xfce-icon-theme") - (version "0.15.1") + (version "0.15.2") (source (origin (method git-fetch) (uri @@ -278,7 +278,7 @@ it to your needs by using several command line options.") (file-name (git-file-name name version)) (sha256 (base32 - "1rl15kh9c7qxw4pvwmw44fb4v3vwh6zin4wpx55bnvm5j76y6p3f")))) + "1g6vndqvp11c2kl5vkpzb1wxvr2pfb3hvqxjjdgx6qzq9x8zmiqk")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no check target -- cgit v1.2.3 From f5c9e76f97d426f081b45328fdb70aaa757a284b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Jan 2021 11:45:47 +0100 Subject: gnu: jucipp: Update to 1.6.2. * gnu/packages/text-editors.scm (jucipp): Update to 1.6.2. --- gnu/packages/text-editors.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 81915ca52b..052dfa1236 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017 Feng Shu ;;; Copyright © 2017 Nikita ;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Andreas Enge ;;; Copyright © 2019, 2020 Nicolas Goaziou @@ -230,7 +230,7 @@ bindings and many of the powerful features of GNU Emacs.") (define-public jucipp (package (name "jucipp") - (version "1.6.1") + (version "1.6.2") (home-page "https://gitlab.com/cppit/jucipp") (source (origin (method git-fetch) @@ -242,7 +242,7 @@ bindings and many of the powerful features of GNU Emacs.") (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "0lb477acqrm3fy3j6i7j9l68j48cnkrzi80588npwwjssqicy4g6")))) + (base32 "10idv2kyw2dg45wfcnh7nybs8qys7kfvif90sjrff3541k97pm5y")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBUILD_TESTING=ON" -- cgit v1.2.3 From 45b4712c551fdebd11ec7eb62c909714fd859223 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Jan 2021 11:46:01 +0100 Subject: gnu: lldpd: Update to 1.0.8. * gnu/packages/networking.scm (lldpd): Update to 1.0.8. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 83a99ded72..28fd096cd0 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3756,14 +3756,14 @@ thousands of connections is clearly realistic with today's hardware.") (define-public lldpd (package (name "lldpd") - (version "1.0.7") + (version "1.0.8") (source (origin (method url-fetch) (uri (string-append "https://media.luffy.cx/files/lldpd/lldpd-" version ".tar.gz")) (sha256 - (base32 "1qc7k83zpcq27hpjv1lmgrj4la2zy1gspwk5jas43j49siwr3xqx")) + (base32 "1vrxr8lgkw7q6ixaaili6ac7i0j0326194s498n2dxihdvkh1llq")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 9f60d927294843e0302cf6b4aef549debe4eeaf0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Jan 2021 13:23:06 +0100 Subject: gnu: nano: Update to 5.5. * gnu/packages/nano.scm (nano): Update to 5.5. --- gnu/packages/nano.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index 0caa918267..5729448e18 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Rene Saavedra -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,13 +30,13 @@ (define-public nano (package (name "nano") - (version "5.4") + (version "5.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) (sha256 - (base32 "1sc6xl9935k9s9clkv83hapijka4qknfnj6f15c3b1i2n84396gy")))) + (base32 "0jkyd3yzcidnvnj1k9bmplzlbd303x6xxblpp5np7zs1kfzq22rr")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 4f38e0e47b4f20d5fa034ec7cde836858cfc7963 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 14 Jan 2021 17:10:41 +0100 Subject: gnu: Add lv2-speech-denoiser. * gnu/packages/audio.scm (lv2-speech-denoiser): New variable. --- gnu/packages/audio.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 6fe441faae..2e46dc3a26 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015 Alex Kost @@ -4134,6 +4134,63 @@ the following features: ") (license license:lgpl3+))) +(define-public lv2-speech-denoiser + (let ((commit "04cfba929630404f8d4f4ca5bac8d9b09a99152f") + (revision "1")) + (package + (name "lv2-speech-denoiser") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lucianodato/speech-denoiser/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "189l6lz8sz5vr6bjyzgcsrvksl1w6crqsg0q65r94b5yjsmjnpr4")))) + (build-system meson-build-system) + (arguments + `(#:meson ,meson-0.55 + ;; Using a "release" build is recommended for performance + #:build-type "release" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-meson-build + (lambda _ + (substitute* "meson.build" + (("install_folder = 'sdenoise.lv2'") + "install_folder = 'lib/lv2/sdenoise.lv2'") + (("build/manifest.ttl") "../build/manifest.ttl")) + #t)) + (add-after 'unpack 'build-rnnoise + (lambda _ + (with-directory-excursion "rnnoise" + (let ((old-CFLAGS (getenv "CFLAGS"))) + (setenv "CFLAGS" "-fvisibility=hidden -fPIC -Wl,--exclude-libs,ALL") + (setenv "CONFIG_SHELL" (which "bash")) + (invoke "autoreconf" "-vif") + (invoke "sh" "configure" + "--disable-examples" + "--disable-doc" + "--disable-shared" + "--enable-static") + (invoke "make") + (setenv "CFLAGS" old-CFLAGS)))))))) + (inputs + `(("lv2" ,lv2))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/werman/noise-suppression-for-voice") + (synopsis "Speech denoise LV2 plugin based on Xiph's RNNoise library") + (description "RNNoise is a library that uses deep learning to apply +noise supression to audio sources with voice presence. This package provides +an LV2 audio plugin.") + (license license:lgpl3+)))) + (define-public cli-visualizer (package (name "cli-visualizer") -- cgit v1.2.3 From 795db9d2199200e69d0acc7ffad4546a75679f95 Mon Sep 17 00:00:00 2001 From: Stefan Date: Mon, 11 Jan 2021 21:32:47 +0100 Subject: gnu: qemu: Fix ioctl(…, SIOCGIFCONF, …) for emulated 64 bit architectures. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/virtualization.scm (qemu): Add a snippet to fix a bug in the do_ioctl_ifconf() function of qemu to make ioctl(…, SIOCGIFCONF, …) work for emulated 64 bit architectures. The sizeof(struct ifreq) is 40 for 64 bit and 32 for 32 bit architectures. This structure contains a union of other structures, of which struct ifmap is the biggest for 64 bit architectures. Calling ioctl(…, SIOCGIFCONF, …) fills a struct sockaddr of that union, and do_ioctl_ifconf() only considered that struct sockaddr for the size of the union, which has the same size as struct ifmap on 32 bit architectures. So do_ioctl_ifconf() assumed a wrong size of 32 for struct ifreq instead of the correct size of 40 on 64 bit architectures. The fix makes do_ioctl_ifconf() handle struct ifmap as the biggest part of the union, treating struct ifreq with the correct size. This fixes (@ (guix build syscalls) network-interface-names) when used in emulated 64 bit architectures. Signed-off-by: Ludovic Courtès --- gnu/packages/virtualization.scm | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 77f85029cb..2262aa6197 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -137,13 +137,28 @@ (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) - (sha256 - (base32 - "1rd41wwlvp0vpialjp2czs6i3lsc338xc72l3zkbb7ixjfslw5y9")) - (patches (search-patches "qemu-build-info-manual.patch")))) - (outputs '("out" "doc")) ;4.7 MiB of HTML docs - (build-system gnu-build-system) - (arguments + (sha256 + (base32 + "1rd41wwlvp0vpialjp2czs6i3lsc338xc72l3zkbb7ixjfslw5y9")) + (patches (search-patches "qemu-build-info-manual.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix a bug in the do_ioctl_ifconf() function of qemu to + ;; make ioctl(…, SIOCGIFCONF, …) work for emulated 64 bit + ;; architectures. The size of struct ifreq is handled + ;; incorrectly. + ;; https://lists.nongnu.org/archive/html/qemu-devel/2021-01/msg01545.html + (substitute* '("linux-user/syscall.c") + (("^([[:blank:]]*)const argtype ifreq_arg_type.*$" line indent) + (string-append line indent + "const argtype ifreq_max_type[] = { MK_STRUCT(STRUCT_ifmap_ifreq) };\n")) + (("^([[:blank:]]*)target_ifreq_size[[:blank:]]=.*$" _ indent) + (string-append indent "target_ifreq_size = thunk_type_size(ifreq_max_type, 0);"))) + #t)))) + (outputs '("out" "doc")) ;4.7 MiB of HTML docs + (build-system gnu-build-system) + (arguments `(;; FIXME: Disable tests on i686 to work around ;; . #:tests? ,(or (%current-target-system) -- cgit v1.2.3 From d88408b25e61ca7df7436d42b5c6695ae8061658 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 25 Dec 2020 13:44:33 +0100 Subject: gnu: xfce: Update to 4.16.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (libxfce4util): Update to 4.16.0. (xfconf): Update to 4.16.0. [arguments]: Add phase to disable hanging test. (libxfce4ui): Update to 4.16.0. [inputs]: Remove unneeded gtk+-2. (exo): Update to 4.16.0. [arguments]: Remove wrap-exo-compose-mail phase. [inputs]: Remove unneeded gtk+-2 and perl-uri. (garcon): Update to 0.8.0. [inputs]: Remove unneeded gtk+-2. (tumbler): Update to 4.16.0. (xfce4-panel): Update to 4.16.0. (xfce4-appfinder): Update to 4.16.0. (xfce4-session): Update to 4.16.0. (xfce4-settings): Update to 4.16.0. [inputs]: Add python. (thunar): Update to 4.16.0. (thunar-volman): Update to 4.16.0. (xfwm4): Update to 4.16.0. (xfdesktop): Update to 4.16.0. (xfce4-power-manager): Update to 4.16.0. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 96 ++++++++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 55 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index d5f68a321d..a5c9482c01 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -54,6 +54,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages popt) + #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages search) @@ -100,7 +101,7 @@ (define-public libxfce4util (package (name "libxfce4util") - (version "4.14.0") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -108,7 +109,7 @@ "/" name "-" version ".tar.bz2")) (sha256 (base32 - "093338faqqsrlc8dkmzr7qv411ysxczg1wlg7s3gvhrfk6vpkb9j")))) + "10svnpc8ggasym1pfgh24bfr0ndqs6lc7v1wmpsizj0zbms8snb0")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -126,7 +127,7 @@ Xfce Desktop Environment.") (define-public xfconf (package (name "xfconf") - (version "4.14.4") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -134,12 +135,17 @@ Xfce Desktop Environment.") "xfconf-" version ".tar.bz2")) (sha256 (base32 - "0wszp93z64112jq5wm4133s64in2ndvnzbgsbn8dh7p5xhp64dyc")))) + "09al5bkq89b8pb3xyxnw0cnz6crxj8678ymwq2k9nzf60y812ak5")))) (build-system gnu-build-system) (arguments '(#:phases ;; Run check after install phase to test dbus activation. (modify-phases %standard-phases + ;; tests-end seems to hang forever + (add-before 'configure 'patchout-tests-end + (lambda _ + (substitute* "tests/Makefile.in" + (("tests-end") "")))) (add-after 'install 'custom-check (lambda _ (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME @@ -147,7 +153,7 @@ Xfce Desktop Environment.") (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service (string-append %output "/share")) ;; For the missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0"); + (setenv "DBUS_FATAL_WARNINGS" "0") (invoke "dbus-launch" "make" "check"))) (delete 'check)))) (native-inputs @@ -172,7 +178,7 @@ storage system.") (define-public libxfce4ui (package (name "libxfce4ui") - (version "4.14.1") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -180,7 +186,7 @@ storage system.") name "-" version ".tar.bz2")) (sha256 (base32 - "1npjhznmnckhnylsv3l7p1zvhckhmp9d7vifs8w12kdfmrg0fjf4")))) + "1anfj3n28abv9kbcpybs7q3k5g3c3d0r4xf4hyfqms2b9zlwj1lb")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -191,14 +197,11 @@ storage system.") ("gobject-introspection" ,gobject-introspection))) (propagated-inputs `(("gtk+-3" ,gtk+) ; required by libxfce4ui-2.pc - ;; libxfce4kbd-private-2.pc refers to all these. + ;; libxfce4kbd-private-3.pc refers to all these. ("libxfce4util" ,libxfce4util) ("xfconf" ,xfconf))) (inputs `(("libsm" ,libsm) ("libice" ,libice) - ;; FIXME: required by libxfce4ui-1.pc, so should be propagated, - ;; but will lead to a conflict with gtk+. - ("gtk+-2" ,gtk+-2) ("startup-notification" ,startup-notification))) (home-page "https://www.xfce.org/") (synopsis "Widgets library for Xfce") @@ -303,7 +306,7 @@ upstream occasionally.") (define-public exo (package (name "exo") - (version "0.12.11") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -311,21 +314,8 @@ upstream occasionally.") "exo-" version ".tar.bz2")) (sha256 (base32 - "1dp5s64g6572h9zvx9js7qc72s728qsd9y7hl7hg6rwaq0cjb2gc")))) + "1k5sfm9cmg8k5zzzv0wb2cciqwwklnpfzcpak7wa32lsxl7b0x8r")))) (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; exo won't find URI::Escape otherwise - (add-after 'install 'wrap-exo-compose-mail - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (perl5lib (getenv "PERL5LIB"))) - (wrap-program (string-append out "/lib/xfce4/exo/exo-compose-mail") - `("PERL5LIB" ":" prefix - (,(string-append perl5lib ":" out - "/lib/perl5/site_perl"))))) - #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) @@ -334,10 +324,7 @@ upstream occasionally.") `(("gtk+-3" ,gtk+) ("libxfce4util" ,libxfce4util))) (inputs - `(;; FIXME Referred to in exo-1.pc but conflict with gtk+-3. - ("gtk+-2" ,gtk+-2) - ("libxfce4ui" ,libxfce4ui) - ("perl-uri" ,perl-uri))) + `(("libxfce4ui" ,libxfce4ui))) (home-page "https://www.xfce.org/") (synopsis "Extension library for Xfce") (description @@ -350,7 +337,7 @@ development.") (define-public garcon (package (name "garcon") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -358,14 +345,12 @@ development.") "garcon-" version ".tar.bz2")) (sha256 (base32 - "08r4dfvdvl178cjajm7ww16lwb7jsfqh3yz614mn84c0a0dvdhw2")))) + "1fx19953fnrk93lak66y3zqbn4n1qvpc77ynzzgdnj5wwngdh4a8")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) ("glib:bin" ,glib "bin"))) - (inputs - `(("gtk+-2" ,gtk+-2))) ; required by garcon-gtk2-1.pc (propagated-inputs `(("gtk+-3" ,gtk+) ; required by garcon-gtk3-1.pc ("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk3-1.pc @@ -381,7 +366,7 @@ merging features essential for loading menus modified with menu editors.") (define-public tumbler (package (name "tumbler") - (version "0.2.9") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -389,7 +374,7 @@ merging features essential for loading menus modified with menu editors.") "tumbler-" version ".tar.bz2")) (sha256 (base32 - "1dh7h0jcbf8brvv9vwq4amnk6zgldl2ipdq3clzsx9p50dpr0235")))) + "0rmga1l7da0pjrs6jlyq1nfn513r543v7cchshrif1341knpy2wv")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -420,7 +405,7 @@ management D-Bus specification.") (define-public xfce4-panel (package (name "xfce4-panel") - (version "4.14.0") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -428,7 +413,7 @@ management D-Bus specification.") name "-" version ".tar.bz2")) (sha256 (base32 - "1x3flv86jh9vqah7mr5mmfx2991mc6icsqjygsc3j88lgsyz7y6m")) + "0gf57hgx6v44bc2hj570inkafbi291scc6wbhmr6sc3xngp9m5sy")) (patches (search-patches "xfce4-panel-plugins.patch")))) (build-system gnu-build-system) (arguments @@ -659,7 +644,7 @@ per window.") (define-public xfce4-appfinder (package (name "xfce4-appfinder") - (version "4.14.0") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/xfce/" @@ -667,7 +652,7 @@ per window.") "/src/" name "-" version ".tar.bz2")) (sha256 (base32 - "162dibl6ipp72x0s35yhk7kkzxd4qimagg5zdkkv5kjgjpa7bhby")))) + "0m09vwgs5i1dy484r2y4w14kp38n469zhg0n4gnj10pcxsm2mf9p")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -686,7 +671,7 @@ your system in categories, so you can quickly find and launch them.") (define-public xfce4-session (package (name "xfce4-session") - (version "4.14.2") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -694,7 +679,7 @@ your system in categories, so you can quickly find and launch them.") "xfce4-session-" version ".tar.bz2")) (sha256 (base32 - "1bwpylcn7x9i301yz45wvkzah9bncv9b44nf4hh9ln4i1jka9qzv")) + "1dqpgnq1hy9z170aapjglyp6jpyq1iqn5331nph727a82br77wi2")) (modules '((guix build utils))) (snippet '(begin @@ -731,7 +716,7 @@ allows you to shut down the computer from Xfce.") (define-public xfce4-settings (package (name "xfce4-settings") - (version "4.14.0") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -739,7 +724,7 @@ allows you to shut down the computer from Xfce.") name "-" version ".tar.bz2")) (sha256 (base32 - "0g0ipkg2fyg8r1z95ynx0xjr78bp49c2dwh4mli05nmb4gb40c70")) + "1hnx88a8xmi38mdf5gxdvx7n8yax1vzah8hy8g37bijlqx7l18b7")) (patches (search-patches "xfce4-settings-defaults.patch")))) (build-system gnu-build-system) (arguments @@ -758,7 +743,8 @@ allows you to shut down the computer from Xfce.") ("libxklavier" ,libxklavier) ("libxrandr" ,libxrandr) ("libxfce4ui" ,libxfce4ui) - ("upower" ,upower) + ("upower" ,upower) ;; TODO needs upower-glib + ("python" ,python) ;; for xfce4-compose-mail ("xf86-input-libinput" ,xf86-input-libinput))) (home-page "https://www.xfce.org/") (synopsis "Xfce settings manager") @@ -770,7 +756,7 @@ like appearance, display, keyboard and mouse settings.") (define-public thunar (package (name "thunar") - (version "1.8.16") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -778,7 +764,7 @@ like appearance, display, keyboard and mouse settings.") "thunar-" version ".tar.bz2")) (sha256 (base32 - "0k1w2zwa8z6sc8vi3frva74npks79x79n7q9p7ibwk7irfqkh4r2")))) + "16zxznc3zcdpcjqjp84j9636kvvrimfn8wj9avxfp4ba254c8xv2")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -802,7 +788,7 @@ fast.") (define-public thunar-volman (package (name "thunar-volman") - (version "0.9.5") + (version "4.16.0") (source (origin (method url-fetch) @@ -810,7 +796,7 @@ fast.") (version-major+minor version) "/" "thunar-volman-" version ".tar.bz2")) (sha256 - (base32 "0dqqkbhn43hhmhqyx1fnmawpvysdjzw6ln4ryf629wil6dlwd9vy")))) + (base32 "0zaliahfz9ci2md7g6w9mb7z5azi5n56gihbnwyzvds2n8cygh6j")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -833,7 +819,7 @@ and import the new pictures from your camera.") (define-public xfwm4 (package (name "xfwm4") - (version "4.14.3") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -841,7 +827,7 @@ and import the new pictures from your camera.") "xfwm4-" version ".tar.bz2")) (sha256 (base32 - "1gw3fbiwraylarl1bqbvfh7nxlss5w8w0im5ahfg3a9mkrdfr6w2")))) + "1czyy4vck4yh6bbxyk6f15mvzv3ndrhabc2k2zyynv5npghyl8hy")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -863,7 +849,7 @@ on the screen.") (define-public xfdesktop (package (name "xfdesktop") - (version "4.14.3") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -871,7 +857,7 @@ on the screen.") "xfdesktop-" version ".tar.bz2")) (sha256 (base32 - "14sp5a4n21prwmh2l5mjq5fjaq7r2pbjxddfx4wzaix8867x1mq6")) + "1bjv2mpkv7zmpzssbvvzh0x4pn8cqm8dvhgsv5i1xwngzspsajwk")) (modules '((guix build utils))) (snippet #~(begin @@ -1007,7 +993,7 @@ system resources, while still being visually appealing and user friendly.") (define-public xfce4-power-manager (package (name "xfce4-power-manager") - (version "1.7.1") + (version "4.16.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -1015,7 +1001,7 @@ system resources, while still being visually appealing and user friendly.") "xfce4-power-manager-" version ".tar.bz2")) (sha256 (base32 - "1ki088iyr266cfyq9bmmhhd27wrsrmbhsblyf4yqby03hlvqif3k")))) + "1wrvqiifaxsgcn1kh4vm2hwxi9lgm6mw4zrfld2zl0mm05y5i77b")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From f79f41e2403e69e4ae5c57e2a5cbd348d8677a98 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 14 Jan 2021 17:17:22 +0100 Subject: gnu: efi-analyzer: Rename with a hyphen instead of an underscore. * gnu/packages/efi.scm (efi_analyzer): Rename to... (efi-analyzer): ... this. (efi_analyzer): Redefine as a deprecated alias. --- gnu/packages/efi.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index ac330dee64..11cfe586ac 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -62,11 +62,11 @@ environment presented by Intel's EFI.") ;; Distribution is allowed only when accepting all those licenses. (license (list license:bsd-2 license:bsd-3 license:bsd-4 license:expat)))) -(define-public efi_analyzer +(define-public efi-analyzer (let ((commit "77c9e3a67cd7c2fca48a4292dad25a5429872f95") (revision "0")) (package - (name "efi_analyzer") + (name "efi-analyzer") (version (git-version "0.0.0" revision commit)) (source (origin @@ -96,6 +96,10 @@ environment presented by Intel's EFI.") information.") (license license:bsd-2)))) +(define-public efi_analyzer + ;; For a short while the package name contained an underscore. + (deprecated-package "efi_analyzer" efi-analyzer)) + (define-public sbsigntools (package (name "sbsigntools") -- cgit v1.2.3 From a36abbe00577dcec5fc3c9ec5bb797a1c1adb6a5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 13 Jan 2021 14:09:59 +0200 Subject: gnu: gemma: Update to 0.98.3. * gnu/packages/bioinformatics.scm (gemma): Update to 0.98.3. [source, home-page]: Update to new upstream URI. [inputs]: Remove eigen, gfortran, lapack. [arguments]: Remove make-flags. Remove 'find-eigen phase. Rename 'bin-mkdir phase to 'prepare-build and substitute openblas include directory. --- gnu/packages/bioinformatics.scm | 49 ++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 512abcd8fd..8dcf2fd649 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2016, 2018, 2019, 2020 Pjotr Prins ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016, 2020 Roel Janssen -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2020 Marius Bakke ;;; Copyright © 2016, 2018 Raoul Bonnal ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -3563,56 +3563,39 @@ comment or quality sections.") (define-public gemma (package (name "gemma") - (version "0.98") + (version "0.98.3") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/xiangzhou/GEMMA") - (commit (string-append "v" version)))) + (url "https://github.com/genetics-statistics/GEMMA") + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "1s3ncnbn45r2hh1cvrqky1kbqq6546biypr4f5mkw1kqlrgyh0yg")))) + "1p8a7kkfn1mmrg017aziy544aha8i9h6wd1x2dk3w2794wl33qb7")))) + (build-system gnu-build-system) (inputs - `(("eigen" ,eigen) - ("gfortran" ,gfortran "lib") - ("gsl" ,gsl) - ("lapack" ,lapack) + `(("gsl" ,gsl) ("openblas" ,openblas) ("zlib" ,zlib))) - (build-system gnu-build-system) (arguments - `(#:make-flags - '(,@(match (%current-system) - ("x86_64-linux" - '("FORCE_DYNAMIC=1")) - ("i686-linux" - '("FORCE_DYNAMIC=1" "FORCE_32BIT=1")) - (_ - '("FORCE_DYNAMIC=1" "NO_INTEL_COMPAT=1")))) - #:phases + `(#:phases (modify-phases %standard-phases (delete 'configure) - (add-after 'unpack 'find-eigen + (add-after 'unpack 'prepare-build (lambda* (#:key inputs #:allow-other-keys) - ;; Ensure that Eigen headers can be found - (setenv "CPLUS_INCLUDE_PATH" - (string-append (assoc-ref inputs "eigen") - "/include/eigen3")) + (mkdir-p "bin") + (substitute* "Makefile" + (("/usr/local/opt/openblas") + (assoc-ref inputs "openblas"))) #t)) - (add-before 'build 'bin-mkdir - (lambda _ - (mkdir-p "bin") - #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (install-file "bin/gemma" - (string-append - out "/bin"))) + (install-file "bin/gemma" + (string-append (assoc-ref outputs "out") "/bin")) #t))) #:tests? #f)) ; no tests included yet - (home-page "https://github.com/xiangzhou/GEMMA") + (home-page "https://github.com/genetics-statistics/GEMMA") (synopsis "Tool for genome-wide efficient mixed model association") (description "Genome-wide Efficient Mixed Model Association (GEMMA) provides a -- cgit v1.2.3 From daf96e704df2da6d2e320c16991840f8dbc216c1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 13 Jan 2021 14:33:45 +0200 Subject: gnu: gemma: Add Texinfo markup. * gnu/packages/bioinformatics.scm (gemma)[description]: Use Texinfo markup. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8dcf2fd649..70696c189a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3598,9 +3598,9 @@ comment or quality sections.") (home-page "https://github.com/genetics-statistics/GEMMA") (synopsis "Tool for genome-wide efficient mixed model association") (description - "Genome-wide Efficient Mixed Model Association (GEMMA) provides a -standard linear mixed model resolver with application in genome-wide -association studies (GWAS).") + "@acronym{GEMMA, Genome-wide Efficient Mixed Model Association} provides a +standard linear mixed model resolver with application in @acronym{GWAS, +genome-wide association studies}.") (license license:gpl3))) (define-public grit -- cgit v1.2.3 From f58e491fb837ae4344689c1cefdc1b6e582c3015 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 14 Jan 2021 10:02:12 +0200 Subject: gnu: Add shunit2. * gnu/packages/check.scm (shunit2): New variable. --- gnu/packages/check.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 1300f9e1a6..d9a1fb3acf 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015, 2017 Cyril Roelandt ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2015, 2016, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016, 2017 Danny Milosavljevic @@ -288,6 +288,55 @@ unit testing. Test output is in XML for automatic testing and GUI based for supervised tests.") (license license:lgpl2.1))) ; no copyright notices. LGPL2.1 is in the tarball +(define-public shunit2 + (package + (name "shunit2") + (version "2.1.8") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kward/shunit2") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08vs0jjl3pfh100sjlw31x4638xj7fghr0j2g1zfikba8n1f9491")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (delete 'build) + (add-after 'patch-source-shebangs 'patch-more-shebangs + (lambda _ + (substitute* "shunit2" + (("#! /bin/sh") (string-append "#! " (which "sh"))) + (("/usr/bin/od") (which "od"))) + (substitute* "test_runner" + (("/bin/sh") (which "sh")) + (("/bin/bash") (which "bash"))) + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; This test is buggy in the build container. + (delete-file "shunit2_misc_test.sh") + (invoke "sh" "test_runner")) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "shunit2" + (string-append (assoc-ref outputs "out") + "/bin")) + #t))))) + (home-page "https://github.com/kward/shunit2") + (synopsis "@code{xUnit} based unit testing for Unix shell scripts") + (description "@code{shUnit2} was originally developed to provide a +consistent testing solution for @code{log4sh}, a shell based logging framework +similar to @code{log4j}. It is designed to work in a similar manner to JUnit, +PyUnit and others.") + (license license:asl2.0))) + ;; When dependent packages upgraded to use newer version of catch, this one should ;; be removed. (define-public catch-framework -- cgit v1.2.3 From 2051be4f4cd526fb445e826d655afa40f8f4a7e5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 14 Jan 2021 10:16:20 +0200 Subject: gnu: gemma: Enable tests. * gnu/packages/bioinformatics.scm (gemma)[source]: Add snippet to remove bundled sources. [native-inputs]: Add catch-framework2-1, perl, shunit2, which. [arguments]: Don't disable tests. Override 'check phase. --- gnu/packages/bioinformatics.scm | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 70696c189a..84a9a4d208 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3572,12 +3572,22 @@ comment or quality sections.") (file-name (git-file-name name version)) (sha256 (base32 - "1p8a7kkfn1mmrg017aziy544aha8i9h6wd1x2dk3w2794wl33qb7")))) + "1p8a7kkfn1mmrg017aziy544aha8i9h6wd1x2dk3w2794wl33qb7")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "contrib") + #t)))) (build-system gnu-build-system) (inputs `(("gsl" ,gsl) ("openblas" ,openblas) ("zlib" ,zlib))) + (native-inputs + `(("catch" ,catch-framework2-1) + ("perl" ,perl) + ("shunit2" ,shunit2) + ("which" ,which))) (arguments `(#:phases (modify-phases %standard-phases @@ -3589,12 +3599,18 @@ comment or quality sections.") (("/usr/local/opt/openblas") (assoc-ref inputs "openblas"))) #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; 'make slow-check' expects shunit2-2.0.3. + (with-directory-excursion "test" + (invoke "./test_suite.sh")) + #t))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (install-file "bin/gemma" (string-append (assoc-ref outputs "out") "/bin")) - #t))) - #:tests? #f)) ; no tests included yet + #t))))) (home-page "https://github.com/genetics-statistics/GEMMA") (synopsis "Tool for genome-wide efficient mixed model association") (description -- cgit v1.2.3 From db30d6eada7ef0f2a6d41c71f37ed3e45899e414 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 14 Jan 2021 11:26:46 +0200 Subject: gnu: sambamba Update to 0.8.0. * gnu/packages/bioinformatics.scm (sambamba): Update to 0.8.0. [source, home-page]: Update to new upstream URI. [arguments]: Shorten 'fix-ldc-version phase. Remove 'place-biod-and-undead phase. Update 'unbundle-prerequisites and 'insatll phases. [native-inputs]: Remove rdmd, biod. Move ldc ... [inputs]: ... to here. Add zlib. (htslib-for-sambamba): Remove variable. --- gnu/packages/bioinformatics.scm | 67 ++++++++--------------------------------- 1 file changed, 12 insertions(+), 55 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 84a9a4d208..77150e0dce 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10513,41 +10513,20 @@ explore and perform basic analysis of single cell sequencing data coming from droplet sequencing. It has been particularly tailored for Drop-seq.") (license license:gpl3)))) -(define htslib-for-sambamba - (let ((commit "2f3c3ea7b301f9b45737a793c0b2dcf0240e5ee5")) - (package - (inherit htslib) - (name "htslib-for-sambamba") - (version (string-append "1.3.1-1." (string-take commit 9))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/lomereiter/htslib") - (commit commit))) - (file-name (string-append "htslib-" version "-checkout")) - (sha256 - (base32 - "0g38g8s3npr0gjm9fahlbhiskyfws9l5i0x1ml3rakzj7az5l9c9")))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ,@(package-native-inputs htslib)))))) - (define-public sambamba (package (name "sambamba") - (version "0.7.1") + (version "0.8.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lomereiter/sambamba") + (url "https://github.com/biod/sambamba") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 - "111h05b60pj8dxbidiamy4imc92x2962b3lmb7wgysl6lx064qis")))) + "07dznzl6m8k7sw84jxw2kx6i3ymrapbmcmyh0fxz8wrybhw8fmwc")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there is no test target @@ -10557,52 +10536,30 @@ droplet sequencing. It has been particularly tailored for Drop-seq.") (delete 'configure) (add-after 'unpack 'fix-ldc-version (lambda _ - (substitute* "gen_ldc_version_info.py" - (("/usr/bin/env.*") (which "python3"))) (substitute* "Makefile" ;; We use ldc2 instead of ldmd2 to compile sambamba. (("\\$\\(shell which ldmd2\\)") (which "ldc2"))) #t)) - (add-after 'unpack 'place-biod-and-undead - (lambda* (#:key inputs #:allow-other-keys) - (copy-recursively (assoc-ref inputs "biod") "BioD") - #t)) (add-after 'unpack 'unbundle-prerequisites (lambda _ (substitute* "Makefile" - (("htslib/libhts.a lz4/lib/liblz4.a") - "-L-lhts -L-llz4") - ((" lz4-static htslib-static") "")) + (("= lz4/lib/liblz4.a") "= -L-llz4") + (("ldc_version_info lz4-static") "ldc_version_info")) #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (mkdir-p bin) (copy-file (string-append "bin/sambamba-" ,version) (string-append bin "/sambamba")) #t)))))) (native-inputs - `(("ldc" ,ldc) - ("rdmd" ,rdmd) - ("python" ,python) - ("biod" - ,(let ((commit "7969eb0a847b05874e83ffddead26e193ece8101")) - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/biod/BioD") - (commit commit))) - (file-name (string-append "biod-" - (string-take commit 9) - "-checkout")) - (sha256 - (base32 - "0mjxsmbmv0jxl3pq21p8j5r829d648if8q58ka50b2956lc6qkpm"))))))) + `(("python" ,python))) (inputs - `(("lz4" ,lz4) - ("htslib" ,htslib-for-sambamba))) - (home-page "https://lomereiter.github.io/sambamba/") + `(("ldc" ,ldc) + ("lz4" ,lz4) + ("zlib" ,zlib))) + (home-page "https://github.com/biod/sambamba") (synopsis "Tools for working with SAM/BAM data") (description "Sambamba is a high performance modern robust and fast tool (and library), written in the D programming language, for -- cgit v1.2.3 From 93309e25c7c3da5744b0a3304b89effed949f844 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 14 Jan 2021 20:38:10 +0200 Subject: gnu: vcflib: Update to 1.0.2. * gnu/packages/bioinformatics.scm (vcflib): Update to 1.0.2. [source]: Download using git-fetch. Remove patch. Update snippet to use packaged libraries. [build-system]: Switch to cmake-build-system. [inputs]: Add bzip2. [native-inputs]: Add package-source of fsom. [arguments]: Delete custom 'set-flags, 'install phases. Don't delete 'configure phase. Adjust 'unpack-submodule-sources phase. * gnu/packages/patches/vcflib-use-shared-libraries.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/bioinformatics.scm | 84 +++++-------- .../patches/vcflib-use-shared-libraries.patch | 135 --------------------- 3 files changed, 29 insertions(+), 191 deletions(-) delete mode 100644 gnu/packages/patches/vcflib-use-shared-libraries.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index eb28104add..77f1d4a096 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1703,7 +1703,6 @@ dist_patch_DATA = \ %D%/packages/patches/vboot-utils-fix-format-load-address.patch \ %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \ %D%/packages/patches/vboot-utils-skip-test-workbuf.patch \ - %D%/packages/patches/vcflib-use-shared-libraries.patch \ %D%/packages/patches/vigra-python-compat.patch \ %D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \ diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 77150e0dce..bb97b2d313 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14923,32 +14923,44 @@ library automatically handles index file generation and use.") (define-public vcflib (package (name "vcflib") - (version "1.0.1") + (version "1.0.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/vcflib/vcflib/releases/" - "download/v" version - "/vcflib-" version "-src.tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/vcflib/vcflib") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "14zzrg8hg8cq9cvq2wdvp21j7nmxxkjrbagw2apd2yqv2kyx42lm")) - (patches (search-patches "vcflib-use-shared-libraries.patch")) + (base32 "1k1z3876kbzifj1sqfzsf3lgb4rw779hvkg6ryxbyq5bc2paj9kh")) (modules '((guix build utils))) (snippet - `(begin + '(begin + (substitute* "CMakeLists.txt" + ((".*fastahack.*") "") + ((".*smithwaterman.*") "") + (("(pkg_check_modules\\(TABIXPP)" text) + (string-append + "pkg_check_modules(FASTAHACK REQUIRED fastahack)\n" + "pkg_check_modules(SMITHWATERMAN REQUIRED smithwaterman)\n" + text)) + (("\\$\\{TABIXPP_LIBRARIES\\}" text) + (string-append "${FASTAHACK_LIBRARIES} " + "${SMITHWATERMAN_LIBRARIES} " + text))) (substitute* (find-files "." "\\.(h|c)(pp)?$") (("\"SmithWatermanGotoh.h\"") "") (("\"convert.h\"") "") (("\"disorder.h\"") "") - (("\"tabix.hpp\"") "") - (("\"Fasta.h\"") "")) + (("Fasta.h") "fastahack/Fasta.h")) (for-each delete-file-recursively '("fastahack" "filevercmp" "fsom" "googletest" "intervaltree" - "libVCFH" "multichoose" "smithwaterman" "tabixpp")) + "libVCFH" "multichoose" "smithwaterman")) #t)))) - (build-system gnu-build-system) + (build-system cmake-build-system) (inputs - `(("htslib" ,htslib) + `(("bzip2" ,bzip2) + ("htslib" ,htslib) ("fastahack" ,fastahack) ("perl" ,perl) ("python" ,python) @@ -14961,22 +14973,13 @@ library automatically handles index file generation and use.") ;; Submodules. ;; This package builds against the .o files so we need to extract the source. ("filevercmp-src" ,(package-source filevercmp)) + ("fsom-src" ,(package-source fsom)) ("intervaltree-src" ,(package-source intervaltree)) ("multichoose-src" ,(package-source multichoose)))) (arguments `(#:tests? #f ; no tests #:phases (modify-phases %standard-phases - (add-after 'unpack 'set-flags - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - (("LDFLAGS =") - (string-append "LDFLAGS = -Wl,-rpath=" - (assoc-ref outputs "out") "/lib "))) - (substitute* "filevercmp/Makefile" - (("-c") "-c -fPIC")) - #t)) - (delete 'configure) (add-after 'unpack 'unpack-submodule-sources (lambda* (#:key inputs #:allow-other-keys) (let ((unpack (lambda (source target) @@ -14989,39 +14992,10 @@ library automatically handles index file generation and use.") "--strip-components=1")))))) (and (unpack "filevercmp-src" "filevercmp") + (unpack "fsom-src" "fsom") (unpack "intervaltree-src" "intervaltree") - (unpack "multichoose-src" "multichoose"))))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (lib (string-append out "/lib"))) - (for-each (lambda (file) - (install-file file bin)) - (find-files "bin" ".*")) - (install-file "libvcflib.so" lib) - (install-file "libvcflib.a" lib) - (for-each - (lambda (file) - (install-file file (string-append out "/include"))) - (find-files "include" "\\.h(pp)?$")) - (mkdir-p (string-append lib "/pkgconfig")) - (with-output-to-file (string-append lib "/pkgconfig/vcflib.pc") - (lambda _ - (format #t "prefix=~a~@ - exec_prefix=${prefix}~@ - libdir=${exec_prefix}/lib~@ - includedir=${prefix}/include~@ - ~@ - ~@ - Name: libvcflib~@ - Version: ~a~@ - Requires: smithwaterman, fastahack~@ - Description: C++ library for parsing and manipulating VCF files~@ - Libs: -L${libdir} -lvcflib~@ - Cflags: -I${includedir}~%" - out ,version)))) - #t))))) + (unpack "multichoose-src" "multichoose")) + #t)))))) (home-page "https://github.com/vcflib/vcflib/") (synopsis "Library for parsing and manipulating VCF files") (description "Vcflib provides methods to manipulate and interpret diff --git a/gnu/packages/patches/vcflib-use-shared-libraries.patch b/gnu/packages/patches/vcflib-use-shared-libraries.patch deleted file mode 100644 index e198ec663c..0000000000 --- a/gnu/packages/patches/vcflib-use-shared-libraries.patch +++ /dev/null @@ -1,135 +0,0 @@ -This patch is a combination of many of the patches from Debian: -https://sources.debian.org/src/libvcflib/1.0.1+dfsg-3/debian/patches/ - ---- - Makefile | 63 +++++++++++--------------------------------------------- - 1 file changed, 12 insertions(+), 51 deletions(-) - -diff --git a/Makefile b/Makefile -index 6b13350..be85f22 100644 ---- a/Makefile -+++ b/Makefile -@@ -114,43 +114,25 @@ BIN_SOURCES = src/vcfecho.cpp \ - src/vcfnull2ref.cpp \ - src/vcfinfosummarize.cpp - --# when we can figure out how to build on mac --# src/vcfsom.cpp -- - #BINS = $(BIN_SOURCES:.cpp=) - BINS = $(addprefix $(BIN_DIR)/,$(notdir $(BIN_SOURCES:.cpp=))) - SHORTBINS = $(notdir $(BIN_SOURCES:.cpp=)) - --TABIX = tabixpp/tabix.o --FASTAHACK = fastahack/Fasta.o --SMITHWATERMAN = smithwaterman/SmithWatermanGotoh.o --REPEATS = smithwaterman/Repeats.o --INDELALLELE = smithwaterman/IndelAllele.o --DISORDER = smithwaterman/disorder.o --LEFTALIGN = smithwaterman/LeftAlign.o --FSOM = fsom/fsom.o - FILEVERCMP = filevercmp/filevercmp.o - --# Work out how to find htslib --# Use the one we ship in tabixpp unless told otherwise by the environment --HTS_LIB ?= $(VCF_LIB_LOCAL)/tabixpp/htslib/libhts.a --HTS_INCLUDES ?= -I$(VCF_LIB_LOCAL)/tabixpp/htslib --HTS_LDFLAGS ?= -L$(VCF_LIB_LOCAL)/tabixpp/htslib -lhts -lbz2 -lm -lz -llzma -pthread -- -- --INCLUDES = $(HTS_INCLUDES) -I$(INC_DIR) --LDFLAGS = -L$(LIB_DIR) -lvcflib $(HTS_LDFLAGS) -lpthread -lz -lm -llzma -lbz2 -+INCLUDES = -I$(INC_DIR) $(shell pkg-config --cflags htslib fastahack smithwaterman tabixpp) -+LDFLAGS = -L$(LIB_DIR) -lvcflib -lpthread -lz -lstdc++ -lm -llzma -lbz2 $(shell pkg-config --libs htslib fastahack smithwaterman tabixpp) - - - --all: $(OBJECTS) $(BINS) scriptToBin -+all: $(OBJECTS) $(BINS) scriptToBin libvcflib.a - - scriptToBin: $(BINS) - $(CP) scripts/* $(BIN_DIR) - - GIT_VERSION += $(shell git describe --abbrev=4 --dirty --always) - --CXXFLAGS = -Ofast -D_FILE_OFFSET_BITS=64 -std=c++0x -+CXXFLAGS = -Ofast -D_FILE_OFFSET_BITS=64 -std=c++0x -fPIC - #CXXFLAGS = -O2 - #CXXFLAGS = -pedantic -Wall -Wshadow -Wpointer-arith -Wcast-qual - -@@ -168,7 +150,7 @@ profiling: - gprof: - $(MAKE) CXXFLAGS="$(CXXFLAGS) -pg" all - --$(OBJECTS): $(SOURCES) $(HEADERS) $(TABIX) multichoose pre $(SMITHWATERMAN) $(FILEVERCMP) $(FASTAHACK) -+$(OBJECTS): $(SOURCES) $(HEADERS) multichoose pre $(FILEVERCMP) - $(CXX) -c -o $@ src/$(*F).cpp $(INCLUDES) $(LDFLAGS) $(CXXFLAGS) && $(CP) src/*.h* $(VCF_LIB_LOCAL)/$(INC_DIR)/ - - multichoose: pre -@@ -177,39 +159,22 @@ multichoose: pre - intervaltree: pre - cd intervaltree && $(MAKE) && $(CP) *.h* $(VCF_LIB_LOCAL)/$(INC_DIR)/ - --$(TABIX): pre -- cd tabixpp && INCLUDES="$(HTS_INCLUDES)" LIBPATH="-L. $(HTS_LDFLAGS)" HTSLIB="$(HTS_LIB)" $(MAKE) && $(CP) *.h* $(VCF_LIB_LOCAL)/$(INC_DIR)/ -- --$(SMITHWATERMAN): pre -- cd smithwaterman && $(MAKE) && $(CP) *.h* $(VCF_LIB_LOCAL)/$(INC_DIR)/ && $(CP) *.o $(VCF_LIB_LOCAL)/$(OBJ_DIR)/ -- --$(DISORDER): $(SMITHWATERMAN) -- --$(REPEATS): $(SMITHWATERMAN) -- --$(LEFTALIGN): $(SMITHWATERMAN) -- --$(INDELALLELE): $(SMITHWATERMAN) -- --$(FASTAHACK): pre -- cd fastahack && $(MAKE) && $(CP) *.h* $(VCF_LIB_LOCAL)/$(INC_DIR)/ && $(CP) Fasta.o $(VCF_LIB_LOCAL)/$(OBJ_DIR)/ -- --#$(FSOM): --# cd fsom && $(CXX) $(CXXFLAGS) -c fsom.c -lm -- - $(FILEVERCMP): pre - cd filevercmp && make && $(CP) *.h* $(VCF_LIB_LOCAL)/$(INC_DIR)/ && $(CP) *.o $(VCF_LIB_LOCAL)/$(INC_DIR)/ - - $(SHORTBINS): pre - $(MAKE) $(BIN_DIR)/$@ - --$(BINS): $(BIN_SOURCES) libvcflib.a $(OBJECTS) $(SMITHWATERMAN) $(FASTAHACK) $(DISORDER) $(LEFTALIGN) $(INDELALLELE) $(SSW) $(FILEVERCMP) pre intervaltree -+$(BINS): $(BIN_SOURCES) libvcflib.so $(OBJECTS) $(SSW) $(FILEVERCMP) pre intervaltree - $(CXX) src/$(notdir $@).cpp -o $@ $(INCLUDES) $(LDFLAGS) $(CXXFLAGS) -DVERSION=\"$(GIT_VERSION)\" - --libvcflib.a: $(OBJECTS) $(SMITHWATERMAN) $(REPEATS) $(FASTAHACK) $(DISORDER) $(LEFTALIGN) $(INDELALLELE) $(SSW) $(FILEVERCMP) $(TABIX) pre -- ar rs libvcflib.a $(OBJECTS) smithwaterman/sw.o $(FASTAHACK) $(SSW) $(FILEVERCMP) $(TABIX) -+libvcflib.a: $(OBJECTS) $(SSW) $(FILEVERCMP) pre -+ ar rs libvcflib.a $(OBJECTS) $(SSW) $(FILEVERCMP) - $(CP) libvcflib.a $(LIB_DIR) - -+libvcflib.so: $(OBJECTS) $(SSW) $(FILEVERCMP) pre -+ $(CXX) -shared -o libvcflib.so $(OBJECTS) $(SSW) $(FILEVERCMP) -+ $(CP) libvcflib.so $(LIB_DIR) - - test: $(BINS) - @prove -Itests/lib -w tests/*.t -@@ -230,16 +195,12 @@ clean: - $(RM) $(BINS) $(OBJECTS) - $(RM) ssw_cpp.o ssw.o - $(RM) libvcflib.a -+ $(RM) libvcflib.so - $(RM) -r $(BIN_DIR) - $(RM) -r $(LIB_DIR) - $(RM) -r $(INC_DIR) - $(RM) -r $(OBJ_DIR) -- $(MAKE) clean -C tabixpp -- $(MAKE) clean -C smithwaterman -- $(MAKE) clean -C fastahack - $(MAKE) clean -C multichoose -- $(MAKE) clean -C fsom -- $(MAKE) clean -C libVCFH - $(MAKE) clean -C test - $(MAKE) clean -C filevercmp - $(MAKE) clean -C intervaltree --- -2.28.0 - -- cgit v1.2.3 From c0c747cc818e5c9dec70b3815ce859abd3f7d583 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Jan 2021 19:59:14 +0100 Subject: gnu: busybox: Update to 1.32.1. * gnu/packages/busybox.scm (busybox): Update to 1.32.1. --- gnu/packages/busybox.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 7fc065f7ac..5af67e084d 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,7 +33,7 @@ (define-public busybox (package (name "busybox") - (version "1.32.0") + (version "1.32.1") (source (origin (method url-fetch) (uri (string-append @@ -41,7 +41,7 @@ version ".tar.bz2")) (sha256 (base32 - "12g63zsvzfz04wbyga8riyl8ils05riw4xf26cyiaasbs3qqfpf3")))) + "1vhd59qmrdyrr1q7rvxmyl96z192mxl089hi87yl0hcp6fyw8mwx")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 381bc724087564f508fc2348e029db696b47dabe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Jan 2021 20:15:27 +0100 Subject: gnu: gptfdisk: Update to 1.0.6. * gnu/packages/disk.scm (gptfdisk): Update to 1.0.6. --- gnu/packages/disk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 102b105dab..3139063298 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -304,14 +304,14 @@ tables, and it understands a variety of different formats.") (define-public gptfdisk (package (name "gptfdisk") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gptfdisk/gptfdisk/" version "/gptfdisk-" version ".tar.gz")) (sha256 - (base32 "0bybgp30pqxb6x5krxazkq4drca0gz4inxj89fpyr204rn3kjz8f")))) + (base32 "1a4c2ss6n2s6x8v11h79jykh96y46apd6i838ka0ngx58gb53ifx")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 2a0a6f8fc3424b75c8a5307957b5f5ec6e298407 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Jan 2021 20:15:39 +0100 Subject: gnu: kyotocabinet: Update to 1.2.79. * gnu/packages/databases.scm (kyotocabinet): Update to 1.2.79. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index de066163ef..817ccdf6de 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2183,14 +2183,14 @@ sets, bitmaps and hyperloglogs.") (define-public kyotocabinet (package (name "kyotocabinet") - (version "1.2.78") + (version "1.2.79") (source (origin (method url-fetch) (uri (string-append "https://fallabs.com/kyotocabinet/pkg/" "kyotocabinet-" version ".tar.gz")) (sha256 (base32 - "1bxkf9kmcavq9rqridb8mvmrk3hj4447ffi24m2admsbm61n6k29")))) + "079ymsahlrijswgwfr2la9yw5h57l752cprhp5dz31iamsj1vyv7")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From ef448aa3f6f29b62d0fe74e7c2883d230d3a72ad Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Jan 2021 21:04:13 +0100 Subject: gnu: facter: Update to 4.0.48. * gnu/packages/admin.scm (facter): Update to 4.0.48. --- 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 1b88cddb9c..fad2de7255 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -445,7 +445,7 @@ graphs and can export its output to different formats.") (define-public facter (package (name "facter") - (version "4.0.47") + (version "4.0.48") (source (origin (method git-fetch) (uri (git-reference @@ -454,7 +454,7 @@ graphs and can export its output to different formats.") (file-name (git-file-name name version)) (sha256 (base32 - "1zz5kk3ad1jj8y939369dfvjh7zqwpkcqzzad7yb6wp01rc5sf88")))) + "10cbk56nbvqvpzq3h958iizvh0vh69zkhw31dxl1qx91zk5d8djx")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit v1.2.3 From 9717250da230f37a48bc17ab83641213e859b283 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 14 Jan 2021 17:20:08 +0000 Subject: gnu: sbcl-postmodern: Update to 1.32.6. * gnu/packages/lisp-xyz.scm (sbcl-postmodern): Update to 1.32.6. [inputs]: Add cl-base64, cl-unicode, ironclad, local-time and uax-15. [arguments]: Add cl-postgres, s-sql and simple-date to 'asd-systems'. (ecl-postmodern)[arguments]: Add cl-postgres, s-sql and simple-date to 'asd-systems'. Update the 'fix-build' phase. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 114 ++++++++++++++++++++++++++++++---------------- 1 file changed, 74 insertions(+), 40 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index da6a77b914..112d3dd5bb 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9170,40 +9170,53 @@ approach to templating.") (sbcl-package->ecl-package sbcl-cl-mysql)) (define-public sbcl-postmodern - (let ((commit "74469b25bbda990ec9b77e0d0eccdba0cd7e721a") - (revision "1")) - (package - (name "sbcl-postmodern") - (version (git-version "1.19" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/marijnh/Postmodern") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0im7ymnyxjhn2w74jfg76k5gpr0gl33n31akx33hl28722ljd0hd")))) - (build-system asdf-build-system/sbcl) - (native-inputs - `(("fiveam" ,sbcl-fiveam))) - (inputs - `(("alexandria" ,sbcl-alexandria) - ("bordeaux-threads" ,sbcl-bordeaux-threads) - ("closer-mop" ,sbcl-closer-mop) - ("global-vars" ,sbcl-global-vars) - ("md5" ,sbcl-md5) - ("split-sequence" ,sbcl-split-sequence) - ("usocket" ,sbcl-usocket))) - (arguments - ;; TODO: Fix missing dependency errors for simple-date/postgres-glue, - ;; cl-postgres/tests and s-sql/tests. - `(#:tests? #f - #:asd-systems '("postmodern" - "simple-date/postgres-glue"))) - (synopsis "Common Lisp library for interacting with PostgreSQL") - (description - "@code{postmodern} is a Common Lisp library for interacting with + (package + (name "sbcl-postmodern") + (version "1.32.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/marijnh/Postmodern") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bfx0hcb9wv47qd334xs0fpmisl75dpvasq1zai210s5wqg0km6d")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("bordeaux-threads" ,sbcl-bordeaux-threads) + ("cl-base64" ,sbcl-cl-base64) + ("cl-unicode" ,sbcl-cl-unicode) + ("closer-mop" ,sbcl-closer-mop) + ("global-vars" ,sbcl-global-vars) + ("ironclad" ,sbcl-ironclad) + ("local-time" ,sbcl-local-time) + ("md5" ,sbcl-md5) + ("split-sequence" ,sbcl-split-sequence) + ("uax-15" ,sbcl-uax-15) + ("usocket" ,sbcl-usocket))) + (arguments + ;; TODO: (Sharlatan-20210114T171037+0000) tests still failing but on other + ;; step, some functionality in `local-time' prevents passing tests. + ;; Error: + ;; + ;; Can't create directory + ;; /gnu/store + ;; /4f47agf1kyiz057ppy6x5p98i7mcbfsv-sbcl-local-time-1.0.6-2.a177eb9 + ;; /lib/common-lisp/sbcl/local-time/src/integration/ + ;; + `(#:tests? #f + #:asd-systems '("cl-postgres" + "s-sql" + "postmodern" + "simple-date" + "simple-date/postgres-glue"))) + (synopsis "Common Lisp library for interacting with PostgreSQL") + (description + "@code{postmodern} is a Common Lisp library for interacting with PostgreSQL databases. It provides the following features: @itemize @@ -9213,9 +9226,27 @@ foreign libraries. @item A syntax for mixing SQL and Lisp code. @item Convenient support for prepared statements and stored procedures. @item A metaclass for simple database-access objects. -@end itemize\n") - (home-page "https://marijnhaverbeke.nl/postmodern/") - (license license:zlib)))) +@end itemize\n + +This package produces 4 systems: postmodern, cl-postgres, s-sql, simple-date + +@code{SIMPLE-DATE} is a very basic implementation of date and time objects, used +to support storing and retrieving time-related SQL types. It is not loaded by +default and you can use local-time (which has support for timezones) instead. + +@code{S-SQL} is used to compile s-expressions to strings of SQL code, escaping +any Lisp values inside, and doing as much as possible of the work at compile +time. + +@code{CL-POSTGRES} is the low-level library used for interfacing with a PostgreSQL +server over a socket. + +@code{POSTMODERN} itself is a wrapper around these packages and provides higher +level functions, a very simple data access object that can be mapped directly to +database tables and some convient utilities. It then tries to put all these +things together into a convenient programming interface") + (home-page "https://marijnhaverbeke.nl/postmodern/") + (license license:zlib))) (define-public cl-postmodern (sbcl-package->cl-source-package sbcl-postmodern)) @@ -9225,15 +9256,18 @@ foreign libraries. (inherit (sbcl-package->ecl-package sbcl-postmodern)) (arguments `(#:tests? #f - #:asd-systems '("postmodern" + #:asd-systems '("cl-postgres" + "s-sql" + "postmodern" + "simple-date" "simple-date/postgres-glue") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-build (lambda _ (substitute* "cl-postgres.asd" - (("\\) \"usocket\"") - " :ecl) \"usocket\"")) + ((":or :sbcl :allegro :ccl :clisp" all) + (string-append all " :ecl"))) #t))))))) (define-public sbcl-db3 -- cgit v1.2.3 From c03875b0361f114634caeb54935fe37a9b7b05af Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 15 Jan 2021 10:09:30 +0100 Subject: gnu: emacs-helm-sly: Update to 0.6.0. * gnu/packages/emacs-xyz.scm (emacs-helm-sly): Update to 0.6.0. --- 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 e35a29cdc3..ac6a63e6a7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20194,7 +20194,7 @@ correctly.") (define-public emacs-helm-sly (package (name "emacs-helm-sly") - (version "0.5.1") + (version "0.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -20203,7 +20203,7 @@ correctly.") (file-name (git-file-name name version)) (sha256 (base32 - "13s2dj09mcdwlibjlahyyq2dxjkjlpxs88dbdyvcd64249jmahsx")))) + "047b1qhabdymgr8c3y8xj4w1rngip4mnypg8br8kavcl8fycbaa0")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm) -- cgit v1.2.3 From 37d40e488b51d106e078d28ee340ac922710fc54 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Thu, 14 Jan 2021 15:32:48 -0500 Subject: gnu: Add emacs-crdt. * gnu/packages/emacs-xyz.scm (emacs-crdt): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ac6a63e6a7..de99227255 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16184,6 +16184,32 @@ dumb text search, @code{elisp-refs} actually parses the code, so it's never confused by comments or @code{foo-bar} matching @code{foo}.") (license license:gpl3+))) +(define-public emacs-crdt + (let ((commit "44068ae505adf2c3a7bdbf6723a25fc45d6d1666") + (revision "0")) + (package + (name "emacs-crdt") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://code.librehq.com/qhong/crdt.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "130fkhvi757pfnbz70g6nw2n71k89cwwx7yzvsd5v177228c8w7w")))) + (build-system emacs-build-system) + (home-page "https://code.librehq.com/qhong/crdt.el") + (synopsis "Real-time collaborative editing environment") + (description + "@code{crdt.el} is a real-time collaborative editing environment for +Emacs using Conflict-free Replicated Data Types. With it, you can share +multiple buffer in one session, and see other users’ cursor and region. It +also synchronizes Org mode folding status. It should work with all of Org +mode.") + (license license:gpl3+)))) + (define-public emacs-crux (let ((commit "308f17d914e2cd79cbc809de66d02b03ceb82859") (revision "2")) -- cgit v1.2.3 From 9867bad90933b10975bc16f3efc1a430ed87b660 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 15 Jan 2021 02:58:02 +0100 Subject: gnu: emacs-calibredb: Patch paths to calibre programs. * gnu/packages/emacs-xyz.scm (emacs-calibredb): Patch paths to calibre programs. [arguments]: Add phase patch-paths. [inputs]: Add calibre. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index de99227255..4d48e0d9cc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -131,6 +131,7 @@ #:use-module (gnu packages databases) #:use-module (gnu packages dictionaries) #:use-module (gnu packages djvu) + #:use-module (gnu packages ebook) #:use-module (gnu packages emacs) #:use-module (gnu packages guile) #:use-module (gnu packages gtk) @@ -22720,6 +22721,21 @@ through Dash docsets.") (sha256 (base32 "19gc05k2p1l8wlkrqij9cw6d61hzknd6a9n64kzlpi87cpbav3lv")))) (build-system emacs-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((calibre (assoc-ref inputs "calibre"))) + (make-file-writable "calibredb-core.el") + (emacs-substitute-variables "calibredb-core.el" + ("calibredb-program" + (string-append calibre "/bin/calibredb")) + ("calibredb-fetch-metadata-program" + (string-append calibre "/bin/fetch-ebook-metadata")))) + #t))))) + (inputs + `(("calibre" ,calibre))) (propagated-inputs `(("emacs-dash" ,emacs-dash) ("emacs-s" ,emacs-s) -- cgit v1.2.3 From 884f320e7ceb35cb8472510e47fc5f1944675d82 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 15 Jan 2021 03:07:14 +0100 Subject: gnu: emacs-dired-hacks: Update to 0.0.1-3.d1a2bda. * gnu/packages/emacs-xyz.scm (emacs-dired-hacks): Update to 0.0.1-3.d1a2bda. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4d48e0d9cc..21144fa6d0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12961,8 +12961,8 @@ the actual transformations.") (license license:gpl2+)))) (define-public emacs-dired-hacks - (let ((commit "886befe113fae397407c804f72c45613d1d43535") - (revision "2")) + (let ((commit "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388") + (revision "3")) (package (name "emacs-dired-hacks") (version (git-version "0.0.1" revision commit)) @@ -12974,7 +12974,7 @@ the actual transformations.") (file-name (git-file-name name version)) (sha256 (base32 - "1cvibg90ggyrivpjmcfprpi2fx7dpa68f8kzg08s88gw5ib75djl")))) + "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit v1.2.3 From 74a83afdf5d518b812d939c394eb259c0fa5aa88 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 16 Jan 2021 02:17:35 +0100 Subject: gnu: Add lrzsz. * gnu/packages/admin.scm (lrzsz): New variable. --- gnu/packages/admin.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index fad2de7255..4be5a17a57 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4306,3 +4306,30 @@ This program allows you to view and manipulate this EEPROM list.") (home-page "https://github.com/xobs/novena-eeprom/") (supported-systems '("armhf-linux")) (license license:bsd-3))) + +(define-public lrzsz + (package + (name "lrzsz") + (version "0.12.20") + (source (origin + (method url-fetch) + (uri (string-append "https://www.ohse.de/uwe/releases/lrzsz-" + version ".tar.gz")) + (sha256 + (base32 + "1wcgfa9fsigf1gri74gq0pa7pyajk12m4z69x7ci9c6x9fqkd2y2")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (setenv "CONFIG_SHELL" (which "bash")) + (invoke "./configure" + (string-append "--prefix=" + (assoc-ref outputs "out")))))))) + (synopsis "Implementation of XMODEM/YMODEM/ZMODEM transfer protocols") + (description "This package provides programs that transfer files using +the XMODEM/YMODEM/ZMODEM file transfer protocols.") + (home-page "https://ohse.de/uwe/software/lrzsz.html") + (license license:gpl2+))) -- cgit v1.2.3 From b52bf667394991affcfba77bc72ed3d6e0b4d540 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 16 Jan 2021 10:46:02 +0000 Subject: gnu: ruby-method-source: Remove unnecessary dependency on git. * gnu/packages/ruby.scm (ruby-method-source)[arguments]: Patch Rakefile to use find rather than git. [native-inputs]: Remove git. --- gnu/packages/ruby.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c5b1af79d3..b811cbd2c4 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5020,10 +5020,16 @@ both CSS3 selector and XPath 1.0 support.") "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp")))) (build-system ruby-build-system) (arguments - `(#:test-target "spec")) + `(#:test-target "spec" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-git-ls-files + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Rakefile" + (("git ls-files") "find . -type f")) + #t))))) (native-inputs - `(("ruby-rspec" ,ruby-rspec) - ("git" ,git))) + `(("ruby-rspec" ,ruby-rspec))) (synopsis "Retrieve the source code for Ruby methods") (description "Method_source retrieves the source code for Ruby methods. Additionally, it can extract source code from Proc and Lambda objects or just -- cgit v1.2.3 From 540893a8ccef41436a1c00ae268f74219f9ab220 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 16 Jan 2021 10:50:18 +0000 Subject: gnu: gnome-font-viewer: Fix thumbnail generation. Previously, thumbnail generation failed, as the gnome-thumbnail-font command couldn't be found. Using an absolute filename in the .thumbnailer file fixes this. Cached failures within .cache/thumbnails/fail/ or similar may need removing before the effect of this change can be seen. * gnu/packages/gnome.scm (gnome-font-viewer)[arguments]: Add patch-thumbnailer phase. --- gnu/packages/gnome.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f4a98ab266..e00f65a32a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2252,6 +2252,16 @@ and keep up to date translations of documentation.") (lambda _ (substitute* "meson-postinstall.sh" (("update-desktop-database") (which "true"))) + #t)) + (add-after 'install 'patch-thumbnailer + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* + (string-append + out + "/share/thumbnailers/gnome-font-viewer.thumbnailer") + (("gnome-thumbnail-font") + (string-append out "/bin/gnome-thumbnail-font")))) #t))))) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 225c5ea014728b03cc521481af7af284746cd464 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Jan 2021 21:22:28 +0100 Subject: Revert "gnu: llvm: Update to 11.0.1." This reverts commit 9b415c0b36c885e7899c45617a8c4e64118a6379, which reportedly breaks[0] rust@1.47.0, rust-1.48.0 and rust-1.49.0. [0]: http://issues.guix.gnu.org/45909 --- gnu/packages/llvm.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index a9265851ab..114654c628 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018, 2019, 2020 Marius Bakke -;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2018 Pierre Neidhardt @@ -476,13 +476,14 @@ output), and Binutils.") (define-public llvm-11 (package (name "llvm") - (version "11.0.1") + (version "11.0.0") (source (origin (method url-fetch) (uri (llvm-uri "llvm" version)) (sha256 - (base32 "0a5mb65xa5bal8q6cb37xgkqis2bip87fsafgq3wbsva9cjprn6c")))) + (base32 + "0s94lwil98w7zb7cjrbnxli0z7gklb312pkw74xs1d6zk346hgwi")))) (build-system cmake-build-system) (outputs '("out" "opt-viewer")) (native-inputs @@ -537,11 +538,11 @@ of programming tools as well as libraries with equivalent functionality.") (define-public clang-runtime-11 (clang-runtime-from-llvm llvm-11 - "1z470r8c5aahdwkmflglx998n0i77j8b1c69d7cir1kf27qy6yq8")) + "0d5j5l8phwqjjscmk8rmqn0i2i0abl537gdbkagl8fjpzy1gyjip")) (define-public clang-11 (clang-from-llvm llvm-11 clang-runtime-11 - "0kab4zmkxffg98a3rx95756jlwhxflalin5w05g1anpwxv175xbk" + "02ajkij85966vd150iy246mv16dsaph1kfi0y8wnncp8w6nar5hg" #:patches '("clang-11.0-libc-search-path.patch") #:tools-extra (origin @@ -550,7 +551,7 @@ of programming tools as well as libraries with equivalent functionality.") (package-version llvm-11))) (sha256 (base32 - "1j8n6n4l54k2lrdxh266y1fl4z8vy5dc76wsf0csk5n3ikfi38ic"))))) + "02bcwwn54661madhq4nxc069s7p7pj5gpqi8ww50w3anbpviilzy"))))) (define-public clang-toolchain-11 (make-clang-toolchain clang-11)) -- cgit v1.2.3 From c544cfb399b6d142052a546511af4da07b833662 Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Wed, 13 Jan 2021 14:45:39 -0500 Subject: gnu: Add embree. * gnu/packages/graphics.scm (embree): New variable. Signed-off-by: Leo Famulari --- gnu/packages/graphics.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 9879130e20..84dcf16d2a 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -428,6 +428,36 @@ with the @command{autotrace} utility or as a C library, @code{libautotrace}.") (license (list license:gpl2+ ;for the utility itself license:lgpl2.1+))))) ;for use as a library +(define-public embree + (package + (name "embree") + (version "3.12.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/embree/embree") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0aznd16n7h8g3f6jcahzfp1dq4r7wayqvn03wsaskiq2dvsi4srd")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; no tests (apparently) + #:configure-flags + (list + "-DEMBREE_ISPC_SUPPORT=OFF"))) + (inputs + `(("tbb" ,tbb) + ("glfw" ,glfw))) + (home-page "https://www.embree.org/") + (synopsis "High performance ray tracing kernels") + (description + "Embree is a collection of high-performance ray tracing kernels. +Embree is meant to increase performance of photo-realistic rendering +applications.") + (license license:asl2.0))) + (define-public blender (package (name "blender") -- cgit v1.2.3 From 2a333f2535a65bfa3607ef50591e9f5dbc6970d1 Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Wed, 13 Jan 2021 14:46:23 -0500 Subject: gnu: blender: Update to 2.91.0. * gnu/packages/graphics.scm (blender): Update to 2.91.0. [inputs]: Add embree. Signed-off-by: Leo Famulari --- gnu/packages/graphics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 84dcf16d2a..246933bc89 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -461,14 +461,14 @@ applications.") (define-public blender (package (name "blender") - (version "2.83.9") + (version "2.91.0") (source (origin (method url-fetch) (uri (string-append "https://download.blender.org/source/" "blender-" version ".tar.xz")) (sha256 (base32 - "106w9vi6z0gi2nbr73g8pm40w3wn7dkjcibzvvzbc786yrnzvkhb")))) + "0x396lgmk0dq9115yrc36s8zwxzmjr490sr5n2y6w27y17yllyjm")))) (build-system cmake-build-system) (arguments (let ((python-version (version-major+minor (package-version python)))) @@ -540,7 +540,8 @@ applications.") ("python" ,python) ("python-numpy" ,python-numpy) ("tbb" ,tbb) - ("zlib" ,zlib))) + ("zlib" ,zlib) + ("embree" ,embree))) (home-page "https://blender.org/") (synopsis "3D graphics creation suite") (description -- cgit v1.2.3 From 670a79a8395c2568099d86b014aa875b1df3d24c Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Tue, 12 Jan 2021 19:27:15 +0100 Subject: gnu: diffoscope: Update to 164. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/diffoscope.scm (diffoscope): Update to 164. Signed-off-by: Ludovic Courtès --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index df29704acf..53cdbd8d84 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,7 +72,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "162") + (version "164") (source (origin (method git-fetch) (uri (git-reference @@ -81,7 +81,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "02wjjbmdbyqpyizw384j50bc2ar4g5m40amz9q102gqbw6sflwbf")))) + "0vjxhz8p0k4y19sl1msrl8x4z3v205rlwj52k5hijv2gn9sqh795")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From d8fd1c177f51a85017e5b624c9e83cebda593c7b Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 12 Jan 2021 10:41:08 +0100 Subject: gnu: mkvtoolnix: Update to 52.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (mkvtoolnix): Update to 52.0.0. [inputs]: Add libdvdread to support dvd chapter. Signed-off-by: Ludovic Courtès --- gnu/packages/video.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b314e4903b..cf7db757af 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -41,7 +41,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Guillaume Le Vaillant ;;; Copyright © 2020 Alex McGrath -;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Alexandru-Sergiu Marton @@ -885,14 +885,14 @@ H.264 (MPEG-4 AVC) video streams.") (define-public mkvtoolnix (package (name "mkvtoolnix") - (version "51.0.0") + (version "52.0.0") (source (origin (method url-fetch) (uri (string-append "https://mkvtoolnix.download/sources/" "mkvtoolnix-" version ".tar.xz")) (sha256 - (base32 "0w2crz6wnfw18m9m4zrij1yplcq5drzhz8n58w9kp51wl48a0yn1")) + (base32 "15y7ahlifsclnkl70wn5w34dil8nwcwcjnw3k2ydqc6dz4vb0j5s")) (modules '((guix build utils))) (snippet '(begin ;; Delete bundled libraries. @@ -914,6 +914,7 @@ H.264 (MPEG-4 AVC) video streams.") ("file" ,file) ("flac" ,flac) ("fmt" ,fmt) + ("libdvdread" ,libdvdread) ("libmatroska" ,libmatroska) ("libogg" ,libogg) ("libvorbis" ,libvorbis) -- cgit v1.2.3 From cde77a82c8d7aee18b0ebc903b87e46b17ad2212 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 15 Jan 2021 00:37:38 +0100 Subject: gnu: thunar: Update to 4.16.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (thunar): Update to 4.16.2. [inputs]: Add gobject-introspection. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index a5c9482c01..0dbcaf698e 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2019 Ingo Ruhnke ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Jonathan Brielmaier -;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020, 2021 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -756,7 +756,7 @@ like appearance, display, keyboard and mouse settings.") (define-public thunar (package (name "thunar") - (version "4.16.0") + (version "4.16.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -764,13 +764,14 @@ like appearance, display, keyboard and mouse settings.") "thunar-" version ".tar.bz2")) (sha256 (base32 - "16zxznc3zcdpcjqjp84j9636kvvrimfn8wj9avxfp4ba254c8xv2")))) + "1pbspa31q4kgydjzmssahq3k0wcy10ma466dlsd2y69nqjc0pab7")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) (inputs `(("exo" ,exo) + ("gobject-introspection" ,gobject-introspection) ("libexif" ,libexif) ("libgudev" ,libgudev) ("libnotify" ,libnotify) -- cgit v1.2.3 From d08a292ad8981e5938c40463a45ab7bced628d63 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 15 Jan 2021 00:44:55 +0100 Subject: gnu: xfwm4: Update to 4.16.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfwm4): Update to 4.16.1. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 0dbcaf698e..2736f861a8 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -820,7 +820,7 @@ and import the new pictures from your camera.") (define-public xfwm4 (package (name "xfwm4") - (version "4.16.0") + (version "4.16.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -828,7 +828,7 @@ and import the new pictures from your camera.") "xfwm4-" version ".tar.bz2")) (sha256 (base32 - "1czyy4vck4yh6bbxyk6f15mvzv3ndrhabc2k2zyynv5npghyl8hy")))) + "133ip28v6j3x4l413d81ixsisf32sa0xzd54n0nn8g6p9fh4rcmm")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From e13f90580c0edc6c8b3731d959dcff0b1402e106 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 15 Jan 2021 01:00:47 +0100 Subject: gnu: xfconf: Install bash completion. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfconf)[arguments]: Add install-shell-completions phase. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 2736f861a8..77c366b0a2 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -155,6 +155,13 @@ Xfce Desktop Environment.") ;; For the missing '/etc/machine-id'. (setenv "DBUS_FATAL_WARNINGS" "0") (invoke "dbus-launch" "make" "check"))) + (add-after 'custom-check 'install-shell-completions + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (etc (string-append out "/etc"))) + (with-directory-excursion "completions" + (install-file "xfconf-query" + (string-append etc "/bash_completion.d")))))) (delete 'check)))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 948e5c9148b4157b7934425542d0ec994c08bfee Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 12 Jan 2021 04:27:01 +0100 Subject: gnu: xfce4-cpufreq-plugin: Update to 1.2.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-cpufreq-plugin): Update to 1.2.3. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 77c366b0a2..c57944ebb7 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1499,7 +1499,7 @@ precedence rules, and the following functions and common constants.") (define-public xfce4-cpufreq-plugin (package (name "xfce4-cpufreq-plugin") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -1508,7 +1508,7 @@ precedence rules, and the following functions and common constants.") "/xfce4-cpufreq-plugin-" version ".tar.bz2")) (sha256 (base32 - "16748wxy8aa5cxga0dbfrq7kv40alg5yx967r2l6vjapv2w083sh")))) + "1g07rpbq61dbdz0zvvb0xz6ipympxadwknn5y5q3v85k0nr9qfbx")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From fb7fb10d47fc4632ef840cee79a70f859acb7e35 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 15 Jan 2021 20:11:54 +0100 Subject: gnu: garcon: Update to 4.16.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (garcon): Update to 4.16.1. [native-inputs]: Add gobject-introspection, sorted alphabeticaly. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index c57944ebb7..fe8c3ce246 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -344,7 +344,7 @@ development.") (define-public garcon (package (name "garcon") - (version "0.8.0") + (version "4.16.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -352,12 +352,13 @@ development.") "garcon-" version ".tar.bz2")) (sha256 (base32 - "1fx19953fnrk93lak66y3zqbn4n1qvpc77ynzzgdnj5wwngdh4a8")))) + "07fjsgdjqxbcm84ga3cl495782k381k6mwksyrks3zf1l8klk4c4")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config) + `(("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) - ("glib:bin" ,glib "bin"))) + ("pkg-config" ,pkg-config))) (propagated-inputs `(("gtk+-3" ,gtk+) ; required by garcon-gtk3-1.pc ("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk3-1.pc -- cgit v1.2.3 From fb3c0d3444f94e348952a5e611be219026ea3fa6 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 15 Jan 2021 21:56:09 +0100 Subject: gnu: xfce4-whiskermenu-plugin: Update to 2.5.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-whiskermenu-plugin): Update to 2.5.2. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index fe8c3ce246..6479620a26 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -570,7 +570,7 @@ keys for controlling the audio volume.") (define-public xfce4-whiskermenu-plugin (package (name "xfce4-whiskermenu-plugin") - (version "2.5.1") + (version "2.5.2") (source (origin (method url-fetch) @@ -578,7 +578,7 @@ keys for controlling the audio volume.") "xfce4-whiskermenu-plugin/" (version-major+minor version) "/" "xfce4-whiskermenu-plugin-" version ".tar.bz2")) (sha256 - (base32 "09b9i68pf5ghq6dj55s4h3fj07jd5zpn1fghjwnnwxmakj54y1xj")))) + (base32 "05f53ycbszvw23g76pbdszfnqfk4f8w4imwfgljj140wzl50gxx6")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 539c05197ce79a7b9dcddf61ec7f5fb4b27b8e4f Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Mon, 11 Jan 2021 16:45:20 +0100 Subject: gnu: python-pep517: Update to 0.9.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-pep517): Update to 0.9.1. Signed-off-by: Ludovic Courtès --- 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 dcba474d82..d08e23936c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8266,14 +8266,14 @@ PEP 8.") (define-public python-pep517 (package (name "python-pep517") - (version "0.8.2") + (version "0.9.1") (source (origin (method url-fetch) (uri (pypi-uri "pep517" version)) (sha256 (base32 - "17m2bcabx3sr5wjalgzppfx5xahqrwm12zq58h68mm482b7rjqcf")))) + "0zqidxah03qpnp6zkg3zd1kmd5f79hhdsfmlc0cldaniy80qddxf")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From e0701ff94a60c16d93fdb704e582b1bc0a91c5e3 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sat, 9 Jan 2021 15:03:49 +0000 Subject: gnu: Add markets. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome-xyz.scm (markets): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome-xyz.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 1204dcee90..eb99fda78e 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020, 2021 Leo Prikler -;;; Copyright © 2019 Alexandros Theodotou +;;; Copyright © 2019, 2021 Alexandros Theodotou ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2020 Alex Griffin ;;; Copyright © 2020 Jack Hill @@ -779,6 +779,55 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.") (define-public numix-theme (deprecated-package "numix-theme" numix-gtk-theme)) +(define-public markets + (package + (name "markets") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bitstower/markets") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jzv74l2jkdiqy1hp0ww5yla50dmrvjw7fgkmb26ynblr1nb3rrb")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "build-aux/meson/postinstall.py" + (("gtk-update-icon-cache") "true")) + #t)) + (add-after 'unpack 'skip-update-desktop-database + ;; Don't update desktop file database. + (lambda _ + (substitute* "build-aux/meson/postinstall.py" + (("update-desktop-database") "true")) + #t))))) + (inputs + `(("gtk3" ,gtk+) + ("gettext" ,gettext-minimal) + ("libgee" ,libgee) + ("libhandy0" ,libhandy-0.0) + ("libsoup" ,libsoup) + ("json-glib" ,json-glib) + ("vala" ,vala))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("glib" ,glib "bin"))) ; for 'glib-compile-resources' + (home-page "https://github.com/bitstower/markets") + (synopsis "Stock, currency and cryptocurrency tracker") + (description + "Markets is a GTK application that displays financial data, helping users +track stocks, currencies and cryptocurrencies.") + (license license:gpl3))) + (define-public vala-language-server (package (name "vala-language-server") -- cgit v1.2.3 From c35d230c8f20c7b5ca5e848eeb01a1289c6a8b8f Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 17 Jan 2021 02:16:18 +0300 Subject: gnu: youtube-dl: Update to 2021.01.16. * gnu/packages/video.scm (youtube-dl): Update to 2021.01.16. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index cf7db757af..37eb07855a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2198,14 +2198,14 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2021.01.08") + (version "2021.01.16") (source (origin (method url-fetch) (uri (string-append "https://youtube-dl.org/downloads/latest/" "youtube-dl-" version ".tar.gz")) (sha256 (base32 - "1k870v9xc7g16nvixa272sdjnmc7pl49ymmnn6rdz0mcj2548h3k")) + "1q8pvw5j45k8nvr3d9rvnhi6xaj1mdqlkrg7q7qq6zciq5r54fhi")) (snippet '(begin ;; Delete the pre-generated files, except for the man page -- cgit v1.2.3 From 23b8af7962114d80552f09ff2adc4c2f4eabf0f5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 17 Jan 2021 11:06:28 +0200 Subject: gnu: gama: Update to 2.13. * gnu/packages/gps.scm (gama): Update to 2.13. --- gnu/packages/gps.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 4fa3bcef19..ca53ac3b73 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 Ludovic Courtès -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2020 Guillaume Le Vaillant @@ -149,7 +149,7 @@ between two other data points.") (define-public gama (package (name "gama") - (version "2.12") + (version "2.13") (source (origin (method url-fetch) @@ -157,7 +157,7 @@ between two other data points.") version ".tar.gz")) (sha256 (base32 - "0zfilasalsy29b7viw0iwgnl9bkvp0l87gpxl1hx7379l8agwqyj")) + "041cprbj4lfs42i7sd1c2zlx3r16g6c5shz3qls79gxb7kqflkgb")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 014845591a406a367082903da3e70d103b78bc44 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 16 Jan 2021 22:11:16 +0000 Subject: gnu: Add buildapp. * gnu/packages/lisp.scm (buildapp): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index e357aad4e0..100335cc2c 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Zhu Zihao +;;; Copyright © 2021 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -1126,3 +1127,43 @@ and make for REPLs that start blazing fast. @item It allows you to include arbitrary libraries. @end itemize\n") (license license:gpl3+))) + +(define-public buildapp + (package + (name "buildapp") + (version "1.5.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xach/buildapp") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "020ipjfqa3l8skd97cj5kq837wgpj28ygfxnkv64cnjrlbnzh161")))) + (build-system gnu-build-system) + (native-inputs + `(("sbcl" ,sbcl))) + (arguments + `(#:tests? #f + #:make-flags + (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))) + #:strip-binaries? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'set-home + (lambda _ + (setenv "HOME" "/tmp") + #t)) + (add-before 'install 'create-target-directory + (lambda* (#:key outputs #:allow-other-keys) + (let* ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (mkdir-p bin) + #t)))))) + (home-page "https://www.xach.com/lisp/buildapp/") + (synopsis "Makes easy to build application executables with SBCL") + (description + "Buildapp is an application for SBCL or CCL that configures and saves an +executable Common Lisp image. It is similar to cl-launch and hu.dwim.build. ") + (license license:bsd-2))) -- cgit v1.2.3 From ae018ad9780b34d83d9324bfebf8886310dbd849 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 17 Jan 2021 11:38:52 +0100 Subject: gnu: abcl: Update to 1.8.0. * gnu/packages/java.scm (abcl): Update to 1.8.0. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/java.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 758f8f1859..d6afb2e9d3 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Vincent Legoll ;;; ;;; This file is part of GNU Guix. ;;; @@ -13120,7 +13121,7 @@ network protocols, and core version control algorithms.") (define-public abcl (package (name "abcl") - (version "1.6.0") + (version "1.8.0") (source (origin (method url-fetch) @@ -13128,7 +13129,7 @@ network protocols, and core version control algorithms.") version "/abcl-src-" version ".tar.gz")) (sha256 (base32 - "0hvbcsffr8n2xwdixc8wyw1bfl9fxn2gyy0c4nma7j9zbn0wwgw9")) + "0zr5mmqyj484vza089l8vc88d07g0m8ymxzglvar3ydwyvi1x1qx")) (patches (search-patches "abcl-fix-build-xml.patch")))) -- cgit v1.2.3 From 9b97f39f57eb5bc5740f830b904961971f24c294 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sun, 17 Jan 2021 14:30:44 +0100 Subject: gnu: gqrx: Update to 2.14.4. * gnu/packages/radio.scm (gqrx): Update to 2.14.4. --- gnu/packages/radio.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 0a4b623360..f66c7175a7 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020 Arun Isaac ;;; Copyright © 2019, 2020 Christopher Howard ;;; Copyright © 2019, 2020 Evan Straw -;;; Copyright © 2020 Guillaume Le Vaillant +;;; Copyright © 2020, 2021 Guillaume Le Vaillant ;;; Copyright © 2020 Danny Milosavljevic ;;; Copyright © 2020 Charlie Ritter ;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice @@ -538,7 +538,7 @@ to the fix block above. (define-public gqrx (package (name "gqrx") - (version "2.13.5") + (version "2.14.4") (source (origin (method git-fetch) @@ -547,7 +547,7 @@ to the fix block above. (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "168wjad5g0ka555hwsciwbj7fqx1c89q59hq1yxj8aiyp5kfcahx")))) + (base32 "0m4ncydihz4n4i80c252vk3c5v672yab1jv85n6ndn7a92xv3ilq")))) (build-system qt-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 175443948f282455d4e1d15d18bd9ff5ee8572f9 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sun, 17 Jan 2021 14:37:04 +0100 Subject: gnu: rtl-433: Update to 20.11. * gnu/packages/radio.scm (rtl-433): Update to 20.11. --- gnu/packages/radio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index f66c7175a7..c58645fe87 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1057,7 +1057,7 @@ their position, altitude, speed, etc.") (define-public rtl-433 (package (name "rtl-433") - (version "20.02") + (version "20.11") (source (origin (method git-fetch) @@ -1066,7 +1066,7 @@ their position, altitude, speed, etc.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "11991xky9gawkragdyg27qsf7kw5bhlg7ygvf3fn7ng00x4xbh1z")))) + (base32 "093bxjxkg7yf78wqj5gpijbfa2p05ny09qqsj84kzi1svnzsa369")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 3d6c5560c0d68d6c235df0d41db73d2aaf4e3230 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 17 Jan 2021 14:44:48 +0200 Subject: gnu: Add simde. * gnu/packages/assembly.scm (simde): New variable. --- gnu/packages/assembly.scm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index aaf70967ab..55a1be8d54 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2013, 2015 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge -;;; Copyright © 2016, 2020 Efraim Flashner +;;; Copyright © 2016, 2020, 2021 Efraim Flashner ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; Copyright © 2019 Andy Tai @@ -26,6 +26,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages assembly) + #:use-module (guix build-system meson) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix download) @@ -148,6 +149,38 @@ to the clients.") (home-page "https://www.gnu.org/software/lightning/") (license license:gpl3+))) +(define-public simde + (package + (name "simde") + (version "0.7.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/simd-everywhere/simde") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xf5xfzkk9rj47cichgz5ni8xs9hbpz5p6fmxr4ij721ffd002k3")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix the version string + (substitute* "meson.build" + (("0.7.0-rc2") "0.7.0")) + #t)))) + (build-system meson-build-system) + ;; We really want this for the headers, and the tests require a bundled library. + (arguments '(#:configure-flags '("-Dtests=false"))) + (synopsis "Implementations of SIMD instruction sets for foreign systems") + (description "The SIMDe header-only library provides fast, portable +implementations of SIMD intrinsics on hardware which doesn't natively support +them, such as calling SSE functions on ARM. There is no performance penalty if +the hardware supports the native implementation (e.g., SSE/AVX runs at full +speed on x86, NEON on ARM, etc.).") + (home-page "https://simd-everywhere.github.io/blog/") + (license license:expat))) + (define-public fasm (package (name "fasm") -- cgit v1.2.3 From 976603b909291281a7decd18c79b0a3430f400e6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 17 Jan 2021 15:06:05 +0200 Subject: gnu: filevercmp: Install header files. * gnu/packages/bioinformatics.scm (filevercmp)[arguments]: Adjust 'install phase to install header files. --- gnu/packages/bioinformatics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index bb97b2d313..765d8e02b9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9385,8 +9385,9 @@ group or two ChIP groups run under different conditions.") (delete 'configure) ; There is no configure phase. (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) - (install-file "filevercmp" bin) + (let ((out (assoc-ref outputs "out"))) + (install-file "filevercmp" (string-append out "/bin")) + (install-file "filevercmp.h" (string-append out "/include")) #t)))))) (home-page "https://github.com/ekg/filevercmp") (synopsis "This program compares version strings") -- cgit v1.2.3 From 3ddeefe854a9f0fc3e33998f001e8445ee72a9f0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 17 Jan 2021 15:15:47 +0200 Subject: gnu: multichoose: Install header files. * gnu/packages/bioinformatics.scm (multichoose)[arguments]: Adjust 'install phase to also install header files. --- gnu/packages/bioinformatics.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 765d8e02b9..7326686245 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14812,10 +14812,14 @@ some of the details of opening and jumping in tabix-indexed files.") (delete 'configure) ; There is no configure phase. (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (include (string-append out "/include"))) ;; TODO: There are Python modules for these programs too. (install-file "multichoose" bin) - (install-file "multipermute" bin)) + (install-file "multipermute" bin) + (install-file "multichoose.h" include) + (install-file "multipermute.h" include)) #t))))) (home-page "https://github.com/ekg/multichoose") (synopsis "Efficient loopless multiset combination generation algorithm") -- cgit v1.2.3 From fc9fd5496f33f697f4dc1e0dc1f20ba62c15726a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 17 Jan 2021 15:31:21 +0200 Subject: gnu: freebayes: Update to 1.3.3. * gnu/packages/bioinformatics.scm (freebayes): Update to 1.3.3. [source]: Add patch. Add snippet to remove vendored library. [build-system]: Switch to meson-build-system. [inputs]: Remove bamtools. Add fastahack, smithwaterman, tabixpp. [native-inputs]: Remove procps, python-2, tabixpp source, smithwaterman source, multichoose source, fsom source, filevercmp source, fastahack source, bash-tap source. Add bash-tap, grep, pkg-config, simde, vcflib. [arguments]: Drop make-flags. Don't delete 'configure phase. Delete custom 'fix-tests, 'build-tabixpp-and-vcflib, 'fix-makefiles, 'install phases. Adjust 'unpack-submodule-sources phase to changed native-inputs. Add new 'patch-source phase. --- gnu/local.mk | 1 + gnu/packages/bioinformatics.scm | 203 +++++++++------------ gnu/packages/patches/freebayes-devendor-deps.patch | 129 +++++++++++++ 3 files changed, 218 insertions(+), 115 deletions(-) create mode 100644 gnu/packages/patches/freebayes-devendor-deps.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 77f1d4a096..6f66021c78 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -998,6 +998,7 @@ dist_patch_DATA = \ %D%/packages/patches/fpc-reproducibility.patch \ %D%/packages/patches/fplll-std-fenv.patch \ %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \ + %D%/packages/patches/freebayes-devendor-deps.patch \ %D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ %D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \ diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7326686245..c527111928 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -57,6 +57,7 @@ #:use-module (guix build-system trivial) #:use-module (guix deprecation) #:use-module (gnu packages) + #:use-module (gnu packages assembly) #:use-module (gnu packages autotools) #:use-module (gnu packages algebra) #:use-module (gnu packages base) @@ -15011,125 +15012,97 @@ manipulations on VCF files.") (license license:expat))) (define-public freebayes - (let ((commit "3ce827d8ebf89bb3bdc097ee0fe7f46f9f30d5fb") - (revision "1") - (version "1.0.2")) - (package - (name "freebayes") - (version (git-version version revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ekg/freebayes") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1sbzwmcbn78ybymjnhwk7qc5r912azy5vqz2y7y81616yc3ba2a2")))) - (build-system gnu-build-system) - (inputs - `(("bamtools" ,bamtools) - ("htslib" ,htslib) - ("zlib" ,zlib))) - (native-inputs - `(("bc" ,bc) ; Needed for running tests. - ("samtools" ,samtools) ; Needed for running tests. - ("parallel" ,parallel) ; Needed for running tests. - ("perl" ,perl) ; Needed for running tests. - ("procps" ,procps) ; Needed for running tests. - ("python" ,python-2) ; Needed for running tests. - ("vcflib-src" ,(package-source vcflib)) - ;; These are submodules for the vcflib version used in freebayes. - ;; This package builds against the .o files so we need to extract the source. - ("tabixpp-src" ,(package-source tabixpp)) - ("smithwaterman-src" ,(package-source smithwaterman)) - ("multichoose-src" ,(package-source multichoose)) - ("fsom-src" ,(package-source fsom)) - ("filevercmp-src" ,(package-source filevercmp)) - ("fastahack-src" ,(package-source fastahack)) - ("intervaltree-src" ,(package-source intervaltree)) - ;; These submodules are needed to run the tests. - ("bash-tap-src" ,(package-source bash-tap)) - ("test-simple-bash-src" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ingydotnet/test-simple-bash/") - (commit "124673ff204b01c8e96b7fc9f9b32ee35d898acc"))) - (file-name "test-simple-bash-src-checkout") - (sha256 - (base32 "043plp6z0x9yf7mdpky1fw7zcpwn1p47px95w9mh16603zqqqpga")))))) - (arguments - `(#:make-flags - (list "CC=gcc" - (string-append "BAMTOOLS_ROOT=" - (assoc-ref %build-inputs "bamtools"))) - #:test-target "test" - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'fix-tests - (lambda _ - (substitute* "test/t/01_call_variants.t" - (("grep -P \"\\(\\\\t500\\$\\|\\\\t11000\\$\\|\\\\t1000\\$\\)\"") - "grep -E ' (500|11000|1000)$'")) - #t)) - (add-after 'unpack 'unpack-submodule-sources - (lambda* (#:key inputs #:allow-other-keys) - (let ((unpack (lambda (source target) - (with-directory-excursion target - (if (file-is-directory? (assoc-ref inputs source)) - (copy-recursively (assoc-ref inputs source) ".") - (invoke "tar" "xvf" - (assoc-ref inputs source) - "--strip-components=1")))))) - (and - (unpack "vcflib-src" "vcflib") - (unpack "fastahack-src" "vcflib/fastahack") - (unpack "filevercmp-src" "vcflib/filevercmp") - (unpack "fsom-src" "vcflib/fsom") - (unpack "intervaltree-src" "vcflib/intervaltree") - (unpack "multichoose-src" "vcflib/multichoose") - (unpack "smithwaterman-src" "vcflib/smithwaterman") - (unpack "tabixpp-src" "vcflib/tabixpp") - (unpack "test-simple-bash-src" "test/test-simple-bash") - (unpack "bash-tap-src" "test/bash-tap"))))) - (add-after 'unpack-submodule-sources 'fix-makefiles - (lambda _ - ;; We don't have the .git folder to get the version tag from. - (substitute* "vcflib/Makefile" - (("^GIT_VERSION.*") - (string-append "GIT_VERSION = v" ,version))) - (substitute* "src/Makefile" - (("-I\\$\\(BAMTOOLS_ROOT\\)/src") - "-I$(BAMTOOLS_ROOT)/include/bamtools")) - #t)) - (add-before 'build 'build-tabixpp-and-vcflib - (lambda* (#:key inputs make-flags #:allow-other-keys) - (with-directory-excursion "vcflib" - (with-directory-excursion "tabixpp" - (apply invoke "make" - (string-append "HTS_LIB=" - (assoc-ref inputs "htslib") - "/lib/libhts.a") - make-flags)) - (apply invoke "make" - (string-append "CFLAGS=-Itabixpp") - "all" - make-flags)))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) - (install-file "bin/freebayes" bin) - (install-file "bin/bamleftalign" bin)) - #t))))) - (home-page "https://github.com/ekg/freebayes") - (synopsis "Haplotype-based variant detector") - (description "FreeBayes is a Bayesian genetic variant detector designed to + (package + (name "freebayes") + (version "1.3.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ekg/freebayes") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0myz3giad7jqp6ricdfnig9ymlcps2h67mlivadvx97ngagm85z8")) + (patches (search-patches "freebayes-devendor-deps.patch")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "contrib/htslib") + #t)))) + (build-system meson-build-system) + (inputs + `(("fastahack" ,fastahack) + ("htslib" ,htslib) + ("smithwaterman" ,smithwaterman) + ("tabixpp" ,tabixpp) + ("zlib" ,zlib))) + (native-inputs + `(("bash-tap" ,bash-tap) + ("bc" ,bc) + ("grep" ,grep) ; Built with perl support. + ("parallel" ,parallel) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("samtools" ,samtools) + ("simde" ,simde) + ;; We need some binaries from vcflib, but we also need to link against a + ;; subset of the library. Vendor the parts we need until we have a shared library. + ("vcflib" ,vcflib) + ("vcflib-src" ,(package-source vcflib)) + ("intervaltree-src" ,(package-source intervaltree)) + ;; This submodule is needed to run the tests. + ("test-simple-bash-src" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ingydotnet/test-simple-bash/") + (commit "124673ff204b01c8e96b7fc9f9b32ee35d898acc"))) + (file-name "test-simple-bash-src-checkout") + (sha256 + (base32 "043plp6z0x9yf7mdpky1fw7zcpwn1p47px95w9mh16603zqqqpga")))))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (let ((bash-tap (assoc-ref inputs "bash-tap"))) + (substitute* (find-files "test/t") + (("BASH_TAP_ROOT=bash-tap") + (string-append "BASH_TAP_ROOT=" bash-tap "/bin")) + (("bash-tap/bash-tap-bootstrap") + (string-append bash-tap "/bin/bash-tap-bootstrap")) + (("source.*bash-tap-bootstrap") + (string-append "source " bash-tap "/bin/bash-tap-bootstrap"))) + (substitute* "meson.build" + ;; Some inputs aren't actually needed. + ((".*bamtools/src.*") "") + ((".*multichoose.*") "") + (("'vcflib/filevercmp'") "")) + #t))) + (add-after 'unpack 'unpack-submodule-sources + (lambda* (#:key inputs #:allow-other-keys) + (let ((unpack (lambda (source target) + (unless (directory-exists? target) + (mkdir-p target)) + (with-directory-excursion target + (if (file-is-directory? (assoc-ref inputs source)) + (copy-recursively (assoc-ref inputs source) ".") + (invoke "tar" "xvf" + (assoc-ref inputs source) + "--strip-components=1")))))) + (and + (unpack "vcflib-src" "vcflib") + (unpack "intervaltree-src" "vcflib/intervaltree") + (unpack "test-simple-bash-src" "test/test-simple-bash")) + #t)))))) + (home-page "https://github.com/ekg/freebayes") + (synopsis "Haplotype-based variant detector") + (description "FreeBayes is a Bayesian genetic variant detector designed to find small polymorphisms, specifically SNPs (single-nucleotide polymorphisms), indels (insertions and deletions), MNPs (multi-nucleotide polymorphisms), and complex events (composite insertion and substitution events) smaller than the length of a short-read sequencing alignment.") - (license license:expat)))) + (license license:expat))) (define-public samblaster (package diff --git a/gnu/packages/patches/freebayes-devendor-deps.patch b/gnu/packages/patches/freebayes-devendor-deps.patch new file mode 100644 index 0000000000..580f53a3b1 --- /dev/null +++ b/gnu/packages/patches/freebayes-devendor-deps.patch @@ -0,0 +1,129 @@ +This patch is original to Guix, ongoing work to upstream bits as possible. + +From 50833daba0b1dbe2ed364b1e980b67a09a312789 Mon Sep 17 00:00:00 2001 +From: Efraim Flashner +Date: Sun, 17 Jan 2021 13:27:17 +0200 +Subject: [PATCH] devendor-dependants + +--- + meson.build | 60 +++++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 47 insertions(+), 13 deletions(-) + +diff --git a/meson.build b/meson.build +index f6bf242..7a3805e 100644 +--- a/meson.build ++++ b/meson.build +@@ -9,8 +9,12 @@ project('freebayes', ['cpp', 'c'], + + zlib_dep = dependency('zlib') + lzma_dep = dependency('liblzma') ++simde_dep = dependency('simde') + bzip2_dep = dependency('bz2lib', required: false) + htslib_dep = dependency('htslib', required : false) ++tabixpp_dep = dependency('tabixpp', required : false) ++fastahack_dep = dependency('fastahack', required : false) ++smithwaterman_dep = dependency('smithwaterman', required : false) + thread_dep = dependency('threads') + + if htslib_dep.found() +@@ -59,6 +63,41 @@ else + ] + endif + ++if tabixpp_dep.found() ++ tabixpp_includes = '' ++ tabixpp_src = [] ++else ++ tabixpp_includes = [ ++ 'vcflib/tabixpp', ++ ] ++ tabixpp_src = [ ++ 'vcflib/tabixpp/tabix.cpp', ++ ] ++endif ++ ++if fastahack_dep.found() ++ fastahack_src = [] ++else ++ fastahack_src = [ ++ 'vcflib/fastahack/Fasta.cpp', ++ ] ++endif ++ ++if smithwaterman_dep.found() ++ smithwaterman_includes = '' ++ smithwaterman_src = [] ++else ++ smithwaterman_includes = [ ++ 'vcflib/smithwaterman', ++ ] ++ smithwaterman_src = [ ++ 'vcflib/smithwaterman/SmithWatermanGotoh.cpp', ++ 'vcflib/smithwaterman/disorder.cpp', ++ 'vcflib/smithwaterman/Repeats.cpp', ++ 'vcflib/smithwaterman/LeftAlign.cpp', ++ 'vcflib/smithwaterman/IndelAllele.cpp', ++ ] ++endif + + + # +@@ -105,22 +144,17 @@ seqlib_src = [ + ] + + vcflib_src = [ +- 'vcflib/tabixpp/tabix.cpp', + 'vcflib/src/Variant.cpp', +- 'vcflib/smithwaterman/SmithWatermanGotoh.cpp', +- 'vcflib/smithwaterman/disorder.cpp', +- 'vcflib/smithwaterman/Repeats.cpp', +- 'vcflib/smithwaterman/LeftAlign.cpp', +- 'vcflib/smithwaterman/IndelAllele.cpp', ++ tabixpp_src, ++ smithwaterman_src, + ] + + bamleftalign_src = [ + 'src/bamleftalign.cpp', + 'src/IndelAllele.cpp', + 'contrib/SeqLib/src/BamWriter.cpp', +- 'vcflib/fastahack/Fasta.cpp', +- 'vcflib/smithwaterman/LeftAlign.cpp', +- 'vcflib/smithwaterman/IndelAllele.cpp', ++ fastahack_src, ++ smithwaterman_src, + 'vcflib/src/split.cpp', + 'src/LeftAlign.cpp', + ] +@@ -135,8 +169,8 @@ incdir = include_directories( + 'contrib', + 'contrib/SeqLib', + 'vcflib/src', +- 'vcflib/tabixpp', +- 'vcflib/smithwaterman', ++ tabixpp_includes, ++ smithwaterman_includes, + 'vcflib/multichoose', + 'vcflib/filevercmp') + +@@ -152,7 +186,7 @@ executable('freebayes', + include_directories : incdir, + cpp_args : cpp_args, + c_args : c_args, +- dependencies: [zlib_dep, lzma_dep, htslib_dep, thread_dep], ++ dependencies: [zlib_dep, lzma_dep, simde_dep, htslib_dep, tabixpp_dep, smithwaterman_dep, thread_dep], + install: true + ) + +@@ -165,7 +199,7 @@ executable('bamleftalign', + include_directories : incdir, + cpp_args : cpp_args, + c_args : c_args, +- dependencies: [zlib_dep, lzma_dep, htslib_dep, thread_dep], ++ dependencies: [zlib_dep, lzma_dep, simde_dep, htslib_dep, tabixpp_dep, fastahack_dep, smithwaterman_dep, thread_dep], + install: true + ) + +-- +2.30.0 + -- cgit v1.2.3 From 06ab89486715a0817aa355186b16958a93626dcc Mon Sep 17 00:00:00 2001 From: Aurora Date: Sat, 16 Jan 2021 23:06:43 +0100 Subject: gnu: sbcl-cffi: Update to 0.23.0. * gnu/packages/lisp-xyz.scm (sbcl-cffi): Update to 0.23.0. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 112d3dd5bb..83fa2a7b5d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Adam Kandur ;;; Copyright © 2020, 2021 Sharlatan Hellseher +;;; Copyright © 2021 Aurora ;;; ;;; This file is part of GNU Guix. ;;; @@ -2511,7 +2512,7 @@ non-consing thread safe queues and fibonacci priority queues.") (define-public sbcl-cffi (package (name "sbcl-cffi") - (version "0.21.0") + (version "0.23.0") (source (origin (method git-fetch) @@ -2520,7 +2521,7 @@ non-consing thread safe queues and fibonacci priority queues.") (commit (string-append "v" version)))) (file-name (git-file-name "cffi-bootstrap" version)) (sha256 - (base32 "1qalargz9bhp850qv60ffwpdqi4xirzar4l3g6qcg8yc6xqf2cjk")))) + (base32 "03s98imc5niwnpj3hhrafl7dmxq45g74h96sm68976k7ahi3vl5b")))) (build-system asdf-build-system/sbcl) (inputs `(("alexandria" ,sbcl-alexandria) -- cgit v1.2.3 From 99d14e5951c243396b712150ec7e3035b4e1ccfc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Jan 2021 23:08:01 +0100 Subject: gnu: libhandy: Update to 1.0.3. * gnu/packages/gnome.scm (libhandy): Update to 1.0.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e00f65a32a..d31a4a02e7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10798,7 +10798,7 @@ advanced image management tool") (define-public libhandy (package (name "libhandy") - (version "1.0.2") + (version "1.0.3") (source (origin (method git-fetch) @@ -10807,7 +10807,7 @@ advanced image management tool") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1bmmkahshvlvpsnb7zp8bddv7i1h5k4p967n6kxh71g1vnj8x20m")))) + (base32 "0flgwlm921801i3ns0dwqpnxl89f3rzn4y9h723i13bmflch3in7")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 07928e11eb2f92745205ceb280070d000708fcb2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Jan 2021 23:09:43 +0100 Subject: gnu: pd: Update to 0.51-4. * gnu/packages/music.scm (pd): Update to 0.51-4. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2fe5e2081a..be05169574 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2296,7 +2296,7 @@ export.") (define-public pd (package (name "pd") - (version "0.51-3") + (version "0.51-4") (source (origin (method url-fetch) (uri @@ -2304,7 +2304,7 @@ export.") version ".src.tar.gz")) (sha256 (base32 - "10cqg387xdpiirak5v9y1lpvcds9bpqz61znx6d1m1hb45n513aw")))) + "1hgw1ciwr59f4f9s0h7c2l36wcsn3jsddhr1r9qj97vf64c1ynaj")))) (build-system gnu-build-system) (arguments (let ((wish (string-append "wish" (version-major+minor -- cgit v1.2.3 From f6b03a308d540ecb0bde402ede63004065c922b1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Jan 2021 23:15:34 +0100 Subject: gnu: oil: Update to 0.8.6. * gnu/packages/shells.scm (oil): Update to 0.8.6. --- gnu/packages/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 0b4edbe452..5ee7add8b1 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -814,14 +814,14 @@ Shell (pdksh).") (define-public oil (package (name "oil") - (version "0.8.5") + (version "0.8.6") (source (origin (method url-fetch) (uri (string-append "https://www.oilshell.org/download/oil-" version ".tar.gz")) (sha256 - (base32 "02pw7x76jzfmk8fqs1k0pz7vwnkal458p93j4if0w0hg36xyx1j2")))) + (base32 "1g7ij3va9rlapfyl3zd08g2iffcr6b0n8b0zrp0bnxwvvnysl95h")))) (build-system gnu-build-system) (arguments `(#:strip-binaries? #f ; strip breaks the binary -- cgit v1.2.3 From ab9f194d7e740c419f29ea75718e7eabee28f40a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Jan 2021 23:23:52 +0100 Subject: gnu: inxi-minimal: Update to 3.2.02-2. * gnu/packages/admin.scm (inxi-minimal): Update to 3.2.02-2. --- 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 4be5a17a57..3582d8d70b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3617,7 +3617,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.2.02-1") + (version "3.2.02-2") (source (origin (method git-fetch) @@ -3626,7 +3626,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "1kh96093waji30ndka3i3dq9pq4f53gq8pgcbxw45mldlx2i98gv")))) + (base32 "0fwx798v9kwiwkgbj97w6rjdanwf7ap65vvq1fqy7gd9x78xcxsq")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) -- cgit v1.2.3 From a3e549b5a8b347255309cb1c5a877a28024d1fb6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Jan 2021 23:26:01 +0100 Subject: gnu: facter: Update to 4.0.49. * gnu/packages/admin.scm (facter): Update to 4.0.49. --- 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 3582d8d70b..b476a90de9 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -445,7 +445,7 @@ graphs and can export its output to different formats.") (define-public facter (package (name "facter") - (version "4.0.48") + (version "4.0.49") (source (origin (method git-fetch) (uri (git-reference @@ -454,7 +454,7 @@ graphs and can export its output to different formats.") (file-name (git-file-name name version)) (sha256 (base32 - "10cbk56nbvqvpzq3h958iizvh0vh69zkhw31dxl1qx91zk5d8djx")))) + "0l7gic5ql5xiy5s6rb0j9ydyaal5bcxl10bx45khcgdr9zg16pb1")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit v1.2.3 From e48cdbb9f6811c10db3819e078cc232ca5e09219 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Jan 2021 23:36:45 +0100 Subject: gnu: keepassxc: Update to 2.6.3. * gnu/packages/password-utils.scm (keepassxc): Update to 2.6.3. --- gnu/packages/password-utils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index bd411f59d0..2053457375 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016, 2019, 2020 Alex Griffin ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017, 2018 Clément Lassieur -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2017, 2019 Eric Bavier ;;; Copyright © 2017, 2020 Nicolas Goaziou @@ -123,7 +123,7 @@ human.") (define-public keepassxc (package (name "keepassxc") - (version "2.6.2") + (version "2.6.3") (source (origin (method url-fetch) @@ -131,7 +131,7 @@ human.") "/releases/download/" version "/keepassxc-" version "-src.tar.xz")) (sha256 - (base32 "0f3ygnjzjijqmmrvrslwsbnz208jgxp5bwy4p336w3bn1bggl6qh")))) + (base32 "1lgp20597dzj8qn8a71x3a6b549rvqybqx4haywwb09qiznvdq77")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DWITH_XC_ALL=YES" -- cgit v1.2.3 From 976d072aa24e07691df56fd5987ef04238fc734d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Jan 2021 23:38:47 +0100 Subject: gnu: mblaze: Update to 1.1. * gnu/packages/mail.scm (mblaze): Update to 1.1. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 043f5c5fec..5b235eea85 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2631,7 +2631,7 @@ converts them to maildir format directories.") (define-public mblaze (package (name "mblaze") - (version "1.0") + (version "1.1") (source (origin (method git-fetch) @@ -2640,7 +2640,7 @@ converts them to maildir format directories.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hxy3mjjv4hg856sl1r15fdmqaw4s9c26b3lidsd5x0kpqy601ai")))) + (base32 "1bir977vnqs76g8jgv1yivqw0wk2kn56l3l5r4w2ipix3fir138y")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) -- cgit v1.2.3 From 1c33b1b8e89d5020cb467f41638751e178b8b2b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Jan 2021 23:44:23 +0100 Subject: gnu: nbd: Update to 3.21. * gnu/packages/networking.scm (nbd): Update to 3.21. --- gnu/packages/networking.scm | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 28fd096cd0..4e8d91256d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -913,14 +913,14 @@ transparently check connection attempts against an access control list.") (define-public zeromq (package (name "zeromq") - (version "4.3.3") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/zeromq/libzmq/releases" - "/download/v" version "/zeromq-" version ".tar.gz")) - (sha256 - (base32 - "18km71p77jm1w7wly2a5mxvphjb0f2l6s08cg382x55f6zdqb4lx")))) + (version "4.3.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/zeromq/libzmq/releases" + "/download/v" version "/zeromq-" version ".tar.gz")) + (sha256 + (base32 "1rf3jmi36ms8jh2g5cvi253h43l6xdfq0r7mvp95va7mi4d014y5")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) (home-page "https://zeromq.org") @@ -3849,15 +3849,14 @@ stamps.") (define-public nbd (package (name "nbd") - (version "3.20") + (version "3.21") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/nbd/nbd/3.20/nbd-" version - ".tar.xz")) + (uri (string-append "mirror://sourceforge/nbd/nbd/" version + "/nbd-" version ".tar.xz")) (sha256 - (base32 - "1kfnyx52nna2mnw264njk1dl2zc8m78sz031yp65mbmpi99v7qg0")))) + (base32 "1ydylvvayi4w2d08flji9q03sl7y8hn0c26vsay3nwwikprqls77")))) (build-system gnu-build-system) (inputs `(("glib" ,glib))) -- cgit v1.2.3 From 1b2c32dc919ec331bbd3219c586f46fe66e06346 Mon Sep 17 00:00:00 2001 From: Ryan Desfosses Date: Thu, 14 Jan 2021 22:25:21 -0500 Subject: gnu: Add emacs-org-mime * gnu/packages/emacs-xyz.scm (emacs-org-mime): New variable. Signed-off-by: Nicolas Goaziou --- 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 21144fa6d0..29c09d1b9f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6374,6 +6374,29 @@ cards created in Org mode.") (SRS) but would like to make cards in Org mode.") (license license:gpl3+)))) +(define-public emacs-org-mime + (package + (name "emacs-org-mime") + (version "0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/org-mime/org-mime") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0vchyd80ybvr6317dwm50nxcgxfrpc0bz6259vnrh24p5sb8shbj")))) + (build-system emacs-build-system) + (home-page "http://github.com/org-mime/org-mime") + (synopsis "Send HTML email using Org mode HTML export") + (description + "This program sends HTML email using Org-mode HTML export. +This approximates a WYSiWYG HTML mail editor from within Emacs, and can be +useful for sending tables, fontified source code, and inline images in +email.") + (license license:gpl3+))) + (define-public emacs-org-superstar (package (name "emacs-org-superstar") -- cgit v1.2.3 From 9aa0a98ea0a93bf3db492833732cd4dc3d85debf Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 3 Jan 2021 20:17:52 -0500 Subject: gnu: gnuplot: Update to 5.4.1. * gnu/packages/maths.scm (gnuplot): Update to 5.4.1. [arguments]: Set GNUTERM in #:make-flags. --- gnu/packages/maths.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 7866bcc6eb..cb4640da41 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -919,14 +919,14 @@ singular value problems.") (define-public gnuplot (package (name "gnuplot") - (version "5.2.7") + (version "5.4.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/" version "/gnuplot-" version ".tar.gz")) (sha256 - (base32 "1vglp4la40f5dpj0zdj63zprrkyjgzy068p35bz5dqxjyczm1zlp")))) + (base32 "03jrqs5lvxmbbz2c4g17dn2hrxqwd3hfadk9q8wbkbkyas2h8sbb")))) (build-system gnu-build-system) (inputs `(("readline" ,readline) ("cairo" ,cairo) @@ -938,7 +938,9 @@ singular value problems.") ("texlive" ,texlive-tiny))) (arguments `(#:configure-flags (list (string-append "--with-texdir=" %output - "/texmf-local/tex/latex/gnuplot")))) + "/texmf-local/tex/latex/gnuplot")) + ;; Plot on a dumb terminal during tests. + #:make-flags '("GNUTERM=dumb"))) (home-page "http://www.gnuplot.info") (synopsis "Command-line driven graphing utility") (description "Gnuplot is a portable command-line driven graphing -- cgit v1.2.3 From f5f642058a3b6bf3eda5eb714ad5fa1f0a2b1b20 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 3 Jan 2021 11:26:16 -0500 Subject: gnu: wxmaxima: Update to 20.12.2. * gnu/packages/maths.scm (wxmaxima): Update to 20.12.2. [arguments]: Remove #:test-target and disable tests. Remove 'pre-check phase. [native-inputs]: Remove xorg-server-for-tests. [inputs]: Add libomp. --- gnu/packages/maths.scm | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index cb4640da41..eff1480e62 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -104,6 +104,7 @@ #:use-module (gnu packages less) #:use-module (gnu packages lisp) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages logging) #:use-module (gnu packages lua) #:use-module (gnu packages gnome) @@ -3504,7 +3505,7 @@ point numbers.") (define-public wxmaxima (package (name "wxmaxima") - (version "20.06.6") + (version "20.12.2") (source (origin (method git-fetch) @@ -3513,22 +3514,20 @@ point numbers.") (commit (string-append "Version-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "054f7n5kx75ng5j20rd5q27n9xxk03mrd7sbxyym1lsswzimqh4w")))) + (base32 "1rxnxk7yanb9ac5pxbii6k7gg3b09pbp9rmwvsvgpbrk17mg79r9")))) (build-system cmake-build-system) (native-inputs - `(("gettext" ,gettext-minimal) - ("xorg-server" ,xorg-server-for-tests))) - ;; TODO: Add libomp for multithreading support. - ;; As of right now, enabling libomp causes the imageCells.wxm test to fail. + `(("gettext" ,gettext-minimal))) (inputs - `(("wxwidgets" ,wxwidgets) + `(("libomp" ,libomp) + ("wxwidgets" ,wxwidgets) ("maxima" ,maxima) ;; Runtime support. ("adwaita-icon-theme" ,adwaita-icon-theme) ("gtk+" ,gtk+) ("shared-mime-info" ,shared-mime-info))) (arguments - `(#:test-target "test" + `(#:tests? #f ; tests fail non-deterministically #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-doc-path @@ -3539,13 +3538,6 @@ point numbers.") (substitute* "src/Dirstructure.cpp" (("/doc/wxmaxima-\\%s") "/doc/wxmaxima")) #t)) - (add-before 'check 'pre-check - (lambda _ - ;; Tests require a running X server. - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1") - (setenv "HOME" (getcwd)) - #t)) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out") -- cgit v1.2.3 From a1093d73c341eb3299f12c146f435b20a0da484f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Jan 2021 00:19:43 +0100 Subject: gnu: ktouch: Update to 20.12.1. * gnu/packages/education.scm (ktouch): Update to 20.12.1. --- gnu/packages/education.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 8ba673fe03..13372489f5 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2017 Ricardo Wurmus ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Efraim Flashner -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2020 Robert Smith ;;; Copyright © 2020 Guy Fleury Iteriteka @@ -680,15 +680,14 @@ language and very flexible regarding to new or unknown keyboard layouts.") (define-public ktouch (package (name "ktouch") - (version "20.12.0") + (version "20.12.1") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/ktouch-" version ".tar.xz")) (sha256 - (base32 - "1s8pcwakx94aygfyjmyps5b43j4kv6dmfw7n12japcka2yfp9bi2")))) + (base32 "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib")))) (build-system qt-build-system) (arguments `(#:phases -- cgit v1.2.3 From e5a806a43af6efb5b2e79a26bc3d4581eb424f1d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Jan 2021 01:30:02 +0100 Subject: gnu: libnftnl: Update to 1.1.9. * gnu/packages/linux.scm (libnftnl): Update to 1.1.9. --- 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 7ed71e9d8f..7fc9eac803 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6434,14 +6434,14 @@ re-use code and to avoid re-inventing the wheel.") (define-public libnftnl (package (name "libnftnl") - (version "1.1.8") + (version "1.1.9") (source (origin (method url-fetch) (uri (string-append "mirror://netfilter.org/libnftnl/" "libnftnl-" version ".tar.bz2")) (sha256 - (base32 "04dp797llg3cqzivwrql30wg9mfr0ngnp0v5gs7jcdmp11dzm8q4")))) + (base32 "16jbp4fs5dz2yf4c3bl1sb48x9x9wi1chv39zwmfgya1k9pimcp9")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From c65e3c9d413c6c273755fa04d7b91bfbfb185573 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Jan 2021 01:30:11 +0100 Subject: gnu: nftables: Update to 0.9.8. * gnu/packages/linux.scm (nftables): Update to 0.9.8. --- 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 7fc9eac803..43156b584c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6458,7 +6458,7 @@ used by nftables.") (define-public nftables (package (name "nftables") - (version "0.9.7") + (version "0.9.8") (source (origin (method url-fetch) @@ -6467,7 +6467,7 @@ used by nftables.") (string-append "https://www.nftables.org/projects/nftables" "/files/nftables-" version ".tar.bz2"))) (sha256 - (base32 "1c1c2475nifncv0ng8z77h2dpanlsx0bhqm15k00jb3a6a68lszy")))) + (base32 "1r4g22grhd4s1918wws9vggb8821sv4kkj8197ygxr6sar301z30")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-man-doc"))) ; FIXME: Needs docbook2x. -- cgit v1.2.3 From ca16ca54284d5365f02ace257e80f9d629c9f2d8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Jan 2021 01:30:23 +0100 Subject: gnu: iptables: Update to 1.8.7. * gnu/packages/linux.scm (iptables): Update to 1.8.7. --- 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 43156b584c..a64b3fef4f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2211,7 +2211,7 @@ external rate conversion.") (define-public iptables (package (name "iptables") - (version "1.8.6") + (version "1.8.7") (source (origin (method url-fetch) @@ -2220,7 +2220,7 @@ external rate conversion.") (string-append "https://www.netfilter.org/projects/iptables/" "files/iptables-" version ".tar.bz2"))) (sha256 - (base32 "0rvp0k8a72h2snrdx48cfn75bfa0ycrd2xl3kjysbymq7q6gxx50")))) + (base32 "1w6qx3sxzkv80shk21f63rq41c84irpx68k62m2cv629n1mwj2f1")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From cbc2c28ad4337781c679b7588a74740b2ba7d189 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Jan 2021 01:31:00 +0100 Subject: gnu: xapian, python-xapian-bindings: Update to 1.4.18. * gnu/packages/search.scm (xapian, python-xapian-bindings): Update to 1.4.18. --- gnu/packages/search.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 8293d562b3..e261e64a7f 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -49,14 +49,14 @@ (define-public xapian (package (name "xapian") - (version "1.4.17") + (version "1.4.18") ;; Note: When updating Xapian, remember to update xapian-bindings below. (source (origin (method url-fetch) (uri (string-append "https://oligarchy.co.uk/xapian/" version "/xapian-core-" version ".tar.xz")) (sha256 - (base32 "0bjpaavdckl4viznr8gbq476fvg648sj4rks2vacmc51vrb8bsxm")))) + (base32 "0xsb4ihf3p767f0zx9p4janwni6r9sg5j6lry0002i8hmnsdnv8r")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) ("util-linux" ,util-linux "lib"))) @@ -94,7 +94,7 @@ rich set of boolean query operators.") "/xapian-bindings-" version ".tar.xz")) (sha256 (base32 - "1lzb739hjfy9ih2c0ircra50h4jr48wxq1fal7sai963w28mv9j8")))) + "13ziql8027glgihgvnbsa75vkcn82g83mbihj60zf0njj170clpy")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-python3") -- cgit v1.2.3 From 4b3f5bef4b8ad7a5a823284954a6251684335f80 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Jan 2021 21:03:14 -0500 Subject: gnu: linux-libre: Update to 5.10.8. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.8. (linux-libre-5.10-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 a64b3fef4f..1ad8f72485 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -353,7 +353,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.10-version "5.10.7") +(define-public linux-libre-5.10-version "5.10.8") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -361,7 +361,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1gpsdxq2gx40gpmm0zya0wxd7fdflbaq9j1j0hbffahgz44nxgsc"))) + (hash (base32 "1v83wm8xbhq1sgn7c84zi7l40vmd9k1gb653b686jp8n4na85z2w"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From 5a748524eee07ee99e2ae89d75652eb8e0c52ca6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Jan 2021 21:03:39 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.90. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.90. (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 1ad8f72485..127d594527 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,7 +369,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.4-version "5.4.89") +(define-public linux-libre-5.4-version "5.4.90") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -377,7 +377,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1bqamd3z71h8jh3mxfisqiaxj5m027xjyifj9ryqdwbdgcbxb396"))) + (hash (base32 "06pscvxjkpz35y6kbmyzdvn9mm4p7pfg0d49chi1q61z0sy3crv4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 7cd85dae005dfcdbebfecfcd435eaa31630c2048 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Jan 2021 21:03:54 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.168. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.168. (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 127d594527..294000de91 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -382,7 +382,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.167") +(define-public linux-libre-4.19-version "4.19.168") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -390,7 +390,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "00gddgr1jj9zkd10mbbkanfkgpqi2jqszibq80rc9bbmgiknfb1i"))) + (hash (base32 "1whkqklqj8rz9lv88aldvwkwnb9xvg0njdbcrk56r7z6f9zkhnmm"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 83c99f37672a7c4b6d788826caeb4b236db3ad89 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Jan 2021 21:05:12 -0500 Subject: gnu: linux-libre 4.14: Update to 4.14.216. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.216. (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 294000de91..f64db02c76 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -395,7 +395,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.215") +(define-public linux-libre-4.14-version "4.14.216") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -403,7 +403,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1ni6p485dszi365rfflrwmjl6arbkhfvl1zm7p99vcv11hllx14s"))) + (hash (base32 "19dvxmqvs1ysl127zqdcqq2pyf7370jj66fd73zdx6ya2pplz1mp"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 2c0f4579682efa8d6a8820ecccd629f1bf65f580 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Jan 2021 21:05:26 -0500 Subject: gnu: linux-libre 4.9: Update to 4.9.252. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.252. (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 f64db02c76..28fed4490f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -408,7 +408,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.251") +(define-public linux-libre-4.9-version "4.9.252") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -416,7 +416,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "03cn3yzyv8vwvv76nxj655i14s9avhr4hcc18mq2rh0qn6zcnkgg"))) + (hash (base32 "1shllgrmxi6darnyzwkzazzjhpwxhm19z1swv40hnm0pbvgxm7hw"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From c20eee77a13045abcb8a379a12d3c91ed3acce9e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Jan 2021 21:05:39 -0500 Subject: gnu: linux-libre 4.4: Update to 4.4.252. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.252. (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 28fed4490f..2497e0dea9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -421,7 +421,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.251") +(define-public linux-libre-4.4-version "4.4.252") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -429,7 +429,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "13mnlwwcwvbyqn8lafjymq66qjfj7nksdiyrcgymx8s03z1why86"))) + (hash (base32 "0lchvfvn0kvqh1yixwscz4wrzd965zsxjkpc7nqiw9rhmvma3paf"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 9b6cddd32dfcffac4cec28366f968cfcce021e1e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 18 Jan 2021 10:39:51 +0200 Subject: gnu: Add ruby-bio-vcf. * gnu/packages/bioinformatics.scm (ruby-bio-vcf): New variable. --- gnu/packages/bioinformatics.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c527111928..182e974efc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7726,6 +7726,31 @@ BLAST, KEGG, GenBank, MEDLINE and GO.") ;; (LGPLv2.1+) and scripts in samples (which have GPL2 and GPL2+) (license (list license:ruby license:lgpl2.1+ license:gpl2+ )))) +(define-public ruby-bio-vcf + (package + (name "ruby-bio-vcf") + (version "0.9.5") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "bio-vcf" version)) + (sha256 + (base32 + "1glw5pn9s8z13spxk6yyfqaz80n9lga67f33w35nkpq9dwi2vg6g")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-cucumber" ,ruby-cucumber))) + (synopsis "Smart VCF parser DSL") + (description + "Bio-vcf provides a @acronym{DSL, domain specific language} for processing +the VCF format. Record named fields can be queried with regular expressions. +Bio-vcf is a new generation VCF parser, filter and converter. Bio-vcf is not +only very fast for genome-wide (WGS) data, it also comes with a filtering, +evaluation and rewrite language and can output any type of textual data, +including VCF header and contents in RDF and JSON.") + (home-page "https://github.com/vcflib/bio-vcf") + (license license:expat))) + (define-public r-biocviews (package (name "r-biocviews") -- cgit v1.2.3 From 6cb86e23a9f12d0646c2a0fbf548a77c9e424eee Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 18 Jan 2021 11:19:37 +0200 Subject: gnu: ruby-bio-vcf: Rename to bio-vcf. This package is widely known in select circles specifically as 'bio-vcf'. * gnu/packages/bioinformatics.scm (ruby-bio-vcf): Rename to bio-vcf. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 182e974efc..d6e179fb9a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7726,9 +7726,9 @@ BLAST, KEGG, GenBank, MEDLINE and GO.") ;; (LGPLv2.1+) and scripts in samples (which have GPL2 and GPL2+) (license (list license:ruby license:lgpl2.1+ license:gpl2+ )))) -(define-public ruby-bio-vcf +(define-public bio-vcf (package - (name "ruby-bio-vcf") + (name "bio-vcf") (version "0.9.5") (source (origin -- cgit v1.2.3 From 973a1e52722c4453041b978100093cb35d7e67a8 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Fri, 15 Jan 2021 09:57:35 +0100 Subject: gnu: musl: Update to 1.2.2. * gnu/packages/musl.scm (musl): Update to 1.2.2. Signed-off-by: Efraim Flashner --- gnu/packages/musl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/musl.scm b/gnu/packages/musl.scm index 466e472deb..e8c51036d7 100644 --- a/gnu/packages/musl.scm +++ b/gnu/packages/musl.scm @@ -28,14 +28,14 @@ (define-public musl (package (name "musl") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append "https://www.musl-libc.org/releases/" "musl-" version ".tar.gz")) (sha256 (base32 - "0jz8fzwgvfyjgxjbpw35ixdglp2apqjvp8m386f6yr4zacc6xbv8")))) + "1p8r6bac64y98ln0wzmnixysckq3crca69ys7p16sy9d04i975lv")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; musl has no tests -- cgit v1.2.3 From 2d9c6542c804eb2ef3d8934e1e3ab8b24e9bbafb Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 14 Jan 2021 19:34:15 +0100 Subject: gnu: mafft: Update to 7.475. * gnu/packages/bioinformatics.scm (mafft): Update to 7.475. Signed-off-by: Efraim Flashner --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d6e179fb9a..2aa6de7b15 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4687,7 +4687,7 @@ sequencing tag position and orientation.") (define-public mafft (package (name "mafft") - (version "7.471") + (version "7.475") (source (origin (method url-fetch) (uri (string-append @@ -4696,7 +4696,7 @@ sequencing tag position and orientation.") (file-name (string-append name "-" version ".tgz")) (sha256 (base32 - "0r1973fx2scq4712zdqfy67wkzqj0c0bhrdy4jxhvq40mdxyry30")))) + "0i2i2m3blh2xkbkdk48hxfssks30ny0v381gdl7zwhcvp0axs26r")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no automated tests, though there are tests in the read me -- cgit v1.2.3 From 8b55544212a90b0276df49596a3d373e5c2e8f5c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 18 Jan 2021 14:39:13 -0500 Subject: gnu: mesa: Skip another test. * gnu/packages/patches/mesa-skip-disk-cache-test.patch: Rename to ... * gnu/packages/patches/mesa-skip-tests.patch: ... new file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gl.scm (mesa)[source]: Adjust accordingly. --- gnu/local.mk | 2 +- gnu/packages/gl.scm | 2 +- .../patches/mesa-skip-disk-cache-test.patch | 19 --------- gnu/packages/patches/mesa-skip-tests.patch | 49 ++++++++++++++++++++++ 4 files changed, 51 insertions(+), 21 deletions(-) delete mode 100644 gnu/packages/patches/mesa-skip-disk-cache-test.patch create mode 100644 gnu/packages/patches/mesa-skip-tests.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 479277aafa..ba95aeca64 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1348,7 +1348,7 @@ dist_patch_DATA = \ %D%/packages/patches/libmemcached-build-with-gcc7.patch \ %D%/packages/patches/libmhash-hmac-fix-uaf.patch \ %D%/packages/patches/mediastreamer2-srtp2.patch \ - %D%/packages/patches/mesa-skip-disk-cache-test.patch \ + %D%/packages/patches/mesa-skip-tests.patch \ %D%/packages/patches/mescc-tools-boot.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ %D%/packages/patches/metabat-fix-compilation.patch \ diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index dc64ccf85e..2612347913 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -249,7 +249,7 @@ also known as DXTn or DXTC) for Mesa.") (base32 "14m09bk7akj0k02lg8fhvvzbdsashlbdsgl2cw7wbqfj2mhdqwh5")) (patches - (search-patches "mesa-skip-disk-cache-test.patch")))) + (search-patches "mesa-skip-tests.patch")))) (build-system meson-build-system) (propagated-inputs `(;; The following are in the Requires.private field of gl.pc. diff --git a/gnu/packages/patches/mesa-skip-disk-cache-test.patch b/gnu/packages/patches/mesa-skip-disk-cache-test.patch deleted file mode 100644 index 190f6b6ee1..0000000000 --- a/gnu/packages/patches/mesa-skip-disk-cache-test.patch +++ /dev/null @@ -1,19 +0,0 @@ -disk_cache_create() here looks up the users home directory from -which resolves to "/" in the build environment. I could not find an easy -way to set the home directory to something else, so we disable this test -for now. - ---- a/src/compiler/glsl/tests/cache_test.c -+++ b/src/compiler/glsl/tests/cache_test.c -@@ -170,11 +170,6 @@ - unsetenv("MESA_GLSL_CACHE_DIR"); - unsetenv("XDG_CACHE_HOME"); - -- cache = disk_cache_create("test", "make_check", 0); -- expect_non_null(cache, "disk_cache_create with no environment variables"); -- -- disk_cache_destroy(cache); -- - /* Test with XDG_CACHE_HOME set */ - setenv("XDG_CACHE_HOME", CACHE_TEST_TMP "/xdg-cache-home", 1); - cache = disk_cache_create("test", "make_check", 0); diff --git a/gnu/packages/patches/mesa-skip-tests.patch b/gnu/packages/patches/mesa-skip-tests.patch new file mode 100644 index 0000000000..2622d5d312 --- /dev/null +++ b/gnu/packages/patches/mesa-skip-tests.patch @@ -0,0 +1,49 @@ +disk_cache_create() here looks up the users home directory from +which resolves to "/" in the build environment. I could not find an easy +way to set the home directory to something else, so we disable this test +for now. + +--- a/src/compiler/glsl/tests/cache_test.c ++++ b/src/compiler/glsl/tests/cache_test.c +@@ -170,11 +170,6 @@ + unsetenv("MESA_GLSL_CACHE_DIR"); + unsetenv("XDG_CACHE_HOME"); + +- cache = disk_cache_create("test", "make_check", 0); +- expect_non_null(cache, "disk_cache_create with no environment variables"); +- +- disk_cache_destroy(cache); +- + /* Test with XDG_CACHE_HOME set */ + setenv("XDG_CACHE_HOME", CACHE_TEST_TMP "/xdg-cache-home", 1); + cache = disk_cache_create("test", "make_check", 0); + +This test fails on i686-linux. I couldn't come up with a regex that +could be used to disable it just on i686-linux, so we disable it +completely with this patch: + +https://gitlab.freedesktop.org/mesa/mesa/-/issues/4091 + +diff --git a/src/util/meson.build b/src/util/meson.build +index 0893f64..909b3e0 100644 +--- a/src/util/meson.build ++++ b/src/util/meson.build +@@ -289,18 +289,6 @@ if with_tests + suite : ['util'], + ) + +- test( +- 'u_debug_stack', +- executable( +- 'u_debug_stack_test', +- files('u_debug_stack_test.cpp'), +- include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], +- dependencies : [idep_mesautil, idep_gtest], +- c_args : [c_msvc_compat_args], +- ), +- suite : ['util'], +- ) +- + process_test_exe = executable( + 'process_test', + files('process_test.c'), -- cgit v1.2.3 From c0afd8044f40059fb1325e7fe8315699197aee5f Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 14 Jan 2021 20:57:44 +0100 Subject: gnu: Add r-snapatac. * gnu/packages/bioinformatics.scm (r-snapatac): New variable. --- gnu/packages/bioinformatics.scm | 51 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2aa6de7b15..9d9cd05969 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018 Gábor Boskovits -;;; Copyright © 2018, 2019, 2020 Mădălin Ionel Patrașcu +;;; Copyright © 2018, 2019, 2020, 2021 Mădălin Ionel Patrașcu ;;; Copyright © 2019, 2020 Maxim Cournoyer ;;; Copyright © 2019 Brian Leung ;;; Copyright © 2019 Brett Gilio @@ -7073,6 +7073,55 @@ sequence.") (supported-systems '("i686-linux" "x86_64-linux")) (license license:bsd-3))) +(define-public r-snapatac + (package + (name "r-snapatac") + (version "2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/r3fang/SnapATAC") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "037jzlbl436fi7lkpq7d83i2vd1crnrik3vac2x6xj75dbikb2av")))) + (properties `((upstream-name . "SnapATAC"))) + (build-system r-build-system) + (propagated-inputs + `(("r-bigmemory" ,r-bigmemory) + ("r-doparallel" ,r-doparallel) + ("r-dosnow" ,r-dosnow) + ("r-edger" ,r-edger) + ("r-foreach" ,r-foreach) + ("r-genomicranges" ,r-genomicranges) + ("r-igraph" ,r-igraph) + ("r-iranges" ,r-iranges) + ("r-irlba" ,r-irlba) + ("r-matrix" ,r-matrix) + ("r-plyr" ,r-plyr) + ("r-plot3d" ,r-plot3d) + ("r-rann" ,r-rann) + ("r-raster" ,r-raster) + ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-rhdf5" ,r-rhdf5) + ("r-rtsne" ,r-rtsne) + ("r-scales" ,r-scales) + ("r-viridis" ,r-viridis))) + (home-page "https://github.com/r3fang/SnapATAC") + (synopsis "Single nucleus analysis package for ATAC-Seq") + (description + "This package provides a fast and accurate analysis toolkit for single +cell ATAC-seq (Assay for transposase-accessible chromatin using sequencing). +Single cell ATAC-seq can resolve the heterogeneity of a complex tissue and +reveal cell-type specific regulatory landscapes. However, the exceeding data +sparsity has posed unique challenges for the data analysis. This package +@code{r-snapatac} is an end-to-end bioinformatics pipeline for analyzing large- +scale single cell ATAC-seq data which includes quality control, normalization, +clustering analysis, differential analysis, motif inference and exploration of +single cell ATAC-seq sequencing data.") + (license license:gpl3))) + (define-public r-scde (package (name "r-scde") -- cgit v1.2.3 From 559feb66618bbeca96ea5431522196d10951b378 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 17 Jan 2021 15:52:08 +0100 Subject: gnu: Add guile-libyaml. * gnu/packages/guile-xyz.scm (guile-libyaml): New variable. --- gnu/packages/guile-xyz.scm | 70 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 9775cc33f0..c2d853f006 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -82,6 +82,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages man) #:use-module (gnu packages maths) + #:use-module (gnu packages mes) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) @@ -101,6 +102,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) + #:use-module (gnu packages web) #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) @@ -4430,6 +4432,74 @@ including parsing and code generation.") "Guile Shapefile is a Guile library for reading shapefiles.") (license license:expat))) +(define-public guile-libyaml + (let ((commit "f5d33a6880e96571d3cb079ed7755ffc156cac46") + (revision "1")) + (package + (name "guile-libyaml") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mwette/guile-libyaml") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12x91983fh1j39zy7kbk19acc1rqdh8515ddx1mh7l26j04k9wgq")))) + (build-system gnu-build-system) + (arguments + `(#:modules (((guix build guile-build-system) + #:prefix guile:) + ,@%gnu-build-system-modules) + #:imported-modules ((guix build guile-build-system) + ,@%gnu-build-system-modules) + #:tests? #false ; there are none + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'remove-unused-files + (lambda* (#:key inputs #:allow-other-keys) + (for-each delete-file + '("guix.scm" "demo1.yml" "demo1.scm" + "yaml/libyaml.scm" + ;; This file is mismatched with the generated FFI code. + "yaml/ffi-help-rt.scm")) + (copy-file (string-append (assoc-ref inputs "nyacc") + "/share/guile/site/3.0/system/ffi-help-rt.scm") + "yaml/ffi-help-rt.scm") + (substitute* "yaml/ffi-help-rt.scm" + (("system ffi-help-rt") "yaml ffi-help-rt")) + #true)) + (add-before 'build 'build-ffi + (lambda* (#:key inputs #:allow-other-keys) + (invoke "guild" "compile-ffi" + "--no-exec" ; allow us to patch the generated file + "yaml/libyaml.ffi") + (substitute* "yaml/libyaml.scm" + (("system ffi-help-rt") "yaml ffi-help-rt") + (("dynamic-link \"libyaml\"") + (format #false "dynamic-link \"~a/lib/libyaml\"" + (assoc-ref inputs "libyaml")))) + #true)) + (replace 'build + (assoc-ref guile:%standard-phases 'build)) + (delete 'install)))) + (inputs + `(("guile" ,guile-3.0) + ("libyaml" ,libyaml))) + (propagated-inputs + `(("guile-bytestructures" ,guile-bytestructures))) + (native-inputs + `(("nyacc" ,nyacc))) + (home-page "https://github.com/mwette/guile-libyaml") + (synopsis "Guile wrapper for libyaml") + (description + "This package provides a simple yaml module for Guile using the +ffi-helper from nyacc.") + (license license:lgpl3+)))) + (define-public schmutz (let ((commit "add24588c59552537b8f1316df99a0cdd62c221e") (revision "1")) -- cgit v1.2.3 From eb9d36670277f2206f87f50fa5186c482aa7fa12 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 18 Jan 2021 17:52:13 -0500 Subject: gnu: libmad: Add comment justifying the 'install-pkg-config phase. * gnu/packages/mp3.scm (libmad)[arguments]: Add a comment about Audacity requiring a pkg-config file for libmad. --- gnu/packages/mp3.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index c32b3cba11..916aa3e3b3 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -82,6 +82,10 @@ ;; remove option that is not supported by gcc any more (substitute* "configure" ((" -fforce-mem") "")) #t)) + ;; Normally one should not add a pkg-config file if one is not provided + ;; by upstream developers, but Audacity expects a pkg-config file for + ;; this package, and other major GNU/Linux distributions already provide + ;; such a file. (add-after 'install 'install-pkg-config (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From ac3c4e32474f226b7500d33605f43204a4c95466 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 18 Jan 2021 18:53:48 -0500 Subject: gnu: libid3tag: Add comment justifying the 'install-pkg-config phase. * gnu/packages/mp3.scm (libid3tag)[arguments]: Add a comment about Audacity requiring a pkg-config file for libid3tag. --- gnu/packages/mp3.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 916aa3e3b3..34390d3696 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -131,6 +131,10 @@ This package contains the library.") (arguments `(#:phases (modify-phases %standard-phases + ;; Normally one should not add a pkg-config file if one is not provided + ;; by upstream developers, but Audacity expects a pkg-config file for + ;; this package, and other major GNU/Linux distributions already provide + ;; such a file. (add-after 'install 'install-pkg-config (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From d34573f3dfd48bf8f5c5ac11904e33cc9517d4af Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 18 Jan 2021 16:45:29 +0100 Subject: gnu: xpra: Update to 4.0.6. * gnu/packages/xorg.scm (xpra): Update to 4.0.6. Signed-off-by: Efraim Flashner --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 8f84b894f6..ef80b10e3a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Leo Prikler ;;; Copyright © 2020 Florian Pelz -;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Jean-Baptiste Note ;;; @@ -6279,14 +6279,14 @@ basic eye-candy effects.") (define-public xpra (package (name "xpra") - (version "4.0.5") + (version "4.0.6") (source (origin (method url-fetch) (uri (string-append "https://www.xpra.org/src/xpra-" version ".tar.xz")) (sha256 - (base32 "11ml66z8vbc0fa567kkmp2j20l5l60aflnkrz5ay8arw3w92nmnz")) + (base32 "1s49y2s75a8a70vj0micnmpic5zv1n32yjxy8fkxsqa6j5njyrww")) (patches (search-patches "xpra-4.0.1-systemd-run.patch")))) (build-system python-build-system) ;; see also http://xpra.org/trac/wiki/Dependencies -- cgit v1.2.3 From 63806fedf27024644c33e8c34fb594c5474bf3a1 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 18 Jan 2021 16:53:26 +0100 Subject: gnu: xpra: Add more encoding options. * gnu/packages/xorg.scm (xpra)[inputs]: Add libx264, x265, libvpx. Signed-off-by: Efraim Flashner --- gnu/packages/xorg.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ef80b10e3a..900f6c925d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6313,6 +6313,9 @@ basic eye-candy effects.") ("xf86-input-keyboard" ,xf86-input-keyboard) ("python-pillow" ,python-pillow) ;; Optional dependencies. + ("libx264" ,libx264) + ("x265" ,x265) + ("libvpx" ,libvpx) ("python-rencode" ,python-rencode) ; For speed. ("python-numpy" ,python-numpy) ("python-pyopengl" ,python-pyopengl) ; Drawing acceleration. -- cgit v1.2.3 From 797585746b1e74aa47f06f0e757cbb6c0a262088 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Jan 2021 10:33:19 +0200 Subject: gnu: freebayes: Extend test timeout on slower architectures. * gnu/packages/bioinformatics.scm (freebayes)[arguments]: Use custom 'check phase on aarch64-linux and armhf-linux to extend the test timeout. --- gnu/packages/bioinformatics.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9d9cd05969..908ae8a194 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -143,6 +143,7 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module (ice-9 match)) (define-public aragorn @@ -15168,7 +15169,16 @@ manipulations on VCF files.") (unpack "vcflib-src" "vcflib") (unpack "intervaltree-src" "vcflib/intervaltree") (unpack "test-simple-bash-src" "test/test-simple-bash")) - #t)))))) + #t))) + ;; The slow tests take longer than the specified timeout. + ,@(if (any (cute string=? <> (%current-system)) + '("armhf-linux" "aarch64-linux")) + '((replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "meson" "test" "--timeout-multiplier" "5")) + #t))) + '())))) (home-page "https://github.com/ekg/freebayes") (synopsis "Haplotype-based variant detector") (description "FreeBayes is a Bayesian genetic variant detector designed to -- cgit v1.2.3 From d6a8148c8d61d7dfcfa14ee45b78e95aad51e2bf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Jan 2021 10:43:06 +0200 Subject: gnu: vcflib: Build a shared library. * gnu/packages/bioinformatics.scm (vcflib)[arguments]: Add phase to build a shared library instead of a static one. --- gnu/packages/bioinformatics.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 908ae8a194..1164873ecc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -15061,6 +15061,13 @@ library automatically handles index file generation and use.") `(#:tests? #f ; no tests #:phases (modify-phases %standard-phases + (add-after 'unpack 'build-shared-library + (lambda _ + (substitute* "CMakeLists.txt" + (("vcflib STATIC") "vcflib SHARED")) + (substitute* "test/Makefile" + (("libvcflib.a") "libvcflib.so")) + #t)) (add-after 'unpack 'unpack-submodule-sources (lambda* (#:key inputs #:allow-other-keys) (let ((unpack (lambda (source target) -- cgit v1.2.3 From 1bbfe1789d07f8ae727a08b8386369ee736582cc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Jan 2021 11:36:01 +0200 Subject: gnu: vcflib: Add pkg-config file. * gnu/packages/bioinformatics.scm (vcflib)[arguments]: Add phase to create pkg-config file. --- gnu/packages/bioinformatics.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1164873ecc..95352f948b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -15083,7 +15083,28 @@ library automatically handles index file generation and use.") (unpack "fsom-src" "fsom") (unpack "intervaltree-src" "intervaltree") (unpack "multichoose-src" "multichoose")) - #t)))))) + #t))) + ;; This pkg-config file is provided by other distributions. + (add-after 'install 'install-pkg-config-file + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pkgconfig (string-append out "/lib/pkgconfig"))) + (mkdir-p pkgconfig) + (with-output-to-file (string-append pkgconfig "/libvcflib.pc") + (lambda _ + (format #t "prefix=~a~@ + exec_prefix=${prefix}~@ + libdir=${exec_prefix}/lib~@ + includedir=${prefix}/include~@ + ~@ + Name: libvcflib~@ + Version: ~a~@ + Requires: smithwaterman, fastahack~@ + Description: C++ library for parsing and manipulating VCF files~@ + Libs: -L${libdir} -llibvcflib~@ + Cflags: -I${includedir}~%" + out ,version))) + #t)))))) (home-page "https://github.com/vcflib/vcflib/") (synopsis "Library for parsing and manipulating VCF files") (description "Vcflib provides methods to manipulate and interpret -- cgit v1.2.3 From 99043adf46d3e27fb10939c1365552844596345d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Jan 2021 11:38:06 +0200 Subject: gnu: freebayes: Don't include vcflib sources. * gnu/packages/bioinformatics.scm (freebayes)[native-inputs]: Remove vcflib-source, intervaltree-source. Move vcflib ... [inputs]: ... to here. [arguments]: Adjust 'patch-source and 'unpack-submodule-sources for changes in vendored code. * gnu/packages/patches/freebayes-devendor-deps.patch: Update patch. --- gnu/packages/bioinformatics.scm | 30 ++++-------- gnu/packages/patches/freebayes-devendor-deps.patch | 57 +++++++++++++++------- 2 files changed, 49 insertions(+), 38 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 95352f948b..70166501d7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -15138,6 +15138,7 @@ manipulations on VCF files.") ("htslib" ,htslib) ("smithwaterman" ,smithwaterman) ("tabixpp" ,tabixpp) + ("vcflib" ,vcflib) ("zlib" ,zlib))) (native-inputs `(("bash-tap" ,bash-tap) @@ -15148,11 +15149,6 @@ manipulations on VCF files.") ("pkg-config" ,pkg-config) ("samtools" ,samtools) ("simde" ,simde) - ;; We need some binaries from vcflib, but we also need to link against a - ;; subset of the library. Vendor the parts we need until we have a shared library. - ("vcflib" ,vcflib) - ("vcflib-src" ,(package-source vcflib)) - ("intervaltree-src" ,(package-source intervaltree)) ;; This submodule is needed to run the tests. ("test-simple-bash-src" ,(origin @@ -15179,25 +15175,17 @@ manipulations on VCF files.") (substitute* "meson.build" ;; Some inputs aren't actually needed. ((".*bamtools/src.*") "") - ((".*multichoose.*") "") - (("'vcflib/filevercmp'") "")) + ((".*multichoose.*") "")) + (substitute* '("src/BedReader.cpp" + "src/BedReader.h") + (("../intervaltree/IntervalTree.h") "IntervalTree.h")) #t))) (add-after 'unpack 'unpack-submodule-sources (lambda* (#:key inputs #:allow-other-keys) - (let ((unpack (lambda (source target) - (unless (directory-exists? target) - (mkdir-p target)) - (with-directory-excursion target - (if (file-is-directory? (assoc-ref inputs source)) - (copy-recursively (assoc-ref inputs source) ".") - (invoke "tar" "xvf" - (assoc-ref inputs source) - "--strip-components=1")))))) - (and - (unpack "vcflib-src" "vcflib") - (unpack "intervaltree-src" "vcflib/intervaltree") - (unpack "test-simple-bash-src" "test/test-simple-bash")) - #t))) + (mkdir-p "test/test-simple-bash") + (copy-recursively (assoc-ref inputs "test-simple-bash-src") + "test/test-simple-bash") + #t)) ;; The slow tests take longer than the specified timeout. ,@(if (any (cute string=? <> (%current-system)) '("armhf-linux" "aarch64-linux")) diff --git a/gnu/packages/patches/freebayes-devendor-deps.patch b/gnu/packages/patches/freebayes-devendor-deps.patch index 580f53a3b1..7e84666b85 100644 --- a/gnu/packages/patches/freebayes-devendor-deps.patch +++ b/gnu/packages/patches/freebayes-devendor-deps.patch @@ -1,19 +1,19 @@ This patch is original to Guix, ongoing work to upstream bits as possible. -From 50833daba0b1dbe2ed364b1e980b67a09a312789 Mon Sep 17 00:00:00 2001 +From 9acc56db5e7469f5976be38b52ba4993de98ee38 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 17 Jan 2021 13:27:17 +0200 Subject: [PATCH] devendor-dependants --- - meson.build | 60 +++++++++++++++++++++++++++++++++++++++++------------ - 1 file changed, 47 insertions(+), 13 deletions(-) + meson.build | 84 +++++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 66 insertions(+), 18 deletions(-) diff --git a/meson.build b/meson.build -index f6bf242..7a3805e 100644 +index f6bf242..bded4af 100644 --- a/meson.build +++ b/meson.build -@@ -9,8 +9,12 @@ project('freebayes', ['cpp', 'c'], +@@ -9,8 +9,13 @@ project('freebayes', ['cpp', 'c'], zlib_dep = dependency('zlib') lzma_dep = dependency('liblzma') @@ -23,10 +23,11 @@ index f6bf242..7a3805e 100644 +tabixpp_dep = dependency('tabixpp', required : false) +fastahack_dep = dependency('fastahack', required : false) +smithwaterman_dep = dependency('smithwaterman', required : false) ++vcflib_dep = dependency('libvcflib', required: false) thread_dep = dependency('threads') if htslib_dep.found() -@@ -59,6 +63,41 @@ else +@@ -59,6 +64,56 @@ else ] endif @@ -42,11 +43,26 @@ index f6bf242..7a3805e 100644 + ] +endif + ++if vcflib_dep.found() ++ vcflib_includes = '' ++ vcflib_src = [] ++else ++ vcflib_includes = [ ++ 'vcflib/src', ++ 'vcflib/multichoose', ++ 'vcflib/filevercmp', ++ ] ++ vcflib_src = [ ++ 'vcflib/src/Variant.cpp', ++ ] ++endif ++ +if fastahack_dep.found() + fastahack_src = [] +else + fastahack_src = [ + 'vcflib/fastahack/Fasta.cpp', ++ 'vcflib/src/split.cpp', + ] +endif + @@ -68,17 +84,18 @@ index f6bf242..7a3805e 100644 # -@@ -105,22 +144,17 @@ seqlib_src = [ +@@ -105,23 +160,18 @@ seqlib_src = [ ] vcflib_src = [ - 'vcflib/tabixpp/tabix.cpp', - 'vcflib/src/Variant.cpp', +- 'vcflib/src/Variant.cpp', - 'vcflib/smithwaterman/SmithWatermanGotoh.cpp', - 'vcflib/smithwaterman/disorder.cpp', - 'vcflib/smithwaterman/Repeats.cpp', - 'vcflib/smithwaterman/LeftAlign.cpp', - 'vcflib/smithwaterman/IndelAllele.cpp', ++ vcflib_src, + tabixpp_src, + smithwaterman_src, ] @@ -90,37 +107,43 @@ index f6bf242..7a3805e 100644 - 'vcflib/fastahack/Fasta.cpp', - 'vcflib/smithwaterman/LeftAlign.cpp', - 'vcflib/smithwaterman/IndelAllele.cpp', +- 'vcflib/src/split.cpp', + fastahack_src, + smithwaterman_src, - 'vcflib/src/split.cpp', ++ vcflib_src, 'src/LeftAlign.cpp', ] -@@ -135,8 +169,8 @@ incdir = include_directories( + +@@ -134,11 +184,9 @@ incdir = include_directories( + 'ttmath', 'contrib', 'contrib/SeqLib', - 'vcflib/src', +- 'vcflib/src', - 'vcflib/tabixpp', - 'vcflib/smithwaterman', +- 'vcflib/multichoose', +- 'vcflib/filevercmp') + tabixpp_includes, + smithwaterman_includes, - 'vcflib/multichoose', - 'vcflib/filevercmp') ++ vcflib_includes) -@@ -152,7 +186,7 @@ executable('freebayes', + c_args = ['-fpermissive','-w'] + cpp_args = ['-fpermissive','-w','-Wc++14-compat'] +@@ -152,7 +200,7 @@ executable('freebayes', include_directories : incdir, cpp_args : cpp_args, c_args : c_args, - dependencies: [zlib_dep, lzma_dep, htslib_dep, thread_dep], -+ dependencies: [zlib_dep, lzma_dep, simde_dep, htslib_dep, tabixpp_dep, smithwaterman_dep, thread_dep], ++ dependencies: [zlib_dep, lzma_dep, simde_dep, htslib_dep, tabixpp_dep, smithwaterman_dep, vcflib_dep, thread_dep], install: true ) -@@ -165,7 +199,7 @@ executable('bamleftalign', +@@ -165,7 +213,7 @@ executable('bamleftalign', include_directories : incdir, cpp_args : cpp_args, c_args : c_args, - dependencies: [zlib_dep, lzma_dep, htslib_dep, thread_dep], -+ dependencies: [zlib_dep, lzma_dep, simde_dep, htslib_dep, tabixpp_dep, fastahack_dep, smithwaterman_dep, thread_dep], ++ dependencies: [zlib_dep, lzma_dep, simde_dep, htslib_dep, tabixpp_dep, fastahack_dep, smithwaterman_dep, vcflib_dep, thread_dep], install: true ) -- cgit v1.2.3 From 1d92fb08cf30d541f4da1c93143403779a775ac1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Jan 2021 11:46:41 +0200 Subject: gnu: terminator: Adjust description. * gnu/packages/gnome.scm (terminator)[description): Remove stray '+'. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d31a4a02e7..e614d26b68 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10792,7 +10792,7 @@ advanced image management tool") (synopsis "Store and run multiple GNOME terminals in one window") (description "Terminator allows you to run multiple GNOME terminals in a grid and -+tabs, and it supports drag and drop re-ordering of terminals.") +tabs, and it supports drag and drop re-ordering of terminals.") (license license:gpl2))) (define-public libhandy -- cgit v1.2.3 From b3e39a475fd332a4b042c92003c368787f8dbcaf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Jan 2021 11:48:38 +0200 Subject: gnu: freebayes: Update source, home-page URIs. * gnu/packages/bioinformatics.scm (freebayes)[source]: Update to new upstream URI. [home-page]: Same. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 70166501d7..8514306f94 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -15121,7 +15121,7 @@ manipulations on VCF files.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ekg/freebayes") + (url "https://github.com/freebayes/freebayes") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -15195,7 +15195,7 @@ manipulations on VCF files.") (invoke "meson" "test" "--timeout-multiplier" "5")) #t))) '())))) - (home-page "https://github.com/ekg/freebayes") + (home-page "https://github.com/freebayes/freebayes") (synopsis "Haplotype-based variant detector") (description "FreeBayes is a Bayesian genetic variant detector designed to find small polymorphisms, specifically SNPs (single-nucleotide polymorphisms), -- cgit v1.2.3 From 868c4dec0f8b4fd6099bcc95b7af1225c0de58aa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Jan 2021 18:11:25 +0200 Subject: gnu: terminology: Update to 1.9.0. * gnu/packages/enlightenment.scm (terminology): Update to 1.9.0. [arguments]: Add configure-flag to find more binaries. --- gnu/packages/enlightenment.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 99309dd4a0..d2769a4d76 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -198,7 +198,7 @@ removable devices or support for multimedia.") (define-public terminology (package (name "terminology") - (version "1.8.1") + (version "1.9.0") (source (origin (method url-fetch) (uri @@ -206,7 +206,7 @@ removable devices or support for multimedia.") "terminology/terminology-" version ".tar.xz")) (sha256 (base32 - "1fxqjf7g30ix4qxi6366rrax27s3maxq43z2vakwnhz4mp49m9h4")) + "0v74858yvrrfy0l2pq7yn6izvqhpkb9gw2jpd3a3khjwv8kw6frz")) (modules '((guix build utils))) ;; Remove the bundled fonts. (snippet @@ -217,10 +217,11 @@ removable devices or support for multimedia.") #t)))) (build-system meson-build-system) (arguments - `(#:configure-flags (list "-Dtests=true" - (string-append "-Dedje-cc=" - (assoc-ref %build-inputs "efl") - "/bin/edje_cc")) + `(#:configure-flags + (let ((efl (assoc-ref %build-inputs "efl"))) + (list "-Dtests=true" + (string-append "-Dedje-cc=" efl "/bin/edje_cc") + (string-append "-Deet=" efl "/bin/eet"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'set-home-directory -- cgit v1.2.3 From 94b7687e3e09174067112981e8cb438da4a90119 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Tue, 19 Jan 2021 04:57:05 +0000 Subject: gnu: esbuild: Update to 0.8.32. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web.scm (esbuild): Update to 0.8.32. Signed-off-by: Ludovic Courtès --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 492308fc18..16c99af9d3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -45,7 +45,7 @@ ;;; Copyright © 2018, 2019, 2020 Björn Höfling ;;; Copyright © 2020, 2021 Paul Garlick ;;; Copyright © 2020 Michael Rohleder -;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2020, 2021 Ryan Prior ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; ;;; This file is part of GNU Guix. @@ -1487,7 +1487,7 @@ used to validate and fix HTML data.") (define-public esbuild (package (name "esbuild") - (version "0.8.31") + (version "0.8.32") (source (origin (method git-fetch) @@ -1496,7 +1496,7 @@ used to validate and fix HTML data.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "08ixas858jlnlrgrcpjiccwb3xdaxd7dd42i7676ymi3a2421f5w")) + (base32 "17aa269dq0gsm4nlhh1q2mj6k8mw6v8ig3nygwk3s07l2xl5gqvn")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From dc5d514362f41de3110114655a4baf4ad00c43b5 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 18 Jan 2021 18:57:11 +0100 Subject: gnu: motion: Update to 4.3.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (motion): Update to 4.3.2. [arguments]: In 'bootstrap' phase, adjust 'version.sh' file name. Signed-off-by: Ludovic Courtès --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 37eb07855a..7047616306 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4161,7 +4161,7 @@ It counts more than 100 plugins.") (define-public motion (package (name "motion") - (version "4.2.2") + (version "4.3.2") (home-page "https://motion-project.github.io/") (source (origin (method git-fetch) @@ -4170,7 +4170,7 @@ It counts more than 100 plugins.") (commit (string-append "release-" version)))) (sha256 (base32 - "05c1gx75xy2hw49x6vkydvwxbr80kipsc3nr906k3hq8735svx6f")) + "09xs815jsivcilpmnrx2jkcxirj4lg5kp99fkr0p2sdxw03myi95")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs @@ -4187,7 +4187,7 @@ It counts more than 100 plugins.") '(#:phases (modify-phases %standard-phases (replace 'bootstrap (lambda _ - (patch-shebang "version.sh") + (patch-shebang "scripts/version.sh") (invoke "autoreconf" "-vfi")))) #:configure-flags '("--sysconfdir=/etc") #:make-flags (list (string-append "sysconfdir=" -- cgit v1.2.3 From 01b92ba705c4274f587443c21a2837ab7aecce33 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 18 Jan 2021 17:25:38 +0100 Subject: gnu: xfce4-appfinder: Update to 4.16.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-appfinder): Update to 4.16.1. [source]: Fix uri and use https. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 6479620a26..c3fb4db732 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -652,15 +652,16 @@ per window.") (define-public xfce4-appfinder (package (name "xfce4-appfinder") - (version "4.16.0") + (version "4.16.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/xfce/" + (uri (string-append "https://archive.xfce.org/src/xfce/" + name "/" (version-major+minor version) - "/src/" name "-" version ".tar.bz2")) + "/" name "-" version ".tar.bz2")) (sha256 (base32 - "0m09vwgs5i1dy484r2y4w14kp38n469zhg0n4gnj10pcxsm2mf9p")))) + "1v77h5634n49idci2jiw0k7jjk0vzpsvgyx2fkp18l39jayykqxz")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 30c164e3fda4b7585acc1beacc653645a8186552 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 17 Jan 2021 10:16:39 +0100 Subject: gnu: rpcbind: Update to 1.2.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/onc-rpc.scm (rpcbind): Update to 1.2.5. Signed-off-by: Ludovic Courtès --- gnu/packages/onc-rpc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index e4b03b7858..14ff13c038 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -92,7 +92,7 @@ IPv4 and IPv6. ONC RPC is notably used by the network file system (NFS).") (define-public rpcbind (package (name "rpcbind") - (version "0.2.4") + (version "1.2.5") (source (origin (method url-fetch) @@ -102,7 +102,7 @@ IPv4 and IPv6. ONC RPC is notably used by the network file system (NFS).") (patches (search-patches "rpcbind-CVE-2017-8779.patch")) (sha256 (base32 - "0rjc867mdacag4yqvs827wqhkh27135rp9asj06ixhf71m9rljh7")))) + "0ynszy5hpc7wbz8xngqwyhgbi9cay73y43izqhcmrcv375l61qrc")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From d485ef5ce9639c7e4d296a476b246e8b85e8f639 Mon Sep 17 00:00:00 2001 From: Oskar Köök Date: Wed, 6 Jan 2021 02:14:52 +0100 Subject: gnu: elixir: Update to 1.11.3. * gnu/packages/elixir.scm (elixir): Update to 1.11.3. Signed-off-by: Efraim Flashner --- gnu/packages/elixir.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index 8a2b6b302c..389b2bb29c 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 nee ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Nikita +;;; Copyright © 2021 Oskar Köök ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,7 +34,7 @@ (define-public elixir (package (name "elixir") - (version "1.10.4") + (version "1.11.3") (source (origin (method git-fetch) @@ -42,7 +43,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "16j4rmm3ix088fvxhvyjqf1hnfg7wiwa87gml3b2mrwirdycbinv")) + (base32 "0ivah4117z75pinvb3gr22d05ihfwcdgw5zvvpv7kbgiqaj8ma8f")) (patches (search-patches "elixir-path-length.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From aa8df16bc5ca99615188b4f1e94a0e13c1e51d3a Mon Sep 17 00:00:00 2001 From: Oskar Köök Date: Wed, 6 Jan 2021 13:42:54 +0100 Subject: gnu: erlang: Update to 23.2.1. * gnu/packages/erlang.scm (erlang): Update to 23.2.1. [arguments]: Add phase to patch configure script. Signed-off-by: Efraim Flashner --- gnu/packages/erlang.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 93569f3560..7b5dc70b5d 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016, 2017 Pjotr Prins ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Nikita +;;; Copyright © 2021 Oskar Köök ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,7 +41,7 @@ (define-public erlang (package (name "erlang") - (version "21.3.8.13") + (version "23.2.1") (source (origin (method git-fetch) ;; The tarball from http://erlang.org/download contains many @@ -52,7 +53,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1dj37vk712dx76y25g13na24wbpn7a5ddmlpf4n51gm10sib54wj")) + "1p3lw4bcm2dph3pf1h4i0d9pzrcfr83r0iadqanxkwbmm1bl11pm")) (patches (search-patches "erlang-man-path.patch")))) (build-system gnu-build-system) (native-inputs @@ -68,7 +69,7 @@ (version-major+minor version) ".tar.gz")) (sha256 (base32 - "0wm1dg1psv1n3gpiwyms06yhsryrnr28p455fp0l1ak8hdf4nipm")))))) + "0rq0rw68f02vckgdiwmvx8bvyv00l81s27cq59i3h79j9prfal2n")))))) (inputs `(("ncurses" ,ncurses) ("openssl" ,openssl) @@ -180,6 +181,14 @@ (lambda _ (invoke "./otp_build" "autoconf") #t)) + (add-after 'autoconf 'patch-configure-script-shell + (lambda _ + (substitute* "configure" + (("cmd_str=\"./configure") + (string-append "cmd_str=\"" + (which "sh") + " ./configure"))) + #t)) (add-after 'install 'patch-erl ;; This only works after install. (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From ba3e25bbf217637d2054bb0c8b906f3eed230613 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Jan 2021 22:21:52 +0200 Subject: gnu: kwayland: Enable test suite. * gnu/packages/kde-frameworks.scm (kwayland)[arguments]: Don't skip tests. Adjust 'check-setup phase to render QT windows offscreen. --- gnu/packages/kde-frameworks.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 9ecbf75d34..8c2028b978 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2016, 2019 Efraim Flashner +;;; Copyright © 2016, 2019, 2021 Efraim Flashner ;;; Copyright © 2016-2019 Hartmut Goebel ;;; Copyright © 2016 David Craven ;;; Copyright © 2017 Thomas Danckaert @@ -1047,13 +1047,12 @@ integration with a custom editor as well as a ready-to-use ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (arguments - `(#:tests? #f ; FIXME tests require weston to run - ; weston requires wayland flags in mesa - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'check 'check-setup (lambda _ (setenv "XDG_RUNTIME_DIR" "/tmp") + (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt-style API to interact with the wayland client and server") -- cgit v1.2.3 From ad6c8887b4e98a282ee8180642861d0879955aa1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 19 Jan 2021 21:48:17 +0100 Subject: gnu: emacs-flycheck-grammalecte: Update to 1.3. * gnu/packages/emacs-xyz.scm (emacs-flycheck-grammalecte): Update to 1.3. [source]: Change upstream URL. [arguments]: Remove phase for symlinks since it is now possible to circumvent it with configuration. Configure accordingly. [home-page]: Update URL. --- gnu/packages/emacs-xyz.scm | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 29c09d1b9f..2ee35dbaa3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4666,18 +4666,19 @@ for Flow files.") (define-public emacs-flycheck-grammalecte (package (name "emacs-flycheck-grammalecte") - (version "1.2") + (version "1.3") (source (origin - (method url-fetch) - (uri (string-append "https://git.deparis.io/" - "flycheck-grammalecte/snapshot/" - "flycheck-grammalecte-" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://git.umaneti.net/flycheck-grammalecte/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1mzmzyik843r4j0ibpwqrxmb0g4xmirrf3lxr010bddkmmxf749a")))) + (base32 "1f1gapvs9j89qr474103dqgsiyb96phlnsmq5hiv4ba242blg9lb")))) (build-system emacs-build-system) (arguments - `(#:include '("\\.(el|py)$") + `(#:include (cons "\\.py$" %default-include) #:exclude '("^test-profile.el$") #:emacs ,emacs ;need libxml support #:phases @@ -4692,28 +4693,22 @@ for Flow files.") (substitute* '("conjugueur.py" "flycheck-grammalecte.py") (("/usr/bin/env python3?") python3)) #t))) - (add-before 'build 'link-to-grammalecte - ;; XXX: The Python part of the package requires grammalecte, but - ;; the library is not specified in PYTHONPATH, since we're not - ;; using Python build system. As a workaround, we symlink - ;; grammalecte libraries here. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (grammalecte (assoc-ref inputs "grammalecte")) - (version ,(version-major+minor (package-version python)))) - (with-directory-excursion - (string-append out "/share/emacs/site-lisp") - (symlink (string-append grammalecte "/lib/" - "python" version "/site-packages/" - "grammalecte") - "grammalecte")) - #t)))))) + (add-after 'unpack 'specify-grammalecte-location + (lambda* (#:key inputs #:allow-other-keys) + (make-file-writable "flycheck-grammalecte.el") + (emacs-substitute-variables "flycheck-grammalecte.el" + ("flycheck-grammalecte--grammalecte-directory" + (string-append (assoc-ref inputs "grammalecte") + "/lib/python" + ,(version-major+minor (package-version python)) + "/site-packages/grammalecte"))) + #t))))) (inputs `(("grammalecte" ,grammalecte) ("python" ,python))) (propagated-inputs `(("emacs-flycheck" ,emacs-flycheck))) - (home-page "https://git.deparis.io/flycheck-grammalecte/") + (home-page "https://git.umaneti.net/flycheck-grammalecte/") (synopsis "Integrate Grammalecte with Flycheck") (description "Integrate the French grammar and typography checker Grammalecte with -- cgit v1.2.3 From 6340fe6f0c06386f0c9db7dee36d1d737db0e568 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 19 Jan 2021 23:12:51 +0100 Subject: gnu: musescore: Update to 3.6. * gnu/packages/music.scm (musescore): Update to 3.6. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index be05169574..5902cf56ba 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4434,7 +4434,7 @@ standalone JACK client and an LV2 plugin is also available.") (define-public musescore (package (name "musescore") - (version "3.5.2") + (version "3.6") (source (origin (method git-fetch) @@ -4443,7 +4443,7 @@ standalone JACK client and an LV2 plugin is also available.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0yzps5xxa50cr2i5iv2ycjdywd0mcrdd6hx93l4p8lfljag3w3al")) + (base32 "0c9yf8irkism3ffzzpkx636wa6b1r1lgpsb2x63pr0gbi5ss5kyh")) (modules '((guix build utils))) (snippet ;; Remove unused libraries. -- cgit v1.2.3 From 13f5f3a2516b211766b33b97875c018a6e1e2388 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 19 Jan 2021 17:10:07 -0600 Subject: gnu: libabigail: Update to 1.8. * gnu/packages/elf.scm (libabigail): Update to 1.8. --- gnu/packages/elf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 48558d5f14..544598684e 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -113,14 +113,14 @@ object or archive file), @command{eu-strip} (for discarding symbols), (package (name "libabigail") (home-page "https://sourceware.org/libabigail/") - (version "1.7") + (version "1.8") (source (origin (method url-fetch) (uri (string-append "https://sourceware.org/pub/libabigail/" "libabigail-" version ".tar.gz")) (sha256 (base32 - "0bf8w01l6wm7mm4clfg5rqi30m1ws11qqa4bp2vxghfwgi9ai8i7")))) + "0p363mkgypcklgf8iylxpbdnfgqc086a6fv7n9hzrjjci45jdgqw")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static" -- cgit v1.2.3 From def314d810a57c99b75f6e797275e3045a6563e8 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Wed, 20 Jan 2021 02:21:17 +0100 Subject: gnu: vlc: Update to 3.0.12. * gnu/packages/video.scm (vlc): Update to 3.0.12. Signed-off-by: Leo Famulari --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 7047616306..97cb7d6837 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1771,7 +1771,7 @@ videoformats depend on the configuration flags of ffmpeg.") (define-public vlc (package (name "vlc") - (version "3.0.11.1") + (version "3.0.12") (source (origin (method url-fetch) (uri (string-append @@ -1780,7 +1780,7 @@ videoformats depend on the configuration flags of ffmpeg.") "/vlc-" version ".tar.xz")) (sha256 (base32 - "1f46h0hv7fk35zg4iczlp7ib7h2jmh8m4r5klw3g2558ib9134qq")))) + "0ygqihw2c5vvzv8950dlf7rdwz1cpz1668jgyja604ljibrmix7g")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) -- cgit v1.2.3 From 1470d2dde17833dca55160a29496ac1251576f54 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 19 Jan 2021 15:39:27 -0500 Subject: gnu: linux-libre: Update to 5.10.9. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.9. (linux-libre-5.10-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 2497e0dea9..5fe6fdecef 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -353,7 +353,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.10-version "5.10.8") +(define-public linux-libre-5.10-version "5.10.9") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -361,7 +361,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1v83wm8xbhq1sgn7c84zi7l40vmd9k1gb653b686jp8n4na85z2w"))) + (hash (base32 "0la7dklpy6xd79fkzavpmlfyrc60kmmwz491msd95dmvv06kwwvz"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From 69a832a592011c354c2fd7b47b82b31d281f14e5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 19 Jan 2021 15:39:46 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.91. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.91. (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 5fe6fdecef..f61eaf3f69 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,7 +369,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.4-version "5.4.90") +(define-public linux-libre-5.4-version "5.4.91") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -377,7 +377,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "06pscvxjkpz35y6kbmyzdvn9mm4p7pfg0d49chi1q61z0sy3crv4"))) + (hash (base32 "05swzh4gb0mk6wzza0k6b0283cygkvj8a2d2b2gab6sb0fxn208f"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From eb11e1e180c198564942ff2b448a800de3116e34 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 19 Jan 2021 15:39:57 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.169. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.169. (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 f61eaf3f69..e0f056aff9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -382,7 +382,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.168") +(define-public linux-libre-4.19-version "4.19.169") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -390,7 +390,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1whkqklqj8rz9lv88aldvwkwnb9xvg0njdbcrk56r7z6f9zkhnmm"))) + (hash (base32 "156y4ly7qyy5z7sbp2vccrs7za72k3zi2hfjpskqqd6civdlvln7"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 944aebb46abfaa16321b42a095c729a0d04ae68d Mon Sep 17 00:00:00 2001 From: Anadon Date: Thu, 14 Jan 2021 08:25:01 +0100 Subject: gnu: Add magic-enum. * gnu/packages/cpp.scm (magic-enum): New variable. Signed-off-by: Leo Prikler --- gnu/packages/cpp.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 45d3faeafb..03b84efdc8 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -808,3 +808,24 @@ code will be mixed in with the actual programming logic. This implementation provides a number of utilities to make coding with expected cleaner.") (home-page "https://tl.tartanllama.xyz/") (license license:cc0))) + +(define-public magic-enum + (package + (name "magic-enum") + (version "0.7.2") + (home-page "https://github.com/Neargye/magic_enum") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (sha256 + (base32 + "07j5zdf3vkliwrcv6k663k35akn7qp23794sz2mnvkj9hbv9s8cx")))) + (build-system cmake-build-system) + (native-inputs + `(("gcc" ,gcc-9))) + (synopsis "C++17 header only library for compile time reflection of enums") + (description "Magic Enum offers static reflection of enums, with +conversions to and from strings, iteration and related functionality.") + (license license:expat))) -- cgit v1.2.3 From 86a56622a726e35e836a2f4a9405d38f74d0b06a Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 18 Jan 2021 19:03:49 +0100 Subject: gnu: radare2: Update to 5.0.0. * gnu/packages/engineering.scm (radare2): Update to 5.0.0. Signed-off-by: Efraim Flashner --- gnu/packages/engineering.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 826e2d89b6..1747671683 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2019 Steve Sprang ;;; Copyright © 2019 John Soo ;;; Copyright © 2020 Brice Waegeneire -;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020,2021 Vincent Legoll ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Ekaitz Zarraga ;;; Copyright © 2020 B. Wilson @@ -1524,7 +1524,7 @@ bindings for Python, Java, OCaml and more.") (define-public radare2 (package (name "radare2") - (version "4.4.0") + (version "5.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -1532,7 +1532,7 @@ bindings for Python, Java, OCaml and more.") (commit version))) (sha256 (base32 - "0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s")) + "0aa7c27kd0l55fy5qfvxqmakp4pz6240v3hn84095qmqkzcbs420")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 664ab4ada7703a3bccfb041c51d9460372a60243 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 18 Jan 2021 19:03:50 +0100 Subject: gnu: cutter: Update to 1.12.0. * gnu/packages/engineering.scm (cutter): Update to 1.12.0. Signed-off-by: Efraim Flashner --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 1747671683..baddaf1737 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2367,7 +2367,7 @@ simulation.") (define-public cutter (package (name "cutter") - (version "1.10.3") + (version "1.12.0") (source (origin (method git-fetch) @@ -2376,7 +2376,7 @@ simulation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qj8jyij02nif4jpirl09ygwnv8a9zi3vkb5sf5s8mg7qwlpnvyk")))) + (base32 "0ljj3j3apbbw628n2nyrxpbnclixx20bqjxm0xwggqzz9vywsar0")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 4b88e27cf3ccbdd0263e6c4294f41595c9cc41c3 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 18 Jan 2021 21:12:25 +0100 Subject: gnu: libusb: Update to 1.0.24. * gnu/packages/libusb.scm (libusb): Update to 1.0.24. Signed-off-by: Efraim Flashner --- gnu/packages/libusb.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index c403181c77..cb0d45ce86 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -53,7 +53,7 @@ (define-public libusb (package (name "libusb") - (version "1.0.23") + (version "1.0.24") (source (origin (method url-fetch) @@ -61,7 +61,7 @@ "releases/download/v" version "/libusb-" version ".tar.bz2")) (sha256 - (base32 "13dd2a9x290d1q8nb1lqiaf36grcvns5ripk5k2xm0lajmpc04fv")))) + (base32 "0amilbi5qncdnrds3ji21vbiz1wvdm1fwp5qrxnk49xkyy2jdzby")))) (build-system gnu-build-system) ;; XXX: Enabling udev is now recommended, but eudev indirectly depends on -- cgit v1.2.3 From b2477b5c4f8fc7ddd8ed6275351f0a2075e576b0 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 18 Jan 2021 21:32:40 +0100 Subject: gnu: libunwind: Update to 1.5.0. * gnu/packages/libunwind.scm (libunwind): Update to 1.5.0. Signed-off-by: Efraim Flashner --- gnu/packages/libunwind.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libunwind.scm b/gnu/packages/libunwind.scm index 588b5dd314..9eaf26fca8 100644 --- a/gnu/packages/libunwind.scm +++ b/gnu/packages/libunwind.scm @@ -28,14 +28,14 @@ (define-public libunwind (package (name "libunwind") - (version "1.3.1") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/libunwind/libunwind-" version ".tar.gz")) (sha256 (base32 - "1y0l08k6ak1mqbfj6accf9s5686kljwgsl4vcqpxzk5n74wpm6a3")))) + "05qhzcg1xag3l5m3c805np6k342gc0f3g087b7g16jidv59pccwh")))) (build-system gnu-build-system) (arguments ;; FIXME: As of glibc 2.25, we get 1 out of 34 test failures (2 are -- cgit v1.2.3 From 62f5640b1c21e7cc8981a26dd90a32093cf520f0 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 18 Jan 2021 21:47:49 +0100 Subject: gnu: libxls: Update to 1.6.2. * gnu/packages/statistics.scm (libxls): Update to 1.6.2. Signed-off-by: Efraim Flashner --- 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 c45544f52e..e3db09088d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -160,14 +160,14 @@ simulation not wholly unlike BUGS. JAGS was written with three aims in mind: (define-public libxls (package (name "libxls") - (version "1.5.3") + (version "1.6.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/libxls/libxls/releases/download/" "v" version "/libxls-" version ".tar.gz")) (sha256 - (base32 "0rl513wpq5qh7wkmdk4g9c68rzffv3mcbz48p4xyg4969zrx8lnm")))) + (base32 "0wg3ymr43aa1j3scyl9x83b2xgg7wilzpil0dj91a8dzji6w7b2x")))) (build-system gnu-build-system) (home-page "https://github.com/libxls/libxls") (synopsis "Read binary (.xls) Excel spreadsheet files") -- cgit v1.2.3 From 57b0949a49fe70cbe91ec42d2799ffa9bef1ca4b Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 18 Jan 2021 21:56:16 +0100 Subject: gnu: lzlib: Update to 1.12. * gnu/packages/compression.scm (lzlib): Update to 1.12. Signed-off-by: Efraim Flashner --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 4aa3665fe8..56350089f5 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1816,14 +1816,14 @@ Clzip is intended to be fully compatible with the regular lzip package.") (define-public lzlib (package (name "lzlib") - (version "1.11") + (version "1.12") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/lzlib/" "lzlib-" version ".tar.gz")) (sha256 - (base32 "0djdj4sg33rzi4k84cygvnp09bfsv6i8wy2k7i67rayib63myp3c")))) + (base32 "1c9pwd6by8is4z8bs6j306jyy6pgm2dvsn4fr7fg2b5m5qj88pcf")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 4498894b1b2b959e3c87d947659cbd5cc069df2e Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 15 Jan 2021 19:23:01 +0100 Subject: gnu: synapse: Update to 1.25.0. * gnu/packages/matrix.scm (synapse): Update to 1.25.0. Signed-off-by: Efraim Flashner --- gnu/packages/matrix.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 426f26d1e1..8a3a1283fa 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Alex ter Weele ;;; Copyright © 2020 Tobias Geerinckx-Rice -;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020, 2021 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,13 +61,13 @@ an LDAP server.") (define-public synapse (package (name "synapse") - (version "1.24.0") + (version "1.25.0") (source (origin (method url-fetch) (uri (pypi-uri "matrix-synapse" version)) (sha256 (base32 - "0pmn8aqc7jj2xdrwljjz2vwg58hlyxp9axac471pcmg2vqais5yb")))) + "0382qcsmgvg24p0xvb37kn3y1kd3bn363kblgwg58iy92df0pga4")))) (build-system python-build-system) ;; TODO Run tests with ‘PYTHONPATH=. trial3 tests’. (propagated-inputs -- cgit v1.2.3 From 16743da26c1c6996765e52bd0bfcfa566f4f9d01 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 15 Jan 2021 21:44:32 +0100 Subject: gnu: quaternion: Update to 0.0.9.4f. * gnu/packages/messaging.scm (quaternion): Update to 0.0.9.4f. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c585326124..348eff3772 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2020 Reza Alizadeh Majd ;;; Copyright © 2020 Jonathan Brielmaier ;;; Copyright © 2020 Mason Hock -;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020 Robert Karszniewicz ;;; @@ -2354,7 +2354,7 @@ There is support for: (define-public quaternion (package (name "quaternion") - (version "0.0.9.4e") + (version "0.0.9.4f") (outputs '("out" "debug")) (source (origin @@ -2364,7 +2364,7 @@ There is support for: (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv")))) + (base32 "1q9ddz4rs02a0w3lwrsjnh59khv38cq9f0kv09vnwvazvayn87ck")))) (build-system qt-build-system) (inputs `(("libqmatrixclient" ,libqmatrixclient) @@ -2375,7 +2375,7 @@ There is support for: ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg" ,qtsvg) ("qttools" ,qttools) - ("xdg-utils", xdg-utils))) + ("xdg-utils" ,xdg-utils))) (arguments `(#:tests? #f)) ; no tests (home-page "https://matrix.org/docs/projects/client/quaternion.html") -- cgit v1.2.3 From f93d3d42b4dbc3d2a054c0145a7b6b369ee09973 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 19 Jan 2021 15:16:53 +0100 Subject: gnu: xfce4-stopwatch-plugin: Update to 0.5.0. * gnu/packages/xfce.scm (xfce4-stopwatch-plugin): Update to 0.5.0. Signed-off-by: Efraim Flashner --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index c3fb4db732..c8dd66b2e0 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1918,7 +1918,7 @@ freedesktop.org specification.") (define-public xfce4-stopwatch-plugin (package (name "xfce4-stopwatch-plugin") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -1927,7 +1927,7 @@ freedesktop.org specification.") "/xfce4-stopwatch-plugin-" version ".tar.bz2")) (sha256 (base32 - "0jfr0ykn97hfngh0hd2wrs9rxswzxaxjv93g6csdp8hnij649nm3")))) + "1q840298jzdqlhc9lw49q32xzdhnbzcgvv69qq5slkc704s5w6vw")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 100a4f84fec03bdf31523232f9f6587bb201ea7c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 19 Jan 2021 22:23:21 +0000 Subject: gnu: Add pgloader. * gnu/packages/databases.scm (pgloader): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/databases.scm | 91 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 817ccdf6de..ee883c10f5 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -86,15 +86,16 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) - #:use-module (gnu packages guile) - #:use-module (gnu packages time) #:use-module (gnu packages golang) + #:use-module (gnu packages guile) #:use-module (gnu packages icu4c) #:use-module (gnu packages jemalloc) #:use-module (gnu packages language) #:use-module (gnu packages libedit) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) + #:use-module (gnu packages lisp) + #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages logging) #:use-module (gnu packages man) #:use-module (gnu packages maths) @@ -111,8 +112,8 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) - #:use-module (gnu packages python-web) #:use-module (gnu packages python-science) + #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages rdf) #:use-module (gnu packages readline) @@ -125,6 +126,7 @@ #:use-module (gnu packages tcl) #:use-module (gnu packages terminals) #:use-module (gnu packages textutils) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages web) @@ -1246,6 +1248,89 @@ pictures, sounds, or video.") (base32 "1rr2dgv4ams8r2lp13w85c77rkmzpb88fjlc28mvlw6zq2fblv2w")))))) +(define-public pgloader + (package + (name "pgloader") + (version "3.6.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dimitri/pgloader") + (commit (string-append "v" version)))) + (sha256 + (base32 "06i1jd2za3ih5caj2b4vzlzags5j65vv8dfdbz0ggdrp40wfd5lh")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + ;; NOTE: (Sharlatan-20210119T211511+0000) Tests are disabled due to being + ;; dependent on Quicklisp, main build target is `pgloader-standalone' which + ;; does not require Quicklisp workarounds. There is no `install' target + ;; configured in Makefile. + `(#:tests? #f + #:strip-binaries? #f + #:make-flags + (list "pgloader-standalone" "BUILDAPP_SBCL=buildapp") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'set-home + (lambda _ + (setenv "HOME" "/tmp") + #t)) + (add-after 'unpack 'patch-Makefile + (lambda _ + (substitute* "Makefile" + (("--sbcl.*") "--sbcl $(CL) --asdf-path . \\\n")) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (mkdir-p bin) + (install-file "build/bin/pgloader" bin)) + #t))))) + (native-inputs + `(("buildapp" ,buildapp) + ("sbcl" ,sbcl))) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-abnf" ,sbcl-cl-abnf) + ("cl-base64" ,sbcl-cl-base64) + ("cl-csv" ,sbcl-cl-csv) + ("cl-fad" ,sbcl-cl-fad) + ("cl-log" ,sbcl-cl-log) + ("cl-markdown" ,sbcl-cl-markdown) + ("cl-mustache" ,sbcl-cl-mustache) + ("cl-ppcre" ,sbcl-cl-ppcre) + ("cl-sqlite" ,sbcl-cl-sqlite) + ("closer-mop" ,sbcl-closer-mop) + ("command-line-arguments" ,sbcl-command-line-arguments) + ("db3" ,sbcl-db3) + ("drakma" ,sbcl-drakma) + ("esrap" ,sbcl-esrap) + ("flexi-streams" ,sbcl-flexi-streams) + ("ixf" ,sbcl-ixf) + ("local-time" ,sbcl-local-time) + ("lparallel" ,sbcl-lparallel) + ("metabang-bind" ,sbcl-metabang-bind) + ("mssql" ,sbcl-mssql) + ("postmodern" ,sbcl-postmodern) + ("py-configparser" ,sbcl-py-configparser) + ("qmynd" ,sbcl-qmynd) + ("quri" ,sbcl-quri) + ("split-sequence" ,sbcl-split-sequence) + ("trivial-backtrace" ,sbcl-trivial-backtrace) + ("usocket" ,sbcl-usocket) + ("uuid" ,sbcl-uuid) + ("yason" ,sbcl-yason) + ("zs3" ,sbcl-zs3))) + (home-page "https://pgloader.io/") + (synopsis "Tool to migrate data to PostgreSQL") + (description + "@code{pgloader} is a program that can load data or migrate databases from +CSV, DB3, iXF, SQLite, MS-SQL or MySQL to PostgreSQL.") + (license (license:x11-style "file://LICENSE")))) + (define-public python-pymysql (package (name "python-pymysql") -- cgit v1.2.3 From 499ce19730ecf101086b92062c4b1b15a08cd68b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 20 Jan 2021 12:22:34 +0100 Subject: gnu: lisp-repl-core-dumper: Update to 0.5.0. * gnu/packages/lisp.scm (lisp-repl-core-dumper): Update to 0.5.0. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 100335cc2c..bdf9ac9d58 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1084,7 +1084,7 @@ assembler, PEG) is less than 1MB.") (define-public lisp-repl-core-dumper (package (name "lisp-repl-core-dumper") - (version "0.4.0") + (version "0.5.0") (source (origin (method git-fetch) @@ -1093,7 +1093,7 @@ assembler, PEG) is less than 1MB.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "13fq6978ivhhi5kd8w67zjkpinrrinbw4raj9f99gpgdlak7lfmj")))) + (base32 "1hrilm9lxy7zdidn4wac4yfqryg3hfw0371nanhd7g9bcfjx7n1q")))) (build-system copy-build-system) (arguments '(#:install-plan -- cgit v1.2.3 From 849e3dd0434211a76f3f7857e77da73959874890 Mon Sep 17 00:00:00 2001 From: raid5atemyhomework Date: Fri, 8 Jan 2021 05:31:17 +0000 Subject: gnu: zfs: Correct ZFS udev rules. * gnu/packages/file-systems.scm (zfs): Add substitutions for /sbin/modprobe in udev rules. Signed-off-by: Efraim Flashner --- gnu/packages/file-systems.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 0a36b7345a..d391065e70 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -885,7 +885,8 @@ APFS.") (let ((out (assoc-ref outputs "out")) (src (assoc-ref outputs "src")) (util-linux (assoc-ref inputs "util-linux")) - (nfs-utils (assoc-ref inputs "nfs-utils"))) + (nfs-utils (assoc-ref inputs "nfs-utils")) + (kmod (assoc-ref inputs "kmod-runtime"))) (substitute* "contrib/Makefile.in" ;; This is not configurable nor is its hard-coded /usr prefix. ((" initramfs") "")) @@ -915,7 +916,9 @@ APFS.") (substitute* "contrib/pyzfs/Makefile.in" ((".*install-lib.*") "")) (substitute* '("Makefile.am" "Makefile.in") - (("\\$\\(prefix)/src") (string-append src "/src")))) + (("\\$\\(prefix)/src") (string-append src "/src"))) + (substitute* (find-files "udev/rules.d/" ".rules.in$") + (("/sbin/modprobe") (string-append kmod "/bin/modprobe")))) #t)) (replace 'build (lambda _ (invoke "make"))) @@ -939,6 +942,7 @@ APFS.") ("pkg-config" ,pkg-config))) (inputs `(("eudev" ,eudev) + ("kmod-runtime" ,kmod) ("libaio" ,libaio) ("libtirpc" ,libtirpc) ("nfs-utils" ,nfs-utils) -- cgit v1.2.3 From e2fe05284d528dd38c35010883ac2642b243d0aa Mon Sep 17 00:00:00 2001 From: raid5atemyhomework Date: Sun, 10 Jan 2021 09:58:03 +0000 Subject: gnu: zfs: update to 2.0.1. * gnu/packages/file-systems.scm (zfs): Update version to 2.0.1. [arguments]: Adjust 'patch-source phase for changes in tarball. Signed-off-by: Efraim Flashner --- gnu/packages/file-systems.scm | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index d391065e70..e6ee645be0 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -847,7 +847,7 @@ APFS.") (define-public zfs (package (name "zfs") - (version "0.8.5") + (version "2.0.1") (outputs '("out" "module" "src")) (source (origin @@ -856,7 +856,7 @@ APFS.") "/download/zfs-" version "/zfs-" version ".tar.gz")) (sha256 - (base32 "0gfdnynmsxbhi97q73smrgmcw1k8zmlr1hgljfn38sk0kimivd6v")))) + (base32 "0y3992l4nzr67q18lz1kizw0za1shvqbpmsjz9shv4frh5ihllbi")))) (build-system linux-module-build-system) (arguments `(;; The ZFS kernel module should not be downloaded since the license @@ -887,18 +887,31 @@ APFS.") (util-linux (assoc-ref inputs "util-linux")) (nfs-utils (assoc-ref inputs "nfs-utils")) (kmod (assoc-ref inputs "kmod-runtime"))) + (substitute* "etc/Makefile.in" + ;; This just contains an example configuration file for + ;; configuring ZFS on traditional init systems, skip it + ;; since we cannot use it anyway; the install target becomes + ;; misdirected. + (("= default ") "= ")) + (substitute* "lib/libzfs/os/linux/libzfs_util_os.c" + ;; Use path to /gnu/store/*-kmod in actual path that is exec'ed. + (("\"/sbin/modprobe\"") + (string-append "\"" kmod "/bin/modprobe" "\"")) + ;; Just use 'modprobe' in message to user, since Guix + ;; does not have a traditional /sbin/ + (("'/sbin/modprobe ") "'modprobe ")) (substitute* "contrib/Makefile.in" ;; This is not configurable nor is its hard-coded /usr prefix. ((" initramfs") "")) - (substitute* "module/zfs/zfs_ctldir.c" + (substitute* "module/os/linux/zfs/zfs_ctldir.c" (("/usr/bin/env\", \"umount") (string-append util-linux "/bin/umount\", \"-n")) (("/usr/bin/env\", \"mount") (string-append util-linux "/bin/mount\", \"-n"))) - (substitute* "lib/libzfs/libzfs_mount.c" + (substitute* "lib/libzfs/os/linux/libzfs_mount_os.c" (("/bin/mount") (string-append util-linux "/bin/mount")) (("/bin/umount") (string-append util-linux "/bin/umount"))) - (substitute* "lib/libshare/nfs.c" + (substitute* "lib/libshare/os/linux/nfs.c" (("/usr/sbin/exportfs") (string-append nfs-utils "/sbin/exportfs"))) (substitute* "config/zfs-build.m4" -- cgit v1.2.3 From 8ce42fec7c9bc123b4ea1adfaedd93271a61efe3 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Wed, 20 Jan 2021 10:34:20 +0100 Subject: gnu: libmesode: Update to 0.10.1. * gnu/packages/messaging.scm (libmesode): Update to 0.10.1. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 348eff3772..36dfb35774 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1998,7 +1998,7 @@ is also scriptable and extensible via Guile.") (define-public libmesode (package (name "libmesode") - (version "0.9.3") + (version "0.10.1") (source (origin (method git-fetch) (uri (git-reference @@ -2007,7 +2007,7 @@ is also scriptable and extensible via Guile.") (file-name (git-file-name name version)) (sha256 (base32 - "0xzfg1xx88cn36352nnjlb1p7xyw32yqkhjzq10px88iaaqz1vv0")))) + "1bxnkhrypgv41qyy1n545kcggmlw1hvxnhwihijhhcf2pxd2s654")))) (build-system gnu-build-system) (inputs `(("expat" ,expat) -- cgit v1.2.3 From 94fe015695b031f094ebb13303b3438c84059680 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Wed, 20 Jan 2021 10:34:21 +0100 Subject: gnu: profanity: Update to 0.10.0. * gnu/packages/messaging.scm (profanity): Update to 0.10.0. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 36dfb35774..1820a146d1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2058,7 +2058,7 @@ are both supported).") (define-public profanity (package (name "profanity") - (version "0.9.5") + (version "0.10.0") (source (origin (method url-fetch) @@ -2067,7 +2067,7 @@ are both supported).") version ".tar.gz")) (sha256 (base32 - "00j9l9v62rz9hprgiy1vrz8v3v59ph18h8kskqxr31fgqvjv5xr3")))) + "137z77514fgj2dk13d12g4jrn6gs5k85nwrk1r1kiv7rj0jy61aa")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 093bfc5d9638286d66b5e8368fb8969e2f2d010d Mon Sep 17 00:00:00 2001 From: Antoine Côté Date: Sun, 3 Jan 2021 15:15:04 -0500 Subject: gnu: blender-2.79: Fix color management. * gnu/packages/graphics.scm (blender-2.79): Fix color management. [inputs]: Add opencolorio. Signed-off-by: Efraim Flashner --- gnu/packages/graphics.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 246933bc89..411d89fcc2 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Gabriel Arazas +;;; Copyright © 2021 Antoine Côté ;;; ;;; This file is part of GNU Guix. ;;; @@ -619,6 +620,7 @@ application can be customized via its API for Python scripting.") `(("boost" ,boost) ("jemalloc" ,jemalloc) ("libx11" ,libx11) + ("opencolorio" ,opencolorio) ("openimageio" ,openimageio) ("openexr" ,openexr) ("ilmbase" ,ilmbase) -- cgit v1.2.3 From b9cfa7ca862d3dfcb6241b61579c7cc059e30617 Mon Sep 17 00:00:00 2001 From: Z572 <873216071@qq.com> Date: Fri, 25 Dec 2020 20:53:01 +0800 Subject: gnu: Add poxml. * gnu/packages/kde.scm (poxml): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/kde.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 4d4a6f2c6c..278e0d3882 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -913,6 +913,33 @@ Python, PHP, and Perl.") a variety of formats, including PDF, PostScript, DejaVu, and EPub.") (license license:gpl2+))) +(define-public poxml + (package + (name "poxml") + (version "20.12.1") + (source (origin + (method url-fetch) + (uri + (string-append "mirror://kde/stable/release-service/" version + "/src/poxml-" version ".tar.xz")) + (sha256 + (base32 + "1smjvblx0jcv3afs2sr4qcmvhqd44iw24hvr9fppa3nxhrmjwmlk")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools))) + (inputs + `(("gettext" ,gettext-minimal) + ("qtbase" ,qtbase))) + (home-page "https://kde.org/applications/development") + (synopsis "Tools for translating DocBook XML files with Gettext") + (description "This is a collection of tools that facilitate translating +DocBook XML files using Gettext message files (PO files). Also included are +several command-line utilities for manipulating DocBook XML files, PO files and +PO template files.") + (license license:gpl2+))) + (define-public kdegraphics-mobipocket (package (name "kdegraphics-mobipocket") -- cgit v1.2.3 From e4ef47b229abb0e890dbaf272b1008234055c1cf Mon Sep 17 00:00:00 2001 From: Z572 <873216071@qq.com> Date: Sat, 26 Dec 2020 19:59:14 +0800 Subject: gnu: Add kdf. * gnu/packages/kde.scm (kdf): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/kde.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 278e0d3882..2f321fc911 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -758,6 +758,40 @@ communicate with each other. Here's a few things KDE Connect can do: charts.") (license license:lgpl2.1+))) +(define-public kdf + (package + (name "kdf") + (version "20.12.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/kdf-" version ".tar.xz")) + (sha256 + (base32 + "0ba67hs4vlb3qyvdzhnpmf8p62df12s8aqw4hzf9vnxff3qix5k1")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools))) + (inputs + `(("kcmutils" ,kcmutils) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kio" ,kio) + ("knotifications" ,knotifications) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kxmlgui" ,kxmlgui) + ("qtbase" ,qtbase))) + (home-page "https://kde.org/applications/system/kdk") + (synopsis "View Disk Usage") + (description "KDiskFree displays the available file devices (hard drive +partitions, floppy and CD drives, etc.) along with information on their +capacity, free space, type and mount point. It also allows you to mount and +unmount drives and view them in a file manager.") + (license license:gpl2+))) + (define-public kcachegrind (package (name "kcachegrind") -- cgit v1.2.3 From b50a14422fbfbaba17fffa53c3a2b06bcecd7e99 Mon Sep 17 00:00:00 2001 From: Adam Kandur Date: Wed, 20 Jan 2021 14:30:05 +0100 Subject: gnu: Add cl-claw. * gnu/packages/lisp-xyz.scm (cl-claw, ecl-claw, sbcl-claw): New variables. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 83fa2a7b5d..36725ebbbb 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2020 Konrad Hinsen ;;; Copyright © 2020 Dimakis Dimakakos ;;; Copyright © 2020 Oleg Pykhalov -;;; Copyright © 2020 Adam Kandur +;;; Copyright © 2020, 2021 Adam Kandur ;;; Copyright © 2020, 2021 Sharlatan Hellseher ;;; Copyright © 2021 Aurora ;;; @@ -12194,6 +12194,43 @@ package.") (define-public ecl-claw-support (sbcl-package->ecl-package sbcl-claw-support)) +(define-public sbcl-claw + (let ((revision "0") + (commit "3cd4a96fca95eb9e8d5d069426694669f81b2250")) + (package + (name "sbcl-claw") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/borodust/claw") + (commit commit))) + (file-name (git-file-name "claw" version)) + (sha256 + (base32 "146yv0hc4hmk72562ssj2d41143pp84dcbd1h7f4nx1c7hf2bb0d")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("cl-json" ,sbcl-cl-json) + ("cl-ppcre" ,sbcl-cl-ppcre) + ("claw-support" ,sbcl-claw-support) + ("local-time" ,sbcl-local-time) + ("trivial-features" ,sbcl-trivial-features))) + (home-page "https://github.com/borodust/claw") + (synopsis "Autowrapper for Common Lisp") + (description + "This is a Common Lisp autowrapping facility for quickly creating clean +and lean bindings to C libraries.") + (license license:bsd-2)))) + +(define-public cl-claw + (sbcl-package->cl-source-package sbcl-claw)) + +(define-public ecl-claw + (sbcl-package->ecl-package sbcl-claw)) + (define-public sbcl-array-operations (let ((commit "75cbc3b1adb2e3ce2109489753d0f290b071e81b") (revision "0")) -- cgit v1.2.3 From c67ff5636f2e62e4fd75ac584865c56d973e27fe Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Mon, 18 Jan 2021 23:27:25 -0600 Subject: gnu: idris: Update to 1.3.3. * gnu/packages/patches/idris-disable-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/idris.scm (idris): Update to 1.3.3. [source]: Use the patch. [native-inputs]: Add ghc-cheapskate. [arguments]: Adjust cheapskate version bounds. Make auxiliary test script executable. --- gnu/local.mk | 1 + gnu/packages/idris.scm | 12 ++++++++---- gnu/packages/patches/idris-disable-test.patch | 19 +++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/idris-disable-test.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 6f66021c78..370719f4d3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1179,6 +1179,7 @@ dist_patch_DATA = \ %D%/packages/patches/icu4c-CVE-2020-10531.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/id3lib-UTF16-writing-bug.patch \ + %D%/packages/patches/idris-disable-test.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/inetutils-hurd.patch \ %D%/packages/patches/inkscape-poppler-0.76.patch \ diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 1982d7cf07..ca2772b904 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016, 2017 David Craven ;;; Copyright © 2018 Alex ter Weele -;;; Copyright © 2019 Eric Bavier +;;; Copyright © 2019, 2021 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,7 +38,7 @@ (define-public idris (package (name "idris") - (version "1.3.2") + (version "1.3.3") (source (origin (method url-fetch) (uri (string-append @@ -46,10 +46,12 @@ "idris-" version "/idris-" version ".tar.gz")) (sha256 (base32 - "0wychzkg0yghd2pp8fqz78vp1ayzks191knfpl7mhh8igsmb6bc7")))) + "1pachwc6msw3n1mz2z1r1w6h518w9gbhdvbaa5vi1qp3cn3wm6q4")) + (patches (search-patches "idris-disable-test.patch")))) (build-system haskell-build-system) (native-inputs ;For tests `(("perl" ,perl) + ("ghc-cheapskate" ,ghc-cheapskate) ("ghc-tasty" ,ghc-tasty) ("ghc-tasty-golden" ,ghc-tasty-golden) ("ghc-tasty-rerun" ,ghc-tasty-rerun))) @@ -98,7 +100,8 @@ (add-after 'unpack 'update-constraints (lambda _ (substitute* "idris.cabal" - (("ansi-terminal < 0\\.9") "ansi-terminal < 0.10")) + (("ansi-terminal < 0\\.9") "ansi-terminal < 0.10") + (("cheapskate >= 0\\.1\\.1\\.2 && < 0\\.2") "cheapskate >= 0.1.1.1 && < 0.2")) #t)) (add-before 'configure 'set-cc-command (lambda _ @@ -118,6 +121,7 @@ (add-after 'install 'check (lambda* (#:key outputs #:allow-other-keys #:rest args) (let ((out (assoc-ref outputs "out"))) + (chmod "test/scripts/timeout" #o755) ;must be executable (setenv "TASTY_NUM_THREADS" (number->string (parallel-job-count))) (setenv "IDRIS_CC" "gcc") ;Needed for creating executables (setenv "PATH" (string-append out "/bin:" (getenv "PATH"))) diff --git a/gnu/packages/patches/idris-disable-test.patch b/gnu/packages/patches/idris-disable-test.patch new file mode 100644 index 0000000000..ec8c7c8451 --- /dev/null +++ b/gnu/packages/patches/idris-disable-test.patch @@ -0,0 +1,19 @@ +The "pkg010" test output depends on the version of optparse-applicative being +used. The expected output requires optparse-applicative >= 0.15.1.0. Skip +the test for now. + +--- idris-1.3.3/test/TestData.hs 2021-01-19 23:05:24.238958262 -0600 ++++ idris-1.3.3/test/TestData.hs 2021-01-19 23:10:33.314390997 -0600 +@@ -212,8 +212,10 @@ + ( 5, ANY ), + ( 6, ANY ), + ( 7, ANY ), +- ( 8, ANY ), +- ( 10, ANY )]), ++ ( 8, ANY )]), ++-- FIXME: Expected output depends on optparse-applicative version. ++-- See https://github.com/idris-lang/Idris-dev/issues/4896 ++-- ( 10, ANY )]), + ("prelude", "Prelude", + [ ( 1, ANY )]), + ("primitives", "Primitive types", -- cgit v1.2.3 From 245162184d933875415348333ae9b24bf02b1ceb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 14:59:31 +0100 Subject: gnu: Add r-credentials. * gnu/packages/cran.scm (r-credentials): New variable. --- gnu/packages/cran.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 40f8e82c34..cd547d12d4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9811,6 +9811,50 @@ when building command line applications. They fall back to alternatives on terminals that do not support Unicode.") (license license:expat))) +(define-public r-credentials + (package + (name "r-credentials") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "credentials" version)) + (sha256 + (base32 + "1w9zj34xdwz9bszsvhv2cbgq96y5sgxbh7ndn31pgfcpzlkfq6f1")))) + (properties `((upstream-name . "credentials"))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'setenv-HOME + (lambda _ + ;; This is necessary because git looks for $HOME/.gitconfig + (setenv "HOME" "/tmp") + #t))))) + (inputs + `(("git" ,git-minimal))) + (propagated-inputs + `(("r-askpass" ,r-askpass) + ("r-curl" ,r-curl) + ("r-jsonlite" ,r-jsonlite) + ("r-openssl" ,r-openssl) + ("r-sys" ,r-sys))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://docs.ropensci.org/credentials/") + (synopsis "Tools for managing SSH and Git credentials") + (description + "This package assists you in setting up and retrieving of HTTPS and SSH +credentials for use with git and other services. For HTTPS remotes the +package interfaces the @command{git-credential} utility which @command{git} +uses to store HTTP usernames and passwords. For SSH remotes this package +provides convenient functions to find or generate appropriate SSH keys. The +package both helps the user to setup a local git installation, and also +provides a back-end for git/ssh client libraries to authenticate with existing +user credentials.") + (license license:expat))) + (define-public r-usethis (package (name "r-usethis") -- cgit v1.2.3 From a9650ccf6579bb1dbae9c0eb6a38a77d03cd2602 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 15:01:25 +0100 Subject: gnu: Add r-gert. * gnu/packages/cran.scm (r-gert): New variable. --- gnu/packages/cran.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cd547d12d4..d65ff97d1c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9855,6 +9855,41 @@ provides a back-end for git/ssh client libraries to authenticate with existing user credentials.") (license license:expat))) +(define-public r-gert + (package + (name "r-gert") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "gert" version)) + (sha256 + (base32 + "1lq4hgv2727lwcv8vha5af26nslj99rjxjrgflshmmcihawpls1n")))) + (properties `((upstream-name . "gert"))) + (build-system r-build-system) + (inputs + `(("libgit2" ,libgit2) + ("zlib" ,zlib))) + (propagated-inputs + `(("r-askpass" ,r-askpass) + ("r-credentials" ,r-credentials) + ("r-openssl" ,r-openssl) + ("r-rstudioapi" ,r-rstudioapi) + ("r-zip" ,r-zip))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("r-knitr" ,r-knitr))) + (home-page "https://docs.ropensci.org/gert/") + (synopsis "Simple Git client for R") + (description + "This package provides a simple git client for R based on libgit2 with +support for SSH and HTTPS remotes. All functions in gert use basic R data +types (such as vectors and data-frames) for their arguments and return values. +User credentials are shared with command line git through the +@code{git-credential} store and SSH keys stored on disk or ssh-agent.") + (license license:expat))) + (define-public r-usethis (package (name "r-usethis") -- cgit v1.2.3 From 8eb2a6c9b8c2f204b3ebd15f2990e6694b9e014b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 15:10:12 +0100 Subject: gnu: Add r-lightgbm. * gnu/packages/cran.scm (r-lightgbm): New variable. --- gnu/packages/cran.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d65ff97d1c..64c7f08096 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23259,6 +23259,42 @@ by providing functionality for preprocessing, predicting, and validating input.") (license license:expat))) +(define-public r-lightgbm + (package + (name "r-lightgbm") + (version "3.1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "lightgbm" version)) + (sha256 + (base32 + "1pwsh6j9ksahh58b15j5ij56bsc6syy3z4k4a5zhy5n7829rz555")))) + (properties `((upstream-name . "lightgbm"))) + (build-system r-build-system) + (propagated-inputs + `(("r-data-table" ,r-data-table) + ("r-jsonlite" ,r-jsonlite) + ("r-matrix" ,r-matrix) + ("r-r6" ,r-r6))) + (home-page "https://github.com/Microsoft/LightGBM") + (synopsis "Light gradient boosting machine") + (description + "Tree based algorithms can be improved by introducing boosting +frameworks. LightGBM is one such framework, based on Ke, Guolin et +al. (2017). This package offers an R interface to work with it. It is +designed to be distributed and efficient with the following goals: + +@enumerate +@item Faster training speed and higher efficiency; +@item lower memory usage; +@item better accuracy; +@item parallel learning supported; and +@item capable of handling large-scale data. +@end enumerate +") + (license license:expat))) + (define-public r-shapforxgboost (package (name "r-shapforxgboost") -- cgit v1.2.3 From e5f7b2c431fb618ce54927400a37721cfbd17de7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 15:10:34 +0100 Subject: gnu: Add r-scattermore. * gnu/packages/cran.scm (r-scattermore): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 64c7f08096..ae86421192 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25161,6 +25161,29 @@ alignment using warping functions, handling of replicated measurements as well as allowing spectra with different resolutions.") (license license:gpl3+))) +(define-public r-scattermore + (package + (name "r-scattermore") + (version "0.7") + (source + (origin + (method url-fetch) + (uri (cran-uri "scattermore" version)) + (sha256 + (base32 + "18nzlprmphkvjg946h10h2qq0wbkmv2526p8di6k2xl4gccq0qpk")))) + (properties `((upstream-name . "scattermore"))) + (build-system r-build-system) + (propagated-inputs + `(("r-ggplot2" ,r-ggplot2) + ("r-scales" ,r-scales))) + (home-page "https://github.com/exaexa/scattermore") + (synopsis "Scatterplots with more points") + (description + "This package provides C-based tools for converting large scatterplot +data to rasters. It speeds up plotting of data with millions of points.") + (license license:gpl3+))) + (define-public r-seurat (package (name "r-seurat") -- cgit v1.2.3 From 44d6092022d9f2227eafbc734c2ce23b91585124 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 15:20:20 +0100 Subject: gnu: Add r-labelled. * gnu/packages/cran.scm (r-labelled): New variable. --- gnu/packages/cran.scm | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ae86421192..1b1ad91595 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2016 Pjotr Prins ;;; Copyright © 2016, 2017 Ben Woodcroft @@ -8222,6 +8222,37 @@ and coverage methods to tune the choice of threshold.") "Common utilities used in other Mosaic family packages are collected here.") (license license:gpl2+))) +(define-public r-labelled + (package + (name "r-labelled") + (version "2.7.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "labelled" version)) + (sha256 + (base32 + "1nsb0mh0jg7gggc41b6v55nmfq07g0qn9fy55x4jws5dscs6pdmi")))) + (properties `((upstream-name . "labelled"))) + (build-system r-build-system) + (propagated-inputs + `(("r-dplyr" ,r-dplyr) + ("r-haven" ,r-haven) + ("r-lifecycle" ,r-lifecycle) + ("r-pillar" ,r-pillar) + ("r-rlang" ,r-rlang) + ("r-tidyr" ,r-tidyr) + ("r-vctrs" ,r-vctrs))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "http://larmarange.github.io/labelled/") + (synopsis "Manipulating labelled data") + (description + "This package provides useful functions to deal with the +@code{haven_labelled} and @code{haven_labelled_spss} classes introduced by the +haven package. ") + (license license:gpl3))) + (define-public r-ggformula (package (name "r-ggformula") -- cgit v1.2.3 From 627e15e1e7be070c8ff5adb080a5ec251499123f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 15:26:17 +0100 Subject: gnu: r-foreign: Update to 0.8-81. * gnu/packages/statistics.scm (r-foreign): Update to 0.8-81. --- gnu/packages/statistics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index e3db09088d..659ca68f44 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2015 Vicente Vera Parra ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner @@ -522,14 +522,14 @@ code for possible problems.") (define-public r-foreign (package (name "r-foreign") - (version "0.8-80") + (version "0.8-81") (source (origin (method url-fetch) (uri (cran-uri "foreign" version)) (sha256 (base32 - "0wjdi3qn9famsxmpdyyahidaid0yhxlpx4ad9k8vrxhxd6xspasp")))) + "0b4rca1bl8xxna05057hchbwfmgjgx0n140szabpc0raizqzks0s")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/foreign") (synopsis "Read data stored by other statistics software") -- cgit v1.2.3 From 81710c867ca229348fb783ead634c1ba09f31f1c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 15:43:45 +0100 Subject: gnu: r-httpuv: Update to 1.5.5. * gnu/packages/cran.scm (r-httpuv): Update to 1.5.5. [source]: Update patch name and remove unused modules. * gnu/packages/patches/r-httpuv-1.5.4-unvendor-libuv.patch: Rename this file... * gnu/packages/patches/r-httpuv-1.5.5-unvendor-libuv.patch: ...to this. * gnu/local.mk (dist_patch_DATA): Rename it. --- gnu/local.mk | 2 +- gnu/packages/cran.scm | 10 ++-- .../patches/r-httpuv-1.5.4-unvendor-libuv.patch | 59 ---------------------- .../patches/r-httpuv-1.5.5-unvendor-libuv.patch | 59 ++++++++++++++++++++++ 4 files changed, 64 insertions(+), 66 deletions(-) delete mode 100644 gnu/packages/patches/r-httpuv-1.5.4-unvendor-libuv.patch create mode 100644 gnu/packages/patches/r-httpuv-1.5.5-unvendor-libuv.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 370719f4d3..c631e449d1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1581,7 +1581,7 @@ dist_patch_DATA = \ %D%/packages/patches/readline-6.2-CVE-2014-2524.patch \ %D%/packages/patches/renpy-use-system-fribidi.patch \ %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \ - %D%/packages/patches/r-httpuv-1.5.4-unvendor-libuv.patch \ + %D%/packages/patches/r-httpuv-1.5.5-unvendor-libuv.patch \ %D%/packages/patches/ri-li-modernize_cpp.patch \ %D%/packages/patches/ripperx-missing-file.patch \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1b1ad91595..4e853fc902 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1024,19 +1024,17 @@ into a pipeline of data manipulation and visualisation.") (define-public r-httpuv (package (name "r-httpuv") - (version "1.5.4") + (version "1.5.5") (source (origin (method url-fetch) (uri (cran-uri "httpuv" version)) (sha256 (base32 - "066rprqvz9qln6xd85x1yh1wbbmzd157xjl8zq1zbgr8l6347inm")) + "05rir03xwamwfq5691vx0x957sgmr4i8iv5vpx5rv1f74y4wkrhb")) ;; Unvendor bundled libraries. As of 1.5.4 the vendored libuv ;; only contains fixes for building on Solaris. - (patches (search-patches "r-httpuv-1.5.4-unvendor-libuv.patch")) - (modules '((guix build utils) - (ice-9 ftw) - (srfi srfi-1))) + (patches (search-patches "r-httpuv-1.5.5-unvendor-libuv.patch")) + (modules '((guix build utils))) (snippet `(begin (delete-file-recursively "src/libuv") diff --git a/gnu/packages/patches/r-httpuv-1.5.4-unvendor-libuv.patch b/gnu/packages/patches/r-httpuv-1.5.4-unvendor-libuv.patch deleted file mode 100644 index 0947718059..0000000000 --- a/gnu/packages/patches/r-httpuv-1.5.4-unvendor-libuv.patch +++ /dev/null @@ -1,59 +0,0 @@ -Removes references to bundled libuv. - ---- a/src/Makevars 2020-07-31 11:53:30.576484531 +0200 -+++ b/src/Makevars 2020-07-31 11:54:19.369863118 +0200 -@@ -5,7 +5,7 @@ - - UNAME := $(shell uname) - --PKG_LIBS = ./libuv/.libs/libuv.a ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread -+PKG_LIBS = -luv ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread - - ifeq ($(UNAME), Darwin) - PKG_LIBS += -framework CoreServices -@@ -23,7 +23,7 @@ - - PKG_CFLAGS = $(C_VISIBILITY) -DSTRICT_R_HEADERS - PKG_CXXFLAGS = $(CXX_VISIBILITY) -DSTRICT_R_HEADERS --PKG_CPPFLAGS = -Ilibuv/include -pthread -+PKG_CPPFLAGS = -pthread - - # To avoid spurious warnings from `R CMD check --as-cran`, about compiler - # warning flags like -Werror. -@@ -43,35 +43,5 @@ - # PKG_CPPFLAGS += -D_GLIBCXX_ASSERTIONS - - --$(SHLIB): libuv/.libs/libuv.a http-parser/http_parser.o sha1/sha1.o base64/base64.o -+$(SHLIB): http-parser/http_parser.o sha1/sha1.o base64/base64.o - --# We needed to rename lt~obsolete.m4 because the name causes problems with R --# CMD check. Here we rename it back. --libuv/m4/lt~obsolete.m4: libuv/m4/lt_obsolete.m4 -- cp -p -f libuv/m4/lt_obsolete.m4 libuv/m4/lt~obsolete.m4 -- --# Run ./configure. We need to touch various autotools-related files to avoid --# it trying to run autotools programs again. We also need to make sure --# configure is executable, because on some platforms, calling unzip() in R --# does not preserve the executable bit. --# --# It's VERY IMPORTANT that mtime(aclocal.m4) <= mtime(configure), and also --# mtime(aclocal.m4) <= mtime(Makefile.in). On some platforms, passing multiple --# files to a single touch command gives them all the same time, but on others --# (Solaris and possibly some Fedoras) the timestamps are slightly increasing --# from one to the next, i.e. the order matters. To remove this fragility, we --# use "-r aclocal.m4" to ensure that all three files are guaranteed to have --# precisely the same timestamp value. --libuv/Makefile: libuv/m4/lt~obsolete.m4 -- (cd libuv \ -- && touch aclocal.m4 \ -- && touch -r aclocal.m4 configure Makefile.in \ -- && chmod +x configure \ -- && CC="$(CC)" CFLAGS="$(CFLAGS) $(CPICFLAGS) $(C_VISIBILITY)" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS)" ./configure $(CONFIGURE_FLAGS)) -- --libuv/.libs/libuv.a: libuv/Makefile -- $(MAKE) --directory=libuv \ -- HAVE_DTRACE=0 -- --clean: -- $(MAKE) --directory=libuv distclean diff --git a/gnu/packages/patches/r-httpuv-1.5.5-unvendor-libuv.patch b/gnu/packages/patches/r-httpuv-1.5.5-unvendor-libuv.patch new file mode 100644 index 0000000000..0947718059 --- /dev/null +++ b/gnu/packages/patches/r-httpuv-1.5.5-unvendor-libuv.patch @@ -0,0 +1,59 @@ +Removes references to bundled libuv. + +--- a/src/Makevars 2020-07-31 11:53:30.576484531 +0200 ++++ b/src/Makevars 2020-07-31 11:54:19.369863118 +0200 +@@ -5,7 +5,7 @@ + + UNAME := $(shell uname) + +-PKG_LIBS = ./libuv/.libs/libuv.a ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread ++PKG_LIBS = -luv ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread + + ifeq ($(UNAME), Darwin) + PKG_LIBS += -framework CoreServices +@@ -23,7 +23,7 @@ + + PKG_CFLAGS = $(C_VISIBILITY) -DSTRICT_R_HEADERS + PKG_CXXFLAGS = $(CXX_VISIBILITY) -DSTRICT_R_HEADERS +-PKG_CPPFLAGS = -Ilibuv/include -pthread ++PKG_CPPFLAGS = -pthread + + # To avoid spurious warnings from `R CMD check --as-cran`, about compiler + # warning flags like -Werror. +@@ -43,35 +43,5 @@ + # PKG_CPPFLAGS += -D_GLIBCXX_ASSERTIONS + + +-$(SHLIB): libuv/.libs/libuv.a http-parser/http_parser.o sha1/sha1.o base64/base64.o ++$(SHLIB): http-parser/http_parser.o sha1/sha1.o base64/base64.o + +-# We needed to rename lt~obsolete.m4 because the name causes problems with R +-# CMD check. Here we rename it back. +-libuv/m4/lt~obsolete.m4: libuv/m4/lt_obsolete.m4 +- cp -p -f libuv/m4/lt_obsolete.m4 libuv/m4/lt~obsolete.m4 +- +-# Run ./configure. We need to touch various autotools-related files to avoid +-# it trying to run autotools programs again. We also need to make sure +-# configure is executable, because on some platforms, calling unzip() in R +-# does not preserve the executable bit. +-# +-# It's VERY IMPORTANT that mtime(aclocal.m4) <= mtime(configure), and also +-# mtime(aclocal.m4) <= mtime(Makefile.in). On some platforms, passing multiple +-# files to a single touch command gives them all the same time, but on others +-# (Solaris and possibly some Fedoras) the timestamps are slightly increasing +-# from one to the next, i.e. the order matters. To remove this fragility, we +-# use "-r aclocal.m4" to ensure that all three files are guaranteed to have +-# precisely the same timestamp value. +-libuv/Makefile: libuv/m4/lt~obsolete.m4 +- (cd libuv \ +- && touch aclocal.m4 \ +- && touch -r aclocal.m4 configure Makefile.in \ +- && chmod +x configure \ +- && CC="$(CC)" CFLAGS="$(CFLAGS) $(CPICFLAGS) $(C_VISIBILITY)" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS)" ./configure $(CONFIGURE_FLAGS)) +- +-libuv/.libs/libuv.a: libuv/Makefile +- $(MAKE) --directory=libuv \ +- HAVE_DTRACE=0 +- +-clean: +- $(MAKE) --directory=libuv distclean -- cgit v1.2.3 From ec9ea1eb8bbfd3f8d50171ba23c38ffb3f904776 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:07:25 +0100 Subject: gnu: r-diffobj: Update to 0.3.3. * gnu/packages/cran.scm (r-diffobj): Update to 0.3.3. --- 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 4e853fc902..15a6128f84 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -126,14 +126,14 @@ files and provide more explicit control over line endings.") (define-public r-diffobj (package (name "r-diffobj") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (cran-uri "diffobj" version)) (sha256 (base32 - "0v18zz14g8ppzmj1d997rdmsfh327ml4wvpmfx168lravdsk5ym2")))) + "1x3d5sk8mk0s2d7dq8wxi1zv6krlx33n22ls2jwnb58b8xrmakj1")))) (properties `((upstream-name . "diffobj"))) (build-system r-build-system) (propagated-inputs `(("r-crayon" ,r-crayon))) -- cgit v1.2.3 From 454b12b87671ebce86ee279dfe9c989aaa06ccd8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:07:28 +0100 Subject: gnu: r-rticles: Update to 0.18. * gnu/packages/cran.scm (r-rticles): Update to 0.18. --- 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 15a6128f84..c58fb76a0b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -178,14 +178,14 @@ easier.") (define-public r-rticles (package (name "r-rticles") - (version "0.17") + (version "0.18") (source (origin (method url-fetch) (uri (cran-uri "rticles" version)) (sha256 (base32 - "1wbwva5n88dw3vvhcrlzkr58cv03hyx0dqgfmxj7d0dgf4ichr3c")))) + "1srczjy9dqw06glrv95798xsg462kfbbwm3yk1fv1zhpz9jhakwv")))) (properties `((upstream-name . "rticles"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From b394dd9b907ad7c93602d4e7ede4a6ef68ba6d73 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:07:31 +0100 Subject: gnu: r-mboost: Update to 2.9-4. * gnu/packages/cran.scm (r-mboost): Update to 2.9-4. --- 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 c58fb76a0b..924f94f54a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -639,13 +639,13 @@ objects.") (define-public r-mboost (package (name "r-mboost") - (version "2.9-3") + (version "2.9-4") (source (origin (method url-fetch) (uri (cran-uri "mboost" version)) (sha256 (base32 - "1qp5c43kc0939sss5w3hhn794lbi69wgfsa31sq4c8vzh35pjqmf")))) + "1dgyc38axfk2a430wsdnnk76xikizkyxf5r0l1kbp6cacrx6idz0")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice) -- cgit v1.2.3 From 57adb8003c133f05ae43a114f2c578abb8b6b529 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:07:34 +0100 Subject: gnu: r-jsonlite: Update to 1.7.2. * gnu/packages/cran.scm (r-jsonlite): Update to 1.7.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 924f94f54a..ed6fb6706e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1078,13 +1078,13 @@ particularly easy to create complete web applications using httpuv alone.") (define-public r-jsonlite (package (name "r-jsonlite") - (version "1.7.1") + (version "1.7.2") (source (origin (method url-fetch) (uri (cran-uri "jsonlite" version)) (sha256 (base32 - "1wygpnycmyf339x92hwapqk7nc1gs9cadx890b809a9spjhah41a")))) + "1lhzcpz9clwq04i5m6jzkvw9x03pwlqrixv4l9xzchjr8d84nd86")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From 01e39c12b8f9dfdf0d471a1c5eefb680764e67d0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:07:37 +0100 Subject: gnu: r-servr: Update to 0.21. * gnu/packages/cran.scm (r-servr): Update to 0.21. --- 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 ed6fb6706e..99187bf7a7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1104,13 +1104,13 @@ in systems and applications.") (define-public r-servr (package (name "r-servr") - (version "0.20") + (version "0.21") (source (origin (method url-fetch) (uri (cran-uri "servr" version)) (sha256 (base32 - "0px75vkc6q4iwbirr27bbrbpv0v9ial7zijnbd6dhjccwxl3x1l3")))) + "12fk585hmz735v4hra8da9wld1fmd67byqnf95m7jjyh7l3dmh1z")))) (build-system r-build-system) (propagated-inputs `(("r-httpuv" ,r-httpuv) -- cgit v1.2.3 From fa9f59ec62b070597b8393d92a7813d0ae31e6ed Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:07:40 +0100 Subject: gnu: r-htmltools: Update to 0.5.1. * gnu/packages/cran.scm (r-htmltools): Update to 0.5.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 99187bf7a7..79b2239c96 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1128,13 +1128,13 @@ directory.") (define-public r-htmltools (package (name "r-htmltools") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (cran-uri "htmltools" version)) (sha256 (base32 - "07fjznax5sin563ddnzlb7iwc8b39wzf7ymjn66pbmxgskijq2pz")))) + "01v33zcs9rv16r6v8ckqh92k5axj6skmk9hyakmqqmgra522xj3a")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) -- cgit v1.2.3 From 9aed22031771055ff54aca7d0580c510f5520dc3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:07:44 +0100 Subject: gnu: r-htmlwidgets: Update to 1.5.3. * gnu/packages/cran.scm (r-htmlwidgets): Update to 1.5.3. --- 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 79b2239c96..41e1258cc1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1149,13 +1149,13 @@ directory.") (define-public r-htmlwidgets (package (name "r-htmlwidgets") - (version "1.5.2") + (version "1.5.3") (source (origin (method url-fetch) (uri (cran-uri "htmlwidgets" version)) (sha256 (base32 - "0072wlkl58lav3qszzqw6pmx8qra4784r0yb6rx4lg7rbrik6335")))) + "0a8g7wqd3qxnhwkm9c9bkzg29db7gvjiaa5y038ln8nch8qq7981")))) (build-system r-build-system) (propagated-inputs `(("r-htmltools" ,r-htmltools) -- cgit v1.2.3 From c132638c5bb98fed09f79c77d7102da6bc395858 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:07:47 +0100 Subject: gnu: r-crosstalk: Update to 1.1.1. * gnu/packages/cran.scm (r-crosstalk): Update to 1.1.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 41e1258cc1..874d51ace6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1726,14 +1726,14 @@ in R and Shiny via the D3 visualization library.") (define-public r-crosstalk (package (name "r-crosstalk") - (version "1.1.0.1") + (version "1.1.1") (source (origin (method url-fetch) (uri (cran-uri "crosstalk" version)) (sha256 (base32 - "03ihj7cimkklrbad9zic78xsrfcisygmgy859hqnx0hiph80p9rn")))) + "1n6c6s7a6yxiwvva71x6bzcrim8xprl5s01fqiy61yq0y3vk8cpd")))) (build-system r-build-system) (propagated-inputs `(("r-htmltools" ,r-htmltools) -- cgit v1.2.3 From 10697abe62fca8d17ca42b578e409f53b35d20ce Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:07:50 +0100 Subject: gnu: r-partykit: Update to 1.2-11. * gnu/packages/cran.scm (r-partykit): Update to 1.2-11. --- 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 874d51ace6..5e62674882 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2141,13 +2141,13 @@ initiative to bring PASSTEC 2000 functionalities to R.") (define-public r-partykit (package (name "r-partykit") - (version "1.2-10") + (version "1.2-11") (source (origin (method url-fetch) (uri (cran-uri "partykit" version)) (sha256 (base32 - "1jg68rqhk2r0h2hk50xl99zp56b1nfdcam06kfvssqrkgkavkswf")))) + "00n6a74x257m2jk7jadjfxaclihxqpqwh356bgxmq8rag0nk70rs")))) (build-system r-build-system) (propagated-inputs `(("r-formula" ,r-formula) -- cgit v1.2.3 From d7f227610d0ae783c1b62debc01f10d4624305f2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:07:53 +0100 Subject: gnu: r-pkgbuild: Update to 1.2.0. * gnu/packages/cran.scm (r-pkgbuild): Update to 1.2.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 5e62674882..4ecedfa5ba 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2239,13 +2239,13 @@ processes. Most of its code is based on the @code{psutil} Python package.") (define-public r-pkgbuild (package (name "r-pkgbuild") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "pkgbuild" version)) (sha256 - (base32 "1gdbrjq4kiwm45c6pb23mp327qyjvslhyf72ca4zhlzwc5vgp6xk")))) + (base32 "0qx920h2viwjg10va81nj0xja495d8ni6vcc25ggvzki6a6k069f")))) (build-system r-build-system) (propagated-inputs `(("r-callr" ,r-callr) -- cgit v1.2.3 From 6967469503792d12c2a84d81873ae4d300a18b53 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:07:56 +0100 Subject: gnu: r-rcpp: Update to 1.0.6. * gnu/packages/cran.scm (r-rcpp): Update to 1.0.6. --- 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 4ecedfa5ba..14fa392ac6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2296,13 +2296,13 @@ you to rapidly iterate while developing a package.") (define-public r-rcpp (package (name "r-rcpp") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) (uri (cran-uri "Rcpp" version)) (sha256 - (base32 "012wbj446k1wz6bp6bpf6h77ypvcsw69xvnax6qf6vyc7dj2qimq")))) + (base32 "04ph6lm36cmvz01ng53pvvf3jxvzsn9smyflkfc7l3q0pib4gwn9")))) (build-system r-build-system) (home-page "http://www.rcpp.org") (synopsis "Seamless R and C++ integration") -- cgit v1.2.3 From 3f4a3beb2365b6ae810e428cd048bcae939db561 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:07:59 +0100 Subject: gnu: r-circlize: Update to 0.4.12. * gnu/packages/cran.scm (r-circlize): Update to 0.4.12. --- 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 14fa392ac6..c5fe550b09 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2471,14 +2471,14 @@ validation and filtering on the values, making options invisible or private.") (define-public r-circlize (package (name "r-circlize") - (version "0.4.11") + (version "0.4.12") (source (origin (method url-fetch) (uri (cran-uri "circlize" version)) (sha256 (base32 - "1s84xl7kv3qc1261xxaq4aqh64gwywhacsf5nh6yf8djw0d1w42d")))) + "1x2j6a80bb4fly3dm91ias964s1gb1cmzj3lyh69ikwjaam0rdmk")))) (build-system r-build-system) (propagated-inputs `(("r-colorspace" ,r-colorspace) -- cgit v1.2.3 From 4e6eb6683e02971f7d5bcfb1b65bfb310a9cbe1c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:08:03 +0100 Subject: gnu: r-getoptlong: Update to 1.0.5. * gnu/packages/cran.scm (r-getoptlong): Update to 1.0.5. --- 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 c5fe550b09..234660fceb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2579,14 +2579,14 @@ compare different dendrograms to one another.") (define-public r-getoptlong (package (name "r-getoptlong") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) (uri (cran-uri "GetoptLong" version)) (sha256 (base32 - "0l9pa9dx8pcg3j7jn4b9k98g7r5vdsvnmf6apnifzm57mc0vlkg6")))) + "00fpm6nd3kqa2ikasxa62jzywi46fvvmx1mdavcp5yrxxn37j8wc")))) (properties `((upstream-name . "GetoptLong"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 4a3fed7c6f5769f718072b0839e867f692ad310c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:08:06 +0100 Subject: gnu: r-restrserve: Update to 0.4.1. * gnu/packages/cran.scm (r-restrserve): Update to 0.4.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 234660fceb..cefb179c5c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2716,13 +2716,13 @@ quantities.") (define-public r-restrserve (package (name "r-restrserve") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) (uri (cran-uri "RestRserve" version)) (sha256 - (base32 "07mm65yxzpwlg6x3lsggj41v8nl4m6v9mszhqjpgj19v3yxvwgi0")))) + (base32 "1486hrzj5q5w4nbrsbqlv7vv20ly01y90qc2vygl5syzwvyjd422")))) (build-system r-build-system) (propagated-inputs `(("r-checkmate" ,r-checkmate) -- cgit v1.2.3 From 9da706f7144297f426a49631a1b829ac40d8582b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:08:12 +0100 Subject: gnu: r-ggally: Update to 2.1.0. * gnu/packages/cran.scm (r-ggally): Update to 2.1.0. [inputs]: Remove libressl; add openssl. [propagated-inputs]: Add r-dplyr, r-forcats, and r-tidyr. --- gnu/packages/cran.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cefb179c5c..840f97581c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2772,20 +2772,22 @@ package also provides a C++ API, that works with or without Rcpp.") (define-public r-ggally (package (name "r-ggally") - (version "2.0.0") + (version "2.1.0") (source (origin (method url-fetch) (uri (cran-uri "GGally" version)) (sha256 (base32 - "1gkmpzh1yvwvypkw0nwqv3gsf6za3220wig3rfv8g23kss60rl1s")))) + "0lvcvlc8p2cii7rqx7m81f7cv3kk9mlf7cbbgv7l75g7ljw8dyvz")))) (properties `((upstream-name . "GGally"))) (build-system r-build-system) (inputs - `(("libressl" ,libressl))) + `(("openssl" ,openssl))) (propagated-inputs - `(("r-ggplot2" ,r-ggplot2) + `(("r-dplyr" ,r-dplyr) + ("r-forcats" ,r-forcats) + ("r-ggplot2" ,r-ggplot2) ("r-gtable" ,r-gtable) ("r-lifecycle" ,r-lifecycle) ("r-plyr" ,r-plyr) @@ -2793,7 +2795,8 @@ package also provides a C++ API, that works with or without Rcpp.") ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-reshape" ,r-reshape) ("r-rlang" ,r-rlang) - ("r-scales" ,r-scales))) + ("r-scales" ,r-scales) + ("r-tidyr" ,r-tidyr))) (home-page "https://ggobi.github.io/ggally") (synopsis "Extension to ggplot2") (description -- cgit v1.2.3 From 93cbf7b6b9d40ecdf37eef556ae49dc03999de83 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:08:15 +0100 Subject: gnu: r-sp: Update to 1.4-5. * gnu/packages/cran.scm (r-sp): Update to 1.4-5. --- 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 840f97581c..24fec7cda4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2831,13 +2831,13 @@ most popular ones.") (define-public r-sp (package (name "r-sp") - (version "1.4-4") + (version "1.4-5") (source (origin (method url-fetch) (uri (cran-uri "sp" version)) (sha256 - (base32 "0zzw1gfic5b311vrbkmmmaap3yllgd192af067l5ymm885jqm1zs")))) + (base32 "1nh9izsnszzm5kbq461w8bi0yh7fqzb74b2zmpg5qis0slbb5vkb")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From 73723bb23f5845e156f9444817a03ffe9765a6d6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:08:18 +0100 Subject: gnu: r-squarem: Update to 2021.1. * gnu/packages/cran.scm (r-squarem): Update to 2021.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 24fec7cda4..4b770610dc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3388,14 +3388,14 @@ contexts.") (define-public r-squarem (package (name "r-squarem") - (version "2020.5") + (version "2021.1") (source (origin (method url-fetch) (uri (cran-uri "SQUAREM" version)) (sha256 (base32 - "1f0j5pbsz2wi7dfl8h8gvdl991bjywiwkd2f6z0xgkh87kl5y0b4")))) + "0n1s32l9p4vdm3h5q6g43s0qbpzry08difsh0yay80wrla6f3rb6")))) (properties `((upstream-name . "SQUAREM"))) (build-system r-build-system) (home-page "https://coah.jhu.edu/people/Faculty_personal_Pages/Varadhan.html") -- cgit v1.2.3 From d5ce26c35ee6a2fa3104be2735f27216f4405704 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:08:21 +0100 Subject: gnu: r-rmysql: Update to 0.10.21. * gnu/packages/cran.scm (r-rmysql): Update to 0.10.21. --- 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 4b770610dc..2f67b7a122 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3553,14 +3553,14 @@ dimensioned arrays.") (define-public r-rmysql (package (name "r-rmysql") - (version "0.10.20") + (version "0.10.21") (source (origin (method url-fetch) (uri (cran-uri "RMySQL" version)) (sha256 (base32 - "0lv9m6zpm8dgv7yixr6xhw379vbq45d7n7gkrmjrppdj8vcih77i")))) + "0cbb5ln9iigl816nzvsls9zil5qlfr8yv2aginapqv6n69nz0srs")))) (properties `((upstream-name . "RMySQL"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 0b03081d6892efa02aa9cfe19282d900d5717c30 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:08:25 +0100 Subject: gnu: r-psych: Update to 2.0.12. * gnu/packages/cran.scm (r-psych): Update to 2.0.12. --- 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 2f67b7a122..55a2faf148 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3766,14 +3766,14 @@ problems as well as resampling based estimators of prediction error.") (define-public r-psych (package (name "r-psych") - (version "2.0.9") + (version "2.0.12") (source (origin (method url-fetch) (uri (cran-uri "psych" version)) (sha256 (base32 - "0wdh580a0psbdil28n0d85hnp42wmn11hcbnihjq8r7h54drgzpn")))) + "0k5dw5nb7kx7f21b0z01dry99qcpnk7iaicv7xq9d35wv2hx8wca")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice) -- cgit v1.2.3 From f0159b532acfabe20de0b12e87e19b7cfe7d1ede Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:08:28 +0100 Subject: gnu: r-broom: Update to 0.7.3. * gnu/packages/cran.scm (r-broom): Update to 0.7.3. --- 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 55a2faf148..3f49d29073 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3819,14 +3819,14 @@ by base R methods related to model fitting.") (define-public r-broom (package (name "r-broom") - (version "0.7.2") + (version "0.7.3") (source (origin (method url-fetch) (uri (cran-uri "broom" version)) (sha256 (base32 - "18qkgw5f46cfr8sc7r9a261ivn3s4w88sdj653gaa20723179300")))) + "0bxwmqj37m06ci378xqlf7kar7pg5g903i1vnrv4i256dkj50mny")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports) -- cgit v1.2.3 From 175e256dd42229d9b0795f18d6f62edaf47334ec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:08:32 +0100 Subject: gnu: r-ggrepel: Update to 0.9.1. * gnu/packages/cran.scm (r-ggrepel): Update to 0.9.1. [propagated-inputs]: Add r-rlang. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3f49d29073..2b138ef393 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3923,18 +3923,19 @@ for certain use cases.") (define-public r-ggrepel (package (name "r-ggrepel") - (version "0.8.2") + (version "0.9.1") (source (origin (method url-fetch) (uri (cran-uri "ggrepel" version)) (sha256 (base32 - "1qaifn3dazdqbqlii210xhw7yf142iw7g9p2axmmxbz90p0by08d")))) + "1z5xyr5f4aryy0v1gzz9m8m4s5fzzwbrf0fxll1nbflr8xnr3yr9")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) ("r-rcpp" ,r-rcpp) + ("r-rlang" ,r-rlang) ("r-scales" ,r-scales))) (native-inputs `(("r-knitr" ,r-knitr))) ; for vignettes -- cgit v1.2.3 From 77d4e7c2ab629fa693f4267bb355684cdcc9745a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:08:35 +0100 Subject: gnu: r-hardyweinberg: Update to 1.7.1. * gnu/packages/cran.scm (r-hardyweinberg): Update to 1.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 2b138ef393..3754292c47 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4230,14 +4230,14 @@ programming} (SQP) based solver).") (define-public r-hardyweinberg (package (name "r-hardyweinberg") - (version "1.6.9") + (version "1.7.1") (source (origin (method url-fetch) (uri (cran-uri "HardyWeinberg" version)) (sha256 (base32 - "0l93r1hkr483hp4yd7rm7mdkgl5lp0nkvv0inahj3r1cplgfxpvs")))) + "0afjz818yvaq3akvgpy4irnlpspd2dj71qkrwj81lm9y36ypwlw6")))) (properties `((upstream-name . "HardyWeinberg"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 0a8607f8734b71175d5580b1ca2429f344f1c5be Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:08:39 +0100 Subject: gnu: r-ggridges: Update to 0.5.3. * gnu/packages/cran.scm (r-ggridges): 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 3754292c47..46688251bd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4541,20 +4541,22 @@ plotting. a three dimensional point cloud.") (define-public r-ggridges (package (name "r-ggridges") - (version "0.5.2") + (version "0.5.3") (source (origin (method url-fetch) (uri (cran-uri "ggridges" version)) (sha256 (base32 - "03pz257aw0mkh5k75rby9givkc1ky3n5scvhjhjiz9vry9fpffmh")))) + "0bmlqy1p6rac90af97ffpdi6php7dblx66l2hcm8ljidgyqzmspm")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) ("r-plyr" ,r-plyr) ("r-scales" ,r-scales) ("r-withr" ,r-withr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/clauswilke/ggridges") (synopsis "Ridgeline plots in ggplot2") (description -- cgit v1.2.3 From b53c860a1779c7ab63c8aec8ff41778e7aceb349 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:08:42 +0100 Subject: gnu: r-xfun: Update to 0.20. * gnu/packages/cran.scm (r-xfun): Update to 0.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 46688251bd..d6706a88d2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4802,13 +4802,13 @@ iVAT).") (define-public r-xfun (package (name "r-xfun") - (version "0.19") + (version "0.20") (source (origin (method url-fetch) (uri (cran-uri "xfun" version)) (sha256 - (base32 "15yyigkl1g9w9d7097hrm94dxn1af333ywr5xdw78qqrw6npn0iv")))) + (base32 "043wv9qihs3r29810mf8ajpn2iks1bxq44wbxz8sfpix5b8kjhi8")))) (build-system r-build-system) ;; knitr itself depends on xfun #; -- cgit v1.2.3 From 89001e01c19ceecbaa62e9f50ee0df8e27527fd3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:08:46 +0100 Subject: gnu: r-vctrs: Update to 0.3.6. * gnu/packages/cran.scm (r-vctrs): Update to 0.3.6. --- 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 d6706a88d2..2b63279d48 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4865,14 +4865,14 @@ to variables on the left-hand side of the assignment.") (define-public r-vctrs (package (name "r-vctrs") - (version "0.3.5") + (version "0.3.6") (source (origin (method url-fetch) (uri (cran-uri "vctrs" version)) (sha256 (base32 - "1k1mcq7jkpc55dsm0wb4k8asc1irvmi5884v3ap4sabf22c5sq0i")))) + "09ddxgzyah7lw42hn6n8fynsixf43s10jamsf94d2aidky63czfz")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) -- cgit v1.2.3 From 8aba74ba04f6092f7ec496d93991780cd9aee048 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:08:49 +0100 Subject: gnu: r-tinytex: Update to 0.28. * gnu/packages/cran.scm (r-tinytex): Update to 0.28. --- 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 2b63279d48..89b1a637ae 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4952,14 +4952,14 @@ terminals.") (define-public r-tinytex (package (name "r-tinytex") - (version "0.27") + (version "0.28") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "10hbc9h1fsw91w5f4fjcaqy68b3n1wr6pml01fnkf3pdjiri5sj0")))) + "11pa1q7gl17ala74lz10qbghk2yqanl9pylwvi9b4kmhx856b83n")))) (build-system r-build-system) (propagated-inputs `(("r-xfun" ,r-xfun))) -- cgit v1.2.3 From 6251debe711166bcc4d43f7acaaf45a294e7c2f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:08:52 +0100 Subject: gnu: r-expm: Update to 0.999-6. * gnu/packages/cran.scm (r-expm): Update to 0.999-6. --- 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 89b1a637ae..b7e4032650 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5500,14 +5500,14 @@ sample Robust Rank-Order Distributional Test.") (define-public r-expm (package (name "r-expm") - (version "0.999-5") + (version "0.999-6") (source (origin (method url-fetch) (uri (cran-uri "expm" version)) (sha256 (base32 - "0y98ya8rhy891nysjlzzy7kcm13dsz8gvxwzvbkmcp1xx0vicxc7")))) + "1p5dapwv8ycxaysgi6imnby04i4kh1c5a2czqa4wygz0s8pr2y9c")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From 73ca708d40eb185fb35d81e9602da8d3a2118791 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:08:55 +0100 Subject: gnu: r-vim: Update to 6.1.0. * gnu/packages/cran.scm (r-vim): Update to 6.1.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 b7e4032650..e9e312c761 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6046,14 +6046,14 @@ specific S3-method.") (define-public r-vim (package (name "r-vim") - (version "6.0.0") + (version "6.1.0") (source (origin (method url-fetch) (uri (cran-uri "VIM" version)) (sha256 (base32 - "0ddhca4v912q82rjpf1qld6i6g2c381g0v5b4hbnygr3lm6a7wiv")))) + "1a8aw0ysaf0al95m2la2zx1p3g5mnwqx0x30br1s1dqqkfnv57hz")))) (properties `((upstream-name . "VIM"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 1463ad0b004f66df4c6657ba5185694ca4393bf4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:08:58 +0100 Subject: gnu: r-renv: Update to 0.12.5. * gnu/packages/cran.scm (r-renv): Update to 0.12.5. --- 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 e9e312c761..35e9d27b8a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6534,14 +6534,14 @@ Python's @url{https://github.com/ActiveState/appdirs,Appdirs} to R.") (define-public r-renv (package (name "r-renv") - (version "0.12.3") + (version "0.12.5") (source (origin (method url-fetch) (uri (cran-uri "renv" version)) (sha256 (base32 - "0k31x19gzpffb701c76p840cip10c0dh8yv3wcs30gqi0ag1g77l")))) + "0wfq1z5glng6jrfxj25mjhp129z6468gaszr9ggks5gp8lrwszzh")))) (properties `((upstream-name . "renv"))) (build-system r-build-system) (native-inputs -- cgit v1.2.3 From 47584730245b04a30f788129462ff9b3b046e977 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:09:04 +0100 Subject: gnu: r-factominer: Update to 2.4. * gnu/packages/cran.scm (r-factominer): Update to 2.4. [propagated-inputs]: Add r-dt. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 35e9d27b8a..b2a5fcd584 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6871,19 +6871,20 @@ clustering.") (define-public r-factominer (package (name "r-factominer") - (version "2.3") + (version "2.4") (source (origin (method url-fetch) (uri (cran-uri "FactoMineR" version)) (sha256 (base32 - "0ldgf3daksh6lpblhqys67m4mxqx3q9s9n5plfam6dwshfik0ky6")))) + "0lg8n9fxxk46nchnj4pbpqqf4swxfsq7r9jzr36dmd36kb7avqxr")))) (properties `((upstream-name . "FactoMineR"))) (build-system r-build-system) (propagated-inputs `(("r-car" ,r-car) ("r-cluster" ,r-cluster) + ("r-dt" ,r-dt) ("r-ellipse" ,r-ellipse) ("r-flashclust" ,r-flashclust) ("r-ggplot2" ,r-ggplot2) @@ -6892,6 +6893,8 @@ clustering.") ("r-leaps" ,r-leaps) ("r-mass" ,r-mass) ("r-scatterplot3d" ,r-scatterplot3d))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "http://factominer.free.fr") (synopsis "Multivariate exploratory data analysis and data mining") (description -- cgit v1.2.3 From 0804420042bba4cad2b789e568a4ab08d5def90b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:09:07 +0100 Subject: gnu: r-fansi: Update to 0.4.2. * gnu/packages/cran.scm (r-fansi): Update to 0.4.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 b2a5fcd584..5ff29cd5d0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6945,14 +6945,14 @@ steps and provides ggplot2-based elegant data visualization.") (define-public r-fansi (package (name "r-fansi") - (version "0.4.1") + (version "0.4.2") (source (origin (method url-fetch) (uri (cran-uri "fansi" version)) (sha256 (base32 - "028ywjy538psnmdnddvy5jr3idzffr4hikzr4x97x0m30g4fws9w")))) + "0i7wmaflkjzdbggqv31wnsj3m9imvc6db429vyjk64xrz1ng1vd2")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) ; for vignettes -- cgit v1.2.3 From 7bb510c20547b513114f05b377dbd44176ec329d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:09:11 +0100 Subject: gnu: r-officer: Update to 0.3.16. * gnu/packages/cran.scm (r-officer): Update to 0.3.16. [propagated-inputs]: Remove r-magrittr. --- gnu/packages/cran.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5ff29cd5d0..cd331c9ff1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7154,18 +7154,17 @@ references and Rd files.") (define-public r-officer (package (name "r-officer") - (version "0.3.15") + (version "0.3.16") (source (origin (method url-fetch) (uri (cran-uri "officer" version)) (sha256 (base32 - "1s9hrkdx105c1plpxywv68bmp8hvvxbdizhwx81fxr79fhj62x5j")))) + "1ls5kp70jfxrzxxb3xrg8sn2fyk6qd7rmx23n5jxi7z7850avjrj")))) (build-system r-build-system) (propagated-inputs - `(("r-magrittr" ,r-magrittr) - ("r-r6" ,r-r6) + `(("r-r6" ,r-r6) ("r-uuid" ,r-uuid) ("r-xml2" ,r-xml2) ("r-zip" ,r-zip))) -- cgit v1.2.3 From d7e73930c004c902f78cb4b80eba88d3c057c4b8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:09:14 +0100 Subject: gnu: r-profilemodel: Update to 0.6.1. * gnu/packages/cran.scm (r-profilemodel): Update to 0.6.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 cd331c9ff1..1da2a8664e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7186,14 +7186,14 @@ to help insert or delete content at a specific location in the document.") (define-public r-profilemodel (package (name "r-profilemodel") - (version "0.6.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (cran-uri "profileModel" version)) (sha256 (base32 - "0yq8hy43h62hlz8bbf9ila4a3xcwizi1if27b78xc5y857ncwad8")))) + "01m5nb8cmq0aq555pxk2a99182si65hhmn68yn9nal2j3zl2bp4i")))) (properties `((upstream-name . "profileModel"))) (build-system r-build-system) (home-page "https://github.com/ikosmidis/profileModel") -- cgit v1.2.3 From 59593db401a777cab644110273c966e1d75d7abf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:09:17 +0100 Subject: gnu: r-insight: Update to 0.12.0. * gnu/packages/cran.scm (r-insight): Update to 0.12.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 1da2a8664e..88e5432aba 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7415,14 +7415,14 @@ other add-on packages.") (define-public r-insight (package (name "r-insight") - (version "0.11.1") + (version "0.12.0") (source (origin (method url-fetch) (uri (cran-uri "insight" version)) (sha256 (base32 - "1m95xfvai1kbzqxdggjvdbk6ax2dg4v2lrfpqn7v607g2n77n2k0")))) + "0gkvcw9d729ql1gfrpxzgrag4xafd0hchrdww215qz11ma1rzy7s")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From a2d7b63af97ab03b25a793137004fa0f2683f16d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:09:20 +0100 Subject: gnu: r-sjmisc: Update to 2.8.6. * gnu/packages/cran.scm (r-sjmisc): Update to 2.8.6. --- 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 88e5432aba..7ca8b99d80 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7469,14 +7469,14 @@ vice versa), or to deal with multiple declared missing values.") (define-public r-sjmisc (package (name "r-sjmisc") - (version "2.8.5") + (version "2.8.6") (source (origin (method url-fetch) (uri (cran-uri "sjmisc" version)) (sha256 (base32 - "0xl0s56d13bia89ai619rcr0fzbvc2k8f7hjxik4qp0g4v87zzlk")))) + "1nfrkv5jfnwb85blpv7yk7xac1myzi2c30bqcf7xicniknkjwycr")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) -- cgit v1.2.3 From dc27771199b3a2b50d16bdd696e105727b57c34c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:09:26 +0100 Subject: gnu: r-moonbook: Update to 0.2.4. * gnu/packages/cran.scm (r-moonbook): Update to 0.2.4. [propagated-inputs]: Remove r-purrr; add r-ztable. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7ca8b99d80..ff07beff94 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7520,23 +7520,25 @@ hypothesis of normality.") (define-public r-moonbook (package (name "r-moonbook") - (version "0.2.3") + (version "0.2.4") (source (origin (method url-fetch) (uri (cran-uri "moonBook" version)) (sha256 (base32 - "0hys56mwbm776ff7dibi8wzyf69qiais9rs1jazv79lk6h56s9s6")))) + "0z78pzc8sr2g19xjdd9cmai4iqyifmh79gj8x40ddww6a27dalry")))) (properties `((upstream-name . "moonBook"))) (build-system r-build-system) (propagated-inputs `(("r-magrittr" ,r-magrittr) ("r-nortest" ,r-nortest) - ("r-purrr" ,r-purrr) ("r-sjmisc" ,r-sjmisc) ("r-stringr" ,r-stringr) - ("r-survival" ,r-survival))) + ("r-survival" ,r-survival) + ("r-ztable" ,r-ztable))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/cardiomoon/moonBook") (synopsis "Functions and datasets for the book by Keon-Woong Moon") (description -- cgit v1.2.3 From 75f6c5584fe4c921e7a19aac6e51340b76fa9343 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:09:29 +0100 Subject: gnu: r-deriv: Update to 4.1.2. * gnu/packages/cran.scm (r-deriv): Update to 4.1.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 ff07beff94..f8959a8819 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7777,14 +7777,14 @@ Group (Non-)Overlap considerations.") (define-public r-deriv (package (name "r-deriv") - (version "4.1.1") + (version "4.1.2") (source (origin (method url-fetch) (uri (cran-uri "Deriv" version)) (sha256 (base32 - "1fzchsignpb7cpizbf6l8v9k1nkmaf4r4j3mnxz0csl2g2npi1xc")))) + "1j9sh1w9lsnnhlh59g4ghykyfx46rxh380s8imvm7pzna7rw7c64")))) (properties `((upstream-name . "Deriv"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/Deriv") -- cgit v1.2.3 From 9a2fc8f0c1487209445be4f5f535b17c850f0abe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:09:32 +0100 Subject: gnu: r-proc: Update to 1.17.0.1. * gnu/packages/cran.scm (r-proc): Update to 1.17.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 f8959a8819..807595dbdf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7909,14 +7909,14 @@ containing one or more SNPs that evolved under directional selection.") (define-public r-proc (package (name "r-proc") - (version "1.16.2") + (version "1.17.0.1") (source (origin (method url-fetch) (uri (cran-uri "pROC" version)) (sha256 (base32 - "0apwa5zzqh74pjnvf5a1s5qf6i9r5h44jdllfrwymkd2v479d2xn")))) + "1gd6a47d6bcfd237s3g7r9rws8x2sg7zrvq5k6clpc41zdpp4712")))) (properties `((upstream-name . "pROC"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From e2604812e0bcb13e00276d62d69d54090ab4eea0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:09:35 +0100 Subject: gnu: r-ggstance: Update to 0.3.5. * gnu/packages/cran.scm (r-ggstance): Update to 0.3.5. --- 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 807595dbdf..141bd82207 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8184,13 +8184,13 @@ and coverage methods to tune the choice of threshold.") (define-public r-ggstance (package (name "r-ggstance") - (version "0.3.4") + (version "0.3.5") (source (origin (method url-fetch) (uri (cran-uri "ggstance" version)) (sha256 - (base32 "0aqz3dn02cgij018a4sglqwrwr9dzzj12l8xr1064q7hfd4f64m1")))) + (base32 "0jz9vvnmcc6a38n8nzr458r65sna23bgn5r8mxdhzdlyqibihr7d")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) -- cgit v1.2.3 From ac0209517509bb4f482b0bf1a18218bff8e0f310 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:09:38 +0100 Subject: gnu: r-mosaiccore: Update to 0.9.0. * gnu/packages/cran.scm (r-mosaiccore): Update to 0.9.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 141bd82207..c571060b6f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8210,13 +8210,13 @@ and coverage methods to tune the choice of threshold.") (define-public r-mosaiccore (package (name "r-mosaiccore") - (version "0.8.0") + (version "0.9.0") (source (origin (method url-fetch) (uri (cran-uri "mosaicCore" version)) (sha256 - (base32 "00va6x1i8d3wkm1bgsms9dsjfn5a1l43prpl9pqirgq3zm85hrqj")))) + (base32 "1h3ixzna4xy42rdnd89jj0v9q0riy3fnkd33z6l5c0zaidzm58fz")))) (properties `((upstream-name . "mosaicCore"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From fe5c6d5a67d5373ae2765be10018524f535cf399 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:09:46 +0100 Subject: gnu: r-ggformula: Update to 0.10.1. * gnu/packages/cran.scm (r-ggformula): Update to 0.10.1. [propagated-inputs]: Add r-ggridges, r-labelled, and r-scales. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c571060b6f..63d1d8bf51 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8264,23 +8264,28 @@ haven package. ") (define-public r-ggformula (package (name "r-ggformula") - (version "0.9.4") + (version "0.10.1") (source (origin (method url-fetch) (uri (cran-uri "ggformula" version)) (sha256 - (base32 "04vdhg1bbc1psrx9ggaphz7cx4fw5xsmhkqpqfcg2w4ba2bjy46f")))) + (base32 "1ph5jd8svk8hmshi894vmmpq3zwgdmf4yn3gmdlkad68z8jynhsp")))) (build-system r-build-system) (propagated-inputs `(("r-ggforce" ,r-ggforce) ("r-ggplot2" ,r-ggplot2) + ("r-ggridges" ,r-ggridges) ("r-ggstance" ,r-ggstance) + ("r-labelled" ,r-labelled) ("r-magrittr" ,r-magrittr) ("r-mosaiccore" ,r-mosaiccore) ("r-rlang" ,r-rlang) + ("r-scales" ,r-scales) ("r-stringr" ,r-stringr) ("r-tibble" ,r-tibble))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/ProjectMOSAIC/ggformula/") (synopsis "Formula interface for the @code{r-ggplot2}") (description -- cgit v1.2.3 From dcfeae7d9ef4e087746ff47b54681304a5d85d41 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:09:49 +0100 Subject: gnu: r-mosaicdata: Update to 0.20.2. * gnu/packages/cran.scm (r-mosaicdata): Update to 0.20.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 63d1d8bf51..8842807135 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8298,13 +8298,13 @@ while providing the intuitive capabilities of @code{r-ggplot2}.") (define-public r-mosaicdata (package (name "r-mosaicdata") - (version "0.20.1") + (version "0.20.2") (source (origin (method url-fetch) (uri (cran-uri "mosaicData" version)) (sha256 - (base32 "05mrwvs7awhpv2gvk0jjva74gndfgh2cl17slxcjhwlpga8nmxji")))) + (base32 "0h3f5fgzkzjfgf3ml0qa5j52921y6wy6jgggxmhs31bs8fd4srg4")))) (properties `((upstream-name . "mosaicData"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/mosaicData/") -- cgit v1.2.3 From 0ba6b55312dbd3bdc8ae8c41a70d90ed51657115 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:09:52 +0100 Subject: gnu: r-magick: Update to 2.6.0. * gnu/packages/cran.scm (r-magick): Update to 2.6.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 8842807135..88fa13a174 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8912,14 +8912,14 @@ samples is large and the number of mixture components is not too large.") (define-public r-magick (package (name "r-magick") - (version "2.5.2") + (version "2.6.0") (source (origin (method url-fetch) (uri (cran-uri "magick" version)) (sha256 (base32 - "0myvryya7b4bbw0hs4jqflrbdffmg78kz28gbybw3yc7zwc7sqxx")))) + "1k4fqhxh2ppynl56fs044wpn4wk6gbv6lwp2x4x7j67zwcv56n36")))) (build-system r-build-system) (inputs `(("imagemagick" ,imagemagick) -- cgit v1.2.3 From 90586b4d3a265f950a3bd42dab399fce1670b1a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:09:55 +0100 Subject: gnu: r-emmeans: Update to 1.5.3. * gnu/packages/cran.scm (r-emmeans): Update to 1.5.3. --- 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 88fa13a174..4dd4c88e2a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9354,14 +9354,14 @@ Hothorn, Westfall, 2010, CRC Press).") (define-public r-emmeans (package (name "r-emmeans") - (version "1.5.2-1") + (version "1.5.3") (source (origin (method url-fetch) (uri (cran-uri "emmeans" version)) (sha256 (base32 - "0ndbjhglycdycppz9lbj3vhiqv2mp0z6h4w8fbyjziqx15ai5h59")))) + "11x7bn260v91gb7qri1pq54l339zm4msa5frc8saqb9ykbg4dby5")))) (build-system r-build-system) (propagated-inputs `(("r-estimability" ,r-estimability) -- cgit v1.2.3 From c01047a126efcd4d32a2f602cec54024e7751df9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:09:58 +0100 Subject: gnu: r-libcoin: Update to 1.0-7. * gnu/packages/cran.scm (r-libcoin): Update to 1.0-7. --- 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 4dd4c88e2a..1bf96f08df 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9405,13 +9405,13 @@ Cohen (1988).") (define-public r-libcoin (package (name "r-libcoin") - (version "1.0-6") + (version "1.0-7") (source (origin (method url-fetch) (uri (cran-uri "libcoin" version)) (sha256 - (base32 "0njfdbz4mkyasxm80p0fb0qibvzz7kdzddn8ybj2k6y8bx0w3bs8")))) + (base32 "1vb21pw3vpv2pdnfcddw2bax13v0dg656r28j0p8njcyhwk89xln")))) (build-system r-build-system) (propagated-inputs `(("r-mvtnorm" ,r-mvtnorm))) (home-page "https://cran.r-project.org/web/packages/libcoin") -- cgit v1.2.3 From 90218277a3dda330e44d38fde729832d0402fd1b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:10:01 +0100 Subject: gnu: r-coin: Update to 1.4-0. * gnu/packages/cran.scm (r-coin): Update to 1.4-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 1bf96f08df..4729935e16 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9424,14 +9424,14 @@ and permutation inference in the framework of Strasser and Weber (1999).") (define-public r-coin (package (name "r-coin") - (version "1.3-1") + (version "1.4-0") (source (origin (method url-fetch) (uri (cran-uri "coin" version)) (sha256 (base32 - "0qi03fyqw42a2vnqcia5l2m1mzyarj2q1iblknx9n19bdsd53qjx")))) + "1n2ad4m3zw8px6yc0h750k59pci3fqpnr742hhvsqirrwcdzp6zv")))) (build-system r-build-system) (propagated-inputs `(("r-libcoin" ,r-libcoin) -- cgit v1.2.3 From c60fe486eb0d2f60a13a7b9542fa4cdab8921942 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:10:05 +0100 Subject: gnu: r-bayesplot: Update to 1.8.0. * gnu/packages/cran.scm (r-bayesplot): Update to 1.8.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 4729935e16..885bf6314a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9451,14 +9451,14 @@ correlation, censored, ordered and multivariate problems.") (define-public r-bayesplot (package (name "r-bayesplot") - (version "1.7.2") + (version "1.8.0") (source (origin (method url-fetch) (uri (cran-uri "bayesplot" version)) (sha256 (base32 - "0aqy4bfjq1fmds0vpacsmqih528cp8wk4v4w0balzkph6zqzpwcl")))) + "0j69a78l5z0wyxcz607amaa4jc8kwwvcia9wxyir65b8ks9gj1d6")))) (build-system r-build-system) (inputs `(("pandoc" ,pandoc) -- cgit v1.2.3 From c614701ee800370714f51ce3614ed1958071108e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:10:08 +0100 Subject: gnu: r-sjstats: Update to 0.18.1. * gnu/packages/cran.scm (r-sjstats): Update to 0.18.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 885bf6314a..7d5adedd6f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9515,13 +9515,13 @@ detection, parallelism through BLAS and parallel user templates.") (define-public r-sjstats (package (name "r-sjstats") - (version "0.18.0") + (version "0.18.1") (source (origin (method url-fetch) (uri (cran-uri "sjstats" version)) (sha256 - (base32 "17b1fcrhgjw66qa8zk2jj1bvz3vp5bnjn3p4y1wsg5ng5nxq8jz0")))) + (base32 "1cv80yjnyh6qihxf57zivihhia20gibr5f03x8aspy6382wnwlka")))) (build-system r-build-system) (propagated-inputs `(("r-bayestestr" ,r-bayestestr) -- cgit v1.2.3 From 6ca0925804bcbf5c243b5cc819eca85eb4c902f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:10:11 +0100 Subject: gnu: r-performance: Update to 0.6.1. * gnu/packages/cran.scm (r-performance): Update to 0.6.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 7d5adedd6f..5551b92c52 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9617,14 +9617,14 @@ ROPE percentage and pd).") (define-public r-performance (package (name "r-performance") - (version "0.6.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (cran-uri "performance" version)) (sha256 (base32 - "0ai1pp6k0pmmjgpj7hc53s0h258c4mljln8lv3nd9r7kzrmic0gc")))) + "0wz2zc98r99pg6r4l09qxxzv1fwxwp1md6wmhay401568kd8h5zn")))) (build-system r-build-system) (propagated-inputs `(("r-bayestestr" ,r-bayestestr) -- cgit v1.2.3 From 1c2d4633115c925d58c9ce2b7836ba31eaefc7cf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:10:14 +0100 Subject: gnu: r-ggeffects: Update to 1.0.1. * gnu/packages/cran.scm (r-ggeffects): 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 5551b92c52..9052836f84 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9644,14 +9644,14 @@ effects models and Bayesian models.") (define-public r-ggeffects (package (name "r-ggeffects") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "ggeffects" version)) (sha256 (base32 - "18diwssc5vij5g7zh9mv0ppcv3xgfi2jqzfx9srxfahg05sr1xdq")))) + "1c5rvycaqp7zp1j6j17c84v8nlpi0w7bhfxmcha4n37m0snk1kgy")))) (build-system r-build-system) (propagated-inputs `(("r-insight" ,r-insight) -- cgit v1.2.3 From b7c40c531e8580d6b08afe8bfc685fa0af1f2253 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:10:17 +0100 Subject: gnu: r-effectsize: Update to 0.4.3. * gnu/packages/cran.scm (r-effectsize): Update to 0.4.3. --- 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 9052836f84..1716dfb4f0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9674,14 +9674,14 @@ results using @code{ggplot2}.") (define-public r-effectsize (package (name "r-effectsize") - (version "0.4.1") + (version "0.4.3") (source (origin (method url-fetch) (uri (cran-uri "effectsize" version)) (sha256 (base32 - "1rbl63b1c7z9llznnwvclqrcgdd4hfmc7y66v7raqqf2a4nadqa5")))) + "1hcrnax9wf0nwsb8nv15rxw8yy8w5dak16dw3w5bxi8xnf56lkz2")))) (properties `((upstream-name . "effectsize"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From bf9e5db035e192556f6adeb2043caabcd4b38b13 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:10:20 +0100 Subject: gnu: r-sjplot: Update to 2.8.7. * gnu/packages/cran.scm (r-sjplot): Update to 2.8.7. --- 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 1716dfb4f0..465d8abdb6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9701,13 +9701,13 @@ conversion of indices such as Cohen's d, r, odds, etc.") (define-public r-sjplot (package (name "r-sjplot") - (version "2.8.6") + (version "2.8.7") (source (origin (method url-fetch) (uri (cran-uri "sjPlot" version)) (sha256 - (base32 "1dn9nvvp4jd45kwr4rpp2abf7xdpdmiv41rr3fkdb32a136bzx4b")))) + (base32 "1g4qabg654kwdm09ihp4h3mg64a1d7a7gsn6w56rwsidqqaxilq0")))) (properties `((upstream-name . "sjPlot"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 0f0cf1787423bb8c56b19393ba131e6b478c3f1d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:10:28 +0100 Subject: gnu: r-usethis: Update to 2.0.0. * gnu/packages/cran.scm (r-usethis): Update to 2.0.0. [propagated-inputs]: Remove r-git2r and r-rematch2; add r-gert, r-jsonlite, r-lifecycle, and r-rappdirs. --- gnu/packages/cran.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 465d8abdb6..893c835eb1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9937,14 +9937,14 @@ User credentials are shared with command line git through the (define-public r-usethis (package (name "r-usethis") - (version "1.6.3") + (version "2.0.0") (source (origin (method url-fetch) (uri (cran-uri "usethis" version)) (sha256 (base32 - "09lk04kycvf5x9ggrb6pwc7bx5mzqxwialm2w9vn1a0w0gh2gcfc")))) + "0m4qnnkdiizsdvq33x502zwkn98hw2qcfm45cjj031vaydcjpai2")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) @@ -9953,11 +9953,13 @@ User credentials are shared with command line git through the ("r-curl" ,r-curl) ("r-desc" ,r-desc) ("r-fs" ,r-fs) + ("r-gert" ,r-gert) ("r-gh" ,r-gh) - ("r-git2r" ,r-git2r) ("r-glue" ,r-glue) + ("r-jsonlite" ,r-jsonlite) + ("r-lifecycle" ,r-lifecycle) ("r-purrr" ,r-purrr) - ("r-rematch2" ,r-rematch2) + ("r-rappdirs" ,r-rappdirs) ("r-rlang" ,r-rlang) ("r-rprojroot" ,r-rprojroot) ("r-rstudioapi" ,r-rstudioapi) -- cgit v1.2.3 From 9376d8549521cdb49326acca6609e5041182c369 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:10:32 +0100 Subject: gnu: r-summarytools: Update to 0.9.8. * gnu/packages/cran.scm (r-summarytools): Update to 0.9.8. [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 893c835eb1..73d961ceac 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10127,14 +10127,14 @@ ways.") (define-public r-summarytools (package (name "r-summarytools") - (version "0.9.6") + (version "0.9.8") (source (origin (method url-fetch) (uri (cran-uri "summarytools" version)) (sha256 (base32 - "03pcb2ild1rb9f15yq8b68p9bg10z5wk2x7ahgyzkwdh5f81vbq2")))) + "0n7rad6bkfn9cb99wbfzbwl5qzch48r0gafhddfcqvyh4fbn2k0j")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) @@ -10149,6 +10149,8 @@ ways.") ("r-rapportools" ,r-rapportools) ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/dcomtois/summarytools") (synopsis "Tools to quickly and neatly summarize data") (description -- cgit v1.2.3 From 949b2b34cfbc563c1fb62bf41e839b20b638cd80 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:10:35 +0100 Subject: gnu: r-mvabund: Update to 4.1.6. * gnu/packages/cran.scm (r-mvabund): Update to 4.1.6. --- 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 73d961ceac..37f11fc2b9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10279,14 +10279,14 @@ the interfaces between R and C++.") (define-public r-mvabund (package (name "r-mvabund") - (version "4.1.3") + (version "4.1.6") (source (origin (method url-fetch) (uri (cran-uri "mvabund" version)) (sha256 (base32 - "1z58h4dk3mc2hfnfvc7pghk471cbp7ah2s1z2ria5igw4s80962b")))) + "0aisvax9d7bk6aykrcdcn1ji618r520mcrkr1i3jnck1qs31z41f")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass) -- cgit v1.2.3 From 1ea8c0e7424f3e452b01ad519d5f7660712a1791 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:10:38 +0100 Subject: gnu: r-afex: Update to 0.28-1. * gnu/packages/cran.scm (r-afex): Update to 0.28-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 37f11fc2b9..db19d2689a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10304,14 +10304,14 @@ analysing multivariate abundance data in community ecology.") (define-public r-afex (package (name "r-afex") - (version "0.28-0") + (version "0.28-1") (source (origin (method url-fetch) (uri (cran-uri "afex" version)) (sha256 (base32 - "0c47bq2llzw2b4avhkxyhmf1m2zjh9jsjiw2kww9n1bhwqsyr4ci")))) + "0blwqr5ni3psav1dcdmhfi4jy3b4scm5njimqfpr1d81zadvgc6g")))) (build-system r-build-system) (propagated-inputs `(("r-car" ,r-car) -- cgit v1.2.3 From 1727f6babd00d1623d50577f15074835c88260f9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:10:41 +0100 Subject: gnu: r-rcppannoy: Update to 0.0.18. * gnu/packages/cran.scm (r-rcppannoy): Update to 0.0.18. --- 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 db19d2689a..d49fcdbc93 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10421,14 +10421,14 @@ address a bug.") (define-public r-rcppannoy (package (name "r-rcppannoy") - (version "0.0.17") + (version "0.0.18") (source (origin (method url-fetch) (uri (cran-uri "RcppAnnoy" version)) (sha256 (base32 - "0z4dpvk2hmh817709l70jdl1vvnzn0vb9wlr5m8jza24sn9w14ac")))) + "0n68cf77gz34iq6w6ad87pbqwqam45nxp1gjzns4g6qhf7qdvrz4")))) (properties `((upstream-name . "RcppAnnoy"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From d4d1c311fc318a5b907c4701b4c7f0b55d2495af Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:10:46 +0100 Subject: gnu: r-rgl: Update to 0.104.16. * gnu/packages/cran.scm (r-rgl): Update to 0.104.16. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d49fcdbc93..cf86a828b8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10537,17 +10537,18 @@ Bioconductor packages.") (define-public r-rgl (package (name "r-rgl") - (version "0.100.54") + (version "0.104.16") (source (origin (method url-fetch) (uri (cran-uri "rgl" version)) (sha256 (base32 - "1mgs2d8igmcdzzymfwbqdrypmaidd4pra5n5gnhsn9pm6pqzidqp")))) + "169a8riiam8445nl7rcwn0x92dlwyzh5xldvap6dcxjyjqmjwbdq")))) (build-system r-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("r-knitr" ,r-knitr))) (inputs `(("freetype" ,freetype) ("libpng" ,libpng) -- cgit v1.2.3 From 05039f13071fa3d678828e9200a999946043e62c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:10:49 +0100 Subject: gnu: r-speedglm: Update to 0.3-3. * gnu/packages/cran.scm (r-speedglm): Update to 0.3-3. --- 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 cf86a828b8..4a6147e70f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11145,14 +11145,14 @@ only sparse real matrices in Matrix package format are supported.") (define-public r-speedglm (package (name "r-speedglm") - (version "0.3-2") + (version "0.3-3") (source (origin (method url-fetch) (uri (cran-uri "speedglm" version)) (sha256 (base32 - "1b25zimk0z7ad62yacqdg0zk0qs0jja4i918ym942xfw4j1z3jjz")))) + "0f37w4lj8dpcg1sfkd7cv6qpdkanmb97mnd8zih2fxzv8bpd0rfh")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass) -- cgit v1.2.3 From 32524474ef44197aa6e4f11c0f2195bba5ad1c9e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:10:52 +0100 Subject: gnu: r-tractor-base: Update to 3.3.3.1. * gnu/packages/cran.scm (r-tractor-base): Update to 3.3.3.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 4a6147e70f..9deda853bc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11529,14 +11529,14 @@ conditional reporting based on the current \"output level\".") (define-public r-tractor-base (package (name "r-tractor-base") - (version "3.3.2") + (version "3.3.3.1") (source (origin (method url-fetch) (uri (cran-uri "tractor.base" version)) (sha256 (base32 - "0y5gm0y4chl30f5qqq8qiiw4j8g32s4i9xrvyp3cwg902kf2p86i")))) + "0w5jw7pf77npkgig7667yikpbwv4dfk1dcq63qm88l409ga2f95p")))) (properties `((upstream-name . "tractor.base"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 9f7ec0f6f42683d365c4ff9d3facb15125e58352 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:10:55 +0100 Subject: gnu: r-gmp: Update to 0.6-2. * gnu/packages/cran.scm (r-gmp): Update to 0.6-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 9deda853bc..17f6b8e6b1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11886,14 +11886,14 @@ preparing, executing, and processing HTTP requests.") (define-public r-gmp (package (name "r-gmp") - (version "0.6-1") + (version "0.6-2") (source (origin (method url-fetch) (uri (cran-uri "gmp" version)) (sha256 (base32 - "11rl7qmfrpp1974f0vzsi3zjyx147wlb82ydxak2b60khfvhrn90")))) + "03kzbflgpy5sgnzxmhshs5qv7jjmfc113ybkhxys4z8y7xdv9z3b")))) (build-system r-build-system) (arguments '(#:phases -- cgit v1.2.3 From 824f59ffe00f2dfafd8fa82a058639d11cb8a766 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:10:59 +0100 Subject: gnu: r-spam: Update to 2.6-0. * gnu/packages/cran.scm (r-spam): Update to 2.6-0. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 17f6b8e6b1..ed57dd3681 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12382,17 +12382,19 @@ This makes it a convenient and fast interface to C/C++ and Fortran code.") (define-public r-spam (package (name "r-spam") - (version "2.5-1") + (version "2.6-0") (source (origin (method url-fetch) (uri (cran-uri "spam" version)) (sha256 - (base32 "0ry0a76cljlmilrzcriiizcidxyhq1i7i9bqhvl1qda81ld8hifi")))) + (base32 "0p5ycvpry955ldrgbbq3syy91wx9425mddpn8r5m9xwlirjxv3v3")))) (build-system r-build-system) (propagated-inputs `(("r-dotcall64" ,r-dotcall64))) - (native-inputs `(("gfortran" ,gfortran))) + (native-inputs + `(("gfortran" ,gfortran) + ("r-knitr" ,r-knitr))) (home-page "https://www.math.uzh.ch/pages/spam/") (synopsis "Sparse matrix algebra") (description -- cgit v1.2.3 From fde312d9b6e4b7e31830c65c678876f58e545067 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:11:02 +0100 Subject: gnu: r-parallelly: Update to 1.23.0. * gnu/packages/cran.scm (r-parallelly): Update to 1.23.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 ed57dd3681..63f1eb4520 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12887,14 +12887,14 @@ them in distributed compute environments.") (define-public r-parallelly (package (name "r-parallelly") - (version "1.21.0") + (version "1.23.0") (source (origin (method url-fetch) (uri (cran-uri "parallelly" version)) (sha256 (base32 - "1hlr81khr7z4x9gprymdh19mdq3nw6wm8d2795sd2pa3ya6phnb0")))) + "025whcz55wj9jd73dalkbxh4l2331mqn758glr6hlf472lwf4v1p")))) (properties `((upstream-name . "parallelly"))) (build-system r-build-system) (home-page "https://github.com/HenrikBengtsson/parallelly") -- cgit v1.2.3 From 06a6c775486f0170607cdcdb048fa3e3e545cb96 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:11:06 +0100 Subject: gnu: r-future: Update to 1.21.0. * gnu/packages/cran.scm (r-future): Update to 1.21.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 63f1eb4520..ee84f2f465 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12915,14 +12915,14 @@ port-forwarding to your local computer.") (define-public r-future (package (name "r-future") - (version "1.20.1") + (version "1.21.0") (source (origin (method url-fetch) (uri (cran-uri "future" version)) (sha256 (base32 - "14k00g8c9zgf77d6q7x2vibvlivzk2rzj7lwn7v7d9nr6prqzlb6")))) + "0bfiy17n5rghxw0702k0vgpjkk13268lniifdlx59flf0q16d7lh")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) -- cgit v1.2.3 From 70cf7268ea51ad2af881c9e630fce7d5994bd0f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:11:09 +0100 Subject: gnu: r-future-apply: Update to 1.7.0. * gnu/packages/cran.scm (r-future-apply): Update to 1.7.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 ee84f2f465..8700758f24 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12948,14 +12948,14 @@ the local machine to, say, distributed processing on a remote compute cluster.") (define-public r-future-apply (package (name "r-future-apply") - (version "1.6.0") + (version "1.7.0") (source (origin (method url-fetch) (uri (cran-uri "future.apply" version)) (sha256 (base32 - "1zbfycjfvxnrigm6l2fd2zgnw96g0apiw426c73gkv3xv7bdy6ms")))) + "1ns5cf80vyabvyz9qp6kpvkg4jycinn7x6v7x6692fgjapdnmyig")))) (properties `((upstream-name . "future.apply"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 289271ebd14c604ef46007d298935044f35f5bd4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:11:12 +0100 Subject: gnu: r-compositions: Update to 2.0-1. * gnu/packages/cran.scm (r-compositions): Update to 2.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 8700758f24..d1ff2bd21d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13261,14 +13261,14 @@ users of rARPACK are advised to switch to the RSpectra package.") (define-public r-compositions (package (name "r-compositions") - (version "2.0-0") + (version "2.0-1") (source (origin (method url-fetch) (uri (cran-uri "compositions" version)) (sha256 (base32 - "0xsx4n699q2r4pk2jrvifi3wi49lih7d1j3j6qgqqd31brg53jqr")))) + "03qslsfx11gshls901zlhw47prd55mf16w4mkmd8x1dgiwq938l4")))) (build-system r-build-system) (propagated-inputs `(("r-bayesm" ,r-bayesm) -- cgit v1.2.3 From a7805083fccd20fd08d6994b215ebf1a6a94f880 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:11:16 +0100 Subject: gnu: r-msir: Update to 1.3.3. * gnu/packages/cran.scm (r-msir): Update to 1.3.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 d1ff2bd21d..df275cd9d0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13549,17 +13549,19 @@ them (Anscombe-Glynn, D'Agostino, Bonett-Seier).") (define-public r-msir (package (name "r-msir") - (version "1.3.2") + (version "1.3.3") (source (origin (method url-fetch) (uri (cran-uri "msir" version)) (sha256 (base32 - "0pvc3q162vqq3k39nni732x05zzfz4y9y2zf56d83185ypszv9kb")))) + "1wm83m3cqd6llxb9p2jwim0wb81v84pgdmgcznygzaaq6kbn3n84")))) (build-system r-build-system) (propagated-inputs `(("r-mclust" ,r-mclust))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://cran.r-project.org/web/packages/msir") (synopsis "Model-based sliced inverse regression") (description -- cgit v1.2.3 From 1c6cc303dad5c506bae4f3a55889d56fe2078af8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:11:19 +0100 Subject: gnu: r-pbdzmq: Update to 0.3-4. * gnu/packages/cran.scm (r-pbdzmq): Update to 0.3-4. --- 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 df275cd9d0..22df132ccd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13743,14 +13743,14 @@ graphs.") (define-public r-pbdzmq (package (name "r-pbdzmq") - (version "0.3-3.1") + (version "0.3-4") (source (origin (method url-fetch) (uri (cran-uri "pbdZMQ" version)) (sha256 (base32 - "08qmrzazadkyxlqc8830r0pckaq10l3fgj1f198xy6wwrm2lf0wy")))) + "0adiac53yq305ymhrds1gas4jm0rn1ddv7c7df5ky2cfhpb4ny87")))) (properties `((upstream-name . "pbdZMQ"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 4cefa5aa52df297f6b04bca4f306b81c3a8486df Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:11:23 +0100 Subject: gnu: r-seqinr: Update to 4.2-5. * gnu/packages/cran.scm (r-seqinr): Update to 4.2-5. --- 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 22df132ccd..66618483bd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14269,14 +14269,14 @@ barplots or heatmaps.") (define-public r-seqinr (package (name "r-seqinr") - (version "4.2-4") + (version "4.2-5") (source (origin (method url-fetch) (uri (cran-uri "seqinr" version)) (sha256 (base32 - "0pw035h17dmic8m0pb73fbyf6p4jbwggxjk5vpjlybn8dwd0rk93")))) + "1z1jipgrn9nrnxlx7bcf8c2chwpa3kfva0zgyb12xbr3kisn166y")))) (build-system r-build-system) (propagated-inputs `(("r-ade4" ,r-ade4) -- cgit v1.2.3 From 8188fc2df531ff6415ea2ecea4333645bfb70129 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:11:26 +0100 Subject: gnu: r-deldir: Update to 0.2-9. * gnu/packages/cran.scm (r-deldir): Update to 0.2-9. --- 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 66618483bd..8974d52a2f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14402,14 +14402,14 @@ sampling.") (define-public r-deldir (package (name "r-deldir") - (version "0.2-3") + (version "0.2-9") (source (origin (method url-fetch) (uri (cran-uri "deldir" version)) (sha256 (base32 - "0kin1hsd6dj36kkg7n328mzp21wwn9jm69lvgg2rvbf6bq7q091d")))) + "0jfwff5kk0zraspsvbk26lphl3fnrc6xmhl4690hr0a5k177ildm")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) (home-page "https://cran.r-project.org/web/packages/deldir") -- cgit v1.2.3 From 3d7c6fc2cb9deb98a5eb6b3a610868af740ee325 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:11:29 +0100 Subject: gnu: r-sf: Update to 0.9-7. * gnu/packages/cran.scm (r-sf): Update to 0.9-7. --- 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 8974d52a2f..c565f5040b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14426,14 +14426,14 @@ tessellation.") (define-public r-sf (package (name "r-sf") - (version "0.9-6") + (version "0.9-7") (source (origin (method url-fetch) (uri (cran-uri "sf" version)) (sha256 (base32 - "01yqlnx9v7lzb6g4ywjlncz67cnkizszarnf2dmd4fi8abhw4zs9")))) + "175fmnnw11fjhfgjv9sn9b0jfjcqbybpgwsvv99d5yddigvw5jja")))) (build-system r-build-system) (inputs `(("gdal" ,gdal) -- cgit v1.2.3 From 2ea077e7db68ee692c7d344fc2854013f295fb17 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:11:32 +0100 Subject: gnu: r-sampling: Update to 2.9. * gnu/packages/cran.scm (r-sampling): Update to 2.9. --- 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 c565f5040b..1cfb9b4f5a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15039,14 +15039,14 @@ handle missing genotypes at some SNPs.") (define-public r-sampling (package (name "r-sampling") - (version "2.8") + (version "2.9") (source (origin (method url-fetch) (uri (cran-uri "sampling" version)) (sha256 (base32 - "06pj7dan0mknpsblmlnk7am78qrnwgnql5vvx7vmbfvib7rj6s9m")))) + "11xis4vzn2ga8ml9xrgfgqzccvwbnabq35aidzdvpnvciybsanvz")))) (build-system r-build-system) (propagated-inputs `(("r-lpsolve" ,r-lpsolve) -- cgit v1.2.3 From dd725cb19d0534ac5e3e8c169a5f3da46f146d59 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:11:35 +0100 Subject: gnu: r-gridgraphics: Update to 0.5-1. * gnu/packages/cran.scm (r-gridgraphics): Update to 0.5-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 1cfb9b4f5a..a73c9b97c4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15312,14 +15312,14 @@ yeast.") (define-public r-gridgraphics (package (name "r-gridgraphics") - (version "0.5-0") + (version "0.5-1") (source (origin (method url-fetch) (uri (cran-uri "gridGraphics" version)) (sha256 (base32 - "0rlyc3xk8kfrfzbfd8n4javq3yxqd7lsfmi4q5n6s61srnrl6c1r")))) + "12yswy02j3h5wir7m5jnkhpjmb0sa4snn61vjd68i49qwsa6w219")))) (properties `((upstream-name . "gridGraphics"))) (build-system r-build-system) (home-page "https://github.com/pmur002/gridgraphics") -- cgit v1.2.3 From a8ee51a215b12d79857bbfca5cc9a3865cf470e0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:11:38 +0100 Subject: gnu: r-sctransform: Update to 0.3.2. * gnu/packages/cran.scm (r-sctransform): Update to 0.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 a73c9b97c4..72d30c8019 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16207,14 +16207,14 @@ code edited with @code{RStudio IDE}, @code{Emacs} and @code{Vim}.") (define-public r-sctransform (package (name "r-sctransform") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (cran-uri "sctransform" version)) (sha256 (base32 - "0b8ni8dzlcikjm2bx5w8yi9vygx0qqxjrmnsy4kf7d1h03n2sxwa")))) + "1p3m6i28nlxh6r609syn88cwlbdpl3dw44dy3gsijk2ibq20mfsx")))) (build-system r-build-system) (propagated-inputs `(("r-future" ,r-future) -- cgit v1.2.3 From ba6210fa6d04e752a4ea0a0c8b57d35403e06d2a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:11:41 +0100 Subject: gnu: r-blme: Update to 1.0-5. * gnu/packages/cran.scm (r-blme): Update to 1.0-5. --- 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 72d30c8019..9468e2cea6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16311,14 +16311,14 @@ parallel versions of vectorized R functions of the @code{mc*apply} family.") (define-public r-blme (package (name "r-blme") - (version "1.0-4") + (version "1.0-5") (source (origin (method url-fetch) (uri (cran-uri "blme" version)) (sha256 (base32 - "1ca2b0248k0fj3lczn9shfjplz1sl4ay4v6djldizp2ch2vwdgy2")))) + "0413j7gwr5yj14jamkizj55q7xii1a0kgazzj0ilqn2ascclz6k7")))) (build-system r-build-system) (propagated-inputs `(("r-lme4" ,r-lme4))) (home-page "https://github.com/vdorie/blme") -- cgit v1.2.3 From 8e1c4975c4e6e1ff4cc0266a4fbc58f477c11a3e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:11:45 +0100 Subject: gnu: r-batchtools: Update to 0.9.15. * gnu/packages/cran.scm (r-batchtools): Update to 0.9.15. --- 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 9468e2cea6..ee7462da4f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16332,14 +16332,14 @@ extends the lme4 package.") (define-public r-batchtools (package (name "r-batchtools") - (version "0.9.14") + (version "0.9.15") (source (origin (method url-fetch) (uri (cran-uri "batchtools" version)) (sha256 (base32 - "1b78r70gm4a0wzjr367hqx2rfphfkbppp14d0l5zs2fvyz166lsx")))) + "0d2xy77hkzhcnyz8zxcv98i80fx6ripjw4rvyx4ww1d0vjjgqf52")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports) -- cgit v1.2.3 From 99ccf36481d32b4d60226b945a5e0e756bb28b66 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:11:49 +0100 Subject: gnu: r-xgboost: Update to 1.3.2.1. * gnu/packages/cran.scm (r-xgboost): Update to 1.3.2.1. [propagated-inputs]: Remove r-stringi. --- gnu/packages/cran.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ee7462da4f..f510adda0f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16725,20 +16725,19 @@ the current document.") (define-public r-xgboost (package (name "r-xgboost") - (version "1.2.0.1") + (version "1.3.2.1") (source (origin (method url-fetch) (uri (cran-uri "xgboost" version)) (sha256 (base32 - "16hpvv2hwdzcyg90z7c1g5d2hj011qk8mivy4l2nqd2g7rkjwis4")))) + "117q8xqm82589517fi8xicd8724v9c0wnq3qpl84h6nm3aw65x1g")))) (build-system r-build-system) (propagated-inputs `(("r-data-table" ,r-data-table) ("r-magrittr" ,r-magrittr) - ("r-matrix" ,r-matrix) - ("r-stringi" ,r-stringi))) + ("r-matrix" ,r-matrix))) (native-inputs `(("r-knitr" ,r-knitr))) (home-page "https://github.com/dmlc/xgboost") -- cgit v1.2.3 From 2cce04d5a1e19947dd9b5e25534c288876ef4c28 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:11:52 +0100 Subject: gnu: r-uwot: Update to 0.1.10. * gnu/packages/cran.scm (r-uwot): Update to 0.1.10. --- 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 f510adda0f..46ca8742a9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16783,14 +16783,14 @@ in R, including a translation of the original algorithm into R.") (define-public r-uwot (package (name "r-uwot") - (version "0.1.9") + (version "0.1.10") (source (origin (method url-fetch) (uri (cran-uri "uwot" version)) (sha256 (base32 - "1iqvircvlxyd68n5279a0cwn5rc3pshxs7w1gqrns9c602xd6mhy")))) + "08vxh085wnrxgwy35ksb4cr7ccjvd98pyr2zlgarqryfgc1bdqbf")))) (build-system r-build-system) (propagated-inputs `(("r-dqrng" ,r-dqrng) -- cgit v1.2.3 From 99d9a7293fb3e2190310d393ce33a318eb98086a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:11:55 +0100 Subject: gnu: r-patchwork: Update to 1.1.1. * gnu/packages/cran.scm (r-patchwork): Update to 1.1.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 46ca8742a9..df2c531e51 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16970,14 +16970,14 @@ guaranteeing well-connected communities.\" .") (define-public r-patchwork (package (name "r-patchwork") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (cran-uri "patchwork" version)) (sha256 (base32 - "13vswvcfmadmjz7pw0qdqdr6x85zbza4gljx2nx3a39hldj71yck")))) + "10glgkf58lcykcwda1hj6xdps02m3i247qynk6s2jmwljagps3fg")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) -- cgit v1.2.3 From 2fda946425e22b11c211b66688e8fed87d3b1b3d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:11:58 +0100 Subject: gnu: r-parameters: Update to 0.11.0. * gnu/packages/cran.scm (r-parameters): Update to 0.11.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 df2c531e51..324f6e0cda 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17295,14 +17295,14 @@ in pipelines.") (define-public r-parameters (package (name "r-parameters") - (version "0.10.1") + (version "0.11.0") (source (origin (method url-fetch) (uri (cran-uri "parameters" version)) (sha256 (base32 - "1xvjvsdd0hql209f7v2l1nw7gy8jkj5qp0699p5m2h55a01jl778")))) + "020k3vxnp0vjrlkcxx5vj30vag474hw48zxzw9315whsq4hhhbqc")))) (properties `((upstream-name . "parameters"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 3ebc2c39b1bf7d8a06ed8698e26b32a0025171f9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:12:01 +0100 Subject: gnu: r-rgdal: Update to 1.5-19. * gnu/packages/cran.scm (r-rgdal): Update to 1.5-19. --- 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 324f6e0cda..3d8b90670d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17324,13 +17324,13 @@ effect size.") (define-public r-rgdal (package (name "r-rgdal") - (version "1.5-18") + (version "1.5-19") (source (origin (method url-fetch) (uri (cran-uri "rgdal" version)) (sha256 - (base32 "1pr267sh0v6cympdg12yny51cmn4r20s5sjq2hqymn4kphcpqijk")))) + (base32 "1cii2azm3zv5l6fn33xzwahp8349z3pb2769vpdxkf7734dxggvg")))) (properties `((upstream-name . "rgdal"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From d05b222eb50965bf292bcc7cab080ad20d617188 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:12:05 +0100 Subject: gnu: r-sysfonts: Update to 0.8.3. * gnu/packages/cran.scm (r-sysfonts): Update to 0.8.3. --- 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 3d8b90670d..909d2557ff 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17942,14 +17942,14 @@ server-side.") (define-public r-sysfonts (package (name "r-sysfonts") - (version "0.8.2") + (version "0.8.3") (source (origin (method url-fetch) (uri (cran-uri "sysfonts" version)) (sha256 (base32 - "1gapsiva0vjd2myxgm1avav6my5x00rmy2hx0qll7dm7v1isznbv")))) + "00kbazxw6zd1kakfshffdj928krca53bw9k78k0zar40mbqxiwd5")))) (properties `((upstream-name . "sysfonts"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 5ccf0b2d79cee27340ba88555a3076ac466dc595 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:12:08 +0100 Subject: gnu: r-showtext: Update to 0.9-2. * gnu/packages/cran.scm (r-showtext): Update to 0.9-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 909d2557ff..1cef8d62b0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17990,14 +17990,14 @@ package.") (define-public r-showtext (package (name "r-showtext") - (version "0.9-1") + (version "0.9-2") (source (origin (method url-fetch) (uri (cran-uri "showtext" version)) (sha256 (base32 - "1hq346k2lm7rv49hw7srn3ab5gcp6b0r4zc1kgsdmswyh3q1asra")))) + "0y5mw6ffk92r7b22irrfhdmj4hxfl0d1wjxj14hznbapc4qm6f0z")))) (properties `((upstream-name . "showtext"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From af672c712fc98f843679c2ef9f354124dd38cf98 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:12:11 +0100 Subject: gnu: r-r-devices: Update to 2.17.0. * gnu/packages/cran.scm (r-r-devices): Update to 2.17.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 1cef8d62b0..c22c4e3a58 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18837,14 +18837,14 @@ identify file sets and individual files.") (define-public r-r-devices (package (name "r-r-devices") - (version "2.16.1") + (version "2.17.0") (source (origin (method url-fetch) (uri (cran-uri "R.devices" version)) (sha256 (base32 - "15zlnq3g27whq26fbcy5zfl5hiddm256h4rga4frblg6wqlbkvdd")))) + "1djz6vm1b7sjvx1q319dl47gbnz9kvipaxcz9i0spyp094lv3m62")))) (properties `((upstream-name . "R.devices"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ce2043266bcdc1f79653e4804decec2386f7f92a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:12:14 +0100 Subject: gnu: r-hdrcde: Update to 3.4. * gnu/packages/cran.scm (r-hdrcde): Update to 3.4. --- 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 c22c4e3a58..7cf3fdaec9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19482,14 +19482,14 @@ R.") (define-public r-hdrcde (package (name "r-hdrcde") - (version "3.3") + (version "3.4") (source (origin (method url-fetch) (uri (cran-uri "hdrcde" version)) (sha256 (base32 - "0c2qbw4c3mq1cb068kjs72rxlbibz8svwcrx853jyr8ybs23z7ab")))) + "16qlk44cjvn2s0vzaf915df65ksdx20dbxhy7fpdqins46hccha3")))) (properties `((upstream-name . "hdrcde"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 1ab88a97b9ab2a2d4c33373965fcf957959d70f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:12:17 +0100 Subject: gnu: r-fda: Update to 5.1.9. * gnu/packages/cran.scm (r-fda): Update to 5.1.9. --- 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 7cf3fdaec9..613ddf1bc4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19563,14 +19563,14 @@ variable observed over time.") (define-public r-fda (package (name "r-fda") - (version "5.1.7") + (version "5.1.9") (source (origin (method url-fetch) (uri (cran-uri "fda" version)) (sha256 (base32 - "1r8hfi6x1maw5zz8k95wfcr7v69lg4zl3mcj69cvvq2mkg4y3158")))) + "0yjrjsv55bcwqn2yxjgj3hn17wfvjvgngfw9xv3w802i52yz9gf8")))) (properties `((upstream-name . "fda"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 8d5f8f9a723970408cfde35a8138e7b28490943f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:12:21 +0100 Subject: gnu: r-activityindex: Update to 0.3.7. * gnu/packages/cran.scm (r-activityindex): Update to 0.3.7. [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 613ddf1bc4..f35f089971 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19670,20 +19670,22 @@ data for different accelerometer brands.") (define-public r-activityindex (package (name "r-activityindex") - (version "0.3.6") + (version "0.3.7") (source (origin (method url-fetch) (uri (cran-uri "ActivityIndex" version)) (sha256 (base32 - "14k6d78s15j7kb7jhixf4msrdjdl28d0r264cbvy41p8dkq7ysvk")))) + "1zj2b6x31a1kxl80rarmkrlm7ack4154mrkbqs3fpi48zpmjbgd5")))) (properties `((upstream-name . "ActivityIndex"))) (build-system r-build-system) (propagated-inputs `(("r-data-table" ,r-data-table) ("r-matrixstats" ,r-matrixstats) ("r-r-utils" ,r-r-utils))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://cran.r-project.org/web/packages/ActivityIndex/") (synopsis "Activity Index calculation using raw accelerometry data") (description -- cgit v1.2.3 From 079b99d8b6894e2aaee008614affe108e3d4b20c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:12:25 +0100 Subject: gnu: r-actuar: Update to 3.1-0. * gnu/packages/cran.scm (r-actuar): Update to 3.1-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 f35f089971..be851635f2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19804,14 +19804,14 @@ API; see the package vignette for details.") (define-public r-actuar (package (name "r-actuar") - (version "3.0-0") + (version "3.1-0") (source (origin (method url-fetch) (uri (cran-uri "actuar" version)) (sha256 (base32 - "0dkp1sczldzy7kj70qvh1q59jhsq1brjybmxdz43jnx63y45llpz")))) + "15a8axb2ym46j8vlm7icwnsc950p8m66hp0armha7drk0725y77k")))) (properties `((upstream-name . "actuar"))) (build-system r-build-system) (propagated-inputs `(("r-expint" ,r-expint))) -- cgit v1.2.3 From 3442505f411e9438b2333216da77e1150f10f6f9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:12:28 +0100 Subject: gnu: r-semtools: Update to 0.5-4. * gnu/packages/cran.scm (r-semtools): Update to 0.5-4. --- 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 be851635f2..91f4f5900e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21309,14 +21309,14 @@ least squares.") (define-public r-semtools (package (name "r-semtools") - (version "0.5-3") + (version "0.5-4") (source (origin (method url-fetch) (uri (cran-uri "semTools" version)) (sha256 (base32 - "0k3w10fnq0l89inhxvnypyrfhlrm921mfn0kwyyfpndvbqizky1d")))) + "15kban4ds2mssxqslm126b89p8biya14c9m68sqk61vzvx5dm2vq")))) (properties `((upstream-name . "semTools"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 48cab177765eb3128956af595861afacc846bd28 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:12:31 +0100 Subject: gnu: r-stanheaders: Update to 2.21.0-7. * gnu/packages/cran.scm (r-stanheaders): Update to 2.21.0-7. --- 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 91f4f5900e..3793223bf6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21360,14 +21360,14 @@ perform @dfn{exploratory mediation} (XMed).") (define-public r-stanheaders (package (name "r-stanheaders") - (version "2.21.0-6") + (version "2.21.0-7") (source (origin (method url-fetch) (uri (cran-uri "StanHeaders" version)) (sha256 (base32 - "1wwcrss4y6xbi81cg6ldhm57wz5paflzzp3yxh8b6shf9l2jla50")))) + "0srkyawyiykn3p5lw1z3zf18s4ax4iasv1ci3l1px40f9w36wm17")))) (properties `((upstream-name . "StanHeaders"))) (build-system r-build-system) (inputs `(("pandoc" ,pandoc))) -- cgit v1.2.3 From 31180c692c7f14b0dbd04a57ddc14bda3d004bbd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:12:34 +0100 Subject: gnu: r-loo: Update to 2.4.1. * gnu/packages/cran.scm (r-loo): Update to 2.4.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 3793223bf6..4b406a41dc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22045,13 +22045,13 @@ recommendations for developers.") (define-public r-loo (package (name "r-loo") - (version "2.4.0") + (version "2.4.1") (source (origin (method url-fetch) (uri (cran-uri "loo" version)) (sha256 - (base32 "01a15ikfnyxhjhrgvy3ag929rg45dxp3wji1j38r4hg4q1yz4ma9")))) + (base32 "0l2v8zpashqbnck3qx5lp1gqjcfphzky8mxyw5gfk9wk99mzn8dw")))) (properties `((upstream-name . "loo"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From da7887e6452420ba83c78c6203ce8c30c3cffffb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:12:37 +0100 Subject: gnu: r-aws: Update to 2.5-1. * gnu/packages/cran.scm (r-aws): Update to 2.5-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 4b406a41dc..14f1a2399a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22736,14 +22736,14 @@ is also implemented here.") (define-public r-aws (package (name "r-aws") - (version "2.5") + (version "2.5-1") (source (origin (method url-fetch) (uri (cran-uri "aws" version)) (sha256 (base32 - "1mwg1q7l4a07g5aa9c6kh3fpl9lakk01pbzlk7ixbpy12yfvj9nm")))) + "1fhm87iax6bkvd4vszvjbcqw3b2drs11rjxr7zf2w4sgc72svaz8")))) (properties `((upstream-name . "aws"))) (build-system r-build-system) -- cgit v1.2.3 From 52b3fba20430d373aa04e32488ff718dea259196 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:12:41 +0100 Subject: gnu: r-mstate: Update to 0.3.1. * gnu/packages/cran.scm (r-mstate): Update to 0.3.1. [propagated-inputs]: Add r-data-table, r-lattice, r-magrittr, r-rlang, and r-viridis. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 14f1a2399a..ee6b422c58 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23111,19 +23111,26 @@ with posterior predictive checks and leave-one-out cross-validation.") (define-public r-mstate (package (name "r-mstate") - (version "0.2.12") + (version "0.3.1") (source (origin (method url-fetch) (uri (cran-uri "mstate" version)) (sha256 (base32 - "0qnhivbibzss8yfsg44cvbf73n4jj4i28rbdysl88g14ig5sabgv")))) + "11i3p7fph8nbnfis1m7rdrq32qryaajv2wrkxk1x6k17zkh4rq6i")))) (properties `((upstream-name . "mstate"))) (build-system r-build-system) (propagated-inputs - `(("r-rcolorbrewer" ,r-rcolorbrewer) - ("r-survival" ,r-survival))) + `(("r-data-table" ,r-data-table) + ("r-lattice" ,r-lattice) + ("r-magrittr" ,r-magrittr) + ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-rlang" ,r-rlang) + ("r-survival" ,r-survival) + ("r-viridis" ,r-viridis))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://www.lumc.nl/org/bds/research/medische-statistiek/survival-analysis/") (synopsis -- cgit v1.2.3 From d7e5ab553c6a405b7ec2fc65c04f93cf6ba7d21b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:12:45 +0100 Subject: gnu: r-directlabels: Update to 2021.1.13. * gnu/packages/cran.scm (r-directlabels): Update to 2021.1.13. --- 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 ee6b422c58..3fe4a1ab73 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23195,14 +23195,14 @@ permuted copies (shadows).") (define-public r-directlabels (package (name "r-directlabels") - (version "2020.6.17") + (version "2021.1.13") (source (origin (method url-fetch) (uri (cran-uri "directlabels" version)) (sha256 (base32 - "1b6v206kizz5rjw03chjvn40a7cqihjpk80h1h79z2x27hp1qi3f")))) + "0415kh9k2qzdwi8zb32fh2icl5wf5335kyj11cyfdmfxji39zv2w")))) (build-system r-build-system) (propagated-inputs `(("r-quadprog" ,r-quadprog))) -- cgit v1.2.3 From 59f4eafddaee9009ec202f214467661e75a74031 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:12:49 +0100 Subject: gnu: r-shapforxgboost: Update to 0.1.0. * gnu/packages/cran.scm (r-shapforxgboost): Update to 0.1.0. [propagated-inputs]: Add r-lightgbm. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3fe4a1ab73..f38d6ee900 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23359,14 +23359,14 @@ designed to be distributed and efficient with the following goals: (define-public r-shapforxgboost (package (name "r-shapforxgboost") - (version "0.0.4") + (version "0.1.0") (source (origin (method url-fetch) (uri (cran-uri "SHAPforxgboost" version)) (sha256 (base32 - "0k6bg27wqnkzv82bcahbapmqhiz6rvnx81m23zbjw58c7lwshgnq")))) + "0jgyss9bawl7sf4dwa75sn7ld3mvrrr0z2074lbkq3f5qb9gwsly")))) (properties `((upstream-name . "SHAPforxgboost"))) (build-system r-build-system) @@ -23377,6 +23377,7 @@ designed to be distributed and efficient with the following goals: ("r-ggforce" ,r-ggforce) ("r-ggplot2" ,r-ggplot2) ("r-ggpubr" ,r-ggpubr) + ("r-lightgbm" ,r-lightgbm) ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-xgboost" ,r-xgboost))) (home-page "https://github.com/liuyanguu/SHAPforxgboost") -- cgit v1.2.3 From fdd4eff2795f9e6994ecd850b7d5ba6e672724f4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:12:52 +0100 Subject: gnu: r-spatstat-utils: Update to 1.20-2. * gnu/packages/cran.scm (r-spatstat-utils): Update to 1.20-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 f38d6ee900..4bc120b8f5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23711,14 +23711,14 @@ diagonals. This package allows you to compute the tensor product of arrays.") (define-public r-spatstat-utils (package (name "r-spatstat-utils") - (version "1.17-0") + (version "1.20-2") (source (origin (method url-fetch) (uri (cran-uri "spatstat.utils" version)) (sha256 (base32 - "08h9kzkkxvlnngxnv5mdylfali5jj4yhgbr8kvf8l7glswz6ik9r")))) + "066f35017wpbz9plwc14gji3ddq4a1h2lx4mcgxajrcrk0zl3hk2")))) (properties `((upstream-name . "spatstat.utils"))) (build-system r-build-system) -- cgit v1.2.3 From a2d9fb647728da65e6f1b67d0c1747f87c61ad67 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:12:55 +0100 Subject: gnu: r-spatstat-data: Update to 1.7-0. * gnu/packages/cran.scm (r-spatstat-data): Update to 1.7-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 4bc120b8f5..0382bf5756 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23732,14 +23732,14 @@ which may also be useful for other purposes.") (define-public r-spatstat-data (package (name "r-spatstat-data") - (version "1.5-2") + (version "1.7-0") (source (origin (method url-fetch) (uri (cran-uri "spatstat.data" version)) (sha256 (base32 - "17vbf48g1mh8iigzzlaa9j4mw087hib7f1kkbl3c50xjcrr5iw6b")))) + "0by10dx72jjn6rvgrdj4xwh4zg6vxi4cp536aq4b6drb7za95hdv")))) (properties `((upstream-name . "spatstat.data"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 6c047222ab7afb207bb42cc75679e99ff88922e9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:12:58 +0100 Subject: gnu: r-cpp11: Update to 0.2.5. * gnu/packages/cran.scm (r-cpp11): Update to 0.2.5. --- 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 0382bf5756..333ab62a98 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23822,14 +23822,14 @@ for linear mixed models (AIREML).") (define-public r-cpp11 (package (name "r-cpp11") - (version "0.2.4") + (version "0.2.5") (source (origin (method url-fetch) (uri (cran-uri "cpp11" version)) (sha256 (base32 - "08lrmpfkwh1w290a5ikhs9yn1vn32wbgvbzb4n3zb2indb8s5g69")))) + "081f3b98mcxyilqsxbzzdnj2x6v7xycprrw7r5934163q0397vvg")))) (properties `((upstream-name . "cpp11"))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From 9bc39d8382fe6ecef0998d9ee5b4484839c80e69 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:13:01 +0100 Subject: gnu: r-config: Update to 0.3.1. * gnu/packages/cran.scm (r-config): Update to 0.3.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 333ab62a98..ab4edde452 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24280,14 +24280,14 @@ coerce and verify the types and shapes of values for input checking.") (define-public r-config (package (name "r-config") - (version "0.3") + (version "0.3.1") (source (origin (method url-fetch) (uri (cran-uri "config" version)) (sha256 (base32 - "0l67nfpm42ssnk0bl4jmq6bibz8hawgfgh2s14s5c8mnimv6mpjs")))) + "0l2zp7v6qaz72dclcbjrlis633zlwp8rsi5azr7iw127iyz7i26l")))) (properties `((upstream-name . "config"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From f7642d2fd20ff585b7034e2611b59380fc686c25 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:13:05 +0100 Subject: gnu: r-hunspell: Update to 3.0.1. * gnu/packages/cran.scm (r-hunspell): Update to 3.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 ab4edde452..ad0f8c59ff 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24804,14 +24804,14 @@ consistent interface, and the package is built on the @code{stringi} and (define-public r-hunspell (package (name "r-hunspell") - (version "3.0") + (version "3.0.1") (source (origin (method url-fetch) (uri (cran-uri "hunspell" version)) (sha256 (base32 - "0mwqw5p0ph083plm2hr2hqr50bjg2dw862dpsfm4l2fgyy3rryq1")))) + "0ql6y05d4xxpm468rslb0wxdp1x9l3flxzmb5w6pjg617f8vpv8z")))) (properties `((upstream-name . "hunspell"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 501e18eb23ce50d4c91d2debc3be5fa4584c4494 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:13:10 +0100 Subject: gnu: r-tidytext: Update to 0.3.0. * gnu/packages/cran.scm (r-tidytext): Update to 0.3.0. [propagated-inputs]: Add r-lifecycle and r-vctrs. --- gnu/packages/cran.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ad0f8c59ff..f9b25b9876 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24839,14 +24839,14 @@ vignettes in all common formats.") (define-public r-tidytext (package (name "r-tidytext") - (version "0.2.6") + (version "0.3.0") (source (origin (method url-fetch) (uri (cran-uri "tidytext" version)) (sha256 (base32 - "0xmjkab7p13ncfglf3a9hvndf8fh96mmxw3l7hcpbnaq9qkiwk29")))) + "1icbfw4zkbs9sp6vk814mw2zzm0bc0d7af92vhriqxaga0gbwdkx")))) (properties `((upstream-name . "tidytext"))) (build-system r-build-system) (propagated-inputs @@ -24854,12 +24854,14 @@ vignettes in all common formats.") ("r-generics" ,r-generics) ("r-hunspell" ,r-hunspell) ("r-janeaustenr" ,r-janeaustenr) + ("r-lifecycle" ,r-lifecycle) ("r-matrix" ,r-matrix) ("r-purrr" ,r-purrr) ("r-rlang" ,r-rlang) ("r-stringr" ,r-stringr) ("r-tibble" ,r-tibble) - ("r-tokenizers" ,r-tokenizers))) + ("r-tokenizers" ,r-tokenizers) + ("r-vctrs" ,r-vctrs))) (native-inputs `(("r-knitr" ,r-knitr))) (home-page "https://github.com/juliasilge/tidytext") -- cgit v1.2.3 From e45c3ac81441b0343a8d900d1aff3ad2f4de484e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:13:13 +0100 Subject: gnu: r-parsnip: Update to 0.1.5. * gnu/packages/cran.scm (r-parsnip): Update to 0.1.5. --- 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 f9b25b9876..cd6f384842 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24874,14 +24874,14 @@ analysis using @code{dplyr}, @code{ggplot2}, and other Tidy tools.") (define-public r-parsnip (package (name "r-parsnip") - (version "0.1.4") + (version "0.1.5") (source (origin (method url-fetch) (uri (cran-uri "parsnip" version)) (sha256 (base32 - "1134840xisvkkrbkh5kvx24vxp7sx06124svy573a9m4h8c492sr")))) + "0c12lyfxqsdprqlcmgy421py38z28h88d68pxb1c4fw14v1c2d06")))) (properties `((upstream-name . "parsnip"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 53963d5bf7e8636364bcb62273d5350cf2d44eb0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:13:16 +0100 Subject: gnu: r-infer: Update to 0.5.4. * gnu/packages/cran.scm (r-infer): Update to 0.5.4. --- 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 cd6f384842..7a8eb35859 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24909,14 +24909,14 @@ functions or computational engines (e.g. R, Spark, Stan, etc).") (define-public r-infer (package (name "r-infer") - (version "0.5.3") + (version "0.5.4") (source (origin (method url-fetch) (uri (cran-uri "infer" version)) (sha256 (base32 - "1q0lnxnv8krv4n9z80sh4b442s89rvnbph5bddy34z83bkncwv2g")))) + "0wvvgqjhyv7ql98cjzqad61wbmk7xrqd1ybk894jr5cmza13c8w2")))) (properties `((upstream-name . "infer"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 8f7e2049957ceaa3c6834ac28c2883635a33853d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:13:19 +0100 Subject: gnu: r-qtl: Update to 1.47-9. * gnu/packages/cran.scm (r-qtl): Update to 1.47-9. --- 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 7a8eb35859..396af2beab 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25131,14 +25131,14 @@ covariate (usually group indicator) and the scores.") (define-public r-qtl (package (name "r-qtl") - (version "1.46-2") + (version "1.47-9") (source (origin (method url-fetch) (uri (cran-uri "qtl" version)) (sha256 (base32 - "0rbwcnvyy96gq1dsgpxx03pv423qya26h6ws5y0blj3blfdmj83a")))) + "0hffirsvw9j82cdx6l7vhqn3a7ab52claqjlinv3lswl1nsfg93b")))) (build-system r-build-system) (home-page "https://rqtl.org/") (synopsis "R package for analyzing QTL experiments in genetics") -- cgit v1.2.3 From a0f9ce93b9fbf218c5fdef084b0a1087426f9f91 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:13:22 +0100 Subject: gnu: r-qtl2: Update to 0.24. * gnu/packages/cran.scm (r-qtl2): Update to 0.24. --- 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 396af2beab..a1a03f3970 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25154,12 +25154,12 @@ genome scans.") (define-public r-qtl2 (package (name "r-qtl2") - (version "0.22-11") + (version "0.24") (source (origin (method url-fetch) (uri (cran-uri "qtl2" version)) (sha256 - (base32 "0dfdzjylqzc92dcszawc8cyinxccjm3p36v9vcq9ma818pqcanmr")))) + (base32 "1558khh0zkwm0rdk87krv9836krvwv5h7ymlz9bsrgcvypyr9186")))) (build-system r-build-system) (propagated-inputs `(("r-data-table" ,r-data-table) -- cgit v1.2.3 From 6dacb2eee2aed16135251891cb6bf22db30686cf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:13:27 +0100 Subject: gnu: r-seurat: Update to 3.2.3. * gnu/packages/cran.scm (r-seurat): Update to 3.2.3. [propagated-inputs]: Add r-scattermore. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a1a03f3970..073a1e188a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25251,13 +25251,13 @@ data to rasters. It speeds up plotting of data with millions of points.") (define-public r-seurat (package (name "r-seurat") - (version "3.2.2") + (version "3.2.3") (source (origin (method url-fetch) (uri (cran-uri "Seurat" version)) (sha256 (base32 - "048vnj0c3mrwhr6yq3jqhgnkg68w99nj1ccsmgnd8rl694w26spj")))) + "11rzc7h2ad8z8k5r1sbz4d7y4rl3080qp2hh7vibwmipbkvlial3")))) (properties `((upstream-name . "Seurat"))) (build-system r-build-system) (propagated-inputs @@ -25297,6 +25297,7 @@ data to rasters. It speeds up plotting of data with millions of points.") ("r-rsvd" ,r-rsvd) ("r-rtsne" ,r-rtsne) ("r-scales" ,r-scales) + ("r-scattermore" ,r-scattermore) ("r-sctransform" ,r-sctransform) ("r-shiny" ,r-shiny) ("r-spatstat" ,r-spatstat) -- cgit v1.2.3 From 958b735189d775b51c9c65c5a6f435db884f1940 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:13:31 +0100 Subject: gnu: r-calculus: Update to 0.3.0. * gnu/packages/cran.scm (r-calculus): Update to 0.3.0. [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 073a1e188a..ec0dc63509 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25403,18 +25403,20 @@ absolute GSEA.") (define-public r-calculus (package (name "r-calculus") - (version "0.2.1") + (version "0.3.0") (source (origin (method url-fetch) (uri (cran-uri "calculus" version)) (sha256 (base32 - "0hs7hzjl6xjza20v9zx9a1piywxa6w3h2rskr52d1dcbc0vwhinp")))) + "1wa5ap89cfcp0ancj9ivx5s2y0wqr2vmp9y115g7f6g772jwhscj")))) (properties `((upstream-name . "calculus"))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/eguidotti/calculus") (synopsis "High dimensional numerical and symbolic calculus") (description -- cgit v1.2.3 From cf40cb0cc40d6ef3a21f8e36f05be260d287ca35 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:13:35 +0100 Subject: gnu: r-lgr: Update to 0.4.2. * gnu/packages/cran.scm (r-lgr): Update to 0.4.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 ec0dc63509..f56b928601 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25573,16 +25573,18 @@ Services (AWS) Simple Storage Service (S3) REST API.") (define-public r-lgr (package (name "r-lgr") - (version "0.4.1") + (version "0.4.2") (source (origin (method url-fetch) (uri (cran-uri "lgr" version)) (sha256 (base32 - "196553hmni1ha9y6494f4g3ds0lwcl81v7k4r8wwap4a6acdrgd9")))) + "0k4kacjk7swm3gmdpha1rg44xb29vzvhvx48jhpb78glj5c9phyr")))) (build-system r-build-system) (propagated-inputs `(("r-r6" ,r-r6))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://s-fleck.github.io/lgr/") (synopsis "Fully featured logging framework") (description "This package offers a flexible, feature-rich yet -- cgit v1.2.3 From 8eee252011b2c7c3534eeaa9a97b3e6c5b645495 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:13:38 +0100 Subject: gnu: r-mlr3measures: Update to 0.3.1. * gnu/packages/cran.scm (r-mlr3measures): Update to 0.3.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 f56b928601..5c5dd1ad5f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25597,13 +25597,13 @@ well as email and push notifications.") (define-public r-mlr3measures (package (name "r-mlr3measures") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (cran-uri "mlr3measures" version)) (sha256 (base32 - "106lfaxphz0kh96ddq14hic7wvxjqp871zdp9kkkfk1kwfg35abw")))) + "18jk4kdj9771r16smz7xhmmiilcdg1qlavln5hrpvkx780zh3hj6")))) (build-system r-build-system) (propagated-inputs `(("r-checkmate" ,r-checkmate) -- cgit v1.2.3 From 5f40f3edc802b712dafd624d6efab36f3378b3f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:13:41 +0100 Subject: gnu: r-mlr3misc: Update to 0.7.0. * gnu/packages/cran.scm (r-mlr3misc): Update to 0.7.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 5c5dd1ad5f..874a77c552 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25620,13 +25620,13 @@ are.") (define-public r-mlr3misc (package (name "r-mlr3misc") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3misc" version)) (sha256 (base32 - "1q63i2059bf7cf61kwm0dqnk5vd60i0j4flziswwdk07fjxqh8xr")))) + "19k3l2d6wnqvdng0m7p54rrlvwl5457lcy7bg82m2bbpqxi8qch3")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports) -- cgit v1.2.3 From 33184efac86f933ce1db903c12f38c59f1882179 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:13:45 +0100 Subject: gnu: r-matrix: Update to 1.3-2. * gnu/packages/statistics.scm (r-matrix): Update to 1.3-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 659ca68f44..701ca7aa91 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -586,14 +586,14 @@ also flexible enough to handle most nonstandard requirements.") (define-public r-matrix (package (name "r-matrix") - (version "1.2-18") + (version "1.3-2") (source (origin (method url-fetch) (uri (cran-uri "Matrix" version)) (sha256 (base32 - "06b1rc1vq65b271f2wpzhqkvhng8hwwnvjflzxkng50i52603zzp")))) + "0ccmmfd0lbvrhzjzr28k4yfawiywa1m4ics34zyi3rqq23csa2wm")))) (properties `((upstream-name . "Matrix"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 1e1edda31c9459a0b5696b243213494cf2fde4f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:13:48 +0100 Subject: gnu: r-nlme: Update to 3.1-151. * gnu/packages/statistics.scm (r-nlme): Update to 3.1-151. --- 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 701ca7aa91..88f5da54c7 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -608,13 +608,13 @@ and operations on them using LAPACK and SuiteSparse.") (define-public r-nlme (package (name "r-nlme") - (version "3.1-150") + (version "3.1-151") (source (origin (method url-fetch) (uri (cran-uri "nlme" version)) (sha256 - (base32 "18qmbzrmrham8hbdlzsca7w46c5iqighx1ymzggll5s86c4s7kvr")))) + (base32 "1jl6x0glpyszy6bkbcggm3f10jl4kldhs5q561k85xcbssx2dim2")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From a7c27124ebfd35b82a41f641b32978c62e427302 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:13:51 +0100 Subject: gnu: r-ggplot2: Update to 3.3.3. * gnu/packages/statistics.scm (r-ggplot2): Update to 3.3.3. --- 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 88f5da54c7..e14b73e620 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1112,13 +1112,13 @@ using just two functions: melt and dcast (or acast).") (define-public r-ggplot2 (package (name "r-ggplot2") - (version "3.3.2") + (version "3.3.3") (source (origin (method url-fetch) (uri (cran-uri "ggplot2" version)) (sha256 - (base32 "0wsib5qpzn4d0w1ss3x158xmrawkms8vvsfvr3mh40pvd8g2ibad")))) + (base32 "1k136k1sr6dq1xvx6gs6gzji6hbnnwnsb5qivsxrblfv90irxhj5")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) -- cgit v1.2.3 From aed08f62d9c74fbefa11cbd98f764b523f21bfc0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:13:54 +0100 Subject: gnu: r-gdtools: Update to 0.2.3. * gnu/packages/statistics.scm (r-gdtools): Update to 0.2.3. --- 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 e14b73e620..62c17cb7ee 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1175,14 +1175,14 @@ agnes cluster diagrams.") (define-public r-gdtools (package (name "r-gdtools") - (version "0.2.2") + (version "0.2.3") (source (origin (method url-fetch) (uri (cran-uri "gdtools" version)) (sha256 (base32 - "08njzin0c6biw62j5w30r9j85vr1m2cg4hmv5d76nym860yrlqjf")))) + "1p3ip0qwpg8f63jfx0b8vbac6l20ddid8xvxzkfi6i858pybnawp")))) (build-system r-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 132c91c4331e69d8fb130009ae7ffe7ddb610f6b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:13:58 +0100 Subject: gnu: r-dbi: Update to 1.1.1. * gnu/packages/statistics.scm (r-dbi): Update to 1.1.1. [native-inputs]: Add r-knitr. --- gnu/packages/statistics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 62c17cb7ee..3bb7096944 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1268,14 +1268,16 @@ evaluation (NSE) in R.") (define-public r-dbi (package (name "r-dbi") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (cran-uri "DBI" version)) (sha256 (base32 - "1r03j9rdcxb9bhxk40dkmy10ikz4yzsxhy3f9k9ix3x577xbfvd9")))) + "0i0kfyg43nryyka2bjlgz4x75w965224qp36wz1hl7a2lswb6ajp")))) (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/rstats-db/DBI") (synopsis "R database interface") (description -- cgit v1.2.3 From a76d4f182a789e0ce6e90c6362d53479ff635056 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:14:01 +0100 Subject: gnu: r-bh: Update to 1.75.0-0. * gnu/packages/statistics.scm (r-bh): Update to 1.75.0-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 3bb7096944..635d8ae632 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1290,13 +1290,13 @@ R/DBMS implementations.") (define-public r-bh (package (name "r-bh") - (version "1.72.0-3") + (version "1.75.0-0") (source (origin (method url-fetch) (uri (cran-uri "BH" version)) (sha256 (base32 - "1ay8vb6i730lipg8b8g3893vqglhw2kqpc29lwdrxdkb66iw33l8")))) + "0nkgvl5qjs2a7jv0ncsrl4fqaw2pdaj7a1pncdv6kp874sci0k5f")))) (build-system r-build-system) (home-page "https://github.com/eddelbuettel/bh") (synopsis "R package providing subset of Boost headers") -- cgit v1.2.3 From cee5a27529ac97bffe3a0a2730380c786d555ca5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:14:04 +0100 Subject: gnu: r-testthat: Update to 3.0.1. * gnu/packages/statistics.scm (r-testthat): Update to 3.0.1. --- 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 635d8ae632..8fb4668cf4 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1585,13 +1585,13 @@ R packages that praise their users.") (define-public r-testthat (package (name "r-testthat") - (version "3.0.0") + (version "3.0.1") (source (origin (method url-fetch) (uri (cran-uri "testthat" version)) (sha256 (base32 - "069ixg03r1s85my9dbc9c1261i4gz8fc1mv67whi2l6kpbp4cjzh")))) + "1l1s4jgmgbsf711ma5i58ssgkz98an7hijcxvwfz314nf5fc8zr9")))) (build-system r-build-system) (propagated-inputs `(("r-brio" ,r-brio) -- cgit v1.2.3 From 521b7db252ec0f7203a3e6cdf30fe27846519273 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:14:07 +0100 Subject: gnu: r-rlang: Update to 0.4.10. * gnu/packages/statistics.scm (r-rlang): Update to 0.4.10. --- 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 8fb4668cf4..38637256aa 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1647,13 +1647,13 @@ defined in different packages.") (define-public r-rlang (package (name "r-rlang") - (version "0.4.9") + (version "0.4.10") (source (origin (method url-fetch) (uri (cran-uri "rlang" version)) (sha256 (base32 - "0qix6jigz3qqjx151fpv1k5hq2miqyakvm3jql2qqsyr9d1028yr")))) + "0ximv89f6zymnwms121k1jfvvflrdm3pmmf5xyvz56f1qiq04lq7")))) (build-system r-build-system) (home-page "http://rlang.tidyverse.org") (synopsis "Functions for base types, core R and Tidyverse features") -- cgit v1.2.3 From d266d87f6a67c1cf15e7ff04f5992be6a6650f72 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:14:10 +0100 Subject: gnu: r-tibble: Update to 3.0.5. * gnu/packages/statistics.scm (r-tibble): Update to 3.0.5. --- 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 38637256aa..123f035661 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1665,14 +1665,14 @@ like tidy evaluation.") (define-public r-tibble (package (name "r-tibble") - (version "3.0.4") + (version "3.0.5") (source (origin (method url-fetch) (uri (cran-uri "tibble" version)) (sha256 (base32 - "189yyl27mnswk1z51xw6gj3lyxgy6m332jq8xyvwskff57w2w692")))) + "142i34h53b8w8jkh3l8y3xsqfvvgp7ybfbv830bjky7cymxjvj8w")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) -- cgit v1.2.3 From 3204b481f74d8d162cf474b49164524a89a9dea8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:14:13 +0100 Subject: gnu: r-dplyr: Update to 1.0.3. * gnu/packages/statistics.scm (r-dplyr): Update to 1.0.3. --- 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 123f035661..431b2ee060 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1697,13 +1697,13 @@ and printing capabilities than traditional data frames.") (define-public r-dplyr (package (name "r-dplyr") - (version "1.0.2") + (version "1.0.3") (source (origin (method url-fetch) (uri (cran-uri "dplyr" version)) (sha256 (base32 - "0jnw18nw20gw3jvq3kvkf9mqn6b7mvgmys8g6350k5jwpygk5cbw")))) + "0hc4wnx70mrsb3s0k5ywffhnky3hznlrvvs22m6ls5crgvcak898")))) (build-system r-build-system) (propagated-inputs `(("r-ellipsis" ,r-ellipsis) -- cgit v1.2.3 From 89000790ae82107bb33fb447bc20dcca06388d3e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:14:17 +0100 Subject: gnu: r-data-table: Update to 1.13.6. * gnu/packages/statistics.scm (r-data-table): Update to 1.13.6. --- 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 431b2ee060..45be96d2c0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1852,13 +1852,13 @@ times.") (define-public r-data-table (package (name "r-data-table") - (version "1.13.4") + (version "1.13.6") (source (origin (method url-fetch) (uri (cran-uri "data.table" version)) (sha256 (base32 - "0jrvl5b8qbzmiymhjgbj4l2nai87ijvv33aw24xvzjx0rkys9dv1")))) + "16ryrpzl86krww5nx7a97i09y5xqld4lw4d9pa1vzjl99x6ds36m")))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) -- cgit v1.2.3 From bf3979cb1019d5e1e935f0c7bdc0256c240730ef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:14:20 +0100 Subject: gnu: r-backports: Update to 1.2.1. * gnu/packages/statistics.scm (r-backports): Update to 1.2.1. --- 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 45be96d2c0..b1b856dce4 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2127,14 +2127,14 @@ limited to R.") (define-public r-backports (package (name "r-backports") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (cran-uri "backports" version)) (sha256 (base32 - "1xgp4i6yxkh2viia96hlf004hn47yrhfivwf8wv63xdldqa8yj9v")))) + "1mf2nz78l97lbxyagv55bcxrny51ds8g28h307cfa1g3ayylp0x2")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/backports") (synopsis "Reimplementations of functions introduced since R 3.0.0") -- cgit v1.2.3 From e25b88ab2e1ca32b841599053d4901d66c484631 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:14:23 +0100 Subject: gnu: r-git2r: Update to 0.28.0. * gnu/packages/statistics.scm (r-git2r): Update to 0.28.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 b1b856dce4..f6335e2b59 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2411,13 +2411,13 @@ functions make it easy to control additional request components.") (define-public r-git2r (package (name "r-git2r") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (cran-uri "git2r" version)) (sha256 (base32 - "1h1vfzym6hi1fqs9p5z5v0f4xldggr425frw8k6dsidah3qhg4h9")))) + "1wjmbs9cmm16pm3g0rmqp7cxxyh95m5lgx4fx5bpgj6j466i8vff")))) (build-system r-build-system) (inputs `(("libgit2" ,libgit2) -- cgit v1.2.3 From 1a1dfc99c8f64675fa598ef86a5f7b018d89b577 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:14:26 +0100 Subject: gnu: r-withr: Update to 2.4.0. * gnu/packages/statistics.scm (r-withr): Update to 2.4.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 f6335e2b59..3b29b9f624 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2496,13 +2496,13 @@ tools to simplify the devolpment of R packages.") (define-public r-withr (package (name "r-withr") - (version "2.3.0") + (version "2.4.0") (source (origin (method url-fetch) (uri (cran-uri "withr" version)) (sha256 (base32 - "1837vjp35npjrnis1im5xrwj1swpgnms00gkjiz7296l8yckrh1c")))) + "1y0l6zbpg0wix60r58yk452aqvx4rd0bk7zw9b90lzniwk3wvr7d")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From 6dda6613884dca635268ca8edfec9a42c570c7fc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:14:31 +0100 Subject: gnu: r-hms: Update to 1.0.0. * gnu/packages/statistics.scm (r-hms): Update to 1.0.0. [propagated-inputs]: Add r-ellipsis and r-lifecycle. --- gnu/packages/statistics.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 3b29b9f624..32853a6450 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2517,18 +2517,20 @@ were originally a part of the r-devtools package.") (define-public r-hms (package (name "r-hms") - (version "0.5.3") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "hms" version)) (sha256 (base32 - "1baki0qw5ijgiflvsdvqj3apg4yanf12vx14kwbqdzk5rz46fasf")))) + "0qn9lvpkqrpxck88nf0zbff43vd7d6s1ibg58qfr3w14sw1yj14p")))) (build-system r-build-system) (propagated-inputs - `(("r-rlang" ,r-rlang) + `(("r-ellipsis" ,r-ellipsis) + ("r-lifecycle" ,r-lifecycle) ("r-pkgconfig" ,r-pkgconfig) + ("r-rlang" ,r-rlang) ("r-vctrs" ,r-vctrs))) (home-page "https://github.com/rstats-db/hms") (synopsis "Pretty time of day") -- cgit v1.2.3 From 0ae1c852664100192d0d035ab6b7e3a7f01b7594 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:14:34 +0100 Subject: gnu: r-rcpparmadillo: Update to 0.10.1.2.2. * gnu/packages/statistics.scm (r-rcpparmadillo): Update to 0.10.1.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 32853a6450..5b8252126c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2634,13 +2634,13 @@ well as additional utilities such as panel and axis annotation functions.") (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.10.1.2.0") + (version "0.10.1.2.2") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "0nzi6plhdijx3khavmywzw9wbch0hj8kygphw35wdlslm4cnqcj1")))) + "0sfhk4mh39ab1y7pmlnijg4w65yz7pfsyjlqy931zdpjzh1kfciq")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From b6958fdbfcda1591c067f4614ebbe4a780cab817 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:14:37 +0100 Subject: gnu: r-catools: Update to 1.18.1. * gnu/packages/statistics.scm (r-catools): Update to 1.18.1. --- 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 5b8252126c..ebb67ffabc 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2680,13 +2680,13 @@ vectors.") (define-public r-catools (package (name "r-catools") - (version "1.18.0") + (version "1.18.1") (source (origin (method url-fetch) (uri (cran-uri "caTools" version)) (sha256 (base32 - "0y1kgyiy322yhb0phzwvf2zgjz9awp13lhzhk9v1ddg88656jhq3")))) + "1yf98x2gaf84y9m32xrg84g384zlfwsdw7wvywdljpgdpvzs9szz")))) (properties `((upstream-name . "caTools"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 7a5adb9714d6ea0fb7984259d4a267a698bc6f7e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:14:40 +0100 Subject: gnu: r-rmarkdown: Update to 2.6. * gnu/packages/statistics.scm (r-rmarkdown): Update to 2.6. --- 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 ebb67ffabc..97e50d057c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2726,13 +2726,13 @@ certain criterion, e.g., it contains a certain regular file.") (define-public r-rmarkdown (package (name "r-rmarkdown") - (version "2.5") + (version "2.6") (source (origin (method url-fetch) (uri (cran-uri "rmarkdown" version)) (sha256 - (base32 "0vmd1kykd4p1nwqbvra34sld5brac0wxb1zmav4wxj05shy67bd5")))) + (base32 "1c7nrpnv2v43msv7nia90rjh6s5x9m5wlb3mpiwy04fyfb29krz6")))) (properties `((upstream-name . "rmarkdown"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From a28aa533bad2ce08e3080778a43cf39be68abbb6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:14:43 +0100 Subject: gnu: r-rsqlite: Update to 2.2.2. * gnu/packages/statistics.scm (r-rsqlite): Update to 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 97e50d057c..18ec1da5ae 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2841,13 +2841,13 @@ a column in data frame.") (define-public r-rsqlite (package (name "r-rsqlite") - (version "2.2.1") + (version "2.2.2") (source (origin (method url-fetch) (uri (cran-uri "RSQLite" version)) (sha256 (base32 - "0lynli9144dzb9vhxssba20v7z5h2nirawpvvy8ykv4n3ir7qlsl")))) + "0wx8awxfd4q4mb5dk261rf7zd7y2lcm121fplay0vxl697yym719")))) (properties `((upstream-name . "RSQLite"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 27edbeadb850891346e43f7f4bb2f649dcace607 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:14:47 +0100 Subject: gnu: r-segmented: Update to 1.3-1. * gnu/packages/statistics.scm (r-segmented): Update to 1.3-1. --- 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 18ec1da5ae..d010a222b3 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3038,14 +3038,14 @@ statements.") (define-public r-segmented (package (name "r-segmented") - (version "1.3-0") + (version "1.3-1") (source (origin (method url-fetch) (uri (cran-uri "segmented" version)) (sha256 (base32 - "1a9nnlf8j8j4ik34z19x187s8ki7pv1aayr344jrpn3h6m8fk3x5")))) + "0g8l1i31zfqamvwc5j537k3ld6dr5z81p84grdlqq41gywmyidmr")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/segmented") (synopsis "Regression models with breakpoints estimation") -- cgit v1.2.3 From 770cf0759c2972f767b250b481885bbda181128c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:14:50 +0100 Subject: gnu: r-dt: Update to 0.17. * gnu/packages/statistics.scm (r-dt): Update to 0.17. --- 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 d010a222b3..6dcf1919ef 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3198,13 +3198,13 @@ using the multicore functionality of the parallel package.") (define-public r-dt (package (name "r-dt") - (version "0.16") + (version "0.17") (source (origin (method url-fetch) (uri (cran-uri "DT" version)) (sha256 (base32 - "0in4d34nxb4pk2jygj0a21cqf0k0m4dhm4rjv68bnkp5kmmz6kbk")))) + "0mpvyfmi2viyhdqx11hznd7dl0q6kxrdmppjsmm2pk0x8a904hz3")))) (properties `((upstream-name . "DT"))) (build-system r-build-system) -- cgit v1.2.3 From ef921c3db7e4f305125dd178ae5f385b3a082a5a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:14:53 +0100 Subject: gnu: r-glmnet: Update to 4.1. * gnu/packages/statistics.scm (r-glmnet): Update to 4.1. --- 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 6dcf1919ef..72a0a9562d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3277,13 +3277,13 @@ analysis of large sparse or dense matrices.") (define-public r-glmnet (package (name "r-glmnet") - (version "4.0-2") + (version "4.1") (source (origin (method url-fetch) (uri (cran-uri "glmnet" version)) (sha256 - (base32 "0qdswxvdwjcnw0by15p9yfzw8laq4f2j0ivpma6q8c5zywldpxxc")))) + (base32 "1js01qnznm20h4pslaw1ragxhrzk0w4nw7r6ryg7i27l344za2lg")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran) -- cgit v1.2.3 From 8bcffe0c469bca115d8c1fedb8a741ce065ff8e2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:14:56 +0100 Subject: gnu: r-hexbin: Update to 1.28.2. * gnu/packages/statistics.scm (r-hexbin): Update to 1.28.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 72a0a9562d..e84b235a25 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3783,14 +3783,14 @@ and tidyr provides no margins or aggregation.") (define-public r-hexbin (package (name "r-hexbin") - (version "1.28.1") + (version "1.28.2") (source (origin (method url-fetch) (uri (cran-uri "hexbin" version)) (sha256 (base32 - "1ry6jm3lqz3mj0s5rzbs6mpkz2hxpnvbw8c1vwc4pj7b173r5l22")))) + "0bbhs5pwxh474w62sq6gqvih7habancxng9wd4f2rgn6lv9zhhb2")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From 04de103591d170b445e1ca15475d9384df7da1fb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:15:01 +0100 Subject: gnu: r-plotly: Update to 4.9.3. * gnu/packages/statistics.scm (r-plotly): Update to 4.9.3. [propagated-inputs]: Remove r-hexbin; add r-vctrs. --- gnu/packages/statistics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index e84b235a25..e648f1eec8 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3831,13 +3831,13 @@ features present in other programming languages.") (define-public r-plotly (package (name "r-plotly") - (version "4.9.2.1") + (version "4.9.3") (source (origin (method url-fetch) (uri (cran-uri "plotly" version)) (sha256 (base32 - "1f0x83a2s7200iqi6gpngijks06fcvcbm6701d5r5rxpb8rawppl")))) + "0801i2q7sw62x734d58h9p2fwpi1hirqj73gsg18pqkdv4b1lkfl")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) @@ -3846,7 +3846,6 @@ features present in other programming languages.") ("r-data-table" ,r-data-table) ("r-dplyr" ,r-dplyr) ("r-ggplot2" ,r-ggplot2) - ("r-hexbin" ,r-hexbin) ("r-htmltools" ,r-htmltools) ("r-htmlwidgets" ,r-htmlwidgets) ("r-httr" ,r-httr) @@ -3860,6 +3859,7 @@ features present in other programming languages.") ("r-scales" ,r-scales) ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr) + ("r-vctrs" ,r-vctrs) ("r-viridislite" ,r-viridislite))) (home-page "https://plot.ly/r") (synopsis "Create interactive web graphics") -- cgit v1.2.3 From 376f32298801fa04fcfed0a6e996ad341ce1acac Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:15:04 +0100 Subject: gnu: r-sfsmisc: Update to 1.1-8. * gnu/packages/statistics.scm (r-sfsmisc): Update to 1.1-8. --- 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 e648f1eec8..c81a71f439 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4141,14 +4141,14 @@ existing packages provide.") (define-public r-sfsmisc (package (name "r-sfsmisc") - (version "1.1-7") + (version "1.1-8") (source (origin (method url-fetch) (uri (cran-uri "sfsmisc" version)) (sha256 (base32 - "12g6m8sf17q3qmm133nm4fa296w5n5d9ly3fvb2nvc0w4llkif3l")))) + "198zpkz1gvw954ym8669svrk81yb49j6fyk5i6a7dw07z3snlmdn")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/sfsmisc") (synopsis "Utilities from \"Seminar fuer Statistik\" ETH Zurich") -- cgit v1.2.3 From 98794aef67eeb6b3244592100110c2a097f0b6d0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:15:07 +0100 Subject: gnu: r-cowplot: Update to 1.1.1. * gnu/packages/statistics.scm (r-cowplot): Update to 1.1.1. --- 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 c81a71f439..e52d385679 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4536,14 +4536,14 @@ Farebrother's algorithm or Liu et al.'s algorithm.") (define-public r-cowplot (package (name "r-cowplot") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (cran-uri "cowplot" version)) (sha256 (base32 - "04d5pg4xi9nhgcbam71b5mp3q1g804ng864v90add1kddfyl3f9h")))) + "0j7d5vhzdxn1blrsfafx5z8lhq122rp8230hp9czrpsnnhjydp67")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) -- cgit v1.2.3 From 4f8bfe296b322477a11025f9da2cbc6960fa0fad Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:15:10 +0100 Subject: gnu: r-robustbase: Update to 0.93-7. * gnu/packages/statistics.scm (r-robustbase): Update to 0.93-7. --- 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 e52d385679..ea235b2f2f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4793,14 +4793,14 @@ can be efficiently implemented directly in the R language.") (define-public r-robustbase (package (name "r-robustbase") - (version "0.93-6") + (version "0.93-7") (source (origin (method url-fetch) (uri (cran-uri "robustbase" version)) (sha256 (base32 - "1cr478xi4n9jwsdpbq182a7ig47rpb413q28dz6d1am08sk6657a")))) + "0mh9d114p3jdrjf8yn4dx5ff41niz5wn411y0ckjcpnazp8d44c9")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From 125c65d7295439bd74d15d521e72a94ad4771e45 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:15:13 +0100 Subject: gnu: r-vgam: Update to 1.1-5. * gnu/packages/statistics.scm (r-vgam): Update to 1.1-5. --- 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 ea235b2f2f..d206c48c0d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4973,13 +4973,13 @@ groupings.") (define-public r-vgam (package (name "r-vgam") - (version "1.1-4") + (version "1.1-5") (source (origin (method url-fetch) (uri (cran-uri "VGAM" version)) (sha256 - (base32 "1iwrpyhz3khgw904zxz3pn7d61zvkd5m22gimzk57f8jjplxh1zm")))) + (base32 "1fx123h4x5awzshv0m4jqbbllrdjfpslb2i8gl9phm1y1wahn69h")))) (properties `((upstream-name . "VGAM"))) (build-system r-build-system) (native-inputs -- cgit v1.2.3 From 1ebff0643483e42cd81ea23835af7195d338f703 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:15:16 +0100 Subject: gnu: r-rcppeigen: Update to 0.3.3.9.1. * gnu/packages/statistics.scm (r-rcppeigen): Update to 0.3.3.9.1. --- 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 d206c48c0d..af9867e5f6 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5040,14 +5040,14 @@ based on an interface to Fortran implementations by M. J. D. Powell.") (define-public r-rcppeigen (package (name "r-rcppeigen") - (version "0.3.3.7.0") + (version "0.3.3.9.1") (source (origin (method url-fetch) (uri (cran-uri "RcppEigen" version)) (sha256 (base32 - "1b78qcjim0n9klgkr82n794d6bj9r9f33g0kcsszsns2hir65sk2")))) + "0qp9gypar280lm84pc8w0fxw4jgwqygwi3qnl5sl52kpkcj8c14a")))) (properties `((upstream-name . "RcppEigen"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 0d04f1e2b2814e8413e0b35db392f38f5077f08b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:15:20 +0100 Subject: gnu: r-quantreg: Update to 5.82. * gnu/packages/statistics.scm (r-quantreg): Update to 5.82. --- 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 af9867e5f6..bc22b501c7 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5110,13 +5110,13 @@ using modular prediction and response module classes.") (define-public r-quantreg (package (name "r-quantreg") - (version "5.75") + (version "5.82") (source (origin (method url-fetch) (uri (cran-uri "quantreg" version)) (sha256 - (base32 "05mb1qmwah5sdgg2z7m36lqkh479phvb1cx4sjnv1ykvmi9alxv5")))) + (base32 "01wcai04asr0wcfm001whihwbbx3b3r1m65ngknj82nh6hg4xhza")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From d964fb5f9894a14634d8f3d455e3bffd6d592542 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:15:25 +0100 Subject: gnu: r-pbkrtest: Update to 0.5-0.1. * gnu/packages/statistics.scm (r-pbkrtest): Update to 0.5-0.1. [propagated-inputs]: Add r-broom, r-dplyr, and r-numderiv. [native-inputs]: Add r-knitr. --- gnu/packages/statistics.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index bc22b501c7..013407a505 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5200,20 +5200,25 @@ C++ library for numerical linear algebra and RcppEigen glue.") (define-public r-pbkrtest (package (name "r-pbkrtest") - (version "0.4-8.6") + (version "0.5-0.1") (source (origin (method url-fetch) (uri (cran-uri "pbkrtest" version)) (sha256 (base32 - "0s5xhhrhv5i9680lw6af9lj2x4jc3fygmzzk0jjpxnb8g4b3p1jz")))) + "0sgl8r74cknmp8lnq5jvc1w181274ylgk6w4pxf4mzkfii42argm")))) (build-system r-build-system) (propagated-inputs - `(("r-lme4" ,r-lme4) + `(("r-broom" ,r-broom) + ("r-dplyr" ,r-dplyr) + ("r-lme4" ,r-lme4) ("r-magrittr" ,r-magrittr) ("r-mass" ,r-mass) - ("r-matrix" ,r-matrix))) + ("r-matrix" ,r-matrix) + ("r-numderiv" ,r-numderiv))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "http://people.math.aau.dk/~sorenh/software/pbkrtest/") (synopsis "Methods for linear mixed model comparison") (description -- cgit v1.2.3 From ee3bae282b9fcfa14dca4a7a24a81b0c9a2c69c1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 20 Jan 2021 17:15:28 +0100 Subject: gnu: r-fdrtool: Update to 1.2.16. * gnu/packages/statistics.scm (r-fdrtool): Update to 1.2.16. --- 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 013407a505..77cd629882 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5535,14 +5535,14 @@ easy and fun.") (define-public r-fdrtool (package (name "r-fdrtool") - (version "1.2.15") + (version "1.2.16") (source (origin (method url-fetch) (uri (cran-uri "fdrtool" version)) (sha256 (base32 - "1h46frlk7d9f4qx0bg6p55nrm9wwwz2sv6d1nz7061wdfsm69yb5")))) + "1aap4k1l3a9m43374xq688mqnzkgqx8l021li262r3h1xr4adpp7")))) (build-system r-build-system) (home-page "http://strimmerlab.org/software/fdrtool/") (synopsis "Estimation of false discovery rates and higher criticism") -- cgit v1.2.3 From f866d591153242ab1859bdf9b968c1a9a5cc6569 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 20 Jan 2021 18:36:45 +0100 Subject: gnu: Add solarus. * gnu/packages/games.scm (solarus): New variable. --- gnu/packages/games.scm | 60 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b8f93505b3..edfa725cf1 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2017, 2019, 2020 Marius Bakke ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2017 Roel Janssen -;;; Copyright © 2017, 2018, 2019, 2020 Nicolas Goaziou +;;; Copyright © 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou ;;; Copyright © 2018 okapi ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2018 Madalin Ionel-Patrascu @@ -2237,6 +2237,64 @@ and defeat them with your bubbles!") ;; GPL2+ is for code, CC0 is for art. (license (list license:gpl2+ license:cc0)))) +(define-public solarus + (package + (name "solarus") + (version "1.6.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/solarus-games/solarus.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1n6l91yyqjx0pz4w1lp3yybpq0fs2yjswfcm8c1wjfkxwiznbdxi")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + ;; The following tests fail reporting a missing "/dev/dri" + ;; file. + (lambda _ + (substitute* "tests/cmake/AddTestMaps.cmake" + ((".*1200_create_shader_from_source.*" all) + (string-append "#" all)) + ((".*1210_shader_scaling_factor.*" all) + (string-append "#" all))) + #t)) + (add-before 'check 'set-home + ;; Tests fail without setting the following environment + ;; variables. + (lambda _ + (setenv "HOME" (getcwd)) + (setenv "XDG_RUNTIME_DIR" (getcwd)) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools))) + (inputs + `(("glm" ,glm) + ("libmodplug" ,libmodplug) + ("libogg" ,libogg) + ("libvorbis" ,libvorbis) + ("luajit" ,luajit) + ("openal" ,openal) + ("physfs" ,physfs) + ("qtbase" ,qtbase) + ("sdl2" ,(sdl-union (list sdl2 sdl2-image sdl2-ttf))))) + (home-page "https://www.solarus-games.org/") + (synopsis "Lightweight game engine for Action-RPGs") + (description + "Solarus is a 2D game engine written in C++, that can run games +scripted in Lua. It has been designed with 16-bit classic Action-RPGs +in mind.") + ;; The source code is licensed under the terms of GPL-3.0. + ;; Resources are licensed under the terms of CC-BY-SA-3.0 and + ;; CC-BY-SA 4.0. + (license (list license:gpl3 license:cc-by-sa3.0 license:cc-by-sa4.0)))) + (define-public superstarfighter (package (name "superstarfighter") -- cgit v1.2.3 From 60f0ab5fced2fc5e75892cdebca17f70684472fd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 20 Jan 2021 18:39:03 +0100 Subject: gnu: solarus: Remove ".git" suffix from URL. * gnu/packages/games.scm (solarus)[source]: Remove ".git" suffix from URL. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index edfa725cf1..01580f75ff 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2245,7 +2245,7 @@ and defeat them with your bubbles!") (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/solarus-games/solarus.git") + (url "https://gitlab.com/solarus-games/solarus") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 -- cgit v1.2.3 From 2ec30608b2b9ffc0ca4d33c231052e0d73899837 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 20 Jan 2021 19:14:31 +0100 Subject: gnu: Add solarus-quest-editor. * gnu/packages/games.scm (solarus-quest-editor): New variable. (solarus): Add a comment about linked updates. --- gnu/packages/games.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 01580f75ff..ee1571e624 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2240,6 +2240,8 @@ and defeat them with your bubbles!") (define-public solarus (package (name "solarus") + ;; XXX: When updating this package, please also update hash in + ;; `solarus-quest-editor' below. (version "1.6.4") (source (origin @@ -2295,6 +2297,40 @@ in mind.") ;; CC-BY-SA 4.0. (license (list license:gpl3 license:cc-by-sa3.0 license:cc-by-sa4.0)))) +(define-public solarus-quest-editor + (package + (inherit solarus) + (name "solarus-quest-editor") + (version (package-version solarus)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/solarus-games/solarus-quest-editor") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn")))) + (arguments + `(#:tests? #false ;no test + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-qt-build + ;; XXX: Fix build with Qt 5.15. It has been applied upstream as + ;; 81d5c7f1 and can be removed at next upgrade. + (lambda _ + (substitute* "src/entities/jumper.cpp" + (("#include " all) + (string-append all "\n" "#include \n"))) + #t))))) + (inputs + `(("solarus" ,solarus) + ,@(package-inputs solarus))) + (synopsis "Create and modify quests for the Solarus engine") + (description + "Solarus Quest Editor is a graphical user interface to create and +modify quests for the Solarus engine."))) + (define-public superstarfighter (package (name "superstarfighter") -- cgit v1.2.3 From 683154166d51c26c8f7248d2a0f2b37cf84d343a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 20 Jan 2021 20:37:57 +0100 Subject: gnu: lisp-repl-core-dumper: Patch path to `cat'. * gnu/packages/lisp.scm (lisp-repl-core-dumper)[arguments]: Substitute calls to `cat' with full store path. --- gnu/packages/lisp.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index bdf9ac9d58..3c09b0af8a 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1103,12 +1103,14 @@ assembler, PEG) is less than 1MB.") (add-before 'install 'fix-utils-path (lambda* (#:key inputs #:allow-other-keys) (let* ((coreutils (string-append (assoc-ref inputs "coreutils") "/bin/")) + (cat (string-append coreutils "cat")) (paste (string-append coreutils "paste")) (sort (string-append coreutils "sort")) (basename (string-append coreutils "basename")) (sed (string-append (assoc-ref inputs "sed") "/bin/sed"))) (substitute* "lisp-repl-core-dumper" (("\\$\\(basename") (string-append "$(" basename)) + (("\\") cat) (("\\") paste) (("\\") sed) (("\\") sort)))))))) -- cgit v1.2.3 From 41134f915f523601fa183f180b801a872b428fc3 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 14 Jan 2021 15:34:29 +0100 Subject: gnu: libnode: Fix regression in unused phases. Fixes regression introduced with commit 1d77141f6d5004cf10d1f9ead53855f25a973847. Reported by Pierre-Antoine Bouttier . * gnu/packages/node.scm (libnode)[arguments]: Delete phase "patch-node-shebang". Signed-off-by: Ricardo Wurmus --- gnu/packages/node.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 9e07cd906e..a495f6d763 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2020 Pierre Langlois ;;; Copyright © 2020 Ricardo Wurmus +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -238,4 +239,5 @@ devices.") `(cons* "--shared" "--without-npm" ,flags)) ((#:phases phases '%standard-phases) `(modify-phases ,phases - (delete 'patch-npm-shebang))))))) + (delete 'patch-npm-shebang) + (delete 'patch-node-shebang))))))) -- cgit v1.2.3 From 708d3ec0de9cfffc933615d92825906efacd4c6d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 20 Jan 2021 19:35:37 -0500 Subject: gnu: Mutt: Fix CVE-2021-3181. * gnu/packages/patches/mutt-CVE-2021-3181.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/mail.scm (mutt)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/mail.scm | 3 +- gnu/packages/patches/mutt-CVE-2021-3181.patch | 45 +++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/mutt-CVE-2021-3181.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index c631e449d1..0553c12f28 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1385,6 +1385,7 @@ dist_patch_DATA = \ %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \ %D%/packages/patches/musl-cross-locale.patch \ %D%/packages/patches/mutt-store-references.patch \ + %D%/packages/patches/mutt-CVE-2021-3181.patch \ %D%/packages/patches/m4-gnulib-libio.patch \ %D%/packages/patches/ncompress-fix-softlinks.patch \ %D%/packages/patches/netcdf-date-time.patch \ diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 5b235eea85..ab3a19578e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -456,7 +456,8 @@ aliasing facilities to work just as they would on normal mail.") (sha256 (base32 "1m4ig69qw4g3lhm4351snmy5i0ch65fqc9vqqdybr6jy21w7w225")) - (patches (search-patches "mutt-store-references.patch")))) + (patches (search-patches "mutt-store-references.patch" + "mutt-CVE-2021-3181.patch")))) (build-system gnu-build-system) (inputs `(("cyrus-sasl" ,cyrus-sasl) diff --git a/gnu/packages/patches/mutt-CVE-2021-3181.patch b/gnu/packages/patches/mutt-CVE-2021-3181.patch new file mode 100644 index 0000000000..df5214b052 --- /dev/null +++ b/gnu/packages/patches/mutt-CVE-2021-3181.patch @@ -0,0 +1,45 @@ +Fix CVE-2021-3181: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3181 + +Patch copied from upstream source repository: + +https://gitlab.com/muttmua/mutt/-/commit/c059e20ea4c7cb3ee9ffd3500ffe313ae84b2545 + +From c059e20ea4c7cb3ee9ffd3500ffe313ae84b2545 Mon Sep 17 00:00:00 2001 +From: Kevin McCarthy +Date: Sun, 17 Jan 2021 10:40:37 -0800 +Subject: [PATCH] Fix memory leak parsing group address. + +When there was a group address terminator with no previous addresses, +an address would be allocated but not attached to the address list. + +Change this to only allocate when last exists. + +It would be more correct to not allocate at all unless we are inside a +group list, but I will address that in a separate commit to master. +--- + rfc822.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/rfc822.c b/rfc822.c +index 7ff4eaa3..ced619f2 100644 +--- a/rfc822.c ++++ b/rfc822.c +@@ -587,11 +587,10 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS *top, const char *s) + #endif + + /* add group terminator */ +- cur = rfc822_new_address (); + if (last) + { +- last->next = cur; +- last = cur; ++ last->next = rfc822_new_address (); ++ last = last->next; + } + + phraselen = 0; +-- +GitLab + -- cgit v1.2.3 From c92590ca1d5f97976ad0945384a3f41fc35441de Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Wed, 20 Jan 2021 16:00:11 +0300 Subject: gnu: Add emacs-jsonnet-mode. * gnu/packages/emacs-xyz.scm (emacs-jsonnet-mode): New variable. --- 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 2ee35dbaa3..a18bf2eb5c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12866,6 +12866,29 @@ JSONRPC is a generic Remote Procedure Call protocol designed around JSON objects.") (license license:gpl3+))) +(define-public emacs-jsonnet-mode + (package + (name "emacs-jsonnet-mode") + (version "0.1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tminor/jsonnet-mode") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vi7415n90d1z2ww1hld0gdp6v7z4rd6f70h476dp2x4hydk293i")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash))) + (home-page "https://github.com/mgyucht/jsonnet-mode") + (synopsis "Major mode for editing jsonnet files") + (description "This package provides syntax highlighting, indenting, +formatting, and utility methods for jsonnet files.") + (license license:gpl3+))) + (define-public emacs-restclient (let ((commit "ac8aad6c6b9e9d918062fa3c89c22c2f4ec48bc3") (version "0") -- cgit v1.2.3 From 3bdd380ff0349aa5a27e408ca139226e1aa807d8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Jan 2021 09:29:06 +0100 Subject: gnu: bind: Update to 9.16.11. * gnu/packages/dns.scm (bind): Update to 9.16.11. --- gnu/packages/dns.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 5bb725ae92..809b9b59cf 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016 Nikita -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2020 Marius Bakke ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Gregor Giesen @@ -317,7 +317,7 @@ and BOOTP/TFTP for network booting of diskless machines.") (package (name "bind") ;; When updating, check whether isc-dhcp's bundled copy should be as well. - (version "9.16.10") + (version "9.16.11") (source (origin (method url-fetch) (uri (string-append @@ -325,7 +325,7 @@ and BOOTP/TFTP for network booting of diskless machines.") "/bind-" version ".tar.xz")) (sha256 (base32 - "1cv26gzbyk3ahidr1fip0pgj28s7l52cafdqpykfc1b2kh0zqixw")))) + "1hcr0q6i2mk83yi12zxjs5q21y3gx7683q99l77ibxfqsx6zc481")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs -- cgit v1.2.3 From a1819473c3a9692e0b1a2fd9fbb9cb642a387521 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Wed, 20 Jan 2021 23:35:49 +0000 Subject: gnu: dnsmasq: Update to 2.83 [security fixes]. Includes fixes for CVE-2020-25681, CVE-2020-25682, CVE-2020-25683, CVE-2020-25684, CVE-2020-25685, CVE-2020-25686, CVE-2020-25687. * gnu/packages/dns.scm (dnsmasq): Update to 2.83. --- gnu/packages/dns.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 809b9b59cf..5e65eed7ed 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2019 Chris Marusich ;;; Copyright © 2019 Rutger Helling -;;; Copyright © 2020 Pierre Langlois +;;; Copyright © 2020, 2021 Pierre Langlois ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Leo Famulari ;;; Copyright © 2020 Brice Waegeneire @@ -277,7 +277,7 @@ prompt the user with the option to go with insecure DNS only.") (define-public dnsmasq (package (name "dnsmasq") - (version "2.82") + (version "2.83") (source (origin (method url-fetch) (uri (string-append @@ -285,7 +285,7 @@ prompt the user with the option to go with insecure DNS only.") version ".tar.xz")) (sha256 (base32 - "0cn1xd1s6xs78jmrmwjnh9m6w3q38pk6dyqy2phvasqiyd33cll4")))) + "1sjamz1v588qf35m8z6wcqkjk5w12bqhj7d7p48dj8jyn3lgghgz")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 1278b157c05ed59f426ab9fb466396fb3d15c9ba Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 21 Jan 2021 09:34:25 +0100 Subject: gnu: guix: Update to d4a562b. * gnu/packages/package-management.scm (guix): Update to d4a562b. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 60d8d4b8c6..d2ab815337 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "23862011c3d02814181399765a024c7fa3fadd97") - (revision 10)) + (commit "d4a562ba7ac4549cc2d57eff7f440026a2045f45") + (revision 11)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "1w6i9z4z24yl8v1gf5m7fgf0bz42gg4dpnhi25fg4a4y5qi7aahk")) + "05gkymzfl0fdb2zjyvvn7w15arfnn7fgpbn3bch9r5yc7ldxg868")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 5f7f4e16d64135291fc5b3d12e57476a52a97105 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 21 Jan 2021 09:35:05 +0100 Subject: gnu: guile-json: Update to 4.5.1. Fixes . Reported by Hartmut Goebel . * gnu/packages/guile.scm (guile-json-4): Update to 4.5.1. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index dfba797b79..0d6f13c97f 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -581,14 +581,14 @@ specification. These are the main features: (package (inherit guile-json-3) (name "guile-json") - (version "4.4.1") + (version "4.5.1") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/guile-json/guile-json-" version ".tar.gz")) (sha256 (base32 - "1xq4f59rdk28xy4sdn6amy07aa19ikrk48iily3kfhwpkbg6v9jj")))))) + "0iigada80cg7dl10z6ligiykci0cv9b88zmncz47nsz5g9gacdpc")))))) (define-public guile2.2-json (package-for-guile-2.2 guile-json-4)) -- cgit v1.2.3 From 55b4120fcc00a5cb7bfb720cac7142ab017f03f8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 21 Jan 2021 12:22:31 +0200 Subject: gnu: shepherd: Remove guild warnings. * gnu/packages/admin.scm (shepherd)[arguments]: Pass GUILE_AUTO_COMPILE=0 as make-flag to prevent guild warnings. --- gnu/packages/admin.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index b476a90de9..6c5b3903db 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -267,7 +267,8 @@ and provides a \"top-like\" mode (monitoring).") "0x9zr0x3xvk4qkb6jnda451d5iyrl06cz1bjzjsm0lxvjj3fabyk")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--localstatedir=/var"))) + '(#:configure-flags '("--localstatedir=/var") + #:make-flags '("GUILE_AUTO_COMPILE=0"))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 3c0f7dcbad41f60eae9db4ade2b5c51bc88799af Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 21 Jan 2021 12:26:04 +0200 Subject: gnu: guile2.2-shepherd: Add missing input. * gnu/packages/admin.scm (guile2.2-shepherd)[inputs]: Add guile2.2-readline. --- gnu/packages/admin.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 6c5b3903db..da5fab8ef8 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -298,7 +298,8 @@ interface and is based on GNU Guile.") `(("pkg-config" ,pkg-config) ("guile" ,guile-2.2))) (inputs - `(("guile" ,guile-2.2))))) + `(("guile" ,guile-2.2) + ("guile2.2-readline" ,guile2.2-readline))))) (define-public guile3.0-shepherd (deprecated-package "guile3.0-shepherd" shepherd)) -- cgit v1.2.3 From dbd94d966ac971ceac1b51814dd75515a80132b0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 21 Jan 2021 12:32:42 +0200 Subject: gnu: guile2.0-shepherd: Fix build. * gnu/packages/admin.scm (guile2.0-shepherd)[native-inputs]: Add help2man. [arguments]: Add custom phase to patch out import of (ice-9 threads). --- gnu/packages/admin.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index da5fab8ef8..87b0f36cc1 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -309,10 +309,21 @@ interface and is based on GNU Guile.") (inherit shepherd) (name "guile2.0-shepherd") (native-inputs - `(("pkg-config" ,pkg-config) + `(("help2man" ,help2man) + ("pkg-config" ,pkg-config) ("guile" ,guile-2.0))) (inputs - `(("guile" ,guile-2.0))))) + `(("guile" ,guile-2.0))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + ;; (ice-9 threads) isn't available in guile-2.0 + (substitute* "modules/shepherd.scm" + ((".*\\(ice-9 threads\\).*") "")) + #t))) + ,@(package-arguments shepherd))))) (define-public cloud-utils (package -- cgit v1.2.3 From 578856fd460015aa3e2be637d09e63590ea698a8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 21 Jan 2021 14:51:26 +0200 Subject: gnu: magic-enum: Declare a source file-name. * gnu/packages/cpp.scm (magic-enum)[source]: Add file-name field. --- gnu/packages/cpp.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 03b84efdc8..ca8f7a9f80 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -819,6 +819,7 @@ provides a number of utilities to make coding with expected cleaner.") (uri (git-reference (url home-page) (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "07j5zdf3vkliwrcv6k663k35akn7qp23794sz2mnvkj9hbv9s8cx")))) -- cgit v1.2.3 From ef9c5247a34580d82a1675eea6242bbe065440cd Mon Sep 17 00:00:00 2001 From: Adam Kandur Date: Thu, 21 Jan 2021 01:04:10 +0100 Subject: gnu: Add cl-claw-utils. * gnu/packages/lisp-xyz.scm (cl-claw-utils, ecl-claw-utils, sbcl-claw-utils): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 36725ebbbb..8f0321fa11 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12231,6 +12231,40 @@ and lean bindings to C libraries.") (define-public ecl-claw (sbcl-package->ecl-package sbcl-claw)) +(define-public sbcl-claw-utils + (let ((revision "0") + (commit "efe25016501973dc369f067a64c7d225802bc56f")) + (package + (name "sbcl-claw-utils") + ;; version is not specified + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/borodust/claw-utils") + (commit commit))) + (file-name (git-file-name "claw-utils" version)) + (sha256 + (base32 "01df3kyf2qs3czi332dnz2s35x2j0fq46vgmsw7wjrrvnqc22mk5")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("claw" ,sbcl-claw))) + (home-page "https://github.com/borodust/claw-utils") + (synopsis "Utilities for easier autowrapping") + (description + "This Common Lisp library contains various handy utilties to help +autowrapping with @code{claw}.") + (license license:expat)))) + +(define-public cl-claw-utils + (sbcl-package->cl-source-package sbcl-claw-utils)) + +(define-public ecl-claw-utils + (sbcl-package->ecl-package sbcl-claw-utils)) + (define-public sbcl-array-operations (let ((commit "75cbc3b1adb2e3ce2109489753d0f290b071e81b") (revision "0")) -- cgit v1.2.3 From 833d220d0b22c44793ea42c8e0e4296456c45b43 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 21 Jan 2021 19:47:28 +0100 Subject: gnu: Add ppath. * gnu/packages/lisp-xyz.scm (cl-ppath, ecl-ppath, sbcl-ppath): New variables. --- gnu/packages/lisp-xyz.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 8f0321fa11..1c98c032c8 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13233,3 +13233,46 @@ be usable from multi-threaded programs.") (define-public cl-cmd (sbcl-package->ecl-package sbcl-cmd)) + +(define-public sbcl-ppath + (let ((commit "eb1a8173b4d1d691ea9a7699412123462f58c3ce")) + (package + (name "sbcl-ppath") + (version (git-version "0.1" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fourier/ppath/") + (commit commit))) + (file-name (git-file-name name commit)) + (sha256 + (base32 "1c46q9lmzqv14z80d3fwdawgn3pn4922x31fyqvsvbcjm4hd16fb")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("osicat" ,sbcl-osicat) + ("ppcre" ,sbcl-cl-ppcre) + ("split-sequence" ,sbcl-split-sequence) + ("trivial-features" ,sbcl-trivial-features))) + (native-inputs + `(("cl-fad" ,sbcl-cl-fad) + ("prove" ,sbcl-prove))) + (home-page "https://github.com/fourier/ppath") + (synopsis "Common Lisp's implementation of the Python's os.path module") + (description + "This library is a path strings manipulation library inspired by +Python's @code{os.path}. All functionality from @code{os.path} is supported on +major operation systems. + +The philosophy behind is to use simple strings and \"dumb\" string +manipulation functions to handle paths and filenames. Where possible the +corresponding OS system functions are called.") + (license license:bsd-2)))) + +(define-public ecl-ppath + (sbcl-package->ecl-package sbcl-ppath)) + +(define-public cl-ppath + (sbcl-package->ecl-package sbcl-ppath)) -- cgit v1.2.3 From 399beecfb07b01ec7d14fc67f3f1558afd529ce7 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Thu, 21 Jan 2021 21:39:21 +0100 Subject: gnu: komikku: Update to 0.25.1. * gnu/packages/gnome.scm (komikku): Update to 0.25.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e614d26b68..505d4bf725 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11825,7 +11825,7 @@ integrated profiler via Sysprof, debugging support, and more.") (define-public komikku (package (name "komikku") - (version "0.24.0") + (version "0.25.1") (source (origin (method git-fetch) @@ -11835,7 +11835,7 @@ integrated profiler via Sysprof, debugging support, and more.") (file-name (git-file-name name version)) (sha256 (base32 - "010p32zrim245y0l784yp0rasqcqlyr3lrxwl3r1876x83qhs6q3")))) + "03skci66y9qqiv4bqbbc0w6d6agilwmx95cw7sribj06zcykm7m3")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From dd988726fcfed305e8b265fb8d8ec01e64d3a58e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 22 Jan 2021 08:35:29 +0100 Subject: gnu: guix: Add search path spec for 'SSL_CERT_DIR'. * gnu/packages/package-management.scm (guix)[native-search-paths]: Add 'SSL_CERT_DIR'. --- gnu/packages/package-management.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index d2ab815337..df5bd2eb81 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -424,7 +424,14 @@ $(prefix)/etc/init.d\n"))) (native-search-paths (list (search-path-specification (variable "GUIX_EXTENSIONS_PATH") - (files '("share/guix/extensions"))))) + (files '("share/guix/extensions"))) + + ;; (guix git) and (guix build download) honor this variable whose + ;; name comes from OpenSSL. + (search-path-specification + (variable "SSL_CERT_DIR") + (separator #f) ;single entry + (files '("etc/ssl/certs"))))) (home-page "https://www.gnu.org/software/guix/") (synopsis "Functional package manager for installed software packages and versions") -- cgit v1.2.3 From 7c424b3831ce891bd536831a04ff0e38f58fa045 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Thu, 14 Jan 2021 13:58:45 +0100 Subject: gnu: genimage: Use GIT-FILE-NAME. * gnu/packages/genimage.scm (origin): Use GIT-FILE-NAME. Signed-off-by: Mathieu Othacehe --- gnu/packages/genimage.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm index c9ed6258a0..bd77e4dc33 100644 --- a/gnu/packages/genimage.scm +++ b/gnu/packages/genimage.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Danny Milosavljevic +;;; Copyright © 2021 Vincent Legoll ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,7 +48,7 @@ (uri (git-reference (url "https://github.com/pengutronix/genimage") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "15jmh17lvm3jw9c92bjarly7iwhmnfl322d91mprfv10ppb9ip54")) -- cgit v1.2.3 From f96a65eb1bad19a7dea8a915179791800b3cf1eb Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 22 Jan 2021 12:10:07 +0100 Subject: gnu: sbcl-cl-gobject-introspection: Update to 20210121. * gnu/packages/lisp-xyz.scm (sbcl-cl-gobject-introspection): Update to 20210121. [arguments]: Re-enable tests now that upstream has fixed them. --- gnu/packages/lisp-xyz.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 1c98c032c8..bddcaec143 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6500,8 +6500,8 @@ ability to store all Common Lisp data types into streams.") (sbcl-package->ecl-package sbcl-cl-store)) (define-public sbcl-cl-gobject-introspection - (let ((commit "7b703e2384945ea0ac39d9b766de434a08d81560") - (revision "0")) + (let ((commit "d0136c8d9ade2560123af1fc55bbf70d2e3db539") + (revision "1")) (package (name "sbcl-cl-gobject-introspection") (version (git-version "0.3" revision commit)) @@ -6515,7 +6515,7 @@ ability to store all Common Lisp data types into streams.") (file-name (git-file-name name version)) (sha256 (base32 - "1zcqd2qj14f6b38vys8gr89s6cijsp9r8j43xa8lynilwva7bwyh")))) + "0dz0r73pq7yhz2iq2jnkq977awx2zws2qfxdcy33329sys1ii32p")))) (build-system asdf-build-system/sbcl) (inputs `(("alexandria" ,sbcl-alexandria) @@ -6527,12 +6527,9 @@ ability to store all Common Lisp data types into streams.") (native-inputs `(("fiveam" ,sbcl-fiveam))) (arguments - ;; TODO: Tests fail, see - ;; https://github.com/andy128k/cl-gobject-introspection/issues/70. - '(#:tests? #f - #:phases + '(#:phases (modify-phases %standard-phases - (add-after (quote unpack) (quote fix-paths) + (add-after 'unpack 'fix-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/init.lisp" (("libgobject-2\\.0\\.so") -- cgit v1.2.3 From 30ec5e5a1e2874711b71c4359d9598309c340d19 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 22 Jan 2021 12:23:07 +0100 Subject: gnu: sbcl-trivial-mimes: Update to 20200615. * gnu/packages/lisp-xyz.scm (sbcl-trivial-mimes): Update to 20200615. --- gnu/packages/lisp-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index bddcaec143..9012febb70 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4390,8 +4390,8 @@ Long Painful History of Time\".") (sbcl-package->ecl-package sbcl-local-time)) (define-public sbcl-trivial-mimes - (let ((commit "303f8ac0aa6ca0bc139aa3c34822e623c3723fab") - (revision "1")) + (let ((commit "a741fc2f567a4f86b853fd4677d75e62c03e51d9") + (revision "2")) (package (name "sbcl-trivial-mimes") (version (git-version "1.1.0" revision commit)) @@ -4403,7 +4403,7 @@ Long Painful History of Time\".") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "17jxgl47r695bvsb7wi3n2ws5rp1zzgvw0zii8cy5ggw4b4ayv6m")))) + (base32 "00kcm17q5plpzdj1qwg83ldhxksilgpcdkf3m9azxcdr968xs9di")))) (build-system asdf-build-system/sbcl) (native-inputs `(("stefil" ,sbcl-hu.dwim.stefil))) @@ -4414,7 +4414,7 @@ Long Painful History of Time\".") (description "This is a teensy library that provides some functions to determine the mime-type of a file.") - (license license:artistic2.0)))) + (license license:zlib)))) (define-public cl-trivial-mimes (sbcl-package->cl-source-package sbcl-trivial-mimes)) -- cgit v1.2.3 From 7f29d77806d94fdffe4135423b80453cbbe553ae Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 22 Jan 2021 12:32:02 +0100 Subject: gnu: sbcl-cmd: Update to 20210117. * gnu/packages/lisp-xyz.scm (sbcl-cmd): Update to 20210117. [inputs]: Add coreutils. [arguments]: Fix `pwd' and `env' paths. --- gnu/packages/lisp-xyz.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9012febb70..57d40dad07 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -53,6 +53,7 @@ #:use-module (guix utils) #:use-module (guix build-system asdf) #:use-module (guix build-system trivial) + #:use-module (gnu packages base) #:use-module (gnu packages c) #:use-module (gnu packages compression) #:use-module (gnu packages databases) @@ -13198,10 +13199,10 @@ standard library.") (sbcl-package->cl-source-package sbcl-shlex)) (define-public sbcl-cmd - (let ((commit "8e68274a935ae61f38d3309c08765d8a49d09c1f")) + (let ((commit "e6a54dbf660bf229c80abc124fa47e7bb6d20c93")) (package (name "sbcl-cmd") - (version (git-version "0.0.1" "1" commit)) + (version (git-version "0.0.1" "2" commit)) (source (origin (method git-fetch) @@ -13210,13 +13211,24 @@ standard library.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "06bwwhy7wmk6fpjrqj1bfscn8rnmk8z9kwc00adp8iq6w5yjsbbj")))) + (base32 "1i0l8ci4cnkx84q4afmpkq51nxah24fqpi6k9kgjbxz6li3zp8hy")))) (build-system asdf-build-system/sbcl) (inputs `(("alexandria" ,sbcl-alexandria) + ("coreutils" ,coreutils) ("serapeum" ,sbcl-serapeum) ("shlex" ,sbcl-shlex) ("trivia" ,sbcl-trivia))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((source (assoc-ref inputs "source")) + (bin (string-append (assoc-ref inputs "coreutils") "/bin"))) + (substitute* (string-append "cmd.lisp") + (("\"env\"") (format #f "\"~a/env\"" bin)) + (("\"pwd\"") (format #f "\"~a/pwd\"" bin))))))))) (home-page "https://github.com/ruricolist/cmd") (synopsis "Conveniently run external programs from Common Lisp") (description -- cgit v1.2.3 From 9a062ce9b5b093ce9f72414737eee687eee84bfe Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 22 Jan 2021 16:21:41 +0100 Subject: gnu: giac: Update to 1.6.0-47. * gnu/packages/algebra.scm (giac): Update to 1.6.0-47. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 030339c430..4699f766b5 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -354,7 +354,7 @@ precision.") (define-public giac (package (name "giac") - (version "1.6.0-41") + (version "1.6.0-47") (source (origin (method url-fetch) @@ -366,7 +366,7 @@ precision.") "~parisse/debian/dists/stable/main/source/" "giac_" version ".tar.gz")) (sha256 - (base32 "1z5b3jm6ffxk3yvdqzwn9icbna68brkrz5kspgacq823d03jfklc")))) + (base32 "15sgsr8l6njp5spagbqclqkdy3x7ra23wi6wvpc8vzlbivy3v43k")))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 ftw) -- cgit v1.2.3 From d265809b782293eb42dd663b4611ca19dd2bf1b3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 22 Jan 2021 16:25:22 +0100 Subject: gnu: emacs-chronometrist: Update to 0.6.3. * gnu/packages/emacs-xyz.scm (emacs-chronometrist): Update to 0.6.3. --- 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 a18bf2eb5c..4867811b82 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2255,7 +2255,7 @@ Lock key.") (define-public emacs-chronometrist (package (name "emacs-chronometrist") - (version "0.5.6") + (version "0.6.3") (source (origin (method git-fetch) @@ -2264,7 +2264,7 @@ Lock key.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0g54pxvid1hlynlnfx99sl027q2mr2f4axsvnf0vb3v48zm0n5cw")))) + (base32 "0ql72qh0bshv62nksv6awz5nqfhmgs8hkyvm7wvzfq64yrwghw50")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From 3e5a902f617adf8b12c562dc52f078ecd46ad31a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 22 Jan 2021 22:03:17 +0100 Subject: gnu: emacs-helm-selector: Update to 0.6. * gnu/packages/emacs-xyz.scm (emacs-helm-selector): Update to 0.6. --- 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 4867811b82..52f61c9c37 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25096,7 +25096,7 @@ pattern guessed from thing under current cursor position. (define-public emacs-helm-selector (package (name "emacs-helm-selector") - (version "0.5") + (version "0.6") (home-page "https://github.com/emacs-helm/helm-selector") (source (origin @@ -25107,7 +25107,7 @@ pattern guessed from thing under current cursor position. (file-name (git-file-name name version)) (sha256 (base32 - "1cv659sqmrvk316fp7mjc58vvbcg1j6s2q4rwgqrpbyszrxl3i63")))) + "02cphsv7lk70v3aaj3nffg4niqd9mhg468mvq5ybh3gx1gxmr8qn")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm))) -- cgit v1.2.3 From bd40832f30ed77a45e6bb2ebf6452d447d1097e2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 10 Jan 2021 22:09:07 +0100 Subject: gnu: Add rust-logtest-2. * gnu/packages/crates-io.scm (rust-logtest-2): 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 260fc5ddd9..13c8f94e02 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18317,6 +18317,30 @@ by inspecting the system for user preference.") `(#:cargo-inputs (("rust-log" ,rust-log-0.4)))))) +(define-public rust-logtest-2 + (package + (name "rust-logtest") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "logtest" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "09ihwkq6z7xm6wdwxmc9mz74lsl20g5bi7fcdm8n87bwcnl46gpb")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #false + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4)) + #:cargo-development-inputs + (("rust-kv-log-macro" ,rust-kv-log-macro-1)))) + (home-page "https://github.com/yoshuawuyts/logtest") + (synopsis "Test and assert log statements") + (description "This package tests and asserts log statements.") + (license (list license:expat license:asl2.0)))) + (define-public rust-loom-0.4 (package (name "rust-loom") -- cgit v1.2.3 From ecd07816143e2897d9ac53b940c93251e482b8ce Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 10 Jan 2021 22:32:48 +0100 Subject: gnu: Add rust-juniper-0.14. * gnu/packages/crates-io.scm (rust-juniper-0.14, rust-juniper-codegen-0.14): New variables. --- gnu/packages/crates-io.scm | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 13c8f94e02..ff55b561e0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16791,6 +16791,73 @@ friction with idiomatic Rust structs to ease interopability.") (license (list license:asl2.0 license:expat)))) +(define-public rust-juniper-codegen-0.14 + (package + (name "rust-juniper-codegen") + (version "0.14.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "juniper_codegen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "06ym8568k9p75kvnfc4ywqbkzaa4ib6gngx9vpbsjwg9v0sg42nl")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #false ;FIXME: fail due to unresolved import + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-juniper" ,rust-juniper-0.14)))) + (home-page "https://github.com/graphql-rust/juniper") + (synopsis "Internal custom derive trait for Juniper GraphQL") + (description + "This package provides an internal custom derive trait for Juniper +GraphQL.") + (license license:bsd-2))) + +(define-public rust-juniper-0.14 + (package + (name "rust-juniper") + (version "0.14.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "juniper" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0s56rb31yddhvjynl5bk8jihcdln8h5yfsx63kfxdhzvw98vlqpn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-chrono" ,rust-chrono-0.4) + ("rust-fnv" ,rust-fnv-1) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-juniper-codegen" ,rust-juniper-codegen-0.14) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-url" ,rust-url-2) + ("rust-uuid" ,rust-uuid-0.7)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/graphql-rust/juniper") + (synopsis "GraphQL server library for Rust") + (description + "Juniper makes it possible to write GraphQL servers in Rust that are +type-safe and fast. It also tries to make declaring and resolving GraphQL +schemas convenient. + +Juniper does not include a web server. Instead it provides building blocks to +make integration with existing servers straightforward. It optionally +provides a pre-built integration for the Actix, Hyper, Iron, Rocket, and Warp +frameworks, including embedded Graphiql and GraphQL Playground for easy +debugging.") + (license license:bsd-2))) + (define-public rust-keccak-0.1 (package (name "rust-keccak") -- cgit v1.2.3 From 5f55832cd7b51f071ff6604e50569fb2be4d054c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 10 Jan 2021 22:37:06 +0100 Subject: gnu: Add rust-route-recognizer-0.2. * gnu/packages/crates-io.scm (rust-route-recognizer-0.2): 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 ff55b561e0..b5b2121745 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27952,6 +27952,25 @@ Rust Language Server.") (;("rust-serde-bytes" ,rust-serde-bytes-0.10) ("rust-serde-json" ,rust-serde-json-1)))))) +(define-public rust-route-recognizer-0.2 + (package + (name "rust-route-recognizer") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "route-recognizer" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17mmnyzg7yr5x84n28y6bll1qn21g11k61p6sgg2fjf0xdshcxsn")))) + (build-system cargo-build-system) + (home-page "https://github.com/http-rs/route-recognizer") + (synopsis "Recognizes URL patterns") + (description + "This package helps recognizing URL patterns with support for dynamic and +wildcard segments") + (license license:expat))) + (define-public rust-rspec-1 (package (name "rust-rspec") -- cgit v1.2.3 From be654769d9cb1abc614d870c1f2756f75ea67f26 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 10 Jan 2021 22:45:42 +0100 Subject: gnu: rust-async-trait-0.1: Update to 0.1.42. * gnu/packages/crates-io.scm (rust-async-trait-0.1): Update to 0.1.42. --- 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 b5b2121745..103afbd85f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2491,15 +2491,14 @@ crate.") (define-public rust-async-trait-0.1 (package (name "rust-async-trait") - (version "0.1.40") + (version "0.1.42") (source (origin (method url-fetch) (uri (crate-uri "async-trait" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "10x7jcg8xqvkmqyz11117aw959p4af5gq1cpf022b9f0hl6j6z38")))) + (base32 "0gd13pqgw5m6l4bqwjkickq13c4v0jxzxs5i4dwmldrlgvklafld")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 6dc7dfe03e82364889ef5f3d0d556e9232d29406 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 23 Jan 2021 09:53:49 +0100 Subject: gnu: rust-byteorder-1: Update to 1.4.2. * gnu/packages/crates-io.scm (rust-byteorder-1): Update to 1.4.2. --- gnu/packages/crates-io.scm | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 103afbd85f..03155f9d30 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4661,28 +4661,23 @@ in a byte slice, fast.") (define-public rust-byteorder-1 (package (name "rust-byteorder") - (version "1.3.4") + (version "1.4.2") (source (origin (method url-fetch) (uri (crate-uri "byteorder" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1pkjfhgjnq898g1d38ygcfi0msg3m6756cwv0sgysj1d26p8mi08")))) + (base32 "0srh0h0594jmsnbvm7n0g8xabhla8lwb3gn8s0fzd7d1snix2i5f")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs - (("rust-doc-comment" ,rust-doc-comment-0.3) - ("rust-quickcheck" ,rust-quickcheck-0.8) - ("rust-rand" ,rust-rand-0.6)))) - (home-page - "https://github.com/BurntSushi/byteorder") - (synopsis - "Reading/writing numbers in big-endian and little-endian") + (("rust-quickcheck" ,rust-quickcheck-0.9) + ("rust-rand" ,rust-rand-0.7)))) + (home-page "https://github.com/BurntSushi/byteorder") + (synopsis "Reading/writing numbers in big-endian and little-endian") (description - "Library for reading/writing numbers in big-endian and + "This library is used for reading or writing numbers in big-endian and little-endian.") (license (list license:expat license:unlicense)))) -- cgit v1.2.3 From c07313ccfadcef2b95cebb52ddfcb4056e2886f2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 23 Jan 2021 09:55:06 +0100 Subject: gnu: Add rust-combine-4. * gnu/packages/crates-io.scm (rust-combine-4): New variable. (rust-combine-3): Inherit from above. --- gnu/packages/crates-io.scm | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 03155f9d30..19e799bc44 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6056,8 +6056,43 @@ programming languages.") (sha256 (base32 "0fildacm47g86acmx44yvxx6cka8fdym5qkgfm8x8gh2hsrghc7r")))))) +(define-public rust-combine-4 + (package + (name "rust-combine") + (version "4.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "combine" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0zkvqp21fbhznf7sjssdiw3zgx3x3q8w10c9mmjdzkf0wjsnjhyc")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytes" ,rust-bytes-0.5) + ("rust-bytes" ,rust-bytes-1) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-memchr" ,rust-memchr-2) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-regex" ,rust-regex-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio" ,rust-tokio-0.2) + ("rust-tokio" ,rust-tokio-0.3)))) + (home-page "https://github.com/Marwes/combine") + (synopsis "Parser combinators on arbitrary streams with zero-copy support") + (description + "This package is an implementation of parser combinators for Rust, +inspired by the Haskell library Parsec. As in Parsec the parsers are LL(1) by +default but they can opt-in to arbitrary lookahead using the attempt +combinator.") + (license license:expat))) + (define-public rust-combine-3 (package + (inherit rust-combine-4) (name "rust-combine") (version "3.8.1") (source @@ -6067,7 +6102,6 @@ programming languages.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1006sbl3ybiky3d5q28p0lyph37hk7sipls1rkhikv11lfxacgfs")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-ascii" ,rust-ascii-0.9) @@ -6082,15 +6116,7 @@ programming languages.") ("rust-bytes" ,rust-bytes-0.4) ("rust-futures" ,rust-futures-0.1) ("rust-partial-io" ,rust-partial-io-0.3) - ("rust-tokio-codec" ,rust-tokio-codec-0.1)))) - (home-page "https://github.com/Marwes/combine") - (synopsis "Parser combinators on arbitrary streams with zero-copy support") - (description - "This package is an implementation of parser combinators for Rust, -inspired by the Haskell library Parsec. As in Parsec the parsers are LL(1) by -default but they can opt-in to arbitrary lookahead using the attempt -combinator.") - (license license:expat))) + ("rust-tokio-codec" ,rust-tokio-codec-0.1)))))) (define-public rust-combine-regex-1-1 (package -- cgit v1.2.3 From 1f2cca55a2dde9294ffe81f948a30e0b0350caa9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 23 Jan 2021 09:57:34 +0100 Subject: gnu: Add rust-jni-0.18. * gnu/packages/crates-io.scm (rust-jni-0.18): New variable. (rust-jni-0.14): Inherit from above. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 19e799bc44..7914d1ee1f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16659,25 +16659,25 @@ primitives to an @code{io::Write}.") (native-inputs `(("jemalloc" ,jemalloc))))) -(define-public rust-jni-0.14 +(define-public rust-jni-0.18 (package (name "rust-jni") - (version "0.14.0") + (version "0.18.0") (source (origin (method url-fetch) (uri (crate-uri "jni" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "00jl4jzzbbcf1nyziras5drp501xsk89g0132pwg194ilh6k308r")))) + (base32 "1brglk3kfia9wkr6rkm6p297b8qk6rv3k8rf6jjiqc74l49735i4")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cesu8" ,rust-cesu8-1) - ("rust-combine" ,rust-combine-3) - ("rust-error-chain" ,rust-error-chain-0.12) + ("rust-combine" ,rust-combine-4) ("rust-jni-sys" ,rust-jni-sys-0.3) ("rust-log" ,rust-log-0.4) + ("rust-thiserror" ,rust-thiserror-1) ("rust-walkdir" ,rust-walkdir-2)) #:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1)))) @@ -16690,6 +16690,29 @@ code from Rust, embed JVM in Rust applications and use any Java libraries.") (license (list license:expat license:asl2.0)))) +(define-public rust-jni-0.14 + (package + (inherit rust-jni-0.18) + (name "rust-jni") + (version "0.14.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "jni" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "00jl4jzzbbcf1nyziras5drp501xsk89g0132pwg194ilh6k308r")))) + (arguments + `(#:cargo-inputs + (("rust-cesu8" ,rust-cesu8-1) + ("rust-combine" ,rust-combine-3) + ("rust-error-chain" ,rust-error-chain-0.12) + ("rust-jni-sys" ,rust-jni-sys-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-walkdir" ,rust-walkdir-2)) + #:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static-1)))))) + (define-public rust-jni-glue-0.0 (package (name "rust-jni-glue") -- cgit v1.2.3 From ea7728a4839fb6c0d3eda93d196bc8beb54adf62 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 23 Jan 2021 10:01:30 +0100 Subject: gnu: rust-xdg-2: Drop minor version from variable name. * gnu/packages/crates-io.scm (rust-xdg-2): Renamed from rust-xdg-2.2. (rust-afl-0.8): (rust-afl-0.5): * gnu/packages/terminals.scm (alacritty): * gnu/packages/crates-graphics.scm (rust-andrew-0.2): Apply renaming. --- gnu/packages/crates-graphics.scm | 4 ++-- gnu/packages/crates-io.scm | 10 +++++----- gnu/packages/terminals.scm | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 02bf7b27a4..ca1fd9b3a7 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2020 Danny Milosavljevic ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Leo Famulari -;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Antoine Côté ;;; ;;; This file is part of GNU Guix. @@ -62,7 +62,7 @@ ("rust-line-drawing" ,rust-line-drawing-0.7) ("rust-rusttype" ,rust-rusttype-0.7) ("rust-walkdir" ,rust-walkdir-2) - ("rust-xdg" ,rust-xdg-2.2) + ("rust-xdg" ,rust-xdg-2) ("rust-xml-rs" ,rust-xml-rs-0.8)) #:cargo-development-inputs (("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.4)))) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7914d1ee1f..0ae18863bd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -993,10 +993,10 @@ block ciphers using AES-NI.") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-rustc-version" ,rust-rustc-version-0.2) - ("rust-xdg" ,rust-xdg-2.2)) + ("rust-xdg" ,rust-xdg-2)) #:cargo-development-inputs (("rust-rustc-version" ,rust-rustc-version-0.2) - ("rust-xdg" ,rust-xdg-2.2)))) + ("rust-xdg" ,rust-xdg-2)))) (home-page "https://github.com/rust-fuzz/afl.rs") (synopsis "Fuzzing Rust code with american-fuzzy-lop") @@ -1023,11 +1023,11 @@ block ciphers using AES-NI.") #:cargo-inputs (("rust-rustc-version" ,rust-rustc-version-0.2) ("rust-cc" ,rust-cc-1) - ("rust-xdg" ,rust-xdg-2.2) + ("rust-xdg" ,rust-xdg-2) ("rust-clap" ,rust-clap-2)) #:cargo-development-inputs (("rust-rustc-version" ,rust-rustc-version-0.2) - ("rust-xdg" ,rust-xdg-2.2)))))) + ("rust-xdg" ,rust-xdg-2)))))) (define-public rust-afl-0.4 (package @@ -41032,7 +41032,7 @@ extended attributes.") "This package provides Rust bindings and wrappers for XCB.") (license license:expat))) -(define-public rust-xdg-2.2 +(define-public rust-xdg-2 (package (name "rust-xdg") (version "2.2.0") diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 74e1937bbc..e6a7d6b16d 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2020 Valentin Ignatev ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Marius Bakke -;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Leo Famulari ;;; ;;; This file is part of GNU Guix. @@ -1242,7 +1242,7 @@ made by suckless.") ("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-parking-lot" ,rust-parking-lot-0.9) ("rust-urlocator" ,rust-urlocator-0.1) - ("rust-xdg" ,rust-xdg-2.2) + ("rust-xdg" ,rust-xdg-2) ("rust-image" ,rust-image-0.22) ("rust-dirs" ,rust-dirs-2.0) ("rust-x11-dl" ,rust-x11-dl-2) -- cgit v1.2.3 From 40d8f553fc6bd7af341f0d1387497dceb3561f1f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 23 Jan 2021 09:58:28 +0100 Subject: gnu: Add rust-app-dirs2-2. * gnu/packages/crates-io.scm (rust-app-dirs2-2): 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 0ae18863bd..df02f1d0ff 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1415,6 +1415,35 @@ escape codes.") @code{std::error::Error}.") (license (list license:expat license:asl2.0)))) +(define-public rust-app-dirs2-2 + (package + (name "rust-app-dirs2") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "app_dirs2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "04v2q3jkqr32mwqs4niqfyhbkvvgrcsw0dajwqaz83nc5hs1igsm")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-jni" ,rust-jni-0.18) + ("rust-ndk-glue" ,rust-ndk-glue-0.2) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-xdg" ,rust-xdg-2)) + #:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-test-case" ,rust-test-case-1)))) + (home-page "https://lib.rs/app_dirs2") + (synopsis "Put app's data in the right place on every platform") + (description + "This package helps you to put your app's data in the right place +on every platform.") + (license license:expat))) + (define-public rust-approx-0.3 (package (name "rust-approx") -- cgit v1.2.3 From ba0cda785ddb16f987f30cbd11591702ab2a94ea Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 23 Jan 2021 10:05:20 +0100 Subject: gnu: Add rust-tectonic-xdv-0.1. * gnu/packages/crates-io.scm (rust-tectonic-xdv-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 df02f1d0ff..1db0ec645b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -34672,6 +34672,29 @@ memory all at once.") "Targeting utilities for compilers and related tools") (license license:asl2.0))) +(define-public rust-tectonic-xdv-0.1 + (package + (name "rust-tectonic-xdv") + (version "0.1.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "tectonic_xdv" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ibxv32i7dla3iw6s01cagzgdgzhm1mmxwqjv841m6m4r7g57gxj")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1)))) + (home-page "https://tectonic-typesetting.github.io/") + (synopsis "Decoder for the XDV and SPX file formats") + (description + "This package provides a decoder for the XDV and SPX file formats +used by XeTeX and Tectonic.") + (license license:expat))) + (define-public rust-tempdir-0.3 (package (name "rust-tempdir") -- cgit v1.2.3 From c7a9d96051e23c728deae0974ba4aed994536705 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 23 Jan 2021 10:05:41 +0100 Subject: gnu: Add rust-tectonic-cfg-support-0.1. * gnu/packages/crates-io.scm (rust-tectonic-cfg-support-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 1db0ec645b..6d0115e820 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -34672,6 +34672,29 @@ memory all at once.") "Targeting utilities for compilers and related tools") (license license:asl2.0))) +(define-public rust-tectonic-cfg-support-0.1 + (package + (name "rust-tectonic-cfg-support") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "tectonic_cfg_support" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jsbk89g4s75cdav6350anls81k3lwaq6imhjb4q2c4cmr24i1cz")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1)))) + (home-page "https://tectonic-typesetting.github.io/") + (synopsis "Support crate for @code{CARGO_CFG_TARGET_*} variables") + (description + "This package provides a build.rs support crate that helps deal +with @code{CARGO_CFG_TARGET_*} variables.") + (license license:expat))) + (define-public rust-tectonic-xdv-0.1 (package (name "rust-tectonic-xdv") -- cgit v1.2.3 From baa47f0b1233ab588af19c8f13421e755aa93cdd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 23 Jan 2021 10:06:32 +0100 Subject: gnu: Add tectonic * gnu/packages/rust-apps.scm (tectonic): New variable. --- gnu/packages/rust-apps.scm | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 3745a8377c..4703443e57 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -33,6 +33,8 @@ #:use-module (gnu packages crates-io) #:use-module (gnu packages crates-graphics) #:use-module (gnu packages documentation) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages gtk) #:use-module (gnu packages jemalloc) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) @@ -458,6 +460,77 @@ gitignore rules.") (base32 "13jzbmjz1bmmfr0i80hw6ar484mgabx3hbpb2ynhk0ddqi0yr58m")))))) +(define-public tectonic + (package + (name "tectonic") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tectonic" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "16fm2bfvfizrydmirzf0bhr1fidb5slcbvr6150and8yqr8jc4lf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-app-dirs2" ,rust-app-dirs2-2) + ("rust-atty" ,rust-atty-0.2) + ("rust-byte-unit" ,rust-byte-unit-4) + ("rust-cbindgen" ,rust-cbindgen-0.16) + ("rust-cc" ,rust-cc-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-error-chain" ,rust-error-chain-0.12) + ("rust-flate2" ,rust-flate2-1) + ("rust-fs2" ,rust-fs2-0.4) + ("rust-headers" ,rust-headers-0.2) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-md-5" ,rust-md-5-0.9) + ("rust-pkg-config" ,rust-pkg-config-0.3) + ("rust-regex" ,rust-regex-1) + ("rust-reqwest" ,rust-reqwest-0.9) + ("rust-serde" ,rust-serde-1) + ("rust-sha2" ,rust-sha2-0.9) + ("rust-structopt" ,rust-structopt-0.3) + ("rust-tectonic-cfg-support" ,rust-tectonic-cfg-support-0.1) + ("rust-tectonic-xdv" ,rust-tectonic-xdv-0.1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-termcolor" ,rust-termcolor-1) + ("rust-toml" ,rust-toml-0.5) + ("rust-vcpkg" ,rust-vcpkg-0.2) + ("rust-zip" ,rust-zip-0.5)) + #:cargo-development-inputs + (("rust-filetime" ,rust-filetime-0.2) + ("rust-futures" ,rust-futures-0.1) + ("rust-headers" ,rust-headers-0.2) + ("rust-hyper" ,rust-hyper-0.12) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-tokio" ,rust-tokio-0.1)) + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version))) + (copy-recursively "docs/src" doc) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("fontconfig" ,fontconfig) + ("harfbuzz" ,harfbuzz) + ("openssl" ,openssl) + ("zlib" ,zlib))) + (home-page "https://tectonic-typesetting.github.io/") + (synopsis "Complete, embeddable TeX/LaTeX engine") + (description + "This package provides a modernized, complete, embeddable +TeX/LaTeX engine. Tectonic is forked from the XeTeX extension to the +classic Web2C implementation of TeX and uses the TeXLive distribution +of support files.") + (license license:expat))) + (define-public tokei (package (name "tokei") -- cgit v1.2.3 From fb51912d37b85463dc11a821b004c71e1306a642 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 20 Jan 2021 15:26:52 +0000 Subject: gnu: Add drill. * gnu/packages/rust-apps.scm (drill): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/rust-apps.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 4703443e57..2a16eebcfd 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Gabriel Arazas ;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2021 Tobias Geerinckx-Rice +;;; Copyright © 2021 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -92,6 +93,47 @@ highlighting for a large number of languages, git integration, and automatic paging.") (license (list license:expat license:asl2.0)))) +(define-public drill + (package + (name "drill") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "drill" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1m73d7rzi0p5c1hn0081d2235kcyapdza7h0vqf5jhnirpnjn793")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-clap" ,rust-clap-2) + ("rust-colored" ,rust-colored-1) + ("rust-csv" ,rust-csv-1) + ("rust-futures" ,rust-futures-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-linked-hash-map" ,rust-linked-hash-map-0.5) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-rand" ,rust-rand-0.7) + ("rust-regex" ,rust-regex-1) + ("rust-reqwest" ,rust-reqwest-0.10) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tokio" ,rust-tokio-0.2) + ("rust-url" ,rust-url-2) + ("rust-yaml-rust" ,rust-yaml-rust-0.4)))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("openssl" ,openssl))) + (home-page "https://github.com/fcsonline/drill") + (synopsis "HTTP load testing application") + (description + "Drill is a HTTP load testing application written in Rust inspired by +Ansible syntax. Benchmark files can be written in YAML.") + (license license:gpl3))) + (define-public exa (package (name "exa") -- cgit v1.2.3 From 60528f9ba729f7a22180d3a93d18bbdb3cfb2783 Mon Sep 17 00:00:00 2001 From: Matthew Kraai Date: Sat, 23 Jan 2021 11:16:35 +0100 Subject: gnu: sbcl-cmd: Remove dead code. * gnu/packages/lisp-xyz.scm (sbcl-cmd)[arguments]: Remove dead code. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 57d40dad07..7f5dfaddbc 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2020, 2021 Adam Kandur ;;; Copyright © 2020, 2021 Sharlatan Hellseher ;;; Copyright © 2021 Aurora +;;; Copyright © 2021 Matthew Kraai ;;; ;;; This file is part of GNU Guix. ;;; @@ -13224,9 +13225,8 @@ standard library.") (modify-phases %standard-phases (add-after 'unpack 'fix-paths (lambda* (#:key inputs #:allow-other-keys) - (let ((source (assoc-ref inputs "source")) - (bin (string-append (assoc-ref inputs "coreutils") "/bin"))) - (substitute* (string-append "cmd.lisp") + (let ((bin (string-append (assoc-ref inputs "coreutils") "/bin"))) + (substitute* "cmd.lisp" (("\"env\"") (format #f "\"~a/env\"" bin)) (("\"pwd\"") (format #f "\"~a/pwd\"" bin))))))))) (home-page "https://github.com/ruricolist/cmd") -- cgit v1.2.3 From b4e58e66f8060accaeb80a9cb732ce991d7cf138 Mon Sep 17 00:00:00 2001 From: Matthew Kraai Date: Sat, 23 Jan 2021 11:19:08 +0100 Subject: gnu: cl-cmd: Use sbcl-package->cl-source-package. * gnu/packages/lisp-xyz.scm (cl-cmd): Use sbcl-package->cl-source-package. Signed-off-by: Guillaume Le Vaillant --- 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 7f5dfaddbc..d2e08883db 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13241,7 +13241,7 @@ be usable from multi-threaded programs.") (sbcl-package->ecl-package sbcl-cmd)) (define-public cl-cmd - (sbcl-package->ecl-package sbcl-cmd)) + (sbcl-package->cl-source-package sbcl-cmd)) (define-public sbcl-ppath (let ((commit "eb1a8173b4d1d691ea9a7699412123462f58c3ce")) -- cgit v1.2.3 From 52ee15f06d2f48143267ee769bf1233c1d7e7325 Mon Sep 17 00:00:00 2001 From: Matthew Kraai Date: Sat, 23 Jan 2021 11:19:09 +0100 Subject: gnu: cl-ppath: Use sbcl-package->cl-source-package. * gnu/packages/lisp-xyz.scm (cl-ppath): Use sbcl-package->cl-source-package. Signed-off-by: Guillaume Le Vaillant --- 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 d2e08883db..88e946efae 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13284,4 +13284,4 @@ corresponding OS system functions are called.") (sbcl-package->ecl-package sbcl-ppath)) (define-public cl-ppath - (sbcl-package->ecl-package sbcl-ppath)) + (sbcl-package->cl-source-package sbcl-ppath)) -- cgit v1.2.3 From 0288e2176e95ad919bd9eee4f33501a1b343c89d Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 22 Jan 2021 14:10:21 +0100 Subject: gnu: Add nanovna-saver. * gnu/packages/radio.scm (nanovna-saver): New variable. --- gnu/packages/radio.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index c58645fe87..95e86e560a 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1117,3 +1117,33 @@ modes: @item X10 @end itemize") (license license:gpl2+))) + +(define-public nanovna-saver + (package + (name "nanovna-saver") + (version "0.3.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/NanoVNA-Saver/nanovna-saver") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0z83rwpnbbs1n74mx8dgh1d1crp90mannj9vfy161dmy4wzc5kpv")))) + (build-system python-build-system) + (native-inputs + `(("python-cython" ,python-cython))) + (inputs + `(("python-numpy" ,python-numpy) + ("python-pyqt" ,python-pyqt) + ("python-pyserial" ,python-pyserial) + ("python-scipy" ,python-scipy))) + (arguments + '(#:tests? #f)) + (home-page "https://github.com/NanoVNA-Saver/nanovna-saver") + (synopsis "GUI for NanoVNA devices") + (description + "NanoVNA-Saver is a tool for reading, displaying and saving data from the +NanoVNA vector network analyzers.") + (license license:gpl3+))) -- cgit v1.2.3 From 490f5388e94ca700eec46812da3626dbeb84a5d0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 23 Jan 2021 18:02:25 +0100 Subject: gnu: emacs-auctex: Update to 13.0.4. * gnu/packages/emacs-xyz.scm (emacs-auctex): Update to 13.0.4. --- 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 52f61c9c37..4eda6252fa 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2073,14 +2073,14 @@ as a library for other Emacs packages.") (define-public emacs-auctex (package (name "emacs-auctex") - (version "13.0.3") + (version "13.0.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "auctex-" version ".tar")) (sha256 - (base32 "1ljpkr0z15fyh907jbgky238dvci5vqi3xhvslyhblhp8sg9cbsi")))) + (base32 "1362dqb8mcaddda9849gqsj6rzlfq18xprddb74j02884xl7hq65")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). -- cgit v1.2.3 From 041b1218e524a986b0bd0841f78c3308bff15024 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Sun, 17 Jan 2021 14:53:43 -0500 Subject: gnu: emacs-eshell-syntax-highlighting: Update to 0.3. * gnu/packages/emacs-xyz.scm (emacs-eshell-syntax-highlighting): Update to 0.3. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4eda6252fa..480e51e288 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18313,16 +18313,16 @@ appropriate directory if no @code{eshell} session is active.") (define-public emacs-eshell-syntax-highlighting (package (name "emacs-eshell-syntax-highlighting") - (version "0.2") + (version "0.3") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/akreisher/eshell-syntax-highlighting") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0id27874wsb5y169030x8g1ldpa1mnskv1s2j3ygqiyh5fvpfash")))) + (base32 "1fb9aa85a3hx1rcmv71j6sc3y278452p1y4dabpwy07avb6apd0p")))) (build-system emacs-build-system) (home-page "https://github.com/akreisher/eshell-syntax-highlighting") (synopsis "Add syntax highlighting to Eshell") -- cgit v1.2.3 From 7ee917d0cf22752d48df1ffaff0e03c72208ae25 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sat, 23 Jan 2021 16:40:47 -0600 Subject: gnu: Add Trigger Rally. * gnu/packages/games.scm (trigger-rally): New variable. --- gnu/packages/games.scm | 89 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ee1571e624..37fa926368 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013 John Darrington ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2016 David Thompson -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Eric Bavier +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Eric Bavier ;;; Copyright © 2014 Cyrill Schenkel ;;; Copyright © 2014 Sylvain Beucler ;;; Copyright © 2014, 2015, 2018, 2019 Ludovic Courtès @@ -2459,6 +2459,93 @@ available, as well as a single-player mode with AI-controlled ships.") "$(call ZIP) -X")) #t)))) +(define-public trigger-rally + (package + (name "trigger-rally") + (version "0.6.6.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/trigger-rally/" + "trigger-" version "/" + "trigger-rally-" version ".tar.gz")) + (sha256 + (base32 + "016bc2hczqscfmngacim870hjcsmwl8r3aq8x03vpf22s49nw23z")))) + (build-system gnu-build-system) + (inputs + `(("freealut" ,freealut) + ("glew" ,glew) + ("glu" ,glu) + ("mesa" ,mesa) + ("openal" ,openal) + ("physfs" ,physfs) + ("sdl" ,(sdl-union (list sdl2 sdl2-image))) + ("tinyxml2" ,tinyxml2))) + (arguments + `(#:make-flags (list (string-append "prefix=" %output) + "bindir=$(prefix)/bin" + "datadir=$(datarootdir)" + "OPTIMS=-Ofast") + #:tests? #f ; No tests present + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'cd-src + (lambda _ (chdir "src"))) + (add-before 'build 'remove-timestamps + (lambda _ + (substitute* (list "Trigger/menu.cpp" + "PEngine/app.cpp") + ((".*__DATE__.*") "")))) + (add-before 'build 'make-verbose + (lambda _ + (substitute* "GNUmakefile" + (("@\\$\\(CXX\\)") "$(CXX)")))) + (add-after 'build 'set-data-path + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "../bin/trigger-rally.config.defs" + ((" Date: Sat, 23 Jan 2021 16:48:11 -0600 Subject: gnu: trigger-rally: Fix license field. * gnu/packages/games.scm (trigger-rally)[license]: Use list. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 37fa926368..be7a3cc181 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2543,8 +2543,8 @@ through the maps in often tight time limits and can further improve by beating the recorded high scores. All attached single races must be finished in time in order to win an event, unlocking additional events and cars. Most maps are equipped with spoken co-driver notes and co-driver icons.") - (license license:cc0 ;textures and audio in data.zip - license:gpl2+))) + (license (list license:cc0 ;textures and audio in data.zip + license:gpl2+)))) (define-public ufo2map (package -- cgit v1.2.3 From a2ebd7bb067c07618a941a9f2ec605817976c21f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:05:57 +0100 Subject: gnu: Add rust-unic-common-0.9. * gnu/packages/crates-io.scm (rust-unic-common-0.9): 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 6d0115e820..c83a7735b3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38659,6 +38659,26 @@ panic-free alternative to @code{core::fmt}.") "Unchecked indexing wrapper using regular index syntax.") (license (list license:asl2.0 license:expat)))) +(define-public rust-unic-common-0.9 + (package + (name "rust-unic-common") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "unic-common" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1g1mm954m0zr497dl4kx3vr09yaly290zs33bbl4wrbaba1gzmw0")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/open-i18n/rust-unic/") + (synopsis "Common utilities for UNIC") + (description + "This package provides common utilities for the Unicode and +Internationalization Crates (UNIC) project.") + (license (list license:expat license:asl2.0)))) + (define-public rust-unicase-2 (package (name "rust-unicase") -- cgit v1.2.3 From 15281c9bb2920d51de793f843d0b8fb51221053d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:06:33 +0100 Subject: gnu: Add rust-unic-ucd-version-0.9. * gnu/packages/crates-io.scm (rust-unic-ucd-version-0.9): 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 c83a7735b3..47213c0881 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38679,6 +38679,30 @@ panic-free alternative to @code{core::fmt}.") Internationalization Crates (UNIC) project.") (license (list license:expat license:asl2.0)))) +(define-public rust-unic-ucd-version-0.9 + (package + (name "rust-unic-ucd-version") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "unic-ucd-version" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1i5hnzpfnxkp4ijfk8kvhpvj84bij575ybqx1b6hyigy6wi2zgcn")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-unic-common" ,rust-unic-common-0.9)))) + (home-page "https://github.com/open-i18n/rust-unic/") + (synopsis "Unicode character database for UNIC") + (description + "This package provides a Unicode character database for the +Unicode and Internationalization Crates (UNIC) project.") + (license (list license:expat license:asl2.0)))) + (define-public rust-unicase-2 (package (name "rust-unicase") -- cgit v1.2.3 From 590314e16c5ce0d92be8b6da215654e8f472ce57 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:06:52 +0100 Subject: gnu: Add rust-unic-char-range-0.9. * gnu/packages/crates-io.scm (rust-unic-char-range-0.9): 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 47213c0881..7f8884cefd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38659,6 +38659,29 @@ panic-free alternative to @code{core::fmt}.") "Unchecked indexing wrapper using regular index syntax.") (license (list license:asl2.0 license:expat)))) +(define-public rust-unic-char-range-0.9 + (package + (name "rust-unic-char-range") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "unic-char-range" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1g0z7iwvjhqspi6194zsff8vy6i3921hpqcrp3v1813hbwnh5603")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rayon" ,rust-rayon-1)))) + (home-page "https://github.com/open-i18n/rust-unic/") + (synopsis "Character range and iteration for UNIC") + (description + "This package provides Unicode character range and iteration for +the Unicode and Internationalization Crates (UNIC) project.") + (license (list license:expat license:asl2.0)))) + (define-public rust-unic-common-0.9 (package (name "rust-unic-common") -- cgit v1.2.3 From 5434a70d1e74c2e6f6d5e1f72f0820dcaae36a51 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:07:06 +0100 Subject: gnu: Add rust-unic-char-property-0.9. * gnu/packages/crates-io.scm (rust-unic-char-property-0.9): 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 7f8884cefd..1788642eda 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38659,6 +38659,30 @@ panic-free alternative to @code{core::fmt}.") "Unchecked indexing wrapper using regular index syntax.") (license (list license:asl2.0 license:expat)))) +(define-public rust-unic-char-property-0.9 + (package + (name "rust-unic-char-property") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "unic-char-property" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "08g21dn3wwix3ycfl0vrbahn0835nv2q3swm8wms0vwvgm07mid8")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-unic-char-range" ,rust-unic-char-range-0.9)))) + (home-page "https://github.com/open-i18n/rust-unic/") + (synopsis "Character property taxonomy, contracts and macros for UNIC") + (description + "This package provides character property taxonomy, contracts and +build macros for the Unicode and Internationalization Crates (UNIC) +project.") + (license (list license:expat license:asl2.0)))) + (define-public rust-unic-char-range-0.9 (package (name "rust-unic-char-range") -- cgit v1.2.3 From 3ef0502f425d38eb7c73714b1b0576f895877f10 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:07:34 +0100 Subject: gnu: Add rust-unic-ucd-segment-0.9. * gnu/packages/crates-io.scm (rust-unic-ucd-segment-0.9): 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 1788642eda..75df37343e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38726,6 +38726,32 @@ the Unicode and Internationalization Crates (UNIC) project.") Internationalization Crates (UNIC) project.") (license (list license:expat license:asl2.0)))) +(define-public rust-unic-ucd-segment-0.9 + (package + (name "rust-unic-ucd-segment") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "unic-ucd-segment" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0027lczcg0r401g6fnzm2bq9fxhgxvri1nlryhhv8192lqic2y90")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-unic-char-property" ,rust-unic-char-property-0.9) + ("rust-unic-char-range" ,rust-unic-char-range-0.9) + ("rust-unic-ucd-version" ,rust-unic-ucd-version-0.9)))) + (home-page "https://github.com/open-i18n/rust-unic/") + (synopsis "Segmentation properties for the UNIC Unicode character database") + (description + "This package provides segmentation properties in the Unicode +character database for the Unicode and Internationalization +Crates (UNIC) project.") + (license (list license:expat license:asl2.0)))) + (define-public rust-unic-ucd-version-0.9 (package (name "rust-unic-ucd-version") -- cgit v1.2.3 From f5559b89a0246cf851332e13186eb598ac529ee3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:07:59 +0100 Subject: gnu: Add rust-unic-segment-0.9. * gnu/packages/crates-io.scm (rust-unic-segment-0.9): 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 75df37343e..9d1f8bd255 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38726,6 +38726,31 @@ the Unicode and Internationalization Crates (UNIC) project.") Internationalization Crates (UNIC) project.") (license (list license:expat license:asl2.0)))) +(define-public rust-unic-segment-0.9 + (package + (name "rust-unic-segment") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "unic-segment" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "08wgz2q6vrdvmbd23kf9pbg8cyzm5q8hq9spc4blzy2ppqk5vvg4")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-unic-ucd-segment" ,rust-unic-ucd-segment-0.9)))) + (home-page "https://github.com/open-i18n/rust-unic/") + (synopsis "Text segmentation algorithmes for UNIC") + (description + "This UNIC component implements algorithms from Unicode Standard +Annex #29 - Unicode Text Segmentation, used for detecting boundaries +of text element boundaries, such as user-perceived characters (a.k.a. +grapheme clusters), words, and sentences.") + (license (list license:expat license:asl2.0)))) + (define-public rust-unic-ucd-segment-0.9 (package (name "rust-unic-ucd-segment") -- cgit v1.2.3 From e4675c78f1bd7ae91808c7a4bcf9826d21adc364 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:08:32 +0100 Subject: gnu: Add rust-deunicode-0.4. * gnu/packages/crates-io.scm (rust-deunicode-0.4): 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 9d1f8bd255..bc4bbecf7c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9053,6 +9053,26 @@ traits for both structs and enums.") structs and enums.") (license license:expat))) +(define-public rust-deunicode-0.4 + (package + (name "rust-deunicode") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "deunicode" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "146nc3wlwz2j9awwf7zf76qvjcahnls0mlv9jm6clcvr9dlph245")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://lib.rs/crates/deunicode") + (synopsis "Convert Unicode strings to pure ASCII") + (description + "This package converts Unicode strings to pure ASCII by +intelligently transliterating them. It supports Emoji and Chinese.") + (license license:bsd-3))) + (define-public rust-dialoguer-0.6 (package (name "rust-dialoguer") -- cgit v1.2.3 From f71c71c73afa24c3f456efef7061884da263c605 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:08:51 +0100 Subject: gnu: Add rust-slug-0.1. * gnu/packages/crates-io.scm (rust-slug-0.1): New variable.c --- 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 bc4bbecf7c..a43200ac5b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32469,6 +32469,30 @@ data type.") license:expat license:asl2.0)))) +(define-public rust-slug-0.1 + (package + (name "rust-slug") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "slug" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0wrk0w7mcmnvpmc27fw8dxkip6f6xgwpfgp7mp56yv2bd8p7dg5k")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-deunicode" ,rust-deunicode-0.4)))) + (home-page "https://github.com/Stebalien/slug-rs") + (synopsis "Convert a Unicode string to a slug") + (description + "This package is a small library for generating slugs from +Unicode strings.") + (license (list license:expat license:asl2.0)))) + (define-public rust-sluice-0.5 (package (name "rust-sluice") -- cgit v1.2.3 From b7b7f9505ff1f9231c99856e813ffb13653a42b8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:09:44 +0100 Subject: gnu: Add rust-rand-hc-0.3. * gnu/packages/crates-io.scm (rust-rand-hc-0.3): New variable. (rust-rand-hc-0.2): Inherit from above. --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a43200ac5b..6e79c16a0d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -26542,8 +26542,32 @@ useful types and distributions, and some randomness-related algorithms.") "Sampling from random number distributions.") (license (list license:expat license:asl2.0)))) +(define-public rust-rand-hc-0.3 + (package + (name "rust-rand-hc") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_hc" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0wra6ar22zdjkry9dsq1mg620m4h3qb9s8rfykkz4im4crqfz41i")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rand-core" ,rust-rand-core-0.6)))) + (home-page "https://crates.io/crates/rand_hc") + (synopsis "HC128 random number generator") + (description "This package provides a cryptographically secure random number +generator that uses the HC-128 algorithm.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rand-hc-0.2 (package + (inherit rust-rand-hc-0.3) (name "rust-rand-hc") (version "0.2.0") (source @@ -26554,16 +26578,9 @@ useful types and distributions, and some randomness-related algorithms.") (sha256 (base32 "0g31sqwpmsirdlwr0svnacr4dbqyz339im4ssl9738cjgfpjjcfa")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-rand-hc" ,rust-rand-core-0.5)))) - (home-page "https://crates.io/crates/rand_hc") - (synopsis "HC128 random number generator") - (description "This package provides a cryptographically secure random number -generator that uses the HC-128 algorithm.") - (license (list license:asl2.0 - license:expat)))) + (("rust-rand-hc" ,rust-rand-core-0.5)))))) (define-public rust-rand-hc-0.1 (package -- cgit v1.2.3 From 2f3206f00eff57f9b8ffdd16034af3873c3969b8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:10:44 +0100 Subject: gnu: Add rust-rand-core-0.6. * gnu/packages/crates-io.scm (rust-rand-core-0.6): New variable. (rust-rand-core-0.5): Inherit from above. --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6e79c16a0d..e5fee2e63a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -26436,8 +26436,33 @@ useful types and distributions, and some randomness-related algorithms.") #:cargo-development-inputs (("rust-autocfg" ,rust-autocfg-0.1)))))) +(define-public rust-rand-core-0.6 + (package + (name "rust-rand-core") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1rfjrcyaj7blz2nawv2pypm5kqc59p80n6f5pg691399iggxf9n0")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-getrandom" ,rust-getrandom-0.2) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://rust-random.github.io/book") + (synopsis "Core random number generator traits and tools") + (description + "This package provides core random number generator traits and +tools for implementation.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rand-core-0.5 (package + (inherit rust-rand-core-0.6) (name "rust-rand-core") (version "0.5.1") (source @@ -26449,17 +26474,10 @@ useful types and distributions, and some randomness-related algorithms.") (sha256 (base32 "06bdvx08v3rkz451cm7z59xwwqn1rkfh6v9ay77b14f8dwlybgch")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-getrandom" ,rust-getrandom-0.1) - ("rust-serde" ,rust-serde-1)))) - (home-page "https://crates.io/crates/rand-core") - (synopsis - "Core random number generator traits and tools for implementation") - (description - "Core random number generator traits and tools for implementation.") - (license (list license:expat license:asl2.0)))) + ("rust-serde" ,rust-serde-1)))))) (define-public rust-rand-core-0.4 (package -- cgit v1.2.3 From aab1c03ecfe98b9fa3aae01cd7191bffafac095d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:11:34 +0100 Subject: gnu: Add rust-rand-chacha-0.3. * gnu/packages/crates-io.scm (rust-rand-chacha-0.3): New variable. (rust-rand-chacha-0.2): Inherit from above. --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e5fee2e63a..1e3d751bbc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -26394,8 +26394,32 @@ useful types and distributions, and some randomness-related algorithms.") (("rust-libc" ,rust-libc-0.2) ("rust-rand" ,rust-rand-0.4)))))) +(define-public rust-rand-chacha-0.3 + (package + (name "rust-rand-chacha") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_chacha" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "03df2xh5nbdvwr17qm3sviaxa95r8yhm1nil2pr0pqf90p7ka9z1")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-ppv-lite86" ,rust-ppv-lite86-0.2) + ("rust-rand-core" ,rust-rand-core-0.6)))) + (home-page "https://crates.io/crates/rand_chacha") + (synopsis "ChaCha random number generator") + (description + "This package provides the ChaCha random number generator.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rand-chacha-0.2 (package + (inherit rust-rand-chacha-0.3) (name "rust-rand-chacha") (version "0.2.2") (source @@ -26407,15 +26431,10 @@ useful types and distributions, and some randomness-related algorithms.") (sha256 (base32 "00il36fkdbsmpr99p9ksmmp6dn1md7rmnwmz0rr77jbrca2yvj7l")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-c2-chacha" ,rust-c2-chacha-0.2) - ("rust-rand-core" ,rust-rand-core-0.5)))) - (home-page "https://crates.io/crates/rand-chacha") - (synopsis "ChaCha random number generator") - (description "ChaCha random number generator.") - (license (list license:asl2.0 license:expat)))) + ("rust-rand-core" ,rust-rand-core-0.5)))))) (define-public rust-rand-chacha-0.1 (package -- cgit v1.2.3 From 5e85434c50213881a2659ae3a264ceccd7a37397 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:12:19 +0100 Subject: gnu: Add rust-rand-0.8. * gnu/packages/crates-io.scm (rust-rand-0.8): New variable. (rust-rand-0.7): Inherit from above. --- gnu/packages/crates-io.scm | 54 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1e3d751bbc..7a3365f965 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -26260,19 +26260,48 @@ that must be shared-mutable, but merely may use atomic instructions to do so.") radix.") (license license:asl2.0))) +(define-public rust-rand-0.8 + (package + (name "rust-rand") + (version "0.8.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "07lb17qj02bi17mhqxlmsiyf4g8cmplm6hbiw5hxc900li19nl8q")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-packed-simd-2" ,rust-packed-simd-2-0.3) + ("rust-rand-chacha" ,rust-rand-chacha-0.3) + ("rust-rand-core" ,rust-rand-core-0.6) + ("rust-rand-hc" ,rust-rand-hc-0.3) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://crates.io/crates/rand") + (synopsis "Random number generators and other randomness functionality") + (description + "Rand provides utilities to generate random numbers, to convert them to +useful types and distributions, and some randomness-related algorithms.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rand-0.7 (package + (inherit rust-rand-0.8) (name "rust-rand") (version "0.7.3") (source - (origin - (method url-fetch) - (uri (crate-uri "rand" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "00sdaimkbz491qgi6qxkv582yivl32m2jd401kzbn94vsiwicsva")))) - (build-system cargo-build-system) + (origin + (method url-fetch) + (uri (crate-uri "rand" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "00sdaimkbz491qgi6qxkv582yivl32m2jd401kzbn94vsiwicsva")))) (arguments `(#:cargo-inputs (("rust-getrandom" ,rust-getrandom-0.1) @@ -26285,14 +26314,7 @@ radix.") ("rust-rand-pcg" ,rust-rand-pcg-0.2)) #:cargo-development-inputs (("rust-rand-hc" ,rust-rand-hc-0.2) - ("rust-rand-pcg" ,rust-rand-pcg-0.2)))) - (home-page "https://crates.io/crates/rand") - (synopsis "Random number generators and other randomness functionality") - (description - "Rand provides utilities to generate random numbers, to convert them to -useful types and distributions, and some randomness-related algorithms.") - (license (list license:asl2.0 - license:expat)))) + ("rust-rand-pcg" ,rust-rand-pcg-0.2)))))) (define-public rust-rand-0.6 (package -- cgit v1.2.3 From 0b0e023ea540b80b8b00340b57b1848c01c98c11 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:12:53 +0100 Subject: gnu: rust-globwalk-0.8: Update to 0.8.1. * gnu/packages/crates-io.scm (rust-globwalk-0.8): Update to 0.8.1. --- 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 7a3365f965..8a479c07cf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13840,15 +13840,14 @@ path simultaneously, and returning all of the globs that matched.") (define-public rust-globwalk-0.8 (package (name "rust-globwalk") - (version "0.8.0") + (version "0.8.1") (source (origin (method url-fetch) (uri (crate-uri "globwalk" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0ihld70ngnri1qd8sd61099yfzcl6iqn17rfa102q1bl6ck710hp")))) + (base32 "1k6xwkydr7igvwjn3xkwjywk4213lcs53f576ilqz1h84jaazqwk")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From d5e57fc3c8aeae5c0f56f323bd2e4cfded1c3e41 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:14:25 +0100 Subject: gnu: Add rust-parse-zoneinfo-0.3. * gnu/packages/crates-io.scm (rust-parse-zoneinfo-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 8a479c07cf..55e893b384 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -23262,6 +23262,28 @@ synchronization primitives.") ("rust-winapi" ,rust-winapi-0.3) ("rust-rustc-version" ,rust-rustc-version-0.2)))))) +(define-public rust-parse-zoneinfo-0.3 + (package + (name "rust-parse-zoneinfo") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "parse-zoneinfo" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0h8g6jy4kckn2gk8sd5adaws180n1ip65xhzw5jxlq4w8ibg41f7")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-regex" ,rust-regex-1)))) + (home-page "") + (synopsis "Parse zoneinfo files from the IANA database") + (description + "This packages parses zoneinfo files from the IANA database.") + (license license:expat))) + (define-public rust-partial-io-0.3 (package (name "rust-partial-io") -- cgit v1.2.3 From b6742050f9299cb01806e8ebb8169413bf1f1de2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:14:57 +0100 Subject: gnu: Add rust-chrono-tz-0.5. * gnu/packages/crates-io.scm (rust-chrono-tz-0.5): 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 55e893b384..e0c552827b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5521,6 +5521,31 @@ chain, the first matching branch is the item that gets emitted.") (description "Date and time library for Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-chrono-tz-0.5 + (package + (name "rust-chrono-tz") + (version "0.5.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "chrono-tz" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "085i4940kn0fn4gkl3xi1kv3vp2frhfig1vla1i461pcbwas6m15")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-chrono" ,rust-chrono-0.4) + ("rust-parse-zoneinfo" ,rust-parse-zoneinfo-0.3) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/chronotope/chrono-tz") + (synopsis "TimeZone implementations for rust-chrono from the IANA database") + (description + "Chrono-TZ is a library that provides implementors of the +TimeZone trait for @code{rust-chrono}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-ci-info-0.3 (package (name "rust-ci-info") -- cgit v1.2.3 From 0e8bbfc9c66733f52e3536f3f0368d23914e7f44 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:15:21 +0100 Subject: gnu: Add rust-tera-1. * gnu/packages/crates-io.scm (rust-tera-1): 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 e0c552827b..9f49a48521 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -34991,6 +34991,42 @@ directories.") "Compact buffer/string type for zero-copy parsing.") (license (list license:expat license:asl2.0)))) +(define-public rust-tera-1 + (package + (name "rust-tera") + (version "1.6.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tera" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1p7qzd8akd4xk4b23dmdrqw9q8061xkl1mar34j3f2glmizapipa")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-chrono" ,rust-chrono-0.4) + ("rust-chrono-tz" ,rust-chrono-tz-0.5) + ("rust-globwalk" ,rust-globwalk-0.8) + ("rust-humansize" ,rust-humansize-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-pest" ,rust-pest-2) + ("rust-pest-derive" ,rust-pest-derive-2) + ("rust-rand" ,rust-rand-0.8) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-slug" ,rust-slug-0.1) + ("rust-unic-segment" ,rust-unic-segment-0.9)))) + (home-page "https://tera.netlify.com/") + (synopsis "Template engine based on Jinja2/Django templates") + (description + "Tera is a template engine inspired by Jinja2 and the Django +template language.") + (license license:expat))) + (define-public rust-term-0.6 (package (name "rust-term") -- cgit v1.2.3 From 908cfe819888673fbf959960c88c82d918fb0ae5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:15:54 +0100 Subject: gnu: rust-yaml-rust-0.4: Update to 0.4.5. * gnu/packages/crates-io.scm (rust-yaml-rust-0.4): Update to 0.4.5. --- gnu/packages/crates-io.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9f49a48521..183aff4b59 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41589,25 +41589,24 @@ Read/Write streams as well as low-level in-memory encoding and decoding.") (define-public rust-yaml-rust-0.4 (package (name "rust-yaml-rust") - (version "0.4.4") + (version "0.4.5") (source (origin (method url-fetch) (uri (crate-uri "yaml-rust" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "038byay0dxsz6isckviz4qshfpyjqmyvda7pq96i6d53y4ickw1r")))) + (base32 "118wbqrr4n6wgk5rjjnlrdlahawlxc1bdsx146mwk8f79in97han")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-linked-hash-map" ,rust-linked-hash-map-0.5)) #:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.9)))) - (home-page "https://chyh1990.github.io/yaml-rust/") - (synopsis "The missing YAML 1.2 parser for rust") - (description - "The missing YAML 1.2 parser for rust.") - (license (list license:asl2.0 license:expat)))) + (home-page "http://chyh1990.github.io/yaml-rust/") + (synopsis "YAML 1.2 parser for Rust") + (description "This package is a YAML 1.2 parser for Rust.") + (license (list license:expat license:asl2.0)))) (define-public rust-yaml-rust-0.3 (package -- cgit v1.2.3 From a74dc3e02fe4d40f1e284fb5b6e7f95ec11dbb51 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:25:15 +0100 Subject: gnu: rust-unindent-0.1: Update to 0.1.7. * gnu/packages/crates-io.scm (rust-unindent-0.1): Update to 0.1.7. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 183aff4b59..b4d520c210 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39203,14 +39203,14 @@ or XID_Continue properties according to Unicode Standard Annex #31.") (define-public rust-unindent-0.1 (package (name "rust-unindent") - (version "0.1.6") + (version "0.1.7") (source (origin (method url-fetch) (uri (crate-uri "unindent" version)) - (file-name (string-append name "-" version ".crate")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0hl9l4w9mhv5qacx7cirm6rarrphw35b5syw2plx13vz884dfhdg")))) + (base32 "1is1gmx1l89z426rn3xsi0mii4vhy2imhqmhx8x2pd8mji6y0kpi")))) (build-system cargo-build-system) (home-page "https://github.com/dtolnay/indoc") (synopsis "Remove a column of leading whitespace from a string") -- cgit v1.2.3 From 8c95725fa2e5b948c1aefe8f7717bd189035fcbe Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:28:18 +0100 Subject: gnu: Add rust-indoc-1. * gnu/packages/crates-io.scm (rust-indoc-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 b4d520c210..2c49cfc542 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15803,6 +15803,33 @@ or numerical index. A corresponding hash set type is also provided.") Rust.") (license license:expat))) +(define-public rust-indoc-1 + (package + (name "rust-indoc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "indoc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0diih20xsxjb159nr0dq6jxnyhq7gg10dlsnh2siikphmvm5m9z5")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #true + #:cargo-inputs + (("rust-unindent" ,rust-unindent-0.1)) + #:cargo-development-inputs + (("rust-rustversion" ,rust-rustversion-1) + ("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://github.com/dtolnay/indoc") + (synopsis "Indented document literals for Rust") + (description + "This crate provides a procedural macro for indented string literals. +The @code{indoc!()} macro takes a multiline string literal and un-indents it +at compile time so the leftmost non-space character is in the first column.") + (license (list license:expat license:asl2.0)))) + (define-public rust-infer-0.2 (package (name "rust-infer") -- cgit v1.2.3 From 545606f9a0a4a98cd26b8159b6996b6575d807b3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:17:04 +0100 Subject: gnu: rust-serde-yaml-0.8: Update to 0.8.15. * gnu/packages/crates-io.scm (rust-serde-yaml-0.8): Update to 0.8.15. [arguments]: Remove rust-unindent as a Cargo development input and replace it with rust-indoc. --- gnu/packages/crates-io.scm | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2c49cfc542..68920f1fd3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31438,32 +31438,28 @@ the application/x-www-form-urlencoded format.") (define-public rust-serde-yaml-0.8 (package (name "rust-serde-yaml") - (version "0.8.11") + (version "0.8.15") (source (origin (method url-fetch) (uri (crate-uri "serde_yaml" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0d9wdjrlx9gxg80kzc6pvdwz5pwhja2n8n0bxja9vv61kzqif6v9")))) + (base32 "17q8rshlq56z6zna7wxhk9pihna3s5qdz8q5niip396lwkvfh6wp")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-dtoa" ,rust-dtoa-0.4) ("rust-linked-hash-map" ,rust-linked-hash-map-0.5) ("rust-serde" ,rust-serde-1) ("rust-yaml-rust" ,rust-yaml-rust-0.4)) #:cargo-development-inputs - (("rust-serde-derive" ,rust-serde-derive-1) - ("rust-unindent" ,rust-unindent-0.1)))) - (home-page - "https://github.com/dtolnay/serde-yaml") + (("rust-indoc" ,rust-indoc-1) + ("rust-serde-derive" ,rust-serde-derive-1)))) + (home-page "https://github.com/dtolnay/serde-yaml") (synopsis "YAML support for Serde") - (description "YAML support for Serde.") - (license (list license:asl2.0 license:expat)))) + (description "This package provides YAML support for Serde.") + (license (list license:expat license:asl2.0)))) (define-public rust-serial-test-0.5 (package -- cgit v1.2.3 From ac1fc8ce320da86d4b57cd0b8b0b9dc5032c1439 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:18:58 +0100 Subject: gnu: rust-serde-json-1: Update to 1.0.61. * gnu/packages/crates-io.scm (rust-serde-json-1): Update to 1.0.61. [source]: Change origin URI. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 68920f1fd3..4bfcbb084a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31140,15 +31140,14 @@ for the serde framework.") (define-public rust-serde-json-1 (package (name "rust-serde-json") - (version "1.0.60") + (version "1.0.61") (source (origin (method url-fetch) - (uri (crate-uri "serde-json" version)) + (uri (crate-uri "serde_json" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0yapc7xxk8dx12691yj0l13008rgvknmc6krvk8jwj7y4x6yh00m")))) + (base32 "0nijvxvgcncvd1wbn73zx7q14bdxah0gf2789qd8kdjpa1cv5kjg")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 8a83c55b0a8dce1ac5559ef93440cc432211a8c8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:22:06 +0100 Subject: gnu: rust-regex-syntax-0.6: Update to 0.6.22. * gnu/packages/crates-io.scm (rust-regex-syntax-0.6): Update to 0.6.22. --- gnu/packages/crates-io.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4bfcbb084a..0899341475 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27652,21 +27652,20 @@ uses finite automata and guarantees linear time matching on all inputs.") (define-public rust-regex-syntax-0.6 (package (name "rust-regex-syntax") - (version "0.6.21") + (version "0.6.22") (source (origin (method url-fetch) (uri (crate-uri "regex-syntax" version)) - (file-name (string-append name "-" version ".crate")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "12d176jkgw9749g07zjxz0n78nyvb2nqx3j4sp5aqyphvji1n61v")))) + (base32 "10b56ylil35jkb4nwqxm8hbyx3zq7fws0wpydjln165s8xql3sxm")))) (build-system cargo-build-system) (home-page "https://github.com/rust-lang/regex") (synopsis "Regular expression parser") (description "This package provides a regular expression parser.") - (license (list license:asl2.0 - license:expat)))) + (license (list license:expat license:asl2.0)))) (define-public rust-regex-syntax-0.5 (package -- cgit v1.2.3 From 51137c7c19c00d2642267020bdd3d37692499d9b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:31:35 +0100 Subject: gnu: rust-regex-1: Update to 1.4.3. * gnu/packages/crates-io.scm (rust-regex-1): Update to 1.4.3. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0899341475..de50b4c520 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27531,15 +27531,14 @@ functionality.") (define-public rust-regex-1 (package (name "rust-regex") - (version "1.4.2") + (version "1.4.3") (source (origin (method url-fetch) (uri (crate-uri "regex" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "172bw2yryv65whn3n5vkww4kgk0bq08lx0zbln8xwia7xl9jrkrq")))) + (base32 "12llbg82js69mdl50lav4yn1iqlx71ckb18dww467q99w4wi49fr")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 190e9068ec047ba1745d663edb33bb12dc549463 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:32:36 +0100 Subject: gnu: rust-parking-lot-0.11: Update to 0.11.1. * gnu/packages/crates-io.scm (rust-parking-lot-0.11): Update to 0.11.1. --- gnu/packages/crates-io.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index de50b4c520..044f7b2914 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -23047,18 +23047,18 @@ unparking.") (define-public rust-parking-lot-0.11 (package (name "rust-parking-lot") - (version "0.11.0") + (version "0.11.1") (source (origin (method url-fetch) (uri (crate-uri "parking_lot" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0cw73942xhxb7a49mp9gkjnlwc8acr30wpfs8zk758icz92ki2d4")))) + (base32 "1sqmgaia8zfd5fbnqw2w13ijh7crk3lf9vw4cb52vwlx0an48xvd")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:skip-build? #t + #:cargo-inputs (("rust-instant" ,rust-instant-0.1) ("rust-lock-api" ,rust-lock-api-0.4) ("rust-parking-lot-core" ,rust-parking-lot-core-0.8)) -- cgit v1.2.3 From dea2f09d128c8f2b0808caa957b10de9d789875f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:32:49 +0100 Subject: gnu: rust-parking-lot-0.11: Shorten synopsis. * gnu/packages/crates-io.scm (rust-parking-lot-0.11): Shorten synopsis. --- gnu/packages/crates-io.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 044f7b2914..7f873784a6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -23066,9 +23066,11 @@ unparking.") (("rust-bincode" ,rust-bincode-1) ("rust-rand" ,rust-rand-0.7)))) (home-page "https://github.com/Amanieu/parking_lot") - (synopsis "More compact and efficient implementations of the standard synchronization primitives") - (description "This package provides more compact and efficient -implementations of the standard synchronization primitives.") + (synopsis + "Efficient implementations of the standard synchronization primitives") + (description + "This package provides more compact and efficient implementations +of the standard synchronization primitives.") (license (list license:asl2.0 license:expat)))) (define-public rust-parking-lot-0.10 -- cgit v1.2.3 From acd15ff763c10c346530b20fcabf97ccaeed2565 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 01:18:01 +0100 Subject: gnu: rust-which-2: Remove minor version from variable name. * gnu/packages/crates-io.scm (rust-which-2): Remove minor version from name. (rust-bindgen-0.50): (rust-bindgen-0.46): (rust-bindgen-0.49): (rust-docmatic-0.1): (rust-which-1.0): Apply renaming. --- gnu/packages/crates-io.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7f873784a6..258435bfe4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3394,7 +3394,7 @@ bindings to C and C++ libraries.") ("rust-quote" ,rust-quote-0.6) ("rust-regex" ,rust-regex-1) ("rust-shlex" ,rust-shlex-0.1) - ("rust-which" ,rust-which-2.0)) + ("rust-which" ,rust-which-2)) #:cargo-development-inputs (("rust-clap" ,rust-clap-2) ("rust-diff" ,rust-diff-0.1) @@ -3429,7 +3429,7 @@ bindings to C and C++ libraries.") ("rust-proc-macro2" ,rust-proc-macro2-0.4) ("rust-quote" ,rust-quote-0.6) ("rust-regex" ,rust-regex-1) - ("rust-which" ,rust-which-2.0)) + ("rust-which" ,rust-which-2)) #:cargo-development-inputs (("rust-clap" ,rust-clap-2) ("rust-diff" ,rust-diff-0.1) @@ -3498,7 +3498,7 @@ bindings to C and C++ libraries.") ("rust-quote" ,rust-quote-0.6) ("rust-regex" ,rust-regex-1) ("rust-shlex" ,rust-shlex-0.1) - ("rust-which" ,rust-which-2.0)) + ("rust-which" ,rust-which-2)) #:cargo-development-inputs (("rust-clap" ,rust-clap-2) ("rust-diff" ,rust-diff-0.1) @@ -9680,7 +9680,7 @@ from macros.") (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-which" ,rust-which-2.0)))) + (("rust-which" ,rust-which-2)))) (home-page "https://github.com/assert-rs/docmatic") (synopsis "Test Rust examples in your documentation") (description "Test Rust examples in your documentation.") @@ -40928,7 +40928,7 @@ using @code{bindgen}.") installed executable in cross platforms.") (license license:expat))) -(define-public rust-which-2.0 +(define-public rust-which-2 (package (name "rust-which") (version "2.0.1") @@ -40958,7 +40958,7 @@ Locate installed executable in cross platforms.") (define-public rust-which-1.0 (package - (inherit rust-which-2.0) + (inherit rust-which-2) (name "rust-which") (version "1.0.5") (source -- cgit v1.2.3 From f7562611aabe4d6714d8fa40a1328d99a0e24653 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:33:58 +0100 Subject: gnu: Add rust-bindgen-0.47. * gnu/packages/crates-io.scm (rust-bindgen-0.47): 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 258435bfe4..781aea6d4b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3400,6 +3400,37 @@ bindings to C and C++ libraries.") ("rust-diff" ,rust-diff-0.1) ("rust-shlex" ,rust-shlex-0.1)))))) +(define-public rust-bindgen-0.47 + (package + (inherit rust-bindgen-0.50) + (name "rust-bindgen") + (version "0.47.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "bindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0b9fyq3h4lz5xfy6gv5h8v6j3hzyqcarlylvw9zc715pas1pz09a")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cexpr" ,rust-cexpr-0.3) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-clang-sys" ,rust-clang-sys-0.26) + ("rust-clap" ,rust-clap-2) + ("rust-env-logger" ,rust-env-logger-0.6) + ("rust-hashbrown" ,rust-hashbrown-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-peeking-take-while" ,rust-peeking-take-while-0.1) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-0.6) + ("rust-regex" ,rust-regex-1) + ("rust-shlex" ,rust-shlex-0.1) + ("rust-which" ,rust-which-2)))))) + (define-public rust-bindgen-0.46 (package (inherit rust-bindgen-0.50) -- cgit v1.2.3 From d84d42e466fd34aece99c505aefed37247590208 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:36:07 +0100 Subject: gnu: Add rust-num-format-windows-0.3. * gnu/packages/crates-io.scm (rust-num-format-windows-0.3): 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 781aea6d4b..bc676fdf94 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21782,6 +21782,29 @@ primitives and enums easier.") primitives and enums easier.") (license license:bsd-3))) +(define-public rust-num-format-windows-0.3 + (package + (name "rust-num-format-windows") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-format-windows" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1sy5jxrbhv6s28c51ibzi34s8qcjm8b21nf7biray7v1qi89h5sf")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bindgen" ,rust-bindgen-0.47)))) + (home-page "https://github.com/bcmyers/num-format/num-format-windows") + (synopsis "Helper crate for @code{num-format}") + (description + "This package provides a helper crate for num-format. Do not use it +directly.") + (license (list license:expat license:asl2.0)))) + (define-public rust-num-integer-0.1 (package (name "rust-num-integer") -- cgit v1.2.3 From d3c5d46edeaf0f17aa9b55f19722f8aa9b16cea6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:36:36 +0100 Subject: gnu: Add rust-num-format-0.4. * gnu/packages/crates-io.scm (rust-num-format-0.4): 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 bc676fdf94..db3695ba24 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21782,6 +21782,39 @@ primitives and enums easier.") primitives and enums easier.") (license license:bsd-3))) +(define-public rust-num-format-0.4 + (package + (name "rust-num-format") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-format" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0r94i9lhr15hk32494v9my31r0829w29yyp7iql98a1cf9wl3zms")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-arrayvec" ,rust-arrayvec-0.4) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-itoa" ,rust-itoa-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-num-bigint" ,rust-num-bigint-0.2) + ("rust-num-format-windows" ,rust-num-format-windows-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-widestring" ,rust-widestring-0.4) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/bcmyers/num-format") + (synopsis "Produce string-representations of numbers") + (description + "This package provides a Rust crate for producing string-representations +of numbers, formatted according to international standards.") + (license (list license:expat license:asl2.0)))) + (define-public rust-num-format-windows-0.3 (package (name "rust-num-format-windows") -- cgit v1.2.3 From 6863acc56885d0d06022bf069d0758e38f315625 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:41:04 +0100 Subject: gnu: rust-same-file-1: Drop minor version from variable name. * gnu/packages/crates-io.scm (rust-same-file-1): Drop minor version from name. (rust-grep-cli-0.1): (rust-ignore-0.4): (rust-same-file-0.1): (rust-walkdir-2): Apply renaming. --- gnu/packages/crates-io.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index db3695ba24..85de62f879 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14102,7 +14102,7 @@ loading crate.") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-regex" ,rust-regex-1) - ("rust-same-file" ,rust-same-file-1.0) + ("rust-same-file" ,rust-same-file-1) ("rust-termcolor" ,rust-termcolor-1) ("rust-winapi-util" ,rust-winapi-util-0.1)))) (home-page @@ -15750,7 +15750,7 @@ let} expressions.") ("rust-log" ,rust-log-0.4) ("rust-memchr" ,rust-memchr-2) ("rust-regex" ,rust-regex-1) - ("rust-same-file" ,rust-same-file-1.0) + ("rust-same-file" ,rust-same-file-1) ("rust-thread-local" ,rust-thread-local-1) ("rust-walkdir" ,rust-walkdir-2) ("rust-winapi-util" ,rust-winapi-util-0.1)) @@ -29822,7 +29822,7 @@ quickly convert floating point numbers to decimal strings.") (license (list license:asl2.0 license:expat)))) -(define-public rust-same-file-1.0 +(define-public rust-same-file-1 (package (name "rust-same-file") (version "1.0.6") @@ -29850,7 +29850,7 @@ paths point to the same file.") (define-public rust-same-file-0.1 (package - (inherit rust-same-file-1.0) + (inherit rust-same-file-1) (name "rust-same-file") (version "0.1.3") (source @@ -40204,7 +40204,7 @@ specified across Unix and Windows platforms.") #:cargo-inputs (("rust-winapi-util" ,rust-winapi-util-0.1) ("rust-winapi" ,rust-winapi-0.3) - ("rust-same-file" ,rust-same-file-1.0)))) + ("rust-same-file" ,rust-same-file-1)))) (home-page "https://github.com/BurntSushi/walkdir") (synopsis "Recursively walk a directory") (description "Recursively walk a directory.") -- cgit v1.2.3 From ea09d5c69b73dc38d8d81ae953fb3500dc5b5fe1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:52:41 +0100 Subject: gnu: Add rust-crossbeam-channel-0.5. * gnu/packages/crates-io.scm (rust-crossbeam-channel-0.5): New variable. (rust-crossbeam-channel-0.4): Inherit from above. --- gnu/packages/crates-io.scm | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 85de62f879..259ed3533c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7375,8 +7375,34 @@ criterion.") (description "Tools for concurrent programming.") (license (list license:expat license:asl2.0)))) +(define-public rust-crossbeam-channel-0.5 + (package + (name "rust-crossbeam-channel") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "crossbeam-channel" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xfplw54pskl3kyf2q6kw8y2phnq6wn8pqxx003n8qfkz3hnx8nw")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)))) + (home-page + "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-channel") + (synopsis "Multi-producer multi-consumer channels for message passing") + (description + "This package provides multi-producer multi-consumer channels for +message passing.") + (license (list license:expat license:asl2.0)))) + (define-public rust-crossbeam-channel-0.4 (package + (inherit rust-crossbeam-channel-0.5) (name "rust-crossbeam-channel") (version "0.4.2") (source @@ -7388,7 +7414,6 @@ criterion.") (sha256 (base32 "0qd05n5bcwafkmbzq1lspwrfi29xnzlw46qarg1sl0lwj68qdvfc")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) @@ -7396,16 +7421,7 @@ criterion.") #:cargo-development-inputs (("rust-num-cpus" ,rust-num-cpus-1) ("rust-rand" ,rust-rand-0.6) - ("rust-signal-hook" ,rust-signal-hook-0.1)))) - (home-page - "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-channel") - (synopsis - "Multi-producer multi-consumer channels for message passing") - (description - "Multi-producer multi-consumer channels for message passing.") - (license (list license:expat - license:asl2.0 - license:bsd-2)))) + ("rust-signal-hook" ,rust-signal-hook-0.1)))))) (define-public rust-crossbeam-channel-0.3 (package -- cgit v1.2.3 From ddd392974af4324b8b901a9ff5d2c56db9f01980 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:38:28 +0100 Subject: gnu: rust-ignore-0.4: Update to 0.4.17. * gnu/packages/crates-io.scm (rust-ignore-0.4): Update to 0.4.17. [arguments]: Upgrade rust-crossbeam-utils version requirement in Cargo inputs, and rust-crossbeam-channel in Cargo development inputs. [home-page]: Update URL. [synopsis, description]: Use Texinfo syntax. --- gnu/packages/crates-io.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 259ed3533c..752e2a108a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15747,20 +15747,18 @@ let} expressions.") (define-public rust-ignore-0.4 (package (name "rust-ignore") - (version "0.4.16") + (version "0.4.17") (source (origin (method url-fetch) (uri (crate-uri "ignore" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0wpcv4qgfzcyzydhlqa2qr56j72fj1a66s11xzdji59898mbzp12")))) + (base32 "1347mxd0cwiidcl0qvixl7za524x5ds0izv8vjh2df0bqr2zp1xj")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) + (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) ("rust-globset" ,rust-globset-0.4) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) @@ -15771,12 +15769,12 @@ let} expressions.") ("rust-walkdir" ,rust-walkdir-2) ("rust-winapi-util" ,rust-winapi-util-0.1)) #:cargo-development-inputs - (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.4)))) - (home-page "https://github.com/BurntSushi/ripgrep/tree/master/ignore") - (synopsis "Efficiently match ignore files such as .gitignore") + (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)))) + (home-page "https://github.com/BurntSushi/ripgrep/tree/master/crates/ignore") + (synopsis "Efficiently match ignore files such as @file{.gitignore}") (description "This package provides a fast library for efficiently matching -ignore files such as .gitignore against file paths.") +ignore files such as @file{.gitignore} against file paths.") (license (list license:unlicense license:expat)))) (define-public rust-indexmap-1 -- cgit v1.2.3 From 96d1dfd436f518a4aac4733761c1f40deb2a9c6f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:56:30 +0100 Subject: gnu: Add rust-crossbeam-epoch-0.9. * gnu/packages/crates-io.scm (rust-crossbeam-epoch-0.9): New variable. (rust-crossbeam-epoch-0.8): Inherit from above. --- gnu/packages/crates-io.scm | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 752e2a108a..acee30c2dd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7493,8 +7493,36 @@ message passing.") #:cargo-development-inputs (("rust-rand" ,rust-rand-0.6)))))) +(define-public rust-crossbeam-epoch-0.9 + (package + (name "rust-crossbeam-epoch") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "crossbeam-epoch" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17anyfg5azjpmcfidq6wn4phj9h0a0zqcxksi33w44akz4wsgam1")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-const-fn" ,rust-const-fn-0.4) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-memoffset" ,rust-memoffset-0.6) + ("rust-scopeguard" ,rust-scopeguard-1)))) + (home-page + "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-epoch") + (synopsis "Epoch-based garbage collection") + (description "This package provides an Epoch-based garbage collection.") + (license (list license:expat license:asl2.0)))) + (define-public rust-crossbeam-epoch-0.8 (package + (inherit rust-crossbeam-epoch-0.9) (name "rust-crossbeam-epoch") (version "0.8.2") (source @@ -7506,7 +7534,6 @@ message passing.") (sha256 (base32 "1knsf0zz7rgzxn0nwz5gajjcrivxpw3zrdcp946gdhdgr9sd53h5")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-autocfg" ,rust-autocfg-1) @@ -7517,12 +7544,7 @@ message passing.") ("rust-memoffset" ,rust-memoffset-0.5) ("rust-scopeguard" ,rust-scopeguard-1)) #:cargo-development-inputs - (("rust-rand" ,rust-rand-0.6)))) - (home-page - "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-epoch") - (synopsis "Epoch-based garbage collection") - (description "Epoch-based garbage collection.") - (license (list license:expat license:asl2.0)))) + (("rust-rand" ,rust-rand-0.6)))))) (define-public rust-crossbeam-epoch-0.7 (package -- cgit v1.2.3 From 94c301e28066174756b88e77dcc35bce8b56e899 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:57:29 +0100 Subject: gnu: Add rust-crossbeam-deque-0.8. * gnu/packages/crates-io.scm (rust-crossbeam-deque-0.8): New variable. (rust-crossbeam-deque-0.7): Inherit from above. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index acee30c2dd..465431a1b0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7445,8 +7445,33 @@ message passing.") ("rust-rand" ,rust-rand-0.6) ("rust-signal-hook" ,rust-signal-hook-0.1)))))) +(define-public rust-crossbeam-deque-0.8 + (package + (name "rust-crossbeam-deque") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "crossbeam-deque" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ad995vzq74k7jd1pgn9zxbacyzj9ii6l0svhlb2dxzy8vxnxbwl")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.9) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)))) + (home-page + "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-deque") + (synopsis "Concurrent work-stealing deque") + (description "This package provides a concurrent work-stealing deque.") + (license (list license:expat license:asl2.0)))) + (define-public rust-crossbeam-deque-0.7 (package + (inherit rust-crossbeam-deque-0.8) (name "rust-crossbeam-deque") (version "0.7.3") (source @@ -7458,19 +7483,13 @@ message passing.") (sha256 (base32 "11c2c0x5grdba3ah3g94yn6b8s47xi8qwm85h8hq5vmf9nbsy0lz")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.8) ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) ("rust-maybe-uninit" ,rust-maybe-uninit-2.0)) #:cargo-development-inputs - (("rust-rand" ,rust-rand-0.6)))) - (home-page - "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-deque") - (synopsis "Concurrent work-stealing deque") - (description "Concurrent work-stealing deque.") - (license (list license:expat license:asl2.0)))) + (("rust-rand" ,rust-rand-0.6)))))) (define-public rust-crossbeam-deque-0.6 (package -- cgit v1.2.3 From 486ce89d90aa2e6d7c21978705cbbb071069c885 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 00:58:37 +0100 Subject: gnu: Add rust-memoffset-0.6. * gnu/packages/crates-io.scm (rust-memoffset-0.6): New variable. (rust-memoffset-0.5): Inherit from above. --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 465431a1b0..3929b4b12f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19455,8 +19455,32 @@ file IO.") #:cargo-development-inputs (("rust-tempdir" ,rust-tempdir-0.3)))))) +(define-public rust-memoffset-0.6 + (package + (name "rust-memoffset") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "memoffset" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "11yxgw330cf8g4wy0fnb20ag8gg1b33fsnfmg2g8z6h5wc444yqm")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-autocfg" ,rust-autocfg-1)))) + (home-page "https://github.com/Gilnaa/memoffset") + (synopsis "C-like offset_of functionality for Rust structs") + (description + "This package provides C-like @code{offset_of} functionality +for Rust structs.") + (license license:expat))) + (define-public rust-memoffset-0.5 (package + (inherit rust-memoffset-0.6) (name "rust-memoffset") (version "0.5.3") (source @@ -19468,19 +19492,12 @@ file IO.") (sha256 (base32 "1fblqzc25hfaym8m0pj112s66pqq87avvaqm5hp5rskib2w9w63m")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-rustc-version" ,rust-rustc-version-0.2)) #:cargo-development-inputs - (("rust-doc-comment" ,rust-doc-comment-0.3)))) - (home-page "https://github.com/Gilnaa/memoffset") - (synopsis - "C-like offset_of functionality for Rust structs") - (description "This package provides C-like @code{offset_of} functionality -for Rust structs.") - (license license:expat))) + (("rust-doc-comment" ,rust-doc-comment-0.3)))))) (define-public rust-memoffset-0.2 (package -- cgit v1.2.3 From 7a27d5b85bf2009e0d2b175843f350a3d806ac44 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 01:02:50 +0100 Subject: gnu: rust-rayon-core-1: Update to 1.9.0. * gnu/packages/crates-io.scm (rust-rayon-core-1): Update to 1.9.0. [arguments]: Update Cargo inputs version requirements for rust-crossbeam-channel, rust-crossbeam-deque, rust-crossbeam-utils. --- gnu/packages/crates-io.scm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3929b4b12f..69bb90bb4c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27406,25 +27406,23 @@ accessors.") (define-public rust-rayon-core-1 (package (name "rust-rayon-core") - (version "1.7.1") + (version "1.9.0") (source (origin (method url-fetch) (uri (crate-uri "rayon-core" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "101jjwkcfw5jk31695gbdm163iicc2pz349q6l8lwj43j3c1abp9")))) + (base32 "0jpsi8zf66xyx4m5f329lpgiql8775vpm6zqm7zn5p11b6n4dcws")))) (build-system cargo-build-system) (arguments - `(;; One of the tests attempts to overflow the stack, but the compiler - ;; has since gotten smarter and the test became defective. - #:tests? #f + ;; One of the tests attempts to overflow the stack, but the compiler has + ;; since gotten smarter and the test became defective. + `(#:tests? #f #:cargo-inputs - (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7) - ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.2) - ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) + (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-num-cpus" ,rust-num-cpus-1)) #:cargo-development-inputs @@ -27434,8 +27432,8 @@ accessors.") ("rust-scoped-tls" ,rust-scoped-tls-1)))) (home-page "https://github.com/rayon-rs/rayon") (synopsis "Core APIs for Rayon") - (description "Core APIs for Rayon.") - (license (list license:expat license:asl2.0)))) + (description "This package provides core APIs for Rayon.") + (license (list license:asl2.0 license:expat)))) (define-public rust-rctree-0.3 (package -- cgit v1.2.3 From 76d874e3369621438f5a10d1f2349f05c49876d5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 01:08:50 +0100 Subject: gnu: rust-rayon-1: Update to 1.5.0. * gnu/packages/crates-io.scm (rust-rayon-1): Update to 1.5.0. [arguments]: Update version requirement for Cargo input rust-crossbeam-deque. --- gnu/packages/crates-io.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 69bb90bb4c..c4f20dc2b1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27351,21 +27351,19 @@ accessors.") (define-public rust-rayon-1 (package (name "rust-rayon") - (version "1.3.1") + (version "1.5.0") (source (origin (method url-fetch) (uri (crate-uri "rayon" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "104h6i5lcp9kx8g80jgqf6z7wcqa186q57wj4qzf011xfmb2iw32")))) + (base32 "0x2n4zkrm6z3avdfh7zgcwx0wq6hx8332dx89v3j1p7s3448w3cb")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-autocfg" ,rust-autocfg-1) - ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7) + ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8) ("rust-either" ,rust-either-1) ("rust-rayon-core" ,rust-rayon-core-1)) #:cargo-development-inputs @@ -27377,7 +27375,8 @@ accessors.") (home-page "https://github.com/rayon-rs/rayon") (synopsis "Simple work-stealing parallelism for Rust") (description - "Simple work-stealing parallelism for Rust.") + "This package provides a simple work-stealing parallelism for +Rust.") (license (list license:asl2.0 license:expat)))) (define-public rust-rayon-0.8 -- cgit v1.2.3 From f0b99174168a25cecbce6546dada572f2a24d65d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 01:10:40 +0100 Subject: gnu: Add rust-dashmap-4. * gnu/packages/crates-io.scm (rust-dashmap-4): New variable. (rust-dashmap-3): Inherit from above. --- gnu/packages/crates-io.scm | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c4f20dc2b1..37d2b50ee2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8620,8 +8620,35 @@ reading attributes into structs when implementing custom derives.") reading attributes into structs when implementing custom derives.") (license license:expat))) +(define-public rust-dashmap-4 + (package + (name "rust-dashmap") + (version "4.0.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "dashmap" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1773x18k5m2zw1iyibs8l3wl1p1aijdbrc0w844xys06inr46yp7")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-rayon" ,rust-rayon-1) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/xacrimon/dashmap") + (synopsis "Blazing fast concurrent HashMap for Rust.") + (description "This package implements a blazing fast concurrent HashMap +for Rust.") + (license license:expat))) + (define-public rust-dashmap-3 (package + (inherit rust-dashmap-4) (name "rust-dashmap") (version "3.11.10") (source @@ -8642,7 +8669,6 @@ reading attributes into structs when implementing custom derives.") "#![feature(inner_deref)]" "\n" all))) #t)))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-ahash" ,rust-ahash-0.3) @@ -8653,12 +8679,7 @@ reading attributes into structs when implementing custom derives.") (add-after 'unpack 'enable-unstable-features (lambda _ (setenv "RUSTC_BOOTSTRAP" "1") - #t))))) - (home-page "https://github.com/xacrimon/dashmap") - (synopsis "Blazing fast concurrent HashMap for Rust") - (description "This package implements a blazing fast concurrent HashMap -for Rust.") - (license license:expat))) + #t))))))) (define-public rust-data-encoding-2 (package -- cgit v1.2.3 From c396ebc7aae3b8c59d7ceda1d19bb080cce6b732 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 01:12:41 +0100 Subject: gnu: rust-aho-corasick-0.7: Update to 0.7.15. * gnu/packages/crates-io.scm (rust-aho-corasick-0.7): Update to 0.7.15. --- gnu/packages/crates-io.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 37d2b50ee2..36f0b98112 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1103,25 +1103,23 @@ using AES-NI for high performance.") (define-public rust-aho-corasick-0.7 (package (name "rust-aho-corasick") - (version "0.7.13") + (version "0.7.15") (source (origin (method url-fetch) (uri (crate-uri "aho-corasick" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "11hfmqf90rdvjdpk0x1lixw1s9n08y3fxfy9zqsk0k2wpbc68c84")))) + (base32 "1rb8gzhljl8r87dpf2n5pnqnkl694casgns4ma0sqzd4zazzw13l")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2)) + `(#:cargo-inputs + (("rust-memchr" ,rust-memchr-2)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)))) (home-page "https://github.com/BurntSushi/aho-corasick") (synopsis "Fast multiple substring searching") - (description - "Fast multiple substring searching.") + (description "This package provides a fast multiple substring searching.") (license (list license:unlicense license:expat)))) (define-public rust-aho-corasick-0.6 -- cgit v1.2.3 From d94f7530434fe3efd61b7d3301eff7501ae044f6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 01:16:25 +0100 Subject: gnu: tokei: Update to 12.1.2. * gnu/packages/rust-apps.scm (tokei): Update to 12.1.2. --- gnu/packages/rust-apps.scm | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 2a16eebcfd..eac55ae3e0 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -576,43 +576,45 @@ of support files.") (define-public tokei (package (name "tokei") - (version "10.1.1") + (version "12.1.2") (source - (origin - (method url-fetch) - (uri (crate-uri "tokei" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "07f5laqw2k9l3k8wrg9h8p2m5d9hkfxngyacwrn3vs7mlnw8l81m")))) + (origin + (method url-fetch) + (uri (crate-uri "tokei" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "000w549v1bpw7r57xw656p40ywf1gimvxxx5cjnri2js0xg927x4")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-clap" ,rust-clap-2) - ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.4) - ("rust-dirs" ,rust-dirs-2.0) + (("rust-aho-corasick" ,rust-aho-corasick-0.7) + ("rust-clap" ,rust-clap-2) + ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-dashmap" ,rust-dashmap-4) + ("rust-dirs" ,rust-dirs-3) ("rust-encoding-rs-io" ,rust-encoding-rs-io-0.1) - ("rust-env-logger" ,rust-env-logger-0.7) + ("rust-env-logger" ,rust-env-logger-0.8) ("rust-grep-searcher" ,rust-grep-searcher-0.1) ("rust-hex" ,rust-hex-0.4) ("rust-ignore" ,rust-ignore-0.4) + ("rust-ignore" ,rust-ignore-0.4) ("rust-log" ,rust-log-0.4) + ("rust-num-format" ,rust-num-format-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot" ,rust-parking-lot-0.11) ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1) ("rust-serde" ,rust-serde-1) - ("rust-serde-cbor" ,rust-serde-cbor-0.10) - ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-cbor" ,rust-serde-cbor-0.11) + ("rust-serde-json" ,rust-serde-json-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-serde-yaml" ,rust-serde-yaml-0.8) + ("rust-tera" ,rust-tera-1) ("rust-term-size" ,rust-term-size-0.3) ("rust-toml" ,rust-toml-0.5)) #:cargo-development-inputs - (("rust-git2" ,rust-git2-0.11) - ("rust-handlebars" ,rust-handlebars-2.0) - ("rust-ignore" ,rust-ignore-0.4) - ("rust-lazy-static" ,rust-lazy-static-1) + (("rust-git2" ,rust-git2-0.13) ("rust-regex" ,rust-regex-1) - ("rust-serde-json" ,rust-serde-json-1) ("rust-tempfile" ,rust-tempfile-3)))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 99e6365c223c73ebe4afaa1c1bca94f8edcd6f0c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 23 Jan 2021 15:53:25 +0100 Subject: gnu: Add trivial-escapes. * gnu/packages/lisp-xyz.scm (cl-trivial-escapes, ecl-trivial-escapes, sbcl-trivial-escapes): New variables. --- gnu/packages/lisp-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 88e946efae..6939f7483d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13285,3 +13285,37 @@ corresponding OS system functions are called.") (define-public cl-ppath (sbcl-package->cl-source-package sbcl-ppath)) + +(define-public sbcl-trivial-escapes + (let ((commit "1eca78da2078495d09893be58c28b3aa7b8cc4d1")) + (package + (name "sbcl-trivial-escapes") + (version (git-version "1.2.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/williamyaoh/trivial-escapes") + (commit commit))) + (file-name (git-file-name name commit)) + (sha256 + (base32 "0v6h8lk17iqv1qkxgqjyzn8gi6v0hvq2vmfbb01md3zjvjqxn6lr")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("named-readtables" ,sbcl-named-readtables))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (home-page "https://github.com/williamyaoh/trivial-escapes") + (synopsis "C-style escape directives for Common Lisp") + (description + "This Common Lisp library interprets escape characters the same way that +most other programming language do. +It provides four readtables. The default one lets you write strings like this: +@code{#\"This string has\na newline in it!\"}.") + (license license:public-domain)))) + +(define-public ecl-trivial-escapes + (sbcl-package->ecl-package sbcl-trivial-escapes)) + +(define-public cl-trivial-escapes + (sbcl-package->cl-source-package sbcl-trivial-escapes)) -- cgit v1.2.3 From 13e18b32699daa4079b9edf16fd63961330e275b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 23 Jan 2021 15:55:22 +0100 Subject: gnu: Add cl-indentify. * gnu/packages/lisp-xyz.scm (cl-indentify, ecl-cl-indentify, sbcl-cl-indentify): New variables. --- gnu/packages/lisp-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6939f7483d..ab1f191221 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13319,3 +13319,38 @@ It provides four readtables. The default one lets you write strings like this: (define-public cl-trivial-escapes (sbcl-package->cl-source-package sbcl-trivial-escapes)) + +(define-public sbcl-cl-indentify + (let ((commit "eb770f434defa4cd41d84bca822428dfd0dbac53")) + (package + (name "sbcl-cl-indentify") + (version (git-version "0.1" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yitzchak/cl-indentify") + (commit commit))) + (file-name (git-file-name name commit)) + (sha256 + (base32 "0ha36bhg474vr76vfhr13szc8cfdj1ickg92k1icz791bqaqg67p")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("command-line-arguments" ,sbcl-command-line-arguments) + ("trivial-gray-streams" ,sbcl-trivial-gray-streams))) + (native-inputs + `(("trivial-escapes" ,sbcl-trivial-escapes) + ("rove" ,sbcl-rove))) + (home-page "https://github.com/yitzchak/cl-indentify") + (synopsis "Code beautifier for Common Lisp") + (description + "A library and command line utility to automatically indent Common Lisp +source files.") + (license license:expat)))) + +(define-public ecl-cl-indentify + (sbcl-package->ecl-package sbcl-cl-indentify)) + +(define-public cl-indentify + (sbcl-package->cl-source-package sbcl-cl-indentify)) -- cgit v1.2.3 From bc14c6a400ce83eb0319ca989f7387a596fa40bd Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 23 Jan 2021 16:16:18 +0100 Subject: gnu: Add concrete-syntax-tree. * gnu/packages/lisp-xyz.scm (cl-concrete-syntax-tree, ecl-concrete-syntax-tree, sbcl-concrete-syntax-tree): New variables. --- gnu/packages/lisp-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ab1f191221..3acc1acb7b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13354,3 +13354,44 @@ source files.") (define-public cl-indentify (sbcl-package->cl-source-package sbcl-cl-indentify)) + +(define-public sbcl-concrete-syntax-tree + (let ((commit "abd242a59dadc5452aa9dbc1d313c83ec2c11f46")) + (package + (name "sbcl-concrete-syntax-tree") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/s-expressionists/Concrete-Syntax-Tree") + (commit commit))) + (file-name (git-file-name name commit)) + (sha256 + (base32 "1lyrglc3h1if44gxd9cwv90wa90nrdjvb7fry39b1xn8ywdfa7di")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("acclimation" ,sbcl-acclimation))) + (home-page "https://github.com/s-expressionists/Concrete-Syntax-Tree") + (synopsis "Parse Common Lisp code into a concrete syntax tree") + (description + "This library is intended to solve the problem of source tracking for +Common Lisp code. + +By \"source tracking\", it is meant that code elements that have a known +origin in the form of a position in a file or in an editor buffer are +associated with some kind of information about this origin. + +Since the exact nature of such origin information depends on the Common Lisp +implementation and the purpose of wanting to track that origin, the library +does not impose a particular structure of this information. Instead, it +provides utilities for manipulating source code in the form of what is called +concrete syntax trees (CSTs for short) that preserve this information about +the origin.") + (license license:bsd-2)))) + +(define-public ecl-concrete-syntax-tree + (sbcl-package->ecl-package sbcl-concrete-syntax-tree)) + +(define-public cl-concrete-syntax-tree + (sbcl-package->cl-source-package sbcl-concrete-syntax-tree)) -- cgit v1.2.3 From cdd1023d1fa61e924ef8c920f59080a6775e4f00 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 23 Jan 2021 16:19:52 +0100 Subject: gnu: Add eclector. * gnu/packages/lisp-xyz.scm (cl-eclector, ecl-eclector, sbcl-eclector): New variables. --- gnu/packages/lisp-xyz.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3acc1acb7b..7491802ed3 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13395,3 +13395,47 @@ the origin.") (define-public cl-concrete-syntax-tree (sbcl-package->cl-source-package sbcl-concrete-syntax-tree)) + +(define-public sbcl-eclector + (package + (name "sbcl-eclector") + (version "0.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/s-expressionists/Eclector") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bwkla0jdp5bg0q1zca5wg22b0nbdmglgax345nrhsf8bdrh47wm")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("acclimation" ,sbcl-acclimation) + ("alexandria" ,sbcl-alexandria) + ("closer-mop" ,sbcl-closer-mop) + ("concrete-syntax-tree" ,sbcl-concrete-syntax-tree))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (arguments + '(#:asd-systems '("eclector" + "eclector-concrete-syntax-tree"))) + (home-page "https://s-expressionists.github.io/Eclector/") + (synopsis "Highly customizable, portable Common Lisp reader") + (description + "Eclector is a portable Common Lisp reader that is highly customizable, +can recover from errors and can return concrete syntax trees. + +In contrast to many other reader implementations, eclector can recover from +most errors in the input supplied to it and continue reading. This capability +is realized as a restart. + +It can also produce instances of the concrete syntax tree classes provided by +the concrete syntax tree library.") + (license license:bsd-2))) + +(define-public ecl-eclector + (sbcl-package->ecl-package sbcl-eclector)) + +(define-public cl-eclector + (sbcl-package->cl-source-package sbcl-eclector)) -- cgit v1.2.3 From 4e0b0bf2f2e6076aa52447b303ac9033cec69f5f Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 23 Jan 2021 16:29:20 +0100 Subject: gnu: Add jsown. * gnu/packages/lisp-xyz.scm (cl-jsown, ecl-jsown, sbcl-jsown): New variables. --- gnu/packages/lisp-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7491802ed3..10add7271c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13439,3 +13439,39 @@ the concrete syntax tree library.") (define-public cl-eclector (sbcl-package->cl-source-package sbcl-eclector)) + +(define-public sbcl-jsown + (let ((commit "744c4407bef58dfa876d9da0b5c0205d869e7977")) + (package + (name "sbcl-jsown") + (version (git-version "1.0.1" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/madnificent/jsown") + (commit commit))) + (file-name (git-file-name name commit)) + (sha256 + (base32 "0gadvmf1d9bq35s61z76psrsnzwwk12svi66jigf491hv48wigw7")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/madnificent/jsown") + (synopsis "Fast JSON reader / writer library for Common Lisp") + (description + "@code{jsown} is a high performance Common Lisp JSON parser. Its aim +is to allow for the fast parsing of JSON objects in Common Lisp. Recently, +functions and macros have been added to ease the burden of writing and editing +@code{jsown} objects. + +@code{jsown} allows you to parse JSON objects quickly to a modifiable Lisp +list and write them back. If you only need partial retrieval of objects, +@code{jsown} allows you to select the keys which you would like to see parsed. +@code{jsown} also has a JSON writer and some helper methods to alter the JSON +objects themselves.") + (license license:expat)))) + +(define-public ecl-jsown + (sbcl-package->ecl-package sbcl-jsown)) + +(define-public cl-jsown + (sbcl-package->cl-source-package sbcl-jsown)) -- cgit v1.2.3 From abf21b14814d555d3ffb6b8d6230295bf97c6642 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 23 Jan 2021 16:37:07 +0100 Subject: gnu: Add system-locale. * gnu/packages/lisp-xyz.scm (cl-system-locale, ecl-system-locale, sbcl-system-locale): New variables. --- gnu/packages/lisp-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 10add7271c..a95a7d7b2d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13475,3 +13475,34 @@ objects themselves.") (define-public cl-jsown (sbcl-package->cl-source-package sbcl-jsown)) + +(define-public sbcl-system-locale + (let ((commit "4b334bc2fa45651bcaa28ae7d9331095d6bf0a17")) + (package + (name "sbcl-system-locale") + (version (git-version "1.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/system-locale/") + (commit commit))) + (file-name (git-file-name name commit)) + (sha256 + (base32 "00p5c053kmgq4ks6l9mxsqz6g3bjcybvkvj0bh3r90qgpkaawm1p")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("documentation-utils" ,sbcl-documentation-utils))) + (home-page "https://shinmera.github.io/system-locale/") + (synopsis "Get the system's locale and language settings in Common Lisp") + (description + "This library retrieves locale information configured on the +system. This is helpful if you want to write applications and libraries that +display messages in the user's native language.") + (license license:zlib)))) + +(define-public ecl-system-locale + (sbcl-package->ecl-package sbcl-system-locale)) + +(define-public cl-system-locale + (sbcl-package->cl-source-package sbcl-system-locale)) -- cgit v1.2.3 From 4c51850784da1d5cf14b4261352f99a0a2a8c9eb Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 23 Jan 2021 16:41:24 +0100 Subject: gnu: Add language-codes. * gnu/packages/lisp-xyz.scm (cl-language-codes, ecl-language-codes, sbcl-language-codes): New variables. --- gnu/packages/lisp-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a95a7d7b2d..06dde224fb 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13506,3 +13506,33 @@ display messages in the user's native language.") (define-public cl-system-locale (sbcl-package->cl-source-package sbcl-system-locale)) + +(define-public sbcl-language-codes + (let ((commit "e7aa0e37cb97a3d37d6bc7316b479d01bff8f42e")) + (package + (name "sbcl-language-codes") + (version (git-version "1.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/language-codes") + (commit commit))) + (file-name (git-file-name name commit)) + (sha256 + (base32 "0py176ibmsc01n5r0q1bs1ykqf5jwdbh8kx0j1a814l9y51241v0")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("documentation-utils" ,sbcl-documentation-utils))) + (home-page "https://shinmera.github.io/language-codes/") + (synopsis "Map ISO language codes to language names in Common Lisp") + (description + "This is a small library providing the ISO-639 language code to +language name mapping.") + (license license:zlib)))) + +(define-public ecl-language-codes + (sbcl-package->ecl-package sbcl-language-codes)) + +(define-public cl-language-codes + (sbcl-package->cl-source-package sbcl-language-codes)) -- cgit v1.2.3 From 773ffd1f1e2ba0aa9b17ccb0947ab0f15cabae37 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 23 Jan 2021 16:43:02 +0100 Subject: gnu: Add multilang-documentation. * gnu/packages/lisp-xyz.scm (cl-multilang-documentation, ecl-multilang-documentation, sbcl-multilang-documentation): New variables. --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 06dde224fb..225edf697b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13536,3 +13536,36 @@ language name mapping.") (define-public cl-language-codes (sbcl-package->cl-source-package sbcl-language-codes)) + +(define-public sbcl-multilang-documentation + (let ((commit "59e798a07e949e8957a20927f52aca425d84e4a0")) + (package + (name "sbcl-multilang-documentation") + (version (git-version "1.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/multilang-documentation") + (commit commit))) + (file-name (git-file-name name commit)) + (sha256 + (base32 "13y5jskx8n2b7kimpfarr8v777w3b7zj5swg1b99nj3hk0843ixw")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("documentation-utils" ,sbcl-documentation-utils) + ("language-codes" ,sbcl-language-codes) + ("system-locale" ,sbcl-system-locale))) + (home-page "https://shinmera.github.io/multilang-documentation/") + (synopsis "Add multiple languages support to Common Lisp documentation") + (description + "This library provides a drop-in replacement function for +cl:documentation that supports multiple docstrings per-language, allowing you +to write documentation that can be internationalised.") + (license license:zlib)))) + +(define-public ecl-multilang-documentation + (sbcl-package->ecl-package sbcl-multilang-documentation)) + +(define-public cl-multilang-documentation + (sbcl-package->cl-source-package sbcl-multilang-documentation)) -- cgit v1.2.3 From c2fe94abbb962577a4450176804d3f23c669a224 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 23 Jan 2021 16:47:08 +0100 Subject: gnu: Add trivial-do. * gnu/packages/lisp-xyz.scm (cl-trivial-do, ecl-trivial-do, sbcl-trivial-do): New variables. --- gnu/packages/lisp-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 225edf697b..0137bf3603 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13569,3 +13569,32 @@ to write documentation that can be internationalised.") (define-public cl-multilang-documentation (sbcl-package->cl-source-package sbcl-multilang-documentation)) + +(define-public sbcl-trivial-do + (let ((commit "03a1729f1e71bad3ebcf6cf098a0cce52dfa1163")) + (package + (name "sbcl-trivial-do") + (version (git-version "0.1" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yitzchak/trivial-do") + (commit commit))) + (file-name (git-file-name name commit)) + (sha256 + (base32 "1ffva79nkicc7wc8c2ic5nayis3b2rk5sxzj74yjkymkjgbpcrgd")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/yitzchak/trivial-do") + (synopsis "Additional dolist style macros for Common Lisp") + (description + "Additional dolist style macros for Common Lisp, such as +@code{doalist}, @code{dohash}, @code{dolist*}, @code{doplist}, @code{doseq} +and @code{doseq*}.") + (license license:zlib)))) + +(define-public ecl-trivial-do + (sbcl-package->ecl-package sbcl-trivial-do)) + +(define-public cl-trivial-do + (sbcl-package->cl-source-package sbcl-trivial-do)) -- cgit v1.2.3 From cc1c91c1a99b8ccfd4a494eea7003d8604f1f48a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 23 Jan 2021 18:05:06 +0100 Subject: gnu: Add common-lisp-jupyter. * gnu/packages/lisp-xyz.scm (cl-common-lisp-jupyter, ecl-common-lisp-jupyter, sbcl-common-lisp-jupyter): New variables. --- gnu/packages/lisp-xyz.scm | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0137bf3603..6006e199c1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13598,3 +13598,51 @@ and @code{doseq*}.") (define-public cl-trivial-do (sbcl-package->cl-source-package sbcl-trivial-do)) + +(define-public sbcl-common-lisp-jupyter + (let ((commit "61a9a8e7a18e2abd7af7c697ba5146fd19bd9d62")) + (package + (name "sbcl-common-lisp-jupyter") + (version (git-version "0.1" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yitzchak/common-lisp-jupyter") + (commit commit))) + (file-name (git-file-name name commit)) + (sha256 + (base32 "0zyzl55l45w9z65ygi5pcwda5w5p1j1bb0p2zg2n5cpv8344dkh2")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("babel" ,sbcl-babel) + ("bordeaux-threads" ,sbcl-bordeaux-threads) + ("cl-base64" ,sbcl-cl-base64) + ("cl-indentify" ,sbcl-cl-indentify) + ("closer-mop" ,sbcl-closer-mop) + ("eclector" ,sbcl-eclector) + ("ironclad" ,sbcl-ironclad) + ("iterate" ,sbcl-iterate) + ("jsown" ,sbcl-jsown) + ("multilang-documentation" ,sbcl-multilang-documentation) + ("pzmq" ,sbcl-pzmq) + ("puri" ,sbcl-puri) + ("static-vectors" ,sbcl-static-vectors) + ("trivial-do" ,sbcl-trivial-do) + ("trivial-garbage" ,sbcl-trivial-garbage) + ("trivial-gray-streams" ,sbcl-trivial-gray-streams) + ("trivial-mimes" ,sbcl-trivial-mimes))) + (home-page "https://yitzchak.github.io/common-lisp-jupyter/") + (synopsis "Common Lisp kernel for Jupyter") + (description + "This is a Common Lisp kernel for Jupyter along with a library for +building Jupyter kernels, based on Maxima-Jupyter which was based on +@code{cl-jupyter}.") + (license license:zlib)))) + +(define-public ecl-common-lisp-jupyter + (sbcl-package->ecl-package sbcl-common-lisp-jupyter)) + +(define-public cl-common-lisp-jupyter + (sbcl-package->cl-source-package sbcl-common-lisp-jupyter)) -- cgit v1.2.3 From dbbf67d365c5a674a80da7a4562a55fe4d4feac1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 24 Jan 2021 11:44:49 +0100 Subject: gnu: emacs-evil-collection: Update to 20210124. * gnu/packages/emacs-xyz.scm (emacs-evil-collection): Update to 20210124. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 480e51e288..a3d66bfd62 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10025,8 +10025,8 @@ extensions.") (license license:gpl3+))) (define-public emacs-evil-collection - (let ((commit "8c256263ad100fecd6246c6c55cbb19dab717c39") - (revision "18")) + (let ((commit "323bb7d85848a6a142ae14f39c3a073ce6423e20") + (revision "19")) (package (name "emacs-evil-collection") (version (git-version "0.0.3" revision commit)) @@ -10038,7 +10038,7 @@ extensions.") (file-name (git-file-name name version)) (sha256 (base32 - "0hz1yfv5g016dm99bwnibbmyhbi21qlc39ckd7p3s82az89hgf2n")))) + "1pf51kj93i1k2ivkjgwcvgxj8shrl8h7rkg578jl4k4awargf0nz")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil) -- cgit v1.2.3 From c95f7dc6f113dc66ca463e3a44c309c0c5ccd7f4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Jan 2021 13:11:03 +0200 Subject: gnu: flatpak: Update to 1.10.1. * gnu/packages/package-management.scm (flatpak): Update to 1.10.1. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index df5bd2eb81..2f3f575d3f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2018, 2019 Eric Bavier -;;; Copyright © 2019, 2020 Efraim Flashner +;;; Copyright © 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2019 Jonathan Brielmaier ;;; Copyright © 2020 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen @@ -1358,14 +1358,14 @@ the boot loader configuration.") (define-public flatpak (package (name "flatpak") - (version "1.8.2") + (version "1.10.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/flatpak/flatpak/releases/download/" version "/flatpak-" version ".tar.xz")) (sha256 - (base32 "1c45a0k7wx685n5b3ihv7dk0mm2kmwbw7cx8w5g2la62yxfn49kr")))) + (base32 "1dywvfpmszvp2wy5hvpzy8z6gz2gzmi9p302njp52p9vpx14ydf1")))) ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to ;; find the TLS backend in glib-networking. -- cgit v1.2.3 From 82fd2eeed3335116cac6bd198420da7ba36cbc52 Mon Sep 17 00:00:00 2001 From: Caliph Nomble Date: Tue, 19 Jan 2021 22:47:19 +0000 Subject: gnu: linux-libre: Allow disk encryption by default. * gnu/packages/linux.scm (%default-extra-linux-options): Enable CONFIG_DM_CRYPT as a module. Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e0f056aff9..d17ea4f43d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -641,6 +641,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." ("CONFIG_MEMCG_KMEM" . #t) ("CONFIG_CPUSETS" . #t) ("CONFIG_PROC_PID_CPUSET" . #t) + ;; Allow disk encryption by default + ("CONFIG_DM_CRYPT" . m) ;; Modules required for initrd: ("CONFIG_NET_9P" . m) ("CONFIG_NET_9P_VIRTIO" . m) -- cgit v1.2.3 From cd6763e48a207fc3c926e96341ac3a7fda027786 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 23 Jan 2021 15:33:54 -0500 Subject: gnu: linux-libre: Update to 5.10.10. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.10. (linux-libre-5.10-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 d17ea4f43d..f03d808b04 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -353,7 +353,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.10-version "5.10.9") +(define-public linux-libre-5.10-version "5.10.10") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -361,7 +361,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0la7dklpy6xd79fkzavpmlfyrc60kmmwz491msd95dmvv06kwwvz"))) + (hash (base32 "06fvgkrn9127xw9kly6l4ws3yv80q8xfqdzaam92lljim5pqdvb0"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From 1482dbcf27723a003be52f25b342838eae7e5094 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 23 Jan 2021 15:34:11 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.92. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.92. (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 f03d808b04..c4fd300c57 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,7 +369,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.4-version "5.4.91") +(define-public linux-libre-5.4-version "5.4.92") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -377,7 +377,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "05swzh4gb0mk6wzza0k6b0283cygkvj8a2d2b2gab6sb0fxn208f"))) + (hash (base32 "1zcl4dadyfrgmx6rh0ncy403rsqb1qs092m6zr6b3i14i3wpz4y0"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 6abde21ea5a7517e5b6763e8336e5664a9db2da0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 23 Jan 2021 15:34:32 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.170. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.170. (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 c4fd300c57..131c026dd6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -382,7 +382,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.169") +(define-public linux-libre-4.19-version "4.19.170") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -390,7 +390,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "156y4ly7qyy5z7sbp2vccrs7za72k3zi2hfjpskqqd6civdlvln7"))) + (hash (base32 "0jjvwbxpfvmzj4z6gkd2mh3kz9vh8hsgsm0013866hzgz1j043fx"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 34bf61796dd31826e6f813c9015a42d1bd118914 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 23 Jan 2021 15:34:47 -0500 Subject: gnu: linux-libre 4.14: Update to 4.14.217. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.217. (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 131c026dd6..7cc0bebd5a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -395,7 +395,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.216") +(define-public linux-libre-4.14-version "4.14.217") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -403,7 +403,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "19dvxmqvs1ysl127zqdcqq2pyf7370jj66fd73zdx6ya2pplz1mp"))) + (hash (base32 "04adj8x7p1has4mh8ygxhqgwb1i08fz9izqw1y6xj5hh8cjnm8v2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From be3e192ea76ab489dc7d4ada331788fc32e19afa Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 23 Jan 2021 15:35:07 -0500 Subject: gnu: linux-libre 4.9: Update to 4.9.253. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.253. (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 7cc0bebd5a..7bdb187427 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -408,7 +408,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.252") +(define-public linux-libre-4.9-version "4.9.253") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -416,7 +416,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1shllgrmxi6darnyzwkzazzjhpwxhm19z1swv40hnm0pbvgxm7hw"))) + (hash (base32 "065w35vb0qp4fvnwmcx7f92inmx64f9r04zzwcwbs0826nl52nws"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 898e137fc8eea07b0f845a0d0079980635656df1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 23 Jan 2021 15:35:18 -0500 Subject: gnu: linux-libre 4.4: Update to 4.4.253. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.253. (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 7bdb187427..32ceb02f27 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -421,7 +421,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.252") +(define-public linux-libre-4.4-version "4.4.253") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -429,7 +429,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0lchvfvn0kvqh1yixwscz4wrzd965zsxjkpc7nqiw9rhmvma3paf"))) + (hash (base32 "0nlqnfhrkaj2s582kc0wxqi0881hgp6l9z85qx4ckflc8jwrh7k6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 9d01749feaa1586b1caf449712116e7518bb2303 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 24 Jan 2021 15:44:06 +0100 Subject: gnu: qt5: Add source code URLs of mirrors. * gnu/packages/qt.scm (qt5-urls): New procedure. (qtbase, qtsvg, qtimageformats, qtx11extras) (qtxmlpatterns, qtdeclarative, qtconnectivity) (qtwebsockets, qtsensors, qtmultimedia, qtwayland) (qtserialport, qtserialbus, qtwebchannel, qtwebglplugin) (qtwebview, qttools, qtscript, qtquickcontrols) (qtquickcontrols2, qtgraphicaleffects, qtgamepad) (qtscxml, qtpurchasing, qtcharts, qtdatavis3d) (qtnetworkauth, qtremoteobjects, qtspeech) (qtwebengine): Use it. --- gnu/packages/qt.scm | 170 +++++++++++++++------------------------------------- 1 file changed, 49 insertions(+), 121 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 79d41b3e73..96a28ceb29 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Andreas Enge ;;; Copyright © 2015 Sou Bunnbu -;;; Copyright © 2015, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2015, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016 Thomas Danckaert @@ -343,16 +343,31 @@ developers using C++ or QML, a CSS & JavaScript like language.") ;; Qt 5: assembler error; see . (supported-systems (delete "mips64el-linux" %supported-systems)))) +(define (qt5-urls component version) + "Return a list of URLs for VERSION of the Qt5 COMPONENT." + ;; We can't use a mirror:// scheme because these URLs are not exact copies: + ;; the layout differs between them. + (list (string-append "https://download.qt.io/official_releases/qt/" + (version-major+minor version) "/" version + "/submodules/" component "-everywhere-src-" + version ".tar.xz") + (string-append "https://download.qt.io/archive/qt/" + (version-major+minor version) "/" version + "/submodules/" component "-everywhere-src-" + version ".tar.xz") + (let ((directory (string-append "qt5" (string-drop component 2)))) + (string-append "http://sources.buildroot.net/" directory "/" + component "-everywhere-src-" version ".tar.xz")) + (string-append "https://distfiles.macports.org/qt5/" + component "-everywhere-src-" version ".tar.xz"))) + (define-public qtbase (package (name "qtbase") (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "12mjsahlma9rw3vz9a6b5h2s6ylg8b34hxc2vnlna5ll429fgfa8")) @@ -611,10 +626,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "18dmfc8s428fzbk7k5vl3212b25455ayrz7s716nwyiy3ahgmmy7")))) @@ -686,10 +698,7 @@ HostData=lib/qt5 (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "132g4rlm61pdcpcrclr1rwpbrxn7va4wjfb021mh8pn1cl0wlgkk")) @@ -727,10 +736,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "0njlh6d327nll7d8qaqrwr5x15m9yzgyar2j45qigs1f7ah896my")))) @@ -751,10 +757,7 @@ from within Qt 5."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "1dyg1z4349k04yyzn8xbp4f5qjgm60gz6wgzp80khpilcmk8g6i1")))) @@ -782,10 +785,7 @@ xmlpatternsvalidator."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "0l0nhc2si6dl9r4s1bs45z90qqigs8jnrsyjjdy38q4pvix63i53")))) @@ -826,10 +826,7 @@ with JavaScript and C++."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "0a5wzin635b926b8prdwfazgy1vhyf8m6an64wp2lpkp78z7prmb")))) @@ -850,10 +847,7 @@ with Bluetooth and NFC."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "116amx4mnv50k0fpswgpr5x8wjny8nbffrjmld01pzhkhfqn4vph")))) @@ -877,10 +871,7 @@ consume data received from the server, or both."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "0qccpgbhyg9k4x5nni7xm0pyvaqia3zrcd42cn7ksf5h21lwmkxw")))) @@ -910,10 +901,7 @@ recognition API for devices."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "1sczzcvk3c5gczz53yvp8ma6gp8aixk5pcq7wh344c9md3g8xkbs")) @@ -961,10 +949,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "0al3yypy3fin62n8d1859jh0mn0fbpa161l7f37hgd4gf75365nk")) @@ -1021,10 +1006,7 @@ compositor libraries."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "08ga9a1lwj83872nxablk602z1dq0la6jqsiicvd7m1sfbfpgnd6")))) @@ -1055,10 +1037,7 @@ interacting with serial ports from within Qt."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "14bahg82jciciqkl74q9hvf3a8kp3pk5v731vp2416k4b8bn4xqb")))) @@ -1090,10 +1069,7 @@ and others."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "0x7q66994pw6cd0f505bmirw1sssqs740zaw8lyqqqr32m2ch7bx")))) @@ -1114,10 +1090,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "05rl657848fsprsnabdqb5z363c6drjc32k59223vl351f8ihhgb")))) @@ -1150,10 +1123,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "0jzzcm7z5njkddzfhmyjz4dbbzq8h93980cci4479zc4xq9r47y6")))) @@ -1203,10 +1173,7 @@ positioning and geolocation plugins."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "1iakl3hlyg51ri1czmis8mmb257b0y1zk2a2knybd3mq69wczc2v")))) @@ -1231,10 +1198,7 @@ that helps in Qt development."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "1zlvg3hc6h70d789g3kv6dxbwswzkskkm00bdgl01grwrdy4izg9")) @@ -1255,10 +1219,7 @@ ECMAScript and Qt."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "0qa4dlhn3iv9yvaic8hw86v6h8rn9sgq8xjfdaym04pfshfyypfm")))) @@ -1279,10 +1240,7 @@ can be used to build complete interfaces in Qt Quick."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "0q0mk2mjlf9ll0gdrdzxy8096s6g9draaqiwrlvdpa7lv14x7xzs")))) @@ -1304,10 +1262,7 @@ not available."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "03xmwhapv0b2qj661iaqqrvhxc7qiid0acrp6rj85824ha2pyyj8")))) @@ -1331,10 +1286,7 @@ coloring, and many more."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "00wd3h465waxdghg2vdhs5pkj0xikwjn88l12477dksm8zdslzgp")))) @@ -1361,10 +1313,7 @@ and mobile applications targeting TV-like form factors."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "141pfschv6zmcvvn3pi7f5vb4nf96zpngy80f9bly1sn58syl303")) @@ -1392,10 +1341,7 @@ also contains functionality to support data models and executable content."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "0lg8x7g7dkf95xwxq8b4yw4ypdz68igkscya96xwbklg3q08gc39")))) @@ -1412,10 +1358,7 @@ purchasing goods and services."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "1drvm15i6n10b6a1acgarig120ppvqh3r6fqqdn8i3blx81m5cmd")))) @@ -1439,10 +1382,7 @@ selecting one of the charts themes.") (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "080fkpxg70m3c697wfnkjhca58b7r1xsqd559jzb21985pdh6g3j")))) @@ -1466,10 +1406,7 @@ customized by using themes or by adding custom items and labels to them.") (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "0pi6p7bq54kzij2p69cgib7n55k69jsq0yqq09yli645s4ym202g")))) @@ -1495,10 +1432,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "1mhlws5w0igf5hw0l90p6dz6k7w16dqfbnk2li0zxdmayk2039m6")))) @@ -1532,10 +1466,7 @@ processes or computers."))) (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "1nn6kspbp8hfkz1jhzc1qx1m9z7r1bgkdqgi9n4vl1q25yk8x7jy")))) @@ -1597,10 +1528,7 @@ using the Enchant spell-checking library.") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) + (uri (qt5-urls name version)) (sha256 (base32 "0iy9lsl6zxlkca6x2p1506hbj3wmhnaipg23z027wfccbnkxcsg1")) -- cgit v1.2.3 From fc68f611929df574c040e15f6653cee63401f8e2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 24 Jan 2021 21:42:04 +0100 Subject: gnu: guix-jupyter: Update to 0.2.0. * gnu/packages/package-management.scm (guix-jupyter): Update to 0.2.0. [source]: Remove 'modules' and 'snippet'. --- gnu/packages/package-management.scm | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 2f3f575d3f..7bfe21baf4 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1140,7 +1140,7 @@ outputs of those builds.") (define-public guix-jupyter (package (name "guix-jupyter") - (version "0.1.0") + (version "0.2.0") (home-page "https://gitlab.inria.fr/guix-hpc/guix-kernel") (source (origin (method git-fetch) @@ -1148,24 +1148,7 @@ outputs of those builds.") (commit (string-append "v" version)))) (sha256 (base32 - "01z7jjkc7r7lj6637rcgpz40v8xqqyfp6871h94yvcnwm7zy9h1n")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Allow builds with Guile 3.0. - (substitute* "configure.ac" - (("^GUILE_PKG.*") - "GUILE_PKG([3.0 2.2])\n")) - - ;; Avoid name clash and build failure now that - ;; 'define-json-mapping' is also provided by Guile-JSON, as - ;; of version 4.3. - (substitute* (find-files "." "\\.scm$") - (("define-json-mapping") - "define-json-mapping*") - (("<=>") - "<->")) - #t)) + "1bjddkj1px1xzm3gia87sclphwsnr4vb92vrfi8gh5dx0z73dmc5")) (file-name (string-append "guix-jupyter-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From e1af6c058e92ff4b0ea91c382c55762384d0a733 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 24 Jan 2021 13:47:33 -0500 Subject: gnu: Add emacs-counsel-bbdb. * gnu/packages/emacs-xyz.scm (emacs-counsel-bbdb): New variable. --- gnu/packages/emacs-xyz.scm | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a3d66bfd62..163eb6791b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2017 Peter Mikkelsen ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Mike Gerwitz -;;; Copyright © 2017, 2018, 2019, 2020 Maxim Cournoyer +;;; Copyright © 2017, 2018, 2019, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2018 Sohom Bhattacharjee ;;; Copyright © 2018, 2019 Mathieu Lirzin ;;; Copyright © 2018, 2019, 2020, 2021 Pierre Neidhardt @@ -1846,6 +1846,34 @@ like. It can be linked with various Emacs mail clients (Message and Mail mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.") (license license:gpl3+))) +(define-public emacs-counsel-bbdb + (package + (name "emacs-counsel-bbdb") + (version "20181128.1320") + (source + (origin + (method url-fetch) + (uri (string-append "https://melpa.org/packages/counsel-bbdb-" + version ".el")) + (sha256 + (base32 + "03g3lk8hz9a17vf5r16x054bhyk8xsbnfq0div8ig13fmhqi159q")))) + (build-system emacs-build-system) + (propagated-inputs `(("emacs-ivy" ,emacs-ivy))) + (home-page "https://github.com/redguard/counsel-bbdb") + (synopsis "Ivy interface for BBDB") + (description "This Ivy extension enables the use of @code{ivy-mode} to input +email addresses from BBDB efficiently. The main functions are: +@table @code +@item counsel-bbdb-complete-mail to input email addresses; +@item counsel-bbdb-reload' to reload contacts from BBDB database; +@item counsel-bbdb-expand-mail-alias to expand mail alias. +@end table +Since @code{counsel-bbdb} is based on @code{ivy-mode}, all Ivy key bindings +are supported. For example, after @samp{C-u M-x counsel-bbdb-complete-mail}, +you can press @samp{C-M-n} to input multiple email addresses.") + (license license:gpl3+))) + (define-public emacs-bluetooth (package (name "emacs-bluetooth") -- cgit v1.2.3 From e330a31f7b7fd1542ce413e962ee36bef9fbc586 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Jan 2021 23:58:29 +0200 Subject: gnu: catimg: Update to 2.7.0. * gnu/packages/image-viewers.scm (catimg): Update to 2.7.0. --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index dfe29d413e..fda9e4cb7b 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -296,7 +296,7 @@ your images. Among its features are: (define-public catimg (package (name "catimg") - (version "2.6.0") + (version "2.7.0") (source (origin (method git-fetch) @@ -305,7 +305,7 @@ your images. Among its features are: (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0g9ywbgy162wiam9hc3yqpq5q4gyxa8fj4jskr3fdz8z8jjaabzz")))) + (base32 "0a2dswbv4xddb2l2d55hc43lzvjwrjs5z9am7v6i0p0mi2fmc89s")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 486e79790e59fecd5b4625395f20c995e9b8ab71 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 23:06:09 +0100 Subject: gnu: tokei: Remove duplicate Cargo inputs. * gnu/packages/rust-apps.scm (tokei)[arguments]: Remove duplicates Cargo inputs. --- gnu/packages/rust-apps.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index eac55ae3e0..e7a0c4fab2 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -597,7 +597,6 @@ of support files.") ("rust-grep-searcher" ,rust-grep-searcher-0.1) ("rust-hex" ,rust-hex-0.4) ("rust-ignore" ,rust-ignore-0.4) - ("rust-ignore" ,rust-ignore-0.4) ("rust-log" ,rust-log-0.4) ("rust-num-format" ,rust-num-format-0.4) ("rust-once-cell" ,rust-once-cell-1) @@ -607,7 +606,6 @@ of support files.") ("rust-serde" ,rust-serde-1) ("rust-serde-cbor" ,rust-serde-cbor-0.11) ("rust-serde-json" ,rust-serde-json-1) - ("rust-serde-json" ,rust-serde-json-1) ("rust-serde-yaml" ,rust-serde-yaml-0.8) ("rust-tera" ,rust-tera-1) ("rust-term-size" ,rust-term-size-0.3) -- cgit v1.2.3 From 9abac0d338794b1906bb8c73c762648ffdbde121 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 23:07:25 +0100 Subject: gnu: Add emacs-repology. * gnu/packages/emacs-xyz.scm (emacs-repology): New variable. --- gnu/packages/emacs-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 163eb6791b..a9e4f69bc0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21164,6 +21164,25 @@ with emacs. It displays the output of the @code{repo status} command in a buffer and launches Magit from the status buffer for the project at point.") (license license:gpl3+))) +(define-public emacs-repology + (package + (name "emacs-repology") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "repology-" version ".tar")) + (sha256 + (base32 "0y12496wafx95izah8vvv1x86k1m8kysm5mlhvshkp0zbpvmb5iq")))) + (build-system emacs-build-system) + (home-page "https://elpa.gnu.org/packages/repology.html") + (synopsis "Repology API access via Elisp") + (description + "This package provides tools to query Repology API (see +@url{https://repology.org/api}), process results, and display them.") + (license license:gpl3+))) + (define-public emacs-alect-themes (package (name "emacs-alect-themes") -- cgit v1.2.3 From ffd5ec05db3e98aa4c7665e6cb9483148e3c37e5 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 25 Jan 2021 08:20:45 +0100 Subject: gnu: sbcl-periods: Update to 20210125. * gnu/packages/lisp-xyz.scm (sbcl-periods): Update to 20210125. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6006e199c1..9202882307 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6081,8 +6081,8 @@ programming style and the efficiency of an iterative programming style.") (sbcl-package->ecl-package sbcl-series)) (define-public sbcl-periods - (let ((commit "983d4a57325db3c8def942f163133cec5391ec28") - (revision "1")) + (let ((commit "60383dcef88a1ac11f82804ae7a33c361dcd2949") + (revision "2")) (package (name "sbcl-periods") (version (git-version "0.0.2" revision commit)) @@ -6095,7 +6095,7 @@ programming style and the efficiency of an iterative programming style.") (file-name (git-file-name name version)) (sha256 (base32 - "0z30jr3lxz3cmi019fsl4lgcgwf0yqpn95v9zkkkwgymdrkd4lga")))) + "1ym2j4an9ig2hl210jg91gpf7xfnp6mlhkw3n9kkdnwiji3ipqlk")))) (build-system asdf-build-system/sbcl) (inputs `(("local-time" ,sbcl-local-time) -- cgit v1.2.3 From d49b0331e161271e5967a156e26eefd2c5abfcb4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 Jan 2021 09:57:18 +0200 Subject: gnu: fennel: Update to 0.8.0. * gnu/packages/lua.scm (fennel): Update to 0.8.0. [arguments]: Move 'check phase to after 'install phase. --- gnu/packages/lua.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 950090afcb..e28dde62d7 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Raimon Grau ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2014 Andreas Enge -;;; Copyright © 2016, 2017, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2019 Ricardo Wurmus ;;; Copyright © 2016 doncatnip ;;; Copyright © 2016, 2017, 2019 Clément Lassieur @@ -1066,7 +1066,7 @@ shell command executions.") (define-public fennel (package (name "fennel") - (version "0.7.0") + (version "0.8.0") (source (origin (method git-fetch) (uri (git-reference @@ -1075,7 +1075,7 @@ shell command executions.") (file-name (git-file-name name version)) (sha256 (base32 - "17pdcwhfw754fblppw46qphnsvxrn3b7066cz54lv8c0c12iryim")) + "1jng33vmnk6mi37l3x2z0plng940jpj7kz1s493ki80z3mkaxjfg")) (modules '((guix build utils))) (snippet '(begin @@ -1091,7 +1091,10 @@ shell command executions.") (lambda _ (substitute* "fennel" (("/usr/bin/env lua") (which "lua"))) - #t))))) + #t)) + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases 'check))))) (inputs `(("lua" ,lua))) (home-page "https://fennel-lang.org/") (synopsis "A Lisp that compiles to Lua") -- cgit v1.2.3 From 547bd6921a01cea1c43488525dfa9f82089fce30 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 Jan 2021 09:58:41 +0200 Subject: gnu: fennel: Satisfy guix-lint. * gnu/packages/lua.scm (fennel)[synopsis]: Remove leading article. --- 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 e28dde62d7..e4b3818faa 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -1097,7 +1097,7 @@ shell command executions.") (assoc-ref %standard-phases 'check))))) (inputs `(("lua" ,lua))) (home-page "https://fennel-lang.org/") - (synopsis "A Lisp that compiles to Lua") + (synopsis "Lisp that compiles to Lua") (description "Fennel is a programming language that brings together the speed, simplicity, and reach of Lua with the flexibility of a Lisp syntax and macro -- cgit v1.2.3 From 064a7ea6e00119d6c157f3d07df5928af7fdac53 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 24 Jan 2021 18:51:44 +0000 Subject: gnu: sbcl-uax-15: Update to 0.1.1. * gnu/packages/lisp-xyz.scm (sbcl-uax-15): Update to 0.1.1. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 54 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9202882307..68c07002e3 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -460,33 +460,33 @@ compatible with ANSI-compliant Common Lisp implementations.") (sbcl-package->ecl-package sbcl-cl-ppcre)) (define-public sbcl-uax-15 - (let ((commit "e7439a91b72f533fcf736643e3ff0677b56c2e7d") - (revision "1")) - (package - (name "sbcl-uax-15") - (version (git-version "0.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/sabracrolleton/uax-15") - (commit commit))) - (file-name (git-file-name "uax-15" version)) - (sha256 - (base32 "1vf8a2aikgx0l5bsq0z9s0dw3sgx1887xhagdlf66fwffa5jskg6")))) - (build-system asdf-build-system/sbcl) - (native-inputs - `(("fiveam" ,sbcl-fiveam))) - (inputs - `(("cl-ppcre" ,sbcl-cl-ppcre) - ("split-sequence" ,sbcl-split-sequence))) - (arguments - `(#:asd-systems '("uax-15"))) - (home-page "https://github.com/sabracrolleton/uax-15") - (synopsis "Common Lisp implementation of unicode normalization functions") - (description "This package provides supports for unicode normalization, -RFC8264 and RFC7564.") - (license license:expat)))) + (package + (name "sbcl-uax-15") + (version "0.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sabracrolleton/uax-15") + (commit (string-append "v" version)))) + (file-name (git-file-name "uax-15" version)) + (sha256 + (base32 "0p2ckw7mzxhwa9vbwj2q2dzayz9dl94d9yqd2ynp0pc5v8i0n2fr")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:asd-systems + '("uax-15"))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (inputs + `(("cl-ppcre" ,sbcl-cl-ppcre) + ("split-sequence" ,sbcl-split-sequence))) + (home-page "https://github.com/sabracrolleton/uax-15") + (synopsis "Common Lisp implementation of unicode normalization functions") + (description + "This package provides supports for unicode normalization, RFC8264 and +RFC7564.") + (license license:expat))) (define-public cl-uax-15 (sbcl-package->cl-source-package sbcl-uax-15)) -- cgit v1.2.3 From 82a9ed3eb3d94e8d3cd0323cdc2fecc30edf67c5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 24 Jan 2021 19:21:46 +0000 Subject: gnu: sbcl-postmodern: Update to 1.32.8. * gnu/packages/lisp-xyz.scm (sbcl-postmodern): Update to 1.32.8. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 68c07002e3..3fefccf1e8 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9172,7 +9172,7 @@ approach to templating.") (define-public sbcl-postmodern (package (name "sbcl-postmodern") - (version "1.32.6") + (version "1.32.8") (source (origin (method git-fetch) @@ -9181,7 +9181,7 @@ approach to templating.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0bfx0hcb9wv47qd334xs0fpmisl75dpvasq1zai210s5wqg0km6d")))) + (base32 "0vr5inbr8dldf6dsl0qj3h2yrnnsayzfwxfzwkn1pk7xbns2l78q")))) (build-system asdf-build-system/sbcl) (native-inputs `(("fiveam" ,sbcl-fiveam))) @@ -9208,6 +9208,9 @@ approach to templating.") ;; /4f47agf1kyiz057ppy6x5p98i7mcbfsv-sbcl-local-time-1.0.6-2.a177eb9 ;; /lib/common-lisp/sbcl/local-time/src/integration/ ;; + ;; NOTE: (Sharlatan-20210124T191940+0000): When set env HOME to /tmp above + ;; issue is resolved but it required live test database to connect to now. + ;; Keep tests switched off. `(#:tests? #f #:asd-systems '("cl-postgres" "s-sql" -- cgit v1.2.3 From 40edcda0f546753bd149c337ff18af2739d08075 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 25 Jan 2021 10:06:11 +0100 Subject: gnu: emacs-helm-sly: Update to 0.7.0. * gnu/packages/emacs-xyz.scm (emacs-helm-sly): Update to 0.7.0. --- 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 a9e4f69bc0..3470569fb0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20290,7 +20290,7 @@ correctly.") (define-public emacs-helm-sly (package (name "emacs-helm-sly") - (version "0.6.0") + (version "0.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -20299,7 +20299,7 @@ correctly.") (file-name (git-file-name name version)) (sha256 (base32 - "047b1qhabdymgr8c3y8xj4w1rngip4mnypg8br8kavcl8fycbaa0")))) + "090vq8c4scf9byn8xic71b02n4c8frhz1y1x1brxn6iar44dmzm5")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm) -- cgit v1.2.3 From 60021f2afaed1c2493017b8de43f13fcd909d48e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 25 Jan 2021 10:06:42 +0100 Subject: gnu: emacs-helm-selector: Update to 0.6.1. * gnu/packages/emacs-xyz.scm (emacs-helm-selector): Update to 0.6.1. --- 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 3470569fb0..9e276d9d26 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25143,7 +25143,7 @@ pattern guessed from thing under current cursor position. (define-public emacs-helm-selector (package (name "emacs-helm-selector") - (version "0.6") + (version "0.6.1") (home-page "https://github.com/emacs-helm/helm-selector") (source (origin @@ -25154,7 +25154,7 @@ pattern guessed from thing under current cursor position. (file-name (git-file-name name version)) (sha256 (base32 - "02cphsv7lk70v3aaj3nffg4niqd9mhg468mvq5ybh3gx1gxmr8qn")))) + "01lh1df0bnas1p7xlqc4i1jd67f8lxgq0q2zsvx10z8828i76j3v")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm))) -- cgit v1.2.3 From 18a512528de2aa5de85eb32f0305692cbf85231f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 Jan 2021 10:08:13 +0200 Subject: gnu: fennel: Install manpage. * gnu/packages/lua.scm (fennel)[arguments]: Add phase to install manpage. --- gnu/packages/lua.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index e4b3818faa..0100ed2dd3 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -1094,7 +1094,13 @@ shell command executions.") #t)) (delete 'check) (add-after 'install 'check - (assoc-ref %standard-phases 'check))))) + (assoc-ref %standard-phases 'check)) + (add-after 'install 'install-manpage + (lambda* (#:key outputs #:allow-other-keys) + (install-file "fennel.1" + (string-append (assoc-ref outputs "out") + "/share/man/man1")) + #t))))) (inputs `(("lua" ,lua))) (home-page "https://fennel-lang.org/") (synopsis "Lisp that compiles to Lua") -- cgit v1.2.3 From 209d94fa646729877b7b03d71d9e162f94e5fab0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 Jan 2021 10:51:05 +0200 Subject: gnu: fennel: Cross-build. * gnu/packages/lua.scm (fennel)[arguments]: Add phase to patch additional calls to lua binary. Adjust 'patch-fennel phase to specify specific lua location. --- gnu/packages/lua.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 0100ed2dd3..80a59c2d6e 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -1087,10 +1087,18 @@ shell command executions.") #:phases (modify-phases %standard-phases (delete 'configure) + (add-before 'build 'patch-lua-calls + (lambda* (#:key inputs #:allow-other-keys) + (let ((lua (string-append (assoc-ref inputs "lua") "/bin/lua"))) + (setenv "LUA" lua) + (substitute* "old/launcher.lua" + (("/usr/bin/env lua") lua)) + #t))) (add-after 'build 'patch-fennel - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* "fennel" - (("/usr/bin/env lua") (which "lua"))) + (("/usr/bin/env .*lua") + (string-append (assoc-ref inputs "lua") "/bin/lua"))) #t)) (delete 'check) (add-after 'install 'check -- cgit v1.2.3 From 3080a6e7a0b8ecc2b33973435ea3fd48146f68f1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 Jan 2021 11:10:16 +0200 Subject: gnu: fennel: Always run tests. * gnu/packages/lua.scm (fennel)[arguments]: Always enable tests. --- gnu/packages/lua.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 80a59c2d6e..b029400cb2 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -1083,6 +1083,7 @@ shell command executions.") (build-system gnu-build-system) (arguments '(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:tests? #t ; even on cross-build #:test-target "test" #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 90a6ce0b1852608185e3ba7fe09e585b43eac3be Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 Jan 2021 12:04:04 +0100 Subject: gnu: guix-jupyter: Update to 0.2.1. * gnu/packages/package-management.scm (guix-jupyter): Update to 0.2.1. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 7bfe21baf4..98af2187fa 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1140,7 +1140,7 @@ outputs of those builds.") (define-public guix-jupyter (package (name "guix-jupyter") - (version "0.2.0") + (version "0.2.1") (home-page "https://gitlab.inria.fr/guix-hpc/guix-kernel") (source (origin (method git-fetch) @@ -1148,7 +1148,7 @@ outputs of those builds.") (commit (string-append "v" version)))) (sha256 (base32 - "1bjddkj1px1xzm3gia87sclphwsnr4vb92vrfi8gh5dx0z73dmc5")) + "1kqwfp5h95s6mirq5nbydsbmlhsinn32grz1ld5mbxvhl6sn2i0j")) (file-name (string-append "guix-jupyter-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From f9bd4621dd92a9415276706b476b9bd2973411fa Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 25 Jan 2021 13:49:25 +0100 Subject: gnu: inkscape-1.0: Update to 1.0.2. * gnu/packages/inkscape.scm (inkscape-1.0): Update to 1.0.2. Signed-off-by: Maxim Cournoyer --- gnu/packages/inkscape.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 56375f0759..075f901b2d 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -120,7 +120,7 @@ as the native format.") (define-public inkscape-1.0 (package (name "inkscape") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) @@ -129,7 +129,7 @@ as the native format.") "inkscape-" version ".tar.xz")) (sha256 (base32 - "1hjp5nnyx2m3miji6q4lcb6zgbi498v641dc7apkqqvayknrb4ng")) + "12krl97a00gdcxxibsb7g2lgx5458mhx2437x0hvz350242j6gns")) (modules '((guix build utils) (ice-9 format))) (snippet -- cgit v1.2.3 From 906155e437c9513462f19baac6e88b976f42b358 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 22 Jan 2021 22:46:11 +0000 Subject: gnu: Add libpasastro. * gnu/packages/astronomy.scm (libpasastro): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/astronomy.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 9485fe600f..6323f3eb48 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2019 by Amar Singh ;;; Copyright © 2020 R Veera Kumar ;;; Copyright © 2020 Guillaume Le Vaillant +;;; Copyright © 2021 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,6 +52,7 @@ #:use-module (gnu packages xorg) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (ice-9 match) #:use-module (srfi srfi-1)) (define-public cfitsio @@ -299,6 +301,55 @@ Mechanics, Astrometry and Astrodynamics library.") (license (list license:lgpl2.0+ license:gpl2+)))) ; examples/transforms.c & lntest/*.c +(define-public libpasastro + ;; NOTE: (Sharlatan-20210122T215921+0000): the version tag has a build + ;; error on spice which is resolved with the latest commit. + (let ((commit "e3c218d1502a18cae858c83a9a8812ab197fcb60") + (revision "1")) + (package + (name "libpasastro") + (version (git-version "1.4.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pchev/libpasastro") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0asp2sn34nds5va2ghppwc41vb6j3d1mf049j949rgrll817kx47")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:make-flags + (list + ,(match (or (%current-target-system) (%current-system)) + ((or "aarch64-linux" "armhf-linux" "i686-linux" "x86_64-linux") + "OS_TARGET=linux") + (_ #f)) + ,(match (or (%current-target-system) (%current-system)) + ("i686-linux" "CPU_TARGET=i386") + ("x86_64-linux" "CPU_TARGET=x86_64") + ((or "armhf-linux" "aarch64-linux") "CPU_TARGET=armv7l") + (_ #f)) + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://github.com/pchev/libpasastro") + (synopsis "Interface to astronomy library for use from Pascal program") + (description + "This package provides shared libraries to interface Pascal program with +standard astronomy libraries: + +@itemize +@item @code{libpasgetdss.so}: Interface with GetDSS to work with DSS images. +@item @code{libpasplan404.so}: Interface with Plan404 to compute planets position. +@item @code{libpaswcs.so}: Interface with libwcs to work with FITS WCS. +@item @code{libpasspice.so}: To work with NAIF/SPICE kernel. +@end itemize\n") + (license license:gpl2+)))) + (define-public xplanet (package (name "xplanet") -- cgit v1.2.3 From b2d6f127c24787df00bffd918fa879842f933817 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 24 Jan 2021 11:16:36 +0000 Subject: gnu: Add sextractor. * gnu/packages/astronomy.scm (sextractor): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/astronomy.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 6323f3eb48..0e1a55481f 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -158,6 +158,52 @@ header.") programs for the manipulation and analysis of astronomical data.") (license license:gpl3+))) +(define-public sextractor + (package + (name "sextractor") + (version "2.25.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/astromatic/sextractor") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0q69n3nyal57h3ik2xirwzrxzljrwy9ivwraxzv9566vi3n4z5mw")))) + (build-system gnu-build-system) + ;; NOTE: (Sharlatan-20210124T103117+0000): Building with `atlas' is failing + ;; due to missing shared library which required on configure phase. Switch + ;; build to use `openblas' instead. It requires FFTW with single precision + ;; `fftwf'. + (arguments + `(#:configure-flags + (list + "--enable-openblas" + (string-append + "--with-openblas-libdir=" (assoc-ref %build-inputs "openblas") "/lib") + (string-append + "--with-openblas-incdir=" (assoc-ref %build-inputs "openblas") "/include") + (string-append + "--with-fftw-libdir=" (assoc-ref %build-inputs "fftw") "/lib") + (string-append + "--with-fftw-incdir=" (assoc-ref %build-inputs "fftw") "/include")))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + (inputs + `(("openblas" ,openblas) + ("fftw" ,fftwf))) + (home-page "http://www.astromatic.net/software/sextractor") + (synopsis "Extract catalogs of sources from astronomical images") + (description + "SExtractor is a program that builds a catalogue of objects from an +astronomical image. Although it is particularly oriented towards reduction of +large scale galaxy-survey data, it can perform reasonably well on moderately +crowded star fields.") + (license license:gpl3+))) + (define-public stellarium (package (name "stellarium") -- cgit v1.2.3 From 0219cd562fc59c4ed8fe42044771ece85fa6f396 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 25 Jan 2021 14:21:41 -0500 Subject: gnu: MPD: Update to 0.22.4. * gnu/packages/mpd.scm (mpd): Update to 0.22.4. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index d81943ed64..ca3c71bc38 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -105,7 +105,7 @@ interfacing MPD in the C, C++ & Objective C languages.") (define-public mpd (package (name "mpd") - (version "0.22.3") + (version "0.22.4") (source (origin (method url-fetch) (uri @@ -114,7 +114,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "/mpd-" version ".tar.xz")) (sha256 (base32 - "1kvcarqijyw07bdqszjsn62plmncaid5az0q542p6rsygc1i501k")))) + "1l4x2jrv04hp4q9gyfg79g78bk68lrd6wd3hysl6y91rln9sj7l9")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=enabled"))) -- cgit v1.2.3 From 3f0af15131e524891df8c9f013f1be1597fe2d7e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 25 Jan 2021 14:21:59 -0500 Subject: gnu: ncmpcpp: Update to 0.9.2. * gnu/packages/mpd.scm (ncmpcpp): Update to 0.9.2. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index ca3c71bc38..4138f4d2f6 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -229,7 +229,7 @@ terminal using ncurses.") (define-public ncmpcpp (package (name "ncmpcpp") - (version "0.9.1") + (version "0.9.2") (source (origin (method url-fetch) (uri @@ -237,7 +237,7 @@ terminal using ncurses.") version ".tar.bz2")) (sha256 (base32 - "0x35nd4v31sma8fliqdbn1nxpjyi8hv472318sfb3xbmr4wlm0fb")))) + "06rs734n120jp51hr0fkkhxrm7zscbhpdwls0m5b5cccghazdazs")))) (build-system gnu-build-system) (inputs `(("libmpdclient" ,libmpdclient) ("boost" ,boost) -- cgit v1.2.3 From 13ff47c02c0687206bdade6510bf5b2bd3bbd654 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 Jan 2021 19:22:00 +0200 Subject: gnu: ldc-bootstrap: Update to 0.17.6. * gnu/packages/dlang.scm (ldc-bootstrap): Update to 0.17.6. [arguments]: Remove 'patch-dmd2 phase. Enable one test from 'patch-phobos. [native-inputs]: Replace llvm-3.8, clang-3.8 with llvm-6, clang-6. --- gnu/packages/dlang.scm | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm index 6cdb2efd14..da3b818c26 100644 --- a/gnu/packages/dlang.scm +++ b/gnu/packages/dlang.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2020 Guy Fleury Iteriteka +;;; Copyright © 2021 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -83,7 +84,7 @@ and freshness without requiring additional information from the user.") (define-public ldc-bootstrap (package (name "ldc") - (version "0.17.4") + (version "0.17.6") (source (origin (method git-fetch) @@ -92,7 +93,7 @@ and freshness without requiring additional information from the user.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0nnrjavfmpfp7bib04isqlxvyzh6mlvsdan0gxysdz96hlg4hcq8")))) + (base32 "1q6hm4fkrcwys83x0p4kfg9xrc1b9g2qicqif2zy5z4nsfsb5vgs")))) (build-system cmake-build-system) (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux")) (properties @@ -117,14 +118,6 @@ and freshness without requiring additional information from the user.") (unpack "druntime-src" "runtime/druntime") (unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite") #t))) - (add-after 'unpack-submodule-sources 'patch-dmd2 - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "dmd2/root/port.c" - ((" ::isnan") " isnan") - ((" ::isinf") " isinf") - (("#undef isnan") "") - (("#undef isinf") "")) - #t)) (add-after 'unpack-submodule-sources 'patch-phobos (lambda* (#:key inputs #:allow-other-keys) (substitute* "runtime/phobos/std/process.d" @@ -137,8 +130,6 @@ and freshness without requiring additional information from the user.") "(tzName == \"+VERSION\" || std.algorithm.endsWith(tzName, \"/leapseconds\"))")) (substitute* "tests/d2/dmd-testsuite/Makefile" (("/bin/bash") (which "bash"))) - ;; FIXME: this test cannot be linked. - (delete-file "tests/d2/dmd-testsuite/runnable/cppa.d") ;; the following two tests fail on i686 (for-each delete-file '("tests/ir/attributes.d" "tests/ir/align.d"))))))) (inputs @@ -147,8 +138,8 @@ and freshness without requiring additional information from the user.") ("tzdata" ,tzdata) ("zlib" ,zlib))) (native-inputs - `(("llvm" ,llvm-3.8) - ("clang" ,clang-3.8) + `(("llvm" ,llvm-6) + ("clang" ,clang-6) ("python-lit" ,python-lit) ("python-wrapper" ,python-wrapper) ("unzip" ,unzip) @@ -160,7 +151,7 @@ and freshness without requiring additional information from the user.") (commit (string-append "ldc-v" version)))) (file-name (git-file-name "phobos" version)) (sha256 - (base32 "0i7gh99w4mi0hdv16261jcdiqyv1nkjdcwy9prw32s0lvplx8fdy")) + (base32 "15jzs38wanks2jfp2izzl7zqrp4c8ai54ppsgm8ws86p3sbbkmj8")) (patches (search-patches "ldc-bootstrap-disable-tests.patch")))) ("druntime-src" ,(origin @@ -170,7 +161,7 @@ and freshness without requiring additional information from the user.") (commit (string-append "ldc-v" version)))) (file-name (git-file-name "druntime" version)) (sha256 - (base32 "0alabm3bbvs94msvxz5psiwk4f51cw9h82z1p5hhsnf8ja6d0am7")))) + (base32 "00wr2kiggwnd8h7by51fhj1xc65hv1ysip5gbgdbkfar58p2d0bb")))) ("dmd-testsuite-src" ,(origin (method git-fetch) @@ -179,7 +170,7 @@ and freshness without requiring additional information from the user.") (commit (string-append "ldc-v" version)))) (file-name (git-file-name "dmd-testsuite" version)) (sha256 - (base32 "05qr4cgb4scfqzbw1l5pk72kil074mvj9d55b165ljyr51sgwgbl")))))) + (base32 "1d1c0979wbippldrkjf7szyj4n87hxz8dwqg1r5b3aai37g9kcky")))))) (home-page "http://wiki.dlang.org/LDC") (synopsis "LLVM-based compiler for the D programming language") (description -- cgit v1.2.3 From 47962191d4fadddf066fcb42e47e7e4ff7712bcb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 Jan 2021 19:27:51 +0200 Subject: gnu: gnuastro: Update to 0.14. * gnu/packages/astronomy.scm (gnuastro): Update to 0.14. [inputs]: Add curl-minimal, libgit2. --- gnu/packages/astronomy.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 0e1a55481f..45d62cd855 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 John Darrington ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice -;;; Copyright © 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2019 by Amar Singh ;;; Copyright © 2020 R Veera Kumar ;;; Copyright © 2020 Guillaume Le Vaillant @@ -130,7 +130,7 @@ header.") (define-public gnuastro (package (name "gnuastro") - (version "0.13") + (version "0.14") (source (origin (method url-fetch) @@ -138,13 +138,15 @@ header.") version ".tar.lz")) (sha256 (base32 - "07di6zx2irc5q0zyymx2951ydzxdfjmzd3az5qnk67ncf3hknvj5")))) + "1xp6n42qxv0x6yigi2w2l5k8006smv27lhrcssysgsvzbydghzg5")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) (inputs `(("cfitsio" ,cfitsio) + ("curl" ,curl-minimal) ("gsl" ,gsl) + ("libgit2" ,libgit2) ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("wcslib" ,wcslib) -- cgit v1.2.3 From 608ca22a81847dbcd38851568f61988e8df111b4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 25 Jan 2021 15:55:17 -0500 Subject: gnu: Add python-eradicate. * gnu/packages/python-check.scm (python-eradicate): New variable. --- gnu/packages/python-check.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index fb111d6e57..c23741825b 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020 Efraim Flashner -;;; Copyright © 2019, 2020 Maxim Cournoyer +;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2020 Marius Bakke @@ -1096,6 +1096,25 @@ any Python VM with basically no runtime overhead.") ;; mypyc/lib-rt/getargs.c (license (list license:expat license:psfl)))) +(define-public python-eradicate + (package + (name "python-eradicate") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "eradicate" version)) + (sha256 + (base32 + "1j30g9jfmbfki383qxwrfds8b23yiwywj40lng4lqcf5yab4ahr7")))) + (build-system python-build-system) + (home-page "https://github.com/myint/eradicate") + (synopsis "Remove commented-out code from Python sources") + (description "The @command{eradicate} command removes commented-out code +from Python files. It does this by detecting block comments that contain +valid Python syntax that are likely to be commented out code.") + (license license:expat))) + (define-public python-robber (package (name "python-robber") -- cgit v1.2.3 From 59c03bd4f9aba7ccd90428508ad072f8db01b9ed Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 25 Jan 2021 16:36:53 -0500 Subject: gnu: Mutt: Update to 2.0.5. * gnu/packages/patches/mutt-CVE-2021-3181.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/mail.scm (mutt): Update to 2.0.5. [source]: Remove obsolete patch. --- gnu/local.mk | 1 - gnu/packages/mail.scm | 7 ++--- gnu/packages/patches/mutt-CVE-2021-3181.patch | 45 --------------------------- 3 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 gnu/packages/patches/mutt-CVE-2021-3181.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 0553c12f28..c631e449d1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1385,7 +1385,6 @@ dist_patch_DATA = \ %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \ %D%/packages/patches/musl-cross-locale.patch \ %D%/packages/patches/mutt-store-references.patch \ - %D%/packages/patches/mutt-CVE-2021-3181.patch \ %D%/packages/patches/m4-gnulib-libio.patch \ %D%/packages/patches/ncompress-fix-softlinks.patch \ %D%/packages/patches/netcdf-date-time.patch \ diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index ab3a19578e..b3927bbafe 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -445,7 +445,7 @@ aliasing facilities to work just as they would on normal mail.") (define-public mutt (package (name "mutt") - (version "2.0.4") + (version "2.0.5") (source (origin (method url-fetch) (uri (list @@ -455,9 +455,8 @@ aliasing facilities to work just as they would on normal mail.") version ".tar.gz"))) (sha256 (base32 - "1m4ig69qw4g3lhm4351snmy5i0ch65fqc9vqqdybr6jy21w7w225")) - (patches (search-patches "mutt-store-references.patch" - "mutt-CVE-2021-3181.patch")))) + "0k80s27sf7djb7zxj81ihksr8jkr71mfaa8976fzh41i1pn5l7g2")) + (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs `(("cyrus-sasl" ,cyrus-sasl) diff --git a/gnu/packages/patches/mutt-CVE-2021-3181.patch b/gnu/packages/patches/mutt-CVE-2021-3181.patch deleted file mode 100644 index df5214b052..0000000000 --- a/gnu/packages/patches/mutt-CVE-2021-3181.patch +++ /dev/null @@ -1,45 +0,0 @@ -Fix CVE-2021-3181: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3181 - -Patch copied from upstream source repository: - -https://gitlab.com/muttmua/mutt/-/commit/c059e20ea4c7cb3ee9ffd3500ffe313ae84b2545 - -From c059e20ea4c7cb3ee9ffd3500ffe313ae84b2545 Mon Sep 17 00:00:00 2001 -From: Kevin McCarthy -Date: Sun, 17 Jan 2021 10:40:37 -0800 -Subject: [PATCH] Fix memory leak parsing group address. - -When there was a group address terminator with no previous addresses, -an address would be allocated but not attached to the address list. - -Change this to only allocate when last exists. - -It would be more correct to not allocate at all unless we are inside a -group list, but I will address that in a separate commit to master. ---- - rfc822.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/rfc822.c b/rfc822.c -index 7ff4eaa3..ced619f2 100644 ---- a/rfc822.c -+++ b/rfc822.c -@@ -587,11 +587,10 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS *top, const char *s) - #endif - - /* add group terminator */ -- cur = rfc822_new_address (); - if (last) - { -- last->next = cur; -- last = cur; -+ last->next = rfc822_new_address (); -+ last = last->next; - } - - phraselen = 0; --- -GitLab - -- cgit v1.2.3 From ead609930f300c8bb274cc1659bb53441cf62df1 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 22 Jan 2021 21:32:41 -0500 Subject: gnu: Add spglib. * gnu/packages/chemistry.scm (spglib): New variable. --- gnu/packages/chemistry.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index ddbf5ca098..129d6c1abe 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Konrad Hinsen -;;; Copyright © 2018 Kei Kebreau +;;; Copyright © 2018, 2021 Kei Kebreau ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020 Björn Höfling @@ -29,6 +29,7 @@ #:use-module (guix git-download) #:use-module (gnu packages) #:use-module (gnu packages algebra) + #:use-module (gnu packages autotools) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -464,3 +465,49 @@ chemical data. It's a collaborative project allowing anyone to search, convert, analyze, or store data from molecular modeling, chemistry, solid-state materials, biochemistry, or related areas.") (license license:gpl2))) + +(define-public spglib + (package + (name "spglib") + (version "1.16.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spglib/spglib") + (commit (string-append "v" version)))) + (sha256 + (base32 "1kzc956m1pnazhz52vspqridlw72wd8x5l3dsilpdxl491aa2nws")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + '(#:test-target "check" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-header-install-dir + (lambda _ + ;; As of the writing of this package, CMake and GNU build systems + ;; install the header to two different location. This patch makes + ;; the CMake build system's choice of header directory compatible + ;; with the GNU build system's choice and with what avogadrolibs + ;; expects. + ;; See https://github.com/spglib/spglib/issues/75 and the relevant + ;; part of https://github.com/OpenChemistry/avogadroapp/issues/97. + (substitute* "CMakeLists.txt" + (("\\$\\{CMAKE_INSTALL_INCLUDEDIR\\}" include-dir) + (string-append include-dir "/spglib"))) + #t))))) + (home-page "https://spglib.github.io/spglib/index.html") + (synopsis "Library for crystal symmetry search") + (description "Spglib is a library for finding and handling crystal +symmetries written in C. Spglib can be used to: + +@enumerate +@item Find symmetry operations +@item Identify space-group type +@item Wyckoff position assignment +@item Refine crystal structure +@item Find a primitive cell +@item Search irreducible k-points +@end enumerate") + (license license:bsd-3))) -- cgit v1.2.3 From daa4728efc14a3c4c3893ba5e4daeda4bbdabf75 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 22 Jan 2021 22:27:21 -0500 Subject: gnu: Add mmtf-cpp. * gnu/packages/chemistry.scm (mmtf-cpp): New variable. --- gnu/packages/chemistry.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index 129d6c1abe..2a42f6bcc8 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -242,6 +242,31 @@ analogy is that InChI is the bar-code for chemistry and chemical structures.") "file://LICENCE" "See LICENCE in the distribution.")))) +(define-public mmtf-cpp + (package + (name "mmtf-cpp") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rcsb/mmtf-cpp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17ylramda69plf5w0v5hxbl4ggkdi5s15z55cv0pljl12yvyva8l")))) + (build-system cmake-build-system) + ;; Tests require the soon-to-be-deprecated version 1 of the catch-framework. + (arguments + '(#:tests? #f)) + (home-page "https://mmtf.rcsb.org/") + (synopsis "C++ API for the Macromolecular Transmission Format") + (description "This package is a library for the +@acronym{MMTF,macromolecular transmission format}, a binary encoding of +biological structures.") + (license license:expat))) + (define with-numpy-1.8 (package-input-rewriting `((,python2-numpy . ,python2-numpy-1.8)))) -- cgit v1.2.3 From 58dd11038bcddc080fdf7745f0d8f3a8d9a46f8a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 22 Jan 2021 23:44:15 -0500 Subject: gnu: Add molequeue. * gnu/packages/chemistry.scm (molequeue): New variable. --- gnu/packages/chemistry.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index 2a42f6bcc8..87b3037589 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -267,6 +267,54 @@ analogy is that InChI is the bar-code for chemistry and chemical structures.") biological structures.") (license license:expat))) +(define-public molequeue + (package + (name "molequeue") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/OpenChemistry/molequeue/" + "releases/download/" version "/molequeue-" + version ".tar.bz2")) + (sha256 + (base32 + "1w1fgxzqrb5yxvpmnc3c9ymnvixy0z1nfafkd9whg9zw8nbgl998")))) + (build-system cmake-build-system) + (inputs + `(("qtbase" ,qtbase))) + (arguments + '(#:configure-flags '("-DENABLE_TESTING=ON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda _ + ;; TODO: Fix/enable the failing message and clientserver tests. + ;; In the message test, the floating-point value "5.36893473232" on + ;; line 165 of molequeue/app/testing/messagetest.cpp should + ;; (apparently) be truncated, but it is not. + (substitute* "molequeue/app/testing/messagetest.cpp" + (("5\\.36893473232") "5.36893")) + ;; It is unclear why the clientserver test fails, so it is + ;; completely disabled. + (substitute* "molequeue/app/testing/CMakeLists.txt" + ((".*clientserver.*") "")) + #t)) + (add-before 'check 'set-display + (lambda _ + ;; Make Qt render "offscreen" for the sake of tests. + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) + (home-page "https://www.openchemistry.org/projects/molequeue/") + (synopsis "Application for coordinating computational jobs") + (description "MoleQueue is a system-tray resident desktop application for +abstracting, managing, and coordinating the execution of tasks both locally and + on remote computational resources. Users can set up local and remote queues +that describe where the task will be executed. Each queue can have programs, +with templates to facilitate the execution of the program. Input files can be +staged, and output files collected using a standard interface.") + (license license:bsd-3))) + (define with-numpy-1.8 (package-input-rewriting `((,python2-numpy . ,python2-numpy-1.8)))) -- cgit v1.2.3 From 68dabe3c1c5a40e060d740b0365f066773297880 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 23 Jan 2021 14:39:30 -0500 Subject: gnu: Add libmsym. * gnu/packages/chemistry.scm (libmsym): New variable. --- gnu/packages/chemistry.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index 87b3037589..e97648fa3b 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -242,6 +242,30 @@ analogy is that InChI is the bar-code for chemistry and chemical structures.") "file://LICENCE" "See LICENCE in the distribution.")))) +(define-public libmsym + (package + (name "libmsym") + (version "0.2.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mcodev31/libmsym") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0a9j28irdsr461qpzlc9z1yjyb9kp64fh5zw7ylspc9zn3189qwk")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON") + #:tests? #f)) ; no check target + (home-page "https://github.com/mcodev31/libmsym") + (synopsis "C library dealing with point group symmetry in molecules") + (description "libmsym is a C library dealing with point group symmetry in +molecules.") + (license license:expat))) + (define-public mmtf-cpp (package (name "mmtf-cpp") -- cgit v1.2.3 From 1d41f7770182f4225dcb7ab197bf0a5b9cca603a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 23 Jan 2021 12:23:11 -0500 Subject: gnu: Add avogadrolibs. * gnu/packages/chemistry.scm (avogadrolibs): New variable. --- gnu/packages/chemistry.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index e97648fa3b..e2a1ef57e1 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -30,6 +30,7 @@ #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) + #:use-module (gnu packages backup) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -44,6 +45,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) + #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) #:use-module (gnu packages xml) #:use-module (guix build-system cmake) @@ -135,6 +137,48 @@ science, and related areas. It offers flexible high quality rendering and a powerful plugin architecture.") (license license:gpl2+))) +(define-public avogadrolibs + (package + (name "avogadrolibs") + (version "1.93.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenChemistry/avogadrolibs") + (commit version))) + (sha256 + (base32 "1xivga626n5acnmwmym8svl0pdri8hkp59czf04ri2zflnviyh39")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (native-inputs + `(("eigen" ,eigen) + ("mmtf-cpp" ,mmtf-cpp) + ("msgpack" ,msgpack) + ("googletest" ,googletest) + ("pkg-config" ,pkg-config) + ("pybind11" ,pybind11))) + (inputs + `(("glew" ,glew) + ("libarchive" ,libarchive) + ("libmsym" ,libmsym) + ("molequeue" ,molequeue) + ("python" ,python) + ("spglib" ,spglib) + ("qtbase" ,qtbase))) + (arguments + '(#:configure-flags (list "-DENABLE_TESTING=ON" + (string-append "-DSPGLIB_INCLUDE_DIR=" + (assoc-ref %build-inputs "spglib") + "/include")))) + (home-page "https://www.openchemistry.org/projects/avogadro2/") + (synopsis "Libraries for chemistry, bioinformatics, and related areas") + (description + "Avogadro libraries provide 3D rendering, visualization, analysis and data +processing useful in computational chemistry, molecular modeling, +bioinformatics, materials science, and related areas.") + (license license:bsd-3))) + (define-public domainfinder (package (name "domainfinder") -- cgit v1.2.3 From cf31ee0427ad9ac254a7fc2af9a4599d44c22f97 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 23 Jan 2021 17:29:50 -0500 Subject: gnu: Add avogadro2. * gnu/packages/chemistry.scm (avogadro2): New variable. --- gnu/packages/chemistry.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index e2a1ef57e1..5351ea596b 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -179,6 +179,41 @@ processing useful in computational chemistry, molecular modeling, bioinformatics, materials science, and related areas.") (license license:bsd-3))) +(define-public avogadro2 + (package + (name "avogadro2") + (version "1.93.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenChemistry/avogadroapp") + (commit version))) + (sha256 + (base32 + "1z3pjlwja778a1dmvx9aqz2hlw5q9g3kqxhm9slz08452600jsv7")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (native-inputs + `(("eigen" ,eigen) + ("pkg-config" ,pkg-config))) + (inputs + `(("avogadrolibs" ,avogadrolibs) + ("hdf5" ,hdf5) + ("molequeue" ,molequeue) + ("qtbase" ,qtbase))) + ;; TODO: Enable tests with "-DENABLE_TESTING" configure flag. + (arguments + '(#:tests? #f)) + (home-page "https://www.openchemistry.org/projects/avogadro2/") + (synopsis "Advanced molecule editor") + (description + "Avogadro 2 is an advanced molecule editor and visualizer designed for use +in computational chemistry, molecular modeling, bioinformatics, materials +science, and related areas. It offers flexible high quality rendering and a +powerful plugin architecture.") + (license license:bsd-3))) + (define-public domainfinder (package (name "domainfinder") -- cgit v1.2.3 From da4483f3790a70058caeb7d208651b18d560ad60 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Jan 2021 10:14:33 +0200 Subject: gnu: openssh: Build without pam for the Hurd. * gnu/packages/ssh.scm (openssh)[inputs]: Only add linux-pam when not building for the Hurd. [arguments]: Adjust configure flag to only use pam when not building for the Hurd. --- gnu/packages/ssh.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 0f2434d7c5..0afd8ed2b2 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2014, 2015, 2016 Mark H Weaver -;;; Copyright © 2015, 2016, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2019 Leo Famulari ;;; Copyright © 2016 Nicolas Goaziou ;;; Copyright © 2016 Christopher Allan Webber @@ -44,6 +44,7 @@ #:use-module (gnu packages gperf) #:use-module (gnu packages groff) #:use-module (gnu packages guile) + #:use-module (gnu packages hurd) #:use-module (gnu packages libedit) #:use-module (gnu packages linux) #:use-module (gnu packages logging) @@ -200,7 +201,9 @@ a server that supports the SSH-2 protocol.") ("pkg-config" ,pkg-config))) (inputs `(("libedit" ,libedit) ("openssl" ,openssl) - ("pam" ,linux-pam) + ,@(if (hurd-target?) + '() + `(("pam" ,linux-pam))) ("mit-krb5" ,mit-krb5) ("zlib" ,zlib) ("xauth" ,xauth))) ; for 'ssh -X' and 'ssh -Y' @@ -223,7 +226,9 @@ a server that supports the SSH-2 protocol.") "--with-libedit" ;; Enable PAM support in sshd. - "--with-pam" + ,,@(if (hurd-target?) + '() + '("--with-pam")) ;; "make install" runs "install -s" by default, ;; which doesn't work for cross-compiled binaries -- cgit v1.2.3 From f39d8d2ca96b15c4d415a36932526e1dd9ee212c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 25 Jan 2021 18:03:31 +0000 Subject: gnu: Add cl-modularize. * gnu/packages/lisp-xyz.scm (cl-modularize, ecl-modularize, sbcl-modularize): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3fefccf1e8..02621260dd 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9686,6 +9686,46 @@ PascalCase, snake_case, param-case, CONSTANT_CASE and more.") (define-public ecl-cl-change-case (sbcl-package->ecl-package sbcl-cl-change-case)) +(define-public sbcl-modularize + (let ((commit "86c5d9a11fbd2df9f0f03ac10b5d71837c8934ba") + (revision "1")) + (package + (name "sbcl-modularize") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/modularize") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zys29rfkb649rkgl3snxhajk8d5yf7ryxkrwy020kwdh7zdsg7d")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:test-asd-file "modularize-test-module.asd" + #:asd-files '("modularize.asd" "modularize-test-module.asd") + #:asd-systems '("modularize" "modularize-test-module"))) + (inputs + `(("documentation-utils" ,sbcl-documentation-utils) + ("trivial-package-local-nicknames" ,sbcl-trivial-package-local-nicknames))) + (home-page "https://shinmera.github.io/modularize/") + (synopsis "Common Lisp modularization framework") + (description + "@code{MODULARIZE} is an attempt at providing a common interface to +segregate major application components. This is achieved by adding special +treatment to packages. Each module is a package that is specially registered, +which allows it to interact and co-exist with other modules in better ways. For +instance, by adding module definition options you can introduce mechanisms to +tie modules together in functionality, hook into each other and so on.") + (license license:zlib)))) + +(define-public ecl-modularize + (sbcl-package->ecl-package sbcl-modularize)) + +(define-public cl-modularize + (sbcl-package->cl-source-package sbcl-modularize)) + (define-public sbcl-moptilities (let ((commit "a436f16b357c96b82397ec018ea469574c10dd41")) (package -- cgit v1.2.3 From 4f8d5e63b2f83fc0b9297e874f03c8424303b488 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Jan 2021 10:23:04 +0200 Subject: gnu: shadow: Build without pam for the Hurd. * gnu/packages/admin.scm (shadow)[arguments]: Adjust configure-flags to not use pam when building for the Hurd. [inputs]: Only use linux-pam when not building for the Hurd. --- gnu/packages/admin.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 87b0f36cc1..e14b84f769 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -676,7 +676,10 @@ hostname.") `(;; Assume System V `setpgrp (void)', which is the default on GNU ;; variants (`AC_FUNC_SETPGRP' is not cross-compilation capable.) #:configure-flags - '("--with-libpam" "ac_cv_func_setpgrp_void=yes") + '(,@(if (hurd-target?) + '() + '("--with-libpam")) + "ac_cv_func_setpgrp_void=yes") #:phases (modify-phases %standard-phases @@ -701,7 +704,10 @@ hostname.") (for-each delete-file (find-files man "^groups\\.")) #t)))))) - (inputs `(("linux-pam" ,linux-pam))) + (inputs + `(,@(if (hurd-target?) + '() + `(("linux-pam" ,linux-pam))))) (home-page "https://github.com/shadow-maint/shadow") (synopsis "Authentication-related tools such as passwd, su, and login") (description -- cgit v1.2.3 From 0e2abacae66db1295be8d5e87ff2eba6322f8f59 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Jan 2021 10:36:21 +0200 Subject: gnu: sudo: Build without pam for the Hurd. * gnu/packages/admin.scm (sudo)[inputs]: Only use linux-pam when not building for the Hurd. --- gnu/packages/admin.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e14b84f769..f78b411559 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1502,7 +1502,9 @@ system administrator.") `(("groff" ,groff)))) (inputs `(("coreutils" ,coreutils) - ("linux-pam" ,linux-pam) + ,@(if (hurd-target?) + '() + `(("linux-pam" ,linux-pam))) ("zlib" ,zlib))) (home-page "https://www.sudo.ws/") (synopsis "Run commands as root") -- cgit v1.2.3 From 538d91140c9a430e4a9dd79d42710a06ba2e5012 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 25 Jan 2021 18:08:24 +0000 Subject: gnu: Add cl-trivial-arguments. * gnu/packages/lisp-xyz.scm (cl-trivial-arguments, ecl-trivial-arguments, sbcl-trivial-arguments): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 02621260dd..b9425dcb6f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3235,6 +3235,34 @@ client and server.") (define-public ecl-s-xml-rpc (sbcl-package->ecl-package sbcl-s-xml-rpc)) +(define-public sbcl-trivial-arguments + (let ((commit "ecd84ed9cf9ef8f1e873d7409e6bd04979372aa7") + (revision "1")) + (package + (name "sbcl-trivial-arguments") + (version (git-version "1.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/trivial-arguments") + (commit commit))) + (file-name (git-file-name "trivial-arguments" version)) + (sha256 + (base32 "02vaqfavhj8jqxnr68nnzvzshm8jbgcy6m9lvyv4daa6f7ihqf88")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/Shinmera/trivial-arguments") + (synopsis "Common Lisp library to retrieve a function's lambda-list") + (description + "This is a simple library to retrieve the argument list of a function.") + (license license:zlib)))) + +(define-public ecl-trivial-arguments + (sbcl-package->ecl-package sbcl-trivial-arguments)) + +(define-public cl-trivial-arguments + (sbcl-package->cl-source-package sbcl-trivial-arguments)) + (define-public sbcl-trivial-clipboard (let ((commit "afcd3743b842f5a81fc86dba60f9db59970f49c5")) (package -- cgit v1.2.3 From 582bc6a8778b14e8fd2d57aed9c6c96684b1b4db Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 25 Jan 2021 18:12:44 +0000 Subject: gnu: Add cl-ubiquitous. * gnu/packages/lisp-xyz.scm (cl-ubiquitous, ecl-ubiquitous, sbcl-ubiquitous): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b9425dcb6f..62af10cc7c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -459,6 +459,39 @@ compatible with ANSI-compliant Common Lisp implementations.") (define-public ecl-cl-ppcre (sbcl-package->ecl-package sbcl-cl-ppcre)) +(define-public sbcl-ubiquitous + (let ((commit "35eb7bd9e1b3daee1705f6b41260775180cce8af") + (revision "1")) + (package + (name "sbcl-ubiquitous") + (version (git-version "2.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/ubiquitous") + (commit commit))) + (file-name (git-file-name "ubiquitous" version)) + (sha256 + (base32 "1xlkaqmjcpkiv2xl2s2pvvrv976dlc846wm16s1lj62iy1315i49")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("bordeaux-threads" ,sbcl-bordeaux-threads))) + (home-page "https://shinmera.github.io/ubiquitous/") + (synopsis "Application configuration mechanism for Common Lisp") + (description + "@code{UBIQUITOUS} is a very easy-to-use library for persistent +configuration storage. It automatically takes care of finding a suitable place +to save your data, and provides simple functions to access and modify the data +within.") + (license license:zlib)))) + +(define-public ecl-ubiquitous + (sbcl-package->ecl-package sbcl-ubiquitous)) + +(define-public cl-ubiquitous + (sbcl-package->cl-source-package sbcl-ubiquitous)) + (define-public sbcl-uax-15 (package (name "sbcl-uax-15") -- cgit v1.2.3 From 51418c32d95d8188d8877616829f26479f1135c6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 25 Jan 2021 17:43:03 +0000 Subject: gnu: Add eye. * gnu/packages/astronomy.scm (eye): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/astronomy.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 45d62cd855..775a937907 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -88,6 +88,29 @@ in FITS files.") (license (license:non-copyleft "file://License.txt" "See License.txt in the distribution.")))) +(define-public eye + (package + (name "eye") + (version "1.4.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.astromatic.net/download/eye/" + "eye-" version ".tar.gz")) + (sha256 + (base32 "092qhzcbrkcfidbx4bv9wz42w297n80jk7a6kwyi9a3fjfz81d7k")))) + (build-system gnu-build-system) + (home-page "https://www.astromatic.net/software/eye") + (synopsis "Small image feature detector using machine learning") + (description + "In EyE (Enhance Your Extraction) an artificial neural network connected to +pixels of a moving window (retina) is trained to associate these input stimuli +to the corresponding response in one or several output image(s). The resulting +filter can be loaded in SExtractor to operate complex, wildly non-linear filters +on astronomical images. Typical applications of EyE include adaptive filtering, +feature detection and cosmetic corrections.") + (license license:cecill))) + (define-public wcslib (package (name "wcslib") -- cgit v1.2.3 From b965b2f004d522acea17f85780e1e44c882e24b3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 26 Jan 2021 14:20:12 +0100 Subject: gnu: pybind11: Update to 2.6.1. * gnu/packages/python-xyz.scm (pybind11): Update to 2.6.1. --- 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 d08e23936c..6fac4871e9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18839,7 +18839,7 @@ user-space file systems in Python.") (define-public pybind11 (package (name "pybind11") - (version "2.4.3") + (version "2.6.1") (source (origin (method git-fetch) (uri (git-reference @@ -18847,7 +18847,7 @@ user-space file systems in Python.") (commit (string-append "v" version)))) (sha256 (base32 - "0k89w4bsfbpzw963ykg1cyszi3h3nk393qd31m6y46pcfxkqh4rd")) + "1wh5b1xnywzxwxkyac2wvyqwzmy1qxs341jjk820r7b825wn6yad")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (native-inputs -- cgit v1.2.3 From ffd0e54376862901962b01b8eb612e0bb191a627 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 26 Jan 2021 00:23:02 -0500 Subject: gnu: mercurial: Update to 5.6.1. This fixes the build on Python 3.9. * gnu/packages/version-control.scm (mercurial): Update to 5.6.1. Delete trailing #t. [phases]{check}: Remove the "test-transaction-rollback-on-sigpipe.t" test file and add a comment. --- gnu/packages/version-control.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index f53ca9b11b..752f06dc7b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2021 Greg Hogan +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -1576,14 +1577,14 @@ execution of any hook written in any language before every commit.") (define-public mercurial (package (name "mercurial") - (version "5.5.1") + (version "5.6.1") (source (origin (method url-fetch) (uri (string-append "https://www.mercurial-scm.org/" "release/mercurial-" version ".tar.gz")) (sha256 (base32 - "0x08yjs26j88kh1bvl2g3r24lnfc023ry3i1cxfq6haray6sv5ag")))) + "1bgz8f1a7lnmh6lzcvwg6q1yx6i7yibhwy06l4k55i04957jap75")))) (build-system python-build-system) (arguments `(#:phases @@ -1596,8 +1597,7 @@ execution of any hook written in any language before every commit.") "tests/test-run-tests.t" "tests/test-transplant.t") (("/bin/sh") - (which "sh"))) - #t)) + (which "sh"))))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (with-directory-excursion "tests" @@ -1608,9 +1608,10 @@ execution of any hook written in any language before every commit.") ;; PATH from before (that's why we are building it!)? "test-hghave.t" - ;; FIXME: Why does this fail in the build container, but - ;; not in 'guix environment -C' (even without /bin/sh)? + ;; These tests fail because the program is not + ;; connected to a TTY in the build container. "test-nointerrupt.t" + "test-transaction-rollback-on-sigpipe.t" ;; FIXME: This gets killed but does not receive an interrupt. "test-commandserver.t" @@ -1639,8 +1640,7 @@ execution of any hook written in any language before every commit.") "--slowtimeout" "86400" ;; The test suite takes a long time and produces little ;; output by default. Prevent timeouts due to silence. - "-v")) - #t)))))) + "-v")))))))) ;; The following inputs are only needed to run the tests. (native-inputs `(("python-nose" ,python-nose) -- cgit v1.2.3 From 631e1f3308f5a0de80a6ed04cf587aa2a02077a5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 26 Jan 2021 17:46:49 +0100 Subject: gnu: python-wheel: Update to 0.36.2. * gnu/packages/python-xyz.scm (python-wheel): Update to 0.36.2. --- 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 6fac4871e9..b63ee6a0a2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2723,14 +2723,14 @@ with sensible defaults out of the box.") (define-public python-wheel (package (name "python-wheel") - (version "0.33.6") + (version "0.36.2") (source (origin (method url-fetch) (uri (pypi-uri "wheel" version)) (sha256 (base32 - "0ii6f34rvpjg3nmw4bc2h7fhdsy38y1h93hghncfs5akfrldmj8h")))) + "0pi4w0brz7a86ddk6pm8p6j0w6d7jgacgxm0c2dab3k5cb8yy7p1")))) (build-system python-build-system) (arguments ;; FIXME: The test suite runs "python setup.py bdist_wheel", which in turn -- cgit v1.2.3 From 3142daccbe9caf8b1189a60f2974e0c938c77abf Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 26 Jan 2021 18:15:43 +0100 Subject: gnu: python-setuptools: Update to 52.0.0. * gnu/packages/python-xyz.scm (python-setuptools): Update to 52.0.0. [source]: Update suffix in URI. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b63ee6a0a2..a9493fe31b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1123,14 +1123,14 @@ other machines, such as over the network.") (define-public python-setuptools (package (name "python-setuptools") - (version "41.0.1") + (version "52.0.0") (source (origin (method url-fetch) - (uri (pypi-uri "setuptools" version ".zip")) + (uri (pypi-uri "setuptools" version)) (sha256 (base32 - "04sns22y2hhsrwfy1mha2lgslvpjsjsz8xws7h2rh5a7ylkd28m2")) + "15ibjdjhkwgj6qbmpsxikkqdfsb1550z46fly7dm15ah4bk1wfpv")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From f85722d9d7eeed3413a2aa50f2915788451c0bcd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 26 Jan 2021 19:21:33 +0100 Subject: gnu: Add python-setuptools-scm/next. * gnu/packages/python-xyz.scm (python-setuptools-scm/next): New variable. --- gnu/packages/python-xyz.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a9493fe31b..d243083f3c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6533,6 +6533,18 @@ child application and control it as if a human were typing commands.") them as the version argument or in a SCM managed file.") (license license:expat))) +;; TODO: Merge with 'python-setuptools-scm' on the next rebuild cycle. +(define-public python-setuptools-scm/next + (package + (inherit python-setuptools-scm) + (version "5.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "setuptools_scm" version)) + (sha256 + (base32 "0ahlrxxkx2xhmxskx57gc96w3bdndflxx30304ihvm7ds136nny8")))))) + (define-public python2-setuptools-scm (package-with-python2 python-setuptools-scm)) -- cgit v1.2.3 From 832f27b4c24db28b778d609602ce40b74a58178e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 26 Jan 2021 19:55:15 +0100 Subject: gnu: sudo: Update to 1.9.5p2 [fixes CVE-2021-3156]. * gnu/packages/admin.scm (sudo): Update to 1.9.5p2. --- 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 87b0f36cc1..9b6f0fd0bd 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1415,7 +1415,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.9.5p1") + (version "1.9.5p2") (source (origin (method url-fetch) (uri @@ -1425,7 +1425,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "10kqdfbfpf3vk5ihz5gwynv4pxdf1lg6ircrlanyygb549yg7pad")) + "0y093z4f3822rc88g9asdch12nljdamp817vjxk04mca7ks2x7jk")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From d039d80deddd4f64d80c252b426f3078bf5e252e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Jan 2021 10:48:40 +0100 Subject: gnu: bind: Edit synopsis & description. * gnu/packages/dns.scm (isc-bind)[synopsys]: Use @acronym. [description]: Likewise. Edit. --- gnu/packages/dns.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 5e65eed7ed..800d2dca34 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -375,15 +375,18 @@ and BOOTP/TFTP for network booting of diskless machines.") (with-directory-excursion "fuzz" (invoke "make" "check")) #t))))) - (synopsis "Domain Name System (DNS) implementation") - (description "BIND is an implementation of the @dfn{Domain Name System} -(DNS) protocols for the Internet. It is a reference implementation of those -protocols, but it is also production-grade software, suitable for use in -high-volume and high-reliability applications. The name BIND stands for -\"Berkeley Internet Name Domain\", because the software originated in the -early 1980s at the University of California at Berkeley. The @code{utils} -output of this package contains the following DNS name servers related command -line utilities: + (synopsis "@acronym{DNS, Domain Name System} implementation") + (description "BIND implements the @acronym{DNS, Domain Name System} +protocols for the Internet. It is both a reference implementation of those +protocols and production-grade software, suitable for use in high-volume and +high-reliability applications. + +The name stands for \"Berkeley Internet Name Domain\" because the software +originated in the early 1980s at the University of California at Berkeley. + +The @code{utils} output of this package contains the following command line +utilities related to DNS name servers: + @table @code @item delv DNS lookup and validation utility -- cgit v1.2.3 From 5b4239b9f5590da1aa0c66a527b111f91b9301c3 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 26 Jan 2021 14:26:41 +0100 Subject: gnu: krita: Update to 4.4.2. * gnu/packages/kde.scm (krita): Update to 4.4.2. Signed-off-by: Leo Famulari --- gnu/packages/kde.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 2f321fc911..73be8af9b0 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2018, 2019, 2020 Hartmut Goebel ;;; Copyright © 2019, 2020 Ludovic Courtès ;;; Copyright © 2020 Marius Bakke -;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2020 Prafulla Giri ;;; Copyright © 2020 Zheng Junjie <873216071@qq.com> ;;; @@ -456,7 +456,7 @@ illustrate project schedules.") (define-public krita (package (name "krita") - (version "4.4.1") + (version "4.4.2") (source (origin (method url-fetch) (uri (string-append @@ -464,7 +464,7 @@ illustrate project schedules.") "/krita-" version ".tar.gz")) (sha256 (base32 - "05rq5hkh2lmk8hall2h9ccaav0nw8fj7vd4aff5fyp2fiq3aybbg")))) + "14lprcv7xw6r19bmylcz4c1p1jfazmza2b4m48f3x7vmdv2sx5ln")))) (build-system cmake-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 8f90c74da09010905ffa2fea8963e5b7026e6635 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 26 Jan 2021 08:56:13 +0100 Subject: gnu: gparted: Update to 1.2.0. * gnu/packages/disk.scm (gparted): Update to 1.2.0. Signed-off-by: Leo Famulari --- gnu/packages/disk.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 3139063298..c9409358db 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020 Pkill -9 ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Raghav Gururajan +;;; Copyright © 2021 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -493,14 +494,14 @@ and can dramatically shorten the lifespan of the drive if left unchecked.") (define-public gparted (package (name "gparted") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gparted/gparted/gparted-" version "/gparted-" version ".tar.gz")) (sha256 - (base32 "092rgwjh1825fal6v3yafq2wr0i61hh0a2n0j4296zn0zdx7pzp2")))) + (base32 "06f72hqx5jf2irzsmi7lgpxxj38ncixh0acb4307wyjd4mfp343c")))) (build-system glib-or-gtk-build-system) (arguments ;; Tests require access to paths outside the build container, such -- cgit v1.2.3 From 7685929e067bfe81dddf6f9955889ba6586b8122 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 26 Jan 2021 22:05:34 +0100 Subject: gnu: Add python-pikepdf. * gnu/packages/python-xyz.scm (python-pikepdf): New variable. --- gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d243083f3c..a22d6e865a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5774,6 +5774,37 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python2-olefile (package-with-python2 python-olefile)) +(define-public python-pikepdf + (package + (name "python-pikepdf") + (version "2.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pikepdf" version)) + (sha256 + (base32 "0da5s9jpp9ll952drbc77yk4rhin2w87pi45x1bybj8kwlcvg27j")))) + (build-system python-build-system) + (arguments + `(#:tests? #false)) ;require python-xmp-toolkit + (native-inputs + `(("pybind11" ,pybind11) + ("python-setuptools" ,python-setuptools) + ("python-setuptools-scm" ,python-setuptools-scm/next) + ("python-setuptools-scm-git-archive" ,python-setuptools-scm-git-archive) + ("python-toml" ,python-toml) + ("python-wheel" ,python-wheel))) + (inputs + `(("qpdf" ,qpdf))) + (propagated-inputs + `(("python-lxml" ,python-lxml) + ("python-pillow" ,python-pillow))) + (home-page "https://github.com/pikepdf/pikepdf") + (synopsis "Read and write PDFs with Python") + (description + "pikepdf is a Python library for reading and writing PDF files.") + (license license:mpl2.0))) + (define-public python-pillow (package (name "python-pillow") -- cgit v1.2.3 From 1a4f1ea1a3d11fd44b169c7ce23a511ca7b819cb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 26 Jan 2021 22:14:46 +0100 Subject: gnu: pdfarranger: Update to 1.7.0. * gnu/packages/pdf.scm (pdfarranger): Update to 1.7.0. [propagated-inputs]: Remove python-pypdf2. Add python-dateutil and python-pikepdf. --- gnu/packages/pdf.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index d03379c113..cd368ae413 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Ben Sturmfels ;;; Copyright © 2019,2020 Hartmut Goebel -;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Timotej Lazar ;;; Copyright © 2020 Maxim Cournoyer @@ -92,6 +92,7 @@ #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages tex) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) @@ -1229,7 +1230,7 @@ python-pypdf2 instead.") (define-public pdfarranger (package (name "pdfarranger") - (version "1.3.1") + (version "1.7.0") (source (origin (method git-fetch) @@ -1238,10 +1239,10 @@ python-pypdf2 instead.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1f8m8r81322i97wkqpmf7a4kiwnq244n6cnbldh03jc49vwq2kxx")))) + (base32 "0dmgmvpghsm938iznalbg8h8k17a5h3q466yfc67mcll428n4nx3")))) (build-system python-build-system) (arguments - '(#:tests? #f ;no tests + '(#:tests? #f ;no tests #:phases (modify-phases %standard-phases (add-after 'install 'wrap-for-typelib (lambda* (#:key inputs outputs #:allow-other-keys) @@ -1257,9 +1258,10 @@ python-pypdf2 instead.") (propagated-inputs `(("gtk+" ,gtk+) ("poppler" ,poppler) + ("python-dateutil" ,python-dateutil) + ("python-pikepdf" ,python-pikepdf) ("python-pycairo" ,python-pycairo) - ("python-pygobject" ,python-pygobject) - ("python-pypdf2" ,python-pypdf2))) + ("python-pygobject" ,python-pygobject))) (home-page "https://github.com/jeromerobert/pdfarranger") (synopsis "Merge, split and re-arrange pages from PDF documents") (description -- cgit v1.2.3 From 6d80e2644ad5eeb280f228a40823f4a4cd73e0b7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 26 Jan 2021 22:50:37 +0100 Subject: gnu: Add img2pdf. * gnu/packages/pdf.scm (img2pdf): New variable. --- gnu/packages/pdf.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index cd368ae413..f9d5bb5c4f 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -93,6 +93,7 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages tex) #:use-module (gnu packages time) + #:use-module (gnu packages tcl) #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) @@ -1082,6 +1083,29 @@ such as zooming, highlighting an area of the screen, and a tool to navigate the PDF pages.") (license license:gpl2))) +(define-public img2pdf + (package + (name "img2pdf") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "img2pdf" version)) + (sha256 + (base32 "1jdhmpzgj8815bhargb3xp3ydlqxwkz0mcadrflx2ga0p056kvpa")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pikepdf" ,python-pikepdf) + ("python-pillow" ,python-pillow) + ("python-tkinter" ,python "tk"))) + (home-page "https://gitlab.mister-muffin.de/josch/img2pdf") + (synopsis "Convert images to PDF via direct JPEG inclusion") + (description + "img2pdf converts images to PDF via direct JPEG inclusion. That +conversion is lossless: the image embedded in the PDF has the exact same color +information for every pixel as the input.") + (license license:lgpl3))) + (define-public fbida (package (name "fbida") -- cgit v1.2.3 From f63b8978e5c181f921bf5811c0019827adcd8e4d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 26 Jan 2021 23:44:23 +0100 Subject: gnu: pdfarranger: Complete and arrange inputs. * gnu/packages/pdf.scm (pdfarranger)[propagated-inputs]: Add img2pdf. Move poppler and gtk+... [inputs]: ...here --- gnu/packages/pdf.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index f9d5bb5c4f..281dc31c36 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -1279,9 +1279,11 @@ python-pypdf2 instead.") (native-inputs `(("intltool" ,intltool) ("python-distutils-extra" ,python-distutils-extra))) - (propagated-inputs + (inputs `(("gtk+" ,gtk+) - ("poppler" ,poppler) + ("poppler" ,poppler))) + (propagated-inputs + `(("img2pdf" ,img2pdf) ("python-dateutil" ,python-dateutil) ("python-pikepdf" ,python-pikepdf) ("python-pycairo" ,python-pycairo) -- cgit v1.2.3 From 4d8837c196cd98cdc1aec17a59b5c2aa90d0e261 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 7 Jan 2021 21:54:37 +0000 Subject: gnu: folly: Update to 2021.01.25.00. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cpp.scm (folly): Update to 2021.01.25.00. Signed-off-by: Ludovic Courtès --- gnu/packages/cpp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index ca8f7a9f80..73a3ceb2df 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Alexandros Theodotou -;;; Copyright © 2020 Greg Hogan +;;; Copyright © 2020, 2021 Greg Hogan ;;; Copyright © 2020 Brett Gilio ;;; ;;; This file is part of GNU Guix. @@ -689,7 +689,7 @@ standard GNU style syntax for options.") (define-public folly (package (name "folly") - (version "2020.10.05.00") + (version "2021.01.25.00") (source (origin (method git-fetch) (uri (git-reference @@ -698,7 +698,7 @@ standard GNU style syntax for options.") (file-name (git-file-name name version)) (sha256 (base32 - "0q4w4cvjxffc462hvs8h4zryq4965j7015zvkwagcm6cj6wmz3cn")))) + "14dl1g6vf7mc90mcync5h2lp14fwcx8n9h91pmiq6rfgv1fjjrwz")))) (build-system cmake-build-system) (arguments '(;; Tests must be explicitly enabled -- cgit v1.2.3 From 5e163ba00969e7ba05897840a1199b967252b4ae Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 26 Jan 2021 23:44:27 +0100 Subject: gnu: guile-gcrypt: Add libgcrypt to 'native-inputs'. * gnu/packages/gnupg.scm (guile-gcrypt)[arguments]: Remove. [native-inputs]: Add LIBGCRYPT. --- gnu/packages/gnupg.scm | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index a2da166bb4..4793618156 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2013, 2015, 2018 Andreas Enge ;;; Copyright © 2014, 2018 Eric Bavier ;;; Copyright © 2014, 2015, 2016, 2020 Mark H Weaver @@ -433,26 +433,13 @@ gpgpme starting with version 1.7.") "0m29fg4pdfifnqqsa437zc5c1bhbfh62mc69ba25ak4x2cla41ll")) (file-name (git-file-name name version)))) (build-system gnu-build-system) - (arguments - ;; When cross-compiling, the bash script libgcrypt-config provided by - ;; libgcrypt must be accessible during configure phase. - `(,@(if (%current-target-system) - '(#:phases - (modify-phases %standard-phases - (add-before 'configure 'add-libgrypt-config - (lambda _ - (setenv "PATH" (string-append - (assoc-ref %build-inputs "libgcrypt") - "/bin:" - (getenv "PATH"))) - #t)))) - '()))) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) ("automake" ,automake) ("texinfo" ,texinfo) - ("guile" ,guile-3.0))) + ("guile" ,guile-3.0) + ("libgcrypt" ,libgcrypt))) ;for 'libgcrypt-config' (inputs `(("guile" ,guile-3.0) ("libgcrypt" ,libgcrypt))) -- cgit v1.2.3 From 181444fe3f7dd1f6c7f7d50f699774db2b2323ca Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 26 Jan 2021 23:49:57 +0100 Subject: gnu: guile-gcrypt: Build sequentially and reproducibly. * gnu/packages/gnupg.scm (guile-gcrypt)[arguments]: New field. --- gnu/packages/gnupg.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 4793618156..4db7b4ca86 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -433,6 +433,10 @@ gpgpme starting with version 1.7.") "0m29fg4pdfifnqqsa437zc5c1bhbfh62mc69ba25ak4x2cla41ll")) (file-name (git-file-name name version)))) (build-system gnu-build-system) + (arguments + ;; Work around to achieve reproducible + ;; builds. + '(#:parallel-build? #f)) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) -- cgit v1.2.3 From cf5e0b2636379cfe1cce67f928a2867efb088865 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 25 Jan 2021 15:49:02 -0500 Subject: gnu: icecat: Update to 78.7.0-guix0-preview1 [security fixes]. Includes fixes for CVE-2021-23953, CVE-2021-23954, CVE-2020-26976, CVE-2021-23960, and CVE-2021-23964. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update gnuzilla commit, base version, and hashes. * gnu/packages/patches/icecat-makeicecat.patch: Adapt to new version. --- gnu/packages/gnuzilla.scm | 12 ++++++------ gnu/packages/patches/icecat-makeicecat.patch | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 0ef0c7f673..b5d5013066 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -694,8 +694,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "78.6.1-guix0-preview1") -(define %icecat-build-id "20210107000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "78.7.0-guix0-preview1") +(define %icecat-build-id "20210126000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -717,11 +717,11 @@ from forcing GEXP-PROMISE." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "1kp75838a38x4h0w98qn01g9asn7jlgm64bz7n70353bnr6bf1qd")))) + "0hqnc98k4irq0lsp154binrl0c6kxy6xmab3ss9jwx6d53dl380s")))) - (upstream-icecat-base-version "78.6.1") ; maybe older than base-version + (upstream-icecat-base-version "78.7.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "10ca84bd9d255caeed506ef36bd3dbe2ad6375ab") + (gnuzilla-commit "abfe5eebaca3c2787f1a9505669393674493c177") (gnuzilla-source (origin (method git-fetch) @@ -733,7 +733,7 @@ from forcing GEXP-PROMISE." (string-take gnuzilla-commit 8))) (sha256 (base32 - "07i3pfbzprnmzrilsh13jjrrk0jixpb9nrrqxzzdvzr2gz06vw29")))) + "00ws3540x5whpicc5fx4k949ff73cqvajz6jp13ahn49wqdads47")))) ;; 'search-patch' returns either a valid file name or #f, so wrap it ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index 3f16880260..edd1ced257 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -25,7 +25,7 @@ index 8be2362..48716f2 100755 -wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc -gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 -gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc --echo -n 0d07b74cb66b94018e3d7f11531f95c76a955e0016a3c401241d0d85062ae7ce firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +-echo -n 1aa041db28cd742e93d663a9da8defd33040b38d8b9470350538473251621643 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - - -echo Extracting Firefox tarball -tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -37,7 +37,7 @@ index 8be2362..48716f2 100755 +# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc +# gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 +# gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc -+# echo -n 0d07b74cb66b94018e3d7f11531f95c76a955e0016a3c401241d0d85062ae7ce firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - ++# echo -n 1aa041db28cd742e93d663a9da8defd33040b38d8b9470350538473251621643 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +# +# echo Extracting Firefox tarball +# tar -xf firefox-${FFVERSION}esr.source.tar.xz -- cgit v1.2.3 From fa3461428140532283f6133ec599d6e7afabe5f8 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Wed, 27 Jan 2021 10:09:58 +0100 Subject: gnu: icedove: Update to 78.7.0 [fixes CVE-2020-15685]. * gnu/packages/gnuzilla.scm (%icedove-build-id, icedove): Update. --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index b5d5013066..93e3690bb0 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1305,11 +1305,11 @@ standards of the IceCat project.") (cpe-version . ,(first (string-split version #\-))))))) ;; Update this together with icecat! -(define %icedove-build-id "20210111000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-build-id "20210126000000") ;must be of the form YYYYMMDDhhmmss (define-public icedove (package (name "icedove") - (version "78.6.1") + (version "78.7.0") (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) @@ -1589,7 +1589,7 @@ standards of the IceCat project.") ;; in the Thunderbird release tarball. We don't use the release ;; tarball because it duplicates the Icecat sources and only adds the ;; "comm" directory, which is provided by this repository. - ,(let ((changeset "f99e82f3f3cae6af48006c39fceb3beeabccd6f6")) + ,(let ((changeset "d4c4077a3ef9b3221984f2d0b42f1d96c35776e8")) (origin (method hg-fetch) (uri (hg-reference @@ -1598,7 +1598,7 @@ standards of the IceCat project.") (file-name (string-append "thunderbird-" version "-checkout")) (sha256 (base32 - "0mrar1qsvvlcggzz54nxi70jzk19mq42585905kb5n90ikr9q2q7"))))) + "0yabs4zlwb5jvlyk45lbw1nzfmra1f8bbwvwcwxjs1a8wcmrmb39"))))) ("autoconf" ,autoconf-2.13) ("cargo" ,rust-1.41 "cargo") ("clang" ,clang) -- cgit v1.2.3 From 3968722b7978c1834affbd9a4b3ad3dde62bc776 Mon Sep 17 00:00:00 2001 From: BonfaceKilz Date: Tue, 26 Jan 2021 13:42:32 +0300 Subject: gnu: guile-redis: Update to 2.0.0. * gnu/packages/guile-xyz.scm (guile-redis): Update to 2.0.0. (guile2.0-redis)[arguments]: Add phase to adjust module imports. This patch was co-authored with Efraim Flashner. Signed-off-by: Efraim Flashner --- gnu/packages/guile-xyz.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index c2d853f006..0526cf8ad8 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Alex Sassmannshausen ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2016 Erik Edrosa -;;; Copyright © 2016, 2019, 2020 Eraim Flashner +;;; Copyright © 2016, 2019, 2020, 2021 Eraim Flashner ;;; Copyright © 2016, 2017 Alex Kost ;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira ;;; Copyright © 2016 Amirouche @@ -33,6 +33,7 @@ ;;; Copyright © 2020 Mike Rosset ;;; Copyright © 2020 Leo Prikler ;;; Copyright © 2020 pukkamustard +;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; ;;; This file is part of GNU Guix. ;;; @@ -2430,7 +2431,7 @@ interface for reading articles in any format.") (define-public guile-redis (package (name "guile-redis") - (version "1.3.0") + (version "2.0.0") (home-page "https://github.com/aconchillo/guile-redis") (source (origin (method git-fetch) @@ -2440,7 +2441,7 @@ interface for reading articles in any format.") (file-name (git-file-name name version)) (sha256 (base32 - "14izs8daxh7pb7vwpxi5g427qa31137jkaxrb1cy5rpjkwchy723")))) + "1zk2x37lw6ygf7rwy71svnsian8lj51axpxmm66ah7dazn69swlm")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -2464,6 +2465,18 @@ key-value cache and store.") (package (inherit guile-redis) (name "guile2.0-redis") + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + ;; put-string is in (rnrs io ports) in guile2.0, + ;; not in (ice-9 textual-ports) + (substitute* "redis/utils.scm" + (("\\(ice-9 textual-ports\\)") + "(rnrs io ports)")) + #t))) + ,@(package-arguments guile-redis))) (native-inputs `(("guile" ,guile-2.0) ,@(alist-delete "guile" (package-native-inputs guile-redis)))))) -- cgit v1.2.3 From f048c4f38b24bbaff4d098e8c8cb81cb11041d9c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 27 Jan 2021 11:16:25 +0200 Subject: gnu: guile-redis: Remove guild warnings. * gnu/packages/guile-xyz.scm (guile-redis)[arguments]: Pass GUILE_AUTO_COMPILE=0 as make-flag to prevent guild warnings. --- gnu/packages/guile-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 0526cf8ad8..c6f25bbdfb 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2443,6 +2443,8 @@ interface for reading articles in any format.") (base32 "1zk2x37lw6ygf7rwy71svnsian8lj51axpxmm66ah7dazn69swlm")))) (build-system gnu-build-system) + (arguments + '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 82f4d5d2cd8a7b78d3bf4f59a462df873a997b66 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 26 Jan 2021 23:16:20 +0000 Subject: gnu: Add cl-modularize-hooks. * gnu/packages/lisp-xyz.scm (cl-modularize-hooks, ecl-modularize-hooks, sbcl-modularize-hooks): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 62af10cc7c..763d6fe50f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9787,6 +9787,40 @@ tie modules together in functionality, hook into each other and so on.") (define-public cl-modularize (sbcl-package->cl-source-package sbcl-modularize)) +(define-public sbcl-modularize-hooks + (let ((commit "e0348ed3ffd59a9ec31ca4ab28289e748bfbf96a") + (revision "1")) + (package + (name "sbcl-modularize-hooks") + (version (git-version "1.0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/modularize-hooks") + (commit commit))) + (file-name (git-file-name "modularize-hooks" version)) + (sha256 + (base32 "12kjvin8hxidwkzfb7inqv5b6g5qzcssnj9wc497v2ixc56fqdz7")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("closer-mop" ,sbcl-closer-mop) + ("lambda-fiddle" ,sbcl-lambda-fiddle) + ("modularize" ,sbcl-modularize) + ("trivial-arguments" ,sbcl-trivial-arguments))) + (home-page "https://shinmera.github.io/modularize-hooks/") + (synopsis "Programmatical interfaces extension for Modularize") + (description + "This is a simple extension to @code{MODULARIZE} that allows modules to +define and trigger hooks, which other modules can hook on to.") + (license license:zlib)))) + +(define-public ecl-modularize-hooks + (sbcl-package->ecl-package sbcl-modularize-hooks)) + +(define-public cl-modularize-hooks + (sbcl-package->cl-source-package sbcl-modularize-hooks)) + (define-public sbcl-moptilities (let ((commit "a436f16b357c96b82397ec018ea469574c10dd41")) (package -- cgit v1.2.3 From 3420075351713edcd19661227638117f32eb91aa Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 26 Jan 2021 23:24:56 +0000 Subject: gnu: Add cl-modularize-interfaces. * gnu/packages/lisp-xyz.scm (cl-modularize-interfaces, ecl-modularize-interfaces, sbcl-modularize-interfaces): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 763d6fe50f..8c0e0f7c05 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9821,6 +9821,41 @@ define and trigger hooks, which other modules can hook on to.") (define-public cl-modularize-hooks (sbcl-package->cl-source-package sbcl-modularize-hooks)) +(define-public sbcl-modularize-interfaces + (let ((commit "96353657afb8c7aeba7ef5b51eb04c5ed3bcb6ef") + (revision "1")) + (package + (name "sbcl-modularize-interfaces") + (version (git-version "0.9.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/modularize-interfaces") + (commit commit))) + (file-name (git-file-name "modularize-interfaces" version)) + (sha256 + (base32 "0bjf4wy39cwf75m7vh0r7mmcchs09yz2lrbyap98hnq8blq70fhc")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("lambda-fiddle" ,sbcl-lambda-fiddle) + ("modularize" ,sbcl-modularize) + ("trivial-arguments" ,sbcl-trivial-arguments) + ("trivial-indent" ,sbcl-trivial-indent))) + (home-page "https://shinmera.github.io/modularize-interfaces/") + (synopsis "Programmatical interfaces extension for Modularize") + (description + "This is an extension to @code{MODULARIZE} that allows your application +to define interfaces in-code that serve both as a primary documentation and as +compliance control.") + (license license:zlib)))) + +(define-public ecl-modularize-interfaces + (sbcl-package->ecl-package sbcl-modularize-interfaces)) + +(define-public cl-modularize-interfaces + (sbcl-package->cl-source-package sbcl-modularize-interfaces)) + (define-public sbcl-moptilities (let ((commit "a436f16b357c96b82397ec018ea469574c10dd41")) (package -- cgit v1.2.3 From eccdc91e2447f61722b0945c9229020ad1660dcd Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 27 Jan 2021 10:23:12 +0100 Subject: gnu: sbcl-modularize-hooks: Fix synopsis. * gnu/packages/lisp-xyz.scm (sbcl-modularize-hooks)[synopsis]: Fix it. --- 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 8c0e0f7c05..73ac0dcb80 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9809,7 +9809,7 @@ tie modules together in functionality, hook into each other and so on.") ("modularize" ,sbcl-modularize) ("trivial-arguments" ,sbcl-trivial-arguments))) (home-page "https://shinmera.github.io/modularize-hooks/") - (synopsis "Programmatical interfaces extension for Modularize") + (synopsis "Generic hooks and triggers extension for Modularize") (description "This is a simple extension to @code{MODULARIZE} that allows modules to define and trigger hooks, which other modules can hook on to.") -- cgit v1.2.3 From 1aee32a26e1a96dd457fcf62f97f514c7a562475 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 27 Jan 2021 00:11:51 +0000 Subject: gnu: Add missfits. * gnu/packages/astronomy.scm (missfits): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/astronomy.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 775a937907..95231e1837 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -421,6 +421,33 @@ standard astronomy libraries: @end itemize\n") (license license:gpl2+)))) +(define-public missfits + (package + (name "missfits") + (version "2.8.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.astromatic.net/download/missfits/" + "missfits-" version ".tar.gz")) + (sha256 + (base32 "04jrd7fsvzr14vdmwgj2f6v97gdcfyjyz6jppml3ghr9xh12jxv5")))) + (build-system gnu-build-system) + (home-page "https://www.astromatic.net/software/missfits") + (synopsis "FITS files Maintenance program") + (description + "MissFITS is a program that performs basic maintenance and packaging tasks +on FITS files: + +@itemize +@item add/edit FITS header keywords +@item split/join Multi-Extension-FITS (MEF) files +@item unpack/pack FITS data-cubes +@item create/check/update FITS checksums, using R. Seaman's protocol + (see http://www.adass.org/adass/proceedings/adass94/seamanr.html) +@end itemize\n") + (license license:gpl3+))) + (define-public xplanet (package (name "xplanet") -- cgit v1.2.3 From 09bba548bf09dcfb958bf1be28bc426458c00a40 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 27 Jan 2021 10:59:55 +0100 Subject: gnu: sbcl-slynk: Fix version number check. * gnu/packages/lisp-xyz.scm (sbcl-slynk)[source]: Don't move files around since this is not required. [arguments]: Re-enable tests. There is none at the moment, but they might get added in the future. Don't list systems since they are found automatically. Moving `slynk.lisp' had the detrimental side-effect to break `sly-version-string' which expects `sly.el' to be in the parent directory. As a result, using `sly-connect' from Emacs would prompt the user: [sly] Versions differ: 1.0.43 (sly) vs. nil (slynk). Continue? (y or n) even though the Slynk version is correct. Maybe there was a need for moving files around in the past, but since our ASDF build system got revamped, all systems are now automatically found. Thus we can leave the files where they are, which fixes the version number check. --- gnu/packages/lisp-xyz.scm | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 73ac0dcb80..bc959502be 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -832,40 +832,11 @@ antialiased TrueType font rendering using CLX and XRender extension.") (commit commit))) (sha256 (base32 "0vv185gz3rkfng5y79dijfnc11p92qdz2kdza05avjbpqfs6l0zn")) - (file-name (git-file-name "slynk" version)) - (modules '((guix build utils) - (ice-9 ftw))) - (snippet - '(begin - ;; Move the contribs into the main source directory for easier - ;; access - (substitute* "slynk/slynk.asd" - (("\\.\\./contrib") - "contrib")) - (rename-file "contrib" "slynk/contrib") - ;; Move slynk's contents into the base directory for easier - ;; access - (for-each (lambda (file) - (unless (string-prefix? "." file) - (rename-file (string-append "slynk/" file) - (string-append "./" (basename file))))) - (scandir "slynk")) - #t)))) + (file-name (git-file-name "slynk" version)))) (build-system asdf-build-system/sbcl) (outputs '("out" "image")) (arguments - `(#:tests? #f ; No test suite - #:asd-systems '("slynk" - "slynk/arglists" - "slynk/fancy-inspector" - "slynk/package-fu" - "slynk/mrepl" - "slynk/trace-dialog" - "slynk/profiler" - "slynk/stickers" - "slynk/indentation" - "slynk/retro") - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'create-asdf-configuration 'build-image (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From bde77a83243679870907e5d8f8132958a00a7f52 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 27 Jan 2021 12:28:01 +0100 Subject: gnu: emacs-helm-sly: Update to 0.7.1. * gnu/packages/emacs-xyz.scm (emacs-helm-sly): Update to 0.7.1. --- 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 9e276d9d26..8e87f88663 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20290,7 +20290,7 @@ correctly.") (define-public emacs-helm-sly (package (name "emacs-helm-sly") - (version "0.7.0") + (version "0.7.1") (source (origin (method git-fetch) (uri (git-reference @@ -20299,7 +20299,7 @@ correctly.") (file-name (git-file-name name version)) (sha256 (base32 - "090vq8c4scf9byn8xic71b02n4c8frhz1y1x1brxn6iar44dmzm5")))) + "12w1j1irgv6gy48zb4xi28ryan3fxd9kaay42798am5i1xa0yjjm")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm) -- cgit v1.2.3 From dbcd2050500c932190d710cee43f5e14f0fd59db Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 14 Jan 2021 16:27:39 -0500 Subject: gnu: python-xyz: Move a few modules to (gnu packages python-build). * gnu/packages/python-xyz.scm (python-pep517): Inherit from python-pep517-bootstrap. Remove the inherited common fields. (python-poetry-core, python-wheel) (python-toml): Move to ... * gnu/packages/python-build.scm: ... here, a new module. (python-pep517-bootstrap): New package. * gnu/local.mk (GNU_SYSTEM_MODULES): Register the new module. --- gnu/local.mk | 1 + gnu/packages/bittorrent.scm | 1 + gnu/packages/check.scm | 1 + gnu/packages/finance.scm | 1 + gnu/packages/machine-learning.scm | 1 + gnu/packages/protobuf.scm | 1 + gnu/packages/python-build.scm | 134 ++++++++++++++++++++++++++++++++++++++ gnu/packages/python-crypto.scm | 1 + gnu/packages/python-web.scm | 1 + gnu/packages/python-xyz.scm | 94 +------------------------- gnu/packages/sphinx.scm | 1 + gnu/packages/version-control.scm | 1 + gnu/packages/virtualization.scm | 1 + 13 files changed, 148 insertions(+), 91 deletions(-) create mode 100644 gnu/packages/python-build.scm (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index c631e449d1..cc9b47b493 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -460,6 +460,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/purescript.scm \ %D%/packages/pv.scm \ %D%/packages/python.scm \ + %D%/packages/python-build.scm \ %D%/packages/python-check.scm \ %D%/packages/python-compression.scm \ %D%/packages/python-crypto.scm \ diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 08e61d7ba2..29b0d62ad2 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -55,6 +55,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index d9a1fb3acf..98b5bb293f 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -67,6 +67,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages time) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 8ead37beb3..1798ad82bc 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -92,6 +92,7 @@ #:use-module (gnu packages popt) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 920b5d82ed..a3084c17e2 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -74,6 +74,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-science) #:use-module (gnu packages python-web) diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index a414bc6bbb..61dee46d43 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages libevent) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-xyz) #:use-module (gnu packages ruby)) diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm new file mode 100644 index 0000000000..b0940b67f3 --- /dev/null +++ b/gnu/packages/python-build.scm @@ -0,0 +1,134 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2015, 2020 Efraim Flashner +;;; Copyright © 2016 Leo Famulari +;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Tanguy Le Carrour +;;; Copyright © 2018 Maxim Cournoyer +;;; +;;; 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 python-build) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system python) + #:use-module (guix download) + #:use-module (guix packages)) + +;;; Commentary: +;;; +;;; Python packages to build... Python packages. Since they are bound to be +;;; relied on by many, their dependencies should be kept minimal, and this +;;; module should not depend on other modules containing Python packages. +;;; +;;; Code: + +(define-public python-wheel + (package + (name "python-wheel") + (version "0.33.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "wheel" version)) + (sha256 + (base32 + "0ii6f34rvpjg3nmw4bc2h7fhdsy38y1h93hghncfs5akfrldmj8h")))) + (build-system python-build-system) + (arguments + ;; FIXME: The test suite runs "python setup.py bdist_wheel", which in turn + ;; fails to find the newly-built bdist_wheel library, even though it is + ;; available on PYTHONPATH. What search path is consulted by setup.py? + '(#:tests? #f)) + (home-page "https://bitbucket.org/pypa/wheel/") + (synopsis "Format for built Python packages") + (description + "A wheel is a ZIP-format archive with a specially formatted filename and +the @code{.whl} extension. It is designed to contain all the files for a PEP +376 compatible install in a way that is very close to the on-disk format. Many +packages will be properly installed with only the @code{Unpack} step and the +unpacked archive preserves enough information to @code{Spread} (copy data and +scripts to their final locations) at any later time. Wheel files can be +installed with a newer @code{pip} or with wheel's own command line utility.") + (license license:expat))) + +(define-public python2-wheel + (package-with-python2 python-wheel)) + +;;; XXX: Not really at home, but this seems the best place to prevent circular +;;; module dependencies. +(define-public python-toml + (package + (name "python-toml") + (version "0.10.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "toml" version)) + (sha256 + (base32 + "03wbqm5cn685cwx2664hjdpz370njl7lf0yal8s0dkp5w4mn2swj")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;no tests suite in release + (home-page "https://github.com/uiri/toml") + (synopsis "Library for TOML") + (description + "@code{toml} is a library for parsing and creating Tom's Obvious, Minimal +Language (TOML) configuration files.") + (license license:expat))) + +(define-public python-pep517-bootstrap + (hidden-package + (package + (name "python-pep517-bootstrap") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pep517" version)) + (sha256 + (base32 + "0zqidxah03qpnp6zkg3zd1kmd5f79hhdsfmlc0cldaniy80qddxf")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;to avoid circular dependencies + (propagated-inputs + `(("python-toml" ,python-toml) + ("python-wheel" ,python-wheel))) + (home-page "https://github.com/pypa/pep517") + (synopsis "Wrappers to build Python packages using PEP 517 hooks") + (description + "Wrappers to build Python packages using PEP 517 hooks.") + (license license:expat)))) + +(define-public python-poetry-core + (package + (name "python-poetry-core") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "poetry-core" version)) + (sha256 + (base32 "1mgv276h1iphn5fqhp2sgkgd5d0c39hs33vgaf157x5ri7rlyrka")))) + (build-system python-build-system) + (home-page "https://github.com/python-poetry/poetry-core") + (synopsis "Poetry PEP 517 build back-end") + (description + "The @code{poetry-core} module provides a PEP 517 build back-end +implementation developed for Poetry. This project is intended to be +a light weight, fully compliant, self-contained package allowing PEP 517 +compatible build front-ends to build Poetry managed projects.") + (license license:expat))) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 486cc48457..c3ed58c424 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -54,6 +54,7 @@ #:use-module (gnu packages password-utils) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-compression) #:use-module (gnu packages python-web) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 622f5fc6e2..c8ad94ae49 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -75,6 +75,7 @@ #:use-module (gnu packages libffi) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-compression) #:use-module (gnu packages python-crypto) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a22d6e865a..4b8e538168 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -164,6 +164,7 @@ #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-compression) #:use-module (gnu packages python-crypto) @@ -2720,38 +2721,6 @@ with sensible defaults out of the box.") (base32 "0njsm0wn31l21bi118g5825ma5sa3rwn7v2x4wjd7yiiahkri337")))) (arguments `()))) -(define-public python-wheel - (package - (name "python-wheel") - (version "0.36.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "wheel" version)) - (sha256 - (base32 - "0pi4w0brz7a86ddk6pm8p6j0w6d7jgacgxm0c2dab3k5cb8yy7p1")))) - (build-system python-build-system) - (arguments - ;; FIXME: The test suite runs "python setup.py bdist_wheel", which in turn - ;; fails to find the newly-built bdist_wheel library, even though it is - ;; available on PYTHONPATH. What search path is consulted by setup.py? - '(#:tests? #f)) - (home-page "https://bitbucket.org/pypa/wheel/") - (synopsis "Format for built Python packages") - (description - "A wheel is a ZIP-format archive with a specially formatted filename and -the @code{.whl} extension. It is designed to contain all the files for a PEP -376 compatible install in a way that is very close to the on-disk format. Many -packages will be properly installed with only the @code{Unpack} step and the -unpacked archive preserves enough information to @code{Spread} (copy data and -scripts to their final locations) at any later time. Wheel files can be -installed with a newer @code{pip} or with wheel's own command line utility.") - (license license:expat))) - -(define-public python2-wheel - (package-with-python2 python-wheel)) - (define-public python-vcversioner (package (name "python-vcversioner") @@ -4062,27 +4031,6 @@ which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.") (define-public python2-feedgenerator (package-with-python2 python-feedgenerator)) -(define-public python-toml - (package - (name "python-toml") - (version "0.10.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "toml" version)) - (sha256 - (base32 - "03wbqm5cn685cwx2664hjdpz370njl7lf0yal8s0dkp5w4mn2swj")))) - (build-system python-build-system) - (arguments - `(#:tests? #f)) ;no tests suite in release - (home-page "https://github.com/uiri/toml") - (synopsis "Library for TOML") - (description - "@code{toml} is a library for parsing and creating Tom's Obvious, Minimal -Language (TOML) configuration files.") - (license license:expat))) - (define-public python-jsonrpc-server (package (name "python-jsonrpc-server") @@ -8308,16 +8256,8 @@ PEP 8.") (define-public python-pep517 (package + (inherit python-pep517-bootstrap) (name "python-pep517") - (version "0.9.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pep517" version)) - (sha256 - (base32 - "0zqidxah03qpnp6zkg3zd1kmd5f79hhdsfmlc0cldaniy80qddxf")))) - (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -8333,15 +8273,7 @@ PEP 8.") `(("python-mock" ,python-mock) ("python-pytest" ,python-pytest) ("python-testpath" ,python-testpath))) - (propagated-inputs - `(("python-toml" ,python-toml) - ("python-wheel" ,python-wheel))) - (home-page "https://github.com/pypa/pep517") - (synopsis "Wrappers to build Python packages using PEP 517 hooks") - (description - "Wrappers to build Python packages using PEP 517 hooks.") - (properties `((python2-variant . ,(delay python2-pep517)))) - (license license:expat))) + (properties `((python2-variant . ,(delay python2-pep517)))))) ;; Skip the tests so we don't create a cyclical dependency with pytest. (define-public python2-pep517 @@ -13222,26 +13154,6 @@ powerful API: thread-safety; decorator syntax; support for memcached, redis, database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") (license license:expat))) -(define-public python-poetry-core - (package - (name "python-poetry-core") - (version "1.0.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "poetry-core" version)) - (sha256 - (base32 "1mgv276h1iphn5fqhp2sgkgd5d0c39hs33vgaf157x5ri7rlyrka")))) - (build-system python-build-system) - (home-page "https://github.com/python-poetry/poetry-core") - (synopsis "Poetry PEP 517 build back-end") - (description - "The @code{poetry-core} module provides a PEP 517 build back-end -implementation developed for Poetry. This project is intended to be -a light weight, fully compliant, self-contained package allowing PEP 517 -compatible build front-ends to build Poetry managed projects.") - (license license:expat))) - (define-public poetry (package (name "poetry") diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 3531ed3bdf..e666456e4a 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages graphviz) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages time)) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 752f06dc7b..afbae86772 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -98,6 +98,7 @@ #:use-module (gnu packages perl-check) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 2262aa6197..8da57cf6ab 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -87,6 +87,7 @@ #:use-module (gnu packages polkit) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) -- cgit v1.2.3 From 3ab7e15cc5802251d3a668d6eed9a12eb6befdb3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 15 Jan 2021 07:57:03 -0500 Subject: gnu: Add python-pypa-build. * gnu/packages/python-build.scm (python-pypa-build): New variable. --- gnu/packages/python-build.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index b0940b67f3..65b90ddf40 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Tanguy Le Carrour -;;; Copyright © 2018 Maxim Cournoyer +;;; Copyright © 2018, 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -113,6 +113,32 @@ Language (TOML) configuration files.") "Wrappers to build Python packages using PEP 517 hooks.") (license license:expat)))) +;;; The name 'python-pypa-build' is chosen rather than 'python-build' to avoid +;;; a name clash with python-build from (guix build-system python). +(define-public python-pypa-build + (package + (name "python-pypa-build") + (version "0.1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "build" version)) + (sha256 + (base32 + "1d6m21lijwm04g50nwgsgj7x3vhblzw7jv05ah8psqgzk20bbch8")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;to tests in the PyPI release + (propagated-inputs + `(("python-pep517", python-pep517-bootstrap) + ("python-toml" ,python-toml))) + (home-page "https://pypa-build.readthedocs.io/en/latest/") + (synopsis "Simple Python PEP 517 package builder") + (description "The @command{build} command invokes the PEP 517 hooks to +build a distribution package. It is a simple build tool and does not perform +any dependency management. It aims to keep dependencies to a minimum, in +order to make bootstrapping easier.") + (license license:expat))) + (define-public python-poetry-core (package (name "python-poetry-core") -- cgit v1.2.3 From d8aa4444688ce244d2556630c3f7cfe739e01310 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 1 Jan 2021 19:10:34 +0100 Subject: gnu: Add ugrep. * gnu/packages/search.scm (ugrep): New Variable. --- gnu/packages/search.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index e261e64a7f..d458747872 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Adam Massmann +;;; Copyright © 2020 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ #:select (gpl2 gpl2+ gpl3+ lgpl2.1+ bsd-3 x11 perl-license)) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) @@ -35,7 +37,9 @@ #:use-module (gnu packages check) #:use-module (gnu packages databases) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages less) #:use-module (gnu packages linux) + #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pdf) #:use-module (gnu packages python) @@ -413,4 +417,59 @@ online libraries. It provides fast search of document text and bibliographic data and simple document and bibtex retrieval.") (license gpl3+))) +(define-public ugrep + (package + (name "ugrep") + (version "3.1.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Genivia/ugrep") + (commit (string-append "v" version)))) + (sha256 + (base32 "1ydnpdhn1mp2pnbqzvwabrp573626k89kbv97fax6y1bz2pamrg4")) + (file-name (string-append name "-" version "-checkout")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "bin") ;; pre-build executables + (for-each delete-file (find-files "tests" "^archive\\..*")) + (for-each delete-file (find-files "tests" "^.*\\.pdf$")) + (for-each delete-file (find-files "tests" "^.*\\.class$")) + #t)))) + (build-system gnu-build-system) + (inputs + `(("bzip2" ,bzip2) + ("less" ,less) + ("lz4" ,lz4) + ("lzip" ,lzip) ;; lzma + ("pcre2" ,pcre2) + ("zlib" ,zlib))) + (arguments + `(#:tests? #f ;; No script for re-building the binary test input-files + #:test-target "test" + #:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + ;; unpatch shepengs in tests + (substitute* '("tests/Hello.bat" + "tests/Hello.sh") + (("#!/gnu/store/.*/bin/sh") "#!/bin/sh"))))))) + (home-page "https://github.com/Genivia/ugrep/") + (synopsis "Faster grep with an interactive query UI") + (description "Ugrep is a ultra fast searcher of file systems, text +and binary files, source code, archives, compressed files, documents, and +more. + +While still being compatible with the standard GNU/BSD grep command-line +options, ugrep supports fuzzy search as well as structured and (adjustable) +colored output, piped through \"less\" for pagination. An interactive query +UI allows refinement and has a built-in help (press F1). Ugrep implements +multi-threaded and other techniques to speed up search, pattern-matching and +decompression. Many pre-defined regexps ease searching e.g. C typdefs or XML +attributes. Results can be output in several structured or self-defined +formats.") + (license bsd-3))) + ;;; search.scm ends here -- cgit v1.2.3 From 78cb2799066dd8bac280c3b8d2bb6a59ce55d6e3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 Jan 2021 17:48:21 +0100 Subject: gnu: mame: Update to 0.228. * gnu/packages/emulators.scm (mame): Update to 0.228. --- gnu/packages/emulators.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 1d94090f48..e52a5fc4af 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2018 David Thompson ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner -;;; Copyright © 2017, 2018, 2019, 2020 Nicolas Goaziou +;;; Copyright © 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou ;;; Copyright © 2017, 2020, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2019 Pierre Neidhardt @@ -1552,7 +1552,7 @@ This is a part of the TiLP project.") (define-public mame (package (name "mame") - (version "0.227") + (version "0.228") (source (origin (method git-fetch) @@ -1561,7 +1561,7 @@ This is a part of the TiLP project.") (commit (apply string-append "mame" (string-split version #\.))))) (file-name (git-file-name name version)) (sha256 - (base32 "0p7xhsahmkr5hh3j6hc1mpgi5z4navy77v4k35i0sgpdv1ax4y2l")) + (base32 "1xqd0b8xz9bc6ks9qbnrm7kkjcr81l0ksisvflr6gr6lxg2268xz")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit v1.2.3 From dbf4561b00263d6c0cf7f294e1a6a8bebf382b46 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 Jan 2021 18:17:33 +0100 Subject: gnu: python-wheel: Update to 0.36.2 (again) * gnu/packages/python-build.scm (python-wheel): Update to 0.36.2. This update was reverted in dbcd2050500c932190d710cee43f5e14f0fd59db. --- gnu/packages/python-build.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 65b90ddf40..1ce6a3095a 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -37,14 +37,14 @@ (define-public python-wheel (package (name "python-wheel") - (version "0.33.6") + (version "0.36.2") (source (origin (method url-fetch) (uri (pypi-uri "wheel" version)) (sha256 (base32 - "0ii6f34rvpjg3nmw4bc2h7fhdsy38y1h93hghncfs5akfrldmj8h")))) + "0pi4w0brz7a86ddk6pm8p6j0w6d7jgacgxm0c2dab3k5cb8yy7p1")))) (build-system python-build-system) (arguments ;; FIXME: The test suite runs "python setup.py bdist_wheel", which in turn -- cgit v1.2.3 From 9d5ed93162f5b843a5961becfce22ab9188e843e Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 27 Jan 2021 20:15:32 +0100 Subject: gnu: Add libjcat. * gnu/packages/compression.scm (libjcat): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/compression.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 56350089f5..d5fb7635ea 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2020 Guillaume Le Vaillant +;;; Copyright © 2020 Léo Le Bouter ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,6 +56,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (gnu packages) @@ -70,7 +72,9 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) + #:use-module (gnu packages man) #:use-module (gnu packages maths) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -78,6 +82,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) + #:use-module (gnu packages version-control) #:use-module (gnu packages xml) #:use-module (ice-9 match) #:use-module ((srfi srfi-1) #:select (last))) @@ -1025,6 +1030,41 @@ smaller than those produced by @code{Xdelta}.") ;; Some source files specify gpl2+, lgpl2+, however COPYING is gpl3. (license license:gpl3+))) +(define-public libjcat + (package + (name "libjcat") + (version "0.1.5") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/hughsie/libjcat") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rxyqikdhkh2nq1y0hy05df2kkxf3d2cp6lm5x1s5i717k6y3zy5")))) + (build-system meson-build-system) + (native-inputs + `(("gobject-introspection" ,gobject-introspection) + ("help2man" ,help2man) + ("pkg-config" ,pkg-config))) + (inputs + `(("git" ,git) + ("glib" ,glib) + ("gnupg" ,gnupg) + ("gnutls" ,gnutls) + ("gpgme" ,gpgme) + ("json-glib" ,json-glib) + ("vala" ,vala))) + (home-page "https://github.com/hughsie/libjcat") + (synopsis "Library for reading and writing Jcat files") + (description + "This library allows reading and writing gzip-compressed JSON catalog +files, which can be used to store GPG, PKCS-7 and SHA-256 checksums for each +file.") + (license license:lgpl2.1+))) + (define-public xdelta (package (name "xdelta") -- cgit v1.2.3 From 20a39cc01c4d27940b72bfbeb93e3b97283d60e7 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Wed, 27 Jan 2021 16:10:46 +0100 Subject: gnu: emacs-cider: Update to 1.0.0. * gnu/packages/emacs-xyz.scm (emacs-cider): Update to 1.0.0. Signed-off-by: Nicolas Goaziou --- 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 8e87f88663..22555a5a93 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9621,7 +9621,7 @@ target will call @code{compile} on it.") (define-public emacs-cider (package (name "emacs-cider") - (version "0.26.1") + (version "1.0.0") (source (origin (method git-fetch) @@ -9630,7 +9630,7 @@ target will call @code{compile} on it.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0m77jbxl380dp1wyj12m82bb06r80js8yxl530ryp1mwvy74f00d")))) + (base32 "143kh9k34yk0g6kdlkma6g432kmb2r9r1lhyq4irsw6d3vaql7dj")))) (build-system emacs-build-system) (arguments '(#:exclude ;don't exclude 'cider-test.el' -- cgit v1.2.3 From 046474c5a8db3398f071a617e2701010ea6e9aa5 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Wed, 27 Jan 2021 16:45:41 +0100 Subject: gnu: emacs-pulseaudio-control: Update to 0.0.1-4.a931533. * gnu/packages/emacs-xyz.scm (emacs-pulseaudio-control): Update to 0.0.1-4.a931533. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 22555a5a93..2848dc6159 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16053,8 +16053,8 @@ navigate and display hierarchy structures.") (license license:gpl3+))) (define-public emacs-pulseaudio-control - (let ((commit "7e1a87068379075a5e9ce36c64c686c03d20d379") - (revision "3")) + (let ((commit "a931533140547510decdc368f39b2d2b97ca725f") + (revision "4")) (package (name "emacs-pulseaudio-control") (version (git-version "0.0.1" revision commit)) @@ -16067,7 +16067,7 @@ navigate and display hierarchy structures.") (file-name (git-file-name name version)) (sha256 (base32 - "0wcaqyh15x56255rrj350089z15pnwixa2vf0ly6dv0hjmzmh3mr")))) + "1jvjn9jszjjapi167an49jxcvr88cvgjwykglhp4b8lwhbjfqw76")))) (build-system emacs-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 2c24aa2720a06f4fd85b41e1f507367708e7efc3 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Wed, 27 Jan 2021 17:17:08 +0100 Subject: gnu: Add emacs-templatel. * gnu/packages/emacs-xyz.scm (emacs-templatel): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2848dc6159..48a0b2a517 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9366,6 +9366,28 @@ Dust.js, React/JSX, Angularjs, ejs, etc.") (home-page "http://web-mode.org/") (license license:gpl3+))) +(define-public emacs-templatel + (package + (name "emacs-templatel") + (version "0.1.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/clarete/templatel") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1k33h503038l2bcr8gs020z2cjxfs94lamkdgv52cvd9i20d0kqq")))) + (build-system emacs-build-system) + (home-page "https://clarete.li/templatel") + (synopsis "Jinja inspired template language for Emacs Lisp") + (description + "templatel is the modern templating language. It provides variable +substitution and control flow through a clean and powerful language inspired +by Python's Jinja.") + (license license:gpl3+))) + (define-public emacs-wgrep (package (name "emacs-wgrep") -- cgit v1.2.3 From 192cb790a9547132f8b52a303863aa32e4e273e6 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 27 Jan 2021 19:52:14 +0100 Subject: gnu: Add libsmbios. * gnu/packages/hardware.scm (libsmbios): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/hardware.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 3da6759472..59f36a8135 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2021 Evgeny Pisemsky +;;; Copyright © 2021 Léo Le Bouter ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,15 +30,18 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages documentation) #:use-module (gnu packages gcc) + #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages openldap) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages protobuf) + #:use-module (gnu packages python) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -130,6 +134,47 @@ calibrated, and restored when the calibration is applied.") human-readable format and checks if it conforms to the standards.") (license license:expat)))) +(define-public libsmbios + (package + (name "libsmbios") + (version "2.4.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url (string-append "https://github.com/dell/" name)) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("perl" ,perl) + ("python" ,python))) + (inputs + `(("libxml2" ,libxml2))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'bootstrap + (lambda _ (invoke "autoreconf" "-vfi")))))) + (synopsis "Library for interacting with Dell SMBIOS tables") + (description + "libsmbios provides a library to interface with the SMBIOS tables. It +also provides extensions for proprietary methods of interfacing with Dell +specific SMBIOS tables.") + (home-page "https://github.com/dell/libsmbios") + (license + (list (license:non-copyleft "file://COPYING-OSL" + "Open Software License version 2.1") + license:gpl2+ license:bsd-3 license:boost1.0)))) + ;; Distinct from memtest86, which is obsolete. (define-public memtest86+ (package -- cgit v1.2.3 From 6be6945251dd72d4558fd6babeb7f595b332ea41 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 27 Jan 2021 19:02:22 +0000 Subject: gnu: Add shapelib * gnu/packages/geo.scm (shapelib): New variable Signed-off-by: Nicolas Goaziou --- gnu/packages/geo.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index c682613ff1..6b0b4a8007 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Christopher Baines ;;; Copyright © 2020 Felix Gruber +;;; Copyright © 2021 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -1693,6 +1694,32 @@ input file (in @code{.osm} or @code{.osm.pbf} format).") license:lgpl2.1+ license:mpl1.1)))) +(define-public shapelib + (package + (name "shapelib") + (version "1.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OSGeo/shapelib") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1lzch0jf6yqhw391phhafzw4ghmiz98zkf698h4fmq109fa2vhqd")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + (home-page "http://shapelib.maptools.org/") + (synopsis "Provides C library to write and update ESRI Shapefiles") + (description + "The Shapefile C Library provides the ability to write simple C programs +for reading, writing and updating (to a limited extent) ESRI Shapefiles, and the +associated attribute file (@file{.dbf}).") + (license license:gpl2+))) + (define-public spatialite-tools (package (name "spatialite-tools") -- cgit v1.2.3 From 5aeee07cc922bdc605bb6cb7c2cd365d2d42f4d6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 27 Jan 2021 15:52:58 -0500 Subject: gnu: VLC: Remove obsolete patch. * gnu/packages/patches/vlc-qt-5.15.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/video.scm (vlc)[source]: Remove patch. --- gnu/local.mk | 1 - gnu/packages/patches/vlc-qt-5.15.patch | 56 ---------------------------------- gnu/packages/video.scm | 1 - 3 files changed, 58 deletions(-) delete mode 100644 gnu/packages/patches/vlc-qt-5.15.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index f71d75135d..5590faf7d7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1710,7 +1710,6 @@ dist_patch_DATA = \ %D%/packages/patches/vboot-utils-fix-format-load-address.patch \ %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \ %D%/packages/patches/vboot-utils-skip-test-workbuf.patch \ - %D%/packages/patches/vlc-qt-5.15.patch \ %D%/packages/patches/vigra-python-compat.patch \ %D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \ diff --git a/gnu/packages/patches/vlc-qt-5.15.patch b/gnu/packages/patches/vlc-qt-5.15.patch deleted file mode 100644 index e986a99861..0000000000 --- a/gnu/packages/patches/vlc-qt-5.15.patch +++ /dev/null @@ -1,56 +0,0 @@ -Fix build of VLC with Qt 5.15. Otherwise it fails like this: - ------- -In file included from gui/qt/util/timetooltip.moc.cpp:10:0: -gui/qt/util/timetooltip.hpp:49:18: error: field ‘mPainterPath’ has incomplete type ‘QPainterPath’ - QPainterPath mPainterPath; - ^~~~~~~~~~~~ -In file included from /gnu/store/jsxxnsdvij5mrrv6c0kj0261k0f44xlz-qtbase-5.15.2/include/qt5/QtGui/qbrush.h:49:0, - from /gnu/store/jsxxnsdvij5mrrv6c0kj0261k0f44xlz-qtbase-5.15.2/include/qt5/QtGui/qpalette.h:46, - from /gnu/store/jsxxnsdvij5mrrv6c0kj0261k0f44xlz-qtbase-5.15.2/include/qt5/QtWidgets/qwidget.h:48, - from /gnu/store/jsxxnsdvij5mrrv6c0kj0261k0f44xlz-qtbase-5.15.2/include/qt5/QtWidgets/QWidget:1, - from gui/qt/util/timetooltip.hpp:27, - from gui/qt/util/timetooltip.moc.cpp:10: -/gnu/store/jsxxnsdvij5mrrv6c0kj0261k0f44xlz-qtbase-5.15.2/include/qt5/QtGui/qmatrix.h:54:7: note: forward declaration of ‘class QPainterPath’ - class QPainterPath; - ^~~~~~~~~~~~ -make[4]: *** [Makefile:25852: gui/qt/util/libqt_plugin_la-timetooltip.moc.lo] Error 1 ------- - -diff --git a/modules/gui/qt/components/playlist/views.cpp b/modules/gui/qt/components/playlist/views.cpp -index 24db9d9..73c1779 100644 ---- a/modules/gui/qt/components/playlist/views.cpp -+++ b/modules/gui/qt/components/playlist/views.cpp -@@ -27,6 +27,7 @@ - #include "input_manager.hpp" /* THEMIM */ - - #include -+#include - #include - #include - #include -diff --git a/modules/gui/qt/dialogs/plugins.cpp b/modules/gui/qt/dialogs/plugins.cpp -index d233382..69728eb 100644 ---- a/modules/gui/qt/dialogs/plugins.cpp -+++ b/modules/gui/qt/dialogs/plugins.cpp -@@ -53,6 +53,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/modules/gui/qt/util/timetooltip.hpp b/modules/gui/qt/util/timetooltip.hpp -index 6a1329e..9f50b18 100644 ---- a/modules/gui/qt/util/timetooltip.hpp -+++ b/modules/gui/qt/util/timetooltip.hpp -@@ -25,6 +25,7 @@ - #include "qt.hpp" - - #include -+#include - - class TimeTooltip : public QWidget - { - diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index cebb70d28e..cd049fb375 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1773,7 +1773,6 @@ videoformats depend on the configuration flags of ffmpeg.") "https://download.videolan.org/pub/videolan/vlc/" (car (string-split version #\-)) "/vlc-" version ".tar.xz")) - (patches (search-patches "vlc-qt-5.15.patch")) (sha256 (base32 "0ygqihw2c5vvzv8950dlf7rdwz1cpz1668jgyja604ljibrmix7g")))) -- cgit v1.2.3 From aee72ed1c6ee75fb8fe8736e14596a429d023509 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 27 Jan 2021 20:08:19 +0100 Subject: gnu: Add qsstv. * gnu/packages/radio.scm (qsstv): New variable. --- gnu/packages/radio.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 95e86e560a..c3f1c0c933 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -66,6 +66,7 @@ #:use-module (gnu packages tcl) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) + #:use-module (gnu packages video) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build-system cmake) @@ -1147,3 +1148,43 @@ modes: "NanoVNA-Saver is a tool for reading, displaying and saving data from the NanoVNA vector network analyzers.") (license license:gpl3+))) + +(define-public qsstv + (package + (name "qsstv") + (version "9.4.4") + (source + (origin + (method url-fetch) + (uri (string-append "http://users.telenet.be/on4qz/qsstv/downloads/" + "qsstv_" version ".tar.gz")) + (sha256 + (base32 "0f9hx6sy418cb23fadll298pqbc5l2lxsdivi4vgqbkvx7sw58zi")))) + (build-system qt-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("fftw" ,fftw) + ("fftwf" ,fftwf) + ("hamlib" ,hamlib) + ("openjpeg" ,openjpeg) + ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("v4l-utils" ,v4l-utils))) + (arguments + `(#:tests? #f ; No test suite. + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (invoke "qmake" + (string-append "PREFIX=" (assoc-ref outputs "out"))) + #t))))) + (home-page "http://users.telenet.be/on4qz/qsstv/") + (synopsis "Program for receiving and transmitting SSTV and HAMDRM") + (description + "QSSTV is a program for receiving and transmitting SSTV and HAMDRM +(sometimes called DSSTV). It is compatible with most of MMSSTV and EasyPal.") + (license (list license:gpl2+ + license:qwt1.0)))) -- cgit v1.2.3 From cd80e11b9555f6d0a9f3413613eeea319ce6c6c3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 Jan 2021 22:33:07 +0100 Subject: gnu: pinentry-tty: Update to 1.1.1. * gnu/packages/gnupg.scm (pinentry-tty): Update to 1.1.1. (pinentry-efl)[source]: Remove patch. * gnu/packages/patches/pinentry-efl.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/gnupg.scm | 8 +- gnu/packages/patches/pinentry-efl.patch | 798 -------------------------------- 3 files changed, 2 insertions(+), 805 deletions(-) delete mode 100644 gnu/packages/patches/pinentry-efl.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index cc9b47b493..19ddbe3cc0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1483,7 +1483,6 @@ dist_patch_DATA = \ %D%/packages/patches/pinball-missing-separators.patch \ %D%/packages/patches/pinball-src-deps.patch \ %D%/packages/patches/pinball-system-ltdl.patch \ - %D%/packages/patches/pinentry-efl.patch \ %D%/packages/patches/pingus-boost-headers.patch \ %D%/packages/patches/pingus-sdl-libs-config.patch \ %D%/packages/patches/pixman-CVE-2016-5296.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 4db7b4ca86..a6e75f0e38 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -775,14 +775,14 @@ including tools for signing keys, keyring analysis, and party preparation. (define-public pinentry-tty (package (name "pinentry-tty") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/pinentry/pinentry-" version ".tar.bz2")) (sha256 (base32 - "0w35ypl960pczg5kp6km3dyr000m1hf0vpwwlh72jjkjza36c1v8")))) + "0zx5vg6wws2sp2yxwi01b8i1pnsqkydncpj7x0p8xl9y05ja04nd")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--enable-pinentry-tty"))) @@ -860,10 +860,6 @@ passphrase when @code{gpg} is run and needs it."))) (package (inherit pinentry-tty) (name "pinentry-efl") - (source - (origin - (inherit (package-source pinentry-tty)) - (patches (search-patches "pinentry-efl.patch")))) (arguments '(#:configure-flags '("--enable-pinentry-efl" "--enable-fallback-curses") diff --git a/gnu/packages/patches/pinentry-efl.patch b/gnu/packages/patches/pinentry-efl.patch deleted file mode 100644 index 5ba79e28df..0000000000 --- a/gnu/packages/patches/pinentry-efl.patch +++ /dev/null @@ -1,798 +0,0 @@ -https://git.gnupg.org/cgi-bin/gitweb.cgi?p=pinentry.git;a=commit;h=948105b7a34ec9a9e5479d376b7c86bafee50a01 -This patch can be removed with the next release of pinentry. - -From 948105b7a34ec9a9e5479d376b7c86bafee50a01 Mon Sep 17 00:00:00 2001 -From: "William L. Thomson Jr" -Date: Tue, 29 May 2018 22:50:47 +0100 -Subject: [PATCH] efl: Add an EFL-based pinentry. - -* NEWS: Update. -* Makefile.am: Add new efl subdirectory. -* configure.ac: Add --enable-pinentry-efl option. -* efl/Makefile.am: New file. -* efl/pinentry-efl.c: New file. - -Signed-off-by: Damien Goutte-Gattat ---- - Makefile.am | 8 +- - configure.ac | 44 +++- - efl/Makefile.am | 38 ++++ - efl/pinentry-efl.c | 623 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 6 files changed, 716 insertions(+), 2 deletions(-) - create mode 100644 efl/Makefile.am - create mode 100644 efl/pinentry-efl.c - -diff --git a/Makefile.am b/Makefile.am -index 8c8b8e5..b8fd0e1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -82,10 +82,16 @@ else - pinentry_fltk = - endif - -+if BUILD_PINENTRY_EFL -+pinentry_efl = efl -+else -+pinentry_efl = -+endif -+ - SUBDIRS = m4 secmem pinentry ${pinentry_curses} ${pinentry_tty} \ - ${pinentry_emacs} ${pinentry_gtk_2} ${pinentry_gnome_3} \ - ${pinentry_qt} ${pinentry_tqt} ${pinentry_w32} \ -- ${pinentry_fltk} doc -+ ${pinentry_fltk} ${pinentry_efl} doc - - - install-exec-local: -diff --git a/configure.ac b/configure.ac -index ff6c2e0..e305e44 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -419,6 +419,42 @@ fi - - - dnl -+dnl Check for EFL pinentry programs. -+dnl -+AC_ARG_ENABLE(pinentry-efl, -+ AC_HELP_STRING([--enable-pinentry-efl], [build EFL pinentry]), -+ pinentry_efl=$enableval, pinentry_efl=maybe) -+ -+dnl check for pkg-config -+if test "$pinentry_efl" != "no"; then -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ if test x"${PKG_CONFIG}" = xno ; then -+ pinentry_efl=no -+ fi -+fi -+ -+if test "$pinentry_efl" != "no"; then -+ AC_MSG_CHECKING([for efl]) -+ "${PKG_CONFIG}" --exists 'elementary >= 1.18' -+ if test $? -ne 0 ; then -+ AC_MSG_RESULT([no]) -+ AC_MSG_WARN([efl >= 1.18 is required for efl pinentry]) -+ pinentry_efl=no -+ else -+ AC_MSG_RESULT([yes]) -+ EFL_CFLAGS=`"${PKG_CONFIG}" --cflags ecore-x elementary` -+ EFL_LIBS=`"${PKG_CONFIG}" --libs ecore-x elementary` -+ AC_SUBST(EFL_CFLAGS) -+ AC_SUBST(EFL_LIBS) -+ if test "$pinentry_efl" != "no" -+ then -+ pinentry_efl=yes -+ fi -+ fi -+fi -+AM_CONDITIONAL(BUILD_PINENTRY_EFL, test "$pinentry_efl" = "yes") -+ -+dnl - dnl Check for GTK+-2 / GNOME3 pinentry programs. - dnl - AC_ARG_ENABLE(pinentry-gtk2, -@@ -645,7 +681,11 @@ else - if test "$pinentry_tqt" = "yes"; then - PINENTRY_DEFAULT=pinentry-tqt - else -- AC_MSG_ERROR([[No pinentry enabled.]]) -+ if test "$pinentry_efl" = "yes"; then -+ PINENTRY_DEFAULT=pinentry-efl -+ else -+ AC_MSG_ERROR([[No pinentry enabled.]]) -+ fi - fi - fi - fi -@@ -721,6 +761,7 @@ secmem/Makefile - pinentry/Makefile - curses/Makefile - tty/Makefile -+efl/Makefile - emacs/Makefile - gtk+-2/Makefile - gnome3/Makefile -@@ -744,6 +785,7 @@ AC_MSG_NOTICE([ - Curses Pinentry ..: $pinentry_curses - TTY Pinentry .....: $pinentry_tty - Emacs Pinentry ...: $pinentry_emacs -+ EFL Pinentry .....: $pinentry_efl - GTK+-2 Pinentry ..: $pinentry_gtk_2 - GNOME 3 Pinentry .: $pinentry_gnome_3 - Qt Pinentry ......: $pinentry_qt $pinentry_qt_lib_version -diff --git a/efl/Makefile.am b/efl/Makefile.am -new file mode 100644 -index 0000000..b986a04 ---- /dev/null -+++ b/efl/Makefile.am -@@ -0,0 +1,38 @@ -+# Makefile.am - PIN entry EFL frontend. -+# Copyright (C) 2017 Obsidian-Studios, Inc. -+# Author William L. Thomson Jr. -+# -+# This file is part of PINENTRY. -+# -+# PINENTRY 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 2 of the License, or -+# (at your option) any later version. -+# -+# PINENTRY 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 this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -+ -+## Process this file with automake to produce Makefile.in -+ -+bin_PROGRAMS = pinentry-efl -+ -+if FALLBACK_CURSES -+ncurses_include = $(NCURSES_INCLUDE) -+libcurses = ../pinentry/libpinentry-curses.a $(LIBCURSES) $(LIBICONV) -+else -+ncurses_include = -+libcurses = -+endif -+ -+AM_CPPFLAGS = $(COMMON_CFLAGS) $(EFL_CFLAGS) $(ncurses_include) \ -+ -I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry -+LDADD = ../pinentry/libpinentry.a ../secmem/libsecmem.a \ -+ $(COMMON_LIBS) $(LIBCAP) $(EFL_LIBS) $(libcurses) -+ -+pinentry_efl_SOURCES = pinentry-efl.c -diff --git a/efl/pinentry-efl.c b/efl/pinentry-efl.c -new file mode 100644 -index 0000000..ca99693 ---- /dev/null -+++ b/efl/pinentry-efl.c -@@ -0,0 +1,623 @@ -+/* pinentry-efl.c -+ Copyright (C) 2017 Obsidian-Studios, Inc. -+ Author William L. Thomson Jr. -+ -+ Based on pinentry-gtk2.c -+ Copyright (C) 1999 Robert Bihlmeyer -+ Copyright (C) 2001, 2002, 2007, 2015 g10 Code GmbH -+ Copyright (C) 2004 by Albrecht Dreß -+ -+ pinentry-efl is a pinentry application for the EFL widget set. -+ It tries to follow the Gnome Human Interface Guide as close as -+ possible. -+ -+ This program 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 2 of the License, or -+ (at your option) any later version. -+ -+ This program 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 this program; if not, write to the Free Software -+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+#include -+#include -+#include -+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wstrict-prototypes" -+#endif -+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) -+#pragma GCC diagnostic pop -+#endif -+ -+#ifdef HAVE_GETOPT_H -+#include -+#else -+#include "getopt.h" -+#endif /* HAVE_GETOPT_H */ -+ -+#include "pinentry.h" -+ -+#ifdef FALLBACK_CURSES -+#include "pinentry-curses.h" -+#endif -+ -+#define PGMNAME "pinentry-efl" -+ -+#ifndef VERSION -+#define VERSION -+#endif -+ -+#define ENTRY_HIDE "Hide entry" -+#define ENTRY_SHOW "Show entry" -+ -+typedef enum { CONFIRM_CANCEL, CONFIRM_OK, CONFIRM_NOTOK } confirm_value_t; -+ -+static const int WIDTH = 480; -+static const int BUTTON_HEIGHT = 27; -+static const int BUTTON_WIDTH = 70; -+static const int BUTTON_ICON_SIZE = 13; -+static const int PADDING = 5; -+ -+static Eina_Bool got_input; -+static Ecore_Timer *timer; -+static Evas_Object *check_label; -+static Evas_Object *error_label; -+static Evas_Object *entry; -+static Evas_Object *repeat_entry; -+static Evas_Object *qualitybar; -+static Evas_Object *win; -+static char **pargv; -+static int grab_failed; -+static int passphrase_ok; -+static int confirm_mode; -+static int pargc; -+static confirm_value_t confirm_value; -+static pinentry_t pinentry; -+ -+pinentry_cmd_handler_t pinentry_cmd_handler; -+ -+static void -+quit (void) -+{ -+ evas_object_del(win); -+ elm_exit(); -+ ecore_main_loop_quit (); -+} -+ -+static void -+delete_event (void *data EINA_UNUSED, -+ Evas_Object *obj EINA_UNUSED, -+ void *event EINA_UNUSED) -+{ -+ pinentry->close_button = 1; -+ quit (); -+} -+ -+static void -+changed_text_handler (void *data EINA_UNUSED, -+ Evas_Object *obj, -+ void *event EINA_UNUSED) -+{ -+ const char *s; -+ int length; -+ int percent; -+ -+ got_input = EINA_TRUE; -+ -+ if (pinentry->repeat_passphrase && repeat_entry) -+ { -+ elm_object_text_set (repeat_entry, ""); -+ elm_object_text_set (error_label, ""); -+ } -+ -+ if (!qualitybar || !pinentry->quality_bar) -+ return; -+ -+ s = elm_object_text_get (obj); -+ if (!s) -+ s = ""; -+ length = strlen (s); -+ percent = length? pinentry_inq_quality (pinentry, s, length) : 0; -+ evas_object_color_set(qualitybar, -+ 255 - ( 2.55 * percent ), -+ 2.55 * percent, 0, 255); -+ elm_progressbar_value_set (qualitybar, (double) percent / 100.0); -+} -+ -+static void -+on_check (void *data EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) -+{ -+ if(elm_check_state_get(obj)) -+ { -+ elm_entry_password_set(entry, EINA_FALSE); -+ elm_object_text_set(check_label,ENTRY_HIDE); -+ } -+ else -+ { -+ elm_entry_password_set(entry, EINA_TRUE); -+ elm_object_text_set(check_label,ENTRY_SHOW); -+ } -+ evas_object_size_hint_min_set(check_label, -+ ELM_SCALE_SIZE(BUTTON_WIDTH), -+ ELM_SCALE_SIZE(BUTTON_HEIGHT)); -+ evas_object_size_hint_align_set(check_label, 0, 1); -+} -+ -+static void -+on_click (void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) -+{ -+ if (confirm_mode) -+ { -+ confirm_value = (confirm_value_t) data; -+ quit (); -+ return; -+ } -+ -+ if (data) -+ { -+ const char *s; -+ const char *s2; -+ -+ s = elm_entry_entry_get (entry); -+ if (!s) -+ s = ""; -+ -+ if (pinentry->repeat_passphrase && repeat_entry) -+ { -+ s2 = elm_entry_entry_get (repeat_entry); -+ if (!s2) -+ s2 = ""; -+ if (strcmp (s, s2)) -+ { -+ elm_object_text_set(error_label, -+ pinentry->repeat_error_string? -+ pinentry->repeat_error_string: -+ "not correctly repeated"); -+ elm_object_focus_set(entry,EINA_TRUE); -+ return; -+ } -+ pinentry->repeat_okay = 1; -+ } -+ -+ passphrase_ok = 1; -+ pinentry_setbufferlen (pinentry, strlen (s) + 1); -+ if (pinentry->pin) -+ strncpy (pinentry->pin, s, strlen(s) + 1); -+ } -+ quit (); -+} -+ -+static void -+enter_callback (void *data, Evas_Object * obj, void *event_info EINA_UNUSED) -+{ -+ if (data) -+ elm_object_focus_set (data, 1); -+ else -+ on_click ((void *) CONFIRM_OK, obj, NULL); -+} -+ -+static Eina_Bool -+timeout_cb (const void * data) -+{ -+ pinentry_t pe = (pinentry_t)data; -+ if (!got_input) -+ { -+ ecore_main_loop_quit(); -+ if (pe) -+ pe->specific_err = gpg_error (GPG_ERR_TIMEOUT); -+ } -+ -+ timer = NULL; -+ return ECORE_CALLBACK_DONE; -+} -+ -+static void -+create_window (void) -+{ -+ char *txt; -+ Evas_Object *icon; -+ Evas_Object *obj; -+ Evas_Object *table; -+ int btn_txt_len = 0; -+ int row = 0; -+ int ok_len = 0; -+ -+ win = elm_win_util_dialog_add(NULL,"pinentry","enter pin"); -+ elm_win_autodel_set(win, EINA_TRUE); -+ elm_win_center(win,EINA_TRUE,EINA_TRUE); -+ evas_object_smart_callback_add(win, "delete,request", delete_event, NULL); -+ -+ table = elm_table_add(win); -+ elm_table_padding_set(table,ELM_SCALE_SIZE(PADDING),0); -+ evas_object_size_hint_padding_set (table, -+ ELM_SCALE_SIZE(PADDING), -+ ELM_SCALE_SIZE(PADDING), -+ ELM_SCALE_SIZE(PADDING), -+ ELM_SCALE_SIZE(PADDING)); -+ evas_object_show(table); -+ -+ if (pinentry->title) -+ { -+ txt = pinentry_utf8_to_local (pinentry->lc_ctype, -+ pinentry->title); -+ elm_win_title_set ( win, txt ); -+ free (txt); -+ } -+ -+ /* Description Label */ -+ if (pinentry->description) -+ { -+ char* aligned; -+ int len; -+ -+ obj = elm_label_add(table); -+ elm_label_line_wrap_set (obj, ELM_WRAP_WORD); -+ txt = pinentry_utf8_to_local (pinentry->lc_ctype, pinentry->description); -+ len = strlen(txt)+20; // 20 chars for align tag -+ aligned = calloc(len+1,sizeof(char)); -+ if(aligned) -+ { -+ snprintf(aligned,len, "%s",txt); -+ elm_object_text_set(obj,aligned); -+ free (aligned); -+ } else -+ elm_object_text_set(obj,txt); -+ free (txt); -+ evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, 0); -+ evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, 0); -+ elm_table_pack(table, obj, 1, row, 5, 1); -+ evas_object_show(obj); -+ row++; -+ } -+ if (!confirm_mode && (pinentry->error || pinentry->repeat_passphrase)) -+ { -+ /* Error Label */ -+ if (pinentry->error) -+ txt = pinentry_utf8_to_local (pinentry->lc_ctype, pinentry->error); -+ else -+ txt = ""; -+ obj = elm_label_add(table); -+ evas_object_color_set(obj, 255, 0, 0, 255); -+ elm_object_text_set(obj,txt); -+ elm_object_style_set(obj,"slide_bounce"); -+ elm_label_slide_duration_set(obj, 10); -+ elm_label_slide_mode_set(obj, ELM_LABEL_SLIDE_MODE_ALWAYS); -+ elm_label_slide_go(obj); -+ evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, 0); -+ evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, 0); -+ elm_table_pack(table, obj, 1, row, 5, 1); -+ evas_object_show(obj); -+ if (pinentry->error) -+ free (txt); -+ row++; -+ } -+ -+ qualitybar = NULL; -+ -+ if (!confirm_mode) -+ { -+ -+ if (pinentry->prompt) -+ { -+ /* Entry/Prompt Label */ -+ obj = elm_label_add(table); -+ txt = pinentry_utf8_to_local (pinentry->lc_ctype, pinentry->prompt); -+ elm_object_text_set(obj,txt); -+ free (txt); -+ evas_object_size_hint_weight_set(obj, 0, EVAS_HINT_EXPAND); -+ evas_object_size_hint_align_set(obj, 1, EVAS_HINT_FILL); -+ elm_table_pack(table, obj, 1, row, 1, 1); -+ evas_object_show(obj); -+ } -+ -+ entry = elm_entry_add(table); -+ elm_entry_scrollable_set(entry, EINA_TRUE); -+ elm_scroller_policy_set(entry, -+ ELM_SCROLLER_POLICY_OFF, -+ ELM_SCROLLER_POLICY_OFF); -+ elm_entry_password_set(entry, EINA_TRUE); -+ elm_entry_single_line_set(entry, EINA_TRUE); -+ evas_object_size_hint_weight_set(entry, 0, 0); -+ evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, 0); -+ elm_table_pack(table, entry, 2, row, 4, 1); -+ evas_object_smart_callback_add(entry, -+ "changed", -+ changed_text_handler, -+ NULL); -+ evas_object_show(entry); -+ row++; -+ -+ /* Check box */ -+ obj = elm_check_add(table); -+ evas_object_size_hint_align_set(obj, 1, EVAS_HINT_FILL); -+ elm_table_pack(table, obj, 1, row, 1, 1); -+ evas_object_smart_callback_add(obj, "changed", on_check, NULL); -+ evas_object_show(obj); -+ -+ /* Check Label */ -+ check_label = elm_label_add(table); -+ on_check((void *)NULL, obj, (void *)NULL); -+ elm_table_pack(table, check_label, 2, row, 4, 1); -+ evas_object_show(check_label); -+ row++; -+ -+ if (pinentry->quality_bar) -+ { -+ /* Quality Bar Label */ -+ obj = elm_label_add(table); -+ txt = pinentry_utf8_to_local (pinentry->lc_ctype, -+ pinentry->quality_bar); -+ elm_object_text_set(obj,txt); -+ free (txt); -+ evas_object_size_hint_weight_set(obj, 0, EVAS_HINT_EXPAND); -+ evas_object_size_hint_align_set(obj, 1, EVAS_HINT_FILL); -+ elm_table_pack(table, obj, 1, row, 1, 1); -+ evas_object_show(obj); -+ -+ qualitybar = elm_progressbar_add(table); -+ evas_object_color_set(qualitybar, 255, 0, 0, 255); -+ evas_object_show(qualitybar); -+ if (pinentry->quality_bar_tt) -+ elm_object_tooltip_text_set (qualitybar, -+ pinentry->quality_bar_tt); -+ evas_object_size_hint_weight_set(qualitybar, EVAS_HINT_EXPAND, 0); -+ evas_object_size_hint_align_set(qualitybar, EVAS_HINT_FILL, 0); -+ elm_table_pack(table, qualitybar, 2, row, 4, 1); -+ row++; -+ } -+ -+ if (pinentry->repeat_passphrase) -+ { -+ /* Repeat Label */ -+ obj = elm_label_add(table); -+ txt = pinentry_utf8_to_local (pinentry->lc_ctype, -+ pinentry->repeat_passphrase); -+ elm_object_text_set(obj,txt); -+ free (txt); -+ evas_object_size_hint_weight_set(obj, 0, EVAS_HINT_EXPAND); -+ evas_object_size_hint_align_set(obj, 1, EVAS_HINT_FILL); -+ elm_table_pack(table, obj, 1, row, 1, 1); -+ evas_object_show(obj); -+ -+ repeat_entry = elm_entry_add(table); -+ elm_entry_scrollable_set(repeat_entry, EINA_TRUE); -+ elm_scroller_policy_set(repeat_entry, -+ ELM_SCROLLER_POLICY_OFF, -+ ELM_SCROLLER_POLICY_OFF); -+ elm_entry_password_set(repeat_entry, EINA_TRUE); -+ elm_entry_single_line_set(repeat_entry, EINA_TRUE); -+ evas_object_size_hint_weight_set(repeat_entry, 0, 0); -+ evas_object_size_hint_align_set(repeat_entry, EVAS_HINT_FILL, 0); -+ elm_table_pack(table, repeat_entry, 2, row, 4, 1); -+ evas_object_smart_callback_add (repeat_entry, "activated", -+ enter_callback, NULL); -+ evas_object_show(repeat_entry); -+ evas_object_smart_callback_add (entry, -+ "activated", -+ enter_callback, -+ repeat_entry); -+ evas_object_smart_callback_add(repeat_entry, -+ "activated", -+ on_click, -+ (void *) CONFIRM_OK); -+ row++; -+ } -+ else -+ evas_object_smart_callback_add(entry, -+ "activated", -+ on_click, -+ (void *) CONFIRM_OK); -+ } -+ -+ /* Cancel Button */ -+ if (!pinentry->one_button) -+ { -+ obj = elm_button_add(table); -+ icon = elm_icon_add (table); -+ evas_object_size_hint_aspect_set (icon, EVAS_ASPECT_CONTROL_BOTH, 1, 1); -+ if (elm_icon_standard_set (icon, "dialog-cancel") || -+ elm_icon_standard_set (icon, "window-close")) -+ { -+ evas_object_size_hint_min_set(icon, -+ ELM_SCALE_SIZE(BUTTON_ICON_SIZE), -+ ELM_SCALE_SIZE(BUTTON_ICON_SIZE)); -+ elm_object_part_content_set(obj, "icon", icon); -+ evas_object_show (icon); -+ } -+ else -+ evas_object_del(icon); -+ if (pinentry->cancel || pinentry->default_cancel) -+ { -+ if(pinentry->cancel) -+ txt = pinentry_utf8_to_local (pinentry->lc_ctype, pinentry->cancel); -+ else -+ txt = pinentry_utf8_to_local (pinentry->lc_ctype, -+ pinentry->default_cancel); -+ if(txt[0]=='_') -+ elm_object_text_set(obj,txt+1); -+ else -+ elm_object_text_set(obj,txt); -+ btn_txt_len = ELM_SCALE_SIZE(strlen(txt) * (PADDING * 1.5)); -+ free (txt); -+ } -+ else -+ elm_object_text_set(obj, "Cancel"); //STOCK_CANCEL -+ evas_object_size_hint_align_set(obj, 0, 0); -+ if(btn_txt_len>ELM_SCALE_SIZE(BUTTON_WIDTH)) -+ evas_object_size_hint_min_set(obj, -+ btn_txt_len, -+ ELM_SCALE_SIZE(BUTTON_HEIGHT)); -+ else -+ evas_object_size_hint_min_set(obj, -+ ELM_SCALE_SIZE(BUTTON_WIDTH), -+ ELM_SCALE_SIZE(BUTTON_HEIGHT)); -+ elm_table_pack(table, obj, 4, row, 1, 1); -+ evas_object_smart_callback_add(obj, -+ "clicked", -+ on_click, -+ (void *) CONFIRM_CANCEL); -+ evas_object_show(obj); -+ } -+ -+ /* OK Button */ -+ obj = elm_button_add(table); -+ icon = elm_icon_add (table); -+ evas_object_size_hint_aspect_set (icon, EVAS_ASPECT_CONTROL_BOTH, 1, 1); -+ if (elm_icon_standard_set (icon, "dialog-ok") || -+ elm_icon_standard_set (icon, "list-add")) -+ { -+ evas_object_size_hint_min_set(icon, -+ ELM_SCALE_SIZE(BUTTON_ICON_SIZE), -+ ELM_SCALE_SIZE(BUTTON_ICON_SIZE)); -+ elm_object_part_content_set(obj, "icon", icon); -+ evas_object_show (icon); -+ } -+ else -+ evas_object_del(icon); -+ if (pinentry->ok || pinentry->default_ok) -+ { -+ if(pinentry->ok) -+ txt = pinentry_utf8_to_local (pinentry->lc_ctype, pinentry->ok); -+ else -+ txt = pinentry_utf8_to_local (pinentry->lc_ctype, pinentry->default_ok); -+ if(txt[0]=='_') -+ elm_object_text_set(obj,txt+1); -+ else -+ elm_object_text_set(obj,txt); -+ ok_len = ELM_SCALE_SIZE(strlen(txt) * (PADDING * 1.5)); -+ if(ok_len>btn_txt_len) -+ btn_txt_len = ok_len; -+ free (txt); -+ } -+ else -+ elm_object_text_set(obj,"OK"); //STOCK_OK -+ evas_object_size_hint_align_set(obj, 0, 0); -+ if(btn_txt_len>ELM_SCALE_SIZE(BUTTON_WIDTH)) -+ evas_object_size_hint_min_set(obj, -+ btn_txt_len, -+ ELM_SCALE_SIZE(BUTTON_HEIGHT)); -+ else -+ evas_object_size_hint_min_set(obj, -+ ELM_SCALE_SIZE(BUTTON_WIDTH), -+ ELM_SCALE_SIZE(BUTTON_HEIGHT)); -+ elm_table_pack(table, obj, 5, row, 1, 1); -+ evas_object_smart_callback_add(obj, "clicked", on_click, (void *) CONFIRM_OK); -+ evas_object_show(obj); -+ -+ /* Key/Lock Icon */ -+ obj = elm_icon_add (win); -+ evas_object_size_hint_aspect_set (obj, EVAS_ASPECT_CONTROL_BOTH, 1, 1); -+ if (elm_icon_standard_set (obj, "dialog-password")) -+ { -+ double ic_size = WIDTH/5; -+ if(row==0) -+ ic_size = ic_size/3.5; -+ else if(row<4) -+ ic_size = ic_size - ic_size/row; -+ evas_object_size_hint_min_set(obj, -+ ELM_SCALE_SIZE(ic_size), -+ ELM_SCALE_SIZE(ic_size)); -+ evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); -+ evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, 0.5); -+ elm_table_pack(table, obj, 0, 0, 1, row? row:1); -+ evas_object_show (obj); -+ } -+ else -+ evas_object_del(obj); -+ -+ /* Box for padding */ -+ obj = elm_box_add (win); -+ elm_box_pack_end (obj, table); -+ evas_object_show (obj); -+ -+ elm_win_resize_object_add(win,obj); -+ evas_object_show(win); -+ -+ if(entry) -+ elm_object_focus_set (entry, EINA_TRUE); -+ -+ if (pinentry->timeout > 0) -+ timer = ecore_timer_add (pinentry->timeout, -+ (Ecore_Task_Cb)timeout_cb, -+ pinentry); -+} -+ -+static int -+efl_cmd_handler (pinentry_t pe) -+{ -+ int want_pass = !!pe->pin; -+ -+ got_input = EINA_FALSE; -+ pinentry = pe; -+ confirm_value = CONFIRM_CANCEL; -+ passphrase_ok = 0; -+ confirm_mode = want_pass ? 0 : 1; -+ /* init ecore-x explicitly using DISPLAY since this can launch -+ * from console -+ */ -+ if (pe->display) -+ ecore_x_init (pe->display); -+ elm_init (pargc, pargv); -+ create_window (); -+ ecore_main_loop_begin (); -+ -+ if (timer) -+ { -+ ecore_timer_del (timer); -+ timer = NULL; -+ } -+ -+ if (confirm_value == CONFIRM_CANCEL || grab_failed) -+ pe->canceled = 1; -+ -+ pinentry = NULL; -+ if (want_pass) -+ { -+ if (passphrase_ok && pe->pin) -+ return strlen (pe->pin); -+ else -+ return -1; -+ } -+ else -+ return (confirm_value == CONFIRM_OK) ? 1 : 0; -+} -+ -+int -+main (int argc, char *argv[]) -+{ -+ pinentry_init (PGMNAME); -+ -+#ifdef FALLBACK_CURSES -+ if (pinentry_have_display (argc, argv)) -+ { -+#endif -+ -+ pinentry_cmd_handler = efl_cmd_handler; -+ pargc = argc; -+ pargv = argv; -+ -+#ifdef FALLBACK_CURSES -+ } -+ else -+ { -+ pinentry_cmd_handler = curses_cmd_handler; -+ } -+#endif -+ -+ pinentry_parse_opts (argc, argv); -+ if (pinentry_loop ()) -+ return 1; -+ -+ return 0; -+} --- -2.8.0.rc3 - -- cgit v1.2.3 From a04b0e454ce366df78fa28b83721ecafe8ca26f3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 Jan 2021 22:36:04 +0100 Subject: gnu: pinentry-efl: Tweak description. * gnu/packages/gnupg.scm (pinentry-efl)[description]: Use @acronym. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index a6e75f0e38..5c8207e875 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -877,8 +877,8 @@ passphrase when @code{gpg} is run and needs it."))) `(("efl" ,efl) ,@(package-inputs pinentry-tty))) (description - "Pinentry provides a console and a graphical interface for the -@dfn{Enlightenment Foundation Libraries} (EFL) that allows users to enter a + "Pinentry provides a console and a graphical interface for @acronym{EFL, +the Enlightenment Foundation Libraries} that allows users to enter a passphrase when @code{gpg} is run and needs it."))) (define-public pinentry-rofi -- cgit v1.2.3 From c45a821a63b73e1655314c028315114f34b26417 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 27 Jan 2021 11:51:43 +0100 Subject: gnu: guile-gcrypt: Refer to the right libgcrypt when cross-compiling. Fixes a regression introduced in 5e163ba00969e7ba05897840a1199b967252b4ae where (gcrypt package-config) would end up referring to the native libgcrypt.so instead of the target one. * gnu/packages/gnupg.scm (guile-gcrypt)[arguments]: Reintroduce 'add-libgrypt-config' phase. [native-inputs]: Remove LIBGCRYPT. --- gnu/packages/gnupg.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 5c8207e875..6e80ca339f 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -436,14 +436,24 @@ gpgpme starting with version 1.7.") (arguments ;; Work around to achieve reproducible ;; builds. - '(#:parallel-build? #f)) + '(#:parallel-build? #f + + #:phases + (modify-phases %standard-phases + (add-before 'configure 'add-libgrypt-config + (lambda* (#:key inputs target #:allow-other-keys) + (when target + ;; When cross-compiling, the bash script 'libgcrypt-config' + ;; must be accessible during the configure phase. + (setenv "PATH" + (string-append (assoc-ref inputs "libgcrypt") + "/bin:" (getenv "PATH"))))))))) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) ("automake" ,automake) ("texinfo" ,texinfo) - ("guile" ,guile-3.0) - ("libgcrypt" ,libgcrypt))) ;for 'libgcrypt-config' + ("guile" ,guile-3.0))) (inputs `(("guile" ,guile-3.0) ("libgcrypt" ,libgcrypt))) -- cgit v1.2.3 From 37cbc95e48577a29627a47534dcbbc43d14f6aa8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 27 Jan 2021 17:31:59 -0500 Subject: gnu: linux-libre: Update to 5.10.11. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.11. (linux-libre-5.10-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 32ceb02f27..e2293e647f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -353,7 +353,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.10-version "5.10.10") +(define-public linux-libre-5.10-version "5.10.11") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -361,7 +361,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "06fvgkrn9127xw9kly6l4ws3yv80q8xfqdzaam92lljim5pqdvb0"))) + (hash (base32 "03viivkmz9kvn8vak26l80p7fr8jbqisa0y605bi9i8gn1b2pvq2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From 5ce0e1929bc4b21c0b4d38c511b118aa5dcccb38 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 27 Jan 2021 17:32:58 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.93. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.93. (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 e2293e647f..05e2855050 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,7 +369,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.4-version "5.4.92") +(define-public linux-libre-5.4-version "5.4.93") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -377,7 +377,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1zcl4dadyfrgmx6rh0ncy403rsqb1qs092m6zr6b3i14i3wpz4y0"))) + (hash (base32 "08nmwd13z10866pc16fqbj41krnvk6hxkl4nmhdkpk346r04jx6k"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 3ad10e474b61d74b4d1d313ff18cfaf11baa30c0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 27 Jan 2021 17:33:10 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.171. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.171. (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 05e2855050..2735c67200 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -382,7 +382,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.170") +(define-public linux-libre-4.19-version "4.19.171") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -390,7 +390,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0jjvwbxpfvmzj4z6gkd2mh3kz9vh8hsgsm0013866hzgz1j043fx"))) + (hash (base32 "02n65bmvm309bg6kzxg5ng5lcw564l3rp7dr6asyb1mr1vz55qzl"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From a929ede800b4d8c0966a1dee425a0c56014dce30 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 24 Jan 2021 11:16:39 -0500 Subject: gnu: liferea: Disable static libraries. * gnu/packages/syndication.scm (liferea)[arguments]: Add '--disable-static' to configure-flags. Signed-off-by: Efraim Flashner --- gnu/packages/syndication.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 54fa221fa6..d191d21999 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -196,7 +196,10 @@ file system, and many more features.") (base32 "1g9463bvswsm899j6dfhslcg6np70m5wq143mjicr24zy8d17bm7")))) (build-system glib-or-gtk-build-system) (arguments - `(#:phases + `(#:configure-flags + (list + "--disable-static") + #:phases (modify-phases %standard-phases (add-before 'configure 'prepare-build-environment (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From ff0ff69315fa2cffa224b6f4b2f879a8e0bdbb89 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 24 Jan 2021 11:11:11 -0500 Subject: gnu: liferea: Add missing inputs. These new inputs are referenced by the package but was missing in the package definition. Some of these inputs might have been used by the package indirectly via propagation from other inputs. * gnu/packages/syndication.scm (liferea) [inputs]: Add glib, libsoup, pango and sqlite. Signed-off-by: Efraim Flashner --- gnu/packages/syndication.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index d191d21999..0e33f99910 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -225,7 +225,8 @@ file system, and many more features.") ("pkg-config" ,pkg-config) ("which" ,which))) (inputs - `(("glib-networking" ,glib-networking) + `(("glib" ,glib) + ("glib-networking" ,glib-networking) ("gnome-keyring" ,gnome-keyring) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gstreamer" ,gstreamer) @@ -233,11 +234,14 @@ file system, and many more features.") ("libnotify" ,libnotify) ("libpeas" ,libpeas) ("libsecret" ,libsecret) + ("libsoup" ,libsoup) ("libxml2" ,libxml2) ("libxslt" ,libxslt) + ("pango" ,pango) ("python" ,python) ("python-pycairo" ,python-pycairo) ("python-pygobject" ,python-pygobject) + ("sqlite" ,sqlite) ("webkitgtk" ,webkitgtk))) (home-page "https://lzone.de/liferea/") (synopsis "News reader for GTK/GNOME") -- cgit v1.2.3 From 0f01493dc893e43858953a37bc4859b323264524 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 15 Jan 2021 17:10:41 +0100 Subject: service: cuirass: Update it. --- gnu/packages/ci.scm | 46 ++++++++++++++---------------- gnu/services/cuirass.scm | 74 +++++++++++++----------------------------------- 2 files changed, 40 insertions(+), 80 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 161b45846e..dad2e4e00c 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2017 Mathieu Lirzin -;;; Copyright © 2017, 2020 Mathieu Othacehe +;;; Copyright © 2017, 2020, 2021 Mathieu Othacehe ;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2018 Clément Lassieur ;;; @@ -26,6 +26,7 @@ #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix git-download) + #:use-module (guix download) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages docbook) @@ -68,8 +69,8 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "697fa14584551d9595cd042f1ffeba240e45a127") - (revision "56")) + (let ((commit "da6a5c0355e72d725003c9005a9974f2a476d999") + (revision "58")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -81,43 +82,33 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0gw9cja8fiyra9vnn3y384gwanvsqdq6gwjcvmz91sy5lvfwv34m")))) + "0p9ad0aisbl7clb3vi7zmfbnmnsnxq90vgx8v9ly5b0dgrav91p4")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) (guix build gnu-build-system) (ice-9 rdelim) (ice-9 popen)) - #:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass - + #:tests? #f ;requires a PostgreSQL database. #:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-repo-tests - (lambda _ - ;; Disable tests that use a connection to the Guix daemon. - (substitute* "Makefile.am" - (("tests/repo.scm \\\\") "\\")) - #t)) - (add-after 'disable-repo-tests 'patch-/bin/sh - (lambda _ - (substitute* "build-aux/git-version-gen" - (("#!/bin/sh") (string-append "#!" (which "sh")))) - #t)) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) ;; Wrap the 'cuirass' command to refer to the right modules. (let* ((out (assoc-ref outputs "out")) + (avahi (assoc-ref inputs "guile-avahi")) (gcrypt (assoc-ref inputs "guile-gcrypt")) (json (assoc-ref inputs "guile-json")) - (sqlite (assoc-ref inputs "guile-sqlite3")) + (zmq (assoc-ref inputs "guile-simple-zmq")) + (squee (assoc-ref inputs "guile-squee")) (git (assoc-ref inputs "guile-git")) (bytes (assoc-ref inputs "guile-bytestructures")) (fibers (assoc-ref inputs "guile-fibers")) (zlib (assoc-ref inputs "guile-zlib")) (guix (assoc-ref inputs "guix")) - (deps (list gcrypt json sqlite git bytes fibers - zlib guix)) + (deps (list avahi gcrypt json zmq squee git bytes + fibers zlib guix)) (guile (assoc-ref %build-inputs "guile")) (effective (read-line (open-pipe* OPEN_READ @@ -137,17 +128,22 @@ 1))) ;; Make sure 'cuirass' can find the 'evaluate' command, as ;; well as the relevant Guile modules. - (wrap-program (string-append out "/bin/cuirass") - `("PATH" ":" prefix (,(string-append out "/bin"))) - `("GUILE_LOAD_PATH" ":" prefix (,mods)) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))) + (for-each + (lambda (name) + (wrap-program (string-append out "/bin/" name) + `("PATH" ":" prefix (,(string-append out "/bin"))) + `("GUILE_LOAD_PATH" ":" prefix (,mods)) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs)))) + '("cuirass" "remote-server" "remote-worker")) #t)))))) (inputs `(("guile" ,guile-3.0/libgc-7) + ("guile-avahi" ,guile-avahi) ("guile-fibers" ,guile-fibers) ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json-4) - ("guile-sqlite3" ,guile-sqlite3-dev) + ("guile-simple-zmq" ,guile-simple-zmq) + ("guile-squee" ,guile-squee) ("guile-git" ,guile-git) ("guile-zlib" ,guile-zlib) ;; FIXME: this is propagated by "guile-git", but it needs to be among diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 7706ed41c6..cb98f1e369 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -29,6 +29,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu services) #:use-module (gnu services base) + #:use-module (gnu services databases) #:use-module (gnu services shepherd) #:use-module (gnu services admin) #:use-module (gnu system shadow) @@ -54,11 +55,6 @@ (default "/var/log/cuirass.log")) (web-log-file cuirass-configuration-web-log-file ;string (default "/var/log/cuirass-web.log")) - (queries-log-file cuirass-configuration-queries-log-file ;string - (default #f)) - (web-queries-log-file - cuirass-configuration-web-queries-log-file ;string - (default #f)) (cache-directory cuirass-configuration-cache-directory ;string (dir-name) (default "/var/cache/cuirass")) (ttl cuirass-configuration-ttl ;integer @@ -69,10 +65,8 @@ (default "cuirass")) (interval cuirass-configuration-interval ;integer (seconds) (default 60)) - (queue-size cuirass-configuration-queue-size - (default 1)) - (database cuirass-configuration-database ;string (file-name) - (default "/var/lib/cuirass/cuirass.db")) + (database cuirass-configuration-database ;string + (default "dbname=cuirass host=/var/run/postgresql")) (port cuirass-configuration-port ;integer (port) (default 8081)) (host cuirass-configuration-host ;string @@ -94,13 +88,9 @@ (cache-directory (cuirass-configuration-cache-directory config)) (web-log-file (cuirass-configuration-web-log-file config)) (log-file (cuirass-configuration-log-file config)) - (queries-log-file (cuirass-configuration-queries-log-file config)) - (web-queries-log-file - (cuirass-configuration-web-queries-log-file config)) (user (cuirass-configuration-user config)) (group (cuirass-configuration-group config)) (interval (cuirass-configuration-interval config)) - (queue-size (cuirass-configuration-queue-size config)) (database (cuirass-configuration-database config)) (ttl (cuirass-configuration-ttl config)) (port (cuirass-configuration-port config)) @@ -113,7 +103,7 @@ (list (shepherd-service (documentation "Run Cuirass.") (provision '(cuirass)) - (requirement '(guix-daemon networking)) + (requirement '(guix-daemon postgres networking)) (start #~(make-forkexec-constructor (list (string-append #$cuirass "/bin/cuirass") "--cache-directory" #$cache-directory @@ -122,11 +112,6 @@ "--database" #$database "--ttl" #$(string-append (number->string ttl) "s") "--interval" #$(number->string interval) - "--queue-size" #$(number->string queue-size) - #$@(if queries-log-file - (list (string-append "--log-queries=" - queries-log-file)) - '()) #$@(if use-substitutes? '("--use-substitutes") '()) #$@(if one-shot? '("--one-shot") '()) #$@(if fallback? '("--fallback") '()) @@ -144,22 +129,16 @@ (shepherd-service (documentation "Run Cuirass web interface.") (provision '(cuirass-web)) - (requirement '(guix-daemon networking)) + (requirement '(guix-daemon postgres networking)) (start #~(make-forkexec-constructor (list (string-append #$cuirass "/bin/cuirass") "--cache-directory" #$cache-directory - "--specifications" - #$(scheme-file "cuirass-specs.scm" specs) "--database" #$database "--ttl" #$(string-append (number->string ttl) "s") "--web" "--port" #$(number->string port) "--listen" #$host "--interval" #$(number->string interval) - #$@(if web-queries-log-file - (list (string-append "--log-queries=" - web-queries-log-file)) - '()) #$@(if use-substitutes? '("--use-substitutes") '()) #$@(if fallback? '("--fallback") '()) #$@extra-options) @@ -184,15 +163,18 @@ (home-directory (string-append "/var/lib/" cuirass-user)) (shell (file-append shadow "/sbin/nologin")))))) +(define (cuirass-postgresql-role config) + (let ((user (cuirass-configuration-user config))) + (list (postgresql-role + (name user) + (create-database? #t))))) + (define (cuirass-activation config) "Return the activation code for CONFIG." (let ((cache (cuirass-configuration-cache-directory config)) (db (dirname (cuirass-configuration-database config))) (user (cuirass-configuration-user config)) (log "/var/log/cuirass") - (queries-log-file (cuirass-configuration-queries-log-file config)) - (web-queries-log-file - (cuirass-configuration-web-queries-log-file config)) (group (cuirass-configuration-group config))) (with-imported-modules '((guix build utils)) #~(begin @@ -206,33 +188,14 @@ (gid (group:gid (getgr #$group)))) (chown #$cache uid gid) (chown #$db uid gid) - (chown #$log uid gid) - - (let ((queries-log-file #$queries-log-file)) - (when queries-log-file - (call-with-output-file queries-log-file (const #t)) - (chown #$queries-log-file uid gid))) - - (let ((web-queries-log-file #$web-queries-log-file)) - (when web-queries-log-file - (call-with-output-file web-queries-log-file (const #t)) - (chown web-queries-log-file uid gid)))))))) + (chown #$log uid gid)))))) (define (cuirass-log-rotations config) "Return the list of log rotations that corresponds to CONFIG." - (let ((queries-log-file (cuirass-configuration-queries-log-file config)) - (web-queries-log-file - (cuirass-configuration-web-queries-log-file config))) - (list (log-rotation - (files `(,(cuirass-configuration-log-file config) - ,@(if queries-log-file - (list queries-log-file) - '()) - ,@(if web-queries-log-file - (list web-queries-log-file) - '()))) - (frequency 'weekly) - (options '("rotate 40")))))) ;worth keeping + (list (log-rotation + (files (list (cuirass-configuration-log-file config))) + (frequency 'weekly) + (options '("rotate 40"))))) ;worth keeping (define cuirass-service-type (service-type @@ -244,7 +207,8 @@ (service-extension rottlog-service-type cuirass-log-rotations) (service-extension activation-service-type cuirass-activation) (service-extension shepherd-root-service-type cuirass-shepherd-service) - (service-extension account-service-type cuirass-account))) + (service-extension account-service-type cuirass-account) + (service-extension postgresql-role-service-type + cuirass-postgresql-role))) (description "Run the Cuirass continuous integration service."))) - -- cgit v1.2.3 From 1e1e6ebf3ea2e3ae57a9f1434fbb54ad876944f5 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Thu, 28 Jan 2021 13:17:06 +0100 Subject: gnu: tsukundere: Update to 0.2.3. * gnu/packages/game-development.scm (tsukundere): Update to 0.2.3. [#:modules] Add guile-build-system for target-guile-effective-version. [#:imported-modules] Likewise. [#:phases] Add patch-command. [native-inputs]: Add texinfo. [description]: Update. --- gnu/packages/game-development.scm | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index fa7875d077..7080db423b 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -490,7 +490,7 @@ clone.") (define-public tsukundere (package (name "tsukundere") - (version "0.2.0") + (version "0.2.3") (source (origin (method git-fetch) (uri (git-reference @@ -499,21 +499,47 @@ clone.") (file-name (git-file-name name version)) (sha256 (base32 - "0qmqch8hh7vsa8qaz853vwbkz0krb106955dnz8dsl7skbm5jpn6")))) + "05ckds2df810441wfavllx9lsw5jsc9h3nb7m31df01nsj56azdw")))) (build-system gnu-build-system) + (arguments + `(#:modules (((guix build guile-build-system) + #:select (target-guile-effective-version)) + ,@%gnu-build-system-modules) + #:imported-modules ((guix build guile-build-system) + ,@%gnu-build-system-modules) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-command + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (version (target-guile-effective-version)) + (scm (string-append out "/share/guile/site/" + version)) + (go (string-append out "/lib/guile/" + version "/site-ccache"))) + + (substitute* "bin/tsukundere" + (("exec guile .*" all) + (string-append + (format #f "export GUILE_LOAD_PATH=~@?~%" + "\"~a:~a\"" scm (getenv "GUILE_LOAD_PATH")) + (format #f "export GUILE_LOAD_COMPILED_PATH=~@?~%" + "\"~a:~a\"" go (getenv "GUILE_LOAD_COMPILED_PATH")) + all))) + #t)))))) (native-inputs `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) ("guile" ,guile-3.0) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) (propagated-inputs `(("guile-sdl2" ,guile3.0-sdl2))) (home-page "https://gitlab.com/leoprikler/tsukundere") (synopsis "Visual novel engine") (description "Tsukundere is a game engine geared heavily towards the development of visual novels, written on top of Guile-SDL2. It is still -experimental and at the time of writing contains little more than the Guile -modules, that make up its runtime.") +experimental.") (license license:lgpl3+))) (define-public sfml -- cgit v1.2.3 From 33648567dd229b1302d2258e76d8b30593fedce6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 27 Jan 2021 20:00:55 +0000 Subject: gnu: Add skymaker. * gnu/packages/astronomy.scm (skymaker): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/astronomy.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 95231e1837..58fefa04a0 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -229,6 +229,36 @@ large scale galaxy-survey data, it can perform reasonably well on moderately crowded star fields.") (license license:gpl3+))) +(define-public skymaker + (package + (name "skymaker") + (version "3.10.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.astromatic.net/download/skymaker/" + "skymaker-" version ".tar.gz")) + (sha256 + (base32 "03zvx7c89plp9559niqv5532r233kza3ir992rg3nxjksqmrqvx1")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + (string-append + "--with-fftw-libdir=" (assoc-ref %build-inputs "fftw") "/lib") + (string-append + "--with-fftw-incdir=" (assoc-ref %build-inputs "fftw") "/include")))) + (inputs + `(("fftw" ,fftwf))) + (home-page "https://www.astromatic.net/software/skymaker") + (synopsis "Astronomical image simulator") + (description + "SkyMaker is a program that simulates astronomical images. It accepts +object lists in ASCII generated by the Stuff program to produce realistic +astronomical fields. SkyMaker is part of the EFIGI +(@url{https://www.astromatic.net/projects/efigi}) development project.") + (license license:gpl3+))) + (define-public stellarium (package (name "stellarium") -- cgit v1.2.3 From 4e89e8b5dd762a510544d305d46c166cefe06266 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Wed, 27 Jan 2021 22:10:57 -0500 Subject: gnu: emacs-modus-themes: Update to 1.1.1. * gnu/packages/emacs-xyz.scm (emacs-modus-themes): Update to 1.1.1. Signed-off-by: Nicolas Goaziou --- 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 48a0b2a517..a34e31337c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24017,7 +24017,7 @@ Emacs that integrate with major modes like Org-mode.") (define-public emacs-modus-themes (package (name "emacs-modus-themes") - (version "1.0.2") + (version "1.1.1") (source (origin (method git-fetch) @@ -24026,7 +24026,7 @@ Emacs that integrate with major modes like Org-mode.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1v82payjgx8z0qdklsrkim7xkb6hqrbs34d5qpq0sii43jwhiy5j")))) + (base32 "1n716nasa1pccz7983kicagc9sqnxlyfmflvifqk4kza2ks0rh9m")))) (build-system emacs-build-system) (home-page "https://protesilaos.com/modus-themes/") (synopsis "Accessible themes (WCAG AAA)") -- cgit v1.2.3 From a6b50a183258c011a7f33715883a7649316ca9d4 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Wed, 27 Jan 2021 21:48:33 -0500 Subject: gnu: Add python-pywal. * gnu/packages/python-xyz.scm (python-pywal): New variable. Signed-off-by: Nicolas Goaziou --- 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 4b8e538168..d903a678a9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -94,6 +94,7 @@ ;;; Copyright © 2020 Leo Prikler ;;; Copyright © 2019 Kristian Trandem ;;; Copyright © 2020 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021 Morgan Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -145,6 +146,7 @@ #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages kerberos) #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) @@ -6057,6 +6059,38 @@ similar to Fourier transforms, the difference being that Fourier transforms are localized only in frequency instead of in time and frequency.") (license license:expat))) +(define-public python-pywal + (package + (name "python-pywal") + (version "3.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dylanaraps/pywal") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "039m7dch479hlwddynacdrr0klz6a5bdly5swqbs94hfimficiyf")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-home-directory + (lambda _ + ;; Tests fail with "Permission denied: '/homeless-shelter'". + (setenv "HOME" "/tmp") + #t))))) + (inputs + `(("imagemagick" ,imagemagick))) + (home-page "https://github.com/dylanaraps/pywal") + (synopsis "Color palette generator and applicator") + (description + "Pywal is a tool that generates a color palette from the dominant colors +in an image. It then applies the colors system-wide and on-the-fly in all of +your favourite programs.") + (license license:expat))) + (define-public python-pywinrm (package (name "python-pywinrm") -- cgit v1.2.3 From c2245ac23a581e3152a683da749b4dae5358d6e3 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Wed, 27 Jan 2021 22:05:43 -0500 Subject: gnu: Add emacs-theme-magic. * gnu/packages/emacs-xyz.scm (emacs-theme-magic): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a34e31337c..85356f2281 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -76,7 +76,7 @@ ;;; Copyright © 2020 Fredrik Salomonsson ;;; Copyright © 2020 Ryan Desfosses ;;; Copyright © 2020 Eric Bavier -;;; Copyright © 2020 Morgan Smith +;;; Copyright © 2020, 2021 Morgan Smith ;;; Copyright © 2020 Peng Mei Yu ;;; Copyright © 2020 Niklas Eklund ;;; Copyright © 2020 Marco Grassi @@ -725,6 +725,50 @@ this one is much simpler and much more consistent. When using this package, then only the color of the mode line changes when a window becomes in-/active.") (license license:gpl3+))) +(define-public emacs-theme-magic + ;; No tagged release upstream, but the commit below correspond to the 0.2.3 + ;; release. + (let ((commit "844c4311bd26ebafd4b6a1d72ddcc65d87f074e3") + (revision "0")) + (package + (name "emacs-theme-magic") + (version "0.2.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jcaw/theme-magic") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "10gkg7jh1s1484gm66a87zr7x8vmv00s7gfd0w2pj47nqf98g8hz")))) + (build-system emacs-build-system) + (arguments + `( + ;; Include Pywal interaction scripts. + #:include (cons "^python/" %default-include) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-exec-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((files '("theme-magic.el" "python/wal_change_colors.py")) + (python (assoc-ref inputs "python")) + (python-pywal (assoc-ref inputs "python-pywal"))) + (substitute* files + (("\"python\"") (string-append "\"" python "/bin/python3\"")) + (("\"wal\"") (string-append "\"" python-pywal "/bin/wal\"")))) + #t))))) + (inputs + `(("python" ,python) + ("python-pywal" ,python-pywal))) + (home-page "https://github.com/jcaw/theme-magic") + (synopsis "Generate and apply color palettes based on your Emacs theme") + (description + "This package provides a command to extract the colors from your Emacs +theme and apply them to the rest of Linux with Pywal. Pywal only applies your +theme to the current session.") + (license license:gpl3+)))) + (define-public emacs-treepy (package (name "emacs-treepy") -- cgit v1.2.3 From 049e06b603ef0b8fcf5fa314379b9c525c58f53f Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Wed, 27 Jan 2021 18:02:07 -0800 Subject: gnu: pinentry-rofi: Update to 2.0.2. * gnu/packages/gnupg.scm (pinentry-rofi): Update to 2.0.2. [arguments]: Simplify the package definition. Signed-off-by: Nicolas Goaziou --- gnu/packages/gnupg.scm | 39 ++++++++------------------------------- 1 file changed, 8 insertions(+), 31 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 6e80ca339f..9be8a32540 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -894,7 +894,7 @@ passphrase when @code{gpg} is run and needs it."))) (define-public pinentry-rofi (package (name "pinentry-rofi") - (version "2.0.1") + (version "2.0.2") (source (origin (method git-fetch) (uri (git-reference @@ -902,7 +902,7 @@ passphrase when @code{gpg} is run and needs it."))) (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "044bnldz7k74s873jwsjgff176l1jsvpbaka7d1wcj8b5pwqv2av")))) + (base32 "14rbz32ykc8pz7gglbvxm3pcgabr7xdnddar6k24icd5xk9mr4rp")))) (build-system gnu-build-system) (arguments `(#:modules @@ -914,38 +914,15 @@ passphrase when @code{gpg} is run and needs it."))) %standard-phases (add-after 'install 'hall-wrap-binaries (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((compiled-dir - (lambda (out version) - (string-append out "/lib/guile/" version "/site-ccache"))) - (uncompiled-dir - (lambda (out version) - (string-append - out - "/share/guile/site" - (if (string-null? version) "" "/") - version))) - (dep-path - (lambda (env path) - (list env ":" 'prefix (list path)))) - (out (assoc-ref outputs "out")) + (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/")) - (site (uncompiled-dir out ""))) + (site (string-append out "/share/guile/site")) + (rofi-bin (string-append (assoc-ref inputs "rofi") "/bin"))) (match (scandir site) (("." ".." version) - (for-each - (lambda (file) - (wrap-program - (string-append bin file) - (dep-path - "PATH" - (string-append (assoc-ref inputs "rofi") "/bin")) - (dep-path - "GUILE_LOAD_PATH" - (uncompiled-dir out version)) - (dep-path - "GUILE_LOAD_COMPILED_PATH" - (compiled-dir out version)))) - ,''("pinentry-rofi")) + (wrap-program + (string-append bin "pinentry-rofi") + (list "PATH" ":" 'prefix `(,rofi-bin))) #t)))))))) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From fc4834f83ba825d31d22fc548b7d99c1bd033601 Mon Sep 17 00:00:00 2001 From: Andrew Miloradovsky Date: Sun, 24 Jan 2021 08:07:40 +0000 Subject: gnu: Add systemc. * gnu/packages/fpga.scm (systemc): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/fpga.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 96ba0026f9..9b3e8acb12 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -467,3 +467,33 @@ a hardware description and verification language. ") (description "This package provides a VHDL compiler and simulator.") (home-page "https://github.com/nickg/nvc") (license license:gpl3+))) + +(define-public systemc + (package + (name "systemc") + (version "2.3.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://accellera.org/images/downloads/standards/" + "systemc/systemc-" version ".tar.gz")) + (sha256 + (base32 "0gvv3xmhiwx1izmzy06yslzqzh6ygrgmw53xqfmyvbz5a6ivk0ap")))) + (native-inputs `(("perl" ,perl))) + (build-system gnu-build-system) + (arguments '(#:configure-flags '("--enable-debug"))) + (home-page "https://accellera.org/community/systemc") + (synopsis "Library for event-driven simulation") + (description + "SystemC is a C++ library for modeling concurrent systems, and the +reference implementation of IEEE 1666-2011. It provides a notion of timing as +well as an event-driven simulations environment. Due to its concurrent and +sequential nature, SystemC allows the description and integration of complex +hardware and software components. To some extent, SystemC can be seen as +a Hardware Description Language. However, unlike VHDL or Verilog, SystemC +provides sophisticated mechanisms that offer high abstraction levels on +components interfaces. This, in turn, facilitates the integration of systems +using different abstraction levels.") + ;; homepages.cae.wisc.edu/~ece734/SystemC/Esperan_SystemC_tutorial.pdf + (license license:asl2.0))) -- cgit v1.2.3 From 1a0907abd2f3e234e825f14dabc7961d240f30aa Mon Sep 17 00:00:00 2001 From: Andrew Miloradovsky Date: Sun, 24 Jan 2021 17:45:47 +0000 Subject: gnu: Add Verilator. * gnu/packages/fpga.scm (verilator): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/fpga.scm | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 9b3e8acb12..bee87d9311 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Amin Bandali ;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2021 Andrew Miloradovsky ;;; ;;; This file is part of GNU Guix. ;;; @@ -497,3 +498,59 @@ components interfaces. This, in turn, facilitates the integration of systems using different abstraction levels.") ;; homepages.cae.wisc.edu/~ece734/SystemC/Esperan_SystemC_tutorial.pdf (license license:asl2.0))) + +(define-public verilator + (package + (name "verilator") + (version "4.108") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/verilator/verilator") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0kcs0p8i2hiw348xqqh49pmllqspbzh2ljwmia03b42md5h4x5vf")))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("bison" ,bison) + ("flex" ,flex) + ("gettext" ,gettext-minimal) + ("python" ,python))) + (inputs + `(("perl" ,perl) + ("systemc" ,systemc))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags + (list (string-append "LDFLAGS=-L" + (assoc-ref %build-inputs "systemc") + "/lib-linux64")) + #:make-flags + (list (string-append "LDFLAGS=-L" + (assoc-ref %build-inputs "systemc") + "/lib-linux64")) + #:phases + (modify-phases %standard-phases + (replace 'bootstrap + (lambda _ (invoke "autoconf")))) + #:test-target "test")) + ;; #error "Something failed during ./configure as config_build.h is incomplete. + ;; Perhaps you used autoreconf, don't." -- so we won't. ^^ + (home-page "https://www.veripool.org/projects/verilator/") + (synopsis "Fast Verilog/SystemVerilog simulator") + (description + "Verilator is invoked with parameters similar to GCC or Synopsys’s VCS. +It ``Verilates'' the specified Verilog or SystemVerilog code by reading it, +performing lint checks, and optionally inserting assertion checks and +coverage-analysis points. It outputs single- or multi-threaded @file{.cpp} +and @file{.h} files, the ``Verilated'' code. + +The user writes a little C++/SystemC wrapper file, which instantiates the +Verilated model of the user’s top level module. These C++/SystemC files are +then compiled by a C++ compiler (GCC/Clang/etc.). The resulting executable +performs the design simulation. Verilator also supports linking its generated +libraries, optionally encrypted, into other simulators.") + (license license:lgpl3))) -- cgit v1.2.3 From b9650f7faafc7d691248692d18d99fa54cce5c76 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 28 Jan 2021 15:06:54 +0100 Subject: gnu: Add extractpdfmark. * gnu/packages/pdf.scm (extractpdfmark): New variable. --- gnu/packages/pdf.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 281dc31c36..66e920a7bb 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -101,6 +101,52 @@ #:use-module (gnu packages xorg) #:use-module (srfi srfi-1)) +(define-public extractpdfmark + (package + (name "extractpdfmark") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/trueroad/extractpdfmark") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14aa6zly53j8gx5d32caiabk2j4b102xha0v9149yahz6kbn5b80")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'start-xorg-server + ;; The test suite wants to write to /homeless-shelter + (lambda _ (setenv "HOME" (getcwd))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) + ("ghostscript" ,ghostscript) + ("pkg-config" ,pkg-config) + ("texlive" ,texlive-tiny))) + (inputs + `(("poppler" ,poppler))) + (home-page "https://github.com/trueroad/extractpdfmark") + (synopsis "Extract page mode and named destinations as PDFmark from PDF") + (description + "PDFmarks is a technique that accompanies PDF, and that is used to store +metadata such as author or title, but also structural information such as +bookmarks or hyperlinks. + +When Ghostscript reads the main PDF generated by the TeX system with embedded +PDF files and outputs the final PDF, the PDF page mode and name targets +etc. are not preserved. Therefore, when you open the final PDF, it is not +displayed correctly. Also, remote PDF links do not work correctly. + +This program is able to extract the page mode and named targets as PDFmark +from PDF. In this way, you can obtain embedded PDF files that have kept this +information.") + (license license:gpl3))) + (define-public flyer-composer (package (name "flyer-composer") -- cgit v1.2.3 From 6d3cafa086b380b371d093906390ad610170ff2b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 25 Jan 2021 15:34:23 +0100 Subject: gnu: Add trf. * gnu/packages/bioinformatics.scm (trf): New variable. --- gnu/packages/bioinformatics.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8514306f94..1aa60a0ae7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2822,6 +2822,30 @@ sequencing data. It uses paired-ends and split-reads to sensitively and accurately delineate genomic rearrangements throughout the genome.") (license license:gpl3+))) +(define-public trf + (package + (name "trf") + (version "4.09.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Benson-Genomics-Lab/TRF") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fhwr4s1mf8nw8fr5imwjvjr42b59p97zr961ifm8xl1bajz4wpg")))) + (build-system gnu-build-system) + (home-page "https://github.com/Benson-Genomics-Lab/TRF") + (synopsis "Tandem Repeats Finder: a program to analyze DNA sequences") + (description "A tandem repeat in DNA is two or more adjacent, approximate +copies of a pattern of nucleotides. Tandem Repeats Finder is a program to +locate and display tandem repeats in DNA sequences. In order to use the +program, the user submits a sequence in FASTA format. The output consists of +two files: a repeat table file and an alignment file. Submitted sequences may +be of arbitrary length. Repeats with pattern size in the range from 1 to 2000 +bases are detected.") + (license license:agpl3+))) + (define-public diamond (package (name "diamond") -- cgit v1.2.3 From 61342f248c78c484b8ebda2c1ccf3d81257d8402 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 25 Jan 2021 18:06:59 +0100 Subject: gnu: Add perl-text-soundex. * gnu/packages/perl.scm (perl-text-soundex): New variable. --- gnu/packages/perl.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index da05f7a95b..370783caf0 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2013, 2019, 2020 Andreas Enge -;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2019, 2021 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017, 2019, 2020 Eric Bavier ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016, 2018 Mark H Weaver @@ -11455,6 +11455,33 @@ lookup in %INC or by assuming it is $0 if the caller is @code{main} (or it can't find %INC{caller()}).") (license license:artistic2.0))) +(define-public perl-text-soundex + (package + (name "perl-text-soundex") + (version "3.05") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/R/RJ/RJBS/Text-Soundex-" + version ".tar.gz")) + (sha256 + (base32 + "1vb0vg1109gfzaak74ynw5s00ml28f33j612g2lxw98b52s5bpgn")))) + (build-system perl-build-system) + (home-page + "https://metacpan.org/release/Text-Soundex") + (synopsis "Implementation of the soundex algorithm.") + (description "Soundex is a phonetic algorithm for indexing names by sound, +as pronounced in English. The goal is for names with the same pronunciation to +be encoded to the same representation so that they can be matched despite +minor differences in spelling. + +This module implements the original soundex algorithm developed by Robert +Russell and Margaret Odell, patented in 1918 and 1922, as well as a variation +called \"American Soundex\" used for US census data, and current maintained by +the National Archives and Records Administration (NARA).") + (license license:perl-license))) + (define-public perl-regexp-pattern (package (name "perl-regexp-pattern") -- cgit v1.2.3 From 04b1a1f6bd2530ea46091ddfa04f9b81d62ed81e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 25 Jan 2021 18:07:07 +0100 Subject: gnu: Add repeat-masker. * gnu/packages/bioinformatics.scm (repeat-masker): New variable. --- gnu/packages/bioinformatics.scm | 56 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1aa60a0ae7..f536ae6004 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2846,6 +2846,62 @@ be of arbitrary length. Repeats with pattern size in the range from 1 to 2000 bases are detected.") (license license:agpl3+))) +(define-public repeat-masker + (package + (name "repeat-masker") + (version "4.1.1") + (source (origin + (method url-fetch) + (uri (string-append "http://www.repeatmasker.org/" + "RepeatMasker/RepeatMasker-" + version ".tar.gz")) + (sha256 + (base32 "03144sl9kh5ni2i33phi7x2pjndzbm5bjw3r4kqvmm6hxyb4k4x2")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #false ; there are none + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((share (string-append (assoc-ref outputs "out") + "/share/RepeatMasker"))) + (mkdir-p share) + (copy-recursively "." share) + (with-directory-excursion share + (invoke "perl" "configure" + "--trf_prgm" (which "trf") + "--hmmer_dir" + (string-append (assoc-ref inputs "hmmer") + "/bin")))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share/RepeatMasker")) + (bin (string-append out "/bin")) + (path (getenv "PERL5LIB"))) + (install-file (string-append share "/RepeatMasker") bin) + (wrap-program (string-append bin "/RepeatMasker") + `("PERL5LIB" ":" prefix (,path ,share))))))))) + (inputs + `(("perl" ,perl) + ("perl-text-soundex" ,perl-text-soundex) + ("python" ,python) + ("python-h5py" ,python-h5py) + ("hmmer" ,hmmer) + ("trf" ,trf))) + (home-page "https://github.com/Benson-Genomics-Lab/TRF") + (synopsis "Tandem Repeats Finder: a program to analyze DNA sequences") + (description "A tandem repeat in DNA is two or more adjacent, approximate +copies of a pattern of nucleotides. Tandem Repeats Finder is a program to +locate and display tandem repeats in DNA sequences. In order to use the +program, the user submits a sequence in FASTA format. The output consists of +two files: a repeat table file and an alignment file. Submitted sequences may +be of arbitrary length. Repeats with pattern size in the range from 1 to 2000 +bases are detected.") + (license license:osl2.1))) + (define-public diamond (package (name "diamond") -- cgit v1.2.3 From b7389f0db5f4029c7436d96137140d75bf797993 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 28 Jan 2021 15:54:34 +0100 Subject: gnu: musescore: Update to 3.6.1. * gnu/packages/music.scm (musescore): Update to 3.6.1. --- gnu/packages/music.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5902cf56ba..0da4cdd73a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 nikita ;;; Copyright © 2017 Rodger Fox -;;; Copyright © 2017, 2018, 2019, 2020 Nicolas Goaziou +;;; Copyright © 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou ;;; Copyright © 2017, 2018, 2019 Pierre Langlois ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice @@ -4434,7 +4434,7 @@ standalone JACK client and an LV2 plugin is also available.") (define-public musescore (package (name "musescore") - (version "3.6") + (version "3.6.1") (source (origin (method git-fetch) @@ -4443,7 +4443,7 @@ standalone JACK client and an LV2 plugin is also available.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0c9yf8irkism3ffzzpkx636wa6b1r1lgpsb2x63pr0gbi5ss5kyh")) + (base32 "087j474sdm8vcjczfqlbb1hpcvgvdghjsd132db9dlqwpgk4hmnv")) (modules '((guix build utils))) (snippet ;; Remove unused libraries. -- cgit v1.2.3 From c13bd9bec84ce43c1e4aac415759537f16e822fa Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 28 Jan 2021 16:19:53 +0100 Subject: gnu: cuirass: Update to 0.0.1-59.68532ae. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-59.68532ae. Signed-off-by: Mathieu Othacehe --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index dad2e4e00c..508544c975 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -69,8 +69,8 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "da6a5c0355e72d725003c9005a9974f2a476d999") - (revision "58")) + (let ((commit "68532aee908954887bfd6393009485d5bbb94ea2") + (revision "59")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -82,7 +82,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0p9ad0aisbl7clb3vi7zmfbnmnsnxq90vgx8v9ly5b0dgrav91p4")))) + "0p6d04xnw6djp8wfr6wh6jx2v3nh9pcw57bgbvv6rk26xy6q69nf")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 96c183bf65e149ecafa1ddf6c2bea4e4167bc6d5 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 28 Jan 2021 16:20:43 +0100 Subject: gnu: guile-sqlite3-dev: Remove it. * gnu/packages/ci.scm (guile-sqlite3-dev): Remove it. Signed-off-by: Mathieu Othacehe --- gnu/packages/ci.scm | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 508544c975..b32514ce20 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -40,7 +40,6 @@ #:use-module (gnu packages perl) #:use-module (gnu packages perl-compression) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages texinfo) #:use-module (gnu packages version-control) @@ -48,26 +47,6 @@ #:use-module (gnu packages xml) #:use-module (guix build-system gnu)) -;; Guile-Sqlite3 package adding SQL query logging support. -;; Remove it when next Guile-Sqlite3 release is out. -(define-public guile-sqlite3-dev - (let ((commit "22ef45d268de7707cbbb943c404f9b0c1668e2e1") - (revision "1")) - (package - (inherit guile-sqlite3) - (name "guile-sqlite3") - (version (git-version "0.1.2" revision commit)) - (home-page "https://notabug.org/mothacehe/guile-sqlite3.git") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit commit))) - (sha256 - (base32 - "1q90f8zhw9n1c39szd2ba7aj5fi92m09pnlv0z7jbhnnjam5jwcd")) - (file-name (string-append name "-" version "-checkout"))))))) - (define-public cuirass (let ((commit "68532aee908954887bfd6393009485d5bbb94ea2") (revision "59")) -- cgit v1.2.3 From db74cc6a2f6de1c40ef585089316f407e9784d83 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 28 Jan 2021 16:32:54 +0100 Subject: gnu: libsmbios: Use osl2.1 license variable. * gnu/packages/hardware.scm (libsmbios)[license]: Use osl2.1 binding. --- gnu/packages/hardware.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 59f36a8135..e0a4fad2e0 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -171,9 +171,7 @@ also provides extensions for proprietary methods of interfacing with Dell specific SMBIOS tables.") (home-page "https://github.com/dell/libsmbios") (license - (list (license:non-copyleft "file://COPYING-OSL" - "Open Software License version 2.1") - license:gpl2+ license:bsd-3 license:boost1.0)))) + (list license:osl2.1 license:gpl2+ license:bsd-3 license:boost1.0)))) ;; Distinct from memtest86, which is obsolete. (define-public memtest86+ -- cgit v1.2.3 From ca5a791f6285b08506ccd662d5911ccf0c4d1ece Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 28 Jan 2021 17:02:32 +0100 Subject: gnu: emacs-flycheck-grammalecte: Fix hash. * gnu/packages/emacs-xyz.scm (emacs-flycheck-grammalecte): Fix hash. The previous hash was from the "dev" branch of the repository. --- 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 85356f2281..9b648da80a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4747,7 +4747,7 @@ for Flow files.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1f1gapvs9j89qr474103dqgsiyb96phlnsmq5hiv4ba242blg9lb")))) + (base32 "0ih0nakal36is0dci82gx4ijrvnpz9jpw1adprfara2cf8dx4rk6")))) (build-system emacs-build-system) (arguments `(#:include (cons "\\.py$" %default-include) -- cgit v1.2.3 From 33a61d65b79b81859f1f97e5dac395c8df88beed Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 28 Jan 2021 18:06:25 +0100 Subject: gnu: emacs-flycheck-grammalecte: Fix build. * gnu/packages/emacs-xyz.scm (emacs-flycheck-grammalecte)[arguments]: Fix typo in variable name. --- 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 9b648da80a..44e97bf33b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4769,7 +4769,7 @@ for Flow files.") (lambda* (#:key inputs #:allow-other-keys) (make-file-writable "flycheck-grammalecte.el") (emacs-substitute-variables "flycheck-grammalecte.el" - ("flycheck-grammalecte--grammalecte-directory" + ("flycheck-grammalecte-grammalecte-directory" (string-append (assoc-ref inputs "grammalecte") "/lib/python" ,(version-major+minor (package-version python)) -- cgit v1.2.3 From 34861ac8eae3935b19b387545ca3c4c311fb66e7 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 28 Jan 2021 14:26:28 +0100 Subject: gnu: Add tpm2-tss. * gnu/packages/hardware.scm (tpm2-tss): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/hardware.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index e0a4fad2e0..10672f52f3 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -28,6 +28,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) + #:use-module (gnu packages curl) #:use-module (gnu packages documentation) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) @@ -42,6 +43,8 @@ #:use-module (gnu packages polkit) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages tls) + #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -541,3 +544,31 @@ screens. It displays various patterns and allows you to estimate the quality of your CRT/LCD monitor.") (home-page "https://github.com/TobiX/screentest") (license license:gpl2))) + +(define-public tpm2-tss + (package + (name "tpm2-tss") + (version "3.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/tpm2-software/tpm2-tss" + "/releases/download/" version "/tpm2-tss-" version + ".tar.gz")) + (sha256 + (base32 "05xynpwq851fp8f5fy7ac0blvz8mr5m5cbqj3gslgbwv63kjnfbq")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("curl" ,curl) + ("json-c" ,json-c) + ("openssl" ,openssl))) + (home-page "https://tpm2-software.github.io/") + (synopsis "OSS Implementation of the TCG TPM2 Software Stack (TSS2)") + (description + "This package provides the @acronym{TCG, Trusted Computing Group} +@acronym{TSS2, TPM2 Software Stack}. The stack contains libtss2-fapi, +libtss2-esys, libtss2-sys, libtss2-mu, libtss2-tcti-device, libtss2-tcti-swtpm +and libtss2-tcti-mssim.") + (license license:bsd-2))) -- cgit v1.2.3 From c02cad6d334f768f131f006c1a81c07954d872c6 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 12 Jan 2021 19:56:31 +0000 Subject: gnu: libbpf: Update to 0.1.1. * gnu/packages/linux.scm (libbpf): Update to 0.1.1. [arguments]: Remove obsolete deletion. Signed-off-by: Efraim Flashner --- gnu/packages/linux.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2735c67200..84f23426aa 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -49,7 +49,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Anders Thuné ;;; Copyright © 2020 Maxim Cournoyer -;;; Copyright © 2020 Greg Hogan +;;; Copyright © 2020, 2021 Greg Hogan ;;; Copyright © 2020 Zhu Zihao ;;; Copyright © 2020 David Dashyan ;;; Copyright © 2020 pukkamustard @@ -7587,7 +7587,7 @@ persistent over reboots.") (define-public libbpf (package (name "libbpf") - (version "0.0.9") + (version "0.1.1") (source (origin (method git-fetch) @@ -7597,7 +7597,7 @@ persistent over reboots.") (file-name (git-file-name name version)) (sha256 (base32 - "18l0gff7nm841mwhr7bc7x863xcyvwh58zl7mc0amnsjqlbrvqg7")))) + "0ilnnm4q22f8fagwp8kb37licy4ks861i2iqh2djsypqhnxvx3fv")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -7617,10 +7617,7 @@ persistent over reboots.") (modify-phases %standard-phases (delete 'configure) (add-before 'build 'pre-build - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "scripts/check-reallocarray.sh" - (("/bin/rm" rm) - (string-append (assoc-ref inputs "coreutils") rm))) + (lambda _ (chdir "src") #t))))) (home-page "https://github.com/libbpf/libbpf") -- cgit v1.2.3 From c2538db5617032788ac2f140496d00d8107579c8 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 12 Jan 2021 19:56:57 +0000 Subject: gnu: bcc: Update to 0.16.0. * gnu/packages/linux.scm (bcc): Update to 0.16.0. Signed-off-by: Efraim Flashner --- 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 84f23426aa..043cf2ca56 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7631,7 +7631,7 @@ headers.") (define-public bcc (package (name "bcc") - (version "0.15.0") + (version "0.16.0") (source (origin (method git-fetch) @@ -7641,7 +7641,7 @@ headers.") (file-name (git-file-name name version)) (sha256 (base32 - "1d5j9zanffa1c7lpi5fcrdlx1n7hy86xl82fam2xqr0s41q4ipxw")))) + "1367c0bzrpclvjvmk0sxgi49rh7j2f9izqk5a7g3yvawh1fmvvjh")))) (build-system cmake-build-system) (native-inputs `(("bison" ,bison) -- cgit v1.2.3 From 7495843d3ca08f33beb0f057a9d672899184a8e1 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Wed, 27 Jan 2021 19:55:12 -0500 Subject: gnu: git-annex: Update to 8.20210127. * gnu/packages/haskell-apps.scm (git-annex): Update to 8.20210127. Signed-off-by: Efraim Flashner --- gnu/packages/haskell-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 19a0fc8a44..a6fb33c31b 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -339,14 +339,14 @@ to @code{cabal repl}).") (define-public git-annex (package (name "git-annex") - (version "8.20201127") + (version "8.20210127") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "0n9m5ffgbzms0nh9dskrc7vjgwwwi9f9gxyh498wnspf96729zz7")))) + (base32 "1hsmaw70lfza1g5j6b9zbwqkkr374m18p7qb4nl952pj42a46vv3")))) (build-system haskell-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 8a488d689509005d8d95ede1fb2d35167faa4749 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Wed, 27 Jan 2021 05:21:54 +0000 Subject: gnu: esbuild: Update to 0.8.36. * gnu/packages/web.scm (esbuild): Update to 0.8.36. Signed-off-by: Efraim Flashner --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 16c99af9d3..1fe393c14b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1487,7 +1487,7 @@ used to validate and fix HTML data.") (define-public esbuild (package (name "esbuild") - (version "0.8.32") + (version "0.8.36") (source (origin (method git-fetch) @@ -1496,7 +1496,7 @@ used to validate and fix HTML data.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "17aa269dq0gsm4nlhh1q2mj6k8mw6v8ig3nygwk3s07l2xl5gqvn")) + (base32 "18k5j12dzfnj38j7acl9gqsqqnqb133c4j557c47jqx6gvpgcz5a")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 8ee5b42546f0f318be36fde15f13c710d7e9d027 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Fri, 22 Jan 2021 19:37:19 +0100 Subject: gnu: libfprint: Update to 1.90.7. * gnu/packages/freedesktop.scm (libfprint): Update to 1.90.7. Signed-off-by: Efraim Flashner --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index ef35349ec2..e175a95ef1 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1480,7 +1480,7 @@ wish to perform colour calibration.") (define-public libfprint (package (name "libfprint") - (version "1.90.6") + (version "1.90.7") (source (origin (method git-fetch) @@ -1489,7 +1489,7 @@ wish to perform colour calibration.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hagm1i78mrd772y3cinr7bda4myx0v4bixwqnqbxknds8m9h8sg")))) + (base32 "00pmdpxxjj4sh8qjq9ch3pylgg9w019rg1bbaw53a4wr637rrz43")))) (build-system meson-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 1649d0f20985551a92ba2182e4e2ad1fbc9ee160 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Fri, 22 Jan 2021 19:39:58 +0100 Subject: gnu: libgdiplus: Update to 6.0.5. * gnu/packages/mono.scm (libgdiplus): Update to 6.0.5. Signed-off-by: Efraim Flashner --- gnu/packages/mono.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mono.scm b/gnu/packages/mono.scm index a01b63f08a..9e5b428969 100644 --- a/gnu/packages/mono.scm +++ b/gnu/packages/mono.scm @@ -134,7 +134,7 @@ Java.") (define-public libgdiplus (package (name "libgdiplus") - (version "6.0.4") + (version "6.0.5") (source (origin (method url-fetch) @@ -144,7 +144,7 @@ Java.") ".tar.gz")) (sha256 (base32 - "0adz5813f881z65lpyf0g0w9hcn7d7qkai6sncpkwnsxfv4khp5p")))) + "1vr5l09i5i91n9qzky7ab9wwvgdidvrbw26y8llip0z4qdf4w7mq")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 79c11747c0bae8580533a6a072fa0283a09ab173 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Wed, 27 Jan 2021 13:06:43 +0100 Subject: gnu: dnsmasq: Update to 2.84. * gnu/packages/dns.scm (dnsmasq): Update to 2.84. Signed-off-by: Efraim Flashner --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 800d2dca34..9583cd3af9 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -277,7 +277,7 @@ prompt the user with the option to go with insecure DNS only.") (define-public dnsmasq (package (name "dnsmasq") - (version "2.83") + (version "2.84") (source (origin (method url-fetch) (uri (string-append @@ -285,7 +285,7 @@ prompt the user with the option to go with insecure DNS only.") version ".tar.xz")) (sha256 (base32 - "1sjamz1v588qf35m8z6wcqkjk5w12bqhj7d7p48dj8jyn3lgghgz")))) + "0305a0c3snwqcv77sipyynr55xip1fp2843yn04pc4vk9g39acb0")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 00809fccababb4d7c20ed1e34ac9e535d015e0dc Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 24 Jan 2021 02:52:26 +0100 Subject: gnu: xfce4-genmon-plugin: Update to 4.1.1. * gnu/packages/xfce.scm (xfce4-genmon-plugin): Update to 4.1.1. Signed-off-by: Efraim Flashner --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index c8dd66b2e0..61b317e74a 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1620,7 +1620,7 @@ be clicked to open the chosen mount point.") (define-public xfce4-genmon-plugin (package (name "xfce4-genmon-plugin") - (version "4.1.0") + (version "4.1.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -1629,7 +1629,7 @@ be clicked to open the chosen mount point.") "/xfce4-genmon-plugin-" version ".tar.bz2")) (sha256 (base32 - "0zafr1jrw87l7h4z3wp88gj7n5mcygm22aw42vdpnp2l8x5nn9fi")))) + "0d81npcqnmkw2qaqa8c6igh9j5r4ivgb15zcjwxjkyhrzz89y4dj")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 8000d225c35396f9677951046e1a8e04e9be6784 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Thu, 21 Jan 2021 23:31:48 +0100 Subject: gnu: libcap-ng: Update to 0.8.2. * gnu/packages/admin.scm (libcap-ng): Update to 0.8.2. Signed-off-by: Efraim Flashner --- 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 9b6f0fd0bd..c470d9288f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2095,7 +2095,7 @@ track changes in important system configuration files.") (define-public libcap-ng (package (name "libcap-ng") - (version "0.8") + (version "0.8.2") (source (origin (method url-fetch) (uri (string-append @@ -2103,7 +2103,7 @@ track changes in important system configuration files.") version ".tar.gz")) (sha256 (base32 - "08cy59iassiwbmfxa5v0kb374r80290vv32f5q1mnip11av26kgi")))) + "1sasp1n154aqy9fz0knlb966svm7xg1zjhg1vr4q839bgjvq7h2j")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 5bf1e8562256ede4140ead6f0dc5dae3ef2b38c1 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 25 Jan 2021 12:10:32 +0100 Subject: gnu: gusb: Update to 0.3.5. * gnu/packages/gnome.scm (gusb): Update to 0.3.5. Signed-off-by: Efraim Flashner --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 505d4bf725..c72ad9a506 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6433,7 +6433,7 @@ DAV, and others.") (define-public gusb (package (name "gusb") - (version "0.3.0") + (version "0.3.5") (source (origin (method git-fetch) (uri (git-reference @@ -6442,7 +6442,7 @@ DAV, and others.") (file-name (git-file-name name version)) (sha256 (base32 - "002pg0p4qzzk5dkyiynm483ir26zxrn4k71c7f6j85mfsdzbgli7")))) + "0ifhdqhpyxwsg0z9s1anj7cf5pya5qsqyp5ksh9n7mqwa4lrjkl8")))) (build-system meson-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) -- cgit v1.2.3 From 441b93cef7deb1d5ea7e691639c509e01841a547 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 19 Jan 2021 17:49:22 +0800 Subject: gnu: fcitx5-configtool: Fix indentation. * gnu/packages/fcitx5.scm(fcitx5-configtool): Fix indentation. Signed-off-by: Efraim Flashner --- gnu/packages/fcitx5.scm | 70 ++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index ed0d928fc7..76219de55e 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -342,42 +342,42 @@ including input methods previous bundled inside Fcitx 4: (define-public fcitx5-configtool (package - (name "fcitx5-configtool") - (version "5.0.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://download.fcitx-im.org/fcitx5" - "/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz")) - (sha256 - (base32 "0mrqhzvab41hkvhkz7vkb8d2mv5bgx4aqp9jpz4kf3kskwm1q14b")))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags - ;; KDE is currently not working on Guix, KCM supports doesn't make sense. - '("-DENABLE_KCM=Off"))) - (inputs - `(("fcitx5" ,fcitx5) - ("fcitx5-qt" ,fcitx5-qt) - ("qtbase" ,qtbase) - ("qtx11extras" ,qtx11extras) - ("kitemviews" ,kitemviews) - ("kwidgetsaddons" ,kwidgetsaddons) - ("libx11" ,libx11) - ("xkeyboard-config" ,xkeyboard-config) - ("libxkbfile" ,libxkbfile) - ("gettext" ,gettext-minimal) - ("iso-codes" ,iso-codes))) - (native-inputs - `(("gcc" ,gcc-9) - ("extra-cmake-modules" ,extra-cmake-modules) - ("pkg-config" ,pkg-config))) - (home-page "https://github.com/fcitx/fcitx5-configtool") - (synopsis "Graphical configuration tool for Fcitx 5") - (description "Fcitx5-configtool is a graphical configuration tool + (name "fcitx5-configtool") + (version "5.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://download.fcitx-im.org/fcitx5" + "/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz")) + (sha256 + (base32 "0mrqhzvab41hkvhkz7vkb8d2mv5bgx4aqp9jpz4kf3kskwm1q14b")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + ;; KDE is currently not working on Guix, KCM supports doesn't make sense. + '("-DENABLE_KCM=Off"))) + (inputs + `(("fcitx5" ,fcitx5) + ("fcitx5-qt" ,fcitx5-qt) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras) + ("kitemviews" ,kitemviews) + ("kwidgetsaddons" ,kwidgetsaddons) + ("libx11" ,libx11) + ("xkeyboard-config" ,xkeyboard-config) + ("libxkbfile" ,libxkbfile) + ("gettext" ,gettext-minimal) + ("iso-codes" ,iso-codes))) + (native-inputs + `(("gcc" ,gcc-9) + ("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/fcitx/fcitx5-configtool") + (synopsis "Graphical configuration tool for Fcitx 5") + (description "Fcitx5-configtool is a graphical configuration tool to manage different input methods in Fcitx 5.") - (license license:gpl2+))) + (license license:gpl2+))) (define-public fcitx5-material-color-theme (package -- cgit v1.2.3 From e07d78b8ace31688e0a1fcf834d791add05db322 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 19 Jan 2021 17:54:02 +0800 Subject: gnu: xcb-imdkit: Update to 1.0.2. * gnu/packages/fcitx5.scm(xcb-imdkit): Update to 1.0.2. Signed-off-by: Efraim Flashner --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 76219de55e..ff9a1153a7 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -51,7 +51,7 @@ (define-public xcb-imdkit (package (name "xcb-imdkit") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) @@ -59,7 +59,7 @@ "https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-" version ".tar.xz")) (sha256 - (base32 "1qgbbp8y8ci7haz99vgbrgpjsbrwwyjianyhdvxcirnbm5bybvmz")) + (base32 "16f7jdnrr8lrll7qvnj0gh3gwzgn5idfsc9rwi1gp1n2mnjrs7w0")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From ce7a5503a02950d2f197abc178735d631b12984b Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 22 Jan 2021 19:02:26 +0800 Subject: gnu: libime: Update to 1.0.3. * gnu/packages/fcitx5.scm(libime): Update to 1.0.3. Signed-off-by: Efraim Flashner --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index ff9a1153a7..0e3fe152cd 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -171,14 +171,14 @@ client.") (define-public libime (package (name "libime") - (version "1.0.2") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-" version "_dict.tar.xz")) (sha256 - (base32 "006pncby7p6h3rnicckzjwi6jzsrqiqbj6p9bpic80lanlllgw31")))) + (base32 "1gi9ylqha9x3dhjsa2i7x9wh2g9vgqkkfr6s1facs2ky65vgvdrv")))) (build-system cmake-build-system) (inputs `(("fcitx5" ,fcitx5) -- cgit v1.2.3 From bcfab937807710886c7d211c95d83409d18f0d9a Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 19 Jan 2021 17:54:39 +0800 Subject: gnu: fcitx5: Update to 5.0.4. * gnu/packages/fcitx5.scm(fcitx5): Update to 5.0.4. Signed-off-by: Efraim Flashner --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 0e3fe152cd..6a68c4e869 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -86,7 +86,7 @@ client.") (define-public fcitx5 (package (name "fcitx5") - (version "5.0.3") + (version "5.0.4") (source (origin (method url-fetch) @@ -94,7 +94,7 @@ client.") "https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-" version "_dict.tar.xz")) (sha256 - (base32 "06zkb33m2rnhg385iy79n3r4svz5jbav74di61xqa3lhbv7534s3")))) + (base32 "14pqbjbdc3b5xlycm92gs1rgkmpykfnyls3gfr608902lk2lw5as")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 3a94ccb51b30f17edad820fb75e946f6609eaeb8 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 19 Jan 2021 17:55:15 +0800 Subject: gnu: fcitx5-lua: Update to 5.0.2. * gnu/packages/fcitx5.scm(fcitx5-lua): Update to 5.0.2. Signed-off-by: Efraim Flashner --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 6a68c4e869..036d2009b1 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -146,7 +146,7 @@ client.") (define-public fcitx5-lua (package (name "fcitx5-lua") - (version "5.0.1") + (version "5.0.2") (source (origin (method url-fetch) @@ -154,7 +154,7 @@ client.") "https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-" version ".tar.xz")) (sha256 - (base32 "177mj56j8yrl79hvk7bbrifvm137np23pwalv83ibgk4l51z92hf")))) + (base32 "0y5yc9102bz681f4wj6xqjxmfdmrshz3fhf39pa61718hkyy9lih")))) (build-system cmake-build-system) (inputs `(("fcitx5" ,fcitx5) -- cgit v1.2.3 From 2db7f8f9ac66c68e8593bec70a7c4aab2e3e9cac Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 19 Jan 2021 17:55:33 +0800 Subject: gnu: fcitx5-chinese-addons: Update to 5.0.3. * gnu/packages/fcitx5.scm(fcitx5-chinese-addons): Update to 5.0.3. Signed-off-by: Efraim Flashner --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 036d2009b1..14de450f37 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -282,7 +282,7 @@ for Qt based application.") (define-public fcitx5-chinese-addons (package (name "fcitx5-chinese-addons") - (version "5.0.2") + (version "5.0.3") (source (origin (method url-fetch) @@ -290,7 +290,7 @@ for Qt based application.") "/fcitx5-chinese-addons/fcitx5-chinese-addons-" version "_dict.tar.xz")) (sha256 - (base32 "0mf91gzwzhfci0jn6g3l516xjw8r4v40ginnbl70h1zx6vr24rfp")))) + (base32 "1kmzbllk0g86m2z3piwn9j84ihxixyxzv7rzj832xfvwqgk7gixk")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From 249ab27306dae69ffb836782e4ec5dc2550f2f6c Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 22 Jan 2021 17:56:00 +0800 Subject: gnu: fcitx5-gtk: Update to 5.0.3. * gnu/packages/fcitx5.scm(fcitx5-gtk): Update to 5.0.3. Signed-off-by: Efraim Flashner --- gnu/packages/fcitx5.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 14de450f37..982536a949 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -196,7 +196,7 @@ editors.") (define-public fcitx5-gtk (package (name "fcitx5-gtk") - (version "5.0.1") + (version "5.0.3") (source (origin (method url-fetch) @@ -204,7 +204,7 @@ editors.") "/fcitx5-gtk/fcitx5-gtk-" version ".tar.xz")) (sha256 - (base32 "0h53liraqc5nz4nyi3ixdfdw3zzkdcsiff7j25acc3gmaa5gyij7")))) + (base32 "18bwwj9a5v82c6ssc8560hd8vwykakvg6sfijwdb5jswk9mafvgj")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;No test @@ -212,7 +212,9 @@ editors.") (list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=" %output "/share/gir-1.0") (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=" - %output "/lib/girepository-1.0")) + %output "/lib/girepository-1.0") + ;; TODO: Enable it when Guix has GTK4. + "-DENABLE_GTK4_IM_MODULE=Off") #:phases (modify-phases %standard-phases (add-before 'configure 'patch-install-prefix -- cgit v1.2.3 From 249cfe69b70cc3c0a1c45990e9700a420962978e Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 22 Jan 2021 17:56:51 +0800 Subject: gnu: fcitx5-qt: Update to 5.0.2. * gnu/packages/fcitx5.scm(fcitx5-qt): Update to 5.0.2. Signed-off-by: Efraim Flashner --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 982536a949..2ab576df21 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -249,7 +249,7 @@ for GTK+2/GTK+3 application.") (define-public fcitx5-qt (package (name "fcitx5-qt") - (version "5.0.1") + (version "5.0.2") (source (origin (method url-fetch) @@ -257,7 +257,7 @@ for GTK+2/GTK+3 application.") "/fcitx5-qt/fcitx5-qt-" version ".tar.xz")) (sha256 - (base32 "0ilhb4yw9k3m1c4fidnv3nd5dgm9xxds11dgdys6gswjjnmcgqqm")))) + (base32 "15rn111mrp6lcgm0ka3vb6a6qwkv6kqkqn563wsm49n16iy1dhqj")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 00a04b8ad927fb262dfcfe187f47bc8cd8d03804 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 19 Jan 2021 17:55:56 +0800 Subject: gnu: fcitx5-configtool: Update to 5.0.2. * gnu/packages/fcitx5.scm(fcitx5-configtool): Update to 5.0.2. Signed-off-by: Efraim Flashner --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 2ab576df21..79d5799774 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -345,7 +345,7 @@ including input methods previous bundled inside Fcitx 4: (define-public fcitx5-configtool (package (name "fcitx5-configtool") - (version "5.0.1") + (version "5.0.2") (source (origin (method url-fetch) @@ -353,7 +353,7 @@ including input methods previous bundled inside Fcitx 4: "https://download.fcitx-im.org/fcitx5" "/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz")) (sha256 - (base32 "0mrqhzvab41hkvhkz7vkb8d2mv5bgx4aqp9jpz4kf3kskwm1q14b")))) + (base32 "0rpk3yn572pcr29jak63x84g0qgj8hj011aw8gmxjah9311nxhpb")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From c2739c0801ebc5461564e862ce8f08405e2782dc Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 28 Jan 2021 17:10:48 +0000 Subject: gnu: rdma-core: Update to 33.1. * gnu/packages/linux.scm (rdma-core): Update to 33.1. Signed-off-by: Efraim Flashner --- 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 043cf2ca56..54b4f76a43 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5507,7 +5507,7 @@ The package provides additional NTFS tools.") (define-public rdma-core (package (name "rdma-core") - (version "26.0") + (version "33.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -5515,7 +5515,7 @@ The package provides additional NTFS tools.") version ".tar.gz")) (sha256 (base32 - "14raqwx4pkzghiwkx1v0dq338f7xqqx8rnsxlpdnngvjy1p5l79j")))) + "1rah0v9gq9rksqd2c17nmydsxcjz178n7m2y4ricwlf5pq1b2yfi")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From aa108f27102f64d93ad7794a6706e0c147d19cb3 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 28 Jan 2021 17:11:22 +0000 Subject: gnu: libfabric: Update to 0.11.2. * gnu/packages/linux.scm (libfabric): Update to 0.11.2. Signed-off-by: Efraim Flashner --- 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 54b4f76a43..56a82b0644 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6726,7 +6726,7 @@ comparing system environments.") (define-public libfabric (package (name "libfabric") - (version "1.4.1") + (version "1.11.2") (source (origin (method url-fetch) @@ -6734,7 +6734,7 @@ comparing system environments.") (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) (sha256 - (base32 "19l2m1frna1l765z4j7wl8hp4rb9wrh0hy5496685hd183hmy5pv")))) + (base32 "1nnpfkwxhim2nqjkb1vwrb4wj4j3l6w6yvvy69fqam2snlhshazz")))) (build-system gnu-build-system) (inputs `(("rdma-core" ,rdma-core) ,@(match (%current-system) -- cgit v1.2.3 From 2ac4428030adf7bb7074a777389f8cb361e28c5a Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Wed, 27 Jan 2021 09:21:02 +0100 Subject: gnu: xfce4-panel: Update to 4.16.1. * gnu/packages/xfce.scm (xfce4-panel): Update to 4.16.1. Signed-off-by: Efraim Flashner --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 61b317e74a..242f07041c 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -413,7 +413,7 @@ management D-Bus specification.") (define-public xfce4-panel (package (name "xfce4-panel") - (version "4.16.0") + (version "4.16.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -421,7 +421,7 @@ management D-Bus specification.") name "-" version ".tar.bz2")) (sha256 (base32 - "0gf57hgx6v44bc2hj570inkafbi291scc6wbhmr6sc3xngp9m5sy")) + "14arjxpvnxdl0a0ajifrmy2py3hv5qy4fykl52wdp4k5pv39n2gs")) (patches (search-patches "xfce4-panel-plugins.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From d889c96be4e0794a33d215d24eabe7e65c1d75b9 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Wed, 27 Jan 2021 09:34:03 +0100 Subject: gnu: xfce4-statusnotifier-plugin: Update to 0.2.3. * gnu/packages/xfce.scm (xfce4-statusnotifier-plugin): Update to 0.2.3. Signed-off-by: Efraim Flashner --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 242f07041c..31f6072630 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1886,7 +1886,7 @@ favorite search engine or bug tracker right from the Xfce panel.") (define-public xfce4-statusnotifier-plugin (package (name "xfce4-statusnotifier-plugin") - (version "0.2.2") + (version "0.2.3") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -1895,7 +1895,7 @@ favorite search engine or bug tracker right from the Xfce panel.") "/xfce4-statusnotifier-plugin-" version ".tar.bz2")) (sha256 (base32 - "1yic99jx7013pywpd0k31pxab8s8lv3wcq364iha99qhsm25k42c")))) + "1d2n56g12dhnjznrq7xvr6d3brpp0lmm080xmgjb7ybc1yygpxrc")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From c4a2cbeb06f2a4d56f98e682c2897a3167530f58 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Jan 2021 22:24:17 +0100 Subject: gnu: Add r-demultiplex. * gnu/packages/bioinformatics.scm (r-demultiplex): New variable. --- gnu/packages/bioinformatics.scm | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f536ae6004..161767c671 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017, 2018 Ben Woodcroft ;;; Copyright © 2015, 2016, 2018, 2019, 2020 Pjotr Prins ;;; Copyright © 2015 Andreas Enge @@ -7269,6 +7269,45 @@ between two different types of motif instances using as much relevant information as possible.") (license (list license:gpl2+ license:gpl3+)))) +(define-public r-demultiplex + (let ((commit "6e2a1422c8e6f418cfb271997eebc91f9195f299") + (revision "1")) + (package + (name "r-demultiplex") + (version (git-version "1.0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chris-mcginnis-ucsf/MULTI-seq") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "01kv88wp8vdaq07sjk0d3d1cb553mq1xqg0war81pgmg63bgi38w")))) + (properties `((upstream-name . "deMULTIplex"))) + (build-system r-build-system) + (propagated-inputs + `(("r-kernsmooth" ,r-kernsmooth) + ("r-reshape2" ,r-reshape2) + ("r-rtsne" ,r-rtsne) + ("r-shortread" ,r-shortread) + ("r-stringdist" ,r-stringdist))) + (home-page "https://github.com/chris-mcginnis-ucsf/MULTI-seq") + (synopsis "MULTI-seq pre-processing and classification tools") + (description + "deMULTIplex is an R package for analyzing single-cell RNA sequencing +data generated with the MULTI-seq sample multiplexing method. The package +includes software to + +@enumerate +@item Convert raw MULTI-seq sample barcode library FASTQs into a sample + barcode UMI count matrix, and +@item Classify cell barcodes into sample barcode groups. +@end enumerate +") + (license license:cc0)))) + (define-public r-genefilter (package (name "r-genefilter") -- cgit v1.2.3 From 5c8765e9898f0cfc51d34bf9602725840af6eabb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 00:06:55 +0100 Subject: gnu: emacs-repology: Update to 1.1.0. * gnu/packages/emacs-xyz.scm (emacs-repology): Update to 1.1.0. --- 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 44e97bf33b..28c7b41d79 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21233,14 +21233,14 @@ buffer and launches Magit from the status buffer for the project at point.") (define-public emacs-repology (package (name "emacs-repology") - (version "1.0.1") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "repology-" version ".tar")) (sha256 - (base32 "0y12496wafx95izah8vvv1x86k1m8kysm5mlhvshkp0zbpvmb5iq")))) + (base32 "031245rrhazj53bk1csa6x3ygzvg74w2hwjf08ficwvmdn97li90")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/repology.html") (synopsis "Repology API access via Elisp") -- cgit v1.2.3 From c21ad767d4368dbd9ff37a6fd5cdea8aa37fec57 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 28 Jan 2021 21:15:04 +0000 Subject: gnu: Add stuff. * gnu/packages/astronomy.scm (stuff): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/astronomy.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 58fefa04a0..c22bfb8709 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -306,6 +306,27 @@ can be used to control telescopes over a serial port for tracking celestial objects.") (license license:gpl2+))) +(define-public stuff + (package + (name "stuff") + (version "1.26.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.astromatic.net/download/stuff/" + "stuff-" version ".tar.gz")) + (sha256 + (base32 "1syibi3b86z9pikhicvkkmgxm916j732fdiw0agw0lq6z13fdcjm")))) + (build-system gnu-build-system) + (home-page "https://www.astromatic.net/software/stuff") + (synopsis "Astronomical catalogue simulation") + (description + "Stuff is a program that simulates \"perfect\" astronomical catalogues. +It generates object lists in ASCII which can read by the SkyMaker program to +produce realistic astronomical fields. Stuff is part of the EFIGI development +project.") + (license license:gpl3+))) + (define-public celestia (let ((commit "9dbdf29c4ac3d20afb2d9a80d3dff241ecf81dce")) (package -- cgit v1.2.3 From fe058ffb53590d69d0a054773e3bd116c8dfe846 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 29 Jan 2021 11:02:47 +0100 Subject: gnu: Add swarp. * gnu/packages/astronomy.scm (swarp): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/astronomy.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index c22bfb8709..cec37113bf 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -327,6 +327,25 @@ produce realistic astronomical fields. Stuff is part of the EFIGI development project.") (license license:gpl3+))) +(define-public swarp + (package + (name "swarp") + (version "2.38.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.astromatic.net/download/swarp/" + "swarp-" version ".tar.gz")) + (sha256 + (base32 "1i670waqp54vin1cn08mqckcggm9zqd69nk7yya2vvqpdizn6jpm")))) + (build-system gnu-build-system) + (home-page "https://www.astromatic.net/software/swarp") + (synopsis "FITS image resampling and co-addition") + (description + "SWarp is a program that resamples and co-adds together FITS images using +any arbitrary astrometric projection defined in the WCS standard.") + (license license:gpl3+))) + (define-public celestia (let ((commit "9dbdf29c4ac3d20afb2d9a80d3dff241ecf81dce")) (package -- cgit v1.2.3 From a80d489227738dffea24713555c9d940f5ffcce0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 28 Jan 2021 21:09:56 +0000 Subject: gnu: Add weightwatcher. * gnu/packages/astronomy.scm (weightwatcher): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/astronomy.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index cec37113bf..9b25e03446 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -150,6 +150,26 @@ coordinate systems in a @dfn{FITS} (Flexible Image Transport System) image header.") (license license:lgpl3+))) +(define-public weightwatcher + (package + (name "weightwatcher") + (version "1.12") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.astromatic.net/download/weightwatcher/" + "weightwatcher-" version ".tar.gz")) + (sha256 + (base32 "1zaqd8d9rpgcwjsp92q3lkfaa22i20gppb91dz34ym54swisjc2p")))) + (build-system gnu-build-system) + (home-page "https://www.astromatic.net/software/weightwatcher") + (synopsis "Weight-map/flag-map multiplexer and rasteriser") + (description + "Weightwatcher is a program hat combines weight-maps, flag-maps and +polygon data in order to produce control maps which can directly be used in +astronomical image-processing packages like Drizzle, Swarp or SExtractor.") + (license license:gpl3+))) + (define-public gnuastro (package (name "gnuastro") -- cgit v1.2.3 From dcb594394484248a8f16d0e07ca400398d9eb5cb Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Fri, 15 Jan 2021 16:24:32 -0500 Subject: gnu: Add emacs-scad-mode. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (emacs-scad-mode): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/engineering.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index baddaf1737..11585f6234 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -20,7 +20,7 @@ ;;; Copyright © 2020 Ekaitz Zarraga ;;; Copyright © 2020 B. Wilson ;;; Copyright © 2020, 2021 Vinicius Monego -;;; Copyright © 2020 Morgan Smith +;;; Copyright © 2020, 2021 Morgan Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,6 +50,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system ant) #:use-module (guix build-system cmake) + #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system qt) @@ -2513,6 +2514,26 @@ full programmatic control over your models.") (home-page "https://www.openscad.org/") (license license:gpl2+))) +(define-public emacs-scad-mode + (package + (inherit openscad) + (name "emacs-scad-mode") + (native-inputs '()) + (inputs '()) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir-elisp + ;; Elisp directory is not in root of the source. + (lambda _ + (chdir "contrib") + #t))))) + (synopsis "Emacs major mode for editing editing OpenSCAD code") + (description "@code{scad-mode} provides an Emacs major mode for editing +OpenSCAD code. It supports syntax highlighting, indenting and refilling of +comments."))) + (define-public freecad (let ((commit-ref "7616153b3c31ace006169cdc2fdafab484498858") (revision "1")) -- cgit v1.2.3 From bb91875bb76a426e745592efe91002a944ec7347 Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Thu, 21 Jan 2021 18:36:16 +0800 Subject: gnu: Add python-inotify-simple. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-inotify-simple): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d903a678a9..2706a8c0cd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -93,7 +93,7 @@ ;;; Copyright © 2020 Diego N. Barbato ;;; Copyright © 2020 Leo Prikler ;;; Copyright © 2019 Kristian Trandem -;;; Copyright © 2020 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2020, 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Morgan Smith ;;; ;;; This file is part of GNU Guix. @@ -6751,6 +6751,27 @@ need to use the older and less efficient @code{pkg_resources} package.") finding unresolved symbols in Python code and their corresponding imports.") (license license:bsd-3))) +(define-public python-inotify-simple + (package + (name "python-inotify-simple") + (version "1.3.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chrisjbillington/inotify_simple") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dv9svrcz31acyq9smjlnw75xv3x5wpn5h6s8j8h0vrqyl3d7l05")))) + (build-system python-build-system) + (home-page + "https://github.com/chrisjbillington/inotify_simple") + (synopsis "Simple wrapper around inotify library") + (description + "@code{inotify-simple} is a simple wrapper around inotify library.") + (license license:bsd-3))) + (define-public python-jaraco-packaging (package (name "python-jaraco-packaging") -- cgit v1.2.3 From cbbac837dc34c0b7541e48450525f34c25b3e6f6 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sun, 17 Jan 2021 14:45:51 +0100 Subject: gnu: Add python-typer. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-typer): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2706a8c0cd..eb1a9c8b14 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18182,6 +18182,61 @@ based on the CPython 2.7 and 3.7 parsers.") license:asl2.0 license:expat)))) ;ast27/Parser/spark.py +(define-public python-typer + (package + (name "python-typer") + (version "0.3.2") + (source + (origin + ;; Building `python-typer` from the git repository requires the `flit-core` + ;; Python package that is not installed by `python-flit`. + (method url-fetch) + (uri (pypi-uri "typer" version)) + (sha256 + (base32 "00v3h63dq8yxahp9vg3yb9r27l2niwv8gv0dbds9dzrc298dfmal")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'disable-failing-tests + (lambda _ + (substitute* "tests/test_completion/test_completion.py" + (("def test_show_completion") + "def _test_show_completion") + (("def test_install_completion") + "def _test_install_completion")) + (substitute* "tests/test_completion/test_completion_install.py" + (("def test_completion_install_bash") + "def _test_completion_install_bash") + (("def test_completion_install_zsh") + "def _test_completion_install_zsh") + (("def test_completion_install_fish") + "def _test_completion_install_fish") + (("def test_completion_install_powershell") + "def _test_completion_install_powershell")) + #t)) + (replace 'check + (lambda _ + (setenv "PYTHONPATH" + (string-append (getcwd) ":" + (getenv "PYTHONPATH"))) + (invoke "python" "-m" "pytest" "tests/") + #t))))) + (propagated-inputs + `(("python-click" ,python-click))) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-pytest" ,python-pytest) + ("python-shellingham" ,python-shellingham))) + (home-page "https://github.com/tiangolo/typer") + (synopsis + "Typer builds CLI based on Python type hints") + (description + "Typer is a library for building CLI applications. It's based on +Python 3.6+ type hints.") + ;; MIT license + (license license:expat))) + (define-public python-typing (package (name "python-typing") -- cgit v1.2.3 From cd1ed8801ac332607f69a4481f49580ccb926c60 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sun, 24 Jan 2021 18:57:31 +0100 Subject: gnu: vkd3d: Update to 1.2. * gnu/packages/vulkan.scm (vkd3d): Update to 1.2. --- gnu/packages/vulkan.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 7e622946e9..86b0e55f34 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -351,10 +351,10 @@ shader compilation.") (license license:asl2.0))) (define-public vkd3d - (let ((commit "ecda316ef54d70bf1b3e860755241bb75873e53f")) ; Release 1.1. + (let ((commit "56cd4a94d541707959ce7677af6d1a34739e5579")) ; Release 1.2. (package (name "vkd3d") - (version "1.1") + (version "1.2") (source (origin (method git-fetch) @@ -363,7 +363,7 @@ shader compilation.") (commit commit))) (sha256 (base32 - "05a28kspy8gzng181w28zjqdb3pj2ss83b0lwnppxbcdzsz7rvrf")) + "1n4a622drgnprvz5hjxzyzcsg2lp5rlf1sajki2vzf5gsx6fdpk8")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 6a77596cab2c173b04efff0a271a8e3972ca7499 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Mon, 25 Jan 2021 01:09:08 +0100 Subject: gnu: wine: Update to 6.0. * gnu/packages/wine.scm (wine): Update to 6.0. [inputs]: Add libusb. Remove glu, ncurses and zlib. --- gnu/packages/wine.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 0d93af0dc9..98b435cb8d 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -38,7 +38,6 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) - #:use-module (gnu packages compression) #:use-module (gnu packages cups) #:use-module (gnu packages databases) #:use-module (gnu packages fontutils) @@ -52,6 +51,7 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages kerberos) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages mingw) #:use-module (gnu packages openldap) @@ -60,7 +60,6 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages mp3) - #:use-module (gnu packages ncurses) #:use-module (gnu packages photo) #:use-module (gnu packages samba) #:use-module (gnu packages scanner) @@ -76,7 +75,7 @@ (define-public wine (package (name "wine") - (version "5.21") + (version "6.0") (source (origin (method url-fetch) @@ -88,7 +87,7 @@ (string-append "https://dl.winehq.org/wine/source/" dir "wine-" version ".tar.xz"))) (sha256 - (base32 "0h185lfpid6cw1sz8rmkpky2l11izpb0w8j0cq6ww6yi94jmq6js")))) + (base32 "0micb3l54cc2cl3v5q92hzvkxxiwi9lmiv72caf45vl35xghd4xl")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) @@ -104,7 +103,6 @@ ("faudio" ,faudio) ("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("glu" ,glu) ("gnutls" ,gnutls) ("gst-plugins-base" ,gst-plugins-base) ("lcms" ,lcms) @@ -118,6 +116,7 @@ ("libpcap" ,libpcap) ("libpng" ,libpng) ("libjpeg" ,libjpeg-turbo) + ("libusb" ,libusb) ("libtiff" ,libtiff) ("libICE" ,libice) ("libX11" ,libx11) @@ -130,15 +129,13 @@ ("libXxf86vm" ,libxxf86vm) ("libXcomposite" ,libxcomposite) ("mit-krb5" ,mit-krb5) - ("ncurses" ,ncurses) ("openal" ,openal) ("pulseaudio" ,pulseaudio) ("sdl2" ,sdl2) ("unixodbc" ,unixodbc) ("v4l-utils" ,v4l-utils) ("vkd3d" ,vkd3d) - ("vulkan-loader" ,vulkan-loader) - ("zlib" ,zlib))) + ("vulkan-loader" ,vulkan-loader))) (arguments `(;; Force a 32-bit build targeting a similar architecture, i.e.: ;; armhf for armhf/aarch64, i686 for i686/x86_64. -- cgit v1.2.3 From b9a54aad0ba282ac78931b67e679bd0132419364 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 14:53:35 +0100 Subject: gnu: python-pikepdf: Update to 2.5.0. * gnu/packages/python-xyz.scm (python-pikepdf): Update to 2.5.0. --- 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 eb1a9c8b14..fac89c1012 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5727,13 +5727,13 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pikepdf (package (name "python-pikepdf") - (version "2.4.0") + (version "2.5.0") (source (origin (method url-fetch) (uri (pypi-uri "pikepdf" version)) (sha256 - (base32 "0da5s9jpp9ll952drbc77yk4rhin2w87pi45x1bybj8kwlcvg27j")))) + (base32 "0wqb8sjbmvz042ymdg0p5bq8pyjccfbdnk7nfi6y7jrlb8qw1dl4")))) (build-system python-build-system) (arguments `(#:tests? #false)) ;require python-xmp-toolkit -- cgit v1.2.3 From 037615cf7163bdde53d44ddd31fadcc355201c54 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:12:48 -0500 Subject: gnu: python2-testresources: Remove package. * gnu/packages/check.scm (python2-testresources-bootstrap) (python2-testresources): Delete. --- gnu/packages/check.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 98b5bb293f..e3e7d44229 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1504,9 +1504,6 @@ style tests."))) testresources package instead.") (license (list license:bsd-3 license:asl2.0)))) ; at the user's option -(define-public python2-testresources-bootstrap - (package-with-python2 python-testresources-bootstrap)) - (define-public python-testresources (package (inherit python-testresources-bootstrap) @@ -1521,9 +1518,6 @@ testresources package instead.") "Testresources is an extension to Python's unittest to allow declarative use of resources by test cases."))) -(define-public python2-testresources - (package-with-python2 python-testresources)) - (define-public python-subunit-bootstrap (package (name "python-subunit-bootstrap") -- cgit v1.2.3 From dccaf68ab0634e99eaeb2184bc799535b0ff8235 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:13:24 -0500 Subject: gnu: python2-pylint: Remove package. * gnu/packages/check.scm (python2-pylint): Delete. --- gnu/packages/check.scm | 43 ------------------------------------------- 1 file changed, 43 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index e3e7d44229..248d7f1299 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2193,51 +2193,8 @@ Pylint has many rules enabled by default, way too much to silence them all on a minimally sized program. It's highly configurable and handle pragmas to control it from within your code. Additionally, it is possible to write plugins to add your own checks.") - (properties `((python2-variant . ,(delay python2-pylint)))) (license license:gpl2+))) -;; Python2 is not supported anymore by Pylint. See: -;; https://github.com/PyCQA/pylint/issues/1763. -(define-public python2-pylint - (let ((pylint (package-with-python2 - (strip-python2-variant python-pylint)))) - (package (inherit pylint) - (version "1.9.5") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/PyCQA/pylint") - (commit (string-append "pylint-" version)))) - (file-name (git-file-name (package-name pylint) version)) - (sha256 - (base32 - "02a89d8a47s7nfiv1ady3j0sg2sbyja3np145brarfp5x9qxz9x2")))) - (arguments - `(,@(strip-keyword-arguments '(#:tests?) (package-arguments pylint)) - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - ;; Somehow, tests fail if run from the build directory. - (let ((work "/tmp/work")) - (mkdir-p work) - (setenv "PYTHONPATH" - (string-append (getenv "PYTHONPATH") ":" work)) - (copy-recursively "." work) - (with-directory-excursion "/tmp" - (invoke "python" "-m" "unittest" "discover" - "-s" (string-append work "/pylint/test") - "-p" "*test_*.py")))))))) - (native-inputs - `(("python2-futures" ,python2-futures) - ,@(package-native-inputs pylint))) - (propagated-inputs - `(("python2-backports-functools-lru-cache" - ,python2-backports-functools-lru-cache) - ("python2-configparser" ,python2-configparser) - ,@(package-propagated-inputs pylint)))))) - (define-public python-paramunittest (package (name "python-paramunittest") -- cgit v1.2.3 From 16038b0594f9b2235b617e92d41ee63ff4a1d485 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:13:49 -0500 Subject: gnu: python2-behave-web-api: Remove package. * gnu/packages/check.scm (python2-behave-web-api): Delete. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 248d7f1299..24d928e7b5 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2423,9 +2423,6 @@ tests written in a natural language style, backed up by Python code.") JSON APIs with Behave.") (license license:expat))) -(define-public python2-behave-web-api - (package-with-python2 python-behave-web-api)) - (define-public python-rednose (package (name "python-rednose") -- cgit v1.2.3 From 171b4aaa0fe4726e260569dc62197ae60fa0bb34 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:14:23 -0500 Subject: gnu: python2-os-testr: Remove package. * gnu/packages/openstack.scm (python2-os-testr): Delete. --- gnu/packages/openstack.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 17a4f3dcdb..a6e298b8ef 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -305,9 +305,6 @@ to docs.openstack.org and developer.openstack.org.") for subunit.") (license asl2.0))) -(define-public python2-os-testr - (package-with-python2 python-os-testr)) - (define-public python-stevedore (package (name "python-stevedore") -- cgit v1.2.3 From dbf019008dd4f372b725689b0df6087c8853564d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:14:46 -0500 Subject: gnu: python2-stevedore: Remove package. * gnu/packages/openstack.scm (python2-stevedore: Delete. --- gnu/packages/openstack.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index a6e298b8ef..94a11ef50a 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -336,9 +336,6 @@ classes for implementing common patterns for using dynamically loaded extensions.") (license asl2.0))) -(define-public python2-stevedore - (package-with-python2 python-stevedore)) - (define-public python-tempest-lib (package (name "python-tempest-lib") -- cgit v1.2.3 From 3794aff8857cb3b7c4c311bef3717b1b06ad22b8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:15:08 -0500 Subject: gnu: python2-oslotest: Remove package. * gnu/packages/openstack.scm (python2-oslotest: Delete. --- gnu/packages/openstack.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 94a11ef50a..6cd8a6fc2a 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -658,9 +658,6 @@ documentation from the OpenStack project.") for debugging, and better support for mocking results.") (license asl2.0))) -(define-public python2-oslotest - (package-with-python2 python-oslotest)) - (define-public python-oslo.utils (package (name "python-oslo.utils") -- cgit v1.2.3 From 3c816ac243692d5f2f157c49d2908760859e0549 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:15:40 -0500 Subject: gnu: python2-falcon: Remove package. * gnu/packages/python-web.scm (python2-falcon): Delete. --- gnu/packages/python-web.scm | 7 ------- 1 file changed, 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index c8ad94ae49..13fcba03e9 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -510,13 +510,6 @@ classes (properties `((python2-variant . ,(delay python2-falcon)))) (license license:asl2.0))) -(define-public python2-falcon - (let ((falcon (package-with-python2 (strip-python2-variant python-falcon)))) - (package - (inherit falcon) - (native-inputs - (alist-delete "python-rapidjson" (package-native-inputs falcon)))))) - (define-public python-falcon-cors (package (name "python-falcon-cors") -- cgit v1.2.3 From 5bc0c8fe3e061057fadb2405dd03ef483b948ed7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:15:58 -0500 Subject: gnu: python2-falcon-cors: Remove package. * gnu/packages/python-web.scm (python2-falcon-cors): Delete. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 13fcba03e9..dfe256f6ae 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -533,9 +533,6 @@ CORS object to the incoming requests, enabling the ability to serve resources over a different origin than that of the web application.") (license license:asl2.0))) -(define-public python2-falcon-cors - (package-with-python2 python-falcon-cors)) - (define-public python-furl (package (name "python-furl") -- cgit v1.2.3 From 97f18952c666999d7fc8cc59eda995cf3c31cc3f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:16:12 -0500 Subject: gnu: python2-cachecontrol: Remove package. * gnu/packages/python-web.scm (python2-cachecontrol): Delete. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index dfe256f6ae..1f16ff4efb 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3175,9 +3175,6 @@ provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients." @code{httplib2} for use with @code{requests} session objects.") (license license:asl2.0))) -(define-public python2-cachecontrol - (package-with-python2 python-cachecontrol)) - (define-public python-cachecontrol-0.11 (package (inherit python-cachecontrol) -- cgit v1.2.3 From 7fd440453132587d090d23d2f114601dccedd12b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:16:39 -0500 Subject: gnu: python2-mwclient: Remove package. * gnu/packages/python-xyz.scm (python2-mwclient): Delete. --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index fac89c1012..0502781f00 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15774,9 +15774,6 @@ exception message with a traceback that points to the culprit.") (description "This package provides a MediaWiki API client.") (license license:expat))) -(define-public python2-mwclient - (package-with-python2 python-mwclient)) - (define-public python-utils (package (name "python-utils") -- cgit v1.2.3 From a92a3cca2a1ba7738a31bcd83864dc7d5620416f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:16:57 -0500 Subject: gnu: python2-apache-libcloud: Remove package. * gnu/packages/python-xyz.scm (python2-apache-libcloud): Delete. --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0502781f00..433e3dd544 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16832,9 +16832,6 @@ class ShellOutSSHClientTests")) many of the popular cloud service providers using a unified API.") (license license:asl2.0))) -(define-public python2-apache-libcloud - (package-with-python2 python-apache-libcloud)) - (define-public python-smmap (package (name "python-smmap") -- cgit v1.2.3 From 25a57cd835e958c8797091d8175d5ab8de2ac33c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:17:27 -0500 Subject: gnu: python2-xenon: Remove package. * gnu/packages/python-xyz.scm (python2-xenon): Delete. --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 433e3dd544..2388567c59 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17035,9 +17035,6 @@ will fail (i.e. it will exit with a non-zero exit code) when any of these requirements is not met.") (license license:expat))) -(define-public python2-xenon - (package-with-python2 python-xenon)) - (define-public python-pysocks (package (name "python-pysocks") -- cgit v1.2.3 From a1df6295de620a4b0434539902ea94ddd8319517 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:18:03 -0500 Subject: gnu: python2-fasteners: Remove package. * gnu/packages/python-xyz.scm (python2-fasteners): Delete. --- gnu/packages/python-web.scm | 1 - gnu/packages/python-xyz.scm | 9 --------- 2 files changed, 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 1f16ff4efb..efb6296e90 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -507,7 +507,6 @@ classes @item Compatible with both CPython and PyPy @item Cython support for better performance when used with CPython @end itemize") - (properties `((python2-variant . ,(delay python2-falcon)))) (license license:asl2.0))) (define-public python-falcon-cors diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2388567c59..3c18ef72b6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18969,17 +18969,8 @@ inferring type information using compile-time introspection.") @item Inter-process locks @item Generic helpers @end itemize\n") - (properties `((python2-variant . ,(delay python2-fasteners)))) (license license:asl2.0))) -(define-public python2-fasteners - (let ((base (package-with-python2 (strip-python2-variant python-fasteners)))) - (package - (inherit base) - (propagated-inputs - `(("python2-futures" ,python2-futures) - ,@(package-propagated-inputs base)))))) - (define-public python-requests-file (package (name "python-requests-file") -- cgit v1.2.3 From 10784fc28c5aadefdaf44c48299fe81234be746f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:18:23 -0500 Subject: gnu: python2-honcho: Remove package. * gnu/packages/python-xyz.scm (python2-honcho): Delete. --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3c18ef72b6..91c3756ffb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6472,9 +6472,6 @@ The output of all running processes is collected by honcho and displayed.") (license license:expat))) -(define-public python2-honcho - (package-with-python2 python-honcho)) - (define-public python-pexpect (package (name "python-pexpect") -- cgit v1.2.3 From 8c9259aa1960e66536599174f7bd76b81bb210d6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:22:55 -0500 Subject: gnu: python2-debtcollector: Remove package. * gnu/packages/openstack.scm (python2-debtcollector): Delete. --- gnu/packages/openstack.scm | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 6cd8a6fc2a..52d598bcea 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -135,18 +135,8 @@ formatters, and other extensions.") "This package provides a collection of Python deprecation patterns and strategies that help you collect your technical debt in a non-destructive manner.") - (properties `((python2-variant . ,(delay python2-debtcollector)))) (license asl2.0))) -(define-public python2-debtcollector - (let ((base (package-with-python2 (strip-python2-variant - python-debtcollector)))) - (package - (inherit base) - (propagated-inputs - `(("python2-funcsigs" ,python2-funcsigs) - ,@(package-propagated-inputs base)))))) - (define-public python-hacking (package (name "python-hacking") -- cgit v1.2.3 From 8a1e3756b16e1c81d9054454fedc53fe6b2c8be1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:23:16 -0500 Subject: gnu: python2-os-client-config: Remove package. * gnu/packages/openstack.scm (python2-os-client-config): Delete. --- gnu/packages/openstack.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 52d598bcea..fcad7e69ec 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -262,9 +262,6 @@ to docs.openstack.org and developer.openstack.org.") comprehensive manner.") (license asl2.0))) -(define-public python2-os-client-config - (package-with-python2 python-os-client-config)) - (define-public python-os-testr (package (name "python-os-testr") -- cgit v1.2.3 From 0c52aff8e91f3645a96cca21c32db1b15b22c75b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:23:32 -0500 Subject: gnu: python2-git-review: Remove package. * gnu/packages/openstack.scm (python2-git-review): Delete. --- gnu/packages/openstack.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index fcad7e69ec..26b275e0fd 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -828,6 +828,3 @@ permanence.") "Git-review is a command-line tool that helps submitting Git branches to Gerrit for review, or fetching existing ones.") (license asl2.0))) - -(define-public python2-git-review - (package-with-python2 python-git-review)) -- cgit v1.2.3 From 5048eb397296587aef9e5015d54f52101423afbd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:23:52 -0500 Subject: gnu: python2-requests-oauthlib: Remove package. * gnu/packages/python-web.scm (python2-requests-oauthlib): --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index efb6296e90..aedd445c4d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3111,9 +3111,6 @@ concurrent HTTP client library for python using @code{gevent}.") provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients.") (license license:isc))) -(define-public python2-requests-oauthlib - (package-with-python2 python-requests-oauthlib)) - (define-public python-url (package (name "python-url") -- cgit v1.2.3 From 710c5c70e369dfabd6ee581981c2526b3694eb92 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:24:14 -0500 Subject: gnu: python2-lockfile: Remove package. * gnu/packages/python-xyz.scm (python2-lockfile): Delete. --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 91c3756ffb..8c3ab4c8fd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1037,9 +1037,6 @@ conventions and aliases in the same expression.") API for locking files.") (license license:expat))) -(define-public python2-lockfile - (package-with-python2 python-lockfile)) - (define-public python-filelock (package (name "python-filelock") -- cgit v1.2.3 From e86c67030a34a0d41bba815afc140d6d6b1e38da Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:24:36 -0500 Subject: gnu: python2-pathpy: Remove package. * gnu/packages/python-xyz.scm (python2-pathpy): Delete. --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8c3ab4c8fd..d4db8ff9ea 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6846,9 +6846,6 @@ releases.") common operations on files to be invoked on those path objects directly.") (license license:expat))) -(define-public python2-pathpy - (package-with-python2 python-pathpy)) - (define-public python-simplegeneric (package (name "python-simplegeneric") -- cgit v1.2.3 From 27915b48bf22db27c6d82f1a9f629a671bbaec53 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:24:59 -0500 Subject: gnu: python2-tox: Remove package. * gnu/packages/python-xyz.scm (python2-tox): Delete. --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d4db8ff9ea..1c80dd8602 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11240,9 +11240,6 @@ supported environment, or act as a frontend to continuous integration servers.") (license license:expat))) -(define-public python2-tox - (package-with-python2 python-tox)) - (define-public python-jmespath (package (name "python-jmespath") -- cgit v1.2.3 From cefe8d6026f3c1d5829db2b8cc9f475db8cd39a6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:26:39 -0500 Subject: gnu: python2-requests-mock: Remove package. * gnu/packages/python-xyz.scm (python2-requests-mock): Delete. --- gnu/packages/python-web.scm | 9 --------- 1 file changed, 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index aedd445c4d..b25f567449 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2517,17 +2517,8 @@ library.") (description "This module provides a building block to stub out the HTTP requests portions of your testing code.") - (properties `((python2-variant . ,(delay python2-requests-mock)))) (license license:asl2.0))) -(define-public python2-requests-mock - (package (inherit (package-with-python2 - (strip-python2-variant python-requests-mock))) - (arguments - `(#:python ,python-2 - ;; FIXME: 'subunit.run discover: error: no such option: --list' - #:tests? #f)))) - (define-public python-requests-toolbelt (package (name "python-requests-toolbelt") -- cgit v1.2.3 From d8b88603ee6b24131aa5b28910abb4926016ed00 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:29:02 -0500 Subject: gnu: python2-testrepository: Remove package. * gnu/packages/check.scm (python2-testrepository-bootstrap) (python2-testrepository): Delete variables. --- gnu/packages/check.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 24d928e7b5..e16a4b195b 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1642,9 +1642,6 @@ Python tests."))) "Bootstrap package for python-testrepository. Don't use this.") (license (list license:bsd-3 license:asl2.0)))) ; at user's option -(define-public python2-testrepository-bootstrap - (package-with-python2 python-testrepository-bootstrap)) - (define-public python-testrepository (package (inherit python-testrepository-bootstrap) @@ -1662,9 +1659,6 @@ Python tests."))) be used as part of a developer's workflow to check things such as what tests have failed since the last commit or what tests are currently failing."))) -(define-public python2-testrepository - (package-with-python2 python-testrepository)) - (define-public python-coverage (package (name "python-coverage") -- cgit v1.2.3 From b0020da044307e6cd8300493ab3669e8338bbb06 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:30:38 -0500 Subject: gnu: python2-subunit: Remove package. * gnu/packages/check.scm (python2-subunit-bootstrap) (python2-subunit): Delete variables. --- gnu/packages/check.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index e16a4b195b..71803b9490 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1544,9 +1544,6 @@ use of resources by test cases."))) python-subunit package instead.") (license (list license:bsd-3 license:asl2.0)))) ; at the user's option -(define-public python2-subunit-bootstrap - (package-with-python2 python-subunit-bootstrap)) - (define-public python-subunit (package (inherit python-subunit-bootstrap) @@ -1562,9 +1559,6 @@ python-subunit package instead.") "Python-subunit is a Python implementation of the subunit test streaming protocol."))) -(define-public python2-subunit - (package-with-python2 python-subunit)) - ;; Fixtures requires python-pbr at runtime, but pbr uses fixtures for its ;; own tests. Hence this bootstrap variant. (define-public python-fixtures-bootstrap -- cgit v1.2.3 From a59cdc108b6174c8329efff3626777afc8b35081 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:31:43 -0500 Subject: gnu: python2-testscenarios: Remove package. * gnu/packages/check.scm (python2-testscenarios-bootstrap) (python2-testscenarios): Delete variables. --- gnu/packages/check.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 71803b9490..ef6dab4d69 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1463,9 +1463,6 @@ compatibility."))) "This package is only for bootstrapping. Don't use this.") (license (list license:bsd-3 license:asl2.0)))) ; at the user's option -(define-public python2-testscenarios-bootstrap - (package-with-python2 python-testscenarios-bootstrap)) - (define-public python-testscenarios (package (inherit python-testscenarios-bootstrap) @@ -1477,9 +1474,6 @@ compatibility."))) "Testscenarios provides clean dependency injection for Python unittest style tests."))) -(define-public python2-testscenarios - (package-with-python2 python-testscenarios)) - ;; Testresources requires python-pbr at runtime, but pbr needs it for its ;; own tests. Hence this bootstrap variant. (define-public python-testresources-bootstrap -- cgit v1.2.3 From a215577f06a0e92c93d5a063c82fade1c17e7018 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:32:50 -0500 Subject: gnu: python2-testtools: Remove package. * gnu/packages/check.scm (python2-testtools-bootstrap) (python2-testtools): Delete variables. --- gnu/packages/check.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index ef6dab4d69..13f495d934 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1405,9 +1405,6 @@ subprocess and see the output as well as any file modifications.") "This package is only for bootstrapping. Do not use this.") (license license:psfl))) -(define-public python2-testtools-bootstrap - (package-with-python2 python-testtools-bootstrap)) - (define-public python-testtools (package (inherit python-testtools-bootstrap) @@ -1433,9 +1430,6 @@ subprocess and see the output as well as any file modifications.") provide matchers, more debugging information, and cross-Python compatibility."))) -(define-public python2-testtools - (package-with-python2 python-testtools)) - (define-public python-testscenarios-bootstrap (package (name "python-testscenarios-bootstrap") -- cgit v1.2.3 From 674391d0cbf9b7c76e8327e9af2545448a3fe3ab Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:33:43 -0500 Subject: gnu: python2-fixtures: Remove package. * gnu/packages/check.scm (python2-fixtures-bootstrap) (python2-fixtures): Delete variables. --- gnu/packages/check.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 13f495d934..7163086ae0 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1571,9 +1571,6 @@ protocol."))) python-fixtures package instead.") (license (list license:bsd-3 license:asl2.0)))) ; at user's option -(define-public python2-fixtures-bootstrap - (package-with-python2 python-fixtures-bootstrap)) - (define-public python-fixtures (package (inherit python-fixtures-bootstrap) @@ -1596,9 +1593,6 @@ python-fixtures package instead.") "Fixtures provides a way to create reusable state, useful when writing Python tests."))) -(define-public python2-fixtures - (package-with-python2 python-fixtures)) - (define-public python-testrepository-bootstrap (package (name "python-testrepository-bootstrap") -- cgit v1.2.3 From 64c8f49ccce3d0084450037646659cdcbbedfb33 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:37:26 -0500 Subject: gnu: python2-pbr: Remove package. * gnu/packages/python-xyz.scm (python2-pbr-minimal) (python2-pbr): Delete variables. --- gnu/packages/python-xyz.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1c80dd8602..012e0f0168 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2521,9 +2521,6 @@ code introspection, and logging.") "Used only for bootstrapping python2-pbr, you should not need this.") (license license:asl2.0))) -(define-public python2-pbr-minimal - (package-with-python2 python-pbr-minimal)) - (define-public python-pbr (package (inherit python-pbr-minimal) @@ -2551,9 +2548,6 @@ versions, process requirements files and generate AUTHORS and ChangeLog file from git information. "))) -(define-public python2-pbr - (package-with-python2 python-pbr)) - (define-public python-pyrsistent (package (name "python-pyrsistent") -- cgit v1.2.3 From aa0d1e3306ed819afd182ee28e25d68e0b8c47ec Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:38:17 -0500 Subject: gnu: python2-virtualenv: Remove package. * gnu/packages/python-xyz.scm (python2-virtualenv): Delete. --- gnu/packages/python-xyz.scm | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 012e0f0168..5b5514d4cd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3194,40 +3194,8 @@ e.g. filters, callbacks and errbacks can all be promises.") (synopsis "Virtual Python environment builder") (description "Virtualenv is a tool to create isolated Python environments.") - (properties `((python2-variant . ,(delay python2-virtualenv)))) (license license:expat))) -(define-public python2-virtualenv - (let ((base (package-with-python2 (strip-python2-variant python-virtualenv)))) - (package - (inherit base) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-after 'set-paths 'adjust-PYTHONPATH - (lambda* (#:key inputs #:allow-other-keys) - (let* ((python (assoc-ref inputs "python")) - (python-sitedir (string-append python "/lib/python2.7" - "/site-packages"))) - ;; XXX: 'python2' always comes first on PYTHONPATH - ;; and shadows the 'setuptools' input. Move python2 - ;; last: this should be fixed in python-build-system - ;; in a future rebuild cycle. - (setenv "PYTHONPATH" - (string-append (string-join (delete python-sitedir - (string-split - (getenv "PYTHONPATH") - #\:)) - ":") - ":" python-sitedir)) - (format #t "environment variable `PYTHONPATH' changed to `~a'~%" - (getenv "PYTHONPATH")) - #t)))))) - (propagated-inputs - `(("python-contextlib2" ,python2-contextlib2) - ,@(package-propagated-inputs base)))))) - (define-public python-markupsafe (package (name "python-markupsafe") -- cgit v1.2.3 From de8dc9039b532f938074eb8504c63d3755d92eb6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:49:29 -0500 Subject: gnu: syncthing-gtk: Switch source to use Debian's Python 3 port. * gnu/packages/syncthing.scm (syncthing-gtk)[source]: Adjust to use the Debian Python 3 port. [phases]{remove-windows.py}: New phase. --- gnu/packages/syncthing.scm | 115 ++++++++++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 53 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 7e479a0d39..eb6cb7b4e3 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2020 Giacomo Leidi +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -189,58 +190,66 @@ Protocol.") (license mpl2.0))) (define-public syncthing-gtk - (package - (name "syncthing-gtk") - (version "0.9.4.4") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/syncthing/syncthing-gtk") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0nc0wd7qvyri7841c3dd9in5d7367hys0isyw8znv5fj4c0a6v1f")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'hardcode-dependencies - (lambda* (#:key inputs #:allow-other-keys) - (let ((psmisc (assoc-ref inputs "psmisc")) - (syncthing (assoc-ref inputs "syncthing"))) - ;; Hardcode dependencies paths to avoid propagation. - (substitute* "syncthing_gtk/tools.py" - (("killall") (string-append psmisc "/bin/killall"))) - (substitute* "syncthing_gtk/configuration.py" - (("/usr/bin/syncthing") (string-append syncthing - "/bin/syncthing")))) - #t)) - (add-after 'wrap 'wrap-libs - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/syncthing-gtk") - `("GI_TYPELIB_PATH" ":" prefix - (,(getenv "GI_TYPELIB_PATH")))) - #t)))))) - (inputs - `(("gtk+" ,gtk+) - ("libappindicator" ,libappindicator) - ("libnotify" ,libnotify) - ("librsvg" ,librsvg) - ("python2-bcrypt" ,python2-bcrypt) - ("python2-dateutil" ,python2-dateutil) - ("python2-pycairo" ,python2-pycairo) - ("python2-pygobject" ,python2-pygobject) - ("python-nautilus" ,python-nautilus) - ("psmisc" ,psmisc) - ("syncthing" ,syncthing))) - (native-inputs - `(("python2-setuptools" ,python2-setuptools))) - (home-page "https://github.com/syncthing/syncthing-gtk") - (synopsis "GTK3 based GUI and notification area icon for Syncthing") - (description "@code{syncthing-gtk} is a GTK3 Python based GUI and + ;; The commit used below corresponds to the latest commit of the + ;; python3-port branch maintained by Debian. Upstream hasn't bothered + ;; porting to Python 3 (see: + ;; https://github.com/kozec/syncthing-gtk/issues/487). + (let ((revision "1") + (commit "c46fbd8ad1d12d409da8942702a2f119cf45514a")) + (package + (name "syncthing-gtk") + (version (git-version "0.9.4.4" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/debian/syncthing-gtk.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1x1c8snf0jpgjmyyidjw0015ksk5ishqn817wx8vs9i0lfgnnbbg")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'hardcode-dependencies + (lambda* (#:key inputs #:allow-other-keys) + (let ((psmisc (assoc-ref inputs "psmisc")) + (syncthing (assoc-ref inputs "syncthing"))) + ;; Hardcode dependencies paths to avoid propagation. + (substitute* "syncthing_gtk/tools.py" + (("killall") (string-append psmisc "/bin/killall"))) + (substitute* "syncthing_gtk/configuration.py" + (("/usr/bin/syncthing") (string-append syncthing + "/bin/syncthing")))))) + (add-after 'unpack 'remove-windows.py + (lambda _ + ;; A Windows-specific module that fails to load with + ;; "ModuleNotFoundError: No module named 'msvcrt'. + (delete-file "syncthing_gtk/windows.py"))) + (add-after 'wrap 'wrap-libs + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/syncthing-gtk") + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH")))))))))) + (inputs + `(("gtk+" ,gtk+) + ("libappindicator" ,libappindicator) + ("libnotify" ,libnotify) + ("librsvg" ,librsvg) + ("python-bcrypt" ,python-bcrypt) + ("python-dateutil" ,python-dateutil) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject) + ("python-nautilus" ,python-nautilus) + ("psmisc" ,psmisc) + ("syncthing" ,syncthing))) + ;; (native-inputs + ;; `(("python2-setuptools" ,python2-setuptools))) + (home-page "https://github.com/syncthing/syncthing-gtk") + (synopsis "GTK3 based GUI and notification area icon for Syncthing") + (description "@code{syncthing-gtk} is a GTK3 Python based GUI and notification area icon for Syncthing. Supported Syncthing features: @itemize @@ -250,7 +259,7 @@ notification area icon for Syncthing. Supported Syncthing features: @item Restart, shutdown server @item Editing daemon settings @end itemize\n") - (license gpl2))) + (license gpl2)))) (define-public go-github-com-jackpal-go-nat-pmp (package -- cgit v1.2.3 From 23a5dcce1d893b8f5c5301ae3c1af863776ed3cf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:53:45 -0500 Subject: gnu: grocsvs: Remove package. This package depends on Python 2 and doesn't build anymore. Upstream doesn't seem active, but if they ever port it to Python 3, they should let people know here: https://github.com/grocsvs/grocsvs/issues/6. * gnu/packages/bioinformatics.scm (grocsvs): Delete. --- gnu/packages/bioinformatics.scm | 41 ----------------------------------------- 1 file changed, 41 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 161767c671..5b14e765de 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -15607,44 +15607,3 @@ biological processes. SBML is useful for models of metabolism, cell signaling, and more. It continues to be evolved and expanded by an international community.") (license license:lgpl2.1+))) - -(define-public grocsvs - ;; The last release is out of date and new features have been added. - (let ((commit "ecd956a65093a0b2c41849050e4512d46fecea5d") - (revision "1")) - (package - (name "grocsvs") - (version (git-version "0.2.6.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/grocsvs/grocsvs") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "14505725gr7qxc17cxxf0k6lzcwmgi64pija4mwf29aw70qn35cc")) - (patches (search-patches "grocsvs-dont-use-admiral.patch")))) - (build-system python-build-system) - (arguments - `(#:tests? #f ; No test suite. - #:python ,python-2)) ; Only python-2 supported. - (inputs - `(("python2-h5py" ,python2-h5py) - ("python2-ipython-cluster-helper" ,python2-ipython-cluster-helper) - ("python2-networkx" ,python2-networkx) - ("python2-psutil" ,python2-psutil) - ("python2-pandas" ,python2-pandas) - ("python2-pybedtools" ,python2-pybedtools) - ("python2-pyfaidx" ,python2-pyfaidx) - ("python2-pygraphviz" ,python2-pygraphviz) - ("python2-pysam" ,python2-pysam) - ("python2-scipy" ,python2-scipy))) - (home-page "https://github.com/grocsvs/grocsvs") - (synopsis "Genome-wide reconstruction of complex structural variants") - (description - "@dfn{Genome-wide Reconstruction of Complex Structural Variants} -(GROC-SVs) is a software pipeline for identifying large-scale structural -variants, performing sequence assembly at the breakpoints, and reconstructing -the complex structural variants using the long-fragment information from the -10x Genomics platform.") - (license license:expat)))) -- cgit v1.2.3 From 42008264d9fff544ee00c3c109093472b8a92bd2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 29 Jan 2021 15:17:15 -0500 Subject: gnu: Remove avogadro. This package fails to build and has been superseded by avogadro2. * gnu/packages/chemistry.scm (avogadro): Remove variable. * gnu/packages/patches/avogadro-boost148.patch, gnu/packages/patches/avogadro-eigen3-update.patch, gnu/packages/patches/avogadro-python-eigen-lib.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 3 - gnu/packages/chemistry.scm | 85 --- gnu/packages/patches/avogadro-boost148.patch | 69 --- gnu/packages/patches/avogadro-eigen3-update.patch | 603 --------------------- .../patches/avogadro-python-eigen-lib.patch | 161 ------ 5 files changed, 921 deletions(-) delete mode 100644 gnu/packages/patches/avogadro-boost148.patch delete mode 100644 gnu/packages/patches/avogadro-eigen3-update.patch delete mode 100644 gnu/packages/patches/avogadro-python-eigen-lib.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index ee57d6fe51..4ca5d60937 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -823,9 +823,6 @@ dist_patch_DATA = \ %D%/packages/patches/audiofile-function-signature.patch \ %D%/packages/patches/automake-skip-amhello-tests.patch \ %D%/packages/patches/avahi-localstatedir.patch \ - %D%/packages/patches/avogadro-boost148.patch \ - %D%/packages/patches/avogadro-eigen3-update.patch \ - %D%/packages/patches/avogadro-python-eigen-lib.patch \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index 5351ea596b..e7b061515b 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -52,91 +52,6 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python)) -(define-public avogadro - (package - (name "avogadro") - (version "1.2.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cryos/avogadro") - (commit version))) - (sha256 - (base32 "0258py3lkba85qhs5ynancinyym61vlp0zaq9yrfs3hhnhpzv9n2")) - (file-name (git-file-name name version)) - (patches - (search-patches "avogadro-eigen3-update.patch" - "avogadro-python-eigen-lib.patch" - "avogadro-boost148.patch")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f - #:configure-flags - (list "-DENABLE_GLSL=ON" - (string-append "-DPYTHON_LIBRARIES=" - (assoc-ref %build-inputs "python") - "/lib") - (string-append "-DPYTHON_INCLUDE_DIRS=" - (assoc-ref %build-inputs "python") - "/include/python" - ,(version-major+minor - (package-version python)))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-python-lib-path - (lambda* (#:key outputs #:allow-other-keys) - ;; This is necessary to install the Python module in the correct - ;; directory. - (substitute* "libavogadro/src/python/CMakeLists.txt" - (("^EXECUTE_PROCESS.*$") "") - (("^.*from sys import stdout.*$") "") - (("^.*OUTPUT_VARIABLE.*") - (string-append "set(PYTHON_LIB_PATH \"" - (assoc-ref outputs "out") - "/lib/python" - ,(version-major+minor - (package-version python)) - "/site-packages\")"))) - #t)) - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Make sure 'avogadro' runs with the correct PYTHONPATH. - (let* ((out (assoc-ref outputs "out"))) - (setenv "PYTHONPATH" - (string-append - (assoc-ref outputs "out") - "/lib/python" - ,(version-major+minor - (package-version python)) - "/site-packages:" - (getenv "PYTHONPATH"))) - (wrap-program (string-append out "/bin/avogadro") - `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))) - #t))))) - (native-inputs - `(("doxygen" ,doxygen) - ("pkg-config" ,pkg-config))) - (inputs - `(("boost" ,boost) - ("eigen" ,eigen) - ("glew" ,glew) - ("openbabel" ,openbabel) - ("python" ,python-2) - ("python-numpy" ,python2-numpy) - ("python-pyqt" ,python2-pyqt-4) - ("python-sip" ,python2-sip) - ("qt" ,qt-4) - ("zlib" ,zlib))) - (home-page "https://avogadro.cc") - (synopsis "Advanced molecule editor") - (description - "Avogadro is an advanced molecule editor and visualizer designed for use -in computational chemistry, molecular modeling, bioinformatics, materials -science, and related areas. It offers flexible high quality rendering and a -powerful plugin architecture.") - (license license:gpl2+))) - (define-public avogadrolibs (package (name "avogadrolibs") diff --git a/gnu/packages/patches/avogadro-boost148.patch b/gnu/packages/patches/avogadro-boost148.patch deleted file mode 100644 index f244f14674..0000000000 --- a/gnu/packages/patches/avogadro-boost148.patch +++ /dev/null @@ -1,69 +0,0 @@ -Index: avogadro-1.2.0/libavogadro/src/pythonengine_p.h -=================================================================== ---- avogadro-1.2.0.orig/libavogadro/src/pythonengine_p.h -+++ avogadro-1.2.0/libavogadro/src/pythonengine_p.h -@@ -31,7 +31,9 @@ - - #include - #include -+#ifndef Q_MOC_RUN - #include -+#endif - - namespace Avogadro { - -Index: avogadro-1.2.0/libavogadro/src/pythonextension_p.h -=================================================================== ---- avogadro-1.2.0.orig/libavogadro/src/pythonextension_p.h -+++ avogadro-1.2.0/libavogadro/src/pythonextension_p.h -@@ -33,7 +33,9 @@ - #include - #include - #include -+#ifndef Q_MOC_RUN - #include -+#endif - - #include - #include -Index: avogadro-1.2.0/libavogadro/src/pythontool_p.h -=================================================================== ---- avogadro-1.2.0.orig/libavogadro/src/pythontool_p.h -+++ avogadro-1.2.0/libavogadro/src/pythontool_p.h -@@ -31,7 +31,9 @@ - - #include - #include -+#ifndef Q_MOC_RUN - #include -+#endif - - #include - #include -Index: avogadro-1.2.0/libavogadro/src/pythoninterpreter.h -=================================================================== ---- avogadro-1.2.0.orig/libavogadro/src/pythoninterpreter.h -+++ avogadro-1.2.0/libavogadro/src/pythoninterpreter.h -@@ -26,7 +26,9 @@ - #define PYTHONINTERPRETER_H - - #include -+#ifndef Q_MOC_RUN - #include -+#endif - #include - #include - -Index: avogadro-1.2.0/libavogadro/src/pythonscript.h -=================================================================== ---- avogadro-1.2.0.orig/libavogadro/src/pythonscript.h -+++ avogadro-1.2.0/libavogadro/src/pythonscript.h -@@ -27,6 +27,8 @@ - #define PYTHONSCRIPT_H - - #include -+#ifndef Q_MOC_RUN - #include -+#endif - - #include "pythonerror.h" diff --git a/gnu/packages/patches/avogadro-eigen3-update.patch b/gnu/packages/patches/avogadro-eigen3-update.patch deleted file mode 100644 index a5f669292f..0000000000 --- a/gnu/packages/patches/avogadro-eigen3-update.patch +++ /dev/null @@ -1,603 +0,0 @@ -From 43af3c117b0b3220b15c2fe2895b94bbd83d3a60 Mon Sep 17 00:00:00 2001 -From: Claudio Fernandes -Date: Sun, 15 Jan 2017 21:23:39 -0200 -Subject: [PATCH] Adapt Avogadro to Eigen 3.3 - ---- - CMakeLists.txt | 9 +------ - avogadro/src/mainwindow.cpp | 5 ++-- - libavogadro/src/camera.cpp | 10 ++++---- - libavogadro/src/camera.h | 14 +++++------ - libavogadro/src/engines/wireengine.cpp | 4 ++-- - .../crystallography/crystallographyextension.cpp | 2 +- - .../crystallography/ui/ceviewoptionswidget.cpp | 2 +- - .../src/extensions/orca/orcaanalysedialog.cpp | 1 - - .../src/extensions/orca/orcainputdialog.cpp | 1 - - .../src/extensions/qtaim/qtaimmathutilities.cpp | 1 + - .../qtaim/qtaimwavefunctionevaluator.cpp | 28 +++++++++++----------- - .../extensions/surfaces/openqube/gamessukout.cpp | 1 + - .../src/extensions/surfaces/openqube/slaterset.cpp | 6 +++-- - libavogadro/src/glpainter_p.cpp | 14 +++++------ - libavogadro/src/glwidget.cpp | 4 ++-- - libavogadro/src/molecule.cpp | 26 ++++++++++++++++++-- - libavogadro/src/navigate.cpp | 2 +- - libavogadro/src/tools/bondcentrictool.cpp | 28 +++++++++++----------- - libavogadro/src/tools/manipulatetool.cpp | 17 +++++++------ - libavogadro/src/tools/navigatetool.cpp | 3 ++- - libavogadro/src/tools/skeletontree.cpp | 7 +++--- - libavogadro/src/tools/skeletontree.h | 2 +- - 22 files changed, 102 insertions(+), 85 deletions(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -231,14 +231,7 @@ if(NOT Linguist_FOUND) - message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations") - endif() - --find_package(Eigen3) # find and setup Eigen3 if available --if(NOT EIGEN3_FOUND) -- message(STATUS "Cannot find Eigen3, trying Eigen2") -- find_package(Eigen2 REQUIRED) # Some version is required --else() --# Use Stage10 Eigen3 support -- set (EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API TRUE) --endif() -+find_package(Eigen3 REQUIRED) # find and setup Eigen3 if available - - find_package(ZLIB REQUIRED) - find_package(OpenBabel2 REQUIRED) # find and setup OpenBabel ---- a/avogadro/src/mainwindow.cpp -+++ b/avogadro/src/mainwindow.cpp -@@ -115,7 +115,6 @@ - #include - - #include --#include - #define USEQUAT - // This is a "hidden" exported Qt function on the Mac for Qt-4.x. - #ifdef Q_WS_MAC -@@ -2775,7 +2774,7 @@ protected: - linearGoal.row(1) = linearGoal.row(2).cross(linearGoal.row(0)); - - // calculate the translation matrix -- Transform3d goal(linearGoal); -+ Projective3d goal(linearGoal); - - goal.pretranslate(- 3.0 * (d->glWidget->radius() + CAMERA_NEAR_DISTANCE) * Vector3d::UnitZ()); - -@@ -2840,7 +2839,7 @@ protected: - Matrix3d linearGoal = Matrix3d::Identity(); - - // calculate the translation matrix -- Transform3d goal(linearGoal); -+ Projective3d goal(linearGoal); - - goal.pretranslate(- 3.0 * (d->glWidget->radius() + CAMERA_NEAR_DISTANCE) * Vector3d::UnitZ()); - ---- a/libavogadro/src/camera.cpp -+++ b/libavogadro/src/camera.cpp -@@ -47,7 +47,7 @@ namespace Avogadro - - CameraPrivate() {}; - -- Eigen::Transform3d modelview, projection; -+ Eigen::Projective3d modelview, projection; - const GLWidget *parent; - double angleOfViewY; - double orthoScale; -@@ -169,20 +169,20 @@ namespace Avogadro - - double Camera::distance(const Eigen::Vector3d & point) const - { -- return ( d->modelview * point ).norm(); -+ return ( d->modelview * point.homogeneous() ).head<3>().norm(); - } - -- void Camera::setModelview(const Eigen::Transform3d &matrix) -+ void Camera::setModelview(const Eigen::Projective3d &matrix) - { - d->modelview = matrix; - } - -- const Eigen::Transform3d & Camera::modelview() const -+ const Eigen::Projective3d & Camera::modelview() const - { - return d->modelview; - } - -- Eigen::Transform3d & Camera::modelview() -+ Eigen::Projective3d & Camera::modelview() - { - return d->modelview; - } ---- a/libavogadro/src/camera.h -+++ b/libavogadro/src/camera.h -@@ -101,16 +101,16 @@ namespace Avogadro { - double angleOfViewY() const; - /** Sets 4x4 "modelview" matrix representing the camera orientation and position. - * @param matrix the matrix to copy from -- * @sa Eigen::Transform3d & modelview(), applyModelview() */ -- void setModelview(const Eigen::Transform3d &matrix); -+ * @sa Eigen::Projective3d & modelview(), applyModelview() */ -+ void setModelview(const Eigen::Projective3d &matrix); - /** @return a constant reference to the 4x4 "modelview" matrix representing - * the camera orientation and position -- * @sa setModelview(), Eigen::Transform3d & modelview() */ -- const Eigen::Transform3d & modelview() const; -+ * @sa setModelview(), Eigen::Projective3d & modelview() */ -+ const Eigen::Projective3d & modelview() const; - /** @return a non-constant reference to the 4x4 "modelview" matrix representing - * the camera orientation and position -- * @sa setModelview(), const Eigen::Transform3d & modelview() const */ -- Eigen::Transform3d & modelview(); -+ * @sa setModelview(), const Eigen::Projective3d & modelview() const */ -+ Eigen::Projective3d & modelview(); - /** Calls gluPerspective() or glOrtho() with parameters automatically chosen - * for rendering the GLWidget's molecule with this camera. Should be called - * only in GL_PROJECTION matrix mode. Example code is given -@@ -342,7 +342,7 @@ namespace Avogadro { - * @return {x/w, y/w, z/w} vector - */ - Eigen::Vector3d V4toV3DivW(const Eigen::Vector4d & v4) { -- return v4.start<3>()/v4.w(); -+ return v4.head<3>()/v4.w(); - } - }; - ---- a/libavogadro/src/engines/wireengine.cpp -+++ b/libavogadro/src/engines/wireengine.cpp -@@ -109,7 +109,7 @@ namespace Avogadro { - const Camera *camera = pd->camera(); - - // perform a rough form of frustum culling -- Eigen::Vector3d transformedPos = pd->camera()->modelview() * v; -+ Eigen::Vector3d transformedPos = (pd->camera()->modelview() * v.homogeneous()).head<3>(); - double dot = transformedPos.z() / transformedPos.norm(); - if(dot > -0.8) - return true; -@@ -167,7 +167,7 @@ namespace Avogadro { - map = pd->colorMap(); // fall back to global color map - - // perform a rough form of frustum culling -- Eigen::Vector3d transformedEnd1 = pd->camera()->modelview() * v1; -+ Eigen::Vector3d transformedEnd1 = (pd->camera()->modelview() * v1.homogeneous()).head<3>(); - double dot = transformedEnd1.z() / transformedEnd1.norm(); - if(dot > -0.8) - return true; // i.e., don't bother rendering ---- a/libavogadro/src/extensions/crystallography/crystallographyextension.cpp -+++ b/libavogadro/src/extensions/crystallography/crystallographyextension.cpp -@@ -1989,7 +1989,7 @@ namespace Avogadro - // fix coordinates - // Apply COB matrix: - Eigen::Matrix3d invCob; -- cob.computeInverse(&invCob); -+ invCob = cob.inverse(); - for (QList::iterator - it = fcoords.begin(), - it_end = fcoords.end(); ---- a/libavogadro/src/extensions/crystallography/ui/ceviewoptionswidget.cpp -+++ b/libavogadro/src/extensions/crystallography/ui/ceviewoptionswidget.cpp -@@ -139,7 +139,7 @@ namespace Avogadro - { - // View into a Miller plane - Camera *camera = m_glWidget->camera(); -- Eigen::Transform3d modelView; -+ Eigen::Projective3d modelView; - modelView.setIdentity(); - - // OK, so we want to rotate to look along the normal at the plane ---- a/libavogadro/src/extensions/orca/orcaanalysedialog.cpp -+++ b/libavogadro/src/extensions/orca/orcaanalysedialog.cpp -@@ -41,7 +41,6 @@ - #include - - #include --#include - - #include - ---- a/libavogadro/src/extensions/orca/orcainputdialog.cpp -+++ b/libavogadro/src/extensions/orca/orcainputdialog.cpp -@@ -33,7 +33,6 @@ - #include - - #include --#include - - #include - ---- a/libavogadro/src/extensions/qtaim/qtaimmathutilities.cpp -+++ b/libavogadro/src/extensions/qtaim/qtaimmathutilities.cpp -@@ -28,6 +28,7 @@ - - #include - #include -+#include - - namespace Avogadro { - namespace QTAIMMathUtilities { ---- a/libavogadro/src/extensions/qtaim/qtaimwavefunctionevaluator.cpp -+++ b/libavogadro/src/extensions/qtaim/qtaimwavefunctionevaluator.cpp -@@ -35,21 +35,21 @@ namespace Avogadro - m_nprim=wfn.numberOfGaussianPrimitives(); - m_nnuc=wfn.numberOfNuclei(); - -- m_nucxcoord=Map >(wfn.xNuclearCoordinates(),m_nnuc); -- m_nucycoord=Map >(wfn.yNuclearCoordinates(),m_nnuc); -- m_nuczcoord=Map >(wfn.zNuclearCoordinates(),m_nnuc); -- m_nucz=Map >(wfn.nuclearCharges(),m_nnuc); -- m_X0=Map >(wfn.xGaussianPrimitiveCenterCoordinates(),m_nprim,1); -- m_Y0=Map >(wfn.yGaussianPrimitiveCenterCoordinates(),m_nprim,1); -- m_Z0=Map >(wfn.zGaussianPrimitiveCenterCoordinates(),m_nprim,1); -- m_xamom=Map >(wfn.xGaussianPrimitiveAngularMomenta(),m_nprim,1); -- m_yamom=Map >(wfn.yGaussianPrimitiveAngularMomenta(),m_nprim,1); -- m_zamom=Map >(wfn.zGaussianPrimitiveAngularMomenta(),m_nprim,1); -- m_alpha=Map >(wfn.gaussianPrimitiveExponentCoefficients(),m_nprim,1); -+ m_nucxcoord=Map >(const_cast(wfn.xNuclearCoordinates()),m_nnuc); -+ m_nucycoord=Map >(const_cast(wfn.yNuclearCoordinates()),m_nnuc); -+ m_nuczcoord=Map >(const_cast(wfn.zNuclearCoordinates()),m_nnuc); -+ m_nucz=Map >(const_cast(wfn.nuclearCharges()),m_nnuc); -+ m_X0=Map >(const_cast(wfn.xGaussianPrimitiveCenterCoordinates()),m_nprim,1); -+ m_Y0=Map >(const_cast(wfn.yGaussianPrimitiveCenterCoordinates()),m_nprim,1); -+ m_Z0=Map >(const_cast(wfn.zGaussianPrimitiveCenterCoordinates()),m_nprim,1); -+ m_xamom=Map >(const_cast(wfn.xGaussianPrimitiveAngularMomenta()),m_nprim,1); -+ m_yamom=Map >(const_cast(wfn.yGaussianPrimitiveAngularMomenta()),m_nprim,1); -+ m_zamom=Map >(const_cast(wfn.zGaussianPrimitiveAngularMomenta()),m_nprim,1); -+ m_alpha=Map >(const_cast(wfn.gaussianPrimitiveExponentCoefficients()),m_nprim,1); - // TODO Implement screening for unoccupied molecular orbitals. -- m_occno=Map >(wfn.molecularOrbitalOccupationNumbers(),m_nmo,1); -- m_orbe=Map >(wfn.molecularOrbitalEigenvalues(),m_nmo,1); -- m_coef=Map >(wfn.molecularOrbitalCoefficients(),m_nmo,m_nprim); -+ m_occno=Map >(const_cast(wfn.molecularOrbitalOccupationNumbers()),m_nmo,1); -+ m_orbe=Map >(const_cast(wfn.molecularOrbitalEigenvalues()),m_nmo,1); -+ m_coef=Map >(const_cast(wfn.molecularOrbitalCoefficients()),m_nmo,m_nprim); - m_totalEnergy=wfn.totalEnergy(); - m_virialRatio=wfn.virialRatio(); - ---- a/libavogadro/src/extensions/surfaces/openqube/gamessukout.cpp -+++ b/libavogadro/src/extensions/surfaces/openqube/gamessukout.cpp -@@ -19,6 +19,7 @@ - using Eigen::Vector3d; - using std::vector; - -+#include - #include - - namespace OpenQube ---- a/libavogadro/src/extensions/surfaces/openqube/slaterset.cpp -+++ b/libavogadro/src/extensions/surfaces/openqube/slaterset.cpp -@@ -25,9 +25,9 @@ - - #include "cube.h" - --#include - #include - #include -+#include - - #include - -@@ -250,7 +250,9 @@ bool SlaterSet::initialize() - - SelfAdjointEigenSolver s(m_overlap); - MatrixXd p = s.eigenvectors(); -- MatrixXd m = p * s.eigenvalues().cwise().inverse().cwise().sqrt().asDiagonal() * p.inverse(); -+ // TODO check if this is correct -+ MatrixXd m1 = (s.eigenvalues().array().inverse().sqrt()); -+ MatrixXd m = p.array()*(m1.diagonal().array())*p.inverse().array(); - m_normalized = m * m_eigenVectors; - - if (!(m_overlap*m*m).isIdentity()) ---- a/libavogadro/src/glpainter_p.cpp -+++ b/libavogadro/src/glpainter_p.cpp -@@ -789,13 +789,13 @@ namespace Avogadro - } else { - points[theta-1] = Eigen::AngleAxisd(theta * (M_PI / 180.0) / 2, n) * u; - } -- points[theta-1] = d->widget->camera()->modelview() * (origin + points[theta-1]); -+ points[theta-1] = (d->widget->camera()->modelview() * (origin + points[theta-1]).homogeneous()).head<3>(); - } - - // Get vectors representing the points' positions in terms of the model view. -- Eigen::Vector3d _origin = d->widget->camera()->modelview() * origin; -- Eigen::Vector3d _direction1 = d->widget->camera()->modelview() * (origin+u); -- Eigen::Vector3d _direction2 = d->widget->camera()->modelview() * (origin+v); -+ Eigen::Vector3d _origin = (d->widget->camera()->modelview() * origin.homogeneous()).head<3>(); -+ Eigen::Vector3d _direction1 = (d->widget->camera()->modelview() * (origin+u).homogeneous()).head<3>(); -+ Eigen::Vector3d _direction2 = (d->widget->camera()->modelview() * (origin+v).homogeneous()).head<3>(); - - glPushAttrib(GL_ALL_ATTRIB_BITS); - glPushMatrix(); -@@ -880,12 +880,12 @@ namespace Avogadro - } else { - points[theta-1] = Eigen::AngleAxisd(theta * (M_PI / 180.0) / 2, n) * u; - } -- points[theta-1] = d->widget->camera()->modelview() * (origin + points[theta-1]); -+ points[theta-1] = (d->widget->camera()->modelview() * (origin + points[theta-1]).homogeneous()).head<3>(); - } - - // Get vectors representing the points' positions in terms of the model view. -- Eigen::Vector3d _direction1 = d->widget->camera()->modelview() * (origin + u); -- Eigen::Vector3d _direction2 = d->widget->camera()->modelview() * (origin + v); -+ Eigen::Vector3d _direction1 = (d->widget->camera()->modelview() * (origin + u).homogeneous()).head<3>(); -+ Eigen::Vector3d _direction2 = (d->widget->camera()->modelview() * (origin + v).homogeneous()).head<3>(); - - glPushAttrib(GL_ALL_ATTRIB_BITS); - glPushMatrix(); ---- a/libavogadro/src/glwidget.cpp -+++ b/libavogadro/src/glwidget.cpp -@@ -765,7 +765,7 @@ namespace Avogadro { - GLfloat fogColor[4]= {static_cast(d->background.redF()), static_cast(d->background.greenF()), - static_cast(d->background.blueF()), static_cast(d->background.alphaF())}; - glFogfv(GL_FOG_COLOR, fogColor); -- Vector3d distance = camera()->modelview() * d->center; -+ Vector3d distance = (camera()->modelview() * d->center.homogeneous()).head<3>(); - double distanceToCenter = distance.norm(); - glFogf(GL_FOG_DENSITY, 1.0); - glHint(GL_FOG_HINT, GL_NICEST); -@@ -1711,7 +1711,7 @@ namespace Avogadro { - - if (d->renderModelViewDebug) { - // Model view matrix: -- const Eigen::Transform3d &modelview = d->camera->modelview(); -+ const Eigen::Projective3d &modelview = d->camera->modelview(); - y += d->pd->painter()->drawText - (x, y, tr("ModelView row 1: %L1 %L2 %L3 %L4") - .arg(modelview(0, 0), 6, 'f', 2, ' ') ---- a/libavogadro/src/molecule.cpp -+++ b/libavogadro/src/molecule.cpp -@@ -38,7 +38,7 @@ - #include "zmatrix.h" - - #include --#include -+#include - - #include - -@@ -1907,7 +1907,29 @@ namespace Avogadro{ - } - d->center /= static_cast(nAtoms); - Eigen::Hyperplane planeCoeffs; -- Eigen::fitHyperplane(numAtoms(), atomPositions, &planeCoeffs); -+ //Eigen::fitHyperplane(numAtoms(), atomPositions, &planeCoeffs); -+ -+ // TODO check if this is OK -+ /************************/ -+ typedef Eigen::Matrix CovMatrixType; -+ typedef Eigen::Vector3d VectorType; -+ -+ VectorType mean = d->center; -+ int size=3; -+ int numPoints=numAtoms(); -+ VectorType ** points=atomPositions; -+ CovMatrixType covMat = CovMatrixType::Zero(size, size); -+ VectorType remean = VectorType::Zero(size); -+ for(int i = 0; i < numPoints; ++i) -+ { -+ VectorType diff = (*(points[i]) - mean).conjugate(); -+ covMat += diff * diff.adjoint(); -+ } -+ Eigen::SelfAdjointEigenSolver eig(covMat); -+ planeCoeffs.normal() = eig.eigenvectors().col(0); -+ /************************/ -+ -+ - delete[] atomPositions; - d->normalVector = planeCoeffs.normal(); - } ---- a/libavogadro/src/navigate.cpp -+++ b/libavogadro/src/navigate.cpp -@@ -40,7 +40,7 @@ namespace Avogadro { - void Navigate::zoom(GLWidget *widget, const Eigen::Vector3d &goal, - double delta) - { -- Vector3d transformedGoal = widget->camera()->modelview() * goal; -+ Vector3d transformedGoal = (widget->camera()->modelview() * goal.homogeneous()).head<3>(); - double distanceToGoal = transformedGoal.norm(); - - double t = ZOOM_SPEED * delta; ---- a/libavogadro/src/tools/bondcentrictool.cpp -+++ b/libavogadro/src/tools/bondcentrictool.cpp -@@ -578,8 +578,8 @@ namespace Avogadro { - - Vector3d clicked = *m_clickedAtom->pos(); - -- Vector3d axis = Vector3d(0, 0, ((widget->camera()->modelview() * other).z() >= -- (widget->camera()->modelview() * center).z() ? -1 : 1)); -+ Vector3d axis = Vector3d(0, 0, ((widget->camera()->modelview() * other.homogeneous()).z() >= -+ (widget->camera()->modelview() * center.homogeneous()).z() ? -1 : 1)); - - Vector3d centerProj = widget->camera()->project(center); - centerProj -= Vector3d(0,0,centerProj.z()); -@@ -673,8 +673,8 @@ namespace Avogadro { - - Vector3d clicked = *m_clickedAtom->pos(); - -- Vector3d axis = Vector3d(0, 0, ((widget->camera()->modelview() * other).z() >= -- (widget->camera()->modelview() * center).z() ? -1 : 1)); -+ Vector3d axis = Vector3d(0, 0, ((widget->camera()->modelview() * other.homogeneous()).z() >= -+ (widget->camera()->modelview() * center.homogeneous()).z() ? -1 : 1)); - - Vector3d centerProj = widget->camera()->project(center); - centerProj -= Vector3d(0,0,centerProj.z()); -@@ -1362,10 +1362,10 @@ namespace Avogadro { - - planeVec = length * (planeVec / planeVec.norm()); - -- Vector3d topLeft = widget->camera()->modelview() * (left + planeVec); -- Vector3d topRight = widget->camera()->modelview() * (right + planeVec); -- Vector3d botRight = widget->camera()->modelview() * (right - planeVec); -- Vector3d botLeft = widget->camera()->modelview() * (left - planeVec); -+ Vector3d topLeft = (widget->camera()->modelview() * (left + planeVec).homogeneous()).head<3>(); -+ Vector3d topRight = (widget->camera()->modelview() * (right + planeVec).homogeneous()).head<3>(); -+ Vector3d botRight = (widget->camera()->modelview() * (right - planeVec).homogeneous()).head<3>(); -+ Vector3d botLeft = (widget->camera()->modelview() * (left - planeVec).homogeneous()).head<3>(); - - float alpha = 0.4; - double lineWidth = 1.5; -@@ -1444,10 +1444,10 @@ namespace Avogadro { - C = D + ((C-D).normalized() * minWidth); - } - -- Vector3d topLeft = widget->camera()->modelview() * D; -- Vector3d topRight = widget->camera()->modelview() * C; -- Vector3d botRight = widget->camera()->modelview() * B; -- Vector3d botLeft = widget->camera()->modelview() * A; -+ Vector3d topLeft = (widget->camera()->modelview() * D.homogeneous()).head<3>(); -+ Vector3d topRight = (widget->camera()->modelview() * C.homogeneous()).head<3>(); -+ Vector3d botRight = (widget->camera()->modelview() * B.homogeneous()).head<3>(); -+ Vector3d botLeft = (widget->camera()->modelview() * A.homogeneous()).head<3>(); - - float alpha = 0.4; - double lineWidth = 1.5; -@@ -1506,12 +1506,12 @@ namespace Avogadro { - Vector3d positionVector) - { - //Rotate skeleton around a particular axis and center point -- Eigen::Transform3d rotation; -+ Eigen::Projective3d rotation; - rotation = Eigen::AngleAxisd(angle, rotationVector); - rotation.pretranslate(centerVector); - rotation.translate(-centerVector); - -- return rotation*positionVector; -+ return (rotation*positionVector.homogeneous()).head<3>(); - } - - // ########## showAnglesChanged ########## ---- a/libavogadro/src/tools/manipulatetool.cpp -+++ b/libavogadro/src/tools/manipulatetool.cpp -@@ -40,7 +40,6 @@ - #include - - using Eigen::Vector3d; --using Eigen::Transform3d; - using Eigen::AngleAxisd; - - namespace Avogadro { -@@ -138,7 +137,7 @@ namespace Avogadro { - double yRotate = m_settingsWidget->yRotateSpinBox->value() * DEG_TO_RAD; - double zRotate = m_settingsWidget->zRotateSpinBox->value() * DEG_TO_RAD; - -- Eigen::Transform3d rotation; -+ Eigen::Projective3d rotation; - rotation.matrix().setIdentity(); - rotation.translation() = center; - rotation.rotate(AngleAxisd(xRotate, Vector3d::UnitX()) -@@ -152,12 +151,12 @@ namespace Avogadro { - if (p->type() == Primitive::AtomType) { - Atom *atom = static_cast(p); - tempPos = translate + *(atom->pos()); -- atom->setPos(rotation * tempPos); -+ atom->setPos((rotation * tempPos.homogeneous()).head<3>()); - } - } else { - foreach(Atom *atom, widget->molecule()->atoms()) { - tempPos = translate + *(atom->pos()); -- atom->setPos(rotation * tempPos); -+ atom->setPos((rotation * tempPos.homogeneous()).head<3>()); - } - } - -@@ -199,7 +198,7 @@ namespace Avogadro { - widget->setCursor(Qt::SizeVerCursor); - - // Move the selected atom(s) in to or out of the screen -- Vector3d transformedGoal = widget->camera()->modelview() * *goal; -+ Vector3d transformedGoal = (widget->camera()->modelview() * goal->homogeneous()).head<3>(); - double distanceToGoal = transformedGoal.norm(); - - double t = ZOOM_SPEED * delta; -@@ -255,7 +254,7 @@ namespace Avogadro { - - // Rotate the selected atoms about the center - // rotate only selected primitives -- Transform3d fragmentRotation; -+ Eigen::Projective3d fragmentRotation; - fragmentRotation.matrix().setIdentity(); - fragmentRotation.translation() = *center; - fragmentRotation.rotate( -@@ -266,7 +265,7 @@ namespace Avogadro { - - foreach(Primitive *p, widget->selectedPrimitives()) - if (p->type() == Primitive::AtomType) -- static_cast(p)->setPos(fragmentRotation * *static_cast(p)->pos()); -+ static_cast(p)->setPos((fragmentRotation * static_cast(p)->pos()->homogeneous()).head<3>()); - widget->molecule()->update(); - } - -@@ -274,7 +273,7 @@ namespace Avogadro { - double delta) const - { - // Tilt the selected atoms about the center -- Transform3d fragmentRotation; -+ Eigen::Projective3d fragmentRotation; - fragmentRotation.matrix().setIdentity(); - fragmentRotation.translation() = *center; - fragmentRotation.rotate(AngleAxisd(delta * ROTATION_SPEED, widget->camera()->backTransformedZAxis())); -@@ -282,7 +281,7 @@ namespace Avogadro { - - foreach(Primitive *p, widget->selectedPrimitives()) - if (p->type() == Primitive::AtomType) -- static_cast(p)->setPos(fragmentRotation * *static_cast(p)->pos()); -+ static_cast(p)->setPos((fragmentRotation * static_cast(p)->pos()->homogeneous()).head<3>()); - widget->molecule()->update(); - } - ---- a/libavogadro/src/tools/navigatetool.cpp -+++ b/libavogadro/src/tools/navigatetool.cpp -@@ -92,7 +92,8 @@ namespace Avogadro { - double sumOfWeights = 0.; - QList atoms = widget->molecule()->atoms(); - foreach (Atom *atom, atoms) { -- Vector3d transformedAtomPos = widget->camera()->modelview() * *atom->pos(); -+ Vector3d transformedAtomPos = (widget->camera()->modelview() * -+ atom->pos()->homogeneous()).head<3>(); - double atomDistance = transformedAtomPos.norm(); - double dot = transformedAtomPos.z() / atomDistance; - double weight = exp(-30. * (1. + dot)); ---- a/libavogadro/src/tools/skeletontree.cpp -+++ b/libavogadro/src/tools/skeletontree.cpp -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - using namespace Eigen; - using namespace std; -@@ -221,7 +222,7 @@ namespace Avogadro { - { - if (m_rootNode) { - //Rotate skeleton around a particular axis and center point -- Eigen::Transform3d rotation; -+ Eigen::Projective3d rotation; - rotation = Eigen::AngleAxisd(angle, rotationAxis); - rotation.pretranslate(centerVector); - rotation.translate(-centerVector); -@@ -248,11 +249,11 @@ namespace Avogadro { - // ########## recursiveRotate ########## - - void SkeletonTree::recursiveRotate(Node* n, -- const Eigen::Transform3d &rotationMatrix) -+ const Eigen::Projective3d &rotationMatrix) - { - // Update the root node with the new position - Atom* a = n->atom(); -- a->setPos(rotationMatrix * (*a->pos())); -+ a->setPos((rotationMatrix * (*a->pos()).homogeneous()).head<3>()); - a->update(); - - // Now update the children ---- a/libavogadro/src/tools/skeletontree.h -+++ b/libavogadro/src/tools/skeletontree.h -@@ -230,6 +230,6 @@ namespace Avogadro { - * @param centerVector Center location to rotate around. - */ - void recursiveRotate(Node* n, -- const Eigen::Transform3d &rotationMatrix); -+ const Eigen::Projective3d &rotationMatrix); - - }; - } // End namespace Avogadro \ No newline at end of file diff --git a/gnu/packages/patches/avogadro-python-eigen-lib.patch b/gnu/packages/patches/avogadro-python-eigen-lib.patch deleted file mode 100644 index ac9f2e30af..0000000000 --- a/gnu/packages/patches/avogadro-python-eigen-lib.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 2d4be7ede177a8df7340fe3b209698d591ee8a04 Mon Sep 17 00:00:00 2001 -From: Claudio Fernandes -Date: Mon, 16 Jan 2017 19:48:23 -0200 -Subject: [PATCH] Adapt libavogadro/python to Eigen 3.3 - ---- - libavogadro/src/python/camera.cpp | 2 +- - libavogadro/src/python/eigen.cpp | 60 +++++++++++++++++++-------------------- - 2 files changed, 31 insertions(+), 31 deletions(-) - -diff --git a/libavogadro/src/python/camera.cpp b/libavogadro/src/python/camera.cpp -index 69ca87bf8..30b32af7d 100644 ---- a/libavogadro/src/python/camera.cpp -+++ b/libavogadro/src/python/camera.cpp -@@ -10,7 +10,7 @@ using namespace Avogadro; - void export_Camera() - { - -- const Eigen::Transform3d& (Camera::*modelview_ptr)() const = &Camera::modelview; -+ const Eigen::Projective3d& (Camera::*modelview_ptr)() const = &Camera::modelview; - Eigen::Vector3d (Camera::*unProject_ptr1)(const Eigen::Vector3d&) const = &Camera::unProject; - Eigen::Vector3d (Camera::*unProject_ptr2)(const QPoint&, const Eigen::Vector3d&) const = &Camera::unProject; - Eigen::Vector3d (Camera::*unProject_ptr3)(const QPoint&) const = &Camera::unProject; -diff --git a/libavogadro/src/python/eigen.cpp b/libavogadro/src/python/eigen.cpp -index c1faedbcc..20b4e719d 100644 ---- a/libavogadro/src/python/eigen.cpp -+++ b/libavogadro/src/python/eigen.cpp -@@ -305,9 +305,9 @@ template <> struct ScalarTraits - struct innerclass - { - // -- // Eigen::Transform3d --> python array (4x4) -+ // Eigen::Projective3d --> python array (4x4) - // -- static PyObject* convert(Eigen::Transform3d const &trans) -+ static PyObject* convert(Eigen::Projective3d const &trans) - { - npy_intp dims[2] = { 4, 4 }; - PyObject *result = PyArray_SimpleNew(2, dims, PyArray_DOUBLE); -@@ -321,9 +321,9 @@ template <> struct ScalarTraits - return incref(result); - } - // -- // Eigen::Transform3d* --> python array (4x4) -+ // Eigen::Projective3d* --> python array (4x4) - // -- static PyObject* convert(Eigen::Transform3d *trans) -+ static PyObject* convert(Eigen::Projective3d *trans) - { - npy_intp dims[2] = { 4, 4 }; - PyObject *result = PyArray_SimpleNew(2, dims, PyArray_DOUBLE); -@@ -337,9 +337,9 @@ template <> struct ScalarTraits - return incref(result); - } - // -- // const Eigen::Transform3d* --> python array (4x4) -+ // const Eigen::Projective3d* --> python array (4x4) - // -- static PyObject* convert(const Eigen::Transform3d *trans) -+ static PyObject* convert(const Eigen::Projective3d *trans) - { - npy_intp dims[2] = { 4, 4 }; - PyObject *result = PyArray_SimpleNew(2, dims, PyArray_DOUBLE); -@@ -358,10 +358,10 @@ template <> struct ScalarTraits - Transform3d_to_python_array() - { - #ifndef WIN32 -- to_python_converter(); -+ to_python_converter(); - #endif -- to_python_converter(); -- to_python_converter(); -+ to_python_converter(); -+ to_python_converter(); - } - - }; -@@ -373,17 +373,17 @@ template <> struct ScalarTraits - // Insert an rvalue from_python converter at the tail of the - // chain. Used for implicit conversions - // -- // python array --> Eigen::Transform3d -+ // python array --> Eigen::Projective3d - // - // used for: - // -- // void function(Eigen::Transform3d vec) -- // void function(Eigen::Transform3d & vec) -- // void function(const Eigen::Transform3d & vec) -+ // void function(Eigen::Projective3d vec) -+ // void function(Eigen::Projective3d & vec) -+ // void function(const Eigen::Projective3d & vec) - // -- converter::registry::push_back( &convertible, &construct, type_id() ); -+ converter::registry::push_back( &convertible, &construct, type_id() ); - -- converter::registry::insert( &convert, type_id() ); -+ converter::registry::insert( &convert, type_id() ); - } - - static void* convert(PyObject *obj_ptr) -@@ -401,7 +401,7 @@ template <> struct ScalarTraits - throw_error_already_set(); // the 1D array does not have exactly 3 elements - - double *values = reinterpret_cast(array->data); -- Eigen::Transform3d *c_obj = new Eigen::Transform3d(); -+ Eigen::Projective3d *c_obj = new Eigen::Projective3d(); - double *dataPtr = c_obj->data(); - - for (int i = 0; i < 16; ++i) -@@ -432,7 +432,7 @@ template <> struct ScalarTraits - // I think this is a better way to get at the double array, where is this - // deleted though? Does Boost::Python do it? - double *values = reinterpret_cast(array->data); -- Eigen::Transform3d *storage = new Eigen::Transform3d(); -+ Eigen::Projective3d *storage = new Eigen::Projective3d(); - double *dataPtr = storage->data(); - - for (int i = 0; i < 16; ++i) -@@ -467,21 +467,21 @@ class EigenUnitTestHelper - void set_vector3d_ptr(Eigen::Vector3d* vec) { m_vector3d = *vec; } - void set_const_vector3d_ptr(const Eigen::Vector3d* const vec) { m_vector3d = *vec; } - -- //Eigen::Transform3d transform3d() { return m_transform3d; } -- //Eigen::Transform3d& transform3d_ref() { return m_transform3d; } -- const Eigen::Transform3d& const_transform3d_ref() { return m_transform3d; } -- Eigen::Transform3d* transform3d_ptr() { return &m_transform3d; } -- const Eigen::Transform3d* const_transform3d_ptr() { return &m_transform3d; } -- -- //void set_transform3d(Eigen::Transform3d vec) { m_transform3d = vec; } -- //void set_transform3d_ref(Eigen::Transform3d& vec) { m_transform3d = vec; } -- void set_const_transform3d_ref(const Eigen::Transform3d& vec) { m_transform3d = vec; } -- void set_transform3d_ptr(Eigen::Transform3d* vec) { m_transform3d = *vec; } -- void set_const_transform3d_ptr(const Eigen::Transform3d* const vec) { m_transform3d = *vec; } -+ //Eigen::Projective3d transform3d() { return m_transform3d; } -+ //Eigen::Projective3d& transform3d_ref() { return m_transform3d; } -+ const Eigen::Projective3d& const_transform3d_ref() { return m_transform3d; } -+ Eigen::Projective3d* transform3d_ptr() { return &m_transform3d; } -+ const Eigen::Projective3d* const_transform3d_ptr() { return &m_transform3d; } -+ -+ //void set_transform3d(Eigen::Projective3d vec) { m_transform3d = vec; } -+ //void set_transform3d_ref(Eigen::Projective3d& vec) { m_transform3d = vec; } -+ void set_const_transform3d_ref(const Eigen::Projective3d& vec) { m_transform3d = vec; } -+ void set_transform3d_ptr(Eigen::Projective3d* vec) { m_transform3d = *vec; } -+ void set_const_transform3d_ptr(const Eigen::Projective3d* const vec) { m_transform3d = *vec; } - - private: - Eigen::Vector3d m_vector3d; -- Eigen::Transform3d m_transform3d; -+ Eigen::Projective3d m_transform3d; - - }; - #endif -@@ -529,6 +529,6 @@ void export_Eigen() - Vector3x_to_python_array(); - Vector3x_from_python_array(); - -- // Eigen::Transform3d -+ // Eigen::Projective3d - Transform3d_to_python_array(); - Transform3d_from_python_array(); -- cgit v1.2.3 From 9085260fccd17955be6922c215f89be3e424dda3 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 25 Dec 2020 23:02:18 +0100 Subject: guix: qt-build-system, qt-utils: Unify wrapping of qt-programs. Unify (guix qt-build-system wrap-all-programs) and (guix qt-utils wrap-qt-program), so both behave the same. The functions now reside in qt-utils to make them easily available for packages not using the qt-build-system. * guix/build/qt-build-system.scm (variables-for-wrapping, wrap-all-programs): Move from here ... * guix/build/qt-utils.scm (variables-for-wrapping, wrap-all-qt-programs): ... to here. Base the later on (wrap-qt-program*): New function, carved out from old wrap-all-programs. (wrap-qt-program): Base on wrap-qt-program*, change arguments in an incompatible way. * gnu/packages/bittorrent.scm (qbittorrent)[arguments]{wrap-qt}: Adjust to new interface of wrap-qt-program. * gnu/packages/finance.scm (electron-cash): Likewise. * gnu/packages/geo.scm (qgis): Likewise. * gnu/packages/password-utils.scm (qtpass): Likewise. * gnu/packages/video.scm (openshot): Likewise. * gnu/packages/web-browsers.scm (kristall): Likewise. --- gnu/packages/bittorrent.scm | 6 ++- gnu/packages/finance.scm | 8 +-- gnu/packages/geo.scm | 7 +-- gnu/packages/password-utils.scm | 6 ++- gnu/packages/video.scm | 6 ++- gnu/packages/web-browsers.scm | 5 +- guix/build-system/qt.scm | 1 + guix/build/qt-build-system.scm | 68 ++------------------------ guix/build/qt-utils.scm | 105 ++++++++++++++++++++++++++++++++-------- 9 files changed, 113 insertions(+), 99 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 08e61d7ba2..6967eccec4 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018 Nam Nguyen ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019, 2020 Brett Gilio +;;; Copyright © 2020 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -447,8 +448,9 @@ desktops.") #:phases (modify-phases %standard-phases (add-after 'install 'wrap-qt - (lambda* (#:key outputs #:allow-other-keys) - (wrap-qt-program (assoc-ref outputs "out") "qbittorrent") + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-qt-program "qbittorrent" #:output out #:inputs inputs)) #t))))) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 8ead37beb3..1f1dadebb3 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016 Andreas Enge ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Alex Griffin -;;; Copyright © 2016 Hartmut Goebel +;;; Copyright © 2016, 2020 Hartmut Goebel ;;; Copyright © 2017 Carlo Zancanaro ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 Vasile Dumitrascu @@ -611,8 +611,10 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (assoc-ref inputs "libsecp256k1") "/lib/libsecp256k1.so.0'"))))) (add-after 'install 'wrap-qt - (lambda* (#:key outputs #:allow-other-keys) - (wrap-qt-program (assoc-ref outputs "out") "electron-cash")))))) + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-qt-program "electron-cash" #:output out #:inputs inputs)) + #t))))) (home-page "https://electroncash.org/") (synopsis "Bitcoin Cash wallet") (description diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index c682613ff1..a90db90084 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; Copyright © 2019, 2020 Efraim Flashner ;;; Copyright © 2019 Wiktor Żelazny -;;; Copyright © 2019 Hartmut Goebel +;;; Copyright © 2019, 2020 Hartmut Goebel ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Christopher Baines ;;; Copyright © 2020 Felix Gruber @@ -2121,8 +2121,9 @@ growing set of geoscientific methods.") (add-after 'install 'wrap-python (assoc-ref python:%standard-phases 'wrap)) (add-after 'wrap-python 'wrap-qt - (lambda* (#:key outputs #:allow-other-keys) - (wrap-qt-program (assoc-ref outputs "out") "qgis") + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-qt-program "qgis" #:output out #:inputs inputs)) #t)) (add-after 'wrap-qt 'wrap-gis (lambda* (#:key inputs outputs #:allow-other-keys) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 2053457375..c568efcf31 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2020 Jean-Baptiste Note ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -664,8 +665,9 @@ key URIs using the standard otpauth:// scheme.") (install-file "qtpass.1" man) #t))) (add-after 'install 'wrap-qt - (lambda* (#:key outputs #:allow-other-keys) - (wrap-qt-program (assoc-ref outputs "out") "qtpass") + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-qt-program "qtpass" #:output out #:inputs inputs)) #t)) (add-before 'check 'check-setup ;; Make Qt render "offscreen", required for tests. diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index cd049fb375..8e9c82d587 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -47,6 +47,7 @@ ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Ivan Kozlov ;;; Copyright © 2020 Antoine Côté +;;; Copyright © 2020 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -4441,9 +4442,10 @@ API. It includes bindings for Python, Ruby, and other languages.") (setenv "HOME" "/tmp") #t)) (add-after 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key outputs inputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program out "openshot-qt")) + (wrap-qt-program "openshot-qt" + #:output out #:inputs inputs)) #t))))) (home-page "https://www.openshot.org/") (synopsis "Video editor") diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index b134d29782..1040e79593 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 Alexandru-Sergiu Marton +;;; Copyright © 2020 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -433,9 +434,9 @@ access.") "/share/fonts/truetype/NotoColorEmoji"))) #t)) (add-after 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key outputs inputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program out "kristall")) + (wrap-qt-program "kristall" #:output out #:inputs inputs)) #t))))) (native-inputs `(("breeze-stylesheet" diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm index 118022ec45..1bd89bfa4d 100644 --- a/guix/build-system/qt.scm +++ b/guix/build-system/qt.scm @@ -53,6 +53,7 @@ (define %qt-build-system-modules ;; Build-side modules imported and used by default. `((guix build qt-build-system) + (guix build qt-utils) ,@%cmake-build-system-modules)) (define (default-cmake) diff --git a/guix/build/qt-build-system.scm b/guix/build/qt-build-system.scm index 005157b0a4..a6955ce4c2 100644 --- a/guix/build/qt-build-system.scm +++ b/guix/build/qt-build-system.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 Federico Beffa ;;; Copyright © 2014, 2015 Ludovic Courtès ;;; Copyright © 2018 Mark H Weaver -;;; Copyright © 2019, 2020 Hartmut Goebel +;;; Copyright © 2019, 2020, 2021 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +22,7 @@ (define-module (guix build qt-build-system) #:use-module ((guix build cmake-build-system) #:prefix cmake:) #:use-module (guix build utils) + #:use-module (guix build qt-utils) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (ice-9 ftw) @@ -47,73 +48,10 @@ (setenv "CTEST_OUTPUT_ON_FAILURE" "1") #t) -(define (variables-for-wrapping base-directories) - - (define (collect-sub-dirs base-directories subdirectory) - (filter-map - (lambda (dir) - (let ((directory (string-append dir subdirectory))) - (if (directory-exists? directory) directory #f))) - base-directories)) - - (filter - (lambda (var-to-wrap) (not (null? (last var-to-wrap)))) - (map - (lambda (var-spec) - `(,(first var-spec) = ,(collect-sub-dirs base-directories (last var-spec)))) - (list - ;; these shall match the search-path-specification for Qt and KDE - ;; libraries - '("XDG_DATA_DIRS" "/share") - '("XDG_CONFIG_DIRS" "/etc/xdg") - '("QT_PLUGIN_PATH" "/lib/qt5/plugins") - '("QML2_IMPORT_PATH" "/lib/qt5/qml"))))) - -(define* (wrap-all-programs #:key inputs outputs - (qt-wrap-excluded-outputs '()) - #:allow-other-keys) - "Implement phase \"qt-wrap\": look for GSettings schemas and -gtk+-v.0 libraries and create wrappers with suitably set environment variables -if found. - -Wrapping is not applied to outputs whose name is listed in -QT-WRAP-EXCLUDED-OUTPUTS. This is useful when an output is known not -to contain any Qt binaries, and where wrapping would gratuitously -add a dependency of that output on Qt." - (define (find-files-to-wrap directory) - (append-map - (lambda (dir) - (if (directory-exists? dir) (find-files dir ".*") (list))) - (list (string-append directory "/bin") - (string-append directory "/sbin") - (string-append directory "/libexec") - (string-append directory "/lib/libexec")))) - - (define input-directories - ;; FIXME: Filter out unwanted inputs, e.g. cmake - (match inputs - (((_ . dir) ...) - dir))) - - (define handle-output - (match-lambda - ((output . directory) - (unless (member output qt-wrap-excluded-outputs) - (let ((bin-list (find-files-to-wrap directory)) - (vars-to-wrap (variables-for-wrapping - (append (list directory) - input-directories)))) - (when (not (null? vars-to-wrap)) - (for-each (cut apply wrap-program <> vars-to-wrap) - bin-list))))))) - - (for-each handle-output outputs) - #t) - (define %standard-phases (modify-phases cmake:%standard-phases (add-before 'check 'check-setup check-setup) - (add-after 'install 'qt-wrap wrap-all-programs))) + (add-after 'install 'qt-wrap wrap-all-qt-programs))) (define* (qt-build #:key inputs (phases %standard-phases) #:allow-other-keys #:rest args) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index d2486ee86c..3fbdb6be61 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Craven +;;; Copyright © 2019, 2020, 2021 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,23 +19,87 @@ (define-module (guix build qt-utils) #:use-module (guix build utils) - #:export (wrap-qt-program)) - -(define (wrap-qt-program out program) - (define (suffix env-var path) - (let ((env-val (getenv env-var))) - (if env-val (string-append env-val ":" path) path))) - - (let ((qml-path (suffix "QML2_IMPORT_PATH" - (string-append out "/lib/qt5/qml"))) - (plugin-path (suffix "QT_PLUGIN_PATH" - (string-append out "/lib/qt5/plugins"))) - (xdg-data-path (suffix "XDG_DATA_DIRS" - (string-append out "/share"))) - (xdg-config-path (suffix "XDG_CONFIG_DIRS" - (string-append out "/etc/xdg")))) - (wrap-program (string-append out "/bin/" program) - `("QML2_IMPORT_PATH" = (,qml-path)) - `("QT_PLUGIN_PATH" = (,plugin-path)) - `("XDG_DATA_DIRS" = (,xdg-data-path)) - `("XDG_CONFIG_DIRS" = (,xdg-config-path))))) + #:use-module (ice-9 match) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) + #:export (wrap-qt-program + wrap-all-qt-programs)) + + +(define (variables-for-wrapping base-directories) + + (define (collect-sub-dirs base-directories subdirectory) + (filter-map + (lambda (dir) + (let ((directory (string-append dir subdirectory))) + (if (directory-exists? directory) directory #f))) + base-directories)) + + (filter + (lambda (var-to-wrap) (not (null? (last var-to-wrap)))) + (map + (lambda (var-spec) + `(,(first var-spec) = ,(collect-sub-dirs base-directories (last var-spec)))) + (list + ;; these shall match the search-path-specification for Qt and KDE + ;; libraries + '("XDG_DATA_DIRS" "/share") + '("XDG_CONFIG_DIRS" "/etc/xdg") + '("QT_PLUGIN_PATH" "/lib/qt5/plugins") + '("QML2_IMPORT_PATH" "/lib/qt5/qml"))))) + + +(define* (wrap-qt-program* program #:key inputs output-dir) + + (define input-directories + ;; FIXME: Filter out unwanted inputs, e.g. cmake + (match inputs + (((_ . dir) ...) + dir))) + + (let ((vars-to-wrap (variables-for-wrapping + (cons output-dir input-directories)))) + (when (not (null? vars-to-wrap)) + (apply wrap-program program vars-to-wrap)))) + + +(define* (wrap-qt-program program-name #:key inputs output) + "Wrap the specified programm (which must reside in the OUTPUT's \"/bin\" +directory) with suitably set environment variables. + +This is like qt-build-systems's phase \"qt-wrap\", but only the named program +is wrapped." + (wrap-qt-program* (string-append output "/bin/" program-name) + #:output-dir output #:inputs inputs)) + + +(define* (wrap-all-qt-programs #:key inputs outputs + (qt-wrap-excluded-outputs '()) + #:allow-other-keys) + "Implement qt-build-systems's phase \"qt-wrap\": look for executables in +\"bin\", \"sbin\" and \"libexec\" of all outputs and create wrappers with +suitably set environment variables if found. + +Wrapping is not applied to outputs whose name is listed in +QT-WRAP-EXCLUDED-OUTPUTS. This is useful when an output is known not +to contain any Qt binaries, and where wrapping would gratuitously +add a dependency of that output on Qt." + (define (find-files-to-wrap output-dir) + (append-map + (lambda (dir) + (if (directory-exists? dir) (find-files dir ".*") (list))) + (list (string-append output-dir "/bin") + (string-append output-dir "/sbin") + (string-append output-dir "/libexec") + (string-append output-dir "/lib/libexec")))) + + (define handle-output + (match-lambda + ((output . output-dir) + (unless (member output qt-wrap-excluded-outputs) + (for-each (cut wrap-qt-program* <> + #:output-dir output-dir #:inputs inputs) + (find-files-to-wrap output-dir)))))) + + (for-each handle-output outputs) + #t) -- cgit v1.2.3 From e41f8923f98c97823836f3562ba3f0aa0c855e11 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 30 Jan 2021 10:58:17 +0100 Subject: gnu: Add nq. * gnu/packages/admin.scm (nq): New variable. --- gnu/packages/admin.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c470d9288f..538e8d3eb4 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2019 Jakob L. Kreuze ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2019 Alex Griffin -;;; Copyright © 2019 Guillaume Le Vaillant +;;; Copyright © 2019, 2021 Guillaume Le Vaillant ;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen @@ -4346,3 +4346,32 @@ This program allows you to view and manipulate this EEPROM list.") the XMODEM/YMODEM/ZMODEM file transfer protocols.") (home-page "https://ohse.de/uwe/software/lrzsz.html") (license license:gpl2+))) + +(define-public nq + (package + (name "nq") + (version "0.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/leahneukirchen/nq") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1db96ykz35r273jyhf7cdknqk4p2jj9l8gbz7pjy1hq4pb6ffk99")))) + (build-system gnu-build-system) + (native-inputs + `(("perl" ,perl))) + (arguments + `(#:make-flags (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (synopsis "Unix command line queue utility") + (description + "@code{nq} can create very lightweight job queue systems which require no +setup, maintenance, supervision, or any long-running processes.") + (home-page "https://github.com/leahneukirchen/nq") + (license license:public-domain))) -- cgit v1.2.3 From 9c8ed43dd884ac143d759d12f2bc451fe3853ed2 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 29 Jan 2021 13:56:22 +0000 Subject: gnu: Add cl-out123. * gnu/packages/lisp-xyz.scm (cl-out123, ecl-cl-out123, sbcl-cl-out123): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 61 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index bc959502be..83a406c038 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -69,6 +69,7 @@ #:use-module (gnu packages libffi) #:use-module (gnu packages lisp) #:use-module (gnu packages maths) + #:use-module (gnu packages mp3) #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -10460,6 +10461,66 @@ online linear classification written in Common Lisp.") (define-public ecl-cl-online-learning (sbcl-package->ecl-package sbcl-cl-online-learning)) +(define-public sbcl-cl-out123 + (let ((commit "6b58d3f8c2a28ad09059ac4c60fb3c781b9b421b") + (revision "1")) + (package + (name "sbcl-cl-out123") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shirakumo/cl-out123") + (commit commit))) + (file-name (git-file-name "cl-out123" version)) + (sha256 + (base32 "0mdwgfax6sq68wvdgjjp78i40ah7wqkpqnvaq8a1c509k7ghdgv1")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled pre-compiled libraries. + (delete-file-recursively "static") + #t)))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "low-level.lisp" + (("libout123.so" all) + (string-append (assoc-ref inputs "libout123") + "/lib/" all))))) + ;; NOTE: (Sharlatan-20210129T134529+0000): ECL package `ext' has no + ;; exported macro `without-interrupts' it's moved to `mp' package + ;; https://github.com/Shirakumo/cl-out123/issues/2 + ;; https://gitlab.com/embeddable-common-lisp/ecl/-/blob/develop/src/lsp/mp.lsp + (add-after 'unpack 'fix-ecl-package-name + (lambda _ + (substitute* "wrapper.lisp" + (("ext:without-interrupts.*") "mp:without-interrupts\n")) + #t))))) + (inputs + `(("bordeaux-threads" ,sbcl-bordeaux-threads) + ("cffi" ,sbcl-cffi) + ("documentation-utils" ,sbcl-documentation-utils) + ("libout123" ,mpg123) + ("trivial-features" ,sbcl-trivial-features) + ("trivial-garbage" ,sbcl-trivial-garbage))) + (home-page "https://shirakumo.github.io/cl-out123/") + (synopsis "Common Lisp bindings to libout123") + (description + "This is a bindings library to @code{libout123} which allows easy +cross-platform audio playback.") + (license license:zlib)))) + +(define-public ecl-cl-out123 + (sbcl-package->ecl-package sbcl-cl-out123)) + +(define-public cl-out123 + (sbcl-package->cl-source-package sbcl-cl-out123)) + (define-public sbcl-cl-random-forest (let ((commit "fedb36ce99bb6f4d7e3a7dd6d8b058f331308f91") (revision "1")) -- cgit v1.2.3 From 91bfb6d19d52927c5e1457778a12f8c7aaa1e865 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jan 2021 20:51:07 +0100 Subject: gnu: ungoogled-chromium: Update to 88.0.4324.104-0.4e2679c. * gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 88. (%chromium-version): Set to 88.0.4324.104. (%ungoogled-revision): Set to 4e2679ce15a53925b34a95aa3e1731751530dc22. (%ungoogled-origin): Update hash. (libvpx/chromium): New variable. (ungoogled-chromium): Update hash. [arguments]: Patch one file for compatibility with system ICU. [inputs]: Change from ICU4C-67 to ICU4C-68. Change from LIBVPX to LIBVPX/CHROMIUM. --- gnu/packages/chromium.scm | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index a994b387bb..0b8f55ff02 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019, 2020 Marius Bakke +;;; Copyright © 2019, 2020, 2021 Marius Bakke ;;; Copyright © 2019 Alex Griffin ;;; ;;; This file is part of GNU Guix. @@ -160,6 +160,7 @@ "third_party/dom_distiller_js" ;BSD-3 "third_party/emoji-segmenter" ;ASL2.0 "third_party/flatbuffers" ;ASL2.0 + "third_party/fusejs" ;ASL2.0 "third_party/glslang" ;BSD-3, Expat, ASL2.0 "third_party/google_input_tools" ;ASL2.0 "third_party/google_input_tools/third_party/closure_library" ;ASL2.0 @@ -277,6 +278,13 @@ "third_party/woff2" ;ASL2.0 "third_party/xcbproto" ;X11 "third_party/xdg-utils" ;Expat + + ;; These are forked components of the X11 keybinding code. + "third_party/libxcb-keysyms" ;X11 + "third_party/libx11/src/KeyBind.c" ;X11 + "third_party/libx11/src/xkb/XKBBind.c" ;X11 + "third_party/x11proto/keysymdef.h" ;X11 + "third_party/zlib/google" ;BSD-3 "third_party/zxcvbn-cpp" ;Expat "url/third_party/mozilla" ;BSD-3, MPL1.1/GPL2+/LGPL2.1+ @@ -302,8 +310,8 @@ (string-append "ungoogled-chromium-" category "-" name)))) (sha256 (base32 hash)))) -(define %chromium-version "87.0.4280.141") -(define %ungoogled-revision "483a1bae4eee601c7d0a4a63499380e40e4f8a44") +(define %chromium-version "88.0.4324.104") +(define %ungoogled-revision "4e2679ce15a53925b34a95aa3e1731751530dc22") (define %debian-revision "debian/84.0.4147.105-1") (define %debian-patches @@ -321,7 +329,7 @@ (string-take %ungoogled-revision 7))) (sha256 (base32 - "0r09d27jrdz01rcwifchbq7ksh2bac15h8svq18jx426mr56dzla")))) + "09x6kxd99a274mln3k3ckly6swyp5qdnkkp8p6grs9nr5jrgqqx5")))) (define %guix-patches (list (local-file @@ -405,6 +413,22 @@ `(cons "--enable-custom-modes" ,flags)))))) +;; WebRTC in Chromium 88 requires an unreleased version of libvpx. Use the +;; commit mentioned in "third_party/libvpx/README.chromium". +(define libvpx/chromium + (package + (inherit libvpx) + (version "1.9.0-88-g12059d956") + (source (origin + (inherit (package-source libvpx)) + (uri (git-reference + (url "https://chromium.googlesource.com/webm/libvpx") + (commit (string-append "v" version)))) + (file-name (git-file-name "libvpx" version)) + (sha256 + (base32 + "14knnvfaskfz97vs3lfqrdpcbcx22s6qp16213wdnvnsf4c1lx1b")))))) + ;; 'make-ld-wrapper' can only work with an 'ld' executable, so we need ;; this trick to make it wrap 'lld'. (define (make-lld-wrapper lld) @@ -443,7 +467,7 @@ %chromium-version ".tar.xz")) (sha256 (base32 - "0x9k809m36pfirnw2vnr9pk93nxdbgrvna0xf1rs3q91zkbr2x8l")) + "0iq1rmfiqmxsj6skbi17g007zqgjsb50b59slfni2n4mz06xmgbx")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) @@ -580,6 +604,12 @@ (("third_party/icu/source/(common|i18n)/") "")) + ;; Fix faulty ICU call. Likely fixed in M89. + (substitute* + "third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc" + (("ideographicSpaceCharacter") + "kIdeographicSpaceCharacter")) + ;; XXX: Should be unnecessary when use_system_lcms2=true. (substitute* "third_party/pdfium/core/fxcodec/icc/iccmodule.h" (("include \"third_party/lcms/include/lcms2\\.h\"") @@ -805,14 +835,14 @@ ("glib" ,glib) ("gtk+" ,gtk+) ("harfbuzz" ,harfbuzz) - ("icu4c" ,icu4c-67) + ("icu4c" ,icu4c-68) ("lcms" ,lcms) ("libevent" ,libevent) ("libffi" ,libffi) ("libjpeg-turbo" ,libjpeg-turbo) ("libpng" ,libpng) ("libva" ,libva) - ("libvpx" ,libvpx) + ("libvpx" ,libvpx/chromium) ("libwebp" ,libwebp) ("libx11" ,libx11) ("libxcb" ,libxcb) -- cgit v1.2.3 From 034abb77a61fe694db9936bda48db833ff134ca5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jan 2021 20:56:03 +0100 Subject: gnu: foot: Update to 1.6.2. * gnu/packages/terminals.scm (foot): Update to 1.6.2. [native-inputs]: Remove GCC-10. --- gnu/packages/terminals.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index e6a7d6b16d..22a2ef99db 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -20,7 +20,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Valentin Ignatev ;;; Copyright © 2020 Michael Rohleder -;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020, 2021 Marius Bakke ;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Leo Famulari ;;; @@ -64,7 +64,6 @@ #:use-module (gnu packages docbook) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) - #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) @@ -702,7 +701,7 @@ eye-candy, customizable, and reasonably lightweight.") (define-public foot (package (name "foot") - (version "1.5.4") + (version "1.6.2") (home-page "https://codeberg.org/dnkl/foot") (source (origin (method git-fetch) @@ -710,7 +709,7 @@ eye-candy, customizable, and reasonably lightweight.") (file-name (git-file-name name version)) (sha256 (base32 - "0y6xfsldz5lwy6kp5dy9s27pnii7n5zj754wglvz9d9fp5lkl6id")))) + "08i3jmjky5s2nnc0c95c009cym91rs4sj4876sr4xnlkb7ab4812")))) (build-system meson-build-system) (arguments `(#:meson ,meson-0.55 @@ -720,10 +719,7 @@ eye-candy, customizable, and reasonably lightweight.") ;; Enable LTO as recommended by INSTALL.md. #:configure-flags '("-Db_lto=true"))) (native-inputs - `(;; Foot makes use of modern C features and needs a newer compiler. - ;; Remove when the default compiler is > GCC 7. - ("gcc" ,gcc-10) - ("ncurses" ,ncurses) ;for 'tic' + `(("ncurses" ,ncurses) ;for 'tic' ("pkg-config" ,pkg-config) ("scdoc" ,scdoc) ("wayland-protocols" ,wayland-protocols))) -- cgit v1.2.3 From 229f944b7092fa5ff088e62f1bd72897e008d983 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 Jan 2021 12:20:48 +0100 Subject: gnu: uBlock Origin: Update to 1.33.0. * gnu/packages/browser-extensions.scm (uassets): Update to commit a5b1e3cae. (ublock-origin): Update to 1.33.0. --- gnu/packages/browser-extensions.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/browser-extensions.scm b/gnu/packages/browser-extensions.scm index 10b8304eb6..3824dc7f72 100644 --- a/gnu/packages/browser-extensions.scm +++ b/gnu/packages/browser-extensions.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020, 2021 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,7 +49,7 @@ supported content to the Kodi media center.") (make-chromium-extension play-to-kodi)) (define uassets - (let ((commit "8e79f25fceb7c27960753de6f4d21491257741ab")) + (let ((commit "a5b1e3cae3e63435caa03940eff549133e524970")) (origin (method git-fetch) (uri (git-reference @@ -58,12 +58,12 @@ supported content to the Kodi media center.") (file-name (git-file-name "uAssets" (string-take commit 9))) (sha256 (base32 - "19ymyv6qpmmyw4lnpx6adm6mzf8ygfj0c9ljw24wl239v9vzn46w"))))) + "1qjq9x6qb07x4iyha3zzwjcgr0p54c2pdadvcp2kj7h34vjlpksj"))))) (define ublock-origin (package (name "ublock-origin") - (version "1.32.4") + (version "1.33.0") (home-page "https://github.com/gorhill/uBlock") (source (origin (method git-fetch) @@ -71,7 +71,7 @@ supported content to the Kodi media center.") (file-name (git-file-name name version)) (sha256 (base32 - "0v5phzsrav1z0gd7rirmsy7k500xhibw73ffk61754hkqd0l635v")))) + "1indr8p4imljgc1d5vyn48cbpzy9ygqmkk4q07czlrhcrz7hb4nx")))) (build-system gnu-build-system) (outputs '("xpi" "firefox" "chromium")) (arguments -- cgit v1.2.3 From f4159867ab15b3314b71a78f81e96764b3d94abc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 Jan 2021 12:23:03 +0100 Subject: gnu: picocom: Fix cross-compilation. * gnu/packages/terminals.scm (picocom)[arguments]: Use CC-FOR-TARGET instead of "gcc". --- gnu/packages/terminals.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 22a2ef99db..38f3403f7e 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -401,7 +401,7 @@ combining, and so on, with a simple interface.") "1vvjydqf0ax47nvdyyl67jafw5b3sfsav00xid6qpgia1gs2r72n")))) (build-system gnu-build-system) (arguments - `(#:make-flags '("CC=gcc") + `(#:make-flags (list (string-append "CC=" ,(cc-for-target))) #:tests? #f ; no tests #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 495bd7053c3ea88d7ba60c41891dd36607f6cc00 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 30 Jan 2021 14:27:51 +0100 Subject: gnu: cuirass: Update to 0.0.1-60.1e8d075. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-60.1e8d075. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index b32514ce20..6b04d19a6f 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "68532aee908954887bfd6393009485d5bbb94ea2") - (revision "59")) + (let ((commit "1e8d075d706adb192eeb07302542448b4341fdf0") + (revision "60")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -61,7 +61,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0p6d04xnw6djp8wfr6wh6jx2v3nh9pcw57bgbvv6rk26xy6q69nf")))) + "0nwrdj253wdqdrq83iv8i9prqzs9nncm8j6ncvd7ssscw7v1qjsa")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 537de152b938f16a56db44195a66425e3cf2f339 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 30 Jan 2021 00:12:48 +0100 Subject: gnu: rust-expat-sys-2: Drop minor version from name. * gnu/packages/crates-io.scm (rust-expat-sys-2): Drop minor version from name. (rust-servo-fontconfig-sys-4): Apply renaming. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 36f0b98112..72780eee7d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11153,7 +11153,7 @@ blocking data structures.") @code{?} in @code{main}.") (license (list license:expat license:asl2.0)))) -(define-public rust-expat-sys-2.1 +(define-public rust-expat-sys-2 (package (name "rust-expat-sys") (version "2.1.6") @@ -31847,7 +31847,7 @@ functionality and without weak references.") (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-expat-sys" ,rust-expat-sys-2.1) + (("rust-expat-sys" ,rust-expat-sys-2) ("rust-servo-freetype-sys" ,rust-servo-freetype-sys-4) ("rust-pkg-config" ,rust-pkg-config-0.3)))) (native-inputs -- cgit v1.2.3 From b934f6ce8b114801e3de12512647ac74d5107a9d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 30 Jan 2021 00:04:16 +0100 Subject: gnu: rust-downcast-rs-1.1: Remove variable. * gnu/packages/crates-io.scm (rust-downcast-rs-1.1): Remove variable. * gnu/packages/crates-graphics.scm (rust-wayland-client-0.23): (rust-wayland-client-0.21): (rust-wayland-server-0.23): (rust-wayland-server-0.21): Refer to rust-downcast-rs-1.2 instead. --- gnu/packages/crates-graphics.scm | 8 ++++---- gnu/packages/crates-io.scm | 21 --------------------- 2 files changed, 4 insertions(+), 25 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index ca1fd9b3a7..d7ab91fbb8 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -1911,7 +1911,7 @@ first-class Rust objects.") `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-calloop" ,rust-calloop-0.4) - ("rust-downcast-rs" ,rust-downcast-rs-1.1) + ("rust-downcast-rs" ,rust-downcast-rs-1.2) ("rust-libc" ,rust-libc-0.2) ("rust-mio" ,rust-mio-0.6) ("rust-nix" ,rust-nix-0.14) @@ -1947,7 +1947,7 @@ the wayland protocol, client side.") `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-calloop" ,rust-calloop-0.4) - ("rust-downcast-rs" ,rust-downcast-rs-1.1) + ("rust-downcast-rs" ,rust-downcast-rs-1.2) ("rust-libc" ,rust-libc-0.2) ("rust-mio" ,rust-mio-0.6) ("rust-nix" ,rust-nix-0.14) @@ -2114,7 +2114,7 @@ Look at the wayland-client crate for usable bindings.") `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-calloop" ,rust-calloop-0.4) - ("rust-downcast-rs" ,rust-downcast-rs-1.1) + ("rust-downcast-rs" ,rust-downcast-rs-1.2) ("rust-libc" ,rust-libc-0.2) ("rust-mio" ,rust-mio-0.6) ("rust-nix" ,rust-nix-0.14) @@ -2147,7 +2147,7 @@ the wayland protocol, server side.") `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-calloop" ,rust-calloop-0.4) - ("rust-downcast-rs" ,rust-downcast-rs-1.1) + ("rust-downcast-rs" ,rust-downcast-rs-1.2) ("rust-libc" ,rust-libc-0.2) ("rust-mio" ,rust-mio-0.6) ("rust-nix" ,rust-nix-0.14) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 72780eee7d..58cf86d3a1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9879,27 +9879,6 @@ from macros.") ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) ("rust-strsim" ,rust-strsim-0.5)))))) -(define-public rust-downcast-rs-1.1 - (package - (name "rust-downcast-rs") - (version "1.1.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "downcast-rs" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1xhs2qj02k9m4mm5fgh19y88850y9jsnwwlblf2ffc91gjs6xfjj")))) - (build-system cargo-build-system) - (home-page "https://github.com/marcianx/downcast-rs") - (synopsis "Trait object downcasting support using only safe Rust") - (description - "Trait object downcasting support using only safe Rust. It supports type -parameters, associated types, and type constraints.") - (license (list license:expat license:asl2.0)))) - (define-public rust-downcast-rs-1.2 (package (name "rust-downcast-rs") -- cgit v1.2.3 From abad76c6b111e1563c976ee8dd69eb6538d30d07 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 30 Jan 2021 00:05:50 +0100 Subject: gnu: rust-downcast-rs-1: Drop minor version from name. * gnu/packages/crates-io.scm (rust-downcast-rs-1): Drop minor version from name. * gnu/packages/crates-graphics.scm (rust-wayland-client-0.23): (rust-wayland-client-0.21): (rust-wayland-server-0.23): (rust-wayland-server-0.21): Apply renaming. --- gnu/packages/crates-graphics.scm | 8 ++++---- gnu/packages/crates-io.scm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index d7ab91fbb8..7fa2c08268 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -1911,7 +1911,7 @@ first-class Rust objects.") `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-calloop" ,rust-calloop-0.4) - ("rust-downcast-rs" ,rust-downcast-rs-1.2) + ("rust-downcast-rs" ,rust-downcast-rs-1) ("rust-libc" ,rust-libc-0.2) ("rust-mio" ,rust-mio-0.6) ("rust-nix" ,rust-nix-0.14) @@ -1947,7 +1947,7 @@ the wayland protocol, client side.") `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-calloop" ,rust-calloop-0.4) - ("rust-downcast-rs" ,rust-downcast-rs-1.2) + ("rust-downcast-rs" ,rust-downcast-rs-1) ("rust-libc" ,rust-libc-0.2) ("rust-mio" ,rust-mio-0.6) ("rust-nix" ,rust-nix-0.14) @@ -2114,7 +2114,7 @@ Look at the wayland-client crate for usable bindings.") `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-calloop" ,rust-calloop-0.4) - ("rust-downcast-rs" ,rust-downcast-rs-1.2) + ("rust-downcast-rs" ,rust-downcast-rs-1) ("rust-libc" ,rust-libc-0.2) ("rust-mio" ,rust-mio-0.6) ("rust-nix" ,rust-nix-0.14) @@ -2147,7 +2147,7 @@ the wayland protocol, server side.") `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-calloop" ,rust-calloop-0.4) - ("rust-downcast-rs" ,rust-downcast-rs-1.2) + ("rust-downcast-rs" ,rust-downcast-rs-1) ("rust-libc" ,rust-libc-0.2) ("rust-mio" ,rust-mio-0.6) ("rust-nix" ,rust-nix-0.14) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 58cf86d3a1..130180b4bc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9879,7 +9879,7 @@ from macros.") ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) ("rust-strsim" ,rust-strsim-0.5)))))) -(define-public rust-downcast-rs-1.2 +(define-public rust-downcast-rs-1 (package (name "rust-downcast-rs") (version "1.2.0") -- cgit v1.2.3 From 880e6334b7aeda04ad8572f9c68a9055de15aeb8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:59:25 +0100 Subject: gnu: rust-dirs-2: Drop minor version from name. * gnu/packages/crates-io.scm (rust-dirs-2): Drop minor version from name. (rust-dirs-1.0): (rust-term-0.6): * gnu/packages/rust-apps.scm (fd): * gnu/packages/sequoia.scm (sequoia): * gnu/packages/web.scm (castor): Apply renaming. --- gnu/packages/crates-io.scm | 6 +++--- gnu/packages/rust-apps.scm | 2 +- gnu/packages/sequoia.scm | 2 +- gnu/packages/web.scm | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 130180b4bc..36ebbe692c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9558,7 +9558,7 @@ Directory guidelines on macOS.") standard locations of directories for config, cache and other data.") (license (list license:expat license:asl2.0)))) -(define-public rust-dirs-2.0 +(define-public rust-dirs-2 (package (inherit rust-dirs-3) (name "rust-dirs") @@ -9577,7 +9577,7 @@ standard locations of directories for config, cache and other data.") (define-public rust-dirs-1.0 (package - (inherit rust-dirs-2.0) + (inherit rust-dirs-2) (name "rust-dirs") (version "1.0.5") (source @@ -35219,7 +35219,7 @@ template language.") (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-dirs" ,rust-dirs-2.0) + (("rust-dirs" ,rust-dirs-2) ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/Stebalien/term") (synopsis "Terminal formatting library") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index e7a0c4fab2..59f73eb90d 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -248,7 +248,7 @@ also knows about symlinks, extended attributes, and Git.") ("rust-atty" ,rust-atty-0.2) ("rust-clap" ,rust-clap-2) ("rust-ctrlc" ,rust-ctrlc-3.1) - ("rust-dirs" ,rust-dirs-2.0) + ("rust-dirs" ,rust-dirs-2) ("rust-globset" ,rust-globset-0.4) ("rust-humantime" ,rust-humantime-2) ("rust-ignore" ,rust-ignore-0.4) diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index ce3396a7c4..bd8c6248d9 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -83,7 +83,7 @@ ("rust-colored" ,rust-colored-1.9.1) ("rust-crossterm" ,rust-crossterm-0.13) ("rust-ctor" ,rust-ctor-0.1) - ("rust-dirs" ,rust-dirs-2.0) + ("rust-dirs" ,rust-dirs-2) ("rust-dyn-clone" ,rust-dyn-clone-1) ("rust-ed25519-dalek" ,rust-ed25519-dalek-1) ("rust-eax" ,rust-eax-0.3) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1fe393c14b..8797411661 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2018 Mădălin Ionel Patrașcu ;;; Copyright © 2018 Alex Vong -;;; Copyright © 2019, 2020 Nicolas Goaziou +;;; Copyright © 2019, 2020, 2021 Nicolas Goaziou ;;; Copyright © 2019 Brendan Tildesley ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Hartmut Goebel @@ -6521,7 +6521,7 @@ collection creation and deletion, and locking operations.") (arguments `(#:cargo-inputs (("rust-ansi-parser" ,rust-ansi-parser-0.6) - ("rust-dirs" ,rust-dirs-2.0) + ("rust-dirs" ,rust-dirs-2) ("rust-gdk" ,rust-gdk-0.13) ("rust-gtk" ,rust-gtk-0.8) ("rust-linkify" ,rust-linkify-0.4) -- cgit v1.2.3 From 0f27a97c698fb943dd022661de80d44bd77f60ee Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 30 Jan 2021 00:01:29 +0100 Subject: gnu: rust-embed-resource-1: Drop minor version from name. * gnu/packages/crates-io.scm (rust-embed-resource-1): Drop minor version from name. * gnu/packages/rust-apps.scm (watchexec): Apply renaming. --- gnu/packages/crates-io.scm | 2 +- gnu/packages/rust-apps.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 36ebbe692c..978448ebd1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10291,7 +10291,7 @@ signing, and verification in pure Rust.") @code{Right} is a general purpose sum type with two cases.") (license (list license:expat license:asl2.0)))) -(define-public rust-embed-resource-1.3 +(define-public rust-embed-resource-1 (package (name "rust-embed-resource") (version "1.3.3") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 59f73eb90d..2f27f94222 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -654,7 +654,7 @@ blanks grouped by language.") (install-file "README.md" doc) #t)))) #:cargo-inputs - (("rust-embed-resource" ,rust-embed-resource-1.3) + (("rust-embed-resource" ,rust-embed-resource-1) ("rust-derive-builder" ,rust-derive-builder-0.9) ("rust-env-logger" ,rust-env-logger-0.7) ("rust-glob" ,rust-glob-0.3) -- cgit v1.2.3 From 54721e7eb83221ce7e12ea64dd270322b7ea315c Mon Sep 17 00:00:00 2001 From: nixo Date: Thu, 28 Jan 2021 16:23:29 +0100 Subject: gnu: julia-compat: Set file name according to standards. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-compat)[source]: Set 'file-name' to (git-file-name ...). Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index f1da66a4be..f00faf6223 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -32,7 +32,7 @@ (uri (git-reference (url "https://github.com/JuliaLang/Compat.jl") (commit (string-append "v" version)))) - (file-name "Compat") + (file-name (git-file-name name version)) (sha256 (base32 "01vwjr2134bzgnaxwd67knbibbhnfgnqjw7gxrp29s6y2a6j3882")))) (build-system julia-build-system) -- cgit v1.2.3 From f7a98af0b9ddadd374761c7a8eec2f86ee385a2e Mon Sep 17 00:00:00 2001 From: nixo Date: Mon, 18 Jan 2021 17:42:50 +0100 Subject: gnu: julia-compat: Update to 3.25.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-compat): Update to 3.25.0. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index f00faf6223..7836489e15 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020 Nicolò Balzarotti +;;; Copyright © 2020, 2021 Nicolò Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,7 +25,7 @@ (define-public julia-compat (package (name "julia-compat") - (version "3.9.1") + (version "3.25.0") (source (origin (method git-fetch) @@ -34,7 +34,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "01vwjr2134bzgnaxwd67knbibbhnfgnqjw7gxrp29s6y2a6j3882")))) + (base32 "1m4r5i8mq29xjp3mllh6047n5a78sdyld57m15anrnsjgaapcgby")))) (build-system julia-build-system) (home-page "https://github.com/JuliaLang/Compat.jl") (synopsis "Compatibility across Julia versions") -- cgit v1.2.3 From eccd448c020d7c34657f644d37cc674bf05eca0e Mon Sep 17 00:00:00 2001 From: nixo Date: Mon, 18 Jan 2021 18:11:42 +0100 Subject: gnu: Add julia-orderedcollections. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-orderedcollections): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 7836489e15..ab5bba1bda 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -43,3 +43,25 @@ between older and newer versions of the Julia language. The Compat package provides a macro that lets you use the latest syntax in a backwards-compatible way.") (license license:expat))) + +(define-public julia-orderedcollections + (package + (name "julia-orderedcollections") + (version "1.3.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaCollections/OrderedCollections.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sfip1ixghsz91q2s7d62rgzw3gppg42fg6bccxlplqa3hfmbycf")))) + (build-system julia-build-system) + (home-page "https://github.com/JuliaCollections/OrderedCollections.jl") + (synopsis "Associative containers that preserve insertion order") + (description "This package implements @code{OrderedDicts} and +@code{OrderedSets}, which are similar to containers in base Julia. However, +during iteration the @code{Ordered*} containers return items in the order in +which they were added to the collection.") + (license license:expat))) -- cgit v1.2.3 From 6545cef5d748e3657144c125037c2bf9af75153f Mon Sep 17 00:00:00 2001 From: nixo Date: Mon, 18 Jan 2021 18:17:50 +0100 Subject: gnu: Add julia-datastructures. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-datastructures): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index ab5bba1bda..bd7802b814 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -44,6 +44,30 @@ provides a macro that lets you use the latest syntax in a backwards-compatible way.") (license license:expat))) +(define-public julia-datastructures + (package + (name "julia-datastructures") + (version "0.18.9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaCollections/DataStructures.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0hdqp8ipsqdw5bqqkdvz4j6n67x80sj5azr9vzyxwjfsgkfbnk2l")))) + (propagated-inputs + `(("julia-compat" ,julia-compat) + ("julia-orderedcollections" ,julia-orderedcollections))) + (build-system julia-build-system) + (home-page "https://github.com/JuliaCollections/DataStructures.jl") + (synopsis "Julia module providing different data structures") + (description "This package implements a variety of data structures, +including, @code{CircularBuffer}, @code{Queue}, @code{Stack}, +@code{Accumulators}, @code{LinkedLists}, @code{SortedDicts} and many others.") + (license license:expat))) + (define-public julia-orderedcollections (package (name "julia-orderedcollections") -- cgit v1.2.3 From 50f99cc589c439d4919add98f47dc1614faa7260 Mon Sep 17 00:00:00 2001 From: nixo Date: Mon, 18 Jan 2021 18:25:02 +0100 Subject: gnu: Add julia-fixedpointnumbers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-fixedpointnumbers): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index bd7802b814..b28906b546 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -68,6 +68,41 @@ including, @code{CircularBuffer}, @code{Queue}, @code{Stack}, @code{Accumulators}, @code{LinkedLists}, @code{SortedDicts} and many others.") (license license:expat))) +(define-public julia-fixedpointnumbers + (package + (name "julia-fixedpointnumbers") + (version "0.8.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaMath/FixedPointNumbers.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0j0n40n04q9sk68wh9jq90m6c67k4ws02k41djjzkrqmpzv4rcdi")))) + (build-system julia-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-test + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "test/fixed.jl" + ;; A deprecation warning is not thrown + (("@test_logs.*:warn" all) (string-append "# " all))) + #t))))) + (propagated-inputs `(("julia-compat" ,julia-compat))) + (home-page "https://github.com/JuliaMath/FixedPointNumbers.jl") + (synopsis "Fixed point types for Julia") + (description "@code{FixedPointNumbers.jl} implements fixed-point number +types for Julia. A fixed-point number represents a fractional, or +non-integral, number. In contrast with the more widely known floating-point +numbers, with fixed-point numbers the decimal point doesn't \"float\": +fixed-point numbers are effectively integers that are interpreted as being +scaled by a constant factor. Consequently, they have a fixed number of +digits (bits) after the decimal (radix) point.") + (license license:expat))) + (define-public julia-orderedcollections (package (name "julia-orderedcollections") -- cgit v1.2.3 From c0c21d77d9f0dec8ac7b49db4c4196e636728839 Mon Sep 17 00:00:00 2001 From: nixo Date: Mon, 18 Jan 2021 18:27:32 +0100 Subject: gnu: Add julia-parsers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-parsers): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index b28906b546..9a615aba58 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -124,3 +124,23 @@ digits (bits) after the decimal (radix) point.") during iteration the @code{Ordered*} containers return items in the order in which they were added to the collection.") (license license:expat))) + +(define-public julia-parsers + (package + (name "julia-parsers") + (version "1.0.15") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaData/Parsers.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "16iffl6l28kspgqch48mhi1s8qhspr3cpqcwsph3rqi72lbfqygx")))) + (build-system julia-build-system) + (home-page "https://github.com/JuliaData/Parsers.jl") + (synopsis "Fast parsing machinery for basic types in Julia") + (description "@code{Parsers.jl} is a collection of type parsers and +utilities for Julia.") + (license license:expat))) -- cgit v1.2.3 From 20767b9b6914aa0b79ae8ad14f0d8d53057e019d Mon Sep 17 00:00:00 2001 From: nixo Date: Mon, 18 Jan 2021 23:46:51 +0100 Subject: gnu: Add julia-adapt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-adapt): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 9a615aba58..2e0efb0b5a 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -22,6 +22,28 @@ #:use-module (guix git-download) #:use-module (guix build-system julia)) +(define-public julia-adapt + (package + (name "julia-adapt") + (version "3.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaGPU/Adapt.jl") + (commit (string-append "v" version)))) + (file-name "Adapt") + (sha256 + (base32 "1lks6k3a1gvwlplld47nh6xfy3nnlpc0vhkzg6zg0qn33qdmavrg")))) + (build-system julia-build-system) + (home-page "https://github.com/JuliaGPU/Adapt.jl") + (synopsis "Package providing the @code{adapt} function, similar to @code{convert}") + (description "This Julia package provides the @code{adapt(T, x)} function +acts like @code{convert(T, x)}, but without the restriction of returning a +@code{T}. This allows you to \"convert\" wrapper types like @code{Adjoint} to +be GPU compatible without throwing away the wrapper.") + (license license:expat))) + (define-public julia-compat (package (name "julia-compat") -- cgit v1.2.3 From fb634a0e0b21864f1b3d3ab66336ea6c2cebdeb8 Mon Sep 17 00:00:00 2001 From: nixo Date: Tue, 19 Jan 2021 00:01:28 +0100 Subject: gnu: Add julia-offsetarrays. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-offsetarrays): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 2e0efb0b5a..3dd731ef28 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -147,6 +147,31 @@ during iteration the @code{Ordered*} containers return items in the order in which they were added to the collection.") (license license:expat))) +(define-public julia-offsetarrays + (package + (name "julia-offsetarrays") + (version "1.5.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaArrays/OffsetArrays.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1y3fnssw2hzyghrk6jfcxslab0f8sjkjszh482snfq4k6mkrhy77")))) + (build-system julia-build-system) + (propagated-inputs + `(("julia-adapt" ,julia-adapt))) + ;; CatIndices depends on OffsetArrays, introducing a recursive dependency + (arguments '(#:tests? #f)) + (home-page "https://juliaarrays.github.io/OffsetArrays.jl/stable/") + (synopsis "Fortran-like arrays with arbitrary, zero or negative indices") + (description "@code{OffsetArrays.jl} provides Julia users with arrays that +have arbitrary indices, similar to those found in some other programming +languages like Fortran.") + (license license:expat))) + (define-public julia-parsers (package (name "julia-parsers") -- cgit v1.2.3 From dae521a0c935d325a13910087d0d2e5c16e97bbf Mon Sep 17 00:00:00 2001 From: nixo Date: Tue, 19 Jan 2021 00:06:34 +0100 Subject: gnu: Add julia-json. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-json): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 3dd731ef28..34dba958ce 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -125,6 +125,31 @@ scaled by a constant factor. Consequently, they have a fixed number of digits (bits) after the decimal (radix) point.") (license license:expat))) +(define-public julia-json + (package + (name "julia-json") + (version "0.21.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaIO/JSON.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1f9k613kbknmp4fgjxvjaw4d5sfbx8a5hmcszmp1w9rqfqngjx9m")))) + (build-system julia-build-system) + (propagated-inputs + `(("julia-datastructures" ,julia-datastructures) + ("julia-fixedpointnumbers" ,julia-fixedpointnumbers) + ("julia-parsers" ,julia-parsers) + ("julia-offsetarrays" ,julia-offsetarrays))) + (home-page "https://github.com/JuliaIO/JSON.jl") + (synopsis "JSON parsing and printing library for Julia") + (description "@code{JSON.jl} is a pure Julia module which supports parsing +and printing JSON documents.") + (license license:expat))) + (define-public julia-orderedcollections (package (name "julia-orderedcollections") -- cgit v1.2.3 From f4a32c5d6b9272f989d847a04d3f732d79a48f70 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 30 Jan 2021 16:16:41 +0100 Subject: gnu: cuirass: Update to 0.0.1-61.6838ec2. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-61.6838ec2. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 6b04d19a6f..cae437cb8d 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "1e8d075d706adb192eeb07302542448b4341fdf0") - (revision "60")) + (let ((commit "6838ec2eac8eae2c3743fca76ad0cda87b4df5fb") + (revision "61")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -61,7 +61,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0nwrdj253wdqdrq83iv8i9prqzs9nncm8j6ncvd7ssscw7v1qjsa")))) + "1jf5d9aar1s96ik7csxg448hzlbz12bkgxqkf4r025f6gp4migqc")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From deda7029e5b9eff1c3281ffc2bb0776c47fd7adf Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 30 Jan 2021 16:25:00 +0100 Subject: gnu: alacritty: Fix build. This is a follow-up of 880e6334b7aeda04ad8572f9c68a9055de15aeb8. * gnu/packages/terminals.scm (alacritty)[arguments]: Rename "rust-dirs-2.0" into "rust-dirs-2" and "rust-embed-resource-1.3" into "rust-embed-resource-1". --- gnu/packages/terminals.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 38f3403f7e..8230b39b8c 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1240,7 +1240,7 @@ made by suckless.") ("rust-urlocator" ,rust-urlocator-0.1) ("rust-xdg" ,rust-xdg-2) ("rust-image" ,rust-image-0.22) - ("rust-dirs" ,rust-dirs-2.0) + ("rust-dirs" ,rust-dirs-2) ("rust-x11-dl" ,rust-x11-dl-2) ("rust-winapi" ,rust-winapi-0.3) ("rust-base64" ,rust-base64-0.11) @@ -1278,7 +1278,7 @@ made by suckless.") ("rust-gl-generator" ,rust-gl-generator-0.14) ("rust-andrew" ,rust-andrew-0.2) ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.6) - ("rust-embed-resource" ,rust-embed-resource-1.3) + ("rust-embed-resource" ,rust-embed-resource-1) ("rust-http-req" ,rust-http-req-0.5) ("rust-zip" ,rust-zip-0.5) ("rust-tempfile" ,rust-tempfile-3) -- cgit v1.2.3 From e629d7221604726d404b4d280a38d9a698d32a30 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 30 Jan 2021 17:58:10 +0100 Subject: gnu: blender: Fix build. * gnu/packages/graphics.scm (openimageio): Update to 2.2.10.1. [arguments]: Do not use system pugixml. [inputs]: Add fmt. * gnu/packages/graphics.scm (blender)[inputs]: Add "pugixml". --- gnu/packages/graphics.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 411d89fcc2..5ed2531402 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2020 Jakub Kądziołka -;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Gabriel Arazas @@ -84,6 +84,7 @@ #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages plotutils) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages pth) #:use-module (gnu packages pulseaudio) ; libsndfile, libsamplerate #:use-module (gnu packages python) @@ -538,6 +539,7 @@ applications.") ("freetype" ,freetype) ("glew" ,glew) ("openal" ,openal) + ("pugixml" ,pugixml) ("python" ,python) ("python-numpy" ,python-numpy) ("tbb" ,tbb) @@ -1088,7 +1090,7 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.") (define-public openimageio (package (name "openimageio") - (version "2.0.13") + (version "2.2.10.1") (source (origin (method git-fetch) (uri (git-reference @@ -1097,23 +1099,26 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.") (file-name (git-file-name name version)) (sha256 (base32 - "0czcls82v71wkw1syib16ncg7463hx0py0xclycsiv4w6i3wlkzz")))) + "0wzh5n527l7ia1754cf9xmbvv4ya6hj34dy6cbq9xk9372h8gd9q")))) (build-system cmake-build-system) ;; FIXME: To run all tests successfully, test image sets from multiple ;; third party sources have to be present. For details see - ;; https://github.com/OpenImageIO/oiio/blob/master/INSTALL + ;; (arguments - `(#:tests? #f)) + `(#:tests? #f + #:configure-flags (list "-DUSE_EXTERNAL_PUGIXML=1"))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("boost" ,boost) + ("fmt" ,fmt) ("libpng" ,libpng) ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("giflib" ,giflib) ("openexr" ,openexr) ("ilmbase" ,ilmbase) + ("pugixml" ,pugixml) ("python" ,python-wrapper) ("pybind11" ,pybind11) ("robin-map" ,robin-map) -- cgit v1.2.3 From a2a17c3fc62af3d1c5c03f3ca493d7e1dd46022a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 30 Jan 2021 18:38:41 +0100 Subject: gnu: blender-2.79: Fix build. * gnu/packages/graphics.scm (blender-2.79)[inputs]: Add pugixml. --- gnu/packages/graphics.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 5ed2531402..7cb4aecec2 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -637,6 +637,7 @@ application can be customized via its API for Python scripting.") ("freetype" ,freetype) ("glew" ,glew) ("openal" ,openal) + ("pugixml" ,pugixml) ("python" ,python) ("zlib" ,zlib))) (home-page "https://blender.org/") -- cgit v1.2.3 From 9008e0ec3f4bbb6a3ac294aab8a67e7800b850fd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 30 Jan 2021 23:27:45 +0200 Subject: gnu: parallel: Update to 20210122. * gnu/packages/parallel.scm (parallel): Update to 20210122. --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index fde19ced92..595b8f12eb 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -55,14 +55,14 @@ (define-public parallel (package (name "parallel") - (version "20201222") + (version "20210122") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "13kxg2vmy20ciiv1gp96g33bmvma1nh5d66jdix1fqj6xjaizr5n")))) + (base32 "1wxkqz6ld1bp0ilvc04vhq99qjay1nl6pbk3qzvp3sjavv9vdwdl")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From ebf88ff593bf02e15d348e41df2139ae58ac0b6a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 30 Jan 2021 23:35:31 +0200 Subject: gnu: slurm: Update note about slurm versions. * gnu/packages/parallel.scm: Update note about what slurm versions should be kept. --- gnu/packages/parallel.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 595b8f12eb..7446ff5a67 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -194,6 +194,8 @@ by managing a queue of pending work.") ;; in incompatible ways, as noted in ;; . Thus, keep older ;; releases here. See also . +;; As noted in the link, YY.MM is the release scheme, and the 'maintenance' +;; digit does not introduce incompatibilities. (define-public slurm-20.02 (package -- cgit v1.2.3 From 8d7bc7932f24cbe8f806574298968f70dc789a03 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 30 Jan 2021 23:49:02 +0200 Subject: gnu: slurm: Update to 20.11.3. * gnu/packages/parallel.scm (slurm): Update to 20.11.3. --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 7446ff5a67..15a15581f0 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -108,7 +108,7 @@ and they are executed on lists of files, hosts, users or other items.") (define-public slurm (package (name "slurm") - (version "20.11.2") + (version "20.11.3") (source (origin (method url-fetch) (uri (string-append @@ -116,7 +116,7 @@ and they are executed on lists of files, hosts, users or other items.") version ".tar.bz2")) (sha256 (base32 - "15h2vs58apgdz02ijgr46090vjyaa81qcm76mm6fxlvkkfd4pyxp")) + "1s70x6yh60sx63dgmp5rlhq8jcz7kxv9pk8gbs9v1jg8zps5h5bk")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 2667156585fe81ed4370b71b232973c29582f232 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 30 Jan 2021 23:59:06 +0200 Subject: gnu: slurm-19.05: Update to 19.05.8. Fixes CVE-2020-{12693,27745,27746,19727,19728}. * gnu/packages/parallel.scm (slurm-19.05): Update to 19.05.8. --- gnu/packages/parallel.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 15a15581f0..67d7c53de8 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -211,11 +211,10 @@ by managing a queue of pending work.") (base32 "0qj4blfymrd2ry2qmb58l3jbr4jwygc3adcfw7my27rippcijlyc")))))) - (define-public slurm-19.05 (package (inherit slurm) - (version "19.05.3-2") + (version "19.05.8") (source (origin (inherit (package-source slurm)) (method url-fetch) @@ -224,7 +223,7 @@ by managing a queue of pending work.") version ".tar.bz2")) (sha256 (base32 - "0qj4blfymrd2ry2qmb58l3jbr4jwygc3adcfw7my27rippcijlyc")))))) + "10c9j4a9a6d4ibpf75006mn03p8xgpaprc247x2idakysjf2fw43")))))) ;; Same as Debian 10 (define-public slurm-18.08 -- cgit v1.2.3 From eb6b061320418fdbd49ecb72c366e43ff7a38dbc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 31 Jan 2021 00:04:11 +0200 Subject: gnu: slurm-18.08: Update to 18.08.9. Fixes CVE-2019-{12838,19727,19728}. * gnu/packages/parallel.scm (slurm-18.08): Update to 18.08.9. --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 67d7c53de8..3a0c22b6d4 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -229,7 +229,7 @@ by managing a queue of pending work.") (define-public slurm-18.08 (package (inherit slurm) - (version "18.08.5-2") + (version "18.08.9") (source (origin (inherit (package-source slurm)) @@ -238,7 +238,7 @@ by managing a queue of pending work.") version ".tar.bz2")) (sha256 (base32 - "0xrj12nmkhvhzi7cyh4yvdm8qa51ji3j82mgpq7sx87g30f9spn4")))))) + "1bgrpz75m7l4xhirsd0fvnkzlkrl8v2qpmjcz60barc5qm2kn457")))))) (define-public slurm-drmaa (package -- cgit v1.2.3 From ed5572876b89e93ed4eb24c6bcfd3057b83acfa7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 31 Jan 2021 00:50:43 +0200 Subject: gnu: cmst: Update to 2020.11.01. * gnu/packages/connman.scm (cmst): Update to 2020.11.01. --- gnu/packages/connman.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm index 5f17a0ea95..1331c849a0 100644 --- a/gnu/packages/connman.scm +++ b/gnu/packages/connman.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2021 Efraim Flashner ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Ricardo Wurmus @@ -138,15 +138,15 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.") (define-public cmst (package (name "cmst") - (version "2019.01.13") + (version "2020.11.01") (source (origin (method url-fetch) (uri (string-append - "https://github.com/andrew-bibb/cmst/releases/download/cmst-" + "https://github.com/andrew-bibb/cmst/releases/download/" version "/cmst-" version ".tar.xz")) (sha256 - (base32 "1cn6xz2rpkf5kx5d6p2x2lh85zppjacp59l6gj3n6x12p90al1vl")))) + (base32 "0jn12wxwjznady6aniwmvahg1dj25p902sdwj0070biv6vx5c7dq")))) (inputs `(("qtbase" ,qtbase))) (native-inputs -- cgit v1.2.3 From 918a099e7422fe8ad3464dc5a1b4f60843297742 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 30 Jan 2021 18:03:25 -0500 Subject: Revert qt-build-system changes that were pushed to a frozen "staging" branch. This reverts commits 9085260fccd17955be6922c215f89be3e424dda3, 4ecc2a24936a1fbfe3ff5654090d41e91c2fe8f2, 094b6ac00939ef5e3f291a477fedd26621078ca8, 104151f4f45f4bc3a816e3ad42256452932e0d8d. --- gnu/packages/bittorrent.scm | 6 +- gnu/packages/finance.scm | 8 +-- gnu/packages/geo.scm | 7 +-- gnu/packages/password-utils.scm | 6 +- gnu/packages/video.scm | 6 +- gnu/packages/web-browsers.scm | 5 +- guix/build-system/qt.scm | 6 -- guix/build/qt-build-system.scm | 68 +++++++++++++++++++- guix/build/qt-utils.scm | 135 ++++++---------------------------------- 9 files changed, 99 insertions(+), 148 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 6967eccec4..08e61d7ba2 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -10,7 +10,6 @@ ;;; Copyright © 2018 Nam Nguyen ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019, 2020 Brett Gilio -;;; Copyright © 2020 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -448,9 +447,8 @@ desktops.") #:phases (modify-phases %standard-phases (add-after 'install 'wrap-qt - (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program "qbittorrent" #:output out #:inputs inputs)) + (lambda* (#:key outputs #:allow-other-keys) + (wrap-qt-program (assoc-ref outputs "out") "qbittorrent") #t))))) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 1f1dadebb3..8ead37beb3 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016 Andreas Enge ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Alex Griffin -;;; Copyright © 2016, 2020 Hartmut Goebel +;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Carlo Zancanaro ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 Vasile Dumitrascu @@ -611,10 +611,8 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (assoc-ref inputs "libsecp256k1") "/lib/libsecp256k1.so.0'"))))) (add-after 'install 'wrap-qt - (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program "electron-cash" #:output out #:inputs inputs)) - #t))))) + (lambda* (#:key outputs #:allow-other-keys) + (wrap-qt-program (assoc-ref outputs "out") "electron-cash")))))) (home-page "https://electroncash.org/") (synopsis "Bitcoin Cash wallet") (description diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index a90db90084..c682613ff1 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; Copyright © 2019, 2020 Efraim Flashner ;;; Copyright © 2019 Wiktor Żelazny -;;; Copyright © 2019, 2020 Hartmut Goebel +;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Christopher Baines ;;; Copyright © 2020 Felix Gruber @@ -2121,9 +2121,8 @@ growing set of geoscientific methods.") (add-after 'install 'wrap-python (assoc-ref python:%standard-phases 'wrap)) (add-after 'wrap-python 'wrap-qt - (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program "qgis" #:output out #:inputs inputs)) + (lambda* (#:key outputs #:allow-other-keys) + (wrap-qt-program (assoc-ref outputs "out") "qgis") #t)) (add-after 'wrap-qt 'wrap-gis (lambda* (#:key inputs outputs #:allow-other-keys) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index c568efcf31..2053457375 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -29,7 +29,6 @@ ;;; Copyright © 2020 Jean-Baptiste Note ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Vinicius Monego -;;; Copyright © 2020 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -665,9 +664,8 @@ key URIs using the standard otpauth:// scheme.") (install-file "qtpass.1" man) #t))) (add-after 'install 'wrap-qt - (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program "qtpass" #:output out #:inputs inputs)) + (lambda* (#:key outputs #:allow-other-keys) + (wrap-qt-program (assoc-ref outputs "out") "qtpass") #t)) (add-before 'check 'check-setup ;; Make Qt render "offscreen", required for tests. diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8e9c82d587..cd049fb375 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -47,7 +47,6 @@ ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Ivan Kozlov ;;; Copyright © 2020 Antoine Côté -;;; Copyright © 2020 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -4442,10 +4441,9 @@ API. It includes bindings for Python, Ruby, and other languages.") (setenv "HOME" "/tmp") #t)) (add-after 'install 'wrap-program - (lambda* (#:key outputs inputs #:allow-other-keys) + (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program "openshot-qt" - #:output out #:inputs inputs)) + (wrap-qt-program out "openshot-qt")) #t))))) (home-page "https://www.openshot.org/") (synopsis "Video editor") diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 1040e79593..b134d29782 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -15,7 +15,6 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 Alexandru-Sergiu Marton -;;; Copyright © 2020 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -434,9 +433,9 @@ access.") "/share/fonts/truetype/NotoColorEmoji"))) #t)) (add-after 'install 'wrap-program - (lambda* (#:key outputs inputs #:allow-other-keys) + (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program "kristall" #:output out #:inputs inputs)) + (wrap-qt-program out "kristall")) #t))))) (native-inputs `(("breeze-stylesheet" diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm index e1368db1d9..118022ec45 100644 --- a/guix/build-system/qt.scm +++ b/guix/build-system/qt.scm @@ -3,7 +3,6 @@ ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2019 Hartmut Goebel -;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,8 +22,6 @@ (define-module (guix build-system qt) #:use-module (guix store) #:use-module (guix utils) - #:use-module ((guix build qt-utils) - #:select (%qt-wrap-excluded-inputs)) #:use-module (guix derivations) #:use-module (guix search-paths) #:use-module (guix build-system) @@ -56,7 +53,6 @@ (define %qt-build-system-modules ;; Build-side modules imported and used by default. `((guix build qt-build-system) - (guix build qt-utils) ,@%cmake-build-system-modules)) (define (default-cmake) @@ -128,7 +124,6 @@ (phases '(@ (guix build qt-build-system) %standard-phases)) (qt-wrap-excluded-outputs ''()) - (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs) (system (%current-system)) (imported-modules %qt-build-system-modules) (modules '((guix build qt-build-system) @@ -152,7 +147,6 @@ provides a 'CMakeLists.txt' file as its build system." search-paths) #:phases ,phases #:qt-wrap-excluded-outputs ,qt-wrap-excluded-outputs - #:qt-wrap-excluded-inputs ,qt-wrap-excluded-inputs #:configure-flags ,configure-flags #:make-flags ,make-flags #:out-of-source? ,out-of-source? diff --git a/guix/build/qt-build-system.scm b/guix/build/qt-build-system.scm index a6955ce4c2..005157b0a4 100644 --- a/guix/build/qt-build-system.scm +++ b/guix/build/qt-build-system.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 Federico Beffa ;;; Copyright © 2014, 2015 Ludovic Courtès ;;; Copyright © 2018 Mark H Weaver -;;; Copyright © 2019, 2020, 2021 Hartmut Goebel +;;; Copyright © 2019, 2020 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,7 +22,6 @@ (define-module (guix build qt-build-system) #:use-module ((guix build cmake-build-system) #:prefix cmake:) #:use-module (guix build utils) - #:use-module (guix build qt-utils) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (ice-9 ftw) @@ -48,10 +47,73 @@ (setenv "CTEST_OUTPUT_ON_FAILURE" "1") #t) +(define (variables-for-wrapping base-directories) + + (define (collect-sub-dirs base-directories subdirectory) + (filter-map + (lambda (dir) + (let ((directory (string-append dir subdirectory))) + (if (directory-exists? directory) directory #f))) + base-directories)) + + (filter + (lambda (var-to-wrap) (not (null? (last var-to-wrap)))) + (map + (lambda (var-spec) + `(,(first var-spec) = ,(collect-sub-dirs base-directories (last var-spec)))) + (list + ;; these shall match the search-path-specification for Qt and KDE + ;; libraries + '("XDG_DATA_DIRS" "/share") + '("XDG_CONFIG_DIRS" "/etc/xdg") + '("QT_PLUGIN_PATH" "/lib/qt5/plugins") + '("QML2_IMPORT_PATH" "/lib/qt5/qml"))))) + +(define* (wrap-all-programs #:key inputs outputs + (qt-wrap-excluded-outputs '()) + #:allow-other-keys) + "Implement phase \"qt-wrap\": look for GSettings schemas and +gtk+-v.0 libraries and create wrappers with suitably set environment variables +if found. + +Wrapping is not applied to outputs whose name is listed in +QT-WRAP-EXCLUDED-OUTPUTS. This is useful when an output is known not +to contain any Qt binaries, and where wrapping would gratuitously +add a dependency of that output on Qt." + (define (find-files-to-wrap directory) + (append-map + (lambda (dir) + (if (directory-exists? dir) (find-files dir ".*") (list))) + (list (string-append directory "/bin") + (string-append directory "/sbin") + (string-append directory "/libexec") + (string-append directory "/lib/libexec")))) + + (define input-directories + ;; FIXME: Filter out unwanted inputs, e.g. cmake + (match inputs + (((_ . dir) ...) + dir))) + + (define handle-output + (match-lambda + ((output . directory) + (unless (member output qt-wrap-excluded-outputs) + (let ((bin-list (find-files-to-wrap directory)) + (vars-to-wrap (variables-for-wrapping + (append (list directory) + input-directories)))) + (when (not (null? vars-to-wrap)) + (for-each (cut apply wrap-program <> vars-to-wrap) + bin-list))))))) + + (for-each handle-output outputs) + #t) + (define %standard-phases (modify-phases cmake:%standard-phases (add-before 'check 'check-setup check-setup) - (add-after 'install 'qt-wrap wrap-all-qt-programs))) + (add-after 'install 'qt-wrap wrap-all-programs))) (define* (qt-build #:key inputs (phases %standard-phases) #:allow-other-keys #:rest args) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index 8e6db10ca1..d2486ee86c 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -1,7 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Craven -;;; Copyright © 2019, 2020, 2021 Hartmut Goebel -;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,116 +18,23 @@ (define-module (guix build qt-utils) #:use-module (guix build utils) - #:use-module (ice-9 match) - #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) - #:export (wrap-qt-program - wrap-all-qt-programs - %qt-wrap-excluded-inputs)) - -(define %qt-wrap-excluded-inputs - '(list "cmake" "extra-cmake-modules" "qttools")) - -;; NOTE: Apart from standard subdirectories of /share, Qt also provides -;; facilities for per-application data directories, such as -;; /share/quassel. Thus, we include the output directory even if it doesn't -;; contain any of the standard subdirectories. -(define (variables-for-wrapping base-directories output-directory) - - (define (collect-sub-dirs base-directories subdirectory-spec) - (filter-map - (lambda (dir) - (match - subdirectory-spec - ((subdir) - (and (directory-exists? (string-append dir subdir)) - (string-append dir (car subdirectory-spec)))) - ((subdir children) - (and - (or - (and (string=? dir output-directory) - (directory-exists? (string-append dir subdir))) - (or-map - (lambda (kid) (directory-exists? (string-append dir subdir kid))) - children)) - (string-append dir subdir))))) - base-directories)) - - (filter - (lambda (var-to-wrap) (not (null? (last var-to-wrap)))) - (map - (match-lambda - ((var kind . subdir-spec) - `(,var ,kind ,(collect-sub-dirs base-directories subdir-spec)))) - (list - ;; these shall match the search-path-specification for Qt and KDE - ;; libraries - '("XDG_DATA_DIRS" suffix "/share" ("/applications" "/fonts" - "/icons" "/mime")) - '("XDG_CONFIG_DIRS" suffix "/etc/xdg") - '("QT_PLUGIN_PATH" prefix "/lib/qt5/plugins") - '("QML2_IMPORT_PATH" prefix "/lib/qt5/qml"))))) - - -(define* (wrap-qt-program* program #:key inputs output-dir - qt-wrap-excluded-inputs) - - (define input-directories - (filter-map - (match-lambda - ((label . directory) - (and (not (member label qt-wrap-excluded-inputs)) - directory))) - inputs)) - - (let ((vars-to-wrap (variables-for-wrapping - (cons output-dir input-directories) - output-dir))) - (when (not (null? vars-to-wrap)) - (apply wrap-program program vars-to-wrap)))) - - -(define* (wrap-qt-program program-name #:key inputs output - (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs)) - "Wrap the specified programm (which must reside in the OUTPUT's \"/bin\" -directory) with suitably set environment variables. - -This is like qt-build-systems's phase \"qt-wrap\", but only the named program -is wrapped." - (wrap-qt-program* (string-append output "/bin/" program-name) - #:output-dir output #:inputs inputs - #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs)) - - -(define* (wrap-all-qt-programs #:key inputs outputs - (qt-wrap-excluded-outputs '()) - (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs) - #:allow-other-keys) - "Implement qt-build-systems's phase \"qt-wrap\": look for executables in -\"bin\", \"sbin\" and \"libexec\" of all outputs and create wrappers with -suitably set environment variables if found. - -Wrapping is not applied to outputs whose name is listed in -QT-WRAP-EXCLUDED-OUTPUTS. This is useful when an output is known not -to contain any Qt binaries, and where wrapping would gratuitously -add a dependency of that output on Qt." - (define (find-files-to-wrap output-dir) - (append-map - (lambda (dir) - (if (directory-exists? dir) (find-files dir ".*") (list))) - (list (string-append output-dir "/bin") - (string-append output-dir "/sbin") - (string-append output-dir "/libexec") - (string-append output-dir "/lib/libexec")))) - - (define handle-output - (match-lambda - ((output . output-dir) - (unless (member output qt-wrap-excluded-outputs) - (for-each (cut wrap-qt-program* <> - #:output-dir output-dir #:inputs inputs - #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs) - (find-files-to-wrap output-dir)))))) - - (for-each handle-output outputs) - #t) + #:export (wrap-qt-program)) + +(define (wrap-qt-program out program) + (define (suffix env-var path) + (let ((env-val (getenv env-var))) + (if env-val (string-append env-val ":" path) path))) + + (let ((qml-path (suffix "QML2_IMPORT_PATH" + (string-append out "/lib/qt5/qml"))) + (plugin-path (suffix "QT_PLUGIN_PATH" + (string-append out "/lib/qt5/plugins"))) + (xdg-data-path (suffix "XDG_DATA_DIRS" + (string-append out "/share"))) + (xdg-config-path (suffix "XDG_CONFIG_DIRS" + (string-append out "/etc/xdg")))) + (wrap-program (string-append out "/bin/" program) + `("QML2_IMPORT_PATH" = (,qml-path)) + `("QT_PLUGIN_PATH" = (,plugin-path)) + `("XDG_DATA_DIRS" = (,xdg-data-path)) + `("XDG_CONFIG_DIRS" = (,xdg-config-path))))) -- cgit v1.2.3 From db432cef6cbd0f4b524232ecf95c30c3e632ae08 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 30 Jan 2021 20:35:25 -0500 Subject: gnu: linux-libre: Update to 5.10.12. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.12. (linux-libre-5.10-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 56a82b0644..78781ba045 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -353,7 +353,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.10-version "5.10.11") +(define-public linux-libre-5.10-version "5.10.12") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -361,7 +361,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "03viivkmz9kvn8vak26l80p7fr8jbqisa0y605bi9i8gn1b2pvq2"))) + (hash (base32 "1an460q3affd7gmd6fqv8g37j3z2fnmq19iy677k8kxb2wl4yi8x"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From de3c1efdb34df21b2a49ddb54eb39b03dc582d15 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 30 Jan 2021 20:37:03 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.94. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.94. (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 78781ba045..18ba627faf 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,7 +369,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.4-version "5.4.93") +(define-public linux-libre-5.4-version "5.4.94") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -377,7 +377,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "08nmwd13z10866pc16fqbj41krnvk6hxkl4nmhdkpk346r04jx6k"))) + (hash (base32 "0f9bml584g6jb822j7xyxx9j2g3s49p08xz4bkx9lbiinxyzagf2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 6d8b5e03e8ce64c71a1bdacc0a6c0534217c5832 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 30 Jan 2021 20:37:22 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.172. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.172. (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 18ba627faf..c3ecf886c1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -382,7 +382,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.171") +(define-public linux-libre-4.19-version "4.19.172") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -390,7 +390,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "02n65bmvm309bg6kzxg5ng5lcw564l3rp7dr6asyb1mr1vz55qzl"))) + (hash (base32 "08hl7vw5r61gnzagnm8nbhlbm0h226crp4m19zh0qr2q0pmwqd2g"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 15f2bb6d106e4f35a85c5ddeba9a4669c1d179f6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 30 Jan 2021 20:37:37 -0500 Subject: gnu: linux-libre 4.14: Update to 4.14.218. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.218. (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 c3ecf886c1..2376fc0fe4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -395,7 +395,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.217") +(define-public linux-libre-4.14-version "4.14.218") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -403,7 +403,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "04adj8x7p1has4mh8ygxhqgwb1i08fz9izqw1y6xj5hh8cjnm8v2"))) + (hash (base32 "0l2rcpccf71amngii7vs18x4x6gb0bwxdb2gszabip03bshqdzp3"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From b0c7ae3eb6cd1a60dea2cd2a43a102377fe721cd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 30 Jan 2021 20:37:51 -0500 Subject: gnu: linux-libre 4.9: Update to 4.9.254. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.254. (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 2376fc0fe4..91db575e58 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -408,7 +408,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.253") +(define-public linux-libre-4.9-version "4.9.254") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -416,7 +416,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "065w35vb0qp4fvnwmcx7f92inmx64f9r04zzwcwbs0826nl52nws"))) + (hash (base32 "1djw5mlff73j7m1176qspdzhf6zyv4m0gkdvlxq4g4mdrbqfx6xn"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From a20b4f07bf90efa21acd035d9830bd8f4bf4240d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 30 Jan 2021 20:38:00 -0500 Subject: gnu: linux-libre 4.4: Update to 4.4.254. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.254. (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 91db575e58..da4a76605c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -421,7 +421,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.253") +(define-public linux-libre-4.4-version "4.4.254") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -429,7 +429,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0nlqnfhrkaj2s582kc0wxqi0881hgp6l9z85qx4ckflc8jwrh7k6"))) + (hash (base32 "11wca1mprlcyk7r5h1c8rx3hr7l6mj4i85jaaf106s7wqcm8wamd"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 0981f872cb1fb94fcdf3f4d00bd08c6a6b61ed8d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 31 Jan 2021 00:50:34 -0500 Subject: gnu: gst-plugins-good: Fix a test failure on 32-bit systems. * gnu/packages/patches/gst-plugins-good-fix-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gstreamer.scm (gst-plugins-good)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/gstreamer.scm | 1 + .../patches/gst-plugins-good-fix-test.patch | 94 ++++++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 gnu/packages/patches/gst-plugins-good-fix-test.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 5590faf7d7..29decae1d1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1128,6 +1128,7 @@ dist_patch_DATA = \ %D%/packages/patches/grub-setup-root.patch \ %D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \ %D%/packages/patches/gspell-dash-test.patch \ + %D%/packages/patches/gst-plugins-good-fix-test.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ %D%/packages/patches/guile-2.2-skip-so-test.patch \ diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 10d9011401..b582585d75 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -591,6 +591,7 @@ for the GStreamer multimedia library.") (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) + (patches (search-patches "gst-plugins-good-fix-test.patch")) (sha256 (base32 "1929nhjsvbl4bw37nfagnfsnxz737cm2x3ayz9ayrn9lwkfm45zp")))) (build-system meson-build-system) diff --git a/gnu/packages/patches/gst-plugins-good-fix-test.patch b/gnu/packages/patches/gst-plugins-good-fix-test.patch new file mode 100644 index 0000000000..38ec0ba802 --- /dev/null +++ b/gnu/packages/patches/gst-plugins-good-fix-test.patch @@ -0,0 +1,94 @@ +Fix a broken test: + +https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/803 + +Patches copied from upstream source repository: + +https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/commit/2ce5909f3a0b0da3abb7b794215d6b8b72a3b7fa +https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/commit/f5310ce346180a717f091f2f09bcbb3ddfb15436 + +From 2ce5909f3a0b0da3abb7b794215d6b8b72a3b7fa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= +Date: Thu, 12 Nov 2020 23:38:21 +0000 +Subject: [PATCH 1/2] tests: qtdemux: fix crash on 32-bit architectures + +Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/803 + +Part-of: +--- + tests/check/elements/qtdemux.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/tests/check/elements/qtdemux.c b/tests/check/elements/qtdemux.c +index 5271c6576..0c748278b 100644 +--- a/tests/check/elements/qtdemux.c ++++ b/tests/check/elements/qtdemux.c +@@ -797,9 +797,10 @@ GST_START_TEST (test_qtdemux_pad_names) + "protection-system", G_TYPE_STRING, + "9a04f079-9840-4286-ab92-e65be0885f95", NULL); + caps = +- gst_caps_new_simple ("video/quicktime", "variant", G_TYPE_STRING, +- "mss-fragmented", "timesacle", G_TYPE_UINT64, 10000000, "media-caps", +- GST_TYPE_CAPS, mediacaps, NULL); ++ gst_caps_new_simple ("video/quicktime", ++ "variant", G_TYPE_STRING, "mss-fragmented", ++ "timesacle", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000), ++ "media-caps", GST_TYPE_CAPS, mediacaps, NULL); + + /* Send segment event* */ + event = gst_event_new_caps (caps); +@@ -852,9 +853,10 @@ GST_START_TEST (test_qtdemux_pad_names) + "protection-system", G_TYPE_STRING, + "9a04f079-9840-4286-ab92-e65be0885f95", NULL); + caps = +- gst_caps_new_simple ("video/quicktime", "variant", G_TYPE_STRING, +- "mss-fragmented", "timesacle", G_TYPE_UINT64, 10000000, "media-caps", +- GST_TYPE_CAPS, mediacaps, NULL); ++ gst_caps_new_simple ("video/quicktime", ++ "variant", G_TYPE_STRING, "mss-fragmented", ++ "timesacle", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000), ++ "media-caps", GST_TYPE_CAPS, mediacaps, NULL); + + /* Send segment event* */ + event = gst_event_new_caps (caps); +-- +2.30.0 + + +From f5310ce346180a717f091f2f09bcbb3ddfb15436 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= +Date: Thu, 12 Nov 2020 23:39:21 +0000 +Subject: [PATCH 2/2] tests: qtdemux: fix typo in caps field + +timesacle -> timescale + +Part-of: +--- + tests/check/elements/qtdemux.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/check/elements/qtdemux.c b/tests/check/elements/qtdemux.c +index 0c748278b..4a14c45c0 100644 +--- a/tests/check/elements/qtdemux.c ++++ b/tests/check/elements/qtdemux.c +@@ -799,7 +799,7 @@ GST_START_TEST (test_qtdemux_pad_names) + caps = + gst_caps_new_simple ("video/quicktime", + "variant", G_TYPE_STRING, "mss-fragmented", +- "timesacle", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000), ++ "timescale", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000), + "media-caps", GST_TYPE_CAPS, mediacaps, NULL); + + /* Send segment event* */ +@@ -855,7 +855,7 @@ GST_START_TEST (test_qtdemux_pad_names) + caps = + gst_caps_new_simple ("video/quicktime", + "variant", G_TYPE_STRING, "mss-fragmented", +- "timesacle", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000), ++ "timescale", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000), + "media-caps", GST_TYPE_CAPS, mediacaps, NULL); + + /* Send segment event* */ +-- +2.30.0 + -- cgit v1.2.3 From 6bacfa63c10a277b559373f29f68723cfb31b0e9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 Jan 2021 18:48:03 -0500 Subject: gnu: Add c++-gsl. * gnu/packages/cpp.scm (c++-gsl): New variable. * gnu/packages/patches/c++-gsl-find-system-gtest.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Leo Prikler --- gnu/local.mk | 1 + gnu/packages/cpp.scm | 29 +++++++ .../patches/c++-gsl-find-system-gtest.patch | 96 ++++++++++++++++++++++ 3 files changed, 126 insertions(+) create mode 100644 gnu/packages/patches/c++-gsl-find-system-gtest.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 4ca5d60937..4acba0990e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -913,6 +913,7 @@ dist_patch_DATA = \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ %D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \ + %D%/packages/patches/c++-gsl-find-system-gtest.patch \ %D%/packages/patches/date-output-pkg-config-files.patch \ %D%/packages/patches/datefudge-gettimeofday.patch \ %D%/packages/patches/dbacl-include-locale.h.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 73a3ceb2df..d19712275c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -63,6 +63,35 @@ #:use-module (gnu packages tls) #:use-module (gnu packages web)) +(define-public c++-gsl + (package + (name "c++-gsl") + (version "3.1.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/microsoft/GSL.git") + (commit + (string-append "v" version)))) + (file-name + (git-file-name name version)) + (patches + (search-patches + "c++-gsl-find-system-gtest.patch")) + (sha256 + (base32 "0gbvr48f03830g3154bjhw92b8ggmg6wwh5xyb8nppk9v6w752l0")))) + (build-system cmake-build-system) + (native-inputs + `(("googletest" ,googletest) + ("pkg-config" ,pkg-config))) + (synopsis "Guidelines Support Library") + (description "c++-gsl contains functions and types that are suggested for +use by the C++ Core Guidelines maintained by the Standard C++ Foundation.") + (home-page "https://github.com/microsoft/GSL/") + (license license:expat))) + (define-public libzen (package (name "libzen") diff --git a/gnu/packages/patches/c++-gsl-find-system-gtest.patch b/gnu/packages/patches/c++-gsl-find-system-gtest.patch new file mode 100644 index 0000000000..2def650292 --- /dev/null +++ b/gnu/packages/patches/c++-gsl-find-system-gtest.patch @@ -0,0 +1,96 @@ +From f5cf01083baf7e8dc8318db3648bc6098dc32d67 Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 18 Apr 2020 13:30:17 +0300 +Subject: [PATCH] Search for GoogleTest via pkg-config first + +--- + tests/CMakeLists.txt | 55 ++++++++++++++++++++++++-------------------- + 1 file changed, 30 insertions(+), 25 deletions(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 02193197..53d475c2 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,36 +1,41 @@ + cmake_minimum_required(VERSION 3.0.2) + + project(GSLTests CXX) ++include(FindPkgConfig) + + # will make visual studio generated project group files + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +-configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt) +-execute_process( +- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . +- RESULT_VARIABLE result +- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download +-) +-if(result) +- message(FATAL_ERROR "CMake step for googletest failed: ${result}") +-endif() ++pkg_search_module(GTestMain gtest_main) ++if (NOT GTestMain_FOUND) ++ configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt) ++ execute_process( ++ COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . ++ RESULT_VARIABLE result ++ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download ++ ) ++ if(result) ++ message(FATAL_ERROR "CMake step for googletest failed: ${result}") ++ endif() + +-execute_process( +- COMMAND ${CMAKE_COMMAND} --build . +- RESULT_VARIABLE result +- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download +-) +-if(result) +- message(FATAL_ERROR "CMake step for googletest failed: ${result}") +-endif() ++ execute_process( ++ COMMAND ${CMAKE_COMMAND} --build . ++ RESULT_VARIABLE result ++ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download ++ ) ++ if(result) ++ message(FATAL_ERROR "CMake step for googletest failed: ${result}") ++ endif() + +-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) ++ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) ++ set(GTestMain_LIBRARIES gtest_main) + +-add_subdirectory( +- ${CMAKE_CURRENT_BINARY_DIR}/googletest-src +- ${CMAKE_CURRENT_BINARY_DIR}/googletest-build +- EXCLUDE_FROM_ALL +-) ++ add_subdirectory( ++ ${CMAKE_CURRENT_BINARY_DIR}/googletest-src ++ ${CMAKE_CURRENT_BINARY_DIR}/googletest-build ++ EXCLUDE_FROM_ALL ++ ) ++endif() + + if (MSVC AND (GSL_CXX_STANDARD EQUAL 17)) + set(GSL_CPLUSPLUS_OPT -Zc:__cplusplus -permissive-) +@@ -149,7 +154,7 @@ function(add_gsl_test name) + target_link_libraries(${name} + GSL + gsl_tests_config +- gtest_main ++ ${GTestMain_LIBRARIES} + ) + add_test( + ${name} +@@ -254,7 +259,7 @@ function(add_gsl_test_noexcept name) + target_link_libraries(${name} + GSL + gsl_tests_config_noexcept +- gtest_main ++ ${GTestMain_LIBRARIES} + ) + add_test( + ${name} -- cgit v1.2.3 From 7152d7568116bb19da986465db93a9b811bee577 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 Jan 2021 22:23:51 -0500 Subject: gnu: Add fcitx-qt5. * gnu/packages/fcitx.scm (fcitx-qt5): New variable. Signed-off-by: Leo Prikler --- gnu/packages/fcitx.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fcitx.scm b/gnu/packages/fcitx.scm index d52edf1750..93cea7a24d 100644 --- a/gnu/packages/fcitx.scm +++ b/gnu/packages/fcitx.scm @@ -19,11 +19,13 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages fcitx) - #:use-module ((guix licenses) #:select (gpl2+)) + #:use-module ((guix licenses) #:select (gpl2+ bsd-3)) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system qt) #:use-module (gnu packages check) #:use-module (gnu packages documentation) #:use-module (gnu packages enchant) @@ -33,14 +35,69 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) #:use-module (gnu packages iso-codes) + #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages man) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages qt) #:use-module (gnu packages sqlite) #:use-module (gnu packages web) #:use-module (gnu packages xml) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages xorg) + #:use-module (gnu packages xdisorg)) + +(define-public fcitx-qt5 + (package + (name "fcitx-qt5") + (version "1.2.5") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/fcitx/fcitx-qt5.git") + (commit version))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1d56bp11jp85b2r4syw1clfg4vqxqfh7gygpwz8wk5sxmfmmdq83")))) + (build-system qt-build-system) + (arguments + `(#:tests? #f ; No target + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-install-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "quickphrase-editor/CMakeLists.txt" + (("\\$\\{FCITX4_ADDON_INSTALL_DIR\\}") + (string-append + (assoc-ref outputs "out") + "/lib/fcitx"))) + (substitute* "platforminputcontext/CMakeLists.txt" + (("\\$\\{CMAKE_INSTALL_QTPLUGINDIR\\}") + (string-append + (assoc-ref outputs "out") + "/lib/qt5/plugins"))) + #t))))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config))) + (inputs + `(("fcitx" ,fcitx) + ("libintl" ,intltool) + ("libxkbcommon" ,libxkbcommon))) + (propagated-inputs + `(("qtbase" ,qtbase))) + (synopsis "Fcitx Qt5 Input Context") + (description "This package provides a Qt5 frontend for fcitx.") + (home-page "https://github.com/fcitx/fcitx-qt5/") + (license + (list + ;; Plugin + bsd-3 + ;; Others + gpl2+)))) (define-public presage (package -- cgit v1.2.3 From eb8c32f8805cb0605f03f2a3d0afdb2e4ac05405 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 Jan 2021 23:51:51 -0500 Subject: gnu: libappindicator: Propagate some inputs as per .pc file. * gnu/packages/freedesktop.scm (libappindicator) [inputs]: Move gtk+ and libdbusmenu to ... [propagated-inputs]: ... here. Signed-off-by: Leo Prikler --- gnu/packages/freedesktop.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e175a95ef1..09db6de783 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2021,14 +2021,15 @@ useful with system integration.") ("xvfb" ,xorg-server-for-tests))) (inputs `(("dbus-glib" ,dbus-glib) - ("gtk+" ,gtk+) - ("libdbusmenu" ,libdbusmenu) ("libindicator" ,libindicator) ("python@2" ,python-2) ("python2-pygtk" ,python2-pygtk) ("python2-pygobject-2" ,python2-pygobject-2) ;; ("mono" ,mono) ; requires non-packaged gapi ("vala" ,vala))) + (propagated-inputs + `(("gtk+" ,gtk+) + ("libdbusmenu" ,libdbusmenu))) (arguments ;; FIXME: do not hardcode gtk version `(#:configure-flags '("--with-gtk=3") -- cgit v1.2.3 From 823b27d970fdf4cbdedc754ec8f4d93bc9fea96d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 14 Jan 2021 00:53:40 -0500 Subject: gnu: Add libchewing. * gnu/packages/language.scm (libchewing): New variable. Signed-off-by: Leo Prikler --- gnu/packages/language.scm | 61 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 3f17465039..621bc7f6e5 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -31,12 +31,14 @@ #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages man) + #:use-module (gnu packages ncurses) #:use-module (gnu packages ocr) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages perl-check) + #:use-module (gnu packages sqlite) #:use-module (gnu packages swig) #:use-module (gnu packages texinfo) #:use-module (gnu packages web) @@ -53,6 +55,65 @@ #:use-module (guix git-download) #:use-module (guix utils)) +(define-public libchewing + (package + (name "libchewing") + (version "0.5.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/chewing/libchewing.git") + (commit + (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "04d09w6xdd08v6laj9y4qmqsijw5i2jvshcilhh4vg6cfnfgl2my")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "test/Makefile.am" + ((" test-bopomofo ") + "") + ((" test-config ") + "") + ((" test-reset ") + "") + ((" test-symbol ") + "") + ((" test-keyboardless ") + "") + ((" test-special-symbol ") + "") + ((" test-keyboard ") + "") + ((" test-regression ") + "") + ((" test-userphrase ") + "")) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("texinfo" ,texinfo))) + (inputs + `(("ncurses" ,ncurses) + ("sqlite" ,sqlite))) + (synopsis "Chinese phonetic input method") + (description "Chewing is an intelligent phonetic (Zhuyin/Bopomofo) input +method, one of the most popular choices for Traditional Chinese users.") + (home-page "http://chewing.im/") + (license lgpl2.1+))) + (define-public liblouis (package (name "liblouis") -- cgit v1.2.3 From 677cb21bfdf7234a2562ac1adc4c5bcbda25cbd3 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 14 Jan 2021 01:02:08 -0500 Subject: gnu: Add hime. * gnu/packages/language.scm (hime): New variable. Signed-off-by: Leo Prikler --- gnu/packages/language.scm | 78 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 621bc7f6e5..221848f2b5 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -23,8 +23,11 @@ (define-module (gnu packages language) #:use-module (gnu packages) + #:use-module (gnu packages anthy) #:use-module (gnu packages autotools) #:use-module (gnu packages audio) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages java) @@ -38,6 +41,7 @@ #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages perl-check) + #:use-module (gnu packages qt) #:use-module (gnu packages sqlite) #:use-module (gnu packages swig) #:use-module (gnu packages texinfo) @@ -45,16 +49,88 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix packages) + #:use-module (guix build-system cmake) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module ((guix licenses) #:select - (bsd-3 gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ perl-license zpl2.1)) + (bsd-3 gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ perl-license zpl2.1 fdl1.2+)) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils)) +(define-public hime + (package + (name "hime") + (version "0.9.11") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/hime-ime/hime.git") + (commit + (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1wn0ici78x5qh6hvv50bf76ld7ds42hzzl4l5qz34hp8wyvrwakw")))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:tests? #f ; No target + #:imported-modules + (,@%glib-or-gtk-build-system-modules + (guix build cmake-build-system) + (guix build qt-build-system)) + #:modules + ((guix build glib-or-gtk-build-system) + ((guix build qt-build-system) + #:prefix qt:) + (guix build utils)) + #:configure-flags + (list + ;; FIXME + ;; error: unknown type name ‘GtkStatusIcon’ + "--disable-system-tray") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-std + (lambda _ + (substitute* "configure" + (("gnu17") + "gnu11") + (("gnu++17") + "gnu++11")) + #t)) + (add-after 'install 'qt-wrap + (assoc-ref qt:%standard-phases 'qt-wrap))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) + ("whereis" ,util-linux))) + (inputs + `(("anthy" ,anthy) + ("appindicator" ,libappindicator) + ("chewing" ,libchewing) + ("gtk+" ,gtk+) + ("qtbase" ,qtbase) + ("xtst" ,libxtst))) + (synopsis "HIME Input Method Editor") + (description "Hime is an extremely easy-to-use input method framework. It +is lightweight, stable, powerful and supports many commonly used input methods, +including Cangjie, Zhuyin, Dayi, Ranked, Shrimp, Greek, Anthy, Korean, Latin, +Random Cage Fighting Birds, Cool Music etc.") + (home-page "http://hime-ime.github.io/") + (license + (list + gpl2+ + lgpl2.1+ + ;; Documentation + fdl1.2+)))) + (define-public libchewing (package (name "libchewing") -- cgit v1.2.3 From 83299e541ff47915ec7f42ddeea488f22304d8cd Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 14 Jan 2021 01:07:16 -0500 Subject: gnu: Add nimf. * gnu/packages/language.scm (nimf): New variable. Signed-off-by: Leo Prikler --- gnu/packages/language.scm | 138 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 221848f2b5..67b519aa56 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -26,10 +26,15 @@ #:use-module (gnu packages anthy) #:use-module (gnu packages autotools) #:use-module (gnu packages audio) + #:use-module (gnu packages base) + #:use-module (gnu packages docbook) + #:use-module (gnu packages emacs) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages ibus) #:use-module (gnu packages java) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) @@ -47,6 +52,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages web) #:use-module (gnu packages xml) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) #:use-module (guix packages) #:use-module (guix build-system cmake) @@ -62,6 +68,138 @@ #:use-module (guix git-download) #:use-module (guix utils)) +(define-public nimf + (package + (name "nimf") + (version "1.2") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/hamonikr/nimf.git") + (commit + (string-append "nimf-" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "01qi7flmaqrn2fk03sa42r0caks9d8lsv88s0bgxahhxwk1x76gc")))) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) + (arguments + `(#:imported-modules + (,@%glib-or-gtk-build-system-modules + (guix build cmake-build-system) + (guix build qt-build-system)) + #:modules + ((guix build glib-or-gtk-build-system) + ((guix build qt-build-system) + #:prefix qt:) + (guix build utils)) + #:configure-flags + (list + "--with-im-config-data" + "--with-imsettings-data" + (string-append "--with-html-dir=" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-flags + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "configure.ac" + (("-Werror") + "-Wno-error")) + #t)) + (add-after 'patch-flags 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* "nimf-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml-4.3") + "/xml/dtd/docbook/")))) + #t)) + (add-after 'patch-docbook-xml 'patch-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "configure.ac" + (("/usr/share/anthy/anthy.dic") + (string-append (assoc-ref inputs "anthy") + "/share/anthy/anthy.dic"))) + (substitute* "configure.ac" + (("/usr/bin:\\$GTK3_LIBDIR/libgtk-3-0") + (string-append (assoc-ref inputs "gtk+:bin") + "/bin:$GTK3_LIBDIR/libgtk-3-0")) + (("/usr/bin:\\$GTK2_LIBDIR/libgtk2.0-0") + (string-append (assoc-ref inputs "gtk+-2:bin") + "/bin:$GTK2_LIBDIR/libgtk2.0-0"))) + (substitute* "modules/clients/gtk/Makefile.am" + (("\\$\\(GTK3_LIBDIR\\)") + (string-append (assoc-ref outputs "out") + "/lib")) + (("\\$\\(GTK2_LIBDIR\\)") + (string-append (assoc-ref outputs "out") + "/lib"))) + (substitute* "modules/clients/qt4/Makefile.am" + (("\\$\\(QT4_LIB_DIR\\)") + (string-append (assoc-ref outputs "out") + "/lib"))) + (substitute* "modules/clients/qt5/Makefile.am" + (("\\$\\(QT5_IM_MODULE_DIR\\)") + (string-append (assoc-ref outputs "out") + "/lib/qt5/plugins/inputmethods"))) + (substitute* '("bin/nimf-settings/Makefile.am" + "data/apparmor-abstractions/Makefile.am" + "data/Makefile.am" "data/im-config/Makefile.am" + "data/imsettings/Makefile.am") + (("/etc") + (string-append (assoc-ref outputs "out") + "/etc")) + (("/usr/share") + (string-append (assoc-ref outputs "out") + "/share"))) + #t)) + (add-after 'install 'qt-wrap + (assoc-ref qt:%standard-phases 'qt-wrap))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("docbook-xml-4.3" ,docbook-xml-4.3) + ("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) + ("gtk+-2:bin" ,gtk+-2 "bin") + ("gtk+:bin" ,gtk+ "bin") + ("gtk-doc" ,gtk-doc) + ("intltool" ,intltool) + ("libtool" ,libtool) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("which" ,which))) + (inputs + `(("anthy" ,anthy) + ("appindicator" ,libappindicator) + ("gtk+-2" ,gtk+-2) + ("gtk+" ,gtk+) + ("hangul" ,libhangul) + ("m17n-db" ,m17n-db) + ("m17n-lib" ,m17n-lib) + ("qt-4" ,qt-4) + ("qtbase" ,qtbase) + ("rime" ,librime) + ("rsvg" ,librsvg) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols) + ("x11" ,libx11) + ("xkbcommon" ,libxkbcommon) + ("xklavier" ,libxklavier))) + (propagated-inputs + `(("glib" ,glib))) + (synopsis "Lightweight input method framework") + (description "Nimf is a lightweight, fast and extensible input method +framework. This package provides a fork of the original nimf project, that +focusses especially on Korean input (Hangul, Hanja, ...).") + (home-page "https://github.com/hamonikr/nimf/") + (license lgpl3+))) + (define-public hime (package (name "hime") -- cgit v1.2.3 From 79389ac37f6f5082a8ce49910ec552cac3659168 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 3 Jan 2021 19:03:00 -0500 Subject: gnu: Add cmake-shared. * gnu/packages/cmake.scm (cmake-shared): New variable. Signed-off-by: Leo Prikler --- gnu/packages/cmake.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 56b32792fe..ab74650066 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -31,6 +31,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix deprecation) #:use-module (guix build-system gnu) @@ -43,6 +44,7 @@ #:use-module (gnu packages curl) #:use-module (gnu packages file) #:use-module (gnu packages hurd) + #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages libevent) #:use-module (gnu packages ncurses) #:use-module (gnu packages serialization) @@ -52,6 +54,33 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-1)) +(define-public cmake-shared + (package + (name "cmake-shared") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lirios/cmake-shared.git") + (commit + (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1srd3jmlalf0szgyp88ymhbnwds4qiywmf8lq1pif9g8irjjhdry")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f)) ; No target + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (synopsis "Shared CMake functions and macros") + (description "CMake-Shared are shared functions and macros for projects +using the CMake build system.") + (home-page "https://github.com/lirios/cmake-shared/") + (license license:bsd-3))) + ;;; Build phases shared between 'cmake-bootstrap' and the later variants ;;; that use cmake-build-system. (define %common-build-phases -- cgit v1.2.3 From 75bdc9a782fb18eb2392ac5c7ae97ff0011fb28a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 3 Jan 2021 19:08:43 -0500 Subject: gnu: Add materialdecoration. * gnu/packages/qt.scm (materialdecoration): New variable. Signed-off-by: Leo Prikler --- gnu/packages/qt.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 96a28ceb29..d1822e9707 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -45,6 +45,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (guix packages) #:use-module (guix deprecation) #:use-module (guix utils) @@ -72,6 +73,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) + #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) @@ -103,6 +105,36 @@ #:use-module (gnu packages xml) #:use-module (srfi srfi-1)) +(define-public materialdecoration + (package + (name "materialdecoration") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lirios/materialdecoration.git") + (commit "2079487116c6c794af3a15452342a69293039b46"))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1pczmxbmnsgj9s1g6ap55qq2q4ccibcnhsw9b6cl5rzgc48izy06")))) + (build-system qt-build-system) + (native-inputs + `(("cmake-shared" ,cmake-shared) + ("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config))) + (inputs + `(("qtbase" ,qtbase) + ("qtwayland" ,qtwayland) + ("wayland" ,wayland))) + (synopsis "Material Decoration for Qt") + (description "MaterialDecoration is a client-side decoration for Qt +applications on Wayland.") + (home-page "https://github.com/lirios/materialdecoration") + (license license:lgpl3+))) + (define-public grantlee (package (name "grantlee") -- cgit v1.2.3 From a5f4d3902708c87f6e4cf089f5f7334eb4cc07db Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 4 Jan 2021 23:59:17 -0500 Subject: gnu: Add range-v3. * gnu/packages/cpp.scm (range-v3): New variable. Signed-off-by: Leo Prikler --- gnu/packages/cpp.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d19712275c..ae47490755 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) + #:use-module (gnu packages documentation) #:use-module (gnu packages gcc) #:use-module (gnu packages libevent) #:use-module (gnu packages libunwind) @@ -63,6 +64,45 @@ #:use-module (gnu packages tls) #:use-module (gnu packages web)) +(define-public range-v3 + (package + (name "range-v3") + (version "0.11.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/ericniebler/range-v3.git") + (commit version))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh")))) + (build-system cmake-build-system) + (native-inputs + `(("doxygen" ,doxygen) + ("perl" ,perl))) + (inputs + `(("boost" ,boost))) + (synopsis "Range library for C++14/17/20") + (description "Range-v3 is an extension of the Standard Template Library that +makes its iterators and algorithms more powerful by making them composable. +Unlike other range-like solutions which, seek to do away with iterators, in +range-v3 ranges are an abstration layer on top of iterators.") + (home-page "https://github.com/ericniebler/range-v3/") + (license + (list + ;; Elements of Programming + (license:x11-style "file:///LICENSE.txt") + ;; SGI STL + license:sgifreeb2.0 + ;;; LibC++ (dual-licensed) + license:expat + license:ncsa + ;; Others + license:boost1.0)))) + (define-public c++-gsl (package (name "c++-gsl") -- cgit v1.2.3 From 179e97d5950ab01138eee4fa0bdaae06b6b06237 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 27 Jan 2021 14:45:54 -0500 Subject: gnu: Add rlottie. * gnu/packages/animation.scm (rlottie): New variable. Signed-off-by: Leo Prikler --- gnu/packages/animation.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 6bfe8f0a12..c92c4ae7e7 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -26,10 +26,12 @@ #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages dejagnu) @@ -53,6 +55,37 @@ #:use-module (gnu packages video) #:use-module (gnu packages xiph)) +(define-public rlottie + (package + (name "rlottie") + (version "0.2") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/Samsung/rlottie.git") + (commit + (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "10bxr1zf9wxl55d4cw2j02r6sgqln7mbxplhhfvhw0z92fi40kr3")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags + (list + "-Dlog=true" + "-Dtest=true"))) + (native-inputs + `(("googletest" ,googletest) + ("pkg-config" ,pkg-config))) + (synopsis "Lottie Animation Library") + (description "Rlottie is a platform independent standalone c++ library for +rendering vector based animations and art in realtime.") + (home-page "https://github.com/Samsung/rlottie/") + (license license:expat))) + ;; ETL, synfig, and Synfig Studio are updated in tandem. (define synfig-version "1.2.2") -- cgit v1.2.3 From 6a3ec5c5495626726bed143e0292807df7cd8d1c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 5 Jan 2021 17:50:16 -0500 Subject: gnu: Add qt5ct. * gnu/packages/qt.scm (qt5ct): New variable. Signed-off-by: Leo Prikler --- gnu/packages/qt.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d1822e9707..cef9c6802f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -105,6 +105,61 @@ #:use-module (gnu packages xml) #:use-module (srfi srfi-1)) +(define-public qt5ct + (package + (name "qt5ct") + (version "1.1") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://sourceforge/qt5ct/qt5ct-" version ".tar.bz2")) + (sha256 + (base32 "1lnx4wqk87lbr6lqc64w5g5ppjjv75kq2r0q0bz9gfpryzdw8xxg")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No target + #:imported-modules + (,@%gnu-build-system-modules + (guix build cmake-build-system) + (guix build qt-build-system)) + #:modules + ((guix build gnu-build-system) + ((guix build qt-build-system) + #:prefix qt:) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "qt5ct.pro" + (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") + (string-append (assoc-ref inputs "qttools") + "/bin/lrelease"))) + #t)) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (invoke "qmake" + (string-append "PREFIX=" out) + (string-append "BINDIR=" out "/bin") + (string-append "DATADIR=" out "/share") + (string-append "PLUGINDIR=" out "/lib/qt5/plugins"))) + #t)) + (add-after 'install 'qt-wrap + (assoc-ref qt:%standard-phases 'qt-wrap))))) + (native-inputs + `(("qttools" ,qttools))) + (inputs + `(("qtbase" ,qtbase) + ("qtsvg" ,qtsvg))) + (synopsis "Qt5 Configuration Tool") + (description "Qt5CT is a program that allows users to configure Qt5 +settings (such as icons, themes, and fonts) in desktop environments or +window managers, that don't provide Qt integration by themselves.") + (home-page "https://qt5ct.sourceforge.io/") + (license license:bsd-2))) + (define-public materialdecoration (package (name "materialdecoration") -- cgit v1.2.3 From a84399eddfd3e55eedcef0283f2fcdff80f504b7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 7 Jan 2021 19:41:42 -0500 Subject: gnu: Add webrtc-for-telegram-desktop. * gnu/packages/telegram.scm: New module. (webrtc-for-telegram-desktop): New variable. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Leo Prikler --- gnu/local.mk | 1 + gnu/packages/telegram.scm | 144 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+) create mode 100644 gnu/packages/telegram.scm (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 4acba0990e..e93425f394 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -535,6 +535,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/task-management.scm \ %D%/packages/tbb.scm \ %D%/packages/tcl.scm \ + %D%/packages/telegram.scm \ %D%/packages/telephony.scm \ %D%/packages/terminals.scm \ %D%/packages/terraform.scm \ diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm new file mode 100644 index 0000000000..8efa8f2a0a --- /dev/null +++ b/gnu/packages/telegram.scm @@ -0,0 +1,144 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Raghav Gururajan +;;; +;;; 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 telegram) + #:use-module (gnu packages) + #:use-module (gnu packages assembly) + #:use-module (gnu packages image) + #:use-module (gnu packages linux) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages protobuf) + #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages python) + #:use-module (gnu packages tls) + #:use-module (gnu packages video) + #:use-module (gnu packages xiph) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix build-system cmake)) + +(define-public webrtc-for-telegram-desktop + (let ((commit "fa86fcc00c218813d61a272a56feab55c76a1ab9") + (revision "52")) + (hidden-package + (package + (name "webrtc-for-telegram-desktop") + (version + (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/tg_owt.git") + (commit commit))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "06gcrlym6vqqw7zlds9lpwyg37d5m81d87h16aps19v0v9gzan0l")) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + (snippet + `(begin + (let ((keep + '( ;; Custom forks which are incompatible with the ones in Guix. + "abseil-cpp" "libsrtp" "openh264" "rnnoise" + ;; Not available in Guix. + "pffft" "usrsctp" + ;; Has cmake support files for libvpx input. + "libvpx"))) + (with-directory-excursion "src/third_party" + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (cons* "." ".." keep)))) + #t))))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No target + #:configure-flags + (list + "-DCMAKE_C_FLAGS=-fPIC" + "-DCMAKE_CXX_FLAGS=-fPIC") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'copy-inputs + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((libvpx-from (assoc-ref inputs "libvpx")) + (libyuv-from (assoc-ref inputs "libyuv")) + (libvpx-to (string-append (getcwd) + "/src/third_party/libvpx/source/libvpx")) + (libyuv-to (string-append (getcwd) + "/src/third_party/libyuv"))) + (copy-recursively libvpx-from libvpx-to) + (copy-recursively libyuv-from libyuv-to)) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("yasm" ,yasm))) + (inputs + `(("alsa" ,alsa-lib) + ("ffmpeg" ,ffmpeg) + ("libjpeg" ,libjpeg-turbo) + ("libvpx" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://chromium.googlesource.com/webm/libvpx") + (commit "5b63f0f821e94f8072eb483014cfc33b05978bb9"))) + (file-name + (git-file-name "libvpx-for-webrtc-for-telegram-desktop" version)) + (sha256 + (base32 "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68")))) + ("libyuv" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://chromium.googlesource.com/libyuv/libyuv") + (commit "ad890067f661dc747a975bc55ba3767fe30d4452"))) + (file-name + (git-file-name "libyuv-for-webrtc-for-telegram-desktop" version)) + (sha256 + (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll")))) + ("openssl" ,openssl) + ("opus" ,opus) + ("protobuf" ,protobuf) + ("pulseaudio" ,pulseaudio))) + (synopsis "WebRTC support for Telegram Desktop") + (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by +Telegram project, for its use in telegram desktop client.") + (home-page "https://github.com/desktop-app/tg_owt") + (license + (list + ;; Abseil-CPP + license:asl2.0 + ;; LibYuv + (license:non-copyleft "file:///src/third_party/libyuv/LICENSE") + ;; OpenH264 + license:bsd-2 + ;; PFFFT + (license:non-copyleft "file:///src/third_party/pffft/LICENSE") + ;; RnNoise + license:gpl3 + ;; LibSRTP, LibVPx, UsrSCTP and Others + license:bsd-3)))))) -- cgit v1.2.3 From cda5fb481c404ca64d7e9cdda9f26c9ea36e216e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 27 Jan 2021 18:37:39 -0500 Subject: gnu: Add rlottie-for-telegram-desktop. * gnu/packages/telegram.scm (rlottie-for-telegram-desktop): New variable. Signed-off-by: Leo Prikler --- gnu/packages/telegram.scm | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 8efa8f2a0a..18fcc0569b 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -18,7 +18,9 @@ (define-module (gnu packages telegram) #:use-module (gnu packages) + #:use-module (gnu packages animation) #:use-module (gnu packages assembly) + #:use-module (gnu packages check) #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) @@ -31,7 +33,8 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix git-download) - #:use-module (guix build-system cmake)) + #:use-module (guix build-system cmake) + #:use-module (guix build-system meson)) (define-public webrtc-for-telegram-desktop (let ((commit "fa86fcc00c218813d61a272a56feab55c76a1ab9") @@ -142,3 +145,37 @@ Telegram project, for its use in telegram desktop client.") license:gpl3 ;; LibSRTP, LibVPx, UsrSCTP and Others license:bsd-3)))))) + +(define-public rlottie-for-telegram-desktop + (let ((commit "cbd43984ebdf783e94c8303c41385bf82aa36d5b") + (revision "671")) + (hidden-package + (package + (inherit rlottie) + (version + (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/rlottie.git") + (commit commit))) + (file-name + (git-file-name "rlottie-for-telegram-desktop" version)) + (sha256 + (base32 "1lxpbgbhps9rmck036mgmiknqrzpjxpas8n7qxykv6pwzn0c8n0c")))) + (arguments + `(#:configure-flags + (list + "-Dlog=true" + "-Ddumptree=true" + "-Dtest=true") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-cxx-flags + (lambda _ + (substitute* "meson.build" + (("werror=true") + "werror=false")) + #t))))))))) -- cgit v1.2.3 From 27fa48443aa684bcb8f7604c4bae80c436052dcc Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 27 Jan 2021 18:57:44 -0500 Subject: gnu: Add libtgvoip-for-telegram-desktop. * gnu/packages/telegram.scm (libtgvoip-for-telegram-desktop): New variable. Signed-off-by: Leo Prikler --- gnu/packages/telegram.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 18fcc0569b..9de9a84e3b 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -20,6 +20,7 @@ #:use-module (gnu packages) #:use-module (gnu packages animation) #:use-module (gnu packages assembly) + #:use-module (gnu packages autotools) #:use-module (gnu packages check) #:use-module (gnu packages image) #:use-module (gnu packages linux) @@ -27,6 +28,7 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages telephony) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages xiph) @@ -34,6 +36,7 @@ #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) #:use-module (guix build-system meson)) (define-public webrtc-for-telegram-desktop @@ -179,3 +182,47 @@ Telegram project, for its use in telegram desktop client.") (("werror=true") "werror=false")) #t))))))))) + +(define-public libtgvoip-for-telegram-desktop + (let ((commit "37d98e984fd6fa389262307db826d52ab86c8241") + (revision "87")) + (hidden-package + (package + (inherit libtgvoip) + (version + (git-version "2.4.4" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/telegramdesktop/libtgvoip.git") + (commit commit))) + (file-name + (git-file-name "libtgvoip-for-telegram-desktop" version)) + (sha256 + (base32 "13dzvyq8p20nlhjihv18aj6y97czk07qdl0k6v81vp6mbwcldg7h")))) + (arguments + `(#:configure-flags + (list + "--disable-static" + "--disable-dsp" ; FIXME + "--enable-audio-callback" + "--with-alsa" + "--with-pulse") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-linkers + (lambda _ + (substitute* "Makefile.am" + (("\\$\\(CRYPTO_LIBS\\) \\$\\(OPUS_LIBS\\)") + "$(CRYPTO_LIBS) $(OPUS_LIBS) $(ALSA_LIBS) $(PULSE_LIBS)")) + (substitute* "tgvoip.pc.in" + (("libcrypto opus") + "libcrypto opus alsa libpulse")) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))))))) -- cgit v1.2.3 From edfbb1d2d1391b96af3b339cdb01df50298ec7ba Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 27 Jan 2021 19:21:23 -0500 Subject: gnu: Add telegram-desktop. * gnu/packages/telegram.scm (telegram-desktop): New variable. Signed-off-by: Leo Prikler --- gnu/packages/telegram.scm | 331 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 330 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 9de9a84e3b..66b94baf28 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -18,26 +18,47 @@ (define-module (gnu packages telegram) #:use-module (gnu packages) + #:use-module (gnu packages aidc) #:use-module (gnu packages animation) #:use-module (gnu packages assembly) + #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) + #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) + #:use-module (gnu packages digest) + #:use-module (gnu packages fcitx) + #:use-module (gnu packages fcitx5) + #:use-module (gnu packages gcc) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages language) + #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) + #:use-module (gnu packages lxqt) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages qt) #:use-module (gnu packages telephony) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages xiph) + #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) - #:use-module (guix build-system meson)) + #:use-module (guix build-system meson) + #:use-module (guix build-system qt)) (define-public webrtc-for-telegram-desktop (let ((commit "fa86fcc00c218813d61a272a56feab55c76a1ab9") @@ -226,3 +247,311 @@ Telegram project, for its use in telegram desktop client.") ("automake" ,automake) ("libtool" ,libtool) ("pkg-config" ,pkg-config))))))) + +(define-public telegram-desktop + (package + (name "telegram-desktop") + (version "2.5.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/telegramdesktop/tdesktop.git") + (commit + (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "0drirhkr9gnm1g03lcqmvap5ljlk859c29gbsm63hhsgv15dlw0y")) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + (snippet + `(begin + (let ((keep + '( ;; Not available in Guix. + "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + (with-directory-excursion "Telegram/ThirdParty" + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (cons* "." ".." keep)))) + #t))))) + (build-system qt-build-system) + (arguments + `(#:tests? #f ; No target + #:imported-modules + (,@%qt-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules + ((guix build qt-build-system) + ((guix build glib-or-gtk-build-system) + #:prefix glib-or-gtk:) + (guix build utils) + (ice-9 match)) + #:configure-flags + (list + ;; Client applications must provide their own API-ID and API-HASH, + ;; see also . + ;; In case, that the credentials below fail to work, contact + ;; Raghav Gururajan + "-DTDESKTOP_API_ID=2791056" + "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" + ;; Use bundled fonts as fallback. + "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) + (add-after 'make-writable 'copy-inputs + (lambda* (#:key inputs outputs #:allow-other-keys) + (for-each + (match-lambda + ((dst src) + (copy-recursively src dst) + (for-each make-file-writable (find-files dst)))) + `(("cmake" ,(assoc-ref inputs "cmake-helpers")) + ("Telegram/codegen" ,(assoc-ref inputs "codegen-source")) + ("Telegram/lib_base" ,(assoc-ref inputs "lib-base-source")) + ("Telegram/lib_crl" ,(assoc-ref inputs "lib-crl-source")) + ("Telegram/lib_lottie" + ,(assoc-ref inputs "lib-lottie-source")) + ("Telegram/lib_qr" ,(assoc-ref inputs "lib-qr-source")) + ("Telegram/lib_rlottie" + ,(assoc-ref inputs "lib-rlottie-source")) + ("Telegram/lib_rpl" ,(assoc-ref inputs "lib-rpl-source")) + ("Telegram/lib_spellcheck" + ,(assoc-ref inputs "lib-spellcheck-source")) + ("Telegram/lib_storage" + ,(assoc-ref inputs "lib-storage-source")) + ("Telegram/lib_tl" ,(assoc-ref inputs "lib-tl-source")) + ("Telegram/lib_ui" ,(assoc-ref inputs "lib-ui-source")) + ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-source")) + ("Telegram/ThirdParty/tgcalls" + ,(assoc-ref inputs "tgcalls-source")))) + #t)) + (add-before 'configure 'patch-cxx-flags + (lambda _ + (substitute* "cmake/options_linux.cmake" + (("class-memaccess") "all")) + #t)) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (native-inputs + `(("cmake-helpers" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/cmake_helpers.git") + (commit "a81345a28d407fb5acd5267ec6afa1864f4e8d5b"))) + (file-name + (git-file-name "cmake-helpers-for-telegram-desktop" version)) + (sha256 + (base32 "0s5hxip68dmkaspjq6j30wx1r5v4prnrjza79hdbznz6i57a2248")))) + ("cmake-shared" ,cmake-shared) + ("extra-cmake-modules" ,extra-cmake-modules) + ("gcc" ,gcc-9) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk+:bin" ,gtk+ "bin") + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("qttools" ,qttools))) + (inputs + `(("alsa" ,alsa-lib) + ("c++-gsl" ,c++-gsl) + ("catch" ,catch-framework2) + ("codegen-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/codegen.git") + (commit "127968de8129e8ccfa6ac50721c70415a5a087c3"))) + (file-name + (git-file-name "codegen" version)) + (sha256 + (base32 "036hzjrsk134ky62192nra43rsln5kh5gz20q1920s922661zky2")))) + ("expected" ,libexpected) + ("fcitx-qt5" ,fcitx-qt5) + ("fcitx5-qt" ,fcitx5-qt) + ("ffmpeg" ,ffmpeg) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("hime" ,hime) + ("hunspell" ,hunspell) + ("iconv" ,libiconv) + ("lib-base-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_base.git") + (commit "81df0d0b7842be2b6c88f93dfa136b8efea4c9ad"))) + (file-name + (git-file-name "lib-base-for-telegram-desktop" version)) + (sha256 + (base32 "0ikddprjnjvg0ic8jr2886xq0f18syp587q6z2kci9xmdnvjl217")))) + ("lib-crl-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_crl.git") + (commit "16150bf71d79382738114b913f137ec1a1a7630c"))) + (file-name + (git-file-name "lib-crl-for-telegram-desktop" version)) + (sha256 + (base32 "0qhagdr26aqb9w7wnchcmk1j7ln28x3wbkkkm06b8h0mybksbj7q")))) + ("lib-lottie-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_lottie.git") + (commit "fb40f379d82ffa1fc7506e9a8dddcf48847715ae"))) + (file-name + (git-file-name "lib-lottie-for-telegram-desktop" version)) + (sha256 + (base32 "1vq0mqxcrrv7akcqk9cl4mm61zw6dcfmy8adl0pcp49kynm64saw")))) + ("lib-qr-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_qr.git") + (commit "92ce41a690a463eb462089a4eb1e51e019308018"))) + (file-name + (git-file-name "lib-qr-for-telegram-desktop" version)) + (sha256 + (base32 "182939nv7xs9b3bgah3gl5y9hx5r59mabd2jw3z6717vc96qi2pj")))) + ("lib-rlottie-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_rlottie.git") + (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) + (file-name + (git-file-name "lib-rlottie-for-telegram-desktop" version)) + (sha256 + (base32 "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) + ("lib-rpl-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_rpl.git") + (commit "e1b96399d9031c4ef0354631e6bb375029d29d9f"))) + (file-name + (git-file-name "lib-rpl-for-telegram-desktop" version)) + (sha256 + (base32 "1wvqazljd2kq1fxlj250jhjrig529499bym9p81dx33kh1l9dgss")))) + ("lib-spellcheck-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_spellcheck.git") + (commit "1b540b38ed78e9a3cba93e9ba4ce4525ab692277"))) + (file-name + (git-file-name "lib-spellcheck-for-telegram-desktop" version)) + (sha256 + (base32 "0a7042h5zrdvgs7v153ral2dh1zj84di5yjcmgcry5k4s1im9di7")))) + ("lib-storage-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_storage.git") + (commit "cbe51722b73cfa9ff27bd59294b08aa5ee33c936"))) + (file-name + (git-file-name "lib-storage-for-telegram-desktop" version)) + (sha256 + (base32 "045l5xsyagyz17gbhmmvl2miss4nb92p0dmza7yfs9pkg9gs0f87")))) + ("lib-tl-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_tl.git") + (commit "404c83d77e5edb8a39f8e9f56a6340960fe5070e"))) + (file-name + (git-file-name "lib-tl-for-telegram-desktop" version)) + (sha256 + (base32 "1k34nkvvcjqw5q81n1qmklid60cvzjk4lmn9qjimk437m6wbii7f")))) + ("lib-ui-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_ui.git") + (commit "1e2799245cf2720a329ecb5cf5644fded669cce6"))) + (file-name + (git-file-name "lib-ui-for-telegram-desktop" version)) + (sha256 + (base32 "0kd4njcvic2700f00qn25vn3b80vsd2flsm3pi2synnldkiy8lcw")))) + ("lib-webrtc-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_webrtc.git") + (commit "4bc51d6f6d5740159fdb51cb1593e80ce149ed4e"))) + (file-name + (git-file-name "lib-webrtc-for-telegram-desktop" version)) + (sha256 + (base32 "06hpyq4qglrj3cb1xg8ghlmzm9ra8f5n6vm7hcy67n2wk8sy4cal")))) + ("libdbusmenu-qt" ,libdbusmenu-qt) + ("libjpeg" ,libjpeg-turbo) + ("libtgvoip" ,libtgvoip-for-telegram-desktop) + ("lz4" ,lz4) + ("materialdecoration" ,materialdecoration) + ("minizip" ,minizip) + ("nimf" ,nimf) + ("openal" ,openal) + ("openssl" ,openssl) + ("opus" ,opus) + ("pulseaudio" ,pulseaudio) + ("qrcodegen" ,qrcodegen-cpp) + ("qt" ,qtbase) + ("qt5ct" ,qt5ct) + ("qtimageformats" ,qtimageformats) + ("qtwayland" ,qtwayland) + ("range-v3" ,range-v3) + ("rlottie" ,rlottie-for-telegram-desktop) + ("tgcalls-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/TelegramMessenger/tgcalls.git") + (commit "178983f72312ca8bd422bc73810fd63f1a89bd9d"))) + (file-name + (git-file-name "tgcalls-for-telegram-desktop" version)) + (sha256 + (base32 "1xad65c9m6mj6zdj08flafvh8xjkd7xi9r1agcyc64y69lr427d0")))) + ("webrtc" ,webrtc-for-telegram-desktop) + ("x11" ,libx11) + ("xcb" ,libxcb) + ("xcb-keysyms" ,xcb-util-keysyms) + ("xxhash" ,xxhash) + ("zlib" ,zlib))) + (propagated-inputs + `(("dconf" ,dconf))) + (synopsis "Telegram Desktop") + (description "Telegram desktop is the official desktop version of the +Telegram instant messager.") + (home-page "https://desktop.telegram.org/") + (license + (list + ;; ThirdParty + license:lgpl2.1+ + ;; Others + license:gpl3+)))) -- cgit v1.2.3 From 191ad9d3d1151fd756375ebd7a99fe9c510a0f82 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:00:56 +0100 Subject: gnu: rust-png-0.16: Update to 0.16.8. * gnu/packages/crates-graphics.scm (rust-png-0.16): Update to 0.16.8. --- gnu/packages/crates-graphics.scm | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 7fa2c08268..3140a721ff 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -1536,16 +1536,14 @@ interactive applications.") (define-public rust-png-0.16 (package (name "rust-png") - (version "0.16.6") + (version "0.16.8") (source - (origin - (method url-fetch) - (uri (crate-uri "png" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1393s3v3kg4bxnn86d7yn2vyz8xj6g64ighdfkc3vzpsg5sbyl61")))) + (origin + (method url-fetch) + (uri (crate-uri "png" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ipl44q3vy4kvx6j296vk7d4v8gvcg203lrkvvixwixq1j98fciw")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1553,19 +1551,11 @@ interactive applications.") (("rust-bitflags" ,rust-bitflags-1) ("rust-crc32fast" ,rust-crc32fast-1) ("rust-deflate" ,rust-deflate-0.8) - ("rust-miniz-oxide" ,rust-miniz-oxide-0.3)) - #:cargo-development-inputs - (("rust-criterion" ,rust-criterion-0.3) - ("rust-getopts" ,rust-getopts-0.2) - ;; TODO: glium has many cyclic dependencies with other packages - ;; ("rust-glium" ,rust-glium-0.24) - ("rust-glob" ,rust-glob-0.3) - ("rust-rand" ,rust-rand-0.7) - ("rust-term" ,rust-term-0.6)))) + ("rust-miniz-oxide" ,rust-miniz-oxide-0.3)))) (home-page "https://github.com/image-rs/image-png.git") (synopsis "PNG decoding and encoding library in pure Rust") (description - "PNG decoding and encoding library in pure Rust.") + "This package is a PNG decoding and encoding library in pure Rust.") (license (list license:expat license:asl2.0)))) (define-public rust-png-0.15 -- cgit v1.2.3 From 91d3daa67ac033fe76eb57f09f69babfde5bfc41 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:05:09 +0100 Subject: gnu: Add rust-dispatch-0.2. * gnu/packages/crates-io.scm (rust-dispatch-0.2): New variable. (rust-dispatch-0.1): Inherit from above. --- gnu/packages/crates-io.scm | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 978448ebd1..288f214504 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9687,27 +9687,41 @@ memory but not other memory. This package provides a discard trait which allows for intentionally leaking memory") (license license:expat))) -(define-public rust-dispatch-0.1 +(define-public rust-dispatch-0.2 (package (name "rust-dispatch") - (version "0.1.4") + (version "0.2.0") (source (origin (method url-fetch) (uri (crate-uri "dispatch" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "019nzy993hxaiazcdnayx3csv2iki34i535asw11ki96hakkrs84")))) + (base32 "0fwjr9b7582ic5689zxj8lf7zl94iklhlns3yivrnv8c9fxr635x")))) (build-system cargo-build-system) - (arguments '(#:tests? #f)) ; Tests only run on Mac. + (arguments `(#:skip-build? #t)) (home-page "https://github.com/SSheldon/rust-dispatch") (synopsis "Rust wrapper for Apple's Grand Central Dispatch") (description "This package provides a Rust wrapper for Apple's Grand Central Dispatch.") (license license:expat))) +(define-public rust-dispatch-0.1 + (package + (inherit rust-dispatch-0.2) + (name "rust-dispatch") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "dispatch" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "019nzy993hxaiazcdnayx3csv2iki34i535asw11ki96hakkrs84")))) + (arguments '(#:tests? #f)))) ; Tests only run on Mac. + (define-public rust-dissimilar-1.0 (package (name "rust-dissimilar") -- cgit v1.2.3 From 58b30a50a9029e297e19ccac072cc431ab21727f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:08:17 +0100 Subject: gnu: Add rust-core-graphics-0.21. * gnu/packages/crates-graphics.scm (rust-core-graphics-0.21): New variable. (rust-core-graphics-0.17): Inherit from above. --- gnu/packages/crates-graphics.scm | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 3140a721ff..5f1607ab61 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -350,8 +350,35 @@ for computer graphics.") (;("rust-glium" ,rust-glium-0.19) ("rust-serde-json" ,rust-serde-json-1)))))) +(define-public rust-core-graphics-0.21 + (package + (name "rust-core-graphics") + (version "0.21.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-graphics" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1i9gwzkil9k276317by0mi1pxz036h412dmcp1bzmlq4adj5anha")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-core-graphics-types" ,rust-core-graphics-types-0.1) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/servo/core-graphics-rs") + (synopsis "Bindings to Core Graphics for macOS") + (description + "This package provides bindings to Core Graphics for macOS.") + (license (list license:expat license:asl2.0)))) + (define-public rust-core-graphics-0.17 (package + (inherit rust-core-graphics-0.21) (name "rust-core-graphics") (version "0.17.3") (source @@ -363,19 +390,13 @@ for computer graphics.") (sha256 (base32 "1acm3vygngnilzlr6klym5ywh7kfzh2xxrh2l41152hwmdl0jyan")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t ; only for macOS #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-core-foundation" ,rust-core-foundation-0.6) ("rust-foreign-types" ,rust-foreign-types-0.3) - ("rust-libc" ,rust-libc-0.2)))) - (home-page "https://github.com/servo/core-graphics-rs") - (synopsis "Bindings to Core Graphics for macOS") - (description - "Bindings to Core Graphics for macOS.") - (license (list license:expat license:asl2.0)))) + ("rust-libc" ,rust-libc-0.2)))))) (define-public rust-core-video-sys-0.1 (package -- cgit v1.2.3 From feea5f4e61f0c2f982db446a2cb6bb91fb9379c7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:08:59 +0100 Subject: gnu: Add rust-cocoa-0.22. * gnu/packages/crates-io.scm (rust-cocoa-0.22): New variable. (rust-cocoa-0.19): Inherit from above. --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 288f214504..aaa77e2f6a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5993,8 +5993,36 @@ CMAKE environmental variable is set.") (license (list license:asl2.0 license:expat)))) +(define-public rust-cocoa-0.22 + (package + (name "rust-cocoa") + (version "0.22.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cocoa" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19qyyv01yzrm6aahn6cdxvb4jhl6v4fj0cgqkxmq38i7hq3dqzv6")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-block" ,rust-block-0.1) + ("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-core-graphics" ,rust-core-graphics-0.21) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-objc" ,rust-objc-0.2)))) + (home-page "https://github.com/servo/core-foundation-rs") + (synopsis "Bindings to Cocoa for macOS") + (description "This package provides bindings to Cocoa for macOS.") + (license (list license:expat license:asl2.0)))) + (define-public rust-cocoa-0.19 (package + (inherit rust-cocoa-0.22) (name "rust-cocoa") (version "0.19.1") (source @@ -6006,7 +6034,6 @@ CMAKE environmental variable is set.") (sha256 (base32 "0034vahbfv574q4b63rj241b8rnka5cjiqsqc6wiggnin9l7g7zj")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t ; only for macOS #:cargo-inputs @@ -6016,11 +6043,7 @@ CMAKE environmental variable is set.") ("rust-core-graphics" ,rust-core-graphics-0.17) ("rust-foreign-types" ,rust-foreign-types-0.3) ("rust-libc" ,rust-libc-0.2) - ("rust-objc" ,rust-objc-0.2)))) - (home-page "https://github.com/servo/core-foundation-rs") - (synopsis "Bindings to Cocoa for macOS") - (description "Bindings to Cocoa for macOS.") - (license (list license:expat license:asl2.0)))) + ("rust-objc" ,rust-objc-0.2)))))) (define-public rust-cocoa-0.18 (package -- cgit v1.2.3 From bd5f593edfa15ad2f9d6a10197faa82abba4ef93 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:10:52 +0100 Subject: gnu: Add rust-metal-0.18. * gnu/packages/crates-io.scm (rust-metal-0.18): New variable. (rust-metal-0.14): Inherit from above. --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aaa77e2f6a..ef05acb8ac 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19686,8 +19686,35 @@ based on Rustls and Ring.") (description "Run pkg-config from declarative dependencies in Cargo.toml.") (license (list license:expat license:asl2.0)))) +(define-public rust-metal-0.18 + (package + (name "rust-metal") + (version "0.18.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "metal" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "08n3kfv78jm3pf7fafwfv67n40lgcdg7w9lqn9g4sdvfwdk90vrf")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-block" ,rust-block-0.1) + ("rust-cocoa" ,rust-cocoa-0.22) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-objc" ,rust-objc-0.2)))) + (home-page "https://github.com/gfx-rs/metal-rs") + (synopsis "Rust bindings for Metal") + (description "This package provides Rust bindings for Metal.") + (license (list license:expat license:asl2.0)))) + (define-public rust-metal-0.14 (package + (inherit rust-metal-0.18) (name "rust-metal") (version "0.14.0") (source @@ -19699,7 +19726,6 @@ based on Rustls and Ring.") (sha256 (base32 "0my1xwlv562i80y3jbk0nygayi383j5skdwk48clb286b7922gyd")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -19715,11 +19741,7 @@ based on Rustls and Ring.") ("rust-objc-id" ,rust-objc-id-0.1)) #:cargo-development-inputs (("rust-sema" ,rust-sema-0.1) - ("rust-winit" ,rust-winit-0.19)))) ; 0.17? - (home-page "https://github.com/gfx-rs/metal-rs") - (synopsis "Rust bindings for Metal") - (description "Rust bindings for Metal.") - (license (list license:expat license:asl2.0)))) + ("rust-winit" ,rust-winit-0.19)))))) ; 0.17? (define-public rust-mimalloc-0.1 (package -- cgit v1.2.3 From dc7912ce77023624db8a7e523e9438e9c3d4f21a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:11:20 +0100 Subject: gnu: Add rust-core-graphics-0.19. * gnu/packages/crates-graphics.scm (rust-core-graphics-0.19): New variable. --- gnu/packages/crates-graphics.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 5f1607ab61..e9e8eff361 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -376,6 +376,26 @@ for computer graphics.") "This package provides bindings to Core Graphics for macOS.") (license (list license:expat license:asl2.0)))) +(define-public rust-core-graphics-0.19 + (package + (inherit rust-core-graphics-0.21) + (name "rust-core-graphics") + (version "0.19.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-graphics" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "08z9pgwfc0wb5v3ns7rnb2010q9g42b5vfwhp9fv4spawrs9725k")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-core-foundation" ,rust-core-foundation-0.7) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-libc" ,rust-libc-0.2)))))) + (define-public rust-core-graphics-0.17 (package (inherit rust-core-graphics-0.21) -- cgit v1.2.3 From bc5f82f73ce1181c9bd80f7a9eddb43354aacb7d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:11:46 +0100 Subject: gnu: rust-core-video-sys-0.1: Update to 0.1.4. * gnu/packages/crates-graphics.scm (rust-core-video-sys-0.1): Update to 0.1.4. --- gnu/packages/crates-graphics.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index e9e8eff361..707f63ac39 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -421,29 +421,29 @@ for computer graphics.") (define-public rust-core-video-sys-0.1 (package (name "rust-core-video-sys") - (version "0.1.3") + (version "0.1.4") (source (origin (method url-fetch) (uri (crate-uri "core-video-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1l59cg88482hkl95ssb30ac9x65hpbdsmxz9s5r6y222jlhnbh4d")))) + (base32 "0a1qbn50jrb5hxrfshyb7y0f3pbf4ily6i6nciv7bn8ac4isvv1l")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t ; only for macOS + `(#:skip-build? #t #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) - ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6) - ("rust-core-graphics" ,rust-core-graphics-0.17) + ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.7) + ("rust-core-graphics" ,rust-core-graphics-0.19) ("rust-libc" ,rust-libc-0.2) - ("rust-metal" ,rust-metal-0.14) + ("rust-metal" ,rust-metal-0.18) ("rust-objc" ,rust-objc-0.2)))) (home-page "https://github.com/luozijun/rust-core-video-sys") (synopsis "Bindings to CoreVideo.framework for macOS and iOS") - (description "Bindings to CoreVideo.framework for macOS and iOS.") + (description + "This package provides bindings to CoreVideo.framework for macOS +and iOS.") (license license:expat))) (define-public rust-dav1d-sys-0.3 -- cgit v1.2.3 From 9cef662c896c13b952c9b4bba8dcefd5750e71a0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:12:31 +0100 Subject: gnu: Add rust-winit-0.24. * gnu/packages/crates-graphics.scm (rust-winit-0.24): New variable. (rust-winit-0.20): Inherit from above. --- gnu/packages/crates-graphics.scm | 65 +++++++++++++++++++++++++++++++++++----- 1 file changed, 57 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 707f63ac39..d88e412b6d 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2228,8 +2228,64 @@ protocol extensions. Look at the crate wayland-client for usable bindings.") (base32 "0a0ndgkg98pvmkv44yya4f7mxzjaxylknqh64bpa05w0azyv02jj")))))) +(define-public rust-winit-0.24 + (package + (name "rust-winit") + (version "0.24.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "winit" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "15zmpx5ip6ziqhds7md1s0ri0blhxfa8fg1ylg84pf0frrpxlkns")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cocoa" ,rust-cocoa-0.24) + ("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-core-graphics" ,rust-core-graphics-0.22) + ("rust-core-video-sys" ,rust-core-video-sys-0.1) + ("rust-dispatch" ,rust-dispatch-0.2) + ("rust-instant" ,rust-instant-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-mio" ,rust-mio-0.6) + ("rust-mio-extras" ,rust-mio-extras-2) + ("rust-ndk" ,rust-ndk-0.2) + ("rust-ndk-glue" ,rust-ndk-glue-0.2) + ("rust-ndk-sys" ,rust-ndk-sys-0.2) + ("rust-objc" ,rust-objc-0.2) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-raw-window-handle" ,rust-raw-window-handle-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.12) + ("rust-stdweb" ,rust-stdweb-0.4) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-wayland-client" ,rust-wayland-client-0.28) + ("rust-web-sys" ,rust-web-sys-0.3) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-x11-dl" ,rust-x11-dl-2)))) + (home-page "https://github.com/rust-windowing/winit") + (synopsis "Window creation library") + (description + "Winit is a window creation and management library. It can create +windows and lets you handle events (for example: the window being +resized, a key being pressed, a mouse movement, etc.) produced by +window. + +Winit is designed to be a low-level brick in a hierarchy of libraries. +Consequently, in order to show something on the window you need to use +the platform-specific getters provided by winit, or another library.") + (license license:asl2.0))) + (define-public rust-winit-0.20 (package + (inherit rust-winit-0.24) (name "rust-winit") (version "0.20.0-alpha6") (source @@ -2250,7 +2306,6 @@ protocol extensions. Look at the crate wayland-client for usable bindings.") (sha256 (base32 "03q4bvdq86kii53d0vsywv08g8vqirf9h1lz2cl6rcc7gjfynpds"))))))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-android-glue" ,rust-android-glue-0.2) @@ -2280,13 +2335,7 @@ protocol extensions. Look at the crate wayland-client for usable bindings.") #:cargo-development-inputs (("rust-console-log" ,rust-console-log-0.1) ("rust-env-logger" ,rust-env-logger-0.5) - ("rust-image" ,rust-image-0.21)))) - (home-page "https://github.com/rust-windowing/winit") - (synopsis - "Cross-platform window creation library") - (description - "Cross-platform window creation library.") - (license license:asl2.0))) + ("rust-image" ,rust-image-0.21)))))) (define-public rust-winit-0.19 (package -- cgit v1.2.3 From 8ae5fb1321fb48281ddf8e3848327eff2a0cf622 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:13:19 +0100 Subject: gnu: Add rust-wayland-egl-0.28. * gnu/packages/crates-graphics.scm (rust-wayland-egl-0.28): New variable. --- gnu/packages/crates-graphics.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index d88e412b6d..a600332679 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2033,6 +2033,32 @@ the wayland protocol, client side.") (("rust-nix" ,rust-nix-0.14) ("rust-wayland-sys" ,rust-wayland-sys-0.21)))))) +(define-public rust-wayland-egl-0.28 + (package + (name "rust-wayland-egl") + (version "0.28.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-egl" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1xd7iap0x4sidmy9dv02cdnxjhnbk9li7r7f39x9cg0i8xs50ly6")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-wayland-client" ,rust-wayland-client-0.28) + ("rust-wayland-sys" ,rust-wayland-sys-0.28)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis "Bindings to libwayland-egl") + (description + "This crate provides bindings for OpenGL/Vulkan support for +Wayland client apps. It allows to create an EGLSurface from any +WlSurface, which can then play the role of the base surface for +initializing an OpenGL or Vulkan context.") + (license license:expat))) + (define-public rust-wayland-protocols-0.23 (package (name "rust-wayland-protocols") -- cgit v1.2.3 From 721a6d6f3689ff4654ef1b0f6cea41684f8433f0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:13:51 +0100 Subject: gnu: rust-glutin-wgl-sys-0.1: Update to 0.1.5. * gnu/packages/crates-graphics.scm (rust-glutin-wgl-sys-0.1): Update to 0.1.5. [arguments]: Skip build. --- gnu/packages/crates-graphics.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index a600332679..60b137cf14 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -927,23 +927,22 @@ and iOS.") (define-public rust-glutin-wgl-sys-0.1 (package (name "rust-glutin-wgl-sys") - (version "0.1.3") + (version "0.1.5") (source (origin (method url-fetch) - (uri (crate-uri "glutin-wgl-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (uri (crate-uri "glutin_wgl_sys" version)) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "08chlfzpj59q36qm212i4k879gvjzha7i90q90fds8pw3v4vn0gq")))) + (base32 "15hns8b3i7iy366m61dg7jlr7wgzz8z8cakgbj3apnv92ld9b99x")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-gl-generator" ,rust-gl-generator-0.11)))) + `(#:skip-build? #t + #:cargo-inputs + (("rust-gl-generator" ,rust-gl-generator-0.14)))) (home-page "https://github.com/tomaka/glutin") (synopsis "Wgl bindings for glutin") - (description "The wgl bindings for glutin.") + (description "This package provides wgl bindings for glutin.") (license license:asl2.0))) (define-public rust-image-0.23 -- cgit v1.2.3 From 48c2a30bbf2276555a77bc59aae01b19485b3a67 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:14:29 +0100 Subject: gnu: rust-glutin-glx-sys-0.1: Update to 0.1.7. * gnu/packages/crates-graphics.scm (rust-glutin-glx-sys-0.1): Update to 0.1.7. [arguments]: Skip build. --- gnu/packages/crates-graphics.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 60b137cf14..d5879a7046 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -904,24 +904,23 @@ and iOS.") (define-public rust-glutin-glx-sys-0.1 (package (name "rust-glutin-glx-sys") - (version "0.1.5") + (version "0.1.7") (source (origin (method url-fetch) - (uri (crate-uri "glutin-glx-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (uri (crate-uri "glutin_glx_sys" version)) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0mxs3mil68xqqb49466n5rpwpcllj6fwqjgrcrzzmz26bv5ab40j")))) + (base32 "0l8kk60kq5v6hl1qr6ym2arzvbsgkh71aa8485cp901bq27kqfby")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-x11-dl" ,rust-x11-dl-2) - ("rust-gl-generator" ,rust-gl-generator-0.11)))) + `(#:skip-build? #t + #:cargo-inputs + (("rust-gl-generator" ,rust-gl-generator-0.14) + ("rust-x11-dl" ,rust-x11-dl-2)))) (home-page "https://github.com/tomaka/glutin") (synopsis "Glx bindings for glutin") - (description "The glx bindings for glutin.") + (description "This package provides glx bindings for glutin.") (license license:asl2.0))) (define-public rust-glutin-wgl-sys-0.1 -- cgit v1.2.3 From 501d10937f5b72ca2e36020b57d2e9b89b8a218e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:14:58 +0100 Subject: gnu: rust-glutin-gles2-sys-0.1: Update to 0.1.5. * gnu/packages/crates-graphics.scm (rust-glutin-gles2-sys-0.1): Update to 0.1.5. [arguments]: Skip build. --- gnu/packages/crates-graphics.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index d5879a7046..c5c82a2edd 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -881,24 +881,23 @@ and iOS.") (define-public rust-glutin-gles2-sys-0.1 (package (name "rust-glutin-gles2-sys") - (version "0.1.3") + (version "0.1.5") (source (origin (method url-fetch) (uri (crate-uri "glutin_gles2_sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1pswvl5zyqmqwzjr674yzslj0al2xbqsp2ai9ggb9qbshlq6r6c9")))) + (base32 "00wisv3a7818bpw5nnqwibmh1bw032izix2l3657q2kkidq4w2g8")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-objc" ,rust-objc-0.2) - ("rust-gl-generator" ,rust-gl-generator-0.11)))) + `(#:skip-build? #t + #:cargo-inputs + (("rust-gl-generator" ,rust-gl-generator-0.14) + ("rust-objc" ,rust-objc-0.2)))) (home-page "https://github.com/tomaka/glutin") - (synopsis "The gles2 bindings for glutin") - (description "The gles2 bindings for glutin.") + (synopsis "Gles2 bindings for glutin") + (description "This package provides gles2 bindings for glutin.") (license license:asl2.0))) (define-public rust-glutin-glx-sys-0.1 -- cgit v1.2.3 From 2c13905d268866990164f6fd4522fdd8be1ada75 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:15:26 +0100 Subject: gnu: rust-glutin-emscripten-sys-0.1: Update to 0.1.1. * gnu/packages/crates-graphics.scm (rust-glutin-emscripten-sys-0.1): Update to 0.1.1. [arguments]: Skip build. --- gnu/packages/crates-graphics.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index c5c82a2edd..ca268b9460 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -862,20 +862,19 @@ and iOS.") (define-public rust-glutin-emscripten-sys-0.1 (package (name "rust-glutin-emscripten-sys") - (version "0.1.0") + (version "0.1.1") (source (origin (method url-fetch) (uri (crate-uri "glutin_emscripten_sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1ix0jmm8p5if4qarzdfl5mz9rbq4hhgqarakb3bzwvyz13dkynr4")))) + (base32 "1wb3qfxg3jh6ibb7bxmlmvf4jcpzck3pn0035g1sds3nvx343pl0")))) (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) (home-page "https://github.com/tomaka/glutin") (synopsis "Emscripten bindings for glutin") - (description "The emscripten bindings for glutin.") + (description "This package provides Emscripten bindings for glutin.") (license license:asl2.0))) (define-public rust-glutin-gles2-sys-0.1 -- cgit v1.2.3 From 0b00d063ca21b057f48aee18c6694aa2552ec094 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:47:33 +0100 Subject: gnu: Add rust-core-graphics-types-0.1. * gnu/packages/crates-graphics.scm (rust-core-graphics-types-0.1): New variable. --- gnu/packages/crates-graphics.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index ca268b9460..39e1ce78de 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -418,6 +418,32 @@ for computer graphics.") ("rust-foreign-types" ,rust-foreign-types-0.3) ("rust-libc" ,rust-libc-0.2)))))) +(define-public rust-core-graphics-types-0.1 + (package + (name "rust-core-graphics-types") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-graphics-types" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "12vqf0n5mjjcqjksdd82n2zh8hfda2zpiiqsr522c2266j5vcs1s")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/servo/core-foundation-rs") + (synopsis "Bindings for some fundamental Core Graphics types") + (description + "This package provides bindings for some fundamental Core Graphics +types.") + (license (list license:expat license:asl2.0)))) + (define-public rust-core-video-sys-0.1 (package (name "rust-core-video-sys") -- cgit v1.2.3 From bd879c649c99a4926f6d44949192ada537a56d65 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:48:43 +0100 Subject: gnu: Add rust-cocoa-foundation-0.1. * gnu/packages/crates-io.scm (rust-cocoa-foundation-0.1): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ef05acb8ac..0398a48e6f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6060,6 +6060,34 @@ CMAKE environmental variable is set.") (base32 "0m6fgdr4d2fp8jhkqvwr23hrqqqjv72g0j9vdgijc58k05j9j1hp")))))) +(define-public rust-cocoa-foundation-0.1 + (package + (name "rust-cocoa-foundation") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cocoa-foundation" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0633ipbd28z35rsdmsl505f1aasrjsrrnirs826aa32nbnv4kpks")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-block" ,rust-block-0.1) + ("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-core-graphics-types" ,rust-core-graphics-types-0.1) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-objc" ,rust-objc-0.2)))) + (home-page "https://github.com/servo/core-foundation-rs") + (synopsis "Bindings to Cocoa Foundation for macOS") + (description + "This package provides bindings to Cocoa Foundation for macOS.") + (license (list license:expat license:asl2.0)))) + (define-public rust-codespan-reporting-0.9 (package (name "rust-codespan-reporting") -- cgit v1.2.3 From 38dbe801c0c988bf5f7f772ca91d974496b56857 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:16:16 +0100 Subject: gnu: Add rust-cocoa-0.23. * gnu/packages/crates-io.scm (rust-cocoa-0.23): New variable. (rust-cocoa-0.22): Inherit from above. --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0398a48e6f..09596628f2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5993,25 +5993,26 @@ CMAKE environmental variable is set.") (license (list license:asl2.0 license:expat)))) -(define-public rust-cocoa-0.22 +(define-public rust-cocoa-0.23 (package (name "rust-cocoa") - (version "0.22.0") + (version "0.23.0") (source (origin (method url-fetch) (uri (crate-uri "cocoa" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "19qyyv01yzrm6aahn6cdxvb4jhl6v4fj0cgqkxmq38i7hq3dqzv6")))) + (base32 "1cj4c2axmg7aiid2786mpzj7wxpd582biv7c7yimqfnggp002hn5")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-block" ,rust-block-0.1) + ("rust-cocoa-foundation" ,rust-cocoa-foundation-0.1) ("rust-core-foundation" ,rust-core-foundation-0.9) - ("rust-core-graphics" ,rust-core-graphics-0.21) + ("rust-core-graphics" ,rust-core-graphics-0.22) ("rust-foreign-types" ,rust-foreign-types-0.3) ("rust-libc" ,rust-libc-0.2) ("rust-objc" ,rust-objc-0.2)))) @@ -6020,6 +6021,29 @@ CMAKE environmental variable is set.") (description "This package provides bindings to Cocoa for macOS.") (license (list license:expat license:asl2.0)))) +(define-public rust-cocoa-0.22 + (package + (inherit rust-cocoa-0.23) + (name "rust-cocoa") + (version "0.22.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cocoa" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19qyyv01yzrm6aahn6cdxvb4jhl6v4fj0cgqkxmq38i7hq3dqzv6")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-block" ,rust-block-0.1) + ("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-core-graphics" ,rust-core-graphics-0.21) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-objc" ,rust-objc-0.2)))))) + (define-public rust-cocoa-0.19 (package (inherit rust-cocoa-0.22) -- cgit v1.2.3 From 1d127ccba5ee17f031f69eac671ac6a652c16351 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:17:01 +0100 Subject: gnu: Add rust-glutin-0.26. * gnu/packages/crates-graphics.scm (rust-glutin-0.26): New variable. (rust-glutin-0.22): Inherit from above. --- gnu/packages/crates-graphics.scm | 49 +++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 39e1ce78de..bd39de863e 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -785,8 +785,48 @@ and iOS.") "Generated OpenGL bindings and wrapper for Servo.") (license (list license:asl2.0 license:expat)))) +(define-public rust-glutin-0.26 + (package + (name "rust-glutin") + (version "0.26.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "glutin" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "18szbh4dixcr7pmymvbrpv21hv0wrpii5w03rv2534bb2ywwpq8s")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-android-glue" ,rust-android-glue-0.2) + ("rust-cgl" ,rust-cgl-0.3) + ("rust-cocoa" ,rust-cocoa-0.23) + ("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-glutin-egl-sys" ,rust-glutin-egl-sys-0.1) + ("rust-glutin-emscripten-sys" ,rust-glutin-emscripten-sys-0.1) + ("rust-glutin-gles2-sys" ,rust-glutin-gles2-sys-0.1) + ("rust-glutin-glx-sys" ,rust-glutin-glx-sys-0.1) + ("rust-glutin-wgl-sys" ,rust-glutin-wgl-sys-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libloading" ,rust-libloading-0.6) + ("rust-log" ,rust-log-0.4) + ("rust-objc" ,rust-objc-0.2) + ("rust-osmesa-sys" ,rust-osmesa-sys-0.1) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-wayland-client" ,rust-wayland-client-0.28) + ("rust-wayland-egl" ,rust-wayland-egl-0.28) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-winit" ,rust-winit-0.24)))) + (home-page "https://github.com/tomaka/glutin") + (synopsis "Cross-platform OpenGL context provider") + (description "This package provides an OpenGL context provider.") + (license license:asl2.0))) + (define-public rust-glutin-0.22 (package + (inherit rust-glutin-0.26) (name "rust-glutin") (version "0.22.0-alpha5") (source @@ -798,7 +838,6 @@ and iOS.") (sha256 (base32 "0lilr4f335m1fq1acmshd51zblfaglw1hha6lhalnc1fw3cg0aag")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-android-glue" ,rust-android-glue-0.2) @@ -819,13 +858,7 @@ and iOS.") ("rust-parking-lot" ,rust-parking-lot-0.9) ("rust-wayland-client" ,rust-wayland-client-0.23) ("rust-winapi" ,rust-winapi-0.3) - ("rust-winit" ,rust-winit-0.20)))) - (home-page "https://github.com/tomaka/glutin") - (synopsis - "Cross-platform OpenGL context provider") - (description - "Cross-platform OpenGL context provider.") - (license license:asl2.0))) + ("rust-winit" ,rust-winit-0.20)))))) (define-public rust-glutin-0.21 (package -- cgit v1.2.3 From eb3e53568cba73a6764ea981205b20cb623564a2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:18:38 +0100 Subject: gnu: Add rust-servo-fontconfig-sys-5. * gnu/packages/crates-io.scm (rust-servo-fontconfig-sys-5): New variable. (rust-servo-fontconfig-sys-4): Inherit from above. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 09596628f2..7e7360b421 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31915,8 +31915,33 @@ functionality and without weak references.") (description "This package provides Rust bindings for fontconfig.") (license (list license:expat license:asl2.0)))) +(define-public rust-servo-fontconfig-sys-5 + (package + (name "rust-servo-fontconfig-sys") + (version "5.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "servo-fontconfig-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "125k4hydb4w08568rgazh95n6haxhf5c78axz50glbc9p6fqfsz3")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-expat-sys" ,rust-expat-sys-2) + ("rust-freetype-sys" ,rust-freetype-sys-0.13) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (home-page "https://crates.io/crates/servo-fontconfig-sys") + (synopsis "Rust wrapper around Fontconfig") + (description + "This package provides a Rust wrapper around Fontxonfig.") + (license license:expat))) + (define-public rust-servo-fontconfig-sys-4 (package + (inherit rust-servo-fontconfig-sys-5) (name "rust-servo-fontconfig-sys") (version "4.0.9") (source @@ -31934,7 +31959,6 @@ functionality and without weak references.") (for-each delete-file-recursively (find-files "." "[^Cargo.toml,^build\\.rs]")) #t)))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-expat-sys" ,rust-expat-sys-2) @@ -31943,12 +31967,7 @@ functionality and without weak references.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("fontconfig" ,fontconfig))) - (home-page "https://crates.io/crates/servo-fontconfig-sys") - (synopsis "Rust wrapper around Fontconfig") - (description - "This package provides a Rust wrapper around Fontxonfig.") - (license license:mpl2.0))) ; build.rs is mpl2.0 + `(("fontconfig" ,fontconfig))))) (define-public rust-servo-freetype-sys-4 (package -- cgit v1.2.3 From 5d533d92d2ce70b162070fc5ba61628afe8db41b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:19:43 +0100 Subject: gnu: Add rust-servo-fontconfig-0.5. * gnu/packages/crates-io.scm (rust-servo-fontconfig-0.5): New variable. (rust-servo-fontconfig-0.4): Inherit from above. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7e7360b421..86f2063a51 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31888,8 +31888,31 @@ functionality and without weak references.") (description "Serialising Rust tests") (license license:expat))) +(define-public rust-servo-fontconfig-0.5 + (package + (name "rust-servo-fontconfig") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "servo-fontconfig" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0z11bjndkp87dnqqmqww6raswgpy7sfh9ahdpx7d0wzxwlpy5qy7")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-servo-fontconfig-sys" ,rust-servo-fontconfig-sys-5)))) + (home-page "https://github.com/servo/rust-fontconfig/") + (synopsis "Rust bindings for fontconfig") + (description "This package provides Rust bindings for fontconfig.") + (license (list license:expat license:asl2.0)))) + (define-public rust-servo-fontconfig-0.4 (package + (inherit rust-servo-fontconfig-0.5) (name "rust-servo-fontconfig") (version "0.4.0") (source @@ -31901,7 +31924,6 @@ functionality and without weak references.") (sha256 (base32 "1nach6s4hdf86jz5hlm4p5r7vin91cs7gg89mr533id5fpbzi250")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) @@ -31909,11 +31931,7 @@ functionality and without weak references.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("fontconfig" ,fontconfig))) - (home-page "https://github.com/servo/rust-fontconfig/") - (synopsis "Rust bindings for fontconfig") - (description "This package provides Rust bindings for fontconfig.") - (license (list license:expat license:asl2.0)))) + `(("fontconfig" ,fontconfig))))) (define-public rust-servo-fontconfig-sys-5 (package -- cgit v1.2.3 From dc971011749029cc6c5763f637a25756efd8f75f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:20:31 +0100 Subject: gnu: Add rust-freetype-sys-0.13. * gnu/packages/crates-io.scm (rust-freetype-sys-0.13): New variable. (rust-freetype-sys-0.9): Inherit from above. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 86f2063a51..33f3f243d5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12314,8 +12314,33 @@ values to other threads.") (description "This package provides bindings for FreeType font library.") (license license:expat))) +(define-public rust-freetype-sys-0.13 + (package + (name "rust-freetype-sys") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "freetype-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "06kkds31s6b1i39dyanwmzbnic7laia1kk3gfvx8sqncq08l0zd3")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cmake" ,rust-cmake-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (home-page "https://github.com/PistonDevelopers/freetype-sys") + (synopsis "Low level binding for FreeType font library") + (description + "This package provides low level binding for FreeType font library.") + (license license:expat))) + (define-public rust-freetype-sys-0.9 (package + (inherit rust-freetype-sys-0.13) (name "rust-freetype-sys") (version "0.9.0") (source @@ -12327,7 +12352,6 @@ values to other threads.") (sha256 (base32 "1i309xc6gcsgdfiim3j5f0sk08imr4frlzfa185iaxqciysqgikx")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) @@ -12335,12 +12359,7 @@ values to other threads.") ("rust-pkg-config" ,rust-pkg-config-0.3)))) (inputs `(("freetype" ,freetype) - ("zlib" ,zlib))) - (home-page "https://github.com/PistonDevelopers/freetype-sys") - (synopsis "Low level binding for FreeType font library") - (description - "This package provides low level binding for FreeType font library.") - (license license:expat))) + ("zlib" ,zlib))))) (define-public rust-fs2-0.4 (package -- cgit v1.2.3 From 23ce3b904bdb65e356a8912150126dab0eb3dac1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:21:14 +0100 Subject: gnu: Add rust-freetype-rs-0.26. * gnu/packages/crates-io.scm (rust-freetype-rs-0.26): New variable. (rust-freetype-rs-0.23): Inherit from above. --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 33f3f243d5..de49a66cf9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12285,8 +12285,32 @@ values to other threads.") "Bindings for Freetype used by Servo.") (license (list license:asl2.0 license:expat)))) +(define-public rust-freetype-rs-0.26 + (package + (name "rust-freetype-rs") + (version "0.26.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "freetype-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1yzmbd73hlblbns0dqkcwfj54l97hx3yb0lqpda8rhm5s34xxskl")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-freetype-sys" ,rust-freetype-sys-0.13) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/PistonDevelopers/freetype-rs") + (synopsis "Bindings for FreeType font library") + (description "This package provides bindings for FreeType font library.") + (license license:expat))) + (define-public rust-freetype-rs-0.23 (package + (inherit rust-freetype-rs-0.26) (name "rust-freetype-rs") (version "0.23.0") (source @@ -12298,7 +12322,6 @@ values to other threads.") (sha256 (base32 "06yn6l44wad0h0i4nzs5jfq64zgf89xr01fy1w22i90j22ilnkmd")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) @@ -12308,11 +12331,7 @@ values to other threads.") (("rust-unicode-normalization" ,rust-unicode-normalization-0.1)))) (inputs `(("freetype" ,freetype) - ("zlib" ,zlib))) - (home-page "https://github.com/PistonDevelopers/freetype-rs") - (synopsis "Bindings for FreeType font library") - (description "This package provides bindings for FreeType font library.") - (license license:expat))) + ("zlib" ,zlib))))) (define-public rust-freetype-sys-0.13 (package -- cgit v1.2.3 From c9d502d6fb1a0a7a198af5d0e104983d3e4834d4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:22:42 +0100 Subject: gnu: Add rust-wio-0.2. * gnu/packages/crates-io.scm (rust-wio-0.2): 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 de49a66cf9..eecb9f51b9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41677,6 +41677,30 @@ API.") "A simple library wrapping a handful of useful winapi functions.") (license license:expat))) +(define-public rust-wio-0.2 + (package + (name "rust-wio") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "wio" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "199p404fp96w1f1c93bf1jrvaqwypxf3hmmldhww4jk4yhr9j4jx")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/retep998/wio-rs") + (synopsis "Windows IO wrapper") + (description + "Wio is a middle-level wrapper around various things in Windows API. It +is designed to be a very thin layer around Windows API to provide a safe Rusty +API but without hiding any functionality.") + (license (list license:expat license:asl2.0)))) + (define-public rust-ws2-32-sys-0.2 (package (name "rust-ws2-32-sys") -- cgit v1.2.3 From 1edd63b699a3dc894a8e86ca56511ac776e1b519 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:23:20 +0100 Subject: gnu: Add rust-dwrote-0.11. * gnu/packages/crates-io.scm (rust-dwrote-0.11): New variable. (rust-dwrote-0.9): Inherit from above. --- gnu/packages/crates-io.scm | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index eecb9f51b9..ec161e5e4b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10190,8 +10190,36 @@ floating-point primitives to an @code{io::Write}.") (description "Clone trait that is object-safe") (license (list license:expat license:asl2.0)))) +(define-public rust-dwrote-0.11 + (package + (name "rust-dwrote") + (version "0.11.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "dwrote" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0nx6d9ddqjv0gfi1if3zbsnc9sfj6qfm900jfgnx66k1llmir6j3")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-wio" ,rust-wio-0.2)))) + (home-page "https://github.com/servo/dwrote-rs") + (synopsis "Lightweight binding to DirectWrite") + (description + "This package provides lightweight binding to DirectWrite.") + (license license:mpl2.0))) + (define-public rust-dwrote-0.9 (package + (inherit rust-dwrote-0.11) (name "rust-dwrote") (version "0.9.0") (source @@ -10203,7 +10231,6 @@ floating-point primitives to an @code{io::Write}.") (sha256 (base32 "03gzl5pd90nlkmwqmbmjmyz47h7wlblbqrwv5a29npnv0ag3dl8b")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -10212,12 +10239,7 @@ floating-point primitives to an @code{io::Write}.") ("rust-serde" ,rust-serde-1) ("rust-serde-derive" ,rust-serde-derive-1) ;("rust-wio" ,rust-wio-0.2) - ("rust-winapi" ,rust-winapi-0.3)))) - (home-page "https://github.com/servo/dwrote-rs") - (synopsis "Lightweight binding to DirectWrite") - (description - "This package provides lightweight binding to DirectWrite.") - (license license:mpl2.0))) + ("rust-winapi" ,rust-winapi-0.3)))))) (define-public rust-easy-parallel-3 (package -- cgit v1.2.3 From 43c1952c978838f62b908fdbf4e304ad269eaeb6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:25:51 +0100 Subject: gnu: Add rust-core-text-19. * gnu/packages/crates-io.scm (rust-core-text-19): New variable. (rust-core-text-13): Inherit from above. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ec161e5e4b..5f216877d2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7099,8 +7099,33 @@ intrinsics.") #:cargo-inputs (("rust-libc" ,rust-libc-0.2)))))) +(define-public rust-core-text-19 + (package + (name "rust-core-text") + (version "19.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-text" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0q1sr55v8zq82y0dwnwwksz1radh515i0a45nbsda3w2idpg9iyj")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-core-graphics" ,rust-core-graphics-0.22) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/servo/core-foundation-rs") + (synopsis "Bindings to the Core Text framework") + (description "This package provides bindings to the Core Text framework.") + (license (list license:expat license:asl2.0)))) + (define-public rust-core-text-13 (package + (inherit rust-core-text-19) (name "rust-core-text") (version "13.3.2") (source @@ -7112,19 +7137,13 @@ intrinsics.") (sha256 (base32 "0v9lxn277p39cf81pb45r7k0lzf17pwgd5cpry1c04ajv556b16v")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t ; only for macOS #:cargo-inputs (("rust-core-foundation" ,rust-core-foundation-0.6) ("rust-core-graphics" ,rust-core-graphics-0.17) ("rust-foreign-types" ,rust-foreign-types-0.3) - ("rust-libc" ,rust-libc-0.2)))) - (home-page "https://github.com/servo/core-foundation-rs") - (synopsis "Bindings to the Core Text framework") - (description - "Bindings to the Core Text framework.") - (license (list license:expat license:asl2.0)))) + ("rust-libc" ,rust-libc-0.2)))))) (define-public rust-cpp-demangle-0.2 (package -- cgit v1.2.3 From af2e9b413d6d31f0e8ef2dcd36ab5996c19e9340 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:26:39 +0100 Subject: gnu: Add rust-crossfont-0.2. * gnu/packages/crates-io.scm (rust-crossfont-0.2): 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 5f216877d2..a9db6ec0e2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7800,6 +7800,41 @@ message passing.") #:cargo-development-inputs (("rust-rand" ,rust-rand-0.6)))))) +(define-public rust-crossfont-0.2 + (package + (name "rust-crossfont") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "crossfont" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "04p8k0yn19n2pdbiqzwkknakz9c7kdii0i2nf3s3p298ab7ld28h")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cocoa" ,rust-cocoa-0.24) + ("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8) + ("rust-core-graphics" ,rust-core-graphics-0.22) + ("rust-core-text" ,rust-core-text-19) + ("rust-dwrote" ,rust-dwrote-0.11) + ("rust-foreign-types" ,rust-foreign-types-0.5) + ("rust-freetype-rs" ,rust-freetype-rs-0.26) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-pkg-config" ,rust-pkg-config-0.3) + ("rust-servo-fontconfig" ,rust-servo-fontconfig-0.5) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/alacritty/crossfont") + (synopsis "Native font loading and rasterization") + (description + "Crossfont is a cross-platform Rust library for loading fonts and +rasterizing glyphs, using native font engines whenever possible.") + (license license:asl2.0))) + (define-public rust-crossterm-0.13 (package (name "rust-crossterm") -- cgit v1.2.3 From 330377cb2a6c4b1f093d8a43d89dc2bf30bc65f7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:27:17 +0100 Subject: gnu: Add rust-x11-clipboard-0.5. * gnu/packages/crates-graphics.scm (rust-x11-clipboard-0.5): New variable. (rust-x11-clipboard-0.4): Inherit from above. --- gnu/packages/crates-graphics.scm | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index bd39de863e..b4212bc299 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2476,8 +2476,30 @@ the platform-specific getters provided by winit, or another library.") (description "This crate provides X11 library bindings for Rust.") (license license:expat))) +(define-public rust-x11-clipboard-0.5 + (package + (name "rust-x11-clipboard") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "x11-clipboard" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17c5yxxhknrp7y9mc7mp85ra8q4jw12c174m9yzbfr1vs2pkgsg5")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-xcb" ,rust-xcb-0.9)))) + (home-page "https://github.com/quininer/x11-clipboard") + (synopsis "x11 clipboard support for Rust") + (description "This package provides x11 clipboard support for Rust.") + (license license:expat))) + (define-public rust-x11-clipboard-0.4 (package + (inherit rust-x11-clipboard-0.5) (name "rust-x11-clipboard") (version "0.4.0") (source @@ -2489,16 +2511,11 @@ the platform-specific getters provided by winit, or another library.") (sha256 (base32 "0nqdnswiyj28b1izjp5rzbc67cxpb5c8p4vh1xyndkirzs84vqqk")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; Tests require display server. #:cargo-inputs (("rust-xcb" ,rust-xcb-0.9)))) (native-inputs - `(("python" ,python))) - (home-page "https://github.com/quininer/x11-clipboard") - (synopsis "x11 clipboard support for Rust") - (description "This package provides x11 clipboard support for Rust.") - (license license:expat))) + `(("python" ,python))))) (define-public rust-x11-dl-2 (package -- cgit v1.2.3 From 06c16eed145a35dc37abb196f3279151207aaccf Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 30 Jan 2021 00:11:10 +0100 Subject: gnu: Add rust-wayland-commons-0.28. * gnu/packages/crates-graphics.scm (rust-wayland-commons-0.28): New variable. (rust-wayland-commons-0.23): Inherit from above. --- gnu/packages/crates-graphics.scm | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index b4212bc299..d27830c539 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2044,8 +2044,35 @@ the wayland protocol, client side.") (("rust-byteorder" ,rust-byteorder-1) ("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-wayland-commons-0.28 + (package + (name "rust-wayland-commons") + (version "0.28.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-commons" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0mid1sgy3bmiywnrhsr31b8w6zvk1ll2ci2as15ddv8pczvm0128")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-nix" ,rust-nix-0.18) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-wayland-sys" ,rust-wayland-sys-0.28)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis "Types and structures used by wayland-client and wayland-server") + (description + "This package provides common types and structures used by wayland-client +and wayland-server.") + (license license:expat))) + (define-public rust-wayland-commons-0.23 (package + (inherit rust-wayland-commons-0.28) (name "rust-wayland-commons") (version "0.23.6") (source @@ -2057,17 +2084,10 @@ the wayland protocol, client side.") (sha256 (base32 "1nyvcs6xxxzqgh0wvc7z0fgi89bf3h9p4qrbf77bnfbwlb8v0rmv")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-nix" ,rust-nix-0.14) - ("rust-wayland-sys" ,rust-wayland-sys-0.23)))) - (home-page "https://github.com/smithay/wayland-rs") - (synopsis - "Common types and structures used by wayland-client and wayland-server") - (description - "Common types and structures used by wayland-client and wayland-server.") - (license license:expat))) + ("rust-wayland-sys" ,rust-wayland-sys-0.23)))))) (define-public rust-wayland-commons-0.21 (package -- cgit v1.2.3 From 5a6c7b822457e1698954125df2d125af9cc17247 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:28:03 +0100 Subject: gnu: Add rust-wayland-server-0.28. * gnu/packages/crates-graphics.scm (rust-wayland-server-0.28): New variable. (rust-wayland-server-0.23): Inherit from above. --- gnu/packages/crates-graphics.scm | 44 ++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index d27830c539..9b3e7b7f94 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2228,8 +2228,42 @@ Look at the wayland-client crate for usable bindings.") (base32 "17mp49v7w0p0x5ry628lj2llljnwkr9aj9g4bqqhfibid32jhf5z")))))) +(define-public rust-wayland-server-0.28 + (package + (name "rust-wayland-server") + (version "0.28.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-server" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "09jfdjfqhjfcpiz4csgh60ymfkmz1cl3jmxyzq9hzcp0kyyxix93")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-downcast-rs" ,rust-downcast-rs-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-nix" ,rust-nix-0.18) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-scoped-tls" ,rust-scoped-tls-1) + ("rust-wayland-commons" ,rust-wayland-commons-0.28) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.28) + ("rust-wayland-sys" ,rust-wayland-sys-0.28)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis + "Bindings to the standard C implementation of the wayland protocol") + (description + "This package provides Rust bindings to the standard C implementation of +the wayland protocol, server side.") + (license license:expat))) + (define-public rust-wayland-server-0.23 (package + (inherit rust-wayland-server-0.28) (name "rust-wayland-server") (version "0.23.6") (source @@ -2241,7 +2275,6 @@ Look at the wayland-client crate for usable bindings.") (sha256 (base32 "1ccsalq6gnf07klnbjx2dxcbibhw03rqsgi578p913s3zsjlcg8a")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) @@ -2252,14 +2285,7 @@ Look at the wayland-client crate for usable bindings.") ("rust-nix" ,rust-nix-0.14) ("rust-wayland-commons" ,rust-wayland-commons-0.23) ("rust-wayland-sys" ,rust-wayland-sys-0.23) - ("rust-wayland-scanner" ,rust-wayland-scanner-0.23)))) - (home-page "https://github.com/smithay/wayland-rs") - (synopsis - "Bindings to the standard C implementation of the wayland protocol") - (description - "This package provides Rust bindings to the standard C implementation of -the wayland protocol, server side.") - (license license:expat))) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.23)))))) (define-public rust-wayland-server-0.21 (package -- cgit v1.2.3 From fa8fb91d9e44f2d4da20e9ad9ac44b983e5e5853 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:29:02 +0100 Subject: gnu: Add rust-wayland-protocols-0.28. * gnu/packages/crates-graphics.scm (rust-wayland-protocols-0.28): New variable. (rust-wayland-protocols-0.23): Inherit from above. --- gnu/packages/crates-graphics.scm | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 9b3e7b7f94..6b5df83ac4 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2134,8 +2134,36 @@ WlSurface, which can then play the role of the base surface for initializing an OpenGL or Vulkan context.") (license license:expat))) +(define-public rust-wayland-protocols-0.28 + (package + (name "rust-wayland-protocols") + (version "0.28.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-protocols" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0c0sw13qssrvf3jgygwqpiimpaagz3haxn9jridd4k85sfs856ii")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-wayland-client" ,rust-wayland-client-0.28) + ("rust-wayland-commons" ,rust-wayland-commons-0.28) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.28) + ("rust-wayland-server" ,rust-wayland-server-0.28)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis "Generated API for the officials Wayland protocol extensions") + (description + "This package provides a generated API for the officials Wayland protocol +extensions.") + (license license:expat))) + (define-public rust-wayland-protocols-0.23 (package + (inherit rust-wayland-protocols-0.28) (name "rust-wayland-protocols") (version "0.23.6") (source @@ -2147,20 +2175,13 @@ initializing an OpenGL or Vulkan context.") (sha256 (base32 "1ygwbzqlnks5xzafka3c8ag6k92g2h6ygj2xsmvjfx2n6rj8dhkc")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-wayland-client" ,rust-wayland-client-0.23) ("rust-wayland-commons" ,rust-wayland-commons-0.23) ("rust-wayland-server" ,rust-wayland-server-0.23) - ("rust-wayland-scanner" ,rust-wayland-scanner-0.23)))) - (home-page "https://github.com/smithay/wayland-rs") - (synopsis - "Generated API for the officials wayland protocol extensions") - (description - "Generated API for the officials wayland protocol extensions.") - (license license:expat))) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.23)))))) (define-public rust-wayland-protocols-0.21 (package -- cgit v1.2.3 From ebd3bf0b10a29907c88fcce2782f9a9cf263b905 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:29:33 +0100 Subject: gnu: Add rust-xcursor-0.3. * gnu/packages/crates-io.scm (rust-xcursor-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 a9db6ec0e2..548cd7d967 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41913,6 +41913,28 @@ extended attributes.") "This package provides Rust bindings and wrappers for XCB.") (license license:expat))) +(define-public rust-xcursor-0.3 + (package + (name "rust-xcursor") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "xcursor" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "022x7jm71dyqrxwsjkqfgj8bx57y7g8yyz318qb80y5ffhaj76is")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-nom" ,rust-nom-6)))) + (home-page "https://crates.io/crates/xcursor") + (synopsis "Library for loading XCursor themes") + (description + "This package provides a library for loading XCursor themes.") + (license license:expat))) + (define-public rust-xdg-2 (package (name "rust-xdg") -- cgit v1.2.3 From 224358df605e9b24324efd02ad38ebb2b2fa73a0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:30:01 +0100 Subject: gnu: Add rust-wayland-cursor-0.28. * gnu/packages/crates-graphics.scm (rust-wayland-cursor-0.28): New variable. --- gnu/packages/crates-graphics.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 6b5df83ac4..63e65a1d70 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2108,6 +2108,32 @@ and wayland-server.") (("rust-nix" ,rust-nix-0.14) ("rust-wayland-sys" ,rust-wayland-sys-0.21)))))) +(define-public rust-wayland-cursor-0.28 + (package + (name "rust-wayland-cursor") + (version "0.28.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-cursor" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0pvf96a9hg7b40vyvamcg491sa0006fr9bzf1xkaf8q22qn15syn")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-nix" ,rust-nix-0.18) + ("rust-wayland-client" ,rust-wayland-client-0.28) + ("rust-xcursor" ,rust-xcursor-0.3)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis "Bindings to libwayland-cursor") + (description + "This crate provides helpers to load the system provided cursor images +and load them into WlBuffers as well as obtain the necessary metadata to +properly display animated cursors.") + (license license:expat))) + (define-public rust-wayland-egl-0.28 (package (name "rust-wayland-egl") -- cgit v1.2.3 From ce42526ff40fb17be4611eb7abd12e996c26c3d7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:30:42 +0100 Subject: gnu: Add rust-wayland-scanner-0.28. * gnu/packages/crates-graphics.scm (rust-wayland-scanner-0.28): New variable. (rust-wayland-scanner-0.23): Inherit from above. --- gnu/packages/crates-graphics.scm | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 63e65a1d70..f43d83fc46 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2232,8 +2232,36 @@ extensions.") ("rust-wayland-sys" ,rust-wayland-sys-0.21) ("rust-wayland-scanner" ,rust-wayland-scanner-0.21)))))) +(define-public rust-wayland-scanner-0.28 + (package + (name "rust-wayland-scanner") + (version "0.28.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-scanner" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0g8ky63qk27in7zajycj3fyydsxlj19hanfcvr8d7z5kcxbvl43h")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-xml-rs" ,rust-xml-rs-0.8)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis "Generate Rust APIs from XML Wayland protocol files") + (description + "Wayland Scanner generates Rust APIs from XML Wayland protocol files. +It is intended for use with wayland-sys. You should only need this crate if +you are working on custom Wayland protocol extensions. Look at the +wayland-client crate for usable bindings.") + (license license:expat))) + (define-public rust-wayland-scanner-0.23 (package + (inherit rust-wayland-scanner-0.28) (name "rust-wayland-scanner") (version "0.23.6") (source @@ -2245,20 +2273,11 @@ extensions.") (sha256 (base32 "0g8wcphykjrcpslznyi3qccx1pckw97rckq5b295nfbg6r3j5c4k")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4) ("rust-quote" ,rust-quote-0.6) - ("rust-xml-rs" ,rust-xml-rs-0.8)))) - (home-page "https://github.com/smithay/wayland-rs") - (synopsis "Generate Rust APIs from XML Wayland protocol files") - (description - "Wayland Scanner generates Rust APIs from XML Wayland protocol files. -It is intended for use with wayland-sys. You should only need this crate if -you are working on custom Wayland protocol extensions. -Look at the wayland-client crate for usable bindings.") - (license license:expat))) + ("rust-xml-rs" ,rust-xml-rs-0.8)))))) (define-public rust-wayland-scanner-0.21 (package -- cgit v1.2.3 From 318c2db0c9648a6cade1343913f416ba2d7eda3f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:31:30 +0100 Subject: gnu: Add rust-wayland-sys-0.28. * gnu/packages/crates-graphics.scm (rust-wayland-sys-0.28): New variable. (rust-wayland-sys-0.23): Inherit from above. --- gnu/packages/crates-graphics.scm | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index f43d83fc46..9f48489e38 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2379,8 +2379,37 @@ the wayland protocol, server side.") ("rust-wayland-sys" ,rust-wayland-sys-0.21) ("rust-wayland-scanner" ,rust-wayland-scanner-0.21)))))) +(define-public rust-wayland-sys-0.28 + (package + (name "rust-wayland-sys") + (version "0.28.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "16f03jsy7q6p2wpaazc4w4kycyyk0fz7lacpdbcizl9m1i7874v7")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-dlib" ,rust-dlib-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis "FFI bindings to the various @file{libwayland-*.so} libraries") + (description + "This package provides FFI bindings to the various +@file{libwayland-*.so} libraries. You should only need this crate if +you are working on custom Wayland protocol extensions. Look at the +crate @code{rust-wayland-client} for usable bindings.") + (license license:expat))) + (define-public rust-wayland-sys-0.23 (package + (inherit rust-wayland-sys-0.28) (name "rust-wayland-sys") (version "0.23.6") (source @@ -2392,19 +2421,11 @@ the wayland protocol, server side.") (sha256 (base32 "1x2qafvj8hd2x5qfaan2dfpw9amg0f5g9sqrkdy7qvbddsl8jknr")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-dlib" ,rust-dlib-0.4) ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-libc" ,rust-libc-0.2)))) - (home-page "https://github.com/smithay/wayland-rs") - (synopsis "FFI bindings to the various libwayland-*.so libraries") - (description - "FFI bindings to the various libwayland-*.so libraries. -You should only need this crate if you are working on custom wayland -protocol extensions. Look at the crate wayland-client for usable bindings.") - (license license:expat))) + ("rust-libc" ,rust-libc-0.2)))))) (define-public rust-wayland-sys-0.21 (package -- cgit v1.2.3 From b3de00f574be95397698887d7fcbdf11a77e6d01 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:33:59 +0100 Subject: gnu: Add rust-wayland-client-0.28. * gnu/packages/crates-graphics.scm (rust-wayland-client-0.28): New variable. (rust-wayland-client-0.23): Inherit from above. --- gnu/packages/crates-graphics.scm | 42 +++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 9f48489e38..d2893ca6ca 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -1979,8 +1979,40 @@ first-class Rust objects.") ("rust-num-derive" ,rust-num-derive-0.2) ("rust-num-traits" ,rust-num-traits-0.2)))))) +(define-public rust-wayland-client-0.28 + (package + (name "rust-wayland-client") + (version "0.28.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-client" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1mxnflzv9s3qpcp0z7kqvrzki5bknfar9n9yky06f8ivs00vxgdx")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-downcast-rs" ,rust-downcast-rs-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-nix" ,rust-nix-0.18) + ("rust-scoped-tls" ,rust-scoped-tls-1) + ("rust-wayland-commons" ,rust-wayland-commons-0.28) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.28) + ("rust-wayland-sys" ,rust-wayland-sys-0.28)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis + "Rust bindings to the standard C implementation of the wayland protocol") + (description + "This package provides Rust bindings to the standard C implementation of +the wayland protocol, client side.") + (license license:expat))) + (define-public rust-wayland-client-0.23 (package + (inherit rust-wayland-client-0.28) (name "rust-wayland-client") (version "0.23.6") (source @@ -1992,7 +2024,6 @@ first-class Rust objects.") (sha256 (base32 "1nmw2kz70llc5mxwzg6bglnqy0qnyr9224zjmq9czazgw3mq045g")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) @@ -2006,14 +2037,7 @@ first-class Rust objects.") ("rust-wayland-scanner" ,rust-wayland-scanner-0.23)) #:cargo-development-inputs (("rust-byteorder" ,rust-byteorder-1) - ("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://github.com/smithay/wayland-rs") - (synopsis - "Rust bindings to the standard C implementation of the wayland protocol") - (description - "This package provides Rust bindings to the standard C implementation of -the wayland protocol, client side.") - (license license:expat))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-wayland-client-0.21 (package -- cgit v1.2.3 From cf8c49f7c4b53b5a2960e4188aaac878773888de Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:37:47 +0100 Subject: gnu: Add rust-memmap2-0.1. * gnu/packages/crates-io.scm (rust-memmap2-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 548cd7d967..c83bdffe54 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19656,6 +19656,27 @@ file IO.") #:cargo-development-inputs (("rust-tempdir" ,rust-tempdir-0.3)))))) +(define-public rust-memmap2-0.1 + (package + (name "rust-memmap2") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "memmap2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0nmymqy9q62x577ydja0ysfyir7h5qa0n5fwcnvchfhhlsi0rdyr")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/RazrFalcon/memmap2-rs") + (synopsis "Cross-platform Rust API for memory-mapped file IO") + (description "This package provides a Rust API for memory-mapped file IO.") + (license (list license:expat license:asl2.0)))) + (define-public rust-memoffset-0.6 (package (name "rust-memoffset") -- cgit v1.2.3 From 347b54181c08186f1ff1cfe2aa768c0d4a0618cd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:38:25 +0100 Subject: gnu: Add rust-calloop-0.6. * gnu/packages/crates-io.scm (rust-calloop-0.6): New variable. (rust-calloop-0.4): Inherit from above. --- gnu/packages/crates-io.scm | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c83bdffe54..421bd89334 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5062,8 +5062,31 @@ cached data.") directories and @code{CACHEDIR.TAG} files.") (license (list license:expat license:asl2.0)))) +(define-public rust-calloop-0.6 + (package + (name "rust-calloop") + (version "0.6.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "calloop" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0z3jlsv3g28097dhsmi2l8nzkd3p937jhb4pg52njhb0wxkn20qb")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-log" ,rust-log-0.4) + ("rust-nix" ,rust-nix-0.18)))) + (home-page "https://github.com/Smithay/calloop") + (synopsis "Callback-based event loop") + (description "This package provides a callback-based event loop.") + (license license:expat))) + (define-public rust-calloop-0.4 (package + (inherit rust-calloop-0.6) (name "rust-calloop") (version "0.4.4") (source @@ -5081,19 +5104,13 @@ directories and @code{CACHEDIR.TAG} files.") (substitute* "Cargo.toml" (("=1.0.0") "^1.0.0")) #t)))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-mio" ,rust-mio-0.6) ("rust-mio-extras" ,rust-mio-extras-2) ("rust-nix" ,rust-nix-0.14)) #:cargo-development-inputs - (("rust-lazycell" ,rust-lazycell-1)))) - (home-page "https://github.com/Smithay/calloop") - (synopsis "Callback-based event loop") - (description - "This package provides a callback-based event loop") - (license license:expat))) + (("rust-lazycell" ,rust-lazycell-1)))))) (define-public rust-capnp-0.13 (package -- cgit v1.2.3 From d21bf67b6fc539026e1b17946be94ace84b10fcd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:39:30 +0100 Subject: gnu: Add rust-ttf-parser-0.6. * gnu/packages/crates-io.scm (rust-ttf-parser-0.6): 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 421bd89334..5f08b83e0c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38998,6 +38998,26 @@ extension for the Trust-DNS client to use rustls for TLS.") "Test harness for ui tests of compiler diagnostics.") (license (list license:expat license:asl2.0)))) +(define-public rust-ttf-parser-0.6 + (package + (name "rust-ttf-parser") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "ttf-parser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1p4z969pwd5adayy3ijq94iiak42yfxz8hk5wnkdsirymgbpqp9y")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/RazrFalcon/ttf-parser") + (synopsis "High-level, safe, zero-allocation TrueType font parser") + (description + "This package provides a high-level, safe, zero-allocation TrueType font +parser.") + (license (list license:expat license:asl2.0)))) + (define-public rust-tuikit-0.2 (package (name "rust-tuikit") -- cgit v1.2.3 From 2c551e714da972376253d0004f88c7d055beb903 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:40:02 +0100 Subject: gnu: Add rust-owned-ttf-parser-0.6. * gnu/packages/crates-io.scm (rust-owned-ttf-parser-0.6): 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 5f08b83e0c..13b661f677 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -23176,6 +23176,28 @@ under its new name.") "Utility to activate escape codes in Windows' CMD and PowerShell.") (license license:expat))) +(define-public rust-owned-ttf-parser-0.6 + (package + (name "rust-owned-ttf-parser") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "owned_ttf_parser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1qydjksjcllf0pnm0jkjvbg4n52wfcwv59dl5b06cqn40sw3z4lz")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-ttf-parser" ,rust-ttf-parser-0.6)))) + (home-page "https://github.com/alexheretic/owned-ttf-parser") + (synopsis "TTF-parser plus support for owned data") + (description + "This package provides a TTF-parser plus support for owned data.") + (license license:asl2.0))) + (define-public rust-owning-ref-0.4 (package (name "rust-owning-ref") -- cgit v1.2.3 From 7c7664700780f570c43f149a31b985f875d61acb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:40:37 +0100 Subject: gnu: Add rust-ab-glyph-rasterizer-0.1. * gnu/packages/crates-io.scm (rust-ab-glyph-rasterizer-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 13b661f677..3eb1511e23 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -65,6 +65,29 @@ ;;; Please: Try to add new module packages in alphabetic order. ;;; +(define-public rust-ab-glyph-rasterizer-0.1 + (package + (name "rust-ab-glyph-rasterizer") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "ab_glyph_rasterizer" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zzz78231w849xslz9s0pwjj6gp02wfbbxdpysqhwwq1vqr5xznr")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libm" ,rust-libm-0.2)))) + (home-page "https://github.com/alexheretic/ab-glyph") + (synopsis "Coverage rasterization for lines, quadratic & cubic beziers") + (description + "This package provides coverage rasterization for lines, quadratic and +cubic beziers.") + (license license:asl2.0))) + (define-public rust-abomonation-0.7 (package (name "rust-abomonation") -- cgit v1.2.3 From ce345eddbdd63b6e92d661320b3d6a82dbafe076 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:41:17 +0100 Subject: gnu: Add rust-rusttype-0.9. * gnu/packages/crates-io.scm (rust-rusttype-0.9): New variable. (rust-rusttype-0.8): Inherit from above. --- gnu/packages/crates-io.scm | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3eb1511e23..34870e9870 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -29928,8 +29928,41 @@ native certificate store.") (license (list license:asl2.0 license:isc license:expat)))) +(define-public rust-rusttype-0.9 + (package + (name "rust-rusttype") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "rusttype" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ngcwn7d2dybjrylga3gpxm3k3mcw3m405hcp32iignhvrx74z6w")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-ab-glyph-rasterizer" ,rust-ab-glyph-rasterizer-0.1) + ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) + ("rust-libm" ,rust-libm-0.2) + ("rust-linked-hash-map" ,rust-linked-hash-map-0.5) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-owned-ttf-parser" ,rust-owned-ttf-parser-0.6) + ("rust-rustc-hash" ,rust-rustc-hash-1)))) + (home-page "https://gitlab.redox-os.org/redox-os/rusttype") + (synopsis "Pure Rust alternative to libraries like FreeType") + (description + "This package provides a pure Rust alternative to libraries like FreeType. +RustType provides an API for loading, querying and rasterising TrueType fonts. +It also provides an implementation of a dynamic GPU glyph cache for hardware +font rendering.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rusttype-0.8 (package + (inherit rust-rusttype-0.9) (name "rust-rusttype") (version "0.8.2") (source @@ -29941,7 +29974,6 @@ native certificate store.") (sha256 (base32 "12hwfg85iii7sbgsyyr23yw862dzp7f8zwn9xv5iqydm5w1i3a8l")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; Artifacts for tests not included. #:cargo-inputs @@ -29954,15 +29986,7 @@ native certificate store.") ("rust-num-cpus" ,rust-num-cpus-1) ("rust-ordered-float" ,rust-ordered-float-1.0) ("rust-rustc-hash" ,rust-rustc-hash-1) - ("rust-stb-truetype" ,rust-stb-truetype-0.3)))) - (home-page "https://gitlab.redox-os.org/redox-os/rusttype") - (synopsis "Pure Rust alternative to libraries like FreeType") - (description - "This package provides a pure Rust alternative to libraries like FreeType. -RustType provides an API for loading, querying and rasterising TrueType fonts. -It also provides an implementation of a dynamic GPU glyph cache for hardware -font rendering.") - (license (list license:expat license:asl2.0)))) + ("rust-stb-truetype" ,rust-stb-truetype-0.3)))))) (define-public rust-rusttype-0.7 (package -- cgit v1.2.3 From 23416785e0a4d57a89e6cc6b98d2bc69b660ad29 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:42:05 +0100 Subject: gnu: Add rust-andrew-0.3. * gnu/packages/crates-graphics.scm (rust-andrew-0.3): New variable. (rust-andrew-0.2): Inherit from above. --- gnu/packages/crates-graphics.scm | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index d2893ca6ca..6541918416 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -42,8 +42,36 @@ ;;; ;;; Please: Try to add new module packages in alphabetic order. +(define-public rust-andrew-0.3 + (package + (name "rust-andrew") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "andrew" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1kx79z6mh7wwp4pz683bdya54h7w7wpzjcwf834fwbv4vl4znjlc")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-rusttype" ,rust-rusttype-0.9) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-xdg" ,rust-xdg-2) + ("rust-xml-rs" ,rust-xml-rs-0.8)))) + (home-page "https://github.com/trimental/andrew") + (synopsis "Provides convenient drawing of objects to buffers") + (description + "The @code{andrew} crate provides convenient drawing of objects such as +shapes, lines and text to buffers.") + (license license:expat))) + (define-public rust-andrew-0.2 (package + (inherit rust-andrew-0.3) (name "rust-andrew") (version "0.2.1") (source @@ -55,7 +83,6 @@ (sha256 (base32 "0pmklwcwy8g1jras46fz8xcny779zfqpg4riksrbdhkjk3w0jzwv")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) @@ -67,13 +94,7 @@ #:cargo-development-inputs (("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.4)))) (inputs - `(("wayland" ,wayland))) - (home-page "https://github.com/trimental/andrew") - (synopsis "Provides convenient drawing of objects to buffers") - (description - "The @code{andrew} crate provides convenient drawing of objects such as -shapes, lines and text to buffers.") - (license license:expat))) + `(("wayland" ,wayland))))) (define-public rust-ansi-colours-1 (package -- cgit v1.2.3 From d958b8d9bec88f1476c4053922ededbce5a799d4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:43:01 +0100 Subject: gnu: Add rust-smithay-client-toolkit-0.12. * gnu/packages/crates-graphics.scm (rust-smithay-client-toolkit-0.12): New variable. (rust-smithay-client-toolkit-0.6): Inherit from above. --- gnu/packages/crates-graphics.scm | 41 +++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 6541918416..8fb94cbe44 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -1835,8 +1835,41 @@ implements standard Rust traits to make `RGB`/`RGBA` pixels and slices first-class Rust objects.") (license license:expat))) +(define-public rust-smithay-client-toolkit-0.12 + (package + (name "rust-smithay-client-toolkit") + (version "0.12.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "smithay-client-toolkit" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1rjdszpf8pns99gyy8f5axf01ckc33f30dddfazyfg45xfii6vii")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-andrew" ,rust-andrew-0.3) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-calloop" ,rust-calloop-0.6) + ("rust-dlib" ,rust-dlib-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-memmap2" ,rust-memmap2-0.1) + ("rust-nix" ,rust-nix-0.18) + ("rust-wayland-client" ,rust-wayland-client-0.28) + ("rust-wayland-cursor" ,rust-wayland-cursor-0.28) + ("rust-wayland-protocols" ,rust-wayland-protocols-0.28)))) + (home-page "https://github.com/smithay/client-toolkit") + (synopsis "Toolkit for making client Wayland applications") + (description + "This package provides a toolkit for making client Wayland applications.") + (license license:expat))) + (define-public rust-smithay-client-toolkit-0.6 (package + (inherit rust-smithay-client-toolkit-0.12) (name "rust-smithay-client-toolkit") (version "0.6.4") (source @@ -1848,7 +1881,6 @@ first-class Rust objects.") (sha256 (base32 "0m20687zs36l6xak2s5k9s7qp78ly8xfjpbmrhacp7whfn4hx5lk")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-andrew" ,rust-andrew-0.2) @@ -1862,12 +1894,7 @@ first-class Rust objects.") #:cargo-development-inputs (("rust-byteorder" ,rust-byteorder-1) ("rust-image" ,rust-image-0.21) - ("rust-wayland-client" ,rust-wayland-client-0.23)))) - (home-page "https://github.com/smithay/client-toolkit") - (synopsis "Toolkit for making client wayland applications") - (description - "Toolkit for making client wayland applications.") - (license license:expat))) + ("rust-wayland-client" ,rust-wayland-client-0.23)))))) (define-public rust-smithay-client-toolkit-0.4 (package -- cgit v1.2.3 From 48792feff92a78aea960af7083b5c4a20cf09675 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:43:49 +0100 Subject: gnu: Add rust-smithay-clipboard-0.6. * gnu/packages/crates-graphics.scm (rust-smithay-clipboard-0.6): New variable. (rust-smithay-clipboard-0.3): Inherit from above. --- gnu/packages/crates-graphics.scm | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 8fb94cbe44..e213253889 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -1926,8 +1926,33 @@ first-class Rust objects.") ("rust-image" ,rust-image-0.20) ("rust-wayland-client" ,rust-wayland-client-0.21)))))) +(define-public rust-smithay-clipboard-0.6 + (package + (name "rust-smithay-clipboard") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "smithay-clipboard" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "14dwisd56cbr80zf719l3fh0n8pm1fjmvry9lsbhdbccf8cv525b")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.12) + ("rust-wayland-client" ,rust-wayland-client-0.28)))) + (home-page "https://github.com/smithay/smithay-clipboard") + (synopsis "Access to the Wayland clipboard for client applications") + (description + "This package provides access to the Wayland clipboard for client +applications.") + (license license:expat))) + (define-public rust-smithay-clipboard-0.3 (package + (inherit rust-smithay-clipboard-0.6) (name "rust-smithay-clipboard") (version "0.3.6") (source @@ -1939,7 +1964,6 @@ first-class Rust objects.") (sha256 (base32 "1h7qhcx44cgwncgpn5llky0c56vgsg9mqrkybb2z37vsxxia4rwn")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-nix" ,rust-nix-0.14) @@ -1947,13 +1971,7 @@ first-class Rust objects.") #:cargo-development-inputs (("rust-andrew" ,rust-andrew-0.2)))) (inputs - `(("wayland" ,wayland))) - (home-page "https://github.com/smithay/smithay-clipboard") - (synopsis - "Provides access to the wayland clipboard for client applications") - (description - "This package provides access to the wayland clipboard for client applications.") - (license license:expat))) + `(("wayland" ,wayland))))) (define-public rust-tiff-0.5 (package -- cgit v1.2.3 From b619e9ba570e3a6ef971a74a6d57e18f4898c740 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:44:28 +0100 Subject: gnu: Add rust-lazy-bytes-cast-5. * gnu/packages/crates-io.scm (rust-lazy-bytes-cast-5): 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 34870e9870..d2ff7b0c39 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17620,6 +17620,25 @@ generated by LALRPOP.") (sha256 (base32 "0z4bjn3g9232n1im5p6mn9mwlvw5aj5iac6hbjmljqxkhf3d2xy2")))))) +(define-public rust-lazy-bytes-cast-5 + (package + (name "rust-lazy-bytes-cast") + (version "5.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "lazy-bytes-cast" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0sr0dy1jfg7bjwm9js4hk0ngl0cmgparq2idv1m1bkc9y2cp898h")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/DoumanAsh/lazy-bytes-cast") + (synopsis "Lazy casts from and to byte arrays") + (description + "This crate provides simple methods to cast from and into byte arrays.") + (license license:boost1.0))) + (define-public rust-lazy-static-1.4 (package (name "rust-lazy-static") -- cgit v1.2.3 From ecd46aeafc325b3d98b9fc44a655824a050bab3f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:45:13 +0100 Subject: gnu: Add rust-clipboard-win-3. * gnu/packages/crates-io.scm (rust-clipboard-win-3): New variable. (rust-clipboard-win-2.1): Inherit from above. --- gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d2ff7b0c39..dae719f335 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5866,8 +5866,32 @@ Command Line Argument Parser.") colorization.") (license license:expat))) +(define-public rust-clipboard-win-3 + (package + (name "rust-clipboard-win") + (version "3.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "clipboard-win" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hh3npqfa1lfn62fwvkmjlpfnizq343a994b898ffsvb100mxpwz")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-lazy-bytes-cast" ,rust-lazy-bytes-cast-5) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/DoumanAsh/clipboard-win") + (synopsis "Simple way to interact with Windows clipboard") + (description + "This package provides simple way to interact with Windows clipboard.") + (license license:expat))) + (define-public rust-clipboard-win-2.1 (package + (inherit rust-clipboard-win-3) (name "rust-clipboard-win") (version "2.1.2") (source @@ -5879,15 +5903,9 @@ colorization.") (sha256 (base32 "0431sg4jhabrqf2dliiwhbx9hinb9z4qfcm6914lm5mb17ya5798")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; Tests are for Windows. - #:cargo-inputs (("rust-winapi" ,rust-winapi-0.3)))) - (home-page "https://github.com/DoumanAsh/clipboard-win") - (synopsis "Interact with Windows clipboard") - (description - "This package provides simple way to interact with Windows clipboard.") - (license license:expat))) + #:cargo-inputs (("rust-winapi" ,rust-winapi-0.3)))))) (define-public rust-clippy-0.0 (package -- cgit v1.2.3 From 36e8952f086b694654e3015cc7cd5a3ecdf43c1f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:46:02 +0100 Subject: gnu: Add rust-copypasta-0.7. * gnu/packages/crates-io.scm (rust-copypasta-0.7): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dae719f335..287e2afb04 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6874,6 +6874,34 @@ Split from the user_agent crate.") the standard library.") (license (list license:expat license:asl2.0)))) +(define-public rust-copypasta-0.7 + (package + (name "rust-copypasta") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "copypasta" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "02zz6yndszmzr5yjhn11g1hsj0232jbzl8gch6mxksw3xngxf8s4")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-clipboard-win" ,rust-clipboard-win-3) + ("rust-objc" ,rust-objc-0.2) + ("rust-objc-foundation" ,rust-objc-foundation-0.1) + ("rust-objc-id" ,rust-objc-id-0.1) + ("rust-smithay-clipboard" ,rust-smithay-clipboard-0.6) + ("rust-x11-clipboard" ,rust-x11-clipboard-0.5)))) + (home-page "https://github.com/alacritty/copypasta") + (synopsis "Get and set the contents of the OS-level clipboard") + (description + "Copypasta is a cross-platform library for getting and setting the +contents of the OS-level clipboard.") + (license (list license:expat license:asl2.0)))) + (define-public rust-cordic-0.1 (package (name "rust-cordic") -- cgit v1.2.3 From d7d8fe36f938d035a7607f6ae2b3525fbba6f966 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:46:38 +0100 Subject: gnu: Add rust-core-graphics-0.22. * gnu/packages/crates-graphics.scm (rust-core-graphics-0.22): New variable. (rust-core-graphics-0.21): Inherit from above. --- gnu/packages/crates-graphics.scm | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index e213253889..4846fc3e20 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -371,17 +371,17 @@ for computer graphics.") (;("rust-glium" ,rust-glium-0.19) ("rust-serde-json" ,rust-serde-json-1)))))) -(define-public rust-core-graphics-0.21 +(define-public rust-core-graphics-0.22 (package (name "rust-core-graphics") - (version "0.21.1") + (version "0.22.2") (source (origin (method url-fetch) (uri (crate-uri "core-graphics" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1i9gwzkil9k276317by0mi1pxz036h412dmcp1bzmlq4adj5anha")))) + (base32 "11lx6xw8nc9fpd552g60qa0cxh0maah8j2m26vkq0aslkgv3b7r6")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -397,6 +397,27 @@ for computer graphics.") "This package provides bindings to Core Graphics for macOS.") (license (list license:expat license:asl2.0)))) +(define-public rust-core-graphics-0.21 + (package + (inherit rust-core-graphics-0.22) + (name "rust-core-graphics") + (version "0.21.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-graphics" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1i9gwzkil9k276317by0mi1pxz036h412dmcp1bzmlq4adj5anha")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-core-graphics-types" ,rust-core-graphics-types-0.1) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-libc" ,rust-libc-0.2)))))) + (define-public rust-core-graphics-0.19 (package (inherit rust-core-graphics-0.21) -- cgit v1.2.3 From dd94c3d34008a29a1e05bdc43bb81ef9378f2613 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:52:37 +0100 Subject: gnu: Add rust-cocoa-0.24. * gnu/packages/crates-io.scm (rust-cocoa-0.24): New variable. (rust-cocoa-0.23): Inherit from above. --- gnu/packages/crates-io.scm | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 287e2afb04..ade627857b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6051,17 +6051,17 @@ CMAKE environmental variable is set.") (license (list license:asl2.0 license:expat)))) -(define-public rust-cocoa-0.23 +(define-public rust-cocoa-0.24 (package (name "rust-cocoa") - (version "0.23.0") + (version "0.24.0") (source (origin (method url-fetch) (uri (crate-uri "cocoa" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1cj4c2axmg7aiid2786mpzj7wxpd582biv7c7yimqfnggp002hn5")))) + (base32 "0cp8hsajmi7gini22bmlsf9dac7cap7x1k169vxhwlr3j8p90qvg")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -6079,6 +6079,30 @@ CMAKE environmental variable is set.") (description "This package provides bindings to Cocoa for macOS.") (license (list license:expat license:asl2.0)))) +(define-public rust-cocoa-0.23 + (package + (inherit rust-cocoa-0.24) + (name "rust-cocoa") + (version "0.23.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cocoa" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1cj4c2axmg7aiid2786mpzj7wxpd582biv7c7yimqfnggp002hn5")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-block" ,rust-block-0.1) + ("rust-cocoa-foundation" ,rust-cocoa-foundation-0.1) + ("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-core-graphics" ,rust-core-graphics-0.22) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-objc" ,rust-objc-0.2)))))) + (define-public rust-cocoa-0.22 (package (inherit rust-cocoa-0.23) -- cgit v1.2.3 From 0c4aa2c9cd6d1d111ff43bdb3003c11407fd7ffe Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:53:27 +0100 Subject: gnu: Add rust-vte-generate-state-changes-0.1. * gnu/packages/crates-io.scm (rust-vte-generate-state-changes-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 ade627857b..637c03bede 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40687,6 +40687,29 @@ updated when the crate version changes.") "This package provides a parser for implementing terminal emulators.") (license (list license:asl2.0 license:expat)))) +(define-public rust-vte-generate-state-changes-0.1 + (package + (name "rust-vte-generate-state-changes") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "vte_generate_state_changes" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zs5q766q7jmc80c5c80gpzy4qpg5lnydf94mgdzrpy7h5q82myj")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1)))) + (home-page "https://github.com/jwilm/vte") + (synopsis "Proc macro for generating VTE state changes") + (description + "This package provides a proc macro for generating VTE state changes.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-wait-timeout-0.2 (package (name "rust-wait-timeout") -- cgit v1.2.3 From d8bfc899cefc5dac12a02ef2d02dbfa75b8dfcf9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:54:04 +0100 Subject: gnu: Add rust-vte-0.10. * gnu/packages/crates-io.scm (rust-vte-0.10): New variable. (rust-vte-0.3): Inherit from above. --- gnu/packages/crates-io.scm | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 637c03bede..2421e82ef4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40663,8 +40663,34 @@ updated when the crate version changes.") "This package provides a pure FFI to Jon Blow's VS discovery script.") (license license:expat))) +(define-public rust-vte-0.10 + (package + (name "rust-vte") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "vte" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1mnjw3f071xbvapdgdf8mcdglw60dadcc5hhvz5zpljm53nmzwid")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-arrayvec" ,rust-arrayvec-0.5) + ("rust-utf8parse" ,rust-utf8parse-0.2) + ("rust-vte-generate-state-changes" + ,rust-vte-generate-state-changes-0.1)))) + (home-page "https://github.com/jwilm/vte") + (synopsis "Parser for implementing terminal emulators") + (description + "This package provides a parser for implementing terminal emulators.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-vte-0.3 (package + (inherit rust-vte-0.10) (name "rust-vte") (version "0.3.3") (source @@ -40676,16 +40702,10 @@ updated when the crate version changes.") (sha256 (base32 "1kz8svnqnxclllsgh0ck20rplw3qzp46b5v30yscnzrgw8vgahjg")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; tests not included in release #:cargo-inputs - (("rust-utf8parse" ,rust-utf8parse-0.1)))) - (home-page "https://github.com/jwilm/vte") - (synopsis "Parser for implementing terminal emulators") - (description - "This package provides a parser for implementing terminal emulators.") - (license (list license:asl2.0 license:expat)))) + (("rust-utf8parse" ,rust-utf8parse-0.1)))))) (define-public rust-vte-generate-state-changes-0.1 (package -- cgit v1.2.3 From 6ee85bc499cd16e685433fd3a18a499a0f69d4fd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:55:34 +0100 Subject: gnu: Add rust-alacritty-config-derive-0.1. * gnu/packages/crates-io.scm (rust-alacritty-config-derive-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 2421e82ef4..24413bbcaf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1196,6 +1196,30 @@ using AES-NI for high performance.") ("rust-rand" ,rust-rand-0.3) ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)))))) +(define-public rust-alacritty-config-derive-0.1 + (package + (name "rust-alacritty-config-derive") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "alacritty_config_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0dn3cg233jyi06xz8q1vfgjikdpcjdid36kqnl0yawdqpm2lq13p")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/alacritty/alacritty") + (synopsis "Failure resistant deserialization derive") + (description + "This package provides a failure resistant deserialization derive.") + (license (list license:expat license:asl2.0)))) + (define-public rust-alga-0.9 (package (name "rust-alga") -- cgit v1.2.3 From 63ef731ebd83388a4babe9623af7d1ece715e09a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:55:54 +0100 Subject: gnu: Add rust-alacritty-terminal-0.12. * gnu/packages/crates-io.scm (rust-alacritty-terminal-0.12): 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 24413bbcaf..f58072a8ac 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1220,6 +1220,46 @@ using AES-NI for high performance.") "This package provides a failure resistant deserialization derive.") (license (list license:expat license:asl2.0)))) +(define-public rust-alacritty-terminal-0.12 + (package + (name "rust-alacritty-terminal") + (version "0.12.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "alacritty_terminal" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1q7sm7rm5yny4lka8w4vji2v2crkkbwj3y8l5qnq01qlwmkjmkfd")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.1) + ("rust-base64" ,rust-base64-0.12) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-dirs" ,rust-dirs-2) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-mio" ,rust-mio-0.6) + ("rust-mio-anonymous-pipes" ,rust-mio-anonymous-pipes-0.1) + ("rust-mio-extras" ,rust-mio-extras-2) + ("rust-miow" ,rust-miow-0.3) + ("rust-nix" ,rust-nix-0.18) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-regex-automata" ,rust-regex-automata-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-yaml" ,rust-serde-yaml-0.8) + ("rust-signal-hook" ,rust-signal-hook-0.1) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-vte" ,rust-vte-0.10) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/alacritty/alacritty") + (synopsis "Library for writing terminal emulators") + (description + "This package provides a library for writing terminal emulators.") + (license license:asl2.0))) + (define-public rust-alga-0.9 (package (name "rust-alga") -- cgit v1.2.3 From a45d8cffff26bd0177da7779bfd248e3e7f062d2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 30 Jan 2021 22:10:54 +0100 Subject: gnu: rust-libloading-0.6: Do not enable unstable features. * gnu/packages/crates-io.scm (rust-libloading-0.6)[origin]: Remove snippet. The snippet would make alacritty build fail. --- gnu/packages/crates-io.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f58072a8ac..dbf8c9d888 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18176,18 +18176,11 @@ library.") (uri (crate-uri "libloading" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1ygliqa518jjxwa5ih4b2f8m984ib596vxmjb28pa5lb8zqdhhr4")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Enable unstable features - (substitute* "src/lib.rs" - (("//! A memory" all) - (string-append "#![feature(non_exhaustive)]\n" all))))))) + (base32 "1ygliqa518jjxwa5ih4b2f8m984ib596vxmjb28pa5lb8zqdhhr4")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:skip-build? #true + #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-winapi" ,rust-winapi-0.3)) #:cargo-development-inputs -- cgit v1.2.3 From 3e10f0eef0fb8b99f5220653b6564693365491b1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 30 Jan 2021 18:41:30 +0100 Subject: gnu: alacritty: Update to 0.7.1. * gnu/packages/terminals.scm (alacritty): Update to 0.7.1. [origin]: Remove snippet. [arguments]: Remove failing test. Remove unneeded phase and some replacements. --- gnu/packages/terminals.scm | 188 +++++++++++++-------------------------------- 1 file changed, 54 insertions(+), 134 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 8230b39b8c..f1364c9024 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1206,142 +1206,71 @@ made by suckless.") (define-public alacritty (package (name "alacritty") - (version "0.4.1") + (version "0.7.1") (source (origin + ;; XXX: The crate at "crates.io" has limited contents. In particular, + ;; it does not contain "extra" directory with completions, icon, etc. (method git-fetch) (uri (git-reference (url "https://github.com/jwilm/alacritty") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "05jcg33ifngpzw2hdhgb614j87ihhhlqgar0kky183rywg0dxikg")) - (modules '((guix build utils))) - (snippet - ;; Don't use a custom location for winit-0.20-alpha6. - '(begin (substitute* "Cargo.toml" - (("winit .*") "")) - #t)))) + (base32 "1b9hy3ya72hhpl8nkayc7dy4f97xp75np48dm5na5pgyv8b45agi")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-clap" ,rust-clap-2) + `(#:cargo-test-flags '("--release" "--" "--skip=config_read_eof") + #:cargo-inputs + (("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.1) + ("rust-alacritty-terminal" ,rust-alacritty-terminal-0.12) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-clap" ,rust-clap-2) + ("rust-cocoa" ,rust-cocoa-0.24) + ("rust-copypasta" ,rust-copypasta-0.7) + ("rust-crossfont" ,rust-crossfont-0.2) + ("rust-dirs" ,rust-dirs-2) + ("rust-embed-resource" ,rust-embed-resource-1) + ("rust-fnv" ,rust-fnv-1) + ("rust-gl-generator" ,rust-gl-generator-0.14) + ;; XXX: Adjust `add-absolute-library-references' phase when updating + ;; glutin input. + ("rust-glutin" ,rust-glutin-0.26) + ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) - ("rust-time" ,rust-time-0.1) - ("rust-env-logger" ,rust-env-logger-0.7) + ("rust-notify" ,rust-notify-4) + ("rust-objc" ,rust-objc-0.2) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-png" ,rust-png-0.16) + ("rust-raw-window-handle" ,rust-raw-window-handle-0.3) ("rust-serde" ,rust-serde-1) - ("rust-serde-yaml" ,rust-serde-yaml-0.8) ("rust-serde-json" ,rust-serde-json-1) - ("rust-glutin" ,rust-glutin-0.22) ; adjust 'patch-glutin-libgl-path as needed - ("rust-notify" ,rust-notify-4) - ("rust-libc" ,rust-libc-0.2) + ("rust-serde-yaml" ,rust-serde-yaml-0.8) + ("rust-time" ,rust-time-0.1) ("rust-unicode-width" ,rust-unicode-width-0.1) - ("rust-parking-lot" ,rust-parking-lot-0.9) ("rust-urlocator" ,rust-urlocator-0.1) - ("rust-xdg" ,rust-xdg-2) - ("rust-image" ,rust-image-0.22) - ("rust-dirs" ,rust-dirs-2) - ("rust-x11-dl" ,rust-x11-dl-2) + ("rust-wayland-client" ,rust-wayland-client-0.28) ("rust-winapi" ,rust-winapi-0.3) - ("rust-base64" ,rust-base64-0.11) - ("rust-bigflags" ,rust-bitflags-1) - ("rust-fnv" ,rust-fnv-1) - ("rust-mio" ,rust-mio-0.6) - ("rust-mio-extras" ,rust-mio-extras-2) - ("rust-terminfo" ,rust-terminfo-0.6) - ("rust-url" ,rust-url-2) - ("rust-vte" ,rust-vte-0.3) - ("rust-nix" ,rust-nix-0.15) - ("rust-miow" ,rust-miow-0.3) - ("rust-mio-anonymous-pipes" ,rust-mio-anonymous-pipes-0.1) - ("rust-mio-named-pipes" ,rust-mio-named-pipes-0.1) - ("rust-signal-hook" ,rust-signal-hook-0.1) - ("rust-clipboard-win" ,rust-clipboard-win-2.1) - ("rust-objc" ,rust-objc-0.2) - ("rust-objc-id" ,rust-objc-id-0.1) - ("rust-objc-foundation" ,rust-objc-foundation-0.1) - ("rust-x11-clipboard" ,rust-x11-clipboard-0.4) - ("rust-smithay-clipboard" ,rust-smithay-clipboard-0.3) - ("rust-wayland-client" ,rust-wayland-client-0.23) - ("rust-euclid" ,rust-euclid-0.20) - ("rust-foreign-types" ,rust-foreign-types-0.5) - ("rust-servo-fontconfig" ,rust-servo-fontconfig-0.4) - ("rust-freetype-rs" ,rust-freetype-rs-0.23) - ("rust-core-foundation" ,rust-core-foundation-0.6) - ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6) - ("rust-core-text" ,rust-core-text-13) - ("rust-core-graphics" ,rust-core-graphics-0.17) - ("rust-dwrote" ,rust-dwrote-0.9) - ("rust-winpty-sys" ,rust-winpty-sys-0.4)) - #:cargo-development-inputs - (("rust-rustc-tools-util" ,rust-rustc-tools-util-0.2) - ("rust-gl-generator" ,rust-gl-generator-0.14) - ("rust-andrew" ,rust-andrew-0.2) - ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.6) - ("rust-embed-resource" ,rust-embed-resource-1) - ("rust-http-req" ,rust-http-req-0.5) - ("rust-zip" ,rust-zip-0.5) - ("rust-tempfile" ,rust-tempfile-3) - ("rust-named-pipe" ,rust-named-pipe-0.4) - ("rust-winapi" ,rust-winapi-0.3)) + ("rust-x11-dl" ,rust-x11-dl-2) + ("rust-xdg" ,rust-xdg-2)) #:phases (modify-phases %standard-phases (add-after 'configure 'add-absolute-library-references (lambda* (#:key inputs cargo-inputs vendor-dir #:allow-other-keys) - (let* ((glutin-name ,(package-name rust-glutin-0.22)) - (glutin-version ,(package-version rust-glutin-0.22)) + (let* ((glutin-name ,(package-name rust-glutin-0.26)) + (glutin-version ,(package-version rust-glutin-0.26)) (glutin-api (string-append glutin-name "-" glutin-version ".tar.gz/src/api/")) - (smithay-client-toolkit-name - ,(package-name rust-smithay-client-toolkit-0.6)) - (smithay-client-toolkit-version - ,(package-version rust-smithay-client-toolkit-0.6)) - (smithay-client-toolkit-src - (string-append smithay-client-toolkit-name "-" - smithay-client-toolkit-version ".tar.gz/src")) - (wayland-sys-name ,(package-name rust-wayland-sys-0.23)) - (wayland-sys-version ,(package-version rust-wayland-sys-0.23)) - (wayland-sys-src (string-append wayland-sys-name "-" - wayland-sys-version - ".tar.gz/src")) - (libxkbcommon (assoc-ref inputs "libxkbcommon")) - (libwayland (assoc-ref inputs "wayland")) (mesa (assoc-ref inputs "mesa"))) - (substitute* (string-append vendor-dir "/" glutin-api "glx/mod.rs") - (("libGL.so") (string-append mesa "/lib/libGL.so"))) - (substitute* (string-append vendor-dir "/" glutin-api "egl/mod.rs") - (("libEGL.so") (string-append mesa "/lib/libEGL.so"))) - (substitute* (string-append vendor-dir "/" - smithay-client-toolkit-src - "/keyboard/ffi.rs") - (("libxkbcommon\\.so") - (string-append libxkbcommon "/lib/libxkbcommon.so"))) - (substitute* (string-append vendor-dir "/" wayland-sys-src - "/server.rs") - (("libwayland-server\\.so") - (string-append libwayland "/lib/libwayland-server.so"))) - (substitute* (string-append vendor-dir "/" wayland-sys-src - "/cursor.rs") - (("libwayland-cursor\\.so") - (string-append libwayland "/lib/libwayland-cursor.so"))) - (substitute* (string-append vendor-dir "/" wayland-sys-src - "/egl.rs") - (("libwayland-egl\\.so") - (string-append libwayland "/lib/libwayland-egl.so"))) - (substitute* (string-append vendor-dir "/" wayland-sys-src - "/client.rs") - (("libwayland-client\\.so") - (string-append libwayland "/lib/libwayland-client.so"))) - #t))) - (add-after 'configure 'remove-alacritty-vendor - (lambda* (#:key vendor-dir #:allow-other-keys) - ;; We don't want Alacritty to be a dependency of itself - ;; If we don't delete it from guix-vendor then build will fail - ;; because Alacritty has a virtual workspace Cargo.toml. - (delete-file-recursively - (string-append vendor-dir "/alacritty-" ,version ".tar.xz")) - #t)) + (substitute* + (string-append vendor-dir "/" glutin-api "glx/mod.rs") + (("libGL.so") (string-append mesa "/lib/libGL.so"))) + (substitute* + (string-append vendor-dir "/" glutin-api "egl/mod.rs") + (("libEGL.so") (string-append mesa "/lib/libEGL.so"))) + #t))) (replace 'install + ;; Upstream install script only takes care of executable. (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) @@ -1350,24 +1279,19 @@ made by suckless.") (tic (string-append (assoc-ref inputs "ncurses") "/bin/tic")) (man (string-append share "/man/man1")) (alacritty-bin "target/release/alacritty")) - ;; Install the executable. (install-file alacritty-bin bin) - ;; Install man pages. (mkdir-p man) (copy-file "extra/alacritty.man" (string-append man "/alacritty.1")) - ;; Install desktop file. - (install-file "extra/linux/alacritty.desktop" + (install-file "extra/linux/Alacritty.desktop" (string-append share "/applications")) - - ;; Install icon + ;; Install icon. (mkdir-p icons) (copy-file "extra/logo/alacritty-term.svg" (string-append icons "/Alacritty.svg")) - ;; Install terminfo. (mkdir-p (string-append share "/terminfo")) ;; We don't compile alacritty-common entry because @@ -1375,18 +1299,19 @@ made by suckless.") (invoke tic "-x" "-e" "alacritty,alacritty-direct" "-o" (string-append share "/terminfo/") "extra/alacritty.info") - ;; Install completions. - (install-file - "extra/completions/alacritty.bash" - (string-append out "/etc/bash_completion.d")) - (install-file - "extra/completions/_alacritty" - (string-append share "/zsh/site-functions")) - (install-file - "extra/completions/alacritty.fish" - (string-append share "/fish/vendor_completions.d")) + (install-file "extra/completions/alacritty.bash" + (string-append out "/etc/bash_completion.d")) + (install-file "extra/completions/_alacritty" + (string-append share "/zsh/site-functions")) + (install-file "extra/completions/alacritty.fish" + (string-append share "/fish/vendor_completions.d")) #t)))))) + (native-inputs + `(("cmake" ,cmake) + ("ncurses" ,ncurses) + ("pkg-config" ,pkg-config) + ("python3" ,python))) (inputs `(("expat" ,expat) ("fontconfig" ,fontconfig) @@ -1400,11 +1325,6 @@ made by suckless.") ("libxxf86vm" ,libxxf86vm) ("wayland" ,wayland) ("mesa" ,mesa))) - (native-inputs - `(("cmake" ,cmake) - ("ncurses" ,ncurses) - ("pkg-config" ,pkg-config) - ("python3" ,python))) (native-search-paths ;; FIXME: This should only be located in 'ncurses'. Nonetheless it is ;; provided for usability reasons. See . -- cgit v1.2.3 From e11055f0125a902fe091394480dd4206c687a98c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 30 Jan 2021 11:08:26 +0000 Subject: gnu: sbcl-cl-online-learning: Update to 0.5-1.87fbef8. * gnu/packages/lisp-xyz.scm (sbcl-cl-online-learning): Update to 0.5-1.87fbef8. [arguments]: Add 'test-asd-file' and 'asd-systems' parameters. Activate tests. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 83a406c038..abdde1eaf2 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10424,8 +10424,8 @@ format.") (sbcl-package->ecl-package sbcl-cl-libsvm-format)) (define-public sbcl-cl-online-learning - (let ((commit "fc7a34f4f161cd1c7dd747d2ed8f698947781423") - (revision "0")) + (let ((commit "87fbef8a340219e853adb3a5bf44a0470da76964") + (revision "1")) (package (name "sbcl-cl-online-learning") (version (git-version "0.5" revision commit)) @@ -10435,10 +10435,10 @@ format.") (uri (git-reference (url "https://github.com/masatoi/cl-online-learning") (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "cl-online-learning" version)) (sha256 (base32 - "14x95rlg80ay5hv645ki57pqvy12v28hz4k1w0f6bsfi2rmpxchq")))) + "1lfq04lnxivx59nq5dd02glyqsqzf3vdn4s9b8wnaln5fs8g2ph9")))) (build-system asdf-build-system/sbcl) (native-inputs `(("prove" ,sbcl-prove))) @@ -10446,13 +10446,14 @@ format.") `(("cl-libsvm-format" ,sbcl-cl-libsvm-format) ("cl-store" ,sbcl-cl-store))) (arguments - `(;; FIXME: Tests pass but then the check phase crashes - #:tests? #f)) + `(#:test-asd-file "cl-online-learning-test.asd" + #:asd-systems '("cl-online-learning-test" + "cl-online-learning"))) + (home-page "https://github.com/masatoi/cl-online-learning") (synopsis "Online Machine Learning for Common Lisp") (description "This library contains a collection of machine learning algorithms for online linear classification written in Common Lisp.") - (home-page "https://github.com/masatoi/cl-online-learning") (license license:expat)))) (define-public cl-online-learning -- cgit v1.2.3 From e05a36a823261c5d779bf0818804ccdf30693590 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 30 Jan 2021 23:36:46 +0000 Subject: gnu: sbcl-puri: Update to 1.5.7-2.4bbab89. * gnu/packages/lisp-xyz.scm (sbcl-puri): Update to 1.5.7-2.4bbab89. [home-page]: Fix URL. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index abdde1eaf2..8011b59c50 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2408,8 +2408,8 @@ tester module.") (sbcl-package->ecl-package sbcl-ptester)) (define-public sbcl-puri - (let ((commit "ef5afb9e5286c8e952d4344f019c1a636a717b97") - (revision "1")) + (let ((commit "4bbab89d9ccbb26346899d1f496c97604fec567b") + (revision "2")) (package (name "sbcl-puri") (version (git-version "1.5.7" revision commit)) @@ -2419,13 +2419,13 @@ tester module.") (uri (git-reference (url "http://git.kpe.io/puri.git") (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "puri" version)) (sha256 - (base32 "1vm25pdl92laj72p5vyd538kf3cjy2655z6bdc99h20ana2p231s")))) + (base32 "0gq2rsr0aihs0z20v4zqvmdl4szq53b52rh97pvnmwrlbn4mapmd")))) (build-system asdf-build-system/sbcl) (native-inputs `(("ptester" ,sbcl-ptester))) - (home-page "http://quickdocs.org/puri/") + (home-page "http://puri.kpe.io/") (synopsis "Portable URI Library") (description "This is a portable Universal Resource Identifier library for Common -- cgit v1.2.3 From f7174a2889130328e586cda15cf74d29aa74795c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 31 Jan 2021 01:39:25 +0000 Subject: gnu: Add cl-piping. * gnu/packages/lisp-xyz.scm (cl-piping, ecl-piping, sbcl-piping): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 8011b59c50..8f57a89446 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1323,6 +1323,34 @@ and macros, primarily for software projects written in CL by the author.") (define-public ecl-jpl-util (sbcl-package->ecl-package sbcl-jpl-util)) +(define-public sbcl-piping + (let ((commit "c7a4163c00dea7e72bf6ad33d6abac0d5826a656") + (revision "1")) + (package + (name "sbcl-piping") + (version (git-version "2.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/piping/") + (commit commit))) + (file-name (git-file-name "piping" version)) + (sha256 + (base32 "0in84qnfkynm36d4n4d6v87vprpi27xrydnga462wfhplji6klv5")))) + (build-system asdf-build-system/sbcl) + (home-page "https://shinmera.github.io/piping/") + (synopsis "Library to enable simple message pipelines") + (description + "This is a Common Lisp library to enable simple message pipelines.") + (license license:zlib)))) + +(define-public ecl-piping + (sbcl-package->ecl-package sbcl-piping)) + +(define-public cl-piping + (sbcl-package->cl-source-package sbcl-piping)) + (define-public sbcl-jpl-queues (package (name "sbcl-jpl-queues") -- cgit v1.2.3 From 67793f33ecd87d717fccd07b63ed6a221a056d6e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 31 Jan 2021 01:41:35 +0000 Subject: gnu: Add cl-verbose. * gnu/packages/lisp-xyz.scm (cl-verbose, ecl-verbose, sbcl-verbose): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 8f57a89446..b16d8d9191 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4702,6 +4702,41 @@ various levels and mix text with expressions.") (define-public ecl-log4cl (sbcl-package->ecl-package sbcl-log4cl)) +(define-public sbcl-verbose + (let ((commit "c5b7ecd465be61b35af17ef57564697b88397174") + (revision "1")) + (package + (name "sbcl-verbose") + (version (git-version "2.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/verbose/") + (commit commit))) + (file-name (git-file-name "verbose" version)) + (sha256 + (base32 "0r51ydj5v7afi2jrlscbhxprv13d9vzg5316g1yzwaxc1kzsdsw6")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("bordeaux-threads" ,sbcl-bordeaux-threads) + ("dissect" ,sbcl-dissect) + ("documentation-utils" ,sbcl-documentation-utils) + ("local-time" ,sbcl-local-time) + ("piping" ,sbcl-piping))) + (home-page "https://shinmera.github.io/verbose/") + (synopsis "Logging framework using the piping library") + (description + "This is a Common Lisp library providing logging faciltiy similar to +@code{CL-LOG} and @code{LOG4CL}.") + (license license:zlib)))) + +(define-public ecl-verbose + (sbcl-package->ecl-package sbcl-verbose)) + +(define-public cl-verbose + (sbcl-package->cl-source-package sbcl-verbose)) + (define-public sbcl-find-port (let ((commit "00c96a25af93a0f8681d34ec548861f2d7485478") (revision "1")) -- cgit v1.2.3 From b41d8a702d1f0df22c04f58bd7174e4906c2857f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 31 Jan 2021 01:43:40 +0000 Subject: gnu: Add cl-mpg123. * gnu/packages/lisp-xyz.scm (cl-mpg123, ecl-cl-mpg123, sbcl-cl-mpg123): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b16d8d9191..3fa11ee7ba 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10525,6 +10525,61 @@ online linear classification written in Common Lisp.") (define-public ecl-cl-online-learning (sbcl-package->ecl-package sbcl-cl-online-learning)) +(define-public sbcl-cl-mpg123 + (let ((commit "5f042c839d2ea4a2ff2a7b60c839d8633d64161d") + (revision "1")) + (package + (name "sbcl-cl-mpg123") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shirakumo/cl-mpg123") + (commit commit))) + (file-name (git-file-name "cl-mpg123" version)) + (sha256 + (base32 "1hl721xaczxck008ax2y3jpkm509ry1sg3lklh2k76764m3ndrjf")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled pre-compiled libraries. + (delete-file-recursively "static") + #t)))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:asd-files '("cl-mpg123.asd" "cl-mpg123-example.asd") + #:asd-systems '("cl-mpg123" "cl-mpg123-example") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "low-level.lisp" + (("libmpg123.so" all) + (string-append (assoc-ref inputs "libmpg123") + "/lib/" all)))))))) + (inputs + `(("cffi" ,sbcl-cffi) + ("cl-out123" ,sbcl-cl-out123) + ("documentation-utils" ,sbcl-documentation-utils) + ("libmpg123" ,mpg123) + ("trivial-features" ,sbcl-trivial-features) + ("trivial-garbage" ,sbcl-trivial-garbage) + ("verbose" ,sbcl-verbose))) + (home-page "https://shirakumo.github.io/cl-mpg123/") + (synopsis "Common Lisp bindings to libmpg123") + (description + "This is a bindings and wrapper library to @code{libmpg123} allowing for +convenient, extensive, and fast decoding of MPEG1/2/3 (most prominently mp3) +files.") + (license license:zlib)))) + +(define-public ecl-cl-mpg123 + (sbcl-package->ecl-package sbcl-cl-mpg123)) + +(define-public cl-mpg123 + (sbcl-package->cl-source-package sbcl-cl-mpg123)) + (define-public sbcl-cl-out123 (let ((commit "6b58d3f8c2a28ad09059ac4c60fb3c781b9b421b") (revision "1")) -- cgit v1.2.3 From f8d8109369c6a70e69010a2522207302c73d2123 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 31 Jan 2021 01:34:40 +0000 Subject: gnu: sbcl-deploy: Update to 1.0.0-2.9b20e64. * gnu/packages/lisp-xyz.scm (sbcl-deploy): Update to 1.0.0-2.9b20e64. [arguments]: Add 'test-asd-file' and 'asd-files' parameters. [native-inputs]: Add cl-mpg123 and cl-out123. [inputs]: Add trivial-features. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3fa11ee7ba..7cfd4b2a6b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12390,9 +12390,8 @@ predictable cross-platform behavior and some utilities useful for versioning.") (sbcl-package->ecl-package sbcl-defpackage-plus)) (define-public sbcl-deploy - ;; tagged branch is outdated - (let ((revision "1") - (commit "59fd49719ef651a8fc11750bcfb337f132cff75f")) + (let ((commit "9b20e64fe924b9e31832304d87a3a72c383dc6d8") + (revision "2")) (package (name "sbcl-deploy") (version (git-version "1.0.0" revision commit)) @@ -12402,15 +12401,21 @@ predictable cross-platform behavior and some utilities useful for versioning.") (uri (git-reference (url "https://github.com/Shinmera/deploy") (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "deploy" version)) (sha256 - (base32 "1vl2116z4kw2pd3qd3n6mmg8g0mnwxr9dgddk86g7j1bis1z8k9a")))) + (base32 "07pfkibaridihg8lbq2czwa4iqifqk24n6rx7bfnv7i49p1ppja1")))) (build-system asdf-build-system/sbcl) + (arguments + `(#:test-asd-file "deploy-test.asd" + #:asd-files '("deploy.asd" + "deploy-test.asd"))) + (native-inputs + `(("cl-mpg123" ,sbcl-cl-mpg123) + ("cl-out123" ,sbcl-cl-out123))) (inputs `(("cffi" ,sbcl-cffi) - ("documentation-utils" ,sbcl-documentation-utils))) - (arguments - '(#:asd-files '("deploy.asd"))) + ("documentation-utils" ,sbcl-documentation-utils) + ("trivial-features" ,sbcl-trivial-features))) (home-page "https://shinmera.github.io/deploy/") (synopsis "Deployment tools for standalone Common Lisp application") (description -- cgit v1.2.3 From ae416e852ad6b305ffaf67343d7192bd7c4c89aa Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 31 Jan 2021 02:49:34 +0000 Subject: gnu: Add indi. * gnu/packages/astronomy.scm (indi): New variable. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/astronomy.scm | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 9b25e03446..9777b0008f 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages fontutils) @@ -40,6 +41,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages libusb) #:use-module (gnu packages lua) #:use-module (gnu packages maths) #:use-module (gnu packages netpbm) @@ -630,3 +632,63 @@ Gpredict can also predict the time of future passes for a satellite, and provide you with detailed information about each pass.") (home-page "http://gpredict.oz9aec.net/index.php") (license license:gpl2+))) + +(define-public indi + (package + (name "indi") + (version "1.8.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/indilib/indi") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "19gm7rbnm3295g2i8mdzfslpz0vrcgfmbl59311qpszvlxbmyd2r")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (let ((out (assoc-ref %outputs "out"))) + (list + "-DINDI_BUILD_UNITTESTS=ON" + "-DCMAKE_BUILD_TYPE=Release" + (string-append "-DCMAKE_INSTALL_PREFIX=" out) + (string-append "-DUDEVRULES_INSTALL_DIR=" out "/lib/udev/rules.d"))) + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (chdir "test") + (invoke "ctest") + (chdir "..") + #t)) + (add-before 'install 'set-install-directories + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/lib/udev/rules.d"))) + #t))))) + (native-inputs + `(("googletest" ,googletest))) + (inputs + `(("cfitsio" ,cfitsio) + ("curl" ,curl) + ("fftw" ,fftw) + ("gsl" ,gsl) + ("libjpeg-turbo" ,libjpeg-turbo) + ("libnova" ,libnova) + ("libtiff" ,libtiff) + ("libusb" ,libusb) + ("zlib" ,zlib))) + (home-page "https://www.indilib.org") + (synopsis "Library for astronimical intrumentation control") + (description + "INDI (Instrument-Neutral Device Interface) is a distributed XML-based +control protocol designed to operate astronomical instrumentation. INDI is +small, flexible, easy to parse, scalable, and stateless. It supports common +DCS functions such as remote control, data acquisition, monitoring, and a lot +more.") + (license (list license:bsd-3 + license:gpl2+ + license:lgpl2.0+ + license:lgpl2.1+)))) -- cgit v1.2.3 From b4fdbdf96700c016bb546a34bfad1d15f5e4de06 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 Jan 2021 11:52:58 +0100 Subject: gnu: emacs-tramp: Update to 2.5.0.1. * gnu/packages/emacs-xyz.scm (emacs-tramp): Update to 2.5.0.1. --- 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 28c7b41d79..5708520e1f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23000,14 +23000,14 @@ well as an option for visually flashing evaluated s-expressions.") (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.5.0") + (version "2.5.0.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "1jpnqyk108nksaym2b9v243y5zkpr4px9d070wsb9cwm3xrcd8rh")))) + (base32 "0kqlc03bbsdywp0m3mf0m62hqyam8vg81phh7nqmpdjzskrdc1yy")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs ;need D-Bus -- cgit v1.2.3 From dcfe2712a1c2e9bc9acc008bcf9333cbe2c7b807 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 Jan 2021 11:53:34 +0100 Subject: gnu: python-pikepdf: Update to 2.5.1. * gnu/packages/python-xyz.scm (python-pikepdf): Update to 2.5.1. --- 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 5b5514d4cd..621783d1ff 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5686,13 +5686,13 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pikepdf (package (name "python-pikepdf") - (version "2.5.0") + (version "2.5.1") (source (origin (method url-fetch) (uri (pypi-uri "pikepdf" version)) (sha256 - (base32 "0wqb8sjbmvz042ymdg0p5bq8pyjccfbdnk7nfi6y7jrlb8qw1dl4")))) + (base32 "0zapzvy9lx6yv13k3j3zaklbcpgidmsvanaz8qnbdxywcm482klm")))) (build-system python-build-system) (arguments `(#:tests? #false)) ;require python-xmp-toolkit -- cgit v1.2.3 From 639ef1ac7937254337fbb6d2bc6e73e7239f2eb4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 Jan 2021 11:55:14 +0100 Subject: gnu: wireshark: Update to 3.4.3. * gnu/packages/networking.scm (wireshark): Update to 3.4.3. --- gnu/packages/networking.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 4e8d91256d..abaab60f31 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Raimon Grau ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2016 John Darrington -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Nicolas Goaziou +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016, 2017, 2018 Arun Isaac @@ -1349,14 +1349,14 @@ of the same name.") (define-public wireshark (package (name "wireshark") - (version "3.4.2") + (version "3.4.3") (source (origin (method url-fetch) (uri (string-append "https://www.wireshark.org/download/src/wireshark-" version ".tar.xz")) (sha256 - (base32 "1i548w6zv6ni5n22rs90a12aakyq811493dxmadlcsj2krr6i66y")))) + (base32 "0ar6pxzrcpxdriz437d6ziwlhb8k5wlvrkalp3hgqwzwy1vwqrzl")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From 9953c4fa94e233c9e397d1d60e91fd4a67859bad Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Sun, 31 Jan 2021 01:20:48 +0000 Subject: gnu: esbuild: Update to 0.8.37. * gnu/packages/web.scm (esbuild): Update to 0.8.37. Signed-off-by: Efraim Flashner --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8797411661..2d651e6983 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1487,7 +1487,7 @@ used to validate and fix HTML data.") (define-public esbuild (package (name "esbuild") - (version "0.8.36") + (version "0.8.37") (source (origin (method git-fetch) @@ -1496,7 +1496,7 @@ used to validate and fix HTML data.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "18k5j12dzfnj38j7acl9gqsqqnqb133c4j557c47jqx6gvpgcz5a")) + (base32 "0c98w2y4y9jaj2wv0334xwdbsvsi5hfh9jdkqr7ffz8lxhmh610f")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 3d72867e1049d7f349e3816d48022485d93c9e7a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 31 Jan 2021 14:45:45 +0200 Subject: gnu: Add python-threadpoolctl. * gnu/packages/machine-learning.scm (python-threadpoolctl): New variable. --- gnu/packages/machine-learning.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index a3084c17e2..4e35e3e369 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus -;;; Copyright © 2016, 2020 Efraim Flashner +;;; Copyright © 2016, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2017, 2020 Marius Bakke ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -871,6 +871,36 @@ data analysis.") (base32 "08zbzi8yx5wdlxfx9jap61vg1malc9ajf576w7a0liv6jvvrxlpj"))))))) +(define-public python-threadpoolctl + (package + (name "python-threadpoolctl") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "threadpoolctl" version)) + (sha256 + (base32 + "0szsxcm2fbxrn83iynn42bnvrdh7mfsmkhfn8pdn7swblfb7rifx")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest")) + #t))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/joblib/threadpoolctl") + (synopsis "Python helpers for common threading libraries") + (description "Thread-pool Controls provides Python helpers to limit the +number of threads used in the threadpool-backed of common native libraries used +for scientific computing and data science (e.g. BLAS and OpenMP).") + (license license:bsd-3))) + (define-public python-pynndescent (package (name "python-pynndescent") -- cgit v1.2.3 From d6f79bc64d5bf51e9bfaaebfaf2aac5bf591acee Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 30 Jan 2021 13:53:05 +0100 Subject: gnu: teeworlds: Fix audio. * gnu/packages/games.scm (teeworlds)[source]: Enable recursive cloning. [build-system]: Switch to cmake-build-system. [arguments]: Remove custom phases build and install. [inputs]: Add openssl. [native-inputs]: Remove bam. [license]: Add map/language data license. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 65 ++++++++------------------------------------------ 1 file changed, 10 insertions(+), 55 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index be7a3cc181..e3e18bf09e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6104,11 +6104,13 @@ small robot living in the nano world, repair its maker.") (method git-fetch) (uri (git-reference (url "https://github.com/teeworlds/teeworlds") - (commit version))) + (commit version) + ;; There are two submodules in datasrc/{languages,maps} + (recursive? #t))) (file-name (git-file-name name version)) (sha256 (base32 - "169dl83q08zl4h813az8hjs4rs3dms9yjn6bnsld4fjcj0imvvc6")) + "1l19ksmimg6b8zzjy0skyhh7z11ql7n5gvilkv7ay5x2b9ndbqwz")) (modules '((guix build utils) (ice-9 ftw) (ice-9 regex) @@ -6121,15 +6123,12 @@ small robot living in the nano world, repair its maker.") (remove (cut string-match "(^.)|(^md5$)" <>) (scandir base-dir))) #t)))) - (build-system gnu-build-system) + (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests included - #:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-26)) #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'unpack 'patch-paths (lambda* (#:key outputs #:allow-other-keys) ;; Embed path to assets. (substitute* "src/engine/shared/storage.cpp" @@ -6138,51 +6137,7 @@ small robot living in the nano world, repair its maker.") (assoc-ref outputs "out") "/share/teeworlds/data" "\""))) - - ;; Bam expects all files to have a recent time stamp. - (for-each (cut utime <> 1 1) - (find-files ".")) - - ;; Do not use bundled libraries. - (substitute* "bam.lua" - (("local json = Compile.+$") - "local json = nil -settings.link.libs:Add(\"jsonparser\")") - (("local png = Compile.+$") - "local png = nil -settings.link.libs:Add(\"pnglite\")") - (("local wavpack = Compile.+$") - "local wavpack = nil -settings.link.libs:Add(\"wavpack\")") - (("if config\\.zlib\\.value == 1") - "if config.zlib.value")) - (substitute* "src/engine/client/graphics_threaded.cpp" - (("engine/external/pnglite/pnglite\\.h") - "pnglite.h")) - (substitute* "src/engine/client/sound.cpp" - (("engine/external/wavpack/wavpack\\.h") - "wavpack/wavpack.h")) - #t)) - (replace 'build - (lambda _ - (invoke "bam" "-a" "-v" "conf=release"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((arch ,(system->linux-architecture - (or (%current-target-system) - (%current-system)))) - (build (string-append "build/" (if (string=? arch "i386") - "x86" arch) - "/release/")) - (data-built (string-append build "data/")) - (out (assoc-ref outputs "out")) - (bin (string-append out "/bin/")) - (data (string-append out "/share/teeworlds/data/"))) - (for-each (cut install-file <> bin) - (map (cut string-append build <>) - '("teeworlds" "teeworlds_srv"))) - (copy-recursively data-built data) - #t)))))) + #t))))) (inputs `(("freetype" ,freetype) ("glu" ,glu) @@ -6193,17 +6148,17 @@ settings.link.libs:Add(\"wavpack\")") ("sdl2-image" ,sdl2-image) ("sdl2-mixer" ,sdl2-mixer) ("wavpack" ,wavpack) + ("openssl" ,openssl) ("zlib" ,zlib))) (native-inputs - `(("bam" ,bam) - ("python" ,python-wrapper) + `(("python" ,python-wrapper) ("pkg-config" ,pkg-config))) (home-page "https://www.teeworlds.com") (synopsis "2D retro multiplayer shooter game") (description "Teeworlds is an online multiplayer game. Battle with up to 16 players in a variety of game modes, including Team Deathmatch and Capture The Flag. You can even design your own maps!") - (license license:bsd-3))) + (license (list license:bsd-3 license:cc-by-sa3.0)))) ; game+maps&languages (define-public enigma (package -- cgit v1.2.3 From 232a10f006b95bf3950fb6c4a9ddc0dc6be75db7 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Fri, 29 Jan 2021 11:09:48 +0100 Subject: gnu: Add licenseheaders. * gnu/packages/license.scm (licenseheaders): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/license.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/license.scm b/gnu/packages/license.scm index 369426768b..7b94c02558 100644 --- a/gnu/packages/license.scm +++ b/gnu/packages/license.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020, 2021 Michael Rohleder +;;; Copyright © 2021 Tanguy Le Carrour ;;; ;;; This file is part of GNU Guix. ;;; @@ -205,3 +206,35 @@ tools that have a lot more features and functionality surrounding the analysis and inspection of copyright and licenses in software projects. This one is designed to be simple.") (license (list asl2.0 gpl3+)))) + +(define-public licenseheaders + (package + (name "licenseheaders") + (version "0.8.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "licenseheaders" version)) + (sha256 + (base32 "073xcm10gyg5kcxqmbsyaz9sr0slbdwgr0r9qanch0zl8i0z9259")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Reported upstream: + ;; . + (add-after 'unpack 'patch-code + (lambda _ + (substitute* "licenseheaders.py" + (("\\\"filenames\\\": \\[\\\"CMakeLists.txt\\\"\\],") + "\"filenames\": [\"CMakeLists.txt\"], \n \"extensions\": [],")) + #t))))) + (propagated-inputs + `(("python-regex" ,python-regex))) + (home-page "http://github.com/johann-petrak/licenseheaders") + (synopsis "Add or change license headers for all files in a directory") + (description + "Licenseheaders is a Python 3 tool to update, change or add license +headers to all files of any of the supported types in or below some +directory.") + (license expat))) -- cgit v1.2.3 From 3eb84a488e2dcc4079f14d3367763dcaeffd0d41 Mon Sep 17 00:00:00 2001 From: Evgeny Pisemsky Date: Sun, 31 Jan 2021 10:40:30 +0300 Subject: gnu: emacs-adaptive-wrap: Update source URI. * gnu/packages/emacs-xyz.scm (emacs-adaptive-wrap)[source]: Update URI. This fixes a "download failed" error when building the package. Signed-off-by: Nicolas Goaziou --- 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 5708520e1f..395be23aaa 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11774,7 +11774,7 @@ information via a consistent and well-integrated user interface.") (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" - "adaptive-wrap-" version ".el")) + "adaptive-wrap-" version ".tar")) (sha256 (base32 "1gs1pqzywvvw4prj63vpj8abh8h14pjky11xfl23pgpk9l3ldrb0")))) (build-system emacs-build-system) -- cgit v1.2.3 From f43a652d4cfa080a2c14bc10b55047cf92b7cb10 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 Jan 2021 17:53:56 +0100 Subject: gnu: sshpass: Update to 1.09. * gnu/packages/ssh.scm (sshpass): Update to 1.09. Re-order fields. --- gnu/packages/ssh.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 146177f7f3..90f32c135d 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015, 2016, 2018, 2019 Efraim Flashner ;;; Copyright © 2016, 2019 Leo Famulari -;;; Copyright © 2016 Nicolas Goaziou +;;; Copyright © 2016, 2021 Nicolas Goaziou ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Stefan Reichör @@ -665,18 +665,17 @@ manipulating key files.") (define-public sshpass (package (name "sshpass") - (version "1.06") - (synopsis "Non-interactive password authentication with SSH") - (home-page "https://sourceforge.net/projects/sshpass/") + (version "1.09") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sshpass/sshpass/" version "/sshpass-" version ".tar.gz")) (sha256 - (base32 - "0q7fblaczb7kwbsz0gdy9267z0sllzgmf0c7z5c9mf88wv74ycn6")))) + (base32 "1dwzqknpswa8vjlbwsx9rcq1j2a7px9h9i2anh09pzkz0mg6wx3i")))) (build-system gnu-build-system) + (home-page "https://sourceforge.net/projects/sshpass/") + (synopsis "Non-interactive password authentication with SSH") (description "sshpass is a tool for non-interactively performing password authentication with SSH's so-called @dfn{interactive keyboard password authentication}.") -- cgit v1.2.3 From 63c237d0448d92b3f0b0f9e9c337b2078a27a715 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Sun, 31 Jan 2021 17:47:20 +0100 Subject: gnu: libchewing: Disable parallel tests. Some tests fail constant when building with multiple threads. * gnu/packages/language.scm (libchewing)[arguments]: Set `parallel-tests` to false. --- gnu/packages/language.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 67b519aa56..93e125db7e 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -287,7 +287,9 @@ Random Cage Fighting Birds, Cool Music etc.") (base32 "04d09w6xdd08v6laj9y4qmqsijw5i2jvshcilhh4vg6cfnfgl2my")))) (build-system gnu-build-system) (arguments - `(#:phases + `(;; test-easy-symbol and test-fullshape fail with multiple cores. + #:parallel-tests? #f + #:phases (modify-phases %standard-phases (add-after 'unpack 'disable-failing-tests (lambda _ -- cgit v1.2.3 From 9c8156507abeb15f6d3816800c077fd99f861e3d Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 31 Jan 2021 20:41:07 +0100 Subject: gnu: opendoas: Update to 6.8.1 [fixes CVE-2019-25016]. * gnu/packages/admin.scm (opendoas): Update to 6.8.1. Signed-off-by: Leo Famulari --- 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 538e8d3eb4..1ddbea7a02 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1512,7 +1512,7 @@ commands and their arguments.") (define-public opendoas (package (name "opendoas") - (version "6.8") + (version "6.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -1521,7 +1521,7 @@ commands and their arguments.") (file-name (git-file-name name version)) (sha256 (base32 - "1dlwnvy8r6slxcy260gfkximp1ms510wdslpfq9y6xvd2qi5izcb")))) + "0gfcssm21vdfg6kcrcc7hz1h4jmhy2zv29rfqyrrj3a6r9b5ah8p")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 8574c822f671764ed56fbc02ebfadd995a9bcf6e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 Jan 2021 21:17:08 +0100 Subject: gnu: privoxy: Update to 3.0.31 [fixes OVE-20210130-0001, OVE-20210128-0001]. * gnu/packages/tor.scm (privoxy): Update to 3.0.31. --- gnu/packages/tor.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index e2ce7afe9d..1ce53a967b 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner ;;; Copyright © 2016, 2017 Nikita -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018, 2019 Eric Bavier ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Ricardo Wurmus @@ -155,7 +155,7 @@ rejects UDP traffic from the application you're using.") (define-public privoxy (package (name "privoxy") - (version "3.0.29") + (version "3.0.31") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/ijbswa/Sources/" @@ -163,7 +163,7 @@ rejects UDP traffic from the application you're using.") version "-stable-src.tar.gz")) (sha256 (base32 - "17a8fbdyb0ixc0wwq68fg7xn7l6n7jq67njpq93psmxgzng0dii5")))) + "1sq4s0h73r7mynl8s0ynn3a6zl98j06nb2nqx2j254n7maijjxq7")))) (build-system gnu-build-system) (arguments '(;; The default 'sysconfdir' is $out/etc; change that to -- cgit v1.2.3 From f936f078bcd805d7a81242ec8e124b3511523457 Mon Sep 17 00:00:00 2001 From: Robert Karszniewicz Date: Sat, 30 Jan 2021 13:25:16 +0100 Subject: gnu: utox: Update to 0.18.1. * gnu/packages/messaging.scm (utox): Update to 0.18.1. [inputs]: Remove libsodium. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1820a146d1..8ddf70540a 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2020 Mason Hock ;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2020 Raghav Gururajan -;;; Copyright © 2020 Robert Karszniewicz +;;; Copyright © 2020, 2021 Robert Karszniewicz ;;; ;;; This file is part of GNU Guix. ;;; @@ -1430,7 +1430,7 @@ messenger protocol.") (define-public utox (package (name "utox") - (version "0.18.0") + (version "0.18.1") (source (origin (method git-fetch) @@ -1441,7 +1441,7 @@ messenger protocol.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0d0mwgxffg4nhai62irf8lyhd1whp9s4k892rsmqz1sra3pbjcg9")))) + "01rvlf94d4rkrygnnjak3cg16hrrqyi1rn9nx65y17qk2nbyh68g")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DENABLE_TESTS=on") @@ -1466,7 +1466,6 @@ messenger protocol.") ("filteraudio" ,filteraudio) ("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("libsodium" ,libsodium) ("c-toxcore" ,c-toxcore) ("gtk+" ,gtk+) ("libvpx" ,libvpx) -- cgit v1.2.3 From a6250b677493d1dcc3c0fd2f0551cba6415c0b5b Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 31 Jan 2021 15:40:02 +0100 Subject: gnu: mousepad: Update to 0.5.2. * gnu/packages/xfce.scm (mousepad): Update to 0.5.2. Signed-off-by: Efraim Flashner --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 31f6072630..bc5fd9fee6 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1206,7 +1206,7 @@ of data to either CD/DVD/BD.") (define-public mousepad (package (name "mousepad") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/mousepad/" @@ -1214,7 +1214,7 @@ of data to either CD/DVD/BD.") version ".tar.bz2")) (sha256 (base32 - "10m52yrh89j7xbr299m9f0mqrhqz95lp3qi5zbqd0bg839xjfbix")))) + "13pvisqhq5rjrkfdw635z600167920fxqzg1ngvismaf39iwbb9h")))) (build-system gnu-build-system) (arguments '(#:configure-flags '(;; Use the GSettings keyfile backend rather than -- cgit v1.2.3 From 4ea5767d3a2a8037ab3c76eda0cf0b1f4b597d69 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 8 Jan 2021 19:13:59 +0000 Subject: gnu: python-sympy: Update to 1.7.1. * gnu/packages/python-xyz.scm (python-sympy): Update to 1.7.1. Signed-off-by: Efraim Flashner --- 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 621783d1ff..c63774ce13 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7957,13 +7957,13 @@ multiprecision arithmetic.") (define-public python-sympy (package (name "python-sympy") - (version "1.6.2") + (version "1.7.1") (source (origin (method url-fetch) (uri (pypi-uri "sympy" version)) (sha256 - (base32 "0247skhkxanczpqqdz6n9k1axgpwl665b25hyn9vgr060p4dryhw")))) + (base32 "0bkb4jf24yv5i4kjpsmg1xjjccfhqyi0syv0p0xvhdbmx5hr5pm3")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From a0b6a7ee2e5bb617d148d0797a0e78e540648a8c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 30 Jan 2021 21:29:30 +0100 Subject: gnu: autoconf: Update to 2.71. * gnu/packages/autotools.scm (autoconf-2.70): Rename to... (autoconf-2.71): ... this. Update to 2.71. --- gnu/packages/autotools.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 6074379c46..09f4bf4122 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2020 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2020, 2021 Ludovic Courtès ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis ;;; Copyright © 2015, 2017, 2018 Mark H Weaver @@ -105,10 +105,11 @@ scripts are self-contained and portable, freeing the user from needing to know anything about Autoconf or M4.") (license gpl3+))) ; some files are under GPLv2+ -(define-public autoconf-2.70 +;; This is the renaissance version, which is not widely supported yet. +(define-public autoconf-2.71 (package (inherit autoconf-2.69) - (version "2.70") + (version "2.71") (source (origin (method url-fetch) @@ -116,7 +117,7 @@ know anything about Autoconf or M4.") version ".tar.xz")) (sha256 (base32 - "1ipckz0wr2mvhj9n3ys54fmf2aksin6bhqvzl304bn6rc1w257ps")))) + "197sl23irn6s9pd54rxj5vcp5y8dv65jb9yfqgr2g56cxg7q6k7i")))) (arguments (substitute-keyword-arguments (package-arguments autoconf-2.69) ((#:tests? _ #f) -- cgit v1.2.3 From 8d2465fcfef96552517bef7d182a04255d5707c2 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Mon, 26 Oct 2020 22:01:45 -0400 Subject: gnu: emacs: Make strip-double-wrap more robust MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs) [strip-double-wrap]: Use regex to find emacs executable. This works even when the version is changed by package transformations (ex: version=git.master) Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ca14584ada..5cca2bc9f7 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019, 2021 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver @@ -195,17 +195,11 @@ (lambda* (#:key outputs #:allow-other-keys) ;; Directly copy emacs-X.Y to emacs, so that it is not wrapped ;; twice. This also fixes a minor issue, where WMs would not be - ;; able to track emacs back to emacs.desktop. The version is - ;; accessed using using THIS-PACKAGE so it "just works" for - ;; inherited Emacs packages of different versions. + ;; able to track emacs back to emacs.desktop. (with-directory-excursion (assoc-ref outputs "out") - (copy-file (string-append - "bin/emacs-" - ,(let ((this-version (package-version this-package))) - (or (false-if-exception - (version-major+minor+point this-version)) - (version-major+minor this-version)))) - "bin/emacs") + (copy-file + (car (find-files "bin" "^emacs-([0-9]+\\.)+[0-9]+$")) + "bin/emacs") #t))) (add-before 'reset-gzip-timestamps 'make-compressed-files-writable ;; The 'reset-gzip-timestamps phase will throw a permission error -- cgit v1.2.3 From 85243d0d63e2219d0d376a541fa67efc24e6e2c8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 6 Jan 2021 14:15:04 -0500 Subject: gnu: dump: Update to 0.4b47. * gnu/packages/backup.scm (dump): Update to 0.4b47. [inputs]: Replace OPENSSL-1.0 with OPENSSL. --- gnu/packages/backup.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index ce6ea7fd49..78c5b31bb5 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1008,7 +1008,7 @@ is format-agnostic, so you can feed virtually any files to it.") (define-public dump (package (name "dump") - (version "0.4b46") + (version "0.4b47") (source (origin (method url-fetch) @@ -1016,7 +1016,7 @@ is format-agnostic, so you can feed virtually any files to it.") version "/dump-" version ".tar.gz")) (sha256 (base32 - "15rg5y15ak0ppqlhcih78layvg7cwp6hc16p3c58xs8svlkxjqc0")))) + "1l2gzzxyqhinx1yqvj4yn9k8vx3iyqi1965dxf9kvvdv9zgaq8fh")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -1026,7 +1026,7 @@ is format-agnostic, so you can feed virtually any files to it.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("openssl" ,openssl-1.0) + `(("openssl" ,openssl) ("zlib" ,zlib) ("util-linux" ,util-linux "lib") ("e2fsprogs" ,e2fsprogs))) -- cgit v1.2.3 From 263b3961f40e49078a25e4118d1c8efc70e8d03f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 1 Feb 2021 03:00:06 -0500 Subject: Revert "gnu: kwayland: Enable test suite." This reverts commit ba3e25bbf217637d2054bb0c8b906f3eed230613. This commit is reverted because it caused kwayland to no longer build on the build farm. Specifically, the test "PlasmaWindowModelTest::testVirtualDesktops" fails. See this discussion for more information: https://lists.gnu.org/archive/html/guix-devel/2021-01/msg00382.html --- gnu/packages/kde-frameworks.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 8c2028b978..9ecbf75d34 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2016, 2019, 2021 Efraim Flashner +;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2016-2019 Hartmut Goebel ;;; Copyright © 2016 David Craven ;;; Copyright © 2017 Thomas Danckaert @@ -1047,12 +1047,13 @@ integration with a custom editor as well as a ready-to-use ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (arguments - `(#:phases + `(#:tests? #f ; FIXME tests require weston to run + ; weston requires wayland flags in mesa + #:phases (modify-phases %standard-phases (add-before 'check 'check-setup (lambda _ (setenv "XDG_RUNTIME_DIR" "/tmp") - (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt-style API to interact with the wayland client and server") -- cgit v1.2.3 From f1fada8ace7bad0c1846829007853944c24dfd62 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 1 Feb 2021 08:46:47 +0000 Subject: gnu: guix-data-service: Update to 0.0.1-24.060df92. * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-24.060df92. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2d651e6983..9f4b533fd2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4642,8 +4642,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (package-with-python2 python-feedparser)) (define-public guix-data-service - (let ((commit "e3878fefb4184f3ad45a6e6f434767c0bf109db8") - (revision "23")) + (let ((commit "060df92557d5a32dbd3ae4a32c2c5725cd53e09b") + (revision "24")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4655,7 +4655,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (file-name (git-file-name name version)) (sha256 (base32 - "0002ckayjnd6mw7a0m7q307jdwc9vsjgiidp72463xyp0yrnjdjf")))) + "0ggwslwm041gkd0i45xhvnalxrhjaj4da27p5wrpknrhpa4ipf6v")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 21f1f5501228dd864fad8e0f61c2b8c8949e51e4 Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Sun, 31 Jan 2021 17:40:40 -0800 Subject: gnu: pinentry-rofi: Update to 2.0.3. * gnu/packages/gnupg.scm (pinentry-rofi): Update to 2.0.3. [arguments]: Add make installcheck phase to verify the installed artifact. [native-inputs]: Add autoconf-archive. Signed-off-by: Efraim Flashner --- gnu/packages/gnupg.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 9be8a32540..83dd1d1578 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -894,7 +894,7 @@ passphrase when @code{gpg} is run and needs it."))) (define-public pinentry-rofi (package (name "pinentry-rofi") - (version "2.0.2") + (version "2.0.3") (source (origin (method git-fetch) (uri (git-reference @@ -902,7 +902,7 @@ passphrase when @code{gpg} is run and needs it."))) (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "14rbz32ykc8pz7gglbvxm3pcgabr7xdnddar6k24icd5xk9mr4rp")))) + (base32 "0kjzvgni9srl8h5c52pqrvgdxs6avv0nhgk19apd97sx10qdwdhk")))) (build-system gnu-build-system) (arguments `(#:modules @@ -923,9 +923,13 @@ passphrase when @code{gpg} is run and needs it."))) (wrap-program (string-append bin "pinentry-rofi") (list "PATH" ":" 'prefix `(,rofi-bin))) - #t)))))))) + #t))))) + (add-after 'compress-documentation 'installcheck + (lambda* rest + (invoke "make" "installcheck")))))) (native-inputs `(("autoconf" ,autoconf) + ("autoconf-archive" ,autoconf-archive) ("automake" ,automake) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) -- cgit v1.2.3 From bd139ecda214878d0a11f5d6a47ca35e248b6f67 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 1 Feb 2021 11:51:53 +0100 Subject: gnu: cuirass: Update to 0.0.1-62.74c1a94. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-62.74c1a94. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index cae437cb8d..c4e85cea33 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "6838ec2eac8eae2c3743fca76ad0cda87b4df5fb") - (revision "61")) + (let ((commit "74c1a94a4db41ae1bebc4fe7dd7e2f550eb7e46f") + (revision "62")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -61,7 +61,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1jf5d9aar1s96ik7csxg448hzlbz12bkgxqkf4r025f6gp4migqc")))) + "1lfng3w0sd28c06vbpf0vy50dbfvh36628z5c5sp8sdj4g7kvrrz")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 221fddd2e2495b1405daf1b34e9f52d6ad19cbbf Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 1 Feb 2021 12:07:21 +0100 Subject: gnu: cuirass: Update to 0.0.1-63.da93cb9. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-63.da93cb9. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index c4e85cea33..a4ee9eae46 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "74c1a94a4db41ae1bebc4fe7dd7e2f550eb7e46f") - (revision "62")) + (let ((commit "da93cb96ff453d060bd185e31802ea58c5e8d7f0") + (revision "63")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -61,7 +61,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1lfng3w0sd28c06vbpf0vy50dbfvh36628z5c5sp8sdj4g7kvrrz")))) + "0awygc2xwm1g90njydxfhk5laqjvah5s0a94zaa8w5iw2zrnbgyl")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 37e997bc7867901dc5eaf9060358dfddacae8dd6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Feb 2021 12:37:03 +0100 Subject: gnu: rdma-core: Remove "-DIOCTL_MODE=write" configure flag. Fixes . This flag was added in commit 2b14c60d3870e74f620775ec8dd64634ff874dc7. It is apparently no longer needed. Worse, it now causes segfaults when used with Omni-Path devices, as reported in the bug above. * gnu/packages/linux.scm (rdma-core)[arguments]: Remove "-DIOCTL_MODE=write" from #:configure-flags. --- gnu/packages/linux.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index da4a76605c..f22564a35b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5528,14 +5528,7 @@ The package provides additional NTFS tools.") (string-append "-DRST2MAN_EXECUTABLE=" (assoc-ref %build-inputs "python-docutils") - "/bin/rst2man.py") - - ;; On some configurations, the - ;; IB_USER_MAD_REGISTER_AGENT ioctl, which is - ;; used by default, would return ENODEV. To - ;; avoid that, use 'write' instead of ioctls, - ;; as suggested in 'CMakeList.txt'. - "-DIOCTL_MODE=write") + "/bin/rst2man.py")) #:phases (modify-phases %standard-phases (replace 'build -- cgit v1.2.3 From 93af2ac871addc7755ea542928124d416f1a0361 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Feb 2021 12:41:57 +0100 Subject: gnu: rdma-core: Build as "RelWithDebInfo". This allows users to use '--with-debug-info=rdma-core' and is otherwise equivalent to "Release". * gnu/packages/linux.scm (rdma-core)[arguments]: Remove #:build-type. --- gnu/packages/linux.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f22564a35b..1d68229281 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5520,9 +5520,7 @@ The package provides additional NTFS tools.") (arguments `(#:tests? #f ; no tests ;; Upstream uses the "ninja" build system and encourage distros - ;; to do the same for consistency. They also recommend using the - ;; "Release" build type. - #:build-type "Release" + ;; to do the same for consistency. #:configure-flags (list "-GNinja" (string-append "-DRST2MAN_EXECUTABLE=" -- cgit v1.2.3 From 877ab0266c69858a9d4554dffba89dc5300a0736 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 1 Feb 2021 18:18:42 +0200 Subject: gnu: vcflib: Fix generated pkg-config file. * gnu/packages/bioinformatics.scm (vcflib)[arguments]: In custom generated pkg-config file, link with all needed libraries and fix linker library. * gnu/packages/patches/freebayes-devendor-deps.patch: Adjust accordingly. --- gnu/packages/bioinformatics.scm | 8 ++++---- gnu/packages/patches/freebayes-devendor-deps.patch | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5b14e765de..39611d23f4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -15209,18 +15209,18 @@ library automatically handles index file generation and use.") (let* ((out (assoc-ref outputs "out")) (pkgconfig (string-append out "/lib/pkgconfig"))) (mkdir-p pkgconfig) - (with-output-to-file (string-append pkgconfig "/libvcflib.pc") + (with-output-to-file (string-append pkgconfig "/vcflib.pc") (lambda _ (format #t "prefix=~a~@ exec_prefix=${prefix}~@ libdir=${exec_prefix}/lib~@ includedir=${prefix}/include~@ ~@ - Name: libvcflib~@ + Name: vcflib~@ Version: ~a~@ - Requires: smithwaterman, fastahack~@ + Requires: smithwaterman, fastahack, tabixpp~@ Description: C++ library for parsing and manipulating VCF files~@ - Libs: -L${libdir} -llibvcflib~@ + Libs: -L${libdir} -lvcflib~@ Cflags: -I${includedir}~%" out ,version))) #t)))))) diff --git a/gnu/packages/patches/freebayes-devendor-deps.patch b/gnu/packages/patches/freebayes-devendor-deps.patch index 7e84666b85..9886de11fb 100644 --- a/gnu/packages/patches/freebayes-devendor-deps.patch +++ b/gnu/packages/patches/freebayes-devendor-deps.patch @@ -23,7 +23,7 @@ index f6bf242..bded4af 100644 +tabixpp_dep = dependency('tabixpp', required : false) +fastahack_dep = dependency('fastahack', required : false) +smithwaterman_dep = dependency('smithwaterman', required : false) -+vcflib_dep = dependency('libvcflib', required: false) ++vcflib_dep = dependency('vcflib', required: false) thread_dep = dependency('threads') if htslib_dep.found() -- cgit v1.2.3 From 35bb3d5ffd84778e1d97eeebc27711f8c35d045b Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 26 Jan 2021 00:02:01 -0500 Subject: gnu: inchi: Update to 1.06. * gnu/packages/chemistry.scm (inchi): Update to 1.06. [source]: Use HTTPS. [native-inputs]: Update inchi-doc hash. --- gnu/packages/chemistry.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index e7b061515b..69cfed454a 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -161,15 +161,16 @@ only with Python 2 and NumPy < 1.9.") (define-public inchi (package (name "inchi") - (version "1.05") + ;; Update the inchi-doc native input when updating inchi. + (version "1.06") (source (origin (method url-fetch) - (uri (string-append "http://www.inchi-trust.org/download/" + (uri (string-append "https://www.inchi-trust.org/download/" (string-join (string-split version #\.) "") "/INCHI-1-SRC.zip")) (sha256 (base32 - "081pcjx1z5jm23fs1pl2r3bccia0ww8wfkzcjpb7byhn7b513hsa")) + "1zbygqn0443p0gxwr4kx3m1bkqaj8x9hrpch3s41py7jq08f6x28")) (file-name (string-append name "-" version ".zip")))) (build-system gnu-build-system) (arguments @@ -222,7 +223,7 @@ only with Python 2 and NumPy < 1.9.") "/INCHI-1-DOC.zip")) (sha256 (base32 - "1id1qb2y4lwsiw91qr2yqpn6kxbwjwhjk0hb2rwk4fxhdqib6da6")) + "1kyda09i9p89xfq90ninwi7w13k1w3ljpl4gqdhpfhi5g8fgxx7f")) (file-name (string-append name "-" version ".zip")))))) (home-page "https://www.inchi-trust.org") (synopsis "Utility for manipulating machine-readable chemical structures") -- cgit v1.2.3 From 1f1c525ac939eefbb433450693aef08fc252e62e Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 26 Jan 2021 00:38:25 -0500 Subject: gnu: openbabel: Update to 3.1.1. * gnu/packages/chemistry.scm (openbabel): Update to 3.1.1. [source]: Update URI. [arguments]: Temporarily skip tests on i686-linux. --- gnu/packages/chemistry.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index 69cfed454a..4b0e719959 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -522,19 +522,23 @@ usual algorithms you expect from a modern molecular dynamics implementation.") (define-public openbabel (package (name "openbabel") - (version "2.4.1") + (version "3.1.1") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/" name "/" name "/" - version "/" name "-" version ".tar.gz")) + (uri (string-append "https://github.com/openbabel/openbabel/" + "releases/download/openbabel-" + (string-replace-substring version "." "-") + "/openbabel-" version "-source.tar.bz2")) (sha256 (base32 - "1z3d6xm70dpfikhwdnbzc66j2l49vq105ch041wivrfz5ic3ch90")) - (patches - (search-patches "openbabel-fix-crash-on-nwchem-output.patch")))) + "0s0f4zib8vshfaywsr5bjjz55jwsg6yiz2qw4i5jm8wysn0q7v56")))) (build-system cmake-build-system) (arguments - `(#:configure-flags + `(;; FIXME: Disable tests on i686 to work around + ;; https://github.com/openbabel/openbabel/issues/2041. + #:tests? ,(or (%current-target-system) + (not (string=? "i686-linux" (%current-system)))) + #:configure-flags (list "-DOPENBABEL_USE_SYSTEM_INCHI=ON" (string-append "-DINCHI_LIBRARY=" (assoc-ref %build-inputs "inchi") -- cgit v1.2.3 From 85843123dedc3060a128457f7814d7461cccb412 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 1 Feb 2021 18:20:04 +0100 Subject: gnu: cuirass: Update to 0.0.1-64.79b77b4. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-64.79b77b4. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index a4ee9eae46..9a08ac4c23 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "da93cb96ff453d060bd185e31802ea58c5e8d7f0") - (revision "63")) + (let ((commit "79b77b4377db2e79a1f3396cfeeca64bfab00341") + (revision "64")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -61,7 +61,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0awygc2xwm1g90njydxfhk5laqjvah5s0a94zaa8w5iw2zrnbgyl")))) + "0wrpzhcs1cvc5c4s72zs100iw0f4nnv5j2lp6yz3j31zl92vxbis")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 1c1ff84f67d7e92574c87dae4cf2dde6ee4dfec3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Feb 2021 21:38:11 +0100 Subject: gnu: python-pikepdf: Update to 2.5.2. * gnu/packages/python-xyz.scm (python-pikepdf): Update to 2.5.2. --- 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 5199ac4d11..e8b13cbe4a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5680,13 +5680,13 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pikepdf (package (name "python-pikepdf") - (version "2.5.1") + (version "2.5.2") (source (origin (method url-fetch) (uri (pypi-uri "pikepdf" version)) (sha256 - (base32 "0zapzvy9lx6yv13k3j3zaklbcpgidmsvanaz8qnbdxywcm482klm")))) + (base32 "1wwfspm912388a61lailbpjpqihq9ha8yz05mjqx9yys4ixykhwg")))) (build-system python-build-system) (arguments `(#:tests? #false)) ;require python-xmp-toolkit -- cgit v1.2.3 From aae32847b803d1c70baf9fed6f44aa8d141248da Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Feb 2021 21:42:05 +0100 Subject: gnu: keepassxc: Update to 2.6.4. * gnu/packages/password-utils.scm (keepassxc): Update to 2.6.4. --- gnu/packages/password-utils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 2053457375..ef4bf535a4 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2017, 2019 Eric Bavier -;;; Copyright © 2017, 2020 Nicolas Goaziou +;;; Copyright © 2017, 2020, 2021 Nicolas Goaziou ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Marius Bakke @@ -123,7 +123,7 @@ human.") (define-public keepassxc (package (name "keepassxc") - (version "2.6.3") + (version "2.6.4") (source (origin (method url-fetch) @@ -131,7 +131,7 @@ human.") "/releases/download/" version "/keepassxc-" version "-src.tar.xz")) (sha256 - (base32 "1lgp20597dzj8qn8a71x3a6b549rvqybqx4haywwb09qiznvdq77")))) + (base32 "0azq20rqsx7axrigha4qh81ipvhqnnlb27w3xdjg5z4h3jky4dp5")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DWITH_XC_ALL=YES" -- cgit v1.2.3 From 2ab2d8e5546d71e14ada8e73f4e67c803894a58a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Feb 2021 21:53:28 +0100 Subject: gnu: python-folium: Update to 0.12.1. * gnu/packages/python-xyz.scm (python-folium): Update to 0.12.1. [source]: Fetch from GitHub instead of PyPI. --- gnu/packages/python-xyz.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e8b13cbe4a..bda2bcc970 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20417,13 +20417,18 @@ time-or-computationally-expensive properties quick and easy and works in Python (define-public python-folium (package (name "python-folium") - (version "0.11.0") + (version "0.12.1") (source (origin - (method url-fetch) - (uri (pypi-uri "folium" version)) + ;; PyPI has a ".whl" file but not a proper source release. + ;; Thus, fetch code from Git. + (method git-fetch) + (uri (git-reference + (url "https://github.com/python-visualization/folium") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "19sclsq3xcjfa7bavzjpyn6rl9b15jbc76n5aag4cwhqqamqj1sl")))) + (base32 "0yi5y9pfpbc4bc4ibr8cblif8ls1wf3k0zawyx86r2qwxxkkyd6k")))) (build-system python-build-system) (propagated-inputs `(("python-branca" ,python-branca) -- cgit v1.2.3 From 5ecc09551b0394e59406ef7898bc084236d84c97 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 1 Feb 2021 07:33:07 +0100 Subject: gnu: emacs-next-pgtk: Update to 28.0.50-1.ae18c8e. * gnu/packages/emacs.scm (emacs-next-pgtk): Update to 28.0.50-1.ae18c8e. Signed-off-by: Leo Famulari --- gnu/packages/emacs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 5cca2bc9f7..98061c93ae 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -308,8 +308,8 @@ languages.") (files '("share/info")))))))) (define-public emacs-next-pgtk - (let ((commit "d46a223d8595e8edb67c6361033625797503cacf") - (revision "0")) + (let ((commit "ae18c8ec4f0ef37c8c9cda473770ff47e41291e2") + (revision "1")) (package/inherit emacs-next (name "emacs-next-pgtk") (version (git-version "28.0.50" revision commit)) @@ -322,7 +322,7 @@ languages.") (file-name (git-file-name name version)) (sha256 (base32 - "1fhkgqsdpy3qkf8wyjvavnfyh8byxh0h80n0448rkg9k0lrkl4wf")))) + "07hgfqh965zmra0rbmnf63p3lsinpv5hn5payqcrjx25pl75xnaf")))) (arguments (substitute-keyword-arguments (package-arguments emacs-next) ((#:configure-flags flags ''()) -- cgit v1.2.3 From 4bce3a06b18f6924d69d62b2e898a5bc4917f411 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sat, 16 Jan 2021 17:52:25 +0000 Subject: gnu: ztoolkit: Move dependencies to propagated-inputs. * gnu/packages/audio.scm (ztoolkit):[inputs]: Remove cairo, libx11. [propagated-inputs]: Add cairo, libx11. Signed-off-by: Leo Famulari --- gnu/packages/audio.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 2e46dc3a26..9a9168c2d4 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4829,11 +4829,13 @@ with the provided metadata and adhere to well-known best practices.") (base32 "07xl3cmdaf7k9mm58m93cn8i1jvgimmiifdw1w7v2jl88nx60pm1")))) (build-system meson-build-system) - (inputs - `(("cairo" ,cairo) - ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) + ;; These are listed as propagated inputs because they are dependencies + ;; in pkgconfig. + (propagated-inputs + `(("cairo" ,cairo) + ("libx11" ,libx11))) (synopsis "GUI toolkit for LV2 plugins") (description "ZToolkit (Ztk) is a cross-platform GUI toolkit heavily inspired by GTK. It handles events and low level drawing on behalf of -- cgit v1.2.3 From 60a5071f60b1287967196d98c434dbe136e2d6ac Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sat, 16 Jan 2021 17:52:26 +0000 Subject: gnu: ztoolkit-rsvg: Move dependencies to propagated-inputs. * gnu/packages/audio.scm (ztoolkit-rsvg)[inputs]: Remove librsvg. [propagated-inputs]: Add librsvg. Signed-off-by: Leo Famulari --- 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 9a9168c2d4..0ec163e932 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4884,9 +4884,9 @@ edited, converted, compressed and saved.") (name "ztoolkit-rsvg") (arguments `(#:configure-flags `("-Denable_rsvg=true"))) - (inputs + (propagated-inputs `(("librsvg" ,librsvg) - ,@(package-inputs ztoolkit))) + ,@(package-propagated-inputs ztoolkit))) (synopsis "ZToolkit with SVG support"))) (define-public lsp-dsp-lib -- cgit v1.2.3 From 5b5915560e5cbd546c005a950515f6d293442a28 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sat, 16 Jan 2021 17:52:27 +0000 Subject: gnu: Add zplugins. * gnu/packages/music.scm (zplugins): New variable. Signed-off-by: Leo Famulari --- gnu/packages/music.scm | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 0da4cdd73a..f8b93ae41a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5932,34 +5932,39 @@ hall reverb and a room reverb. Both are available as LV2 plugins as well as JACK standalone applications.") (license license:gpl3+))) -(define-public zlfo +(define-public zplugins (package - (name "zlfo") - (version "0.1.3") + (name "zplugins") + (version "0.1.7") (source (origin (method git-fetch) - (uri (git-reference - (url "https://git.zrythm.org/git/ZLFO") - (commit (string-append "v" version)))) + (uri + (git-reference + (url "https://git.zrythm.org/git/zplugins") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0bm466ci5xyvxvq7l9p6xyh789lvk6i31b4zja1igqh13akbjnjz")))) + "1rkm2xajmyik6289b20rp5a5br9f3sh1xk8nb1bs6qpmcrfirgbs")))) (build-system meson-build-system) (inputs - `(("librsvg" ,librsvg) - ("lv2" ,lv2) - ("ztoolkit-rsvg" ,ztoolkit-rsvg))) + `(("guile" ,guile-2.2) + ("libsndfile" ,libsndfile) + ("lv2" ,lv2) + ("ztoolkit-rsvg" ,ztoolkit-rsvg))) (native-inputs - `(("pkg-config" ,pkg-config))) - (synopsis "Low frequency oscillator plugin") - (description "ZLFO is a fully featured -@dfn{low frequency oscillator} (LFO) for @dfn{control voltage} (CV)-based -automation that comes as an LV2 plugin bundle with a custom UI.") - (home-page "https://git.zrythm.org/cgit/ZLFO/") + `(("pkg-config" ,pkg-config))) + (synopsis "Audio plugin collection") + (description "ZPlugins is a collection of audio DSP plugins intended +to be bundled with the Zrythm @dfn{digital audio workstation} (DAW).") + (home-page "https://www.zrythm.org/en/plugins.html") (license license:agpl3+))) +(define-public zlfo + ;; The "zlfo" package is now included in zplugins + (deprecated-package "zlfo" zplugins)) + (define-public remid-lv2 (package (name "remid-lv2") -- cgit v1.2.3 From 796c9b0bf582399112ab76a35dcd9ae42a88b19b Mon Sep 17 00:00:00 2001 From: Antoine Côté Date: Mon, 1 Feb 2021 23:30:45 -0500 Subject: gnu: Add font-fira-go. * gnu/packages/fonts.scm (font-fira-go): New variable. Signed-off-by: Leo Famulari --- gnu/packages/fonts.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 11a8e6261b..b3a45a0df2 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2020 Simen Endsjø ;;; Copyright © 2020 Tim Van den Langenbergh ;;; Copyright © 2020 Nicolò Balzarotti +;;; Copyright © 2021 Antoine Côté ;;; ;;; This file is part of GNU Guix. ;;; @@ -1031,6 +1032,27 @@ Sans Pro family.") (description "This is the typeface used by Mozilla in Firefox OS.") (license license:silofl1.1))) +(define-public font-fira-go + (package + (name "font-fira-go") + (version "1.000") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bBoxType/FiraGO") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10rcfg1fijv00yxv5n9l3lm0axhafa1irkg42zpmasd70flgg655")))) + (build-system font-build-system) + (home-page "https://github.com/bBoxType/FiraGO") + (synopsis "Multilingual extension of the Fira Sans font family") + (description "FiraGO is a multilingual extension of the Fira Sans font +family. Based on the Fira Sans 4.3 glyph set, FiraGO adds support for the +Arabic, Devanagari, Georgian, Hebrew and Thai scripts.") + (license license:silofl1.1))) + (define-public font-fira-code (package (name "font-fira-code") -- cgit v1.2.3 From b66d9db336a88aca386ee21c5821a8f98789205a Mon Sep 17 00:00:00 2001 From: Alexandr Vityazev Date: Sat, 30 Jan 2021 23:40:46 +0300 Subject: gnu: emacs-imenu-list: Update to 0.8-0.46008. * gnu/packages/emacs-xyz.scm (emacs-imenu-list): Update to 0.8-0.46008. Fixes in that commit adapt the display function for changes in emacs 27.0.50. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 395be23aaa..eaf2bf4900 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2610,29 +2610,32 @@ using the DOT syntax, and use Graphviz to convert these files to diagrams.") (license license:gpl2+))) (define-public emacs-imenu-list - (package - (name "emacs-imenu-list") - (version "0.8") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/bmag/imenu-list") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "13xh9bdl3k6ccfq83wjmkpi4269qahv4davki4wq18dr4amrzhlx")))) - (build-system emacs-build-system) - (home-page "https://github.com/bmag/imenu-list") - (synopsis - "Automatically tracks the current buffer's imenu entries") - (description - "This Emacs minor mode creates an automatically updated buffer called + (let ((commit "46008738f8fef578a763c308cf6695e5b4d4aa77") + (revision "0") + (version "0.8")) + (package + (name "emacs-imenu-list") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/bmag/imenu-list") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14l3yw9y1nk103s7z5i1fmd6kvlb2p6ayi6sf9l1x1ydg9glrpl8")))) + (build-system emacs-build-system) + (home-page "https://github.com/bmag/imenu-list") + (synopsis + "Automatically tracks the current buffer's imenu entries") + (description + "This Emacs minor mode creates an automatically updated buffer called @code{*Ilist*} that is populated with the current buffer's imenu entries. This buffer is typically shown as a sidebar (Emacs vertically splits the window).") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-mmm-mode (package -- cgit v1.2.3 From 13b2c44e5abe329e4fad6364601e579d2bddfe1c Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 1 Feb 2021 13:47:21 +0100 Subject: gnu: emacs-rg: Fix use on remote systems. * gnu/packages/emacs-xyz.scm (emacs-rg)[inputs]: Remove. Move ripgrep to... [propagated-inputs]: ... here. This also gives access to ripgrep's manual. [arguments]: Replace the full path with the executable name. --- gnu/packages/emacs-xyz.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index eaf2bf4900..efd80c14c5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe -;;; Copyright © 2017, 2018, 2019, 2020 Clément Lassieur +;;; Copyright © 2017, 2018, 2019, 2020, 2021 Clément Lassieur ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017, 2018 Kyle Meyer ;;; Copyright © 2017 Kei Kebreau @@ -3851,19 +3851,18 @@ result.") (arguments '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'hardcode-rg-path - ;; Hardcode the path to ripgrep. + (add-after 'unpack 'remove-rg-path + ;; Remove the path to ripgrep so that it works on remote systems. (lambda _ (let ((file "rg.el")) (chmod file #o644) (emacs-substitute-sexps file - ("(defcustom rg-executable" (which "rg"))))))))) + ("(defcustom rg-executable" "rg")))))))) (propagated-inputs `(("emacs-s" ,emacs-s) ("emacs-transient" ,emacs-transient) - ("emacs-wgrep" ,emacs-wgrep))) - (inputs - `(("ripgrep" ,ripgrep))) + ("emacs-wgrep" ,emacs-wgrep) + ("ripgrep" ,ripgrep))) (home-page "https://rgel.readthedocs.io/en/latest/") (synopsis "Search tool based on @code{ripgrep}") (description -- cgit v1.2.3 From 966bdd118172d12b39fd2e97e98ec15b0865a4db Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Wed, 27 Jan 2021 20:44:42 -0300 Subject: gnu: Add md4c. * gnu/packages/markup.scm (md4c): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/markup.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index af08774c70..95a3eb269e 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Nikita ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 EuAndreh ;;; ;;; This file is part of GNU Guix. ;;; @@ -277,3 +278,25 @@ Smu was started as a rewrite of Markdown but became something more lightweight and consistent. The biggest difference between Markdown and smu is that smu doesn't support reference style links.") (license x11))) + +(define-public md4c + (package + (name "md4c") + (version "0.4.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mity/md4c/") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0m3202zzjvw4k7jw66z1qi3cbisxzvplq5alkygpifvhzm81gwwx")))) + (build-system cmake-build-system) + (arguments '(#:tests? #f)) + (home-page "https://github.com/mity/md4c/") + (synopsis "C Markdown parser compliant to CommonMark") + (description "MD4C is a C Markdown parser with a +SAX-like interface. It is compliant to the CommonMark specification, +with a few extensions.") + (license expat))) -- cgit v1.2.3 From 4264cf97c9ed51ec26ffb24bf69ec1ef655fe79e Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 2 Feb 2021 09:40:17 +0100 Subject: gnu: Add python-pymd4c. * gnu/packages/python-xyz.scm (python-pymd4c): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bda2bcc970..2a392d69c5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -95,6 +95,7 @@ ;;; Copyright © 2019 Kristian Trandem ;;; Copyright © 2020, 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Morgan Smith +;;; Copyright © 2020 EuAndreh ;;; ;;; This file is part of GNU Guix. ;;; @@ -154,6 +155,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages man) + #:use-module (gnu packages markup) #:use-module (gnu packages maths) #:use-module (gnu packages monitoring) #:use-module (gnu packages multiprecision) @@ -475,6 +477,30 @@ EasyGUI is NOT event-driven. Instead, all GUI interactions are invoked by simple function calls.") (license license:bsd-3))) +(define-public python-pymd4c + (package + (name "python-pymd4c") + (version "0.4.6.0b1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pymd4c" version)) + (sha256 + (base32 "07s3arn85ri92im6x3ipljdmrxmpik7irs06i6lm17j1x6j9841d")))) + (build-system python-build-system) + (inputs + `(("md4c" ,md4c))) + (native-inputs + `(("python-flake8" ,python-flake8) + ("python-pkgconfig" ,python-pkgconfig) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/dominickpastore/pymd4c") + (synopsis "Python bindings for MD4C") + (description + "PyMD4C provides Python bindings for MD4c, a C Markdown parser, compliant +to CommonMark.") + (license license:expat))) + (define-public python-pymediainfo (package (name "python-pymediainfo") -- cgit v1.2.3 From e5c1348a8c4176325001578b8d285d241a44609f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Feb 2021 09:54:15 +0100 Subject: gnu: Add python-sphinx-argparse. * gnu/packages/sphinx.scm (python-sphinx-argparse): New variable. --- gnu/packages/sphinx.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 7da42d958c..cbf0d21f51 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2017 Christopher Allan Webber ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2019 Efraim Flashner -;;; Copyright © 2019 Nicolas Goaziou +;;; Copyright © 2019, 2021 Nicolas Goaziou ;;; Copyright © 2019 Alexandros Theodotou ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Giacomo Leidi @@ -439,6 +439,30 @@ theme for the Sphinx documentation system. It's the default theme of Sphinx.") (define-public python2-sphinx-alabaster-theme (package-with-python2 python-sphinx-alabaster-theme)) +(define-public python-sphinx-argparse + (package + (name "python-sphinx-argparse") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sphinx-argparse" version)) + (sha256 + (base32 "05wc8f5hb3jsg2vh2jf7jsyan8d4i09ifrz2c8fp6f7x1zw9iav0")))) + (build-system python-build-system) + (propagated-inputs + `(("python-sphinx" ,python-sphinx))) + (native-inputs + `(("python-commonmark" ,python-commonmark) + ("python-pytest" ,python-pytest) + ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme))) + (home-page "https://github.com/ribozz/sphinx-argparse") + (synopsis "Sphinx extension for documenting argparse commands and options") + (description + "This package is a sphinx extension that automatically documents +argparse commands and options") + (license license:expat))) + (define-public python-sphinx-cloud-sptheme (package (name "python-sphinx-cloud-sptheme") -- cgit v1.2.3 From 8eb32ee0598308c9527e4d58e93456ac4717ea62 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Feb 2021 09:57:03 +0100 Subject: gnu: Add python-yamllint. * gnu/packages/python-xyz.scm (python-yamllint): New variable. --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2a392d69c5..3d29bd5931 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17798,6 +17798,29 @@ user's @file{~/Trash} directory.") "@code{pyfavicon} is an async favicon fetcher.") (license license:expat))) +(define-public python-yamllint + (package + (name "python-yamllint") + (version "1.26.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "yamllint" version)) + (sha256 + (base32 "11qhs1jk9pwvyk5k3q5blh9sq42dh1ywdf1f3i2zixf7hncwir5h")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pathspec" ,python-pathspec) + ("python-pyyaml" ,python-pyyaml) + ("python-setuptools" ,python-setuptools))) + (home-page "https://github.com/adrienverge/yamllint") + (synopsis "Linter for YAML files") + (description + "Yamllint is a linter for YAML files. yamllint does not only check for +syntax validity, but for weirdnesses like key repetition and cosmetic problems +such as lines length, trailing spaces, indentation, etc.") + (license license:gpl3+))) + (define-public python-yapf (package (name "python-yapf") -- cgit v1.2.3 From 868d2420f0aadf92bb751a37474afa2a181956d0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Feb 2021 09:59:22 +0100 Subject: gnu: Add python-flake8-implicit-str-concat. * gnu/packages/python-xyz.scm (python-flake8-implicit-str-concat): New variable. --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3d29bd5931..4e992cde86 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8444,6 +8444,31 @@ design problems in your program. It contains warnings that don't belong in pyflakes and pycodestyle.") (license license:expat))) +(define-public python-flake8-implicit-str-concat + (package + (name "python-flake8-implicit-str-concat") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "flake8_implicit_str_concat" version)) + (sha256 + (base32 "1v0y29xlmbr2q12a4nnpm1dm9aw1mjiys1x8jif4z8c90d63cqm6")))) + (build-system python-build-system) + (propagated-inputs + `(("python-attrs" ,python-attrs) + ("python-more-itertools" ,python-more-itertools))) + (home-page "https://github.com/keisheiled/flake8-implicit-str-concat") + (synopsis "Flake8 plugin to encourage correct string literal concatenation") + (description + "This is a plugin for the Python code checking tool Flake8 to encourage +correct string literal concatenation. + +It looks for style problems like implicitly concatenated string literals on +the same line (which can be introduced by the code formating tool Black), or +unnecessary plus operators for explicit string literal concatenation.") + (license license:expat))) + (define-public python-flake8-polyfill (package (name "python-flake8-polyfill") -- cgit v1.2.3 From 7594f660db87e125dac7cefa4e13008389586f47 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Feb 2021 10:01:27 +0100 Subject: gnu: Add python-flake8-print. * gnu/packages/python-xyz.scm (python-flake8-print): New variable. --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4e992cde86..c9548cdac0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8512,6 +8512,28 @@ plugins that intend to support Flake8 2.x and 3.x simultaneously.") (define-public python2-flake8-polyfill (package-with-python2 python-flake8-polyfill)) +(define-public python-flake8-print + (package + (name "python-flake8-print") + (version "4.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "flake8-print" version)) + (sha256 + (base32 "05k5kkvyk6fdmvnacxfzypk74vbl3pmva13dqg1aljfwnxsc7yjs")))) + (build-system python-build-system) + (propagated-inputs + `(("python-flake8" ,python-flake8) + ("python-pycodestyle" ,python-pycodestyle) + ("python-six" ,python-six))) + (home-page "https://github.com/jbkahn/flake8-print") + (synopsis "Print statement checker plugin for Flake8") + (description + "This plugin for Flake8 checks for @code{print} statements in Python +files.") + (license license:expat))) + (define-public python-flake8-pyi (package (name "python-flake8-pyi") -- cgit v1.2.3 From c1377a323c0e77ed438c3f831aa726b3622e23b5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Feb 2021 10:03:06 +0100 Subject: gnu: Add python-pre-commit. * gnu/packages/python-xyz.scm (python-pre-commit): New variable. --- gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c9548cdac0..068c2d2c1f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19913,6 +19913,37 @@ Features: @end itemize") (license license:asl2.0))) +(define-public python-pre-commit + (package + (name "python-pre-commit") + (version "2.10.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pre_commit" version)) + (sha256 + (base32 "1ycf6wpxrhxhdzz0vpryhbdxlwik5khgcvp3hxwvfr447a6k84zl")))) + (build-system python-build-system) + (arguments + ;; Tests fail with "AttributeError: module 'pre_commit.resources' has no + ;; attribute 'empty_template_setup'". + `(#:tests? #false)) + (propagated-inputs + `(("python-cfgv" ,python-cfgv) + ("python-identify" ,python-identify) + ("python-importlib-metadata" ,python-importlib-metadata) + ("python-importlib-resources" ,python-importlib-resources) + ("python-nodeenv" ,python-nodeenv) + ("python-pyyaml" ,python-pyyaml) + ("python-toml" ,python-toml) + ("python-virtualenv" ,python-virtualenv))) + (home-page "https://github.com/pre-commit/pre-commit") + (synopsis "Framework for managing multi-language pre-commit hooks") + (description + "This package provides a framework for managing and maintaining +multi-language pre-commit hooks.") + (license license:expat))) + (define-public python-precis-i18n (package (name "python-precis-i18n") -- cgit v1.2.3 From 3ee3e98971d37b176d5b167091aa6a13d4285c9e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Feb 2021 10:05:09 +0100 Subject: gnu: Add python-bump2version. * gnu/packages/python-xyz.scm (python-bump2version): New variable. --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 068c2d2c1f..9ca1f624b0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3609,6 +3609,29 @@ text styles of documentation.") (base32 "1zmhnswy0wxfn0xprs9aqsvx2c3kmzfn2wx14q8cv3vpkxdamj4q"))))))) +(define-public python-bump2version + (package + (name "python-bump2version") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "bump2version" version)) + (sha256 + (base32 "1rinm4gv1fyh7xjv3v6r1p3zh5kl4ry2qifz5f7frx31mnzv4b3n")))) + (build-system python-build-system) + (arguments + ;; XXX: Tests fail with "bumpversion: error: the following arguments are + ;; required: --new-version". + `(#:tests? #false)) + (home-page "https://github.com/c4urself/bump2version") + (synopsis "Version-bump your software with a single command!") + (description + "This package provides a small command line tool to simplify releasing +software by updating all version strings in your source code by the correct +increment. It also creates commits and tags.") + (license license:expat))) + (define-public python-bumpversion (package (name "python-bumpversion") -- cgit v1.2.3 From 625708b03a37fc2a33c437b8e27856ca76965f43 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 2 Feb 2021 09:41:34 +0100 Subject: gnu: Add mdpo. gnu/packages/gettext.scm (mdpo): New variable. gnu/packages/python-xyz (python-polib): Update to 1.1.0. Signed-off-by: Nicolas Goaziou --- gnu/packages/gettext.scm | 42 +++++++++++++++++++++++++++++++++++++++++- gnu/packages/python-xyz.scm | 4 ++-- 2 files changed, 43 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index de28c2341b..bee33f2685 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Miguel ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020 EuAndreh ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,12 +28,14 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages gettext) - #:use-module ((guix licenses) #:select (gpl2+ gpl3+)) + #:use-module ((guix licenses) #:select (gpl2+ gpl3+ bsd-3)) #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) + #:use-module (guix build-system python) + #:use-module (gnu packages check) #:use-module (gnu packages docbook) #:use-module (gnu packages emacs) #:use-module (gnu packages hurd) @@ -42,6 +45,8 @@ #:use-module (gnu packages perl-check) #:use-module (gnu packages tex) #:use-module (gnu packages xml) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (guix utils)) (define-public gettext-minimal @@ -183,6 +188,41 @@ allows applications to emit text annotated with styling information, such as color, font attributes (weight, posture), or underlining.") (license gpl3+))) +(define-public mdpo + (package + (name "mdpo") + (version "0.3.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mdpo" version)) + (sha256 + (base32 "0kgbm0af7jwpfspa2xxiy9nc2l1r2s1rhbhz4r229zcqv49ak6sq")))) + (build-system python-build-system) + (native-inputs + `(("python-bump2version" ,python-bump2version) + ("python-flake8" ,python-flake8) + ("python-flake8-implicit-str-concat" ,python-flake8-implicit-str-concat) + ("python-flake8-print" ,python-flake8-print) + ("python-isort" ,python-isort) + ("python-pre-commit" ,python-pre-commit) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-sphinx" ,python-sphinx) + ("python-sphinx-argparse" ,python-sphinx-argparse) + ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) + ("python-twine" ,python-twine) + ("python-yamllint" ,python-yamllint))) + (propagated-inputs + `(("python-polib" ,python-polib) + ("python-pymd4c" ,python-pymd4c))) + (home-page "https://github.com/mondeja/mdpo") + (synopsis "Markdown file translation utilities using pofiles") + (description + "The mdpo utility creates pofiles, the format stabilished by GNU Gettext, +from Markdown files.") + (license bsd-3))) + (define-public po4a (package (name "po4a") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9ca1f624b0..33ac58a568 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2251,13 +2251,13 @@ syntax.") (define-public python-polib (package (name "python-polib") - (version "1.0.8") + (version "1.1.0") (source (origin (method url-fetch) (uri (pypi-uri "polib" version)) (sha256 (base32 - "1pq2hbm3m2q0cjdszk8mc4qa1vl3wcblh5nfyirlfnzb2pcy7zss")))) + "0aikb8gcarhifn3sadrbbs5czagih9hjv250gsrgy9v1d49pvn7s")))) (build-system python-build-system) (home-page "https://bitbucket.org/izi/polib/wiki/Home") (synopsis "Manipulate, create and modify gettext files") -- cgit v1.2.3 From 90ad8bd1a63abbf94f2ebb9f10630773d1f15ece Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Thu, 21 Jan 2021 23:06:52 +0800 Subject: gnu: ecl: Propagate some dependencies used in header files. * gnu/packages/lisp.scm(ecl)[inputs]: Move gmp, libatomic-ops, libgc and libffi to... [propagated-inputs]: ... here. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 3c09b0af8a..69011a3197 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -236,7 +236,13 @@ interface to the Tk widget system.") `(("cl-asdf" ,cl-asdf) ("which" ,which) ("texinfo" ,texinfo))) - (inputs + ;; When ECL is embedded in a program that wants to use Common Lisp as an + ;; extension language, libgmp, libatomic-ops, libgc and libffi must be + ;; present when compiling the program because they are required by ECL's + ;; header file. + ;; Therefore we put these libraries in 'propagated-inputs' instead + ;; of 'inputs'. + (propagated-inputs `(("gmp" ,gmp) ("libatomic-ops" ,libatomic-ops) ("libgc" ,libgc) -- cgit v1.2.3 From 13337a2fa081dea78b46615349eaa599740de6cb Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 1 Feb 2021 23:51:40 +0000 Subject: gnu: sbcl-3bz: Update to 0.0.0-1.569614c. * gnu/packages/lisp-xyz.scm (sbcl-3bz): Update to 0.0.0-1.569614c. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7cfd4b2a6b..1f01412b4c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11017,8 +11017,8 @@ than a few Kb.") (sbcl-package->ecl-package sbcl-mmap)) (define-public sbcl-3bz - (let ((commit "d6119083b5e0b0a6dd3abc2877936c51f3f3deed") - (revision "0")) + (let ((commit "569614c40408f3aefc77ba233e0e4bd66d3850ad") + (revision "1")) (package (name "sbcl-3bz") (version (git-version "0.0.0" revision commit)) @@ -11030,7 +11030,7 @@ than a few Kb.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0fyxzyf2b6sc0w8d9g4nlva861565z6f3xszj0lw29x526dd9rhj")))) + (base32 "0kvvlvf50jhhw1s510f3clpr1a68632bq6d698yxcrx722igcrg4")))) (build-system asdf-build-system/sbcl) (inputs `(("alexandria" ,sbcl-alexandria) @@ -11040,7 +11040,7 @@ than a few Kb.") ("nibbles" ,sbcl-nibbles) ("trivial-features" ,sbcl-trivial-features))) (arguments - ;; FIXME: Without the following line, the build fails (see issue 41437). + ;; FIXME: #41437 - Build fails when package name starts from a digit `(#:asd-systems '("3bz"))) (home-page "https://github.com/3b/3bz") (synopsis "Deflate decompression for Common Lisp") -- cgit v1.2.3 From 65454c1caa60c8f07833aa920648188ab6bbca85 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 2 Feb 2021 00:37:36 +0000 Subject: gnu: sbcl-parse-float: Update to 0.0.0-2.3074765. * gnu/packages/listp-xyz.scm (sbcl-parse-float): Update to 0.0.0-2.3074765. [native-inputs]: Remove prove, add lisp-unit. [inputs]: Remove babel. [arguments]: Enable tests. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 1f01412b4c..736dbfca37 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2323,10 +2323,11 @@ pattern-matching-like, but a char-by-char procedural parser.") (sbcl-package->ecl-package sbcl-proc-parse)) (define-public sbcl-parse-float - (let ((commit "2aae569f2a4b2eb3bfb5401a959425dcf151b09c")) + (let ((commit "3074765101e41222b6b624a66aaf1e6416379f9c") + (revision "2")) (package (name "sbcl-parse-float") - (version (git-version "0.0.0" "1" commit)) + (version (git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2334,23 +2335,21 @@ pattern-matching-like, but a char-by-char procedural parser.") (url "https://github.com/soemraws/parse-float") (commit commit))) (sha256 - (base32 - "08xw8cchhmqcc0byng69m3f5a2izc9y2290jzz2k0qrbibp1fdk7")) + (base32 "0jd2spawc3v8vzqf8ky4cngl45jm65fhkrdf20mf6dcbn3mzpkmr")) (file-name (git-file-name "proc-parse" version)))) (build-system asdf-build-system/sbcl) - (inputs - `(("alexandria" ,sbcl-alexandria) - ("babel" ,sbcl-babel))) - (native-inputs - `(("prove" ,sbcl-prove))) (arguments - ;; TODO: Tests don't find "proc-parse-test", why? - `(#:tests? #f)) + ;; FIXME: https://github.com/soemraws/parse-float/issues/12 + `(#:asd-systems '("parse-float" "parse-float-tests"))) + (native-inputs + `(("lisp-unit" ,sbcl-lisp-unit))) + (inputs + `(("alexandria" ,sbcl-alexandria))) + (home-page "https://github.com/soemraws/parse-float") (synopsis "Parse a floating point value from a string in Common Lisp") (description "This package exports the following function to parse floating-point values from a string in Common Lisp.") - (home-page "https://github.com/soemraws/parse-float") (license license:public-domain)))) (define-public cl-parse-float -- cgit v1.2.3 From 5be01dcdc1c8fa89fd120919258b574c844c13cb Mon Sep 17 00:00:00 2001 From: Alexey Abramov Date: Fri, 15 Jan 2021 17:26:37 +0100 Subject: gnu: obs: Use an environment variable for plugins location. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/video.scm (obs): Use it. * gnu/packages/patches/obs-modules-location.patch: Patch it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/patches/obs-modules-location.patch | 33 +++++++++++++++++++++++++ gnu/packages/video.scm | 14 ++++++++++- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/obs-modules-location.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index d53ed440f9..49a5925280 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1411,6 +1411,7 @@ dist_patch_DATA = \ %D%/packages/patches/nvi-dbpagesize-binpower.patch \ %D%/packages/patches/nvi-db4.patch \ %D%/packages/patches/nyacc-binary-literals.patch \ + %D%/packages/patches/obs-modules-location.patch \ %D%/packages/patches/ocaml-bitstring-fix-configure.patch \ %D%/packages/patches/ocaml-cairo2-caml_ba_array-fix.patch \ %D%/packages/patches/ocaml-CVE-2015-8869.patch \ diff --git a/gnu/packages/patches/obs-modules-location.patch b/gnu/packages/patches/obs-modules-location.patch new file mode 100644 index 0000000000..18b286d006 --- /dev/null +++ b/gnu/packages/patches/obs-modules-location.patch @@ -0,0 +1,33 @@ +From d250434e6c8eb4f8c8cb47ef3cc6e6de8fa8f828 Mon Sep 17 00:00:00 2001 +From: Alexey Abramov +Date: Fri, 15 Jan 2021 17:07:17 +0100 +Subject: [PATCH] Use environment variable for a default module location + +diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c +index 382fa0546..481ea0f14 100644 +*** a/libobs/obs-nix.c +--- b/libobs/obs-nix.c +@@ -66,8 +66,19 @@ + + void add_default_module_paths(void) + { +- for (int i = 0; i < module_patterns_size; i++) +- obs_add_module_path(module_bin[i], module_data[i]); ++ char *bin_directory = getenv("OBS_PLUGINS_DIRECTORY"); ++ char *data_directory = getenv("OBS_PLUGINS_DATA_DIRECTORY"); ++ if (bin_directory && data_directory) { ++ struct dstr dstr_data_directory; ++ dstr_init_copy(&dstr_data_directory, data_directory); ++ dstr_cat(&dstr_data_directory, "/%module%"); ++ obs_add_module_path(bin_directory, dstr_data_directory.array); ++ dstr_free(&dstr_data_directory); ++ ++ } else { ++ for (int i = 0; i < module_patterns_size; i++) ++ obs_add_module_path(module_bin[i], module_data[i]); ++ } + } + + /* +-- +2.29.2 \ No newline at end of file diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index cd049fb375..ef80cb4cc2 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -47,6 +47,7 @@ ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Ivan Kozlov ;;; Copyright © 2020 Antoine Côté +;;; Copyright © 2021 Alexey Abramov ;;; ;;; This file is part of GNU Guix. ;;; @@ -3083,7 +3084,9 @@ be used for realtime video capture via Linux-specific APIs.") (file-name (git-file-name name version)) (sha256 (base32 - "1k1asqiqw757v59ayx0w029ril947hs0lcp8n91knzjl891fr4nc")))) + "1k1asqiqw757v59ayx0w029ril947hs0lcp8n91knzjl891fr4nc")) + (patches + (search-patches "obs-modules-location.patch")))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -3098,6 +3101,15 @@ be used for realtime video capture via Linux-specific APIs.") (wrap-program (string-append out "/bin/obs") `("QT_PLUGIN_PATH" ":" prefix (,plugin-path)))) #t))))) + (native-search-paths + (list (search-path-specification + (variable "OBS_PLUGINS_DIRECTORY") + (separator #f) ;single entry + (files '("lib/obs-plugins"))) + (search-path-specification + (variable "OBS_PLUGINS_DATA_DIRECTORY") + (separator #f) ;single entry + (files '("share/obs/obs-plugins"))))) (native-inputs `(("cmocka" ,cmocka) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From deadd9789759a66426707f52a9308e671c717d13 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Mon, 18 Jan 2021 19:39:44 +0300 Subject: gnu: Add obs-spectralizer. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (obs-spectralizer): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/video.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ef80cb4cc2..19ecd6072c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3141,6 +3141,33 @@ and JACK.") (home-page "https://obsproject.com") (license license:gpl2+))) +(define-public obs-spectralizer + (package + (name "obs-spectralizer") + (version "1.3.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/univrsal/spectralizer") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0q75cnyqydpvfda51zm9gxqj3wqr99ad0lxzjhw0ld67qvj1ag6i")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f + #:configure-flags + (list "-DGLOBAL_INSTALLATION=ON" "-DUSE_CMAKE_LIBDIR=ON"))) + (inputs `(("obs" ,obs) + ("fftw" ,fftw))) + (home-page "https://github.com/univrsal/spectralizer") + (synopsis "OBS plugin for audio visualization") + (description "This OBS plugins allows you to vizualize MPD and internal +OBS audio sources.") + (license license:gpl2))) + (define-public libvdpau (package (name "libvdpau") -- cgit v1.2.3 From 84929062e3b6601dad5a8a97776c90ba4a4bf731 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 2 Feb 2021 10:48:36 +0100 Subject: gnu: obs-spectralizer: Remove bundled Windows DLLs. * gnu/packages/video.scm (obs-spectralizer)[source]: Add 'snippet' and 'modules'. --- gnu/packages/video.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 19ecd6072c..ffa7e25023 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3152,6 +3152,11 @@ and JACK.") (url "https://github.com/univrsal/spectralizer") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + + ;; Remove bundled Windows DLLs. + (snippet '(delete-file-recursively "fftw3")) + (modules '((guix build utils))) + (sha256 (base32 "0q75cnyqydpvfda51zm9gxqj3wqr99ad0lxzjhw0ld67qvj1ag6i")))) -- cgit v1.2.3 From aee9f696b1d9bd3c41dddc81997a4f0e73081cea Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Mon, 18 Jan 2021 19:27:43 +0300 Subject: gnu: Add obs-wlrobs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (obs-wlrobs): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/video.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ffa7e25023..4c555a5622 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -48,6 +48,7 @@ ;;; Copyright © 2020 Ivan Kozlov ;;; Copyright © 2020 Antoine Côté ;;; Copyright © 2021 Alexey Abramov +;;; Copyright © 2021 Andrew Tropin ;;; ;;; This file is part of GNU Guix. ;;; @@ -74,6 +75,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix svn-download) + #:use-module (guix hg-download) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) @@ -3173,6 +3175,35 @@ and JACK.") OBS audio sources.") (license license:gpl2))) +(define-public obs-wlrobs + (package + (name "obs-wlrobs") + (version "1.0") + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://hg.sr.ht/~scoopta/wlrobs") + (changeset (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1faiq2gdb7qis3m1hilm4pz8lkmkab75vzm608dbiazahhybf96p")))) + (build-system meson-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (propagated-inputs `() ) + (inputs `(("obs" ,obs) + ("libx11" ,libx11 "out") + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols))) + (home-page "https://hg.sr.ht/~scoopta/wlrobs") + (synopsis "OBS plugin for Wayland (wlroots) screen capture") + (description + "This OBS plugin allows you to capture the screen on wlroots-based +Wayland compositors.") + (license license:gpl3+))) + (define-public libvdpau (package (name "libvdpau") -- cgit v1.2.3 From c852d897551f514de95c224fa79e748f48808068 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Mon, 25 Jan 2021 14:00:23 -0500 Subject: gnu: Add quark. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web.scm (quark): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/web.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8cbcfd011e..879eb160ea 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8015,3 +8015,41 @@ handling library written in C89 (\"ANSI C\"). uriparser is fast and supports Unicode.") (home-page "https://uriparser.github.io/") (license license:bsd-3)))) + +(define-public quark + ;; No releases yet + (let ((revision "0") + (commit "c6a9055e5a30be570e30da8d216c39662c3a3f99")) + (package + (name "quark") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.suckless.org/quark/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1znvnr30xi5vgd6n3wvgv9pwj992zpzzjk0fmq28ydf1l6kqvkm7")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ; no configure script + (home-page "https://tools.suckless.org/quark/") + (synopsis "Small and simple HTTP GET/HEAD-only web server for static +content") + (description "Quark is an extremely small and simple HTTP GET/HEAD only +web server for static content. TLS is not natively supported and should be +provided by a TLS reverse proxy (e.g. tlstunnel, hitch or stunnel).") + (license license:isc) + + ;; XXX: Ignore this CVE to work around a name clash with the unrelated + ;; "cpe:2.3:a:comelz:quark" package. The proper fix is for (guix cve) + ;; to account for "vendor names". + (properties '((lint-hidden-cve . ("CVE-2019-15520"))))))) -- cgit v1.2.3 From 3e82cd8bfc146d62cd1192a5d8903eb068aa6d0c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 2 Feb 2021 14:15:50 +0100 Subject: gnu: cuirass: Update to 0.0.1-65.6bd940f. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-65.6bd940f. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 9a08ac4c23..fe2ef7bb83 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "79b77b4377db2e79a1f3396cfeeca64bfab00341") - (revision "64")) + (let ((commit "6bd940fc24646533ed2c113d9b551d23fe4f030d") + (revision "65")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -61,7 +61,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0wrpzhcs1cvc5c4s72zs100iw0f4nnv5j2lp6yz3j31zl92vxbis")))) + "0nv8y6dm17m4z28aqr47ch4l4qaqr1zixdv7jajxdky9dqy085vm")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From b230a47fdbd340bc3ee9d991abb4acc52ca30eb4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Feb 2021 15:26:51 +0100 Subject: gnu: xbindkey: Order inputs alphabetically. * gnu/packages/xdisorg.scm (xbindkeys)[inputs]: Swap them. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 79ba61b344..92f9c565b1 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -957,8 +957,8 @@ transparent text on your screen.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("libx11" ,libx11) - ("guile" ,guile-2.2))) + `(("guile" ,guile-2.2) + ("libx11" ,libx11))) (home-page "https://www.nongnu.org/xbindkeys/") (synopsis "Associate a combination of keys with a shell command") (description -- cgit v1.2.3 From a6e47aaa9feb2a3cc59bd25d7839f67caada5d35 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Feb 2021 15:32:59 +0100 Subject: Order (gnu packages xdisorg) module imports more alphabetically. * gnu/packages/xdisorg.scm: Somewhat sort the module imports. --- gnu/packages/xdisorg.scm | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 92f9c565b1..26f60a31a4 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -60,54 +60,54 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages xdisorg) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix hg-download) - #:use-module (guix utils) #:use-module (guix build-system cmake) - #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix build-system scons) - #:use-module (gnu packages) - #:use-module (gnu packages documentation) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix hg-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) #:use-module (gnu packages admin) - #:use-module (gnu packages base) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages compression) - #:use-module (gnu packages image) - #:use-module (gnu packages pkg-config) + #:use-module (gnu packages documentation) #:use-module (gnu packages flex) + #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gtk) + #:use-module (gnu packages guile) #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages icu4c) + #:use-module (gnu packages image) + #:use-module (gnu packages linux) + #:use-module (gnu packages m4) #:use-module (gnu packages man) #:use-module (gnu packages maths) - #:use-module (gnu packages m4) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) - #:use-module (gnu packages linux) - #:use-module (gnu packages gl) - #:use-module (gnu packages guile) - #:use-module (gnu packages xml) - #:use-module (gnu packages gtk) #:use-module (gnu packages qt) - #:use-module (gnu packages xorg) - #:use-module (gnu packages fontutils) - #:use-module (gnu packages bison) #:use-module (gnu packages sphinx) + #:use-module (gnu packages xml) + #:use-module (gnu packages xorg) + #:use-module (gnu packages) #:use-module (ice-9 match)) ;; packages outside the x.org system proper -- cgit v1.2.3 From 72fabd8d6ef7fbfd19c1f1ef294b26e3c5a16bbf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Feb 2021 15:39:02 +0100 Subject: gnu: xbindkeys: Refer to tk's wish interpreter. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/packages/xdisorg.scm (xbindkeys)[arguments]: Add a ‘sanitise-shebang’ phase. [inputs]: Add tk. --- gnu/packages/xdisorg.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 26f60a31a4..4d1dc8391c 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -105,6 +105,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sphinx) + #:use-module (gnu packages tcl) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages) @@ -954,11 +955,23 @@ transparent text on your screen.") (base32 "1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'sanitise-shebang + ;; This wish script uses a strange double shebang that escapes our + ;; patch-shebangs phase. Assume that it's unnecessary & replace it. + (lambda _ + (substitute* "xbindkeys_show" + (("^#!.*|^exec wish.*") "") + (("^# \\\\") (string-append "#!" (which "wish")))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.2) - ("libx11" ,libx11))) + ("libx11" ,libx11) + ("tk" ,tk))) (home-page "https://www.nongnu.org/xbindkeys/") (synopsis "Associate a combination of keys with a shell command") (description -- cgit v1.2.3 From 2c9d481c9098e18accd179f11edc1164e75f228e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Feb 2021 15:47:21 +0100 Subject: gnu: xbindkeys: Refer to xbindkeys in xbindkeys_show. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xdisorg.scm (xbindkeys)[arguments]: Add a ‘patch-references’ phase. --- gnu/packages/xdisorg.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 4d1dc8391c..6b4d3f4a8a 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -965,7 +965,14 @@ transparent text on your screen.") (substitute* "xbindkeys_show" (("^#!.*|^exec wish.*") "") (("^# \\\\") (string-append "#!" (which "wish")))) - #t))))) + #t)) + (add-after 'unpack 'patch-references + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "xbindkeys_show" + (("\"(xbindkeys)\"" _ command) + (format #f "\"~a/bin/~a\"" out command))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From eee86c6e5bd99102aa08d0c9be4407738abeb10d Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 1 Feb 2021 20:14:31 +0000 Subject: gnu: python-xlib: Update to 0.29. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make python-six a propagated input as it's used at runtime. * gnu/packages/python-xyz.scm (python-xlib): Update to 0.29. [native-inputs]: Move python-six to… [propagated-inputs]: …here. --- gnu/packages/python-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 33ac58a568..9cf9fe8c17 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8063,7 +8063,7 @@ falling into the Python interpreter.") (define-public python-xlib (package (name "python-xlib") - (version "0.27") + (version "0.29") (source (origin (method git-fetch) @@ -8072,7 +8072,7 @@ falling into the Python interpreter.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "09kimic8rhprx3q8nzalc4aggg42ahqm4v5qcj8dm68yvxfdk986")))) + (base32 "17cwd2knqm2vwrii3kqii9abwsnydhpg4byqx1vy7rjs6i1vbqfc")))) (build-system python-build-system) (arguments `(#:phases @@ -8088,8 +8088,9 @@ falling into the Python interpreter.") (native-inputs `(("python-mock" ,python-mock) ("python-setuptools-scm" ,python-setuptools-scm) - ("python-six" ,python-six) ("xorg-server" ,xorg-server))) + (propagated-inputs + `(("python-six" ,python-six))) (home-page "https://github.com/python-xlib/python-xlib") (synopsis "Python X11 client library") (description -- cgit v1.2.3 From 5fc40f747873500adb268304156ada8823dc2358 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 1 Feb 2021 20:16:38 +0000 Subject: gnu: plover: Update to 4.0.0.dev8. This moves from Python 2 to Python 3. This is a dev release, but from nearly 2 years ago. Backing up your plover.cfg is advised by the release notes when upgrading from version 3 to 4. * gnu/packages/stenography.scm (plover): Update to 4.0.0.dev8. [arguments]: Remove. [native-inputs]: Switch to Python 3 package variants. [inputs]: Switch to Python 3 package variants, and add python-pyqt. --- gnu/packages/stenography.scm | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/stenography.scm b/gnu/packages/stenography.scm index c462deacfa..979b2c29ef 100644 --- a/gnu/packages/stenography.scm +++ b/gnu/packages/stenography.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2021 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (gnu packages) + #:use-module (gnu packages qt) #:use-module (gnu packages check) #:use-module (gnu packages libusb) #:use-module (gnu packages python) @@ -31,7 +33,7 @@ (define-public plover (package (name "plover") - (version "3.1.1") + (version "4.0.0.dev8") (source (origin (method git-fetch) @@ -40,21 +42,21 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "114rlxvq471fyifwcdcgdad79ak7q3w2lk8z9nqhz1i9fg05721c")))) + (base32 "1b2ys77bkjsdmyg97i7lq3lj45q56bycvsm06d4rs656kxhvc0a3")))) (build-system python-build-system) - (arguments - `(#:python ,python-2)) (native-inputs - `(("python2-mock" ,python2-mock) - ("python2-pytest" ,python2-pytest) - ("python2-setuptools-scm" ,python2-setuptools-scm))) + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-setuptools-scm" ,python-setuptools-scm))) (inputs - `(("python2-appdirs" ,python2-appdirs) - ("python2-dbus" ,python2-dbus) - ("python2-hidapi" ,python2-hidapi) - ("python2-pyserial" ,python2-pyserial) - ("python2-wxpython" ,python2-wxpython) - ("python2-xlib" ,python2-xlib))) + `(("python-appdirs" ,python-appdirs) + ("python-pyqt" ,python-pyqt) + ("python-babel" ,python-babel) + ("python-dbus" ,python-dbus) + ("python-hidapi" ,python-hidapi) + ("python-pyserial" ,python-pyserial) + ("python-wxpython" ,python-wxpython) + ("python-xlib" ,python-xlib))) (home-page "https://www.openstenoproject.org/plover/") (synopsis "Stenography engine") (description -- cgit v1.2.3 From 5058090ed4b6f4a9d09d74d9516295afff75ece5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Feb 2021 21:55:25 +0100 Subject: gnu: Add python-mediafile. * gnu/packages/music.scm (python-mediafile): New variable. * gnu/packages/patches/python-mediafile-wavpack.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 3 +- gnu/packages/music.scm | 26 ++++++++++ .../patches/python-mediafile-wavpack.patch | 57 ++++++++++++++++++++++ 3 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-mediafile-wavpack.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 49a5925280..b9b4b664e4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -7,7 +7,7 @@ # Copyright © 2016, 2017, 2018 Kei Kebreau # Copyright © 2016, 2017 Rene Saavedra # Copyright © 2016 Adonay "adfeno" Felipe Nogueira -# Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus +# Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus # Copyright © 2016 Ben Woodcroft # Copyright © 2016, 2017, 2018, 2019 Alex Vong # Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner @@ -1543,6 +1543,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ + %D%/packages/patches/python-mediafile-wavpack.patch \ %D%/packages/patches/python-memcached-syntax-warnings.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f8b93ae41a..4c1681f2a4 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3225,6 +3225,32 @@ streams on an individual packet/page level.") (define-public python2-mutagen (package-with-python2 python-mutagen)) +(define-public python-mediafile + (package + (name "python-mediafile") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mediafile" version)) + (patches (search-patches "python-mediafile-wavpack.patch")) + (sha256 + (base32 + "0jmsp3f57xj35ayp8b6didk85nxgl3viw34s5px3l5dwgc055yx3")))) + (build-system python-build-system) + (propagated-inputs + `(("python-mutagen" ,python-mutagen) + ("python-six" ,python-six) + ("python-tox" ,python-tox))) + (home-page "https://github.com/beetbox/mediafile") + (synopsis "Read and write audio file tags") + (description + "MediaFile is a simple interface to the metadata tags for many audio file +formats. It wraps Mutagen, a high-quality library for low-level tag +manipulation, with a high-level, format-independent interface for a common set +of tags.") + (license license:expat))) + (define-public python-musicbrainzngs (package (name "python-musicbrainzngs") diff --git a/gnu/packages/patches/python-mediafile-wavpack.patch b/gnu/packages/patches/python-mediafile-wavpack.patch new file mode 100644 index 0000000000..9839fe87b5 --- /dev/null +++ b/gnu/packages/patches/python-mediafile-wavpack.patch @@ -0,0 +1,57 @@ +This patch has already been applied upstream, but is not included in the +current release 0.6.0. + +From d2fc3b59f77c515b02dfe7ad936f89264375d2b4 Mon Sep 17 00:00:00 2001 +From: Adrian Sampson +Date: Wed, 29 Jul 2020 19:42:57 -0400 +Subject: [PATCH] Fix test for WavPack bitrate + +Fixes #34. +--- + docs/index.rst | 5 +++++ + mediafile.py | 2 +- + test/test_mediafile.py | 2 +- + 3 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/docs/index.rst b/docs/index.rst +index 7b622df..1465405 100644 +--- a/docs/index.rst ++++ b/docs/index.rst +@@ -100,6 +100,11 @@ Internals + Changelog + --------- + ++v0.7.0 ++'''''' ++ ++- Mutagen 1.45.0 or later is now required. ++ + v0.6.0 + '''''' + +diff --git a/mediafile.py b/mediafile.py +index 23fadaf..9e9d063 100644 +--- a/mediafile.py ++++ b/mediafile.py +@@ -56,7 +56,7 @@ + import six + + +-__version__ = '0.6.0' ++__version__ = '0.7.0' + __all__ = ['UnreadableFileError', 'FileTypeError', 'MediaFile'] + + log = logging.getLogger(__name__) +diff --git a/test/test_mediafile.py b/test/test_mediafile.py +index e9e1850..7f17f44 100644 +--- a/test/test_mediafile.py ++++ b/test/test_mediafile.py +@@ -907,7 +907,7 @@ class WavpackTest(ReadWriteTestBase, unittest.TestCase): + 'bitrate': 109312, + 'format': u'WavPack', + 'samplerate': 44100, +- 'bitdepth': 0, ++ 'bitdepth': 16, + 'channels': 1, + } + -- cgit v1.2.3 From e07f60274ba015fc119784ef6cca6258e9b4104f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Feb 2021 21:57:28 +0100 Subject: gnu: Add python-confuse. * gnu/packages/python-xyz.scm (python-confuse): New variable. --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9cf9fe8c17..12f8dc40da 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23555,6 +23555,28 @@ Qt applications.") of binary data.") (license license:expat))) +(define-public python-confuse + (package + (name "python-confuse") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "confuse" version)) + (sha256 + (base32 + "0r74djc8r6lfx6ldsqnhpvfsn256gsfzbl33qcm77hp2qr8h9z4j")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pathlib" ,python-pathlib) + ("python-pyyaml" ,python-pyyaml))) + (home-page "https://github.com/beetbox/confuse") + (synopsis "Painless YAML configuration.") + (description "Confuse is a configuration library for Python that uses +YAML. It takes care of defaults, overrides, type checking, command-line +integration, human-readable errors, and standard OS-specific locations.") + (license license:expat))) + (define-public python-pivy (package (name "python-pivy") -- cgit v1.2.3 From 4532a1575b8159054c90d3f16ca60d9b61777c25 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Feb 2021 21:57:34 +0100 Subject: gnu: Add python-reflink. * gnu/packages/python-xyz.scm (python-reflink): New variable. --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 12f8dc40da..e296e3c6e1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23577,6 +23577,32 @@ YAML. It takes care of defaults, overrides, type checking, command-line integration, human-readable errors, and standard OS-specific locations.") (license license:expat))) +(define-public python-reflink + (package + (name "python-reflink") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "reflink" version)) + (sha256 + (base32 + "0fkf3sd958g9hvr3jwlhnhqqzrwxljrc3grsf3yknh94vf13a9f9")))) + (build-system python-build-system) + (arguments + `(#:tests? #false)) ; almost all tests want to run mkfs.btrfs + (propagated-inputs + `(("python-cffi" ,python-cffi))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner))) + (home-page "https://gitlab.com/rubdos/pyreflink") + (synopsis "Python wrapper around reflink system call") + (description + "Python reflink wraps around platform specific @code{reflink} +implementations.") + (license license:expat))) + (define-public python-pivy (package (name "python-pivy") -- cgit v1.2.3 From dffc918af6cf6e1ce942dd329d210271ced1205d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Feb 2021 22:02:11 +0100 Subject: gnu: Add beets-next. * gnu/packages/music.scm (beets-next): New variable. --- gnu/packages/music.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 4c1681f2a4..1193c83a13 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3484,6 +3484,59 @@ websites such as Libre.fm.") of tools for manipulating and accessing your music.") (license license:expat))) +(define-public beets-next + (let ((commit "04ea754d00e2873ae9aa2d9e07c5cefd790eaee2") + (revision "1")) + (package + (inherit beets) + (name "beets-next") + (version (git-version (package-version beets) revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/beetbox/beets") + (commit commit))) + (sha256 + (base32 + "092a9sss2shhcjmpgbwvscv8brpm5970i5hddkhi81xcff3bg1h4")))) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; XXX: unclear why this fails + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "test/test_zero.py" + (("def test_album_art") "def _test_album_art")) + #t)) + (add-after 'unpack 'set-HOME + (lambda _ + (setenv "HOME" (string-append (getcwd) "/tmp")) + #t)) + (replace 'check + (lambda _ + ;; Resources must be writable. + (for-each make-file-writable + (find-files "test/rsrc" ".")) + (invoke "nosetests" "-v"))) + ;; Wrap the executable, so it can find python-gi (aka pygobject) and + ;; gstreamer plugins. + (add-after 'wrap 'wrap-typelib + (lambda* (#:key outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/beet")) + (plugins (getenv "GST_PLUGIN_SYSTEM_PATH")) + (types (getenv "GI_TYPELIB_PATH"))) + (wrap-program prog + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,plugins)) + `("GI_TYPELIB_PATH" ":" prefix (,types))) + #t)))))) + (inputs + `(("python-confuse" ,python-confuse) + ("python-mediafile" ,python-mediafile) + ("python-reflink" ,python-reflink) + ("python-requests-oauthlib" ,python-requests-oauthlib) + ,@(package-inputs beets)))))) + (define-public beets-bandcamp (package (name "beets-bandcamp") -- cgit v1.2.3 From 95aca2991bbc622c7b07c2f404681dde60fd830d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Feb 2021 22:39:11 +0100 Subject: gnu: guix: Update to 1.2.0-12.dffc918. * gnu/packages/package-management.scm (guix): Update to 1.2.0-12.dffc918. --- gnu/packages/package-management.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 669f69e755..8cfe5f3ef2 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès -;;; Copyright © 2015, 2017, 2020 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2017 Muriithi Frederick Muriuki ;;; Copyright © 2017, 2018 Oleg Pykhalov ;;; Copyright © 2017 Roel Janssen @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "d4a562ba7ac4549cc2d57eff7f440026a2045f45") - (revision 11)) + (commit "dffc918af6cf6e1ce942dd329d210271ced1205d") + (revision 12)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "05gkymzfl0fdb2zjyvvn7w15arfnn7fgpbn3bch9r5yc7ldxg868")) + "0wcwb09iy4svky5kmxwch7fymmkx78h8haam6p8ix110mm88in8k")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From c1e7ae444a77aa5cc78a715f78843ccd178c9d6b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Feb 2021 22:51:31 +0100 Subject: gnu: emacs-elfeed: Update to 3.4.0. * gnu/packages/emacs-xyz.scm (emacs-elfeed): Update to 3.4.0. --- 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 efd80c14c5..be5b707b4c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8798,7 +8798,7 @@ and tooling.") (define-public emacs-elfeed (package (name "emacs-elfeed") - (version "3.3.0") + (version "3.4.0") (source (origin (method git-fetch) @@ -8807,7 +8807,7 @@ and tooling.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0j8a94val4ml7g1vcjgzk1w89h55sxfdrwnncmz6qbh1y2xsz8c5")))) + (base32 "1y95410hrcp23zc84sn79bxla9xr2fqh7wwagza05iaprv7zbbw0")))) (build-system emacs-build-system) (arguments `(#:tests? #t -- cgit v1.2.3 From d65a25c9a2fdc9940c691afd8a10c7d489052cdf Mon Sep 17 00:00:00 2001 From: Antoine Côté Date: Tue, 2 Feb 2021 15:38:02 -0500 Subject: gnu: Add font-space-grotesk. * gnu/packages/fonts.scm (font-space-grotesk): New variable. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/fonts.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index b3a45a0df2..92a7580cf6 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1393,6 +1393,43 @@ programming. Iosevka is completely generated from its source code.") "Sarasa Gothic is a programming font based on Iosevka and Source Han Sans, most CJK characters are same height, and double width as ASCII characters."))) +(define-public font-space-grotesk + (package + (name "font-space-grotesk") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/floriankarsten/space-grotesk") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1aiivn0rl7ydiyqvsr0fa2hx82h3br3x48w3100fcly23n0fdcby")))) + (build-system font-build-system) + ;; TODO: Package fontmake and gftools and build from source. + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'install-license-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version))) + (install-file "OFL.txt" doc) + #t)))))) + (home-page "https://floriankarsten.github.io/space-grotesk/") + (synopsis "Proportional variant of the fixed-width Space Mono family") + (description + "Space Grotesk is a proportional sans-serif typeface variant based on Colophon +Foundry's fixed-width Space Mono family. It retains the monospace's idiosyncratic +details while optimizing for improved readability at non-display sizes. + +Space Grotesk includes Latin Vietnamese, Pinyin, and all Western, Central, and +South-Eastern European language support, as well as several OpenType features: +old-style and tabular figures, superscript and subscript numerals, fractions, +and stylistic alternates.") + (license license:silofl1.1))) + (define-public font-go (let ((commit "f03a046406d4d7fbfd4ed29f554da8f6114049fc") (revision "1")) -- cgit v1.2.3 From 1b3dcb3dd266fda9732b7a8194bd24e80043fb7a Mon Sep 17 00:00:00 2001 From: nixo Date: Sat, 30 Jan 2021 22:37:51 +0100 Subject: gnu: font-juliamono: Update to 0.031. * gnu/packages/fonts.scm (font-juliamono): Update to 0.031. Signed-off-by: Leo Famulari --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 92a7580cf6..b24425ca22 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1881,7 +1881,7 @@ in small sizes, the text looks crisper.") (define-public font-juliamono (package (name "font-juliamono") - (version "0.025") + (version "0.031") (source (origin (method git-fetch) @@ -1890,7 +1890,7 @@ in small sizes, the text looks crisper.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1w8mpl9zc1y4j1f26ikbz5g9dqsszhikp4r9p1d3ch3b5ayb5c3m")))) + (base32 "0pcz2qaw0g0gak4plvhgg3m76h4gamffa373r52dzx0qwn1i1cf1")))) (build-system font-build-system) (arguments `(#:phases -- cgit v1.2.3 From 63cf277bfacf282d2b19f00553745b2a9370eca0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 30 Jan 2021 23:20:18 +0200 Subject: gnu: Add tootle. * gnu/packages/mastodon.scm (tootle): New variable. --- gnu/packages/mastodon.scm | 75 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mastodon.scm b/gnu/packages/mastodon.scm index e7affc805d..a01d4c56d9 100644 --- a/gnu/packages/mastodon.scm +++ b/gnu/packages/mastodon.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019, 2020 Efraim Flashner +;;; Copyright © 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -20,14 +20,22 @@ (define-module (gnu packages mastodon) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages check) - #:use-module (gnu packages time) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gtk) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) - #:use-module (gnu packages python-xyz)) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages time)) (define-public toot (package @@ -67,6 +75,67 @@ Features include: @end itemize") (license license:gpl3))) +(define-public tootle + (package + (name "tootle") + (version "1.0-alpha2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bleakgrey/tootle") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16xz58xasprza89j3ljrfpgvn05yc00p1ch96nyia99r1dyms9rx")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson/post_install.py" + (("gtk-update-icon-cache") "true")) + #t)) + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "src/Dialogs/NewAccount.vala" + (("xdg-mime") (which "xdg-mime"))) + ;; Patch for building on glib < 2.64 + (substitute* "src/Build.vala" + (("(os_name = ).*" _ first) (string-append first "\"GNU\";\n")) + (("(os_ver = ).*" _ first) (string-append first "\"Guix\";\n")) + (("GLib.Environment.get_os_info.*") "\"unknown\";\n")) + #t)) + (add-after 'install 'symlink-package + (lambda* (#:key outputs #:allow-other-keys) + (symlink "com.github.bleakgrey.tootle" + (string-append (assoc-ref outputs "out") "/bin/tootle")) + #t))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") ; for glib-compile-resources + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("pkg-config" ,pkg-config))) + (inputs + `(("glib-networking" ,glib-networking) + ("gtk+" ,gtk+) + ("json-glib" ,json-glib) + ("libgee" ,libgee) + ("libhandy" ,libhandy) + ("libsoup" ,libsoup) + ("vala" ,vala-0.50) + ("xdg-utils" ,xdg-utils))) + (home-page "https://github.com/bleakgrey/tootle") + (synopsis "GTK3 client for Mastodon") + (description "Tootle is a GTK client for Mastodon. It provides a clean, +native interface that allows you to integrate Mastodon's social experience +seamlessly with your desktop environment.") + (license license:gpl3+))) + (define-public python-mastodon-py (package (name "python-mastodon-py") -- cgit v1.2.3