diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-05-06 23:37:40 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-05-06 23:37:40 +0200 |
| commit | c263cfdcde0402cf44be7b14841d567f00e0af11 (patch) | |
| tree | 311052b6ad6e391571f4e45631f5c3ca991b0cda /gnu | |
| parent | 3b7f3108e0ebd459ec9c75717988fc61755e7185 (diff) | |
| parent | 13c18af1d835db11f3f4cf34e65c7da706625a3f (diff) | |
| download | guix-c263cfdcde0402cf44be7b14841d567f00e0af11.tar guix-c263cfdcde0402cf44be7b14841d567f00e0af11.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu')
29 files changed, 925 insertions, 237 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index be02f93ec7..25b0dba5eb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2,7 +2,7 @@ # Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge <andreas@enge.fr> # Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> -# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org> +# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org> # Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> # Copyright © 2016, 2017, 2018 Kei Kebreau <kkebreau@posteo.net> # Copyright © 2016, 2017 Rene Saavedra <rennes@openmailbox.org> @@ -726,6 +726,7 @@ dist_patch_DATA = \ %D%/packages/patches/a2ps-CVE-2014-0466.patch \ %D%/packages/patches/a2ps-CVE-2015-8107.patch \ %D%/packages/patches/abcl-fix-build-xml.patch \ + %D%/packages/patches/ableton-link-system-libraries-debian.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \ %D%/packages/patches/adb-add-libraries.patch \ %D%/packages/patches/aegis-constness-error.patch \ @@ -1017,6 +1018,7 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnome-shell-theme.patch \ %D%/packages/patches/gnome-shell-disable-test.patch \ + %D%/packages/patches/gnome-todo-delete-esource-duplicate.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ @@ -1079,6 +1081,7 @@ dist_patch_DATA = \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-makeicecat.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ + %D%/packages/patches/icecat-use-older-reveal-hidden-html.patch \ %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icecat-use-system-media-libs.patch \ %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \ @@ -1571,7 +1574,9 @@ dist_patch_DATA = \ %D%/packages/patches/vsearch-unbundle-cityhash.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ + %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/weasyprint-library-paths.patch \ + %D%/packages/patches/webkitgtk-share-store.patch \ %D%/packages/patches/websocketpp-fix-for-boost-1.70.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index eb7064430f..d0ec23973a 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -88,6 +88,7 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages music) #:use-module (gnu packages ncurses) + #:use-module (gnu packages networking) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -2319,7 +2320,7 @@ background file post-processing.") (define-public supercollider (package (name "supercollider") - (version "3.10.4") + (version "3.11.0") (source (origin (method git-fetch) (uri (git-reference @@ -2330,11 +2331,15 @@ background file post-processing.") (file-name (git-file-name name version)) (sha256 (base32 - "0xdg1dx0y0agircnkn4bg3jpw184xc5pn28k7rrzgjh1rdnyzz24")))) + "02v911w2kdbg3kfl593lb2ig4sjbfxzv20a0vbcymhfzpvp1x6xp")))) (build-system cmake-build-system) + (outputs + '("out" ;core language + "ide")) ;qt ide (arguments `(#:configure-flags '("-DSYSTEM_BOOST=on" "-DSYSTEM_YAMLCPP=on" - "-DSC_QT=off" "-DCMAKE_BUILD_TYPE=Release" + "-DSC_QT=ON" "-DCMAKE_BUILD_TYPE=Release" + "-DFORTIFY=ON" "-DLIBSCSYNTH=ON" "-DSC_EL=off") ;scel is packaged individually as ;emacs-scel #:modules ((guix build utils) @@ -2355,6 +2360,9 @@ background file post-processing.") (lambda (x) (and (eq? (stat:type (stat x)) 'directory) (not (member (basename x) keep-dirs)))))))) + (substitute* "lang/CMakeLists.txt" + (("include\\(\\.\\./external_libraries/link/AbletonLinkConfig\\.cmake\\)") + "find_package(AbletonLink NAMES AbletonLink ableton-link link REQUIRED)")) #t)) ;; Some tests are broken (see: ;; https://github.com/supercollider/supercollider/issues/3555 and @@ -2366,8 +2374,6 @@ background file post-processing.") "") (("perf_counter_test.cpp") "")) - (delete-file "testsuite/server/supernova/server_test.cpp") - (delete-file "testsuite/server/supernova/perf_counter_test.cpp") (substitute* "testsuite/CMakeLists.txt" (("add_subdirectory\\(sclang\\)") "")) @@ -2384,9 +2390,20 @@ background file post-processing.") "SC_Filesystem::instance\\(\\)\\.getDirectory" "\\(DirName::Resource\\) / CLASS_LIB_DIR_NAME")) (string-append "Path(\"" scclass-dir "\")"))) + #t))) + (add-before 'install 'install-ide + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (ide (assoc-ref outputs "ide")) + (scide "editors/sc-ide/scide")) + (install-file scide + (string-append ide "/bin")) + (delete-file scide) #t)))))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("ableton-link" ,ableton-link) + ("pkg-config" ,pkg-config) + ("qttools" ,qttools))) (inputs `(("jack" ,jack-1) ("libsndfile" ,libsndfile) @@ -2399,7 +2416,14 @@ background file post-processing.") ("icu4c" ,icu4c) ("boost" ,boost) ("boost-sync" ,boost-sync) - ("yaml-cpp" ,yaml-cpp))) + ("yaml-cpp" ,yaml-cpp) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtsvg" ,qtsvg) + ("qtwebchannel" ,qtwebchannel) + ("qtwebsockets" ,qtwebsockets))) + (propagated-inputs ;to get native-search-path + `(("qtwebengine" ,qtwebengine))) (home-page "https://github.com/supercollider/supercollider") (synopsis "Synthesis engine and programming language") (description "SuperCollider is a synthesis engine (@code{scsynth} or @@ -4276,3 +4300,104 @@ between 700 and 3200 bit/s. The main application is low bandwidth HF/VHF digital radio.") (home-page "https://www.rowetel.com/?page_id=452") (license license:lgpl2.1))) + +(define-public ableton-link + (package + (name "ableton-link") + (version "3.0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ableton/link.git") + (commit (string-append "Link-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0262vm0v7hmqjhqx5xikh529p3c065p1yld6ymaiz74yq1dnnjir")) + (modules '((guix build utils))) + (patches + (search-patches "ableton-link-system-libraries-debian.patch")) + (snippet + '(begin + ;; Tests assume that CMake's "build" directory is a + ;; sub-directory of the source tree, so we fix it. + (substitute* "ci/run-tests.py" + (("root_dir,") "root_dir, os.pardir,")) + ;; Unbundle dependencies. + (delete-file-recursively "third_party") + (delete-file-recursively "modules") + #t)))) + (build-system cmake-build-system) + (native-inputs + `(("catch" ,catch-framework) + ("python" ,python) ;for running tests + ("portaudio" ,portaudio) ;for portaudio examples + ("qtbase" ,qtbase) ;for Qt examples + ("qtdeclarative" ,qtdeclarative) + ("qttools" ,qttools))) + (inputs + `(("jack" ,jack-1) ;for JACK examples + ("qtquickcontrols" ,qtquickcontrols))) ;for Qt examples + (propagated-inputs + ;; This is because include/ableton/platforms/asio/AsioWrapper.hpp + ;; contains '#include <asio.hpp>'. + `(("asio" ,asio))) + (arguments + `(#:configure-flags + '("-DLINK_BUILD_QT_EXAMPLES=ON" + "-DLINK_BUILD_JACK=ON") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys) + (let* ((python (string-append (assoc-ref inputs "python") + "/bin/python3")) + (run-tests (string-append "../ableton-link-" + ,version + "-checkout/ci/run-tests.py"))) + (invoke python run-tests "--target" "LinkCoreTest") + (invoke python run-tests "--target" "LinkDiscoveryTest")))) + (add-before 'install 'patch-cmake + (lambda* (#:key inputs #:allow-other-keys) + (let* ((source (string-append "../ableton-link-" + ,version + "-checkout/"))) + (substitute* (string-append source + "cmake_include/AsioStandaloneConfig.cmake") + (((string-append "\\$\\{CMAKE_CURRENT_LIST_DIR\\}/\\.\\./" + "modules/asio-standalone/asio/include")) + (string-append (assoc-ref inputs "asio") + "/include"))) + (substitute* (string-append source "AbletonLinkConfig.cmake") + (("\\$\\{CMAKE_CURRENT_LIST_DIR\\}/include") + "${CMAKE_CURRENT_LIST_DIR}/../../../include") + (("\\$\\{CMAKE_CURRENT_LIST_DIR\\}/include/ableton/Link\\.hpp") + "${CMAKE_CURRENT_LIST_DIR}/../../../include/ableton/Link.hpp")) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lib-cmake (string-append out "/lib/cmake/ableton-link")) + (source (string-append "../ableton-link-" ,version "-checkout"))) + (for-each (lambda (test-file) + (delete-file test-file)) + '("bin/LinkDiscoveryTest" "bin/LinkCoreTest")) + (copy-recursively "bin" bin) + (copy-recursively (string-append source "/include/ableton") + (string-append out "/include/ableton")) + (install-file (string-append source "/AbletonLinkConfig.cmake") + lib-cmake) + (install-file (string-append source + "/cmake_include/AsioStandaloneConfig.cmake") + (string-append lib-cmake "/cmake_include")) + #t)))))) + (home-page "https://github.com/Ableton/link") + (synopsis "Synchronize musical beat, tempo, and phase across multiple applications") + (description + "Ableton Link is a C++ library that synchronizes musical beat, tempo, and phase +across multiple applications running on one or more devices. Applications on devices +connected to a local network discover each other automatically and form a musical +session in which each participant can perform independently: anyone can start or stop +while still staying in time.") + (license license:gpl2+))) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 61ee995c2c..9bfe690625 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -248,7 +248,7 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %chromium-version "81.0.4044.129") +(define %chromium-version "81.0.4044.138") (define %ungoogled-revision "c2a89fb6b5b559c826796c811741fa8ed3e11de8") (define %debian-revision "debian/81.0.4044.92-1") (define package-revision "0") @@ -264,7 +264,7 @@ from forcing GEXP-PROMISE." %chromium-version ".tar.xz")) (sha256 (base32 - "1ls663s1f74p912x42qp3zcvm17kmjiv1ij6yy1c14gdhcpmjx7z")))) + "19kpzmqmld0m0nflx13w9flxfal19msnxhzl3lip1jqih65z4y7l")))) (define %ungoogled-origin (origin diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index f8d284cf24..1b98da8dc4 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -48,6 +48,7 @@ #:use-module (gnu packages documentation) #:use-module (gnu packages elf) #:use-module (gnu packages file-systems) + #:use-module (gnu packages file) #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -942,45 +943,52 @@ since they are better handled by external tools.") (sha256 (base32 "1fl51k5jm2vrfc2g66agbikzirmp0yb0lqhmsssixfb4mky3hpzs")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-bin-dirs + (lambda* (#:key inputs #:allow-other-keys) + (let* ((bash (assoc-ref inputs "bash")) + (coreutils (assoc-ref inputs "coreutils")) + (findutils (assoc-ref inputs "findutils")) + (file-prog (assoc-ref inputs "file"))) + (with-directory-excursion "src" + (substitute* '("FilePanel.cpp" "help.h" "SearchPanel.cpp" + "startupnotification.cpp" "xfeutils.cpp") + (("/bin/sh" file) (string-append bash file)) + (("/bin/ls" file) (string-append coreutils file)) + (("/usr(/bin/du)" _ file) (string-append coreutils file)) + (("/usr(/bin/sort)" _ file) (string-append coreutils file)) + (("/usr(/bin/cut)" _ file) (string-append coreutils file)) + (("/usr(/bin/xargs)" _ file) (string-append findutils file)) + (("/usr(/bin/file)" _ file) (string-append file-prog file)))) + #t))) + (add-after 'unpack 'patch-share-dirs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share"))) + (with-directory-excursion "src" + (substitute* '("foxhacks.cpp" "help.h" "xfedefs.h" + "XFileExplorer.cpp") + (("/(usr|opt)(/local)?/share") share))) + #t)))))) (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs - `(("fox" ,fox) + `(("bash" ,bash) + ("coreutils" ,coreutils) + ("file" ,file) + ("findutils" ,findutils) + ("fox" ,fox) ("freetype" ,freetype) ("x11" ,libx11) ("xcb" ,libxcb) ("xcb-util" ,xcb-util) ("xft" ,libxft) ("xrandr" ,libxrandr))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-xfe-paths - (lambda* (#:key outputs #:allow-other-keys) - (let* - ((out (assoc-ref outputs "out")) - (share (string-append out "/share")) - (xferc (string-append out "/share/xfe/xferc")) - (xfe-theme (string-append out "/share/xfe/icons/xfe-theme"))) - ;; Correct path for xfe registry. - (substitute* "src/foxhacks.cpp" - (("/etc:/usr/share:/usr/local/share") share)) - ;; Correct path for xfe configuration. - (substitute* "src/XFileExplorer.cpp" - (("/usr/share/xfe/xferc") xferc) - (("/usr/local/share/xfe/xferc") xferc) - (("/opt/local/share/xfe/xferc") xferc)) - ;; Correct path for xfe icons. - (substitute* "src/xfedefs.h" - (((string-append - "~/.config/xfe/icons/xfe-theme:" - "/usr/local/share/xfe/icons/xfe-theme:" - "/usr/share/xfe/icons/xfe-theme")) - xfe-theme)) - #t)))))) (synopsis "File Manager for X-Based Graphical Systems") - (description"XFE (X File Explorer) is a file manager for X. It is based on + (description "XFE (X File Explorer) is a file manager for X. It is based on the popular but discontinued, X Win Commander. It aims to be the file manager of choice for all light thinking Unix addicts!") (home-page "http://roland65.free.fr/xfe/") diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b1a1852368..c02535df78 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1517,6 +1517,29 @@ This package turns this into an O(1) operation. It does so by assigning a letter to each link using avy.") (license license:gpl3+))) +(define-public emacs-auto-sudoedit + (package + (name "emacs-auto-sudoedit") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ncaq/auto-sudoedit.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "10p0hc95j382km8655pqld9wxg10j1f36czzppkdd6a55cxarv9f")))) + (propagated-inputs + `(("emacs-f" ,emacs-f))) + (build-system emacs-build-system) + (home-page "https://github.com/ncaq/auto-sudoedit") + (synopsis "Automatically re-open read-only files with sudo") + (description + "This package automatically reopens a file or directory with +@command{sudo} if it cannot write to it.") + (license license:expat))) + (define-public emacs-bbdb (package (name "emacs-bbdb") @@ -2251,6 +2274,30 @@ programs @command{djvused}, @command{djview}, @command{ddjvu}, and @command{djvm} installed.") (license license:gpl3+))) +(define-public emacs-pabbrev + (package + (name "emacs-pabbrev") + (version "4.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "pabbrev-" version ".el")) + (sha256 + (base32 "19v5adk61y8fpigw7k6wz6dj79jwr450hnbi7fj0jvb21cvjmfxh")))) + (build-system emacs-build-system) + (home-page "http://elpa.gnu.org/packages/pabbrev.html") + (synopsis "Predictive abbreviation expansion") + (description + "The code provides a abbreviation expansion for Emacs. It is +fairly similar to Dabbrev expansion, which works based on the contents +of the current buffer (or other buffers). + +Predictive abbreviation expansion works based on the previously +written text. Unlike dynamic abbreviation, the text is analysed +during idle time, while Emacs is doing nothing else.") + (license license:gpl3+))) + (define-public emacs-pdf-tools (package (name "emacs-pdf-tools") @@ -21779,6 +21826,32 @@ interface.") (home-page "https://github.com/akirak/ivy-omni-org") (license license:gpl3+)))) +(define-public emacs-ivy-posframe + (let ((commit "ae9bafe94fe6b77b6fe45766ae6172646f6a5d50")) + (package + (name "emacs-ivy-posframe") + (version (git-version "0.1.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tumashu/ivy-posframe.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1j6yns5d7lh2v1nfcznrirl7qicdli9csciqvfgj4gkh72a97pw1")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-posframe" ,emacs-posframe) + ("emacs-ivy" ,emacs-ivy))) + (home-page "https://github.com/tumashu/ivy-posframe") + (synopsis "Pop a posframe (a child frame) to show Ivy candidates") + (description + "This package provides an Emacs Ivy extension, which let Ivy use +posframe to show its candidate menu.") + (license license:gpl3+)))) + (define-public emacs-shackle (let ((commit "7ccbe513852a1d1700b698547efca14b8940319d") (revision "1")) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c174927633..9c1fd30773 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2019 Valentin Ignatev <valentignatev@gmail.com> ;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at> ;;; Copyright © 2019 Amin Bandali <bandali@gnu.org> +;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us> ;;; ;;; This file is part of GNU Guix. ;;; @@ -69,6 +70,7 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix utils) + #:use-module (ice-9 match) #:use-module (srfi srfi-1)) (define-public emacs @@ -242,9 +244,9 @@ languages.") (license license:gpl3+))) (define-public emacs-next - (let ((commit "36abf6864604b3061c2e070f8997491fa2bce44c") + (let ((commit "c36c5a3dedbb2e0349be1b6c3b7567ea7b594f1c") (revision "0") - (emacs-version "27.0.50")) + (emacs-version "27.0.91")) (package (inherit emacs) (name "emacs-next") @@ -256,7 +258,7 @@ languages.") (url "https://git.savannah.gnu.org/git/emacs.git") (commit commit))) (sha256 - (base32 "1ckn607p0clz0dhhlizvv7l03p4nminy48h53xrpz55w4rcrcm2l")) + (base32 "0mlrg2npy1r79laahkgzhxd1qassfcdz8qk1cpw7mqgf6y5x505h")) (file-name (git-file-name name version)) (patches (search-patches "emacs27-exec-path.patch" "emacs-fix-scheme-indent-function.patch" @@ -321,7 +323,9 @@ languages.") (inputs `(("jansson" ,jansson) ("harfbuzz" ,harfbuzz) - ,@(package-inputs emacs))) + ;; Emacs no longer uses ImageMagick by default + ;; https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-27.0.91&id=c36c5a3dedbb2e0349be1b6c3b7567ea7b594f1c#n102 + ,@(alist-delete "imagemagick" (package-inputs emacs)))) (native-inputs `(("autoconf" ,autoconf) ; needed when building from trunk ,@(package-native-inputs emacs))) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 6cae5ec3f3..d3402718f7 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -38,6 +38,7 @@ (define-module (gnu packages game-development) #:use-module (srfi srfi-1) + #:use-module (ice-9 match) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) @@ -2225,3 +2226,83 @@ rigid body physics library written in C.") developers providing an advanced true color console, input, and lots of other utilities frequently used in roguelikes.") (license license:bsd-3))) + +(define-public warsow-qfusion + ;; As of 2020-04-09, the latest stable version 2.1.0 is deprecated. + ;; The 2.5 beta as published on the homepage is commit + ;; c4de15df559410aff0ca6643724e24cddb0ecbbd + (let ((commit "c4de15df559410aff0ca6643724e24cddb0ecbbd")) + (package + (name "warsow-qfusion") + (version (git-version "2.5" "1" commit)) ; 2.5-beta + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Warsow/qfusion/") + (commit commit) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xv2yycr43p3xmq7lm6j6zb3cpcr6w00x7qg918faq0mw9j7v48g")) + ;; Issue reported here: https://github.com/Warsow/qfusion/issues/46 + (patches (search-patches "warsow-qfusion-fix-bool-return-type.patch")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No tests. + #:configure-flags '("-DQFUSION_GAME=Warsow") + #:modules + ((guix build utils) + (guix build cmake-build-system) + (ice-9 match)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'change-to-build-dir + (lambda _ + (chdir "source") + #t)) + (add-after 'install 'really-install + (lambda* (#:key outputs system #:allow-other-keys) + (let ((arch (match system + ("x86_64-linux" "x86_64") + ("i686-linux" "i386"))) + (out (assoc-ref outputs "out"))) + (install-file (string-append "../source/build/basewsw/libgame_" + arch ".so") + (string-append out "/lib/")) + (install-file (string-append "../source/build/libui_" arch ".so") + (string-append out "/lib/")) + (for-each + (lambda (file) + (install-file file (string-append out "/bin/"))) + (append (find-files "../source/build" "warsow") + (find-files "../source/build" "wsw_server.")))) + #t))))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("curl" ,curl) + ("freetype" ,freetype) + ("ffmpeg" ,ffmpeg) + ("libjpeg" ,libjpeg-turbo) + ("libogg" ,libogg) + ("libpng" ,libpng) + ("libtheora" ,libtheora) + ("libvorbis" ,libvorbis) + ("mesa" ,mesa) + ("openal" ,openal) + ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("sdl2" ,sdl2) + ("uuid.h" ,util-linux "lib") + ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/Warsow/qfusion") + (supported-systems '("i686-linux" "x86_64-linux")) + (synopsis "Warsow's fork of qfusion, the id Tech 2 derived game engine") + (description + "This package contains the game engine of Warsow, a first-person +shooter video game. The engine is based on qfusion, the id Tech 2 derived +game engine. id Tech 2 is the engine originally behind Quake 2.") + (license license:gpl2+)))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 624bb9b78e..b927ef4ab5 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6817,7 +6817,7 @@ your score gets higher, you level up and the blocks fall faster.") (define-public endless-sky (package (name "endless-sky") - (version "0.9.10") + (version "0.9.12") (source (origin (method git-fetch) @@ -6826,8 +6826,7 @@ your score gets higher, you level up and the blocks fall faster.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1wax9qhxakydg6bs92d1jy2fki1n9r0wkps1np02y0pvm1fl189i")))) + (base32 "18nkl4s3r5sy3sd9lhbdg9160c7fggklklprx0d5azifc8g6k0wj")))) (build-system scons-build-system) (arguments `(#:scons ,scons-python2 diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 625248a25a..41c341fd41 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -148,6 +148,53 @@ GNOME Shell.") (home-page "https://github.com/ubuntu/gnome-shell-extension-appindicator/") (license license:gpl2+))) +(define-public gnome-shell-extension-clipboard-indicator + (package + (name "gnome-shell-extension-clipboard-indicator") + (version "34") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/Tudmotu/" + "gnome-shell-extension-clipboard-indicator.git")) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0i00psc1ky70zljd14jzr627y7nd8xwnwrh4xpajl1f6djabh12s")) + (modules '((guix build utils))) + (snippet + ;; Remove pre-compiled settings schemas and translations from + ;; source, as they are generated as part of build. Upstream + ;; includes them for people who want to run the software + ;; directly from source tree. + '(begin (delete-file "schemas/gschemas.compiled") + (for-each delete-file (find-files "locale" "\\.mo$")) + #t)))) + (build-system copy-build-system) + (arguments + '(#:install-plan + '(("." "share/gnome-shell/extensions/clipboard-indicator@tudmotu.com" + #:include-regexp ("\\.css$" "\\.compiled$" "\\.js(on)?$" "\\.mo$" "\\.xml$"))) + #:phases + (modify-phases %standard-phases + (add-before 'install 'compile-schemas + (lambda _ + (with-directory-excursion "schemas" + (invoke "glib-compile-schemas" ".")) + #t)) + (add-before 'install 'compile-locales + (lambda _ (invoke "./compile-locales.sh") + #t))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin"))) ; for glib-compile-schemas + (home-page "https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator") + (synopsis "Clipboard manager extension for GNOME Shell") + (description "Clipboard Indicator is a clipboard manager for GNOME Shell +that caches clipboard history.") + (license license:expat))) + (define-public gnome-shell-extension-topicons-redux (package (name "gnome-shell-extension-topicons-redux") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b07c2dbb05..d5a2032ccf 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8110,7 +8110,9 @@ desktop. It supports multiple calendars, month, week and year view.") name "-" version ".tar.xz")) (sha256 (base32 - "08ygqbib72jlf9y0a16k54zz51sncpq2wa18wp81v46q8301ymy7")))) + "08ygqbib72jlf9y0a16k54zz51sncpq2wa18wp81v46q8301ymy7")) + (patches + (search-patches "gnome-todo-delete-esource-duplicate.patch")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e1c8b4fccf..9b3d6381a0 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -554,8 +554,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "68.7.0-guix0-preview1") -(define %icecat-build-id "20200406000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "68.8.0-guix0-preview1") +(define %icecat-build-id "20200505000000") ;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' @@ -577,11 +577,11 @@ from forcing GEXP-PROMISE." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0w3mad0r4khcd7hfmm3xix9x6mp5yp8g8kyh18vanfnjqdls0gmd")))) + "0hp8cc7xk6qj4q1s8n97qv9sdrypkzvphik96m5qv1r5s9k24nzs")))) - (upstream-icecat-base-version "68.7.0") ; maybe older than base-version + (upstream-icecat-base-version "68.8.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "d185c5a67506311e19440fd4b824a822ce840369") + (gnuzilla-commit "5358ff2963a6136f8acafdc598cad540231ad23e") (gnuzilla-source (origin (method git-fetch) @@ -593,10 +593,12 @@ from forcing GEXP-PROMISE." (string-take gnuzilla-commit 8))) (sha256 (base32 - "09skws692qv5kbhj8bvy3prj7v0iyfz68xjck4vbfxkahldfppqx")))) + "1bq0qzgkxz9q61g48bc05i0zx1z8k0pklxnmn54ch136aqgsyli4")))) (makeicecat-patch - (local-file (search-patch "icecat-makeicecat.patch")))) + (local-file (search-patch "icecat-makeicecat.patch"))) + (gnuzilla-fixes-patch + (local-file (search-patch "icecat-use-older-reveal-hidden-html.patch")))) (origin (method computed-origin-method) @@ -642,6 +644,8 @@ from forcing GEXP-PROMISE." (make-file-writable "makeicecat") (invoke "patch" "--force" "--no-backup-if-mismatch" "-p1" "--input" #+makeicecat-patch) + (invoke "patch" "--force" "--no-backup-if-mismatch" + "-p1" "--input" #+gnuzilla-fixes-patch) (patch-shebang "makeicecat") (substitute* "makeicecat" (("^FFMAJOR=(.*)" all ffmajor) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 467a7d0cb9..97c3a571a1 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -409,14 +409,14 @@ external server.") (define-public mujs (package (name "mujs") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) (uri (string-append "https://mujs.com/downloads/mujs-" version ".tar.xz")) (sha256 (base32 - "1q9w2dcspfp580pzx7sw7x9gbn8j0ak6dvj75wd1ml3f3q3i43df")))) + "1ilhay15z4k7mlzs6g2d00snivin7vp72dfw5wwpmc0x70jr31l2")))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/libedit.scm b/gnu/packages/libedit.scm index 37638a2b6a..38da02572a 100644 --- a/gnu/packages/libedit.scm +++ b/gnu/packages/libedit.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com> +;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,3 +49,24 @@ library (libedit). This Berkeley-style licensed command line editor library provides generic line editing, history, and tokenization functions, similar to those found in GNU Readline.") (license bsd-3))) + +(define-public editline + (package + (name "editline") + (version "1.17.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://ftp.troglobit.com/editline/editline-" version ".tar.xz")) + (sha256 + (base32 "03pw3z6pz590v8xfnjx0yynnzij2sb9xwjbvqvdzsid56crkn8nz")))) + (build-system gnu-build-system) + (home-page "https://troglobit.com/projects/editline/") + (synopsis "Line editing library") + (description + "@code{editline} is a small line editing library. It can be linked into almost +any program to provide command line editing and history functions. It is call +compatible with the GNU Readline library, but at a fraction of the size, +and as a result fewer features.") + (license bsd-4))) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8a0068add0..b188c9bb68 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,50 +369,50 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (sha256 hash))) -(define-public linux-libre-5.6-version "5.6.10") +(define-public linux-libre-5.6-version "5.6.11") (define-public linux-libre-5.6-pristine-source (let ((version linux-libre-5.6-version) - (hash (base32 "1f81b0icn0r9gww95rckyxs5d4g8bwf4mmqkrmwxxf4xga19dp3v"))) + (hash (base32 "1ahv4a3mnszqs3qcnwmhbvjgis1jg37anj5jvn70i7s2k6z6rpfn"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.6))) -(define-public linux-libre-5.4-version "5.4.38") +(define-public linux-libre-5.4-version "5.4.39") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "03pks3jx5kk0wnhjkm92wxdbgw8qbdg93sfwchnx88m2wfj9yaz7"))) + (hash (base32 "1j35yf1nilb9z7lw8w2drpww7q2zy8zfr0ip8hwcbcd7c5d9chai"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.120") +(define-public linux-libre-4.19-version "4.19.121") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "03mjng5ws9y56id99619ysarz73qqyylgc3mlknga1yphbhh16qb"))) + (hash (base32 "11bhjdaihhc42xhf4qxdkkjznc0i6igh0ahjbzr3fb8bmq9sirgv"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.178") +(define-public linux-libre-4.14-version "4.14.179") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1pcqxmq9ir4f963aiw5bab9w2mp4vfiwaq2bk7nksbl2bs3k6b7x"))) + (hash (base32 "10arrj3ppbxkn15yxqpxlz4k8yp2afzbfpp2nwfy6klhjiffp9sx"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.221") +(define-public linux-libre-4.9-version "4.9.222") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1gh1x73xblxkb927igc3shrqnn49lcscwrq2fixmk9n7jb7q2hp6"))) + (hash (base32 "0aajgflf96bj7chbd83rdmgcdwd025c6mz6li4cwbfx7xcb91kjc"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.221") +(define-public linux-libre-4.4-version "4.4.222") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "06rpjnvrdp71flz948mfmx7jv8x2vmdg54zz1xpkb2458mwh5hbq"))) + (hash (base32 "02zxy5vjxgrqs0mkz5aj70v6pazhif7x5cm26rf8zh4idpmhk2zh"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 280826545c..da3d079b24 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -74,11 +74,10 @@ #:use-module (srfi srfi-19)) (define-public sbcl-alexandria - (let ((revision "1") - (commit "3b849bc0116ea70f215ee6b2fbf354e862aaa9dd")) + (let ((commit "5e5c7d83090cc0fbf32c4628362ac3ce2c50dc59")) (package (name "sbcl-alexandria") - (version (git-version "1.0.0" revision commit)) + (version "1.0.1") (source (origin (method git-fetch) @@ -87,7 +86,7 @@ (commit commit))) (sha256 (base32 - "04amwvx2vl691f0plcfbqqwxgib9zimih7jrn5zl7mbwvrxy022b")) + "010w8829dq28jf8ajfzas9nfvpxa5bal04mg299xq6y9spihc2iz")) (file-name (git-file-name name version)))) (build-system asdf-build-system/sbcl) (native-inputs @@ -202,7 +201,7 @@ support.") (define-public sbcl-trivial-gray-streams (let ((revision "1") - (commit "0483ade330508b4b2edeabdb47d16ec9437ee1cb")) + (commit "ebd59b1afed03b9dc8544320f8f432fdf92ab010")) (package (name "sbcl-trivial-gray-streams") (version (string-append "0.0.0-" revision "." (string-take commit 7))) @@ -214,7 +213,7 @@ support.") (url "https://github.com/trivial-gray-streams/trivial-gray-streams.git") (commit commit))) (sha256 - (base32 "0m3rpf2x0zmdk3nf1qfa01j6a55vj7gkwhyw78qslcgbjlgh8p4d")) + (base32 "0b1pxlccmnagk9cbh4cy8s5k66g3x0gwib5shjwr24xvrji6lp94")) (file-name (string-append "trivial-gray-streams-" version "-checkout")))) (build-system asdf-build-system/sbcl) @@ -1158,25 +1157,27 @@ utilities that make it even easier to manipulate text in Common Lisp. It has (sbcl-package->ecl-package sbcl-cl-strings)) (define-public sbcl-trivial-features - (package - (name "sbcl-trivial-features") - (version "0.8") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/trivial-features/trivial-features.git") - (commit (string-append "v" version)))) - (file-name (git-file-name "trivial-features" version)) - (sha256 - (base32 "0ccv7dqyrk55xga78i5vzlic7mdwp28in3g1a8fqhlk6626scsq9")))) - (build-system asdf-build-system/sbcl) - (arguments '(#:tests? #f)) - (home-page "https://cliki.net/trivial-features") - (synopsis "Ensures consistency of @code{*FEATURES*} in Common Lisp") - (description "Trivial-features ensures that @code{*FEATURES*} is + ;; No release since 2014. + (let ((commit "870d03de0ed44067963350936856e17ee725153e")) + (package + (name "sbcl-trivial-features") + (version (git-version "0.8" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/trivial-features/trivial-features.git") + (commit commit))) + (file-name (git-file-name "trivial-features" version)) + (sha256 + (base32 "14pcahr8r2j3idhyy216zyw8jnj1dnrx0qbkkbdqkvwzign1ah4j")))) + (build-system asdf-build-system/sbcl) + (arguments '(#:tests? #f)) + (home-page "https://cliki.net/trivial-features") + (synopsis "Ensures consistency of @code{*FEATURES*} in Common Lisp") + (description "Trivial-features ensures that @code{*FEATURES*} is consistent across multiple Common Lisp implementations.") - (license license:expat))) + (license license:expat)))) (define-public cl-trivial-features (sbcl-package->cl-source-package sbcl-trivial-features)) @@ -1242,29 +1243,31 @@ with a focus on interactive development.") (sbcl-package->ecl-package sbcl-hu.dwim.stefil)) (define-public sbcl-babel - (package - (name "sbcl-babel") - (version "0.5.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cl-babel/babel.git") - (commit (string-append "v" version)))) - (file-name (git-file-name "babel" version)) - (sha256 - (base32 "139a8rn2gnhj082n8jg01gc8fyr63hkj57hgrnmb3d1r327yc77f")))) - (build-system asdf-build-system/sbcl) - (native-inputs - `(("tests:cl-hu.dwim.stefil" ,sbcl-hu.dwim.stefil))) - (inputs - `(("sbcl-alexandria" ,sbcl-alexandria) - ("sbcl-trivial-features" ,sbcl-trivial-features))) - (home-page "https://common-lisp.net/project/babel/") - (synopsis "Charset encoding and decoding library") - (description "Babel is a charset encoding and decoding library, not unlike + ;; No release since 2014. + (let ((commit "aeed2d1b76358db48e6b70a64399c05678a6b9ea")) + (package + (name "sbcl-babel") + (version (git-version "0.5.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cl-babel/babel.git") + (commit commit))) + (file-name (git-file-name "babel" version)) + (sha256 + (base32 "0lkvv4xdpv4cv1y2bqillmabx8sdb2y4l6pbinq6mjh33w2brpvb")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("tests:cl-hu.dwim.stefil" ,sbcl-hu.dwim.stefil))) + (inputs + `(("sbcl-alexandria" ,sbcl-alexandria) + ("sbcl-trivial-features" ,sbcl-trivial-features))) + (home-page "https://common-lisp.net/project/babel/") + (synopsis "Charset encoding and decoding library") + (description "Babel is a charset encoding and decoding library, not unlike GNU libiconv, but completely written in Common Lisp.") - (license license:expat))) + (license license:expat)))) (define-public cl-babel (sbcl-package->cl-source-package sbcl-babel)) @@ -1745,11 +1748,11 @@ streams, support is included for convenient stream wrappers.") (sbcl-package->ecl-package sbcl-ironclad)) (define-public sbcl-named-readtables - (let ((commit "4dfb89fa1af6b305b6492b8af042f5190c11e9fc") - (revision "1")) + (let ((commit "64bd53f37a1694cfde48fc38b8f03901f6f0c05b") + (revision "2")) (package (name "sbcl-named-readtables") - (version (string-append "0.9-" revision "." (string-take commit 7))) + (version (git-version "0.9" revision commit)) (source (origin (method git-fetch) @@ -1757,7 +1760,7 @@ streams, support is included for convenient stream wrappers.") (url "https://github.com/melisgl/named-readtables.git") (commit commit))) (sha256 - (base32 "083kgh5462iqbb4px6kq8s7sggvpvkm36hx4qi9rnaw53b6ilqkk")) + (base32 "01l4831m7k84qvhzyx0qgdl50isr4zmp40qf6dfq2iqcaj8y4h3n")) (file-name (git-file-name "named-readtables" version)))) (build-system asdf-build-system/sbcl) (arguments @@ -2827,10 +2830,10 @@ the Common Lisp programming language.") (sbcl-package->ecl-package sbcl-trivial-garbage)) (define-public sbcl-closer-mop - (let ((commit "fac29ce90e3a46e1fc6cf182190e193526fa9dbc")) + (let ((commit "19c9d33f576e10715fd79cc1d4f688dab0f241d6")) (package (name "sbcl-closer-mop") - (version (git-version "1.0.0" "1" commit)) + (version (git-version "1.0.0" "2" commit)) (source (origin (method git-fetch) @@ -2838,7 +2841,7 @@ the Common Lisp programming language.") (url "https://github.com/pcostanza/closer-mop") (commit commit))) (sha256 - (base32 "0hvh77y869h8fg9di5snyg85fxq6fdh9gj1igmx1g6j6j5x915dl")) + (base32 "1w3x087wvlwkd6swfdgbvjfs6kazf0la8ax4pjfzikwjch4snn2c")) (file-name (git-file-name "closer-mop" version )))) (build-system asdf-build-system/sbcl) (home-page "https://github.com/pcostanza/closer-mop") @@ -2855,7 +2858,7 @@ Lisp implementations.") (sbcl-package->ecl-package sbcl-closer-mop)) (define sbcl-cl-cffi-gtk-boot0 - (let ((commit "29443c5aaca975709df8025c4649366d882033cb")) + (let ((commit "412d17214e092220c65a5660f5cbbd9cb69b8fe4")) (package (name "sbcl-cl-cffi-gtk-boot0") (version (git-version "0.11.2" "1" commit)) @@ -2868,7 +2871,7 @@ Lisp implementations.") (file-name (git-file-name "cl-cffi-gtk" version)) (sha256 (base32 - "0f6s92sf8xyzh1yksqx8bsy1sv0zmy0c13j3b8bavaba5hlxpxah")))) + "0n997yhcnzk048nalx8ys62ja2ac8iv4mbn3mb55iapl0321hghn")))) (build-system asdf-build-system/sbcl) (inputs `(("iterate" ,sbcl-iterate) @@ -2887,6 +2890,7 @@ is a library for creating graphical user interfaces.") (name "sbcl-cl-cffi-gtk-glib") (inputs `(("glib" ,glib) + ("bordeaux-threads" ,sbcl-bordeaux-threads) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments `(#:asd-file "glib/cl-cffi-gtk-glib.asd" @@ -2895,8 +2899,8 @@ is a library for creating graphical user interfaces.") (add-after 'unpack 'fix-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "glib/glib.init.lisp" - (("libglib|libgthread" all) (string-append - (assoc-ref inputs "glib") "/lib/" all)))))))))) + (("libglib|libgthread" all) + (string-append (assoc-ref inputs "glib") "/lib/" all)))))))))) (define-public sbcl-cl-cffi-gtk-gobject (package @@ -3606,7 +3610,7 @@ RFC 1321 by R. Rivest, published April 1992.") (sbcl-package->cl-source-package sbcl-md5)) (define-public sbcl-cl+ssl - (let ((commit "141ae91416bc40f1618dc07e48429b84388aa599") + (let ((commit "701e645081e6533a3f0f0b3ac86389d6f506c4b5") (revision "1")) (package (name "sbcl-cl+ssl") @@ -3619,7 +3623,7 @@ RFC 1321 by R. Rivest, published April 1992.") (commit commit))) (file-name (git-file-name "cl+ssl" version)) (sha256 - (base32 "1s0hg1h9sf8q89v0yrxmzg5f5sng29rgx3n21r9h9yql8351myan")))) + (base32 "0nfl275nwhff3m25872y388cydz14kqb6zbwywa6nj85r9k8bgs0")))) (build-system asdf-build-system/sbcl) (arguments '(#:phases @@ -3684,37 +3688,34 @@ Rosenberg's CL packages.") (sbcl-package->cl-source-package sbcl-kmrcl)) (define-public sbcl-cl-base64 - (let ((version "3.3.3")) - (package - (name "sbcl-cl-base64") - (version version) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "http://git.kpe.io/cl-base64.git") - (commit (string-append "v" version)))) - (file-name (git-file-name "cl-base64" version)) - (sha256 - (base32 "1dw6j7n6gsd2qa0p0rbsjxj00acxx3i9ca1qkgl0liy8lpnwkypl")))) - (build-system asdf-build-system/sbcl) - (arguments - ;; Tests fail with: :FORCE and :FORCE-NOT arguments not allowed - ;; in a nested call to ASDF/OPERATE:OPERATE unless identically - ;; to toplevel - '(#:tests? #f)) - (inputs - `(("sbcl-ptester" ,sbcl-ptester) - ("sbcl-kmrcl" ,sbcl-kmrcl))) - (home-page "http://files.kpe.io/cl-base64/") - (synopsis - "Common Lisp package to encode and decode base64 with URI support") - (description - "This package provides highly optimized base64 encoding and decoding. + (package + (name "sbcl-cl-base64") + (version "3.3.4") + (source + (origin + (method url-fetch) + (uri (string-append "http://files.kpe.io/cl-base64/cl-base64-" + version ".tar.gz")) + (sha256 + (base32 "0pl4zwn5bf18dm8fh1kn1yshaa6kpmfrjyb33z9mq4raqmj3xpv2")))) + (build-system asdf-build-system/sbcl) + (arguments + ;; Tests fail with: :FORCE and :FORCE-NOT arguments not allowed + ;; in a nested call to ASDF/OPERATE:OPERATE unless identically + ;; to toplevel + '(#:tests? #f)) + (inputs + `(("sbcl-ptester" ,sbcl-ptester) + ("sbcl-kmrcl" ,sbcl-kmrcl))) + (home-page "http://files.kpe.io/cl-base64/") + (synopsis + "Common Lisp package to encode and decode base64 with URI support") + (description + "This package provides highly optimized base64 encoding and decoding. Besides conversion to and from strings, integer conversions are supported. Encoding with Uniform Resource Identifiers is supported by using a modified encoding table that uses only URI-compatible characters.") - (license license:bsd-3)))) + (license license:bsd-3))) (define-public cl-base64 (sbcl-package->cl-source-package sbcl-cl-base64)) @@ -3976,34 +3977,40 @@ PROPER-LIST, ASSOCIATION-LIST, PROPERTY-LIST and TUPLE.") (define-public sbcl-cl-syntax-annot (package + (inherit sbcl-cl-syntax) (name "sbcl-cl-syntax-annot") - (version "0.0.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/m2ym/cl-syntax.git") - (commit "03f0c329bbd55b8622c37161e6278366525e2ccc"))) - (file-name (git-file-name name version)) - (sha256 - (base32 "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y")))) - (build-system asdf-build-system/sbcl) (arguments '(#:asd-file "cl-syntax-annot.asd" #:asd-system-name "cl-syntax-annot")) (inputs `(("sbcl-cl-syntax" ,sbcl-cl-syntax) ("sbcl-cl-annot" ,sbcl-cl-annot))) - (home-page "https://github.com/m2ym/cl-syntax") - (synopsis "Reader Syntax Coventions for Common Lisp and SLIME") + (synopsis "Common Lisp reader Syntax for cl-annot") (description - "CL-SYNTAX provides Reader Syntax Coventions for Common Lisp and -SLIME.") - (license license:llgpl))) + "CL-SYNTAX provides reader syntax coventions for Common Lisp and +@code{cl-annot}."))) (define-public cl-syntax-annot (sbcl-package->cl-source-package sbcl-cl-syntax-annot)) +(define-public sbcl-cl-syntax-interpol + (package + (inherit sbcl-cl-syntax) + (name "sbcl-cl-syntax-interpol") + (arguments + '(#:asd-file "cl-syntax-interpol.asd" + #:asd-system-name "cl-syntax-interpol")) + (inputs + `(("sbcl-cl-syntax" ,sbcl-cl-syntax) + ("sbcl-cl-interpol" ,sbcl-cl-interpol))) + (synopsis "Common Lisp reader Syntax for cl-interpol") + (description + "CL-SYNTAX provides reader syntax coventions for Common Lisp and +@code{cl-interpol}."))) + +(define-public cl-syntax-interpol + (sbcl-package->cl-source-package sbcl-cl-syntax-interpol)) + (define-public sbcl-cl-utilities (let ((commit "dce2d2f6387091ea90357a130fa6d13a6776884b") (revision "1")) @@ -4072,8 +4079,8 @@ addition, removal, and random selection.") (sbcl-package->cl-source-package sbcl-map-set)) (define-public sbcl-quri - (let ((commit "76b75103f21ead092c9f715512fa82441ef61185") - (revision "1")) + (let ((commit "b53231c5f19446dd7c24b15a249fefa45ae94f9a") + (revision "2")) (package (name "sbcl-quri") (version (git-version "0.1.0" revision commit)) @@ -4085,7 +4092,7 @@ addition, removal, and random selection.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1ccbxsgzdibmzq33mmbmmz9vwl6l03xh6nbpsh1hkdvdcl7q0a60")))) + (base32 "0cansr63m690ymvhway419178mq2sqnmxm4rdxclbsrnjwwbi36m")))) (build-system asdf-build-system/sbcl) (arguments ;; Tests fail with: Component QURI-ASD::QURI-TEST not found, @@ -4212,8 +4219,8 @@ depending on content size.") (sbcl-package->cl-source-package sbcl-smart-buffer)) (define-public sbcl-fast-http - (let ((commit "f9e7597191bae380503e20724fd493a24d024935") - (revision "1")) + (let ((commit "502a37715dcb8544cc8528b78143a942de662c5a") + (revision "2")) (package (name "sbcl-fast-http") (version (git-version "0.2.0" revision commit)) @@ -4225,7 +4232,7 @@ depending on content size.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0qdmwv2zm0sizxdb8nnclgwl0nfjcbjaimbakavikijw7lr9b4jp")))) + (base32 "0al2g7g219jjljsf7b23pbilpgacxy5as5gs2nqf76b5qni396mi")))) (build-system asdf-build-system/sbcl) (arguments ;; Tests fail with: Component FAST-HTTP-ASD::FAST-HTTP-TEST not found, @@ -4233,7 +4240,8 @@ depending on content size.") `(#:tests? #f)) (native-inputs `(("sbcl-prove-asdf" ,sbcl-prove-asdf) - ("sbcl-prove" ,sbcl-prove))) + ("sbcl-prove" ,sbcl-prove) + ("cl-syntax-interpol" ,sbcl-cl-syntax-interpol))) (inputs `(("sbcl-alexandria" ,sbcl-alexandria) ("sbcl-proc-parse" ,sbcl-proc-parse) @@ -4349,8 +4357,8 @@ against the last run.") (sbcl-package->cl-source-package sbcl-checkl)) (define-public sbcl-fast-io - (let ((commit "dc3a71db7e9b756a88781ae9c342fe9d4bbab51c") - (revision "1")) + (let ((commit "603f4903dd74fb221859da7058ae6ca3853fe64b") + (revision "2")) (package (name "sbcl-fast-io") (version (git-version "1.0.0" revision commit)) @@ -4362,7 +4370,7 @@ against the last run.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1jsp6xvi26ln6fdy5j5zi05xvan8jsqdhisv552dy6xg6ws8i1yq")))) + (base32 "00agvc0xx4w715i6ach05p995zpcpghn04xc06zyci06q677vw3n")))) (build-system asdf-build-system/sbcl) (arguments ;; Error while trying to load definition for system fast-io-test from @@ -4541,7 +4549,7 @@ performance and simplicity in mind.") (sbcl-package->cl-source-package sbcl-lack-request)) (define-public sbcl-local-time - (let ((commit "beac054eef428552b63d4ae7820c32ffef9a3015") + (let ((commit "62792705245168d3fc2e04164b9a143477284142") (revision "1")) (package (name "sbcl-local-time") @@ -4554,7 +4562,7 @@ performance and simplicity in mind.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0xhkmgxh41dg2wwlsp0h2l41jp144xn4gpxhh0lna6kh0560w2cc")))) + (base32 "1r5zq4l1lrgprdr2pw7wwry194yknnllyjf6lx7snypb3k4r3yir")))) (build-system asdf-build-system/sbcl) (arguments ;; TODO: Component :STEFIL not found, required by #<SYSTEM @@ -5413,12 +5421,12 @@ formats.") (define-public sbcl-iolib.asdf ;; Latest release is from June 2017. - (let ((commit "81e20614c0d27f9605bf9766214e236fd31b99b4") - (revision "1")) + (let ((commit "7f5ea3a8457a29d224b24653c2b3657fb1898021") + (revision "2")) (package (name "sbcl-iolib.asdf") (build-system asdf-build-system/sbcl) - (version "0.8.3") + (version (git-version "0.8.3" revision commit)) (home-page "https://github.com/sionescu/iolib") (source (origin @@ -5429,7 +5437,7 @@ formats.") (file-name (git-file-name name version)) (sha256 (base32 - "1j81r0wm7nfbwl991f26s4npcy7kybzybd3m47rbxy31h0cfcmdm")))) + "1bg5w7lm61hqk4b0svmri8a590q36z76jfa0sdgzb39r98c04w12")))) (inputs `(("alexandria" ,sbcl-alexandria))) (arguments @@ -5504,7 +5512,7 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.") (inputs `(("iolib.asdf" ,sbcl-iolib.asdf) ("iolib.conf" ,sbcl-iolib.conf) - ("iolib.grovel" ,sbcl-iolib.grovel) + ("cffi-grovel" ,sbcl-cffi-grovel) ("iolib.base" ,sbcl-iolib.base) ("bordeaux-threads" ,sbcl-bordeaux-threads) ("idna" ,sbcl-idna) @@ -5516,7 +5524,6 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.") (arguments '(#:asd-file "iolib.asd" #:asd-system-name "iolib/syscalls" - #:test-asd-file "iolib.tests.asd" #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-paths @@ -5527,7 +5534,7 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.") "(:default \"" (assoc-ref inputs "libfixposix") "/lib/libfixposix\")"))) ;; Socket tests need Internet access, disable them. - (substitute* "iolib.tests.asd" + (substitute* "iolib.asd" (("\\(:file \"sockets\" :depends-on \\(\"pkgdcl\" \"defsuites\"\\)\\)") ""))))))) (synopsis "Common Lisp I/O library"))) @@ -5543,8 +5550,6 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.") (substitute-keyword-arguments (package-arguments sbcl-iolib+syscalls) ((#:asd-system-name _) "iolib/multiplex"))))) - - (define sbcl-iolib+streams (package (inherit sbcl-iolib+syscalls) @@ -5817,12 +5822,12 @@ cookie headers, cookie creation, cookie jar creation and more.") (sbcl-package->cl-source-package sbcl-cl-cookie)) (define-public sbcl-dexador - (let ((commit "a2714d126cc94bc7a9a6e1e3c08de455b3a66378") + (let ((commit "953090f04c4d1a9ee6632b90133cdc297b68badc") (revision "1")) (package (name "sbcl-dexador") (build-system asdf-build-system/sbcl) - (version (git-version "0.9.10" revision commit)) + (version "0.9.14" ) (home-page "https://github.com/fukamachi/dexador") (source (origin @@ -5833,7 +5838,7 @@ cookie headers, cookie creation, cookie jar creation and more.") (file-name (git-file-name name version)) (sha256 (base32 - "0nbqgn4v3l2z6m1k1bdxfnqpfrk84nxdmz7csz11zzcfs4flkv79")))) + "0w18fz3301rpmwc3kwb810czcd24mbf7r1z8vdyc0v5crjfpw3mn")))) (inputs `(("trivial-gray-streams" ,sbcl-trivial-gray-streams) ("babel" ,sbcl-babel) @@ -5859,7 +5864,8 @@ cookie headers, cookie creation, cookie jar creation and more.") ("babel" ,sbcl-babel) ("alexandria" ,sbcl-alexandria) ("cl-ppcre" ,sbcl-cl-ppcre) - ("local-time" ,sbcl-local-time))) + ("local-time" ,sbcl-local-time) + ("trivial-features" ,sbcl-trivial-features))) (arguments ;; TODO: Circular dependency: tests depend on clack-test which depends on dexador. `(#:tests? #f @@ -5923,8 +5929,8 @@ This library offers macros to deal with symbols from any namespace.") (sbcl-package->cl-source-package sbcl-lisp-namespace)) (define-public sbcl-trivial-cltl2 - (let ((commit "8eec8407df833e8f27df8a388bc10913f16d9e83") - (revision "1")) + (let ((commit "8a3bda30dc25d2f65fcf514d0eb6e6db75252c61") + (revision "2")) (package (name "sbcl-trivial-cltl2") (build-system asdf-build-system/sbcl) @@ -5939,7 +5945,7 @@ This library offers macros to deal with symbols from any namespace.") (file-name (git-file-name name version)) (sha256 (base32 - "1dyyxz17vqv8hlfwq287gl8xxbvcnq798ajb7p5jdjz91wqf4bgk")))) + "08cnzb9rnczn4pn2zpf0587ny4wjy1mjndy885fz9pw7xrlx37ip")))) (synopsis "Simple CLtL2 compatibility layer for Common Lisp") (description "This library is a portable compatibility layer around \"Common Lisp the Language, 2nd @@ -5995,8 +6001,8 @@ can and/or provide reasonable defaults.") (sbcl-package->cl-source-package sbcl-introspect-environment)) (define-public sbcl-type-i - (let ((commit "dea233f45f94064105ec09f0767de338f67dcbe2") - (revision "1")) + (let ((commit "d34440ab4ebf5a46a58deccb35950b15670e3667") + (revision "2")) (package (name "sbcl-type-i") (build-system asdf-build-system/sbcl) @@ -6011,7 +6017,7 @@ can and/or provide reasonable defaults.") (file-name (git-file-name name version)) (sha256 (base32 - "039g5pbrhh65s0bhr9314gmd2nwc2y5lp2377c5qrc2lxky89qs3")))) + "12wsga0pwjkkr176lnjwkmmlm3ccp0n310sjj9h20lk53iyd0z69")))) (inputs `(("alexandria" ,sbcl-alexandria) ("introspect-environment" ,sbcl-introspect-environment) @@ -6195,8 +6201,8 @@ This package uses fare-quasiquote with named-readtable."))) @code{fare-quasiquote-optima}."))) (define-public sbcl-trivia.level0 - (let ((commit "574901ac376ae54c9d37169fd5efab9b3b8fcc63") - (revision "1")) + (let ((commit "37698b47a14c2007630468de7a993694ef7bd475") + (revision "2")) (package (name "sbcl-trivia.level0") (build-system asdf-build-system/sbcl) @@ -6211,7 +6217,7 @@ This package uses fare-quasiquote with named-readtable."))) (file-name (git-file-name name version)) (sha256 (base32 - "0hf53n71xzr9sjwrxis5fivx3drclf4s39h5ck8vh21ndqj9zvdk")))) + "0rsbwbw3ipxxgr6zzhci12nilq8zky475kmhz1rcxy4q8a85vn72")))) (inputs `(("alexandria" ,sbcl-alexandria))) (synopsis "Pattern matching in Common Lisp") @@ -6588,8 +6594,9 @@ extension-points via the concept of hooks.") (sbcl-package->ecl-package sbcl-cl-hooks)) (define-public sbcl-s-sysdeps - (let ((commit "d28246b5dffef9e73a0e0e6cfbc4e878006fe34d") - (revision "1")) + ;; No release since 2013. + (let ((commit "9aa23bbdceb24bcdbe0e7c39fa1901858f823106") + (revision "2")) (package (name "sbcl-s-sysdeps") (build-system asdf-build-system/sbcl) @@ -6604,7 +6611,11 @@ extension-points via the concept of hooks.") (file-name (git-file-name name version)) (sha256 (base32 - "14b69b81yrxmjlvmm3lfxk04x5v7hqz4fql121334wh72czznfh9")))) + "1fh8r7kf8s3hvqdg6b71b8p7w3v2kkga9bw8j3qqdxhzr6anpm0b")))) + (inputs + `(("bordeaux-threads" ,sbcl-bordeaux-threads) + ("usocket" ,sbcl-usocket) + ("usocket-server" ,sbcl-usocket-server))) (synopsis "Common Lisp abstraction layer over platform dependent functionality") (description "@code{s-sysdeps} is an abstraction layer over platform dependent functionality. This simple package is used as a building block in a @@ -6627,8 +6638,8 @@ number of other open source projects. (sbcl-package->ecl-package sbcl-s-sysdeps)) (define-public sbcl-cl-prevalence - (let ((commit "c163c227ed85d430b82cb1e3502f72d4f88e3cfa") - (revision "1")) + (let ((commit "da3ed6c4594b1c2fca90c178c1993973c4bf16c9") + (revision "2")) (package (name "sbcl-cl-prevalence") (build-system asdf-build-system/sbcl) @@ -6643,7 +6654,7 @@ number of other open source projects. (file-name (git-file-name name version)) (sha256 (base32 - "1i9zj1q2ahgwch56an21yzbgkynz0kab9fyxkq9mg8p3xrv38jjn")))) + "0bq905hv1626dl6b7s0zn4lbdh608g1pxaljl1fda6pwp9hmj95a")))) (inputs `(("s-sysdeps" ,sbcl-s-sysdeps) ("s-xml" ,sbcl-s-xml))) @@ -7832,8 +7843,8 @@ functions for arrays and vectors. Originally from Plump.") (sbcl-package->cl-source-package sbcl-array-utils)) (define-public sbcl-plump - (let ((commit "16f1231bf706cfbc54d9e55a853ca945e4452a08") - (revision "0")) + (let ((commit "34f890fe46efdebe7bb70d218f1937e98f632bf9") + (revision "1")) (package (name "sbcl-plump") (version (git-version "2.0.0" revision commit)) @@ -7847,7 +7858,7 @@ functions for arrays and vectors. Originally from Plump.") (file-name (git-file-name name version)) (sha256 (base32 - "0705k8pbip51v74rccgwscwph439f2pma9f915qf1h4bhjx999ip")))) + "0a0x8wn6vv1ylxcwck12k18gy0a366kdm6ddxxk7yynl4mwnqgkh")))) (build-system asdf-build-system/sbcl) (inputs `(("array-utils" ,sbcl-array-utils) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9acc2adb79..3b5c707057 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages bootstrap) ;for 'bootstrap-guile-origin' #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -58,6 +60,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages hurd) + #:use-module (gnu packages libedit) #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages man) @@ -538,18 +541,21 @@ out) and returning a package that uses that as its 'source'." (define-public nix (package (name "nix") - (version "2.0.4") + (version "2.3.4") (source (origin (method url-fetch) (uri (string-append "http://nixos.org/releases/nix/nix-" version "/nix-" version ".tar.xz")) (sha256 (base32 - "0ss9svxlh1pvrdmnqjvjyqjmbqmrdbyfarvbb14i9d4bggzl0r8n")))) + "03fhbb8088sgz3709zd9n9rydavar79w87l9n4q9iimcw06nlqhw")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("curl" ,curl) + (inputs `(("boost" ,boost) + ("brotli" ,brotli) ("bzip2" ,bzip2) + ("curl" ,curl) + ("editline" ,editline) ("libgc" ,libgc) ("libseccomp" ,libseccomp) ("libsodium" ,libsodium) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 5bcdfa06ba..4f5ac1029f 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> +;;; Copyright © 2020 Jean-Baptiste Note <jean-baptiste.note@m4x.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,6 +62,7 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages cryptsetup) #:use-module (gnu packages curl) + #:use-module (gnu packages docbook) #:use-module (gnu packages file) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) @@ -1168,3 +1170,42 @@ exhaustive mode to try every password given a charset or in dictionary mode to try every password contained in a file.") (home-page "https://github.com/glv2/bruteforce-luks") (license license:gpl3+))) + +(define-public makepasswd + (let ((commit "3545d57d3a589a392d7eb0df36a5286785345c9e") + (revision "1")) + (package + (name "makepasswd") + (version (git-version "0.5.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/khorben/makepasswd") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0lspqyyxbk6h28yxnp7pd5aib161vrkzgasam5jpzn35n1jacx2j")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("libxslt" ,libxslt) + ("libxml2" ,libxml2) + ("docbook-xsl" ,docbook-xsl) + ("docbook-xml" ,docbook-xml))) + (inputs + `(("openssl" ,openssl))) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure)) + #:make-flags (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:tests? #f)) ;no tests + (synopsis "Generate (pseudo-)random passwords and hashes") + (description + "Makepasswd is a program that generates pseudo-random passwords of a +desired length. It can also generate their corresponding hashes for a given +encryption algorithm if so desired.") + (home-page "https://github.com/khorben/makepasswd") + (license license:gpl3)))) diff --git a/gnu/packages/patches/ableton-link-system-libraries-debian.patch b/gnu/packages/patches/ableton-link-system-libraries-debian.patch new file mode 100644 index 0000000000..184896ee61 --- /dev/null +++ b/gnu/packages/patches/ableton-link-system-libraries-debian.patch @@ -0,0 +1,29 @@ +This patch was borrowed from Debian's package: +https://salsa.debian.org/multimedia-team/ableton-link/-/blob/9c65141bf5bba0872811c179af77ac95770352cc/debian/patches/DEBIAN_system_libraries.patch +Description: Drop dependencies on included 3rd-party libs + upstream includes git-submodules for Catch and ASIO (not found in the tarball). + on Debian we want to use the system provided libraries. +Author: IOhannes m zmölnig +Origin: Debian +Forwarded: not-needed +Last-Update: 2016-10-26 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- ableton-link.orig/cmake_include/AsioStandaloneConfig.cmake ++++ ableton-link/cmake_include/AsioStandaloneConfig.cmake +@@ -1,6 +1,2 @@ + add_library(AsioStandalone::AsioStandalone IMPORTED INTERFACE) + +-set_property(TARGET AsioStandalone::AsioStandalone APPEND PROPERTY +- INTERFACE_INCLUDE_DIRECTORIES +- ${CMAKE_CURRENT_LIST_DIR}/../modules/asio-standalone/asio/include +-) +--- ableton-link.orig/cmake_include/CatchConfig.cmake ++++ ableton-link/cmake_include/CatchConfig.cmake +@@ -1,6 +1,2 @@ + add_library(Catch::Catch IMPORTED INTERFACE) + +-set_property(TARGET Catch::Catch APPEND PROPERTY +- INTERFACE_INCLUDE_DIRECTORIES +- ${CMAKE_SOURCE_DIR}/third_party/catch +-) diff --git a/gnu/packages/patches/gnome-todo-delete-esource-duplicate.patch b/gnu/packages/patches/gnome-todo-delete-esource-duplicate.patch new file mode 100644 index 0000000000..c680e86495 --- /dev/null +++ b/gnu/packages/patches/gnome-todo-delete-esource-duplicate.patch @@ -0,0 +1,10 @@ +From: Emmanuele Bassi <ebassi@gnome.org> + +See also: https://gitlab.gnome.org/GNOME/gnome-todo/commit/6cdabc4dd0c6c804a093b94c269461ce376fed4f +--- gnome-todo-3.28.1/plugins/eds/gtd-eds-autoptr.h.orig 2020-05-06 14:20:49.589902539 +0200 ++++ gnome-todo-3.28.1/plugins/eds/gtd-eds-autoptr.h 2020-05-06 14:20:54.593919721 +0200 +@@ -25,4 +25,3 @@ + G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponent, g_object_unref); + G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_free_id); + G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalClient, g_object_unref); +-G_DEFINE_AUTOPTR_CLEANUP_FUNC (ESource, g_object_unref); diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index c2c59ec855..2978a5789e 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 ad3ea069c3d23aab360ad04ff4d0f5e556d3538f7dd4eae0690c4e9241537570 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +-echo -n fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842 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 ad3ea069c3d23aab360ad04ff4d0f5e556d3538f7dd4eae0690c4e9241537570 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - ++# echo -n fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +# +# echo Extracting Firefox tarball +# tar -xf firefox-${FFVERSION}esr.source.tar.xz diff --git a/gnu/packages/patches/icecat-use-older-reveal-hidden-html.patch b/gnu/packages/patches/icecat-use-older-reveal-hidden-html.patch new file mode 100644 index 0000000000..228adc23f1 --- /dev/null +++ b/gnu/packages/patches/icecat-use-older-reveal-hidden-html.patch @@ -0,0 +1,70 @@ +From 2e8618d22568b6e00892a17303d437dd700eca98 Mon Sep 17 00:00:00 2001 +From: Mark H Weaver <mhw@netris.org> +Date: Tue, 5 May 2020 21:27:41 -0400 +Subject: [PATCH] Revert "Update Reveal hidden HTML." + +I prefer the user interface of the old version. + +This reverts commit f6e3adb6b2344ee2c7bb453a305fd2d6fb4c194c. +--- + .../passive_improve_css.js | 23 ++++++++++++++----- + 1 file changed, 17 insertions(+), 6 deletions(-) + +diff --git a/data/extensions/SubmitMe@0xbeef.coffee/passive_improve_css.js b/data/extensions/SubmitMe@0xbeef.coffee/passive_improve_css.js +index 7692990..ca57982 100644 +--- a/data/extensions/SubmitMe@0xbeef.coffee/passive_improve_css.js ++++ b/data/extensions/SubmitMe@0xbeef.coffee/passive_improve_css.js +@@ -10,6 +10,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI + */ + + ++var bad = []; ++ + function escapeHTML (unsafe_str) { + return unsafe_str + .replace(/&/g, '&') +@@ -20,9 +22,14 @@ function escapeHTML (unsafe_str) { + .replace(/\//g, '/') + } + ++function dounhide(){ ++ for(var i = 0; i < bad.length; i++){ ++ bad[i].remove(); ++ } ++} ++ + console.log("passive_improve_css.js"); + function reveal_css(){ +- var bad = []; + + var elements = document.getElementsByTagName("style"); + for(var i = 0; i < elements.length; i++){ +@@ -41,16 +48,20 @@ function reveal_css(){ + + } + } +- if(bad.length > 0 && window.confirm("Hidden HTML detected, would you like to reveal it?")){ +- for(var i = 0; i < bad.length; i++){ +- bad[i].remove(); +- } ++ if(bad.length > 0){ ++ const insertedDiv = document.createElement('div'); ++ insertedDiv.innerHTML= '<p id="unhide" class="button white" style="text-decoration:none!important; color:#000!important; font-size:1em !important; font-family:\'sans-serif\'!important; font-weight:normal !important; background-color:transparent!important; margin:0!important; padding:0!important; font-size:10px!important; line-height:1!important"' + ++ 'alt="Click to reveal hidden elements in this page">' + ++ '<span>Reveal hidden elements</span>' + ++ '</a>'; ++ insertedDiv.style="position:fixed; bottom:1em; right:1em; opacity:0.8; z-index: 2147483647 !important; border-radius: 3px !important; background-color: #fff !important; padding: 0.5em !important; box-shadow: 0 0 3px grey !important; font-color:#bbb!important; cursor: pointer!important;"; ++ insertedDiv.addEventListener("click", dounhide, false); ++ document.body.insertBefore(insertedDiv, document.body.firstChild); + } + } + + reveal_css(); + +- + /* + var a = document.getElementsByTagName("style")[2]; + var btn = document.createElement("style"); // Create a <button> element +-- +2.26.2 + diff --git a/gnu/packages/patches/warsow-qfusion-fix-bool-return-type.patch b/gnu/packages/patches/warsow-qfusion-fix-bool-return-type.patch new file mode 100644 index 0000000000..ec22377446 --- /dev/null +++ b/gnu/packages/patches/warsow-qfusion-fix-bool-return-type.patch @@ -0,0 +1,22 @@ +diff --git a/source/ref_gl/r_imagelib.cpp b/source/ref_gl/r_imagelib.cpp +index 418028a..f76916b 100644 +--- a/source/ref_gl/r_imagelib.cpp ++++ b/source/ref_gl/r_imagelib.cpp +@@ -762,7 +762,7 @@ static void q_jpg_noop( j_decompress_ptr cinfo ) { + + static boolean q_jpg_fill_input_buffer( j_decompress_ptr cinfo ) { + Com_DPrintf( "Premature end of jpeg file\n" ); +- return 1; ++ return TRUE; + } + + static void q_jpg_skip_input_data( j_decompress_ptr cinfo, long num_bytes ) { +@@ -955,7 +955,7 @@ bool WriteJPG( const char *name, r_imginfo_t *info, int quality ) { + } + + // start compression +- qjpeg_start_compress( &cinfo, true ); ++ qjpeg_start_compress( &cinfo, TRUE ); + + // feed scanline data + w3 = cinfo.image_width * info->samples; diff --git a/gnu/packages/patches/webkitgtk-share-store.patch b/gnu/packages/patches/webkitgtk-share-store.patch new file mode 100644 index 0000000000..053d86fcf4 --- /dev/null +++ b/gnu/packages/patches/webkitgtk-share-store.patch @@ -0,0 +1,19 @@ +Tell bubblewrap to share the store. Required for programs that use the +sandboxing features such as Epiphany. + +See <https://bugs.gnu.org/40837>. +Author: Jack Hill <jackhill@jackhill.us> +--- +diff --git a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp +--- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp ++++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp +@@ -737,6 +737,9 @@ GRefPtr<GSubprocess> bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces + "--ro-bind-try", "/usr/local/share", "/usr/local/share", + "--ro-bind-try", DATADIR, DATADIR, + ++ // Bind mount the store inside the WebKitGTK sandbox. ++ "--ro-bind", "@storedir@", "@storedir@", ++ + // We only grant access to the libdirs webkit is built with and + // guess system libdirs. This will always have some edge cases. + "--ro-bind-try", "/lib", "/lib", diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 30567431bf..229597b7d5 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -842,6 +842,71 @@ weak-signal conditions.") (home-page "https://www.physics.princeton.edu/pulsar/k1jt/wsjtx.html") (license license:gpl3))) +(define-public js8call + (package + (inherit wsjtx) + (name "js8call") + (version "2.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "http://files.js8call.com/" version + "/js8call-" version ".tgz")) + (sha256 + (base32 "034jnv6h172znn9ijl6wpmzx0rqibb69ppg52ndvkxhqlgrbsvyc")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete bundled boost to use the shared one. + (delete-file-recursively "boost") + #t)))) + (build-system qt-build-system) + (native-inputs + `(("asciidoc" ,asciidoc) + ("gfortran" ,gfortran) + ("pkg-config" ,pkg-config) + ("qttools" ,qttools) + ("ruby-asciidoctor" ,ruby-asciidoctor))) + (inputs + `(("boost" ,boost) + ("fftw" ,fftw) + ("fftwf" ,fftwf) + ("hamlib" ,wsjtx-hamlib) + ("libusb" ,libusb) + ("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia) + ("qtserialport" ,qtserialport))) + (arguments + `(#:tests? #f ; No test suite + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("DESTINATION /usr/share") + (string-append "DESTINATION " + (assoc-ref outputs "out") + "/share"))) + #t)) + (add-after 'unpack 'fix-hamlib + (lambda _ + (substitute* "CMake/Modules/Findhamlib.cmake" + (("set \\(ENV\\{PKG_CONFIG_PATH\\}.*\\)") + "set (__pc_path $ENV{PKG_CONFIG_PATH}) + list (APPEND __pc_path \"${__hamlib_pc_path}\") + set (ENV{PKG_CONFIG_PATH} \"${__pc_path}\")")) + (substitute* "HamlibTransceiver.hpp" + (("#ifdef JS8_USE_LEGACY_HAMLIB") + "#if 1")) + #t))))) + (synopsis "Weak-signal ham radio communication program") + (description + "JS8Call is a software using the JS8 digital mode (a derivative of the FT8 +mode) providing weak signal keyboard to keyboard messaging to amateur radio +operators.") + (home-page "http://js8call.com/") + (license license:gpl3))) + (define-public xnec2c (package (name "xnec2c") diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 072760ee10..886babf3fa 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2019 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2020 Tom Zander <tomz@freedommail.ch> ;;; ;;; This file is part of GNU Guix. ;;; @@ -967,3 +968,35 @@ keybindings, autocomplete and unlimited undo. It can pipe a marked block of text through any command line filter. It can also open very large binary files. It was originally developed on the Amiga 3000T.") (license license:gpl3+))) + +(define-public hexer + (package + (name "hexer") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (string-append "https://devel.ringlet.net/files/editors/hexer/" + "hexer-" version ".tar.xz")) + (sha256 + (base32 "157z17z8qivdin2km2wp86x1bv1nx15frrwcz11mk0l3ab74mf76")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no upstream tests + #:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "LTERMCAP=-lncurses") + (string-append "LDFLAGS=-L" (assoc-ref %build-inputs "ncurses") + "/lib")) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ;no configure script + (inputs + `(("ncurses" ,ncurses))) + (home-page "https://devel.ringlet.net/editors/hexer/") + (synopsis "Multi buffer editor for binary files with vi-like interface") + (description "Hexer is a multi-buffer editor for binary files for Unix-like +systems that displays its buffer(s) as a hex dump. The user interface is kept +similar to vi/ex.") + (license license:bsd-3))) diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index 6d536131a7..8b54849b18 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,7 +39,7 @@ (define-public tmux (package (name "tmux") - (version "3.0a") + (version "3.1b") (source (origin (method url-fetch) (uri (string-append @@ -46,7 +47,7 @@ version "/tmux-" version ".tar.gz")) (sha256 (base32 - "1fcdbw77nz918f7gqc1ga7zlkp1g112in1h8kkjnkadgnhldzlaa")))) + "1fbd93hzaz64h7j0h9nsll29avbq1ikqa438wrgsf1dga0fkagyr")))) (build-system gnu-build-system) (inputs `(("libevent" ,libevent) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index a5e73c2c38..90be7d2625 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -128,7 +128,8 @@ engine that uses Wayland for graphics output.") "webkitgtk-" version ".tar.xz")) (sha256 (base32 - "1g9hik3bprki5s9d7y5288q5irwckbzajr6rnlvjrlnqrwjkblmr")))) + "1g9hik3bprki5s9d7y5288q5irwckbzajr6rnlvjrlnqrwjkblmr")) + (patches (search-patches "webkitgtk-share-store.patch")))) (build-system cmake-build-system) (outputs '("out" "doc")) (arguments @@ -156,6 +157,15 @@ engine that uses Wayland for graphics output.") "-DUSE_WOFF2=OFF") #:phases (modify-phases %standard-phases + (add-after 'unpack 'configure-bubblewrap-store-directory + (lambda _ + ;; This phase is a corollary to 'webkitgtk-share-store.patch' to + ;; avoid hard coding /gnu/store, for users with other prefixes. + (let ((store-directory (%store-directory))) + (substitute* + "Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp" + (("@storedir@") store-directory)) + #t))) (add-after 'unpack 'patch-gtk-doc-scan (lambda* (#:key inputs #:allow-other-keys) (for-each (lambda (file) diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm index df3cb01646..89fa73920d 100644 --- a/gnu/services/admin.scm +++ b/gnu/services/admin.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,8 +72,11 @@ (list (log-rotation ;syslog files (files %rotated-files) + (options '(;; Run post-rotate once per rotation + "sharedscripts" + ;; Append .gz to rotated files + "storefile @FILENAME.@COMP_EXT")) ;; Restart syslogd after rotation. - (options '("sharedscripts")) (post-rotate #~(let ((pid (call-with-input-file "/var/run/syslog.pid" read))) (kill pid SIGHUP)))) diff --git a/gnu/services/sound.scm b/gnu/services/sound.scm index a1c928222a..bdf819b422 100644 --- a/gnu/services/sound.scm +++ b/gnu/services/sound.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at> +;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -127,11 +128,6 @@ ctl.!default { (default (file-append pulseaudio "/etc/pulse/system.pa")))) -(define (pulseaudio-environment config) - `(;; Define these variables, so that pulseaudio honors /etc. - ("PULSE_CONFIG" . "/etc/pulse/daemon.conf") - ("PULSE_CLIENTCONFIG" . "/etc/pulse/client.conf"))) - (define (pulseaudio-conf-entry arg) (match arg ((key . value) @@ -139,21 +135,22 @@ ctl.!default { ((? string? _) (string-append arg "\n")))) +(define pulseaudio-environment + (match-lambda + (($ <pulseaudio-configuration> client-conf daemon-conf default-script-file) + `(("PULSE_CONFIG" . ,(apply mixed-text-file "daemon.conf" + "default-script-file = " default-script-file "\n" + (map pulseaudio-conf-entry daemon-conf))) + ("PULSE_CLIENTCONFIG" . ,(apply mixed-text-file "client.conf" + (map pulseaudio-conf-entry client-conf))))))) + (define pulseaudio-etc (match-lambda - (($ <pulseaudio-configuration> client-conf daemon-conf - default-script-file system-script-file) + (($ <pulseaudio-configuration> _ _ default-script-file system-script-file) `(("pulse" ,(file-union "pulse" - `(("client.conf" - ,(apply mixed-text-file "client.conf" - (map pulseaudio-conf-entry client-conf))) - ("daemon.conf" - ,(apply mixed-text-file "daemon.conf" - "default-script-file = " default-script-file "\n" - (map pulseaudio-conf-entry daemon-conf))) - ("default.pa" ,default-script-file) + `(("default.pa" ,default-script-file) ("system.pa" ,system-script-file)))))))) (define pulseaudio-service-type |