diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-06-13 13:24:35 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-06-13 13:24:35 +0200 |
| commit | d9bbfe042e06df35c12e4b8f53bfb1889cba90bf (patch) | |
| tree | 9f34077cd824e8955be4ed2b5f1a459aa8076489 /gnu/packages | |
| parent | f87a7cc60e058d2e07560d0d602747b567d9dce4 (diff) | |
| parent | 47f2168b6fabb105565526b2a1243eeeb13008fe (diff) | |
| download | guix-d9bbfe042e06df35c12e4b8f53bfb1889cba90bf.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages')
124 files changed, 3338 insertions, 1850 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 75380be594..9392c59521 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -115,14 +115,14 @@ (define-public aide (package (name "aide") - (version "0.16.1") + (version "0.16.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/aide/aide/releases/download/v" version "/aide-" version ".tar.gz")) (sha256 - (base32 "1dqhc0c24wa4zid06pfy61k357yvzh28ij86bk9jf6hcqzn7qaqg")))) + (base32 "15xp47sz7kk1ciffw3f5xw2jg2mb2lqrbr3q6p4bkbz5dap9iy8p")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) @@ -1734,13 +1734,13 @@ of supported upstream metrics systems simultaneously.") (define-public ansible (package (name "ansible") - (version "2.7.10") + (version "2.8.0") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 - (base32 "15721d0bxymghxnlnknq43lszlxg3ybbcp2p5v424hhw6wg2v944")))) + (base32 "1bpk5r5x6vdgn839n74yv2chd2ja10yfrhav0fzwa38mi5yxsd3j")))) (build-system python-build-system) (native-inputs `(("python-bcrypt" ,python-bcrypt) @@ -2124,25 +2124,36 @@ results (ndiff), and a packet generation and response analysis tool (nping).") (define-public dstat (package (name "dstat") - (version "0.7.3") + (version "0.7.4") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/dagwieers/dstat.git") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name "dstat" version)) (sha256 - (base32 "0sbpna531034gr40w4g9cwz35s2fpf9h654paznsxw9fih91rfa5")))) + (base32 "1qnmkhqmjd1m3if05jj29dvr5hn6kayq9bkkkh881w472c0zhp8v")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no make check #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "DESTDIR=" out) "prefix=/")) - ;; No configure script. - #:phases (modify-phases %standard-phases (delete 'configure)))) - (inputs `(("python-2" ,python-2))) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-after 'install 'wrap + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/dstat") + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))) + #t)))))) + (inputs + ;; Python 3 is supposedly supported but prints a DeprecationWarning. + ;; Upstream is dead. See <https://github.com/dagwieers/dstat/releases>. + `(("python" ,python-wrapper) + ("python-six" ,python-six))) (synopsis "Versatile resource statistics tool") (description "Dstat is a versatile replacement for @command{vmstat}, @command{iostat}, @command{netstat}, and @command{ifstat}. Dstat overcomes @@ -2160,7 +2171,7 @@ throughput (in the same interval).") (define-public thefuck (package (name "thefuck") - (version "3.28") + (version "3.29") (source (origin (method git-fetch) @@ -2169,7 +2180,7 @@ throughput (in the same interval).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "070b2sx8r0b4hry6xg97psxlikxghmz91zicg2cm6kc1yhgz4agc")) + (base32 "1qhxwjjgrzpqrqjv7l2847ywpln76lyd6j8bl9gz2r6kl0fx2fqs")) (patches (search-patches "thefuck-test-environ.patch")))) (build-system python-build-system) (arguments @@ -2849,7 +2860,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.0.33-1") + (version "3.0.34-1") (source (origin (method git-fetch) @@ -2858,7 +2869,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "19bfdid4zp39irsdq3m6yyqf2336c30da35qgslrzcr2vh815g8c")))) + (base32 "0x2s40lwsan2pk292nspjgyw00f9f5fdfmwfvl50924pxhyxn2fh")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index afcb33ad6d..61d3331c97 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,8 +27,15 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (gnu packages autotools) - #:use-module (gnu packages pkg-config) + #:use-module (gnu packages imagemagick) + #:use-module (gnu packages glib) + #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) + #:use-module (gnu packages video) #:use-module (guix build-system gnu)) @@ -102,3 +110,48 @@ characters, and is highly robust.") barcodes of the modern ECC200 variety. libdmtx is a shared library, allowing C/C++ programs to use its capabilities without restrictions or overhead.") (license license:bsd-3))) + +(define-public zbar + (package + (name "zbar") + (version "0.23") + (source + (origin + (method url-fetch) + (uri (string-append "https://linuxtv.org/downloads/zbar/zbar-" + version + ".tar.bz2")) + (sha256 + (base32 + "0bmd93a15qpgbsq9c9j33qms18rdrgz6gbc48zi6z9w5pvrvi7z9")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags (list "--with-gtk=auto" + "--with-python=auto" + (string-append "--with-dbusconfdir=" + (assoc-ref %outputs "out") + "/etc") + "CXXFLAGS=-std=c++11"))) + (native-inputs + `(("glib" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("gobject-introspection" ,gobject-introspection) + ("gtk+" ,gtk+) + ("imagemagick" ,imagemagick) + ("libjpeg" ,libjpeg-turbo) + ("python" ,python) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras) + ("v4l-utils" ,v4l-utils))) + (synopsis "Bar code reader") + (description + "ZBar can read barcodes from various sources, such as video streams, +image files, and raw intensity sensors. It supports EAN-13/UPC-A, UPC-E, +EAN-8, Code 128, Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and SQ +Code. Included with the library are basic applications for decoding captured +bar code images and using a video device (e.g. webcam) as a bar code scanner. +For application developers, language bindings are included for C, C++ and +Python as well as GUI widgets for GTK and Qt.") + (home-page "https://github.com/mchehab/zbar") + (license license:lgpl2.1+))) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 128d41a570..69163a43d9 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -251,7 +251,7 @@ precision.") (define-public giac (package (name "giac") - (version "1.5.0-49") + (version "1.5.0-57") (source (origin (method url-fetch) ;; "~parisse/giac" is not used because the maintainer regularly @@ -263,7 +263,7 @@ precision.") "source/giac_" version ".tar.gz")) (sha256 (base32 - "0f4pkand9vmqfayw18jm5qxbhcwi1405qfd7ibzh9lwzz6amkm3l")))) + "08c93knsisbk9dkyyrignw0wvqbr1sa5czlvk5l307ahxbbmqncf")))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 ftw) diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index b46382c035..08bf4eb1de 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -264,7 +264,7 @@ waveform until they line up with the proper sounds.") (define-public pencil2d (package (name "pencil2d") - (version "0.6.3") + (version "0.6.4") (source (origin (method git-fetch) (uri (git-reference @@ -273,7 +273,7 @@ waveform until they line up with the proper sounds.") (file-name (git-file-name name version)) (sha256 (base32 - "097xwvhw7vl9pgknhb40zs6adf7mb1xxfc73h4kiqgp6z59prjl3")))) + "0zi8x0w8n817zds2lyw9l8j33c03kiybkrcyy3s5fg66mchmrwnr")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index 7f898b2f88..4f6f1a1cca 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016 Christopher Andersson <christopher@8bits.nu> ;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2016, 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk> ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,7 +32,8 @@ #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages compression) - #:use-module (gnu packages perl)) + #:use-module (gnu packages perl) + #:use-module (ice-9 match)) (define-public aspell (package @@ -102,7 +104,14 @@ dictionaries, including personal ones.") (define* (aspell-dictionary dict-name full-name #:key version sha256 (prefix "aspell6-")) (package - (name (string-append "aspell-dict-" dict-name)) + (name (string-append + "aspell-dict-" + ;; Downcase and replace underscore in package names + ;; to follow Guix naming conventions. + (string-map (match-lambda + (#\_ #\-) + (chr chr)) + (string-downcase dict-name)))) (version version) (source (origin (method url-fetch) @@ -132,6 +141,22 @@ dictionaries, including personal ones.") (home-page "http://aspell.net/"))) +(define-public aspell-dict-ar + (aspell-dictionary "ar" "Arabic" + #:version "1.2-0" + #:prefix "aspell6-" + #:sha256 + (base32 + "1avw40bp8yi5bnkq64ihm2rldgw34lk89yz281q9bmndh95a47h4"))) + +(define-public aspell-dict-be + (aspell-dictionary "be" "Belarusian" + #:version "0.01" + #:prefix "aspell5-" + #:sha256 + (base32 + "1svls9p7rsfi3hs0afh0cssj006qb4v1ik2yzqgj8hm10c6as2sm"))) + (define-public aspell-dict-ca (aspell-dictionary "ca" "Catalan" #:version "2.1.5-1" @@ -146,6 +171,14 @@ dictionaries, including personal ones.") (base32 "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"))) +(define-public aspell-dict-da + (aspell-dictionary "da" "Danish" + #:version "1.4.42-1" + #:prefix "aspell5-" + #:sha256 + (base32 + "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"))) + (define-public aspell-dict-el (aspell-dictionary "el" "Greek" #:version "0.08-0" @@ -175,6 +208,14 @@ dictionaries, including personal ones.") (base32 "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"))) +(define-public aspell-dict-fi + (aspell-dictionary "fi" "Finnish" + #:version "0.7-0" + #:prefix "aspell6-" + #:sha256 + (base32 + "07d5s08ba4dd89cmwy9icc01i6fjdykxlb9ravmhdrhi8mxz1mzq"))) + (define-public aspell-dict-fr (aspell-dictionary "fr" "French" #:version "0.50-3" @@ -197,6 +238,14 @@ dictionaries, including personal ones.") (base32 "13bhbghx5b8g0119g3wxd4n8mlf707y41vlf59irxjj0kynankfn"))) +(define-public aspell-dict-hi + (aspell-dictionary "hi" "Hindi" + #:version "0.02-0" + #:prefix "aspell6-" + #:sha256 + (base32 + "0drs374qz4419zx1lf2k281ydxf2750jk5ailafj1x0ncz27h1ys"))) + (define-public aspell-dict-it (let ((version "2.4-20070901-0") (sha256 @@ -218,6 +267,13 @@ dictionaries, including personal ones.") (home-page "http://linguistico.sourceforge.net/pages/dizionario_italiano.html")))) +(define-public aspell-dict-mi + (aspell-dictionary "mi" "Maori" + #:version "0.50-0" + #:sha256 + (base32 + "12bxplpd348yx8d2q8qvahi9dlp7qf28qmanzhziwc7np8rixvmy"))) + (define-public aspell-dict-nl (aspell-dictionary "nl" "Dutch" #:version "0.50-2" @@ -226,14 +282,29 @@ dictionaries, including personal ones.") (base32 "0ffb87yjsh211hllpc4b9khqqrblial4pzi1h9r3v465z1yhn3j4"))) +(define-public aspell-dict-nn + (aspell-dictionary "nn" "Norwegian Nynorsk" + #:version "0.50.1-1" + #:sha256 + (base32 + "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"))) + (define-public aspell-dict-pt-br - (aspell-dictionary "pt-br" "Brazilian Portuguese" + (aspell-dictionary "pt_BR" "Brazilian Portuguese" #:version "20090702-0" #:prefix "aspell6-" #:sha256 (base32 "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"))) +(define-public aspell-dict-pt-pt + (aspell-dictionary "pt_PT" "Portuguese" + #:version "20070510-0" + #:prefix "aspell6-" + #:sha256 + (base32 + "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"))) + (define-public aspell-dict-ru (aspell-dictionary "ru" "Russian" #:version "0.99f7-1" @@ -249,6 +320,13 @@ dictionaries, including personal ones.") (base32 "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v"))) +(define-public aspell-dict-uk + (aspell-dictionary "uk" "Ukrainian" + #:version "1.4.0-0" + #:sha256 + (base32 + "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m"))) + ;;; ;;; Hunspell packages made from the Aspell word lists. diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index ab5dcd92a7..9ddb9e1d52 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 John Darrington <jmd@gnu.org> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. @@ -37,15 +37,15 @@ (define-public cfitsio (package (name "cfitsio") - (version "3.450") + (version "3.47") (source (origin (method url-fetch) (uri (string-append "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/" - name (string-replace-substring version "." "") ".tar.gz")) + name "-" version ".tar.gz")) (sha256 - (base32 "0bmrkw6w65zb0k3mszaaqy1f4zjm2hl7njww74nb5v38wvdi4q5z")))) + (base32 "1vzlxnrjckz78p2wf148v2z3krkwnykfqvlj42sz3q711vqid1a1")))) (build-system gnu-build-system) ;; XXX Building with curl currently breaks wcslib. It doesn't use ;; pkg-config and hence won't link with -lcurl. diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index c897e30458..9defc59b93 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -174,14 +174,14 @@ Filter) modules follow the convention of 1V / Octave.") "--enable-jack" "--enable-sndfile" "--enable-samplerate" - ;; TODO: enable compilation with avcodec once available. - "--disable-avcodec") + "--enable-avcodec") #:python ,python-2)) (inputs `(("jack" ,jack-1) ("libsndfile" ,libsndfile) ("libsamplerate" ,libsamplerate) - ("fftwf" ,fftwf))) + ("fftwf" ,fftwf) + ("ffmpeg" ,ffmpeg))) ; for libavcodec (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://aubio.org/") @@ -2120,14 +2120,14 @@ different audio devices such as ALSA or PulseAudio.") (define-public qjackctl (package (name "qjackctl") - (version "0.5.7") + (version "0.5.8") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qjackctl/qjackctl/" version "/qjackctl-" version ".tar.gz")) (sha256 (base32 - "1g6a5j74p45yisl28bw4fcc9nr6b710ikk459p4mp6djh9gs8v95")))) + "1r5hf3hcr20n93jrrm7xk2zf6yx264pcr4d10cpybhrancxh602n")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; no check target @@ -3701,7 +3701,7 @@ library.") (define-public faudio (package (name "faudio") - (version "19.05") + (version "19.06.07") (source (origin (method git-fetch) @@ -3710,7 +3710,7 @@ library.") (commit version))) (file-name (string-append name "-" version "-checkout")) (sha256 - (base32 "1dja2ykixk1ycqda116cg9fy4qg364dqj88amfln0r9pnsj2kbxk")))) + (base32 "1w37qp279lgpyvslwz3wlb4fp0i68ncd411rqdlk5s71b1zz466n")))) (arguments '(#:tests? #f ; No tests. #:configure-flags '("-DFFMPEG=ON"))) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 64ed5bb14a..f62c5c3c00 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -73,7 +73,7 @@ (define-public duplicity (package (name "duplicity") - (version "0.7.18.2") + (version "0.7.19") (source (origin (method url-fetch) @@ -82,7 +82,7 @@ "-series/" version "/+download/duplicity-" version ".tar.gz")) (sha256 - (base32 "0j37dgyji36hvb5dbzlmh5rj83jwhni02yq16g6rd3hj8f7qhdn2")))) + (base32 "0ag9dknslxlasslwfjhqgcqbkb1mvzzx93ry7lch2lfzcdd91am6")))) (build-system python-build-system) (native-inputs `(("util-linux" ,util-linux) ; setsid command, for the tests @@ -495,15 +495,13 @@ detection, and lossless compression.") (define-public borg (package (name "borg") - (version "1.1.9") + (version "1.1.10") (source (origin (method url-fetch) (uri (pypi-uri "borgbackup" version)) (sha256 - (base32 - "0x95nhv4h34m8cxycbwc4xdz350saaxlgh727b23bgn4ci7gh3vx")) - (patches (search-patches "borg-fix-hard-link-preloading.patch")) + (base32 "1pp70p4n5kamvcbl4d8021ggrxhyykmg9isjg4yd3wags8b19d7g")) (modules '((guix build utils))) (snippet '(begin @@ -525,7 +523,12 @@ detection, and lossless compression.") ;; Remove bundled shared libraries. (with-directory-excursion "src/borg/algorithms" (for-each delete-file-recursively - (list "blake2" "lz4" "zstd"))) + (list "blake2" "lz4" "msgpack" "zstd"))) + ;; Purge some msgpack references from setup.py or the resulting + ;; sources will be unbuildable. + (substitute* "setup.py" + ((".*Extension\\('borg\\.algorithms\\.msgpack\\..*") "") + (("msgpack_packer_source, msgpack_unpacker_source") "")) #t)))) (build-system python-build-system) (arguments @@ -549,6 +552,12 @@ detection, and lossless compression.") ;; HOME=/homeless-shelter. (setenv "HOME" "/tmp") #t))) + (add-after 'unpack 'use-system-msgpack + (lambda _ + (substitute* "src/borg/helpers.py" + (("prefer_system_msgpack = False") + "prefer_system_msgpack = True")) + #t)) ;; The tests need to be run after Borg is installed. (delete 'check) (add-after 'install 'check diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 9df0dc98d6..6585d2eebd 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2019 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <mhw@netris.org> @@ -992,12 +992,47 @@ to the @code{share/locale} sub-directory of this package.") (let ((args `(#:tests? #f #:strip-binaries? #f ,@(package-arguments glibc)))) (substitute-keyword-arguments args + ((#:modules modules '((guix build utils) + (guix build gnu-build-system))) + `((srfi srfi-11) + (gnu build locale) + ,@modules)) + ((#:imported-modules modules '()) + `((gnu build locale) + ,@%gnu-build-system-modules)) ((#:phases phases) `(modify-phases ,phases (replace 'build (lambda _ (invoke "make" "localedata/install-locales" "-j" (number->string (parallel-job-count))))) + (add-after 'build 'symlink-normalized-codesets + (lambda* (#:key outputs #:allow-other-keys) + ;; The above phase does not install locales with names using + ;; the "normalized codeset." Thus, create symlinks like: + ;; en_US.utf8 -> en_US.UTF-8 + (define (locale-directory? file stat) + (and (file-is-directory? file) + (string-index (basename file) #\_) + (string-rindex (basename file) #\.))) + + (let* ((out (assoc-ref outputs "out")) + (locales (find-files out locale-directory? + #:directories? #t))) + (for-each (lambda (directory) + (let*-values (((base) + (basename directory)) + ((name codeset) + (locale->name+codeset base)) + ((normalized) + (normalize-codeset codeset))) + (unless (string=? codeset normalized) + (symlink base + (string-append (dirname directory) + "/" name "." + normalized))))) + locales) + #t))) (delete 'install) (delete 'move-static-libs))) ((#:configure-flags flags) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 805cf3256c..970df735aa 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Dave Love <fx@gnu.org> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org> ;;; @@ -38,14 +38,14 @@ (define-public fio (package (name "fio") - (version "3.13") + (version "3.14") (source (origin (method url-fetch) (uri (string-append "http://brick.kernel.dk/snaps/" "fio-" version ".tar.bz2")) (sha256 (base32 - "0ddj7zm04jqlna3w61qyp4qvwnv0r2lc1hzpwrgbvv4fq581w7d2")))) + "047y53nyhnmnxcrsfbsf0gcpxw7bli3n19ycscpxy9974j0fck0v")))) (build-system gnu-build-system) (arguments '(#:test-target "test" diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 3810749f83..e87907fac5 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -590,6 +590,35 @@ data. It is derived from the UCSC hg19 genome and based on the \"knownGene\" track. The database is exposed as a @code{TxDb} object.") (license license:artistic2.0))) +(define-public r-txdb-hsapiens-ucsc-hg38-knowngene + (package + (name "r-txdb-hsapiens-ucsc-hg38-knowngene") + (version "3.4.6") + (source (origin + (method url-fetch) + ;; We cannot use bioconductor-uri here because this tarball is + ;; located under "data/annotation/" instead of "bioc/". + (uri (string-append "https://bioconductor.org/packages/" + "release/data/annotation/src/contrib" + "/TxDb.Hsapiens.UCSC.hg38.knownGene_" + version ".tar.gz")) + (sha256 + (base32 + "12j7rri9r129v9w1yiqadg952dx462dh092sxif3r5kk8l7bxkn9")))) + (properties + `((upstream-name . "TxDb.Hsapiens.UCSC.hg38.knownGene"))) + (build-system r-build-system) + (propagated-inputs + `(("r-genomicfeatures" ,r-genomicfeatures))) + (home-page + "https://bioconductor.org/packages/TxDb.Hsapiens.UCSC.hg38.knownGene/") + (synopsis "Annotation package for human genome in TxDb format") + (description + "This package provides an annotation database of Homo sapiens genome +data. It is derived from the UCSC hg38 genome and based on the \"knownGene\" +track. The database is exposed as a @code{TxDb} object.") + (license license:artistic2.0))) + (define-public r-txdb-mmusculus-ucsc-mm9-knowngene (package (name "r-txdb-mmusculus-ucsc-mm9-knowngene") @@ -1153,14 +1182,14 @@ determining dependencies between variables, code improvement suggestions.") (define-public r-chippeakanno (package (name "r-chippeakanno") - (version "3.18.0") + (version "3.18.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPpeakAnno" version)) (sha256 (base32 - "089v16mm5m0rlyyyd0d6rz8gwb852zf3bcdrrw70wanlfjn258q7")))) + "1mwi5s600c3jxy8f1azfrndc3g06qvhbmrp9wqac9nwjbfx1kfji")))) (properties `((upstream-name . "ChIPpeakAnno"))) (build-system r-build-system) (propagated-inputs @@ -2086,14 +2115,14 @@ independent of the p-value under the null hypothesis.") (define-public r-icobra (package (name "r-icobra") - (version "1.12.0") + (version "1.12.1") (source (origin (method url-fetch) (uri (bioconductor-uri "iCOBRA" version)) (sha256 (base32 - "1w9frnczgypzc2czbwrvlizqcqhbp6cdpyws7vkmnn9k0ggzxvfc")))) + "1wj0vqyb6h4rddmn4va3182yap9bv4m1r1jlzyjfyrqxhl2sqb1q")))) (properties `((upstream-name . "iCOBRA"))) (build-system r-build-system) (propagated-inputs @@ -2886,14 +2915,14 @@ to multiple hypothesis correction.") (define-public r-dose (package (name "r-dose") - (version "3.10.0") + (version "3.10.1") (source (origin (method url-fetch) (uri (bioconductor-uri "DOSE" version)) (sha256 (base32 - "0dvhnfhzhhzcxm8zhdwrkif7sak4p888sjqfd3a0p77h0hs6g8pv")))) + "0ab7mgj42fg6608qkciyqivr1n8s8r5ibvp0z3jfclrnyx6cl0w1")))) (properties `((upstream-name . "DOSE"))) (build-system r-build-system) (propagated-inputs @@ -3408,14 +3437,14 @@ position-specific scores within R and Bioconductor.") (define-public r-atacseqqc (package (name "r-atacseqqc") - (version "1.8.0") + (version "1.8.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ATACseqQC" version)) (sha256 (base32 - "03f130vcd6hd3fv2pg60id0ddd6qkwsyx73gm907xaayf42ar2pj")))) + "0h5j3724hnd86w22vy3whqx6gkf0nf2dxd2clgzdvjzblbcd5s69")))) (properties `((upstream-name . "ATACseqQC"))) (build-system r-build-system) (propagated-inputs @@ -3621,14 +3650,14 @@ investigation using RNA-seq data.") (define-public r-aucell (package (name "r-aucell") - (version "1.6.0") + (version "1.6.1") (source (origin (method url-fetch) (uri (bioconductor-uri "AUCell" version)) (sha256 (base32 - "025q1as9pifbxa7hidlz634q6d7l73zx8mqy4rjbfrk7d5615xvm")))) + "1vd8w6dygn1b5bwlha09mm6fbwyj07pmawpv53agcg1y7jlxs31b")))) (properties `((upstream-name . "AUCell"))) (build-system r-build-system) (propagated-inputs @@ -4438,14 +4467,14 @@ interpretation.") (define-public r-rhisat2 (package (name "r-rhisat2") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (bioconductor-uri "Rhisat2" version)) (sha256 (base32 - "01jhj5vvfl4n2d0nl3nd1iw9nii85mgw2adnrmxb8wwlxgy240vr")))) + "1y3zqvk1vbcb10r1myh6f5yzjvf7bhwhpiq78bs1k6spli4bzj0q")))) (properties `((upstream-name . "Rhisat2"))) (build-system r-build-system) (native-inputs @@ -4548,3 +4577,171 @@ high-throughput sequencing data. It performs parallel processing of entire files and produces a report which contains a set of high-resolution graphics.") (license license:gpl2+))) + +(define-public r-birewire + (package + (name "r-birewire") + (version "3.16.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "BiRewire" version)) + (sha256 + (base32 + "1gjb18l3gq3w8zl6r5d49hw0r1kfh9f7ghv9hz6y86aniprvb518")))) + (properties `((upstream-name . "BiRewire"))) + (build-system r-build-system) + (propagated-inputs + `(("r-igraph" ,r-igraph) + ("r-matrix" ,r-matrix) + ("r-slam" ,r-slam) + ("r-tsne" ,r-tsne))) + (home-page "https://bioconductor.org/packages/release/bioc/html/BiRewire.html") + (synopsis "Tools for randomization of bipartite graphs") + (description + "This package provides functions for bipartite network rewiring through N +consecutive switching steps and for the computation of the minimal number of +switching steps to be performed in order to maximise the dissimilarity with +respect to the original network. It includes functions for the analysis of +the introduced randomness across the switching steps and several other +routines to analyse the resulting networks and their natural projections.") + (license license:gpl3))) + +(define-public r-birta + (package + (name "r-birta") + (version "1.28.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "birta" version)) + (sha256 + (base32 + "12xjyvgmh4h0b7hi4qg50kcpb9003gnh2xyfgncb8l9mzvsbkxc2")))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-limma" ,r-limma) + ("r-mass" ,r-mass))) + (home-page "https://bioconductor.org/packages/birta") + (synopsis "Bayesian inference of regulation of transcriptional activity") + (description + "Expression levels of mRNA molecules are regulated by different +processes, comprising inhibition or activation by transcription factors and +post-transcriptional degradation by microRNAs. @dfn{birta} (Bayesian +Inference of Regulation of Transcriptional Activity) uses the regulatory +networks of transcription factors and miRNAs together with mRNA and miRNA +expression data to predict switches in regulatory activity between two +conditions. A Bayesian network is used to model the regulatory structure and +Markov-Chain-Monte-Carlo is applied to sample the activity states.") + (license license:gpl2+))) + +(define-public r-ropls + (package + (name "r-ropls") + (version "1.16.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "ropls" version)) + (sha256 + (base32 + "099nv9dgmw3avkxv7cd27r16yj56svjlp5q4i389yp1n0r5zhyl2")))) + (build-system r-build-system) + (propagated-inputs `(("r-biobase" ,r-biobase))) + (native-inputs + `(("r-knitr" ,r-knitr))) ; for vignettes + (home-page "https://dx.doi.org/10.1021/acs.jproteome.5b00354") + (synopsis "Multivariate analysis and feature selection of omics data") + (description + "Latent variable modeling with @dfn{Principal Component Analysis} (PCA) +and @dfn{Partial Least Squares} (PLS) are powerful methods for visualization, +regression, classification, and feature selection of omics data where the +number of variables exceeds the number of samples and with multicollinearity +among variables. @dfn{Orthogonal Partial Least Squares} (OPLS) enables to +separately model the variation correlated (predictive) to the factor of +interest and the uncorrelated (orthogonal) variation. While performing +similarly to PLS, OPLS facilitates interpretation. + +This package provides imlementations of PCA, PLS, and OPLS for multivariate +analysis and feature selection of omics data. In addition to scores, loadings +and weights plots, the package provides metrics and graphics to determine the +optimal number of components (e.g. with the R2 and Q2 coefficients), check the +validity of the model by permutation testing, detect outliers, and perform +feature selection (e.g. with Variable Importance in Projection or regression +coefficients).") + (license license:cecill))) + +(define-public r-biosigner + (package + (name "r-biosigner") + (version "1.12.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "biosigner" version)) + (sha256 + (base32 + "1643iya40v6whb7lw7y34w5sanbasvj4yhvcygbip667yhphyv5b")))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-e1071" ,r-e1071) + ("r-randomforest" ,r-randomforest) + ("r-ropls" ,r-ropls))) + (native-inputs + `(("r-knitr" ,r-knitr) + ("r-rmarkdown" ,r-rmarkdown) + ("pandoc" ,ghc-pandoc) + ("pandoc-citeproc" ,ghc-pandoc-citeproc))) ; all for vignettes + (home-page "https://bioconductor.org/packages/biosigner/") + (synopsis "Signature discovery from omics data") + (description + "Feature selection is critical in omics data analysis to extract +restricted and meaningful molecular signatures from complex and high-dimension +data, and to build robust classifiers. This package implements a method to +assess the relevance of the variables for the prediction performances of the +classifier. The approach can be run in parallel with the PLS-DA, Random +Forest, and SVM binary classifiers. The signatures and the corresponding +'restricted' models are returned, enabling future predictions on new +datasets.") + (license license:cecill))) + +(define-public r-annotatr + (package + (name "r-annotatr") + (version "1.10.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "annotatr" version)) + (sha256 + (base32 + "1zlhy6swfgqjhhcqn8c6akxd4c4z8p85swfh095imji7hxnlhh1f")))) + (build-system r-build-system) + (propagated-inputs + `(("r-annotationdbi" ,r-annotationdbi) + ("r-annotationhub" ,r-annotationhub) + ("r-dplyr" ,r-dplyr) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicfeatures" ,r-genomicfeatures) + ("r-genomicranges" ,r-genomicranges) + ("r-ggplot2" ,r-ggplot2) + ("r-iranges" ,r-iranges) + ("r-readr" ,r-readr) + ("r-regioner" ,r-regioner) + ("r-reshape2" ,r-reshape2) + ("r-rtracklayer" ,r-rtracklayer) + ("r-s4vectors" ,r-s4vectors))) + (home-page "https://bioconductor.org/packages/annotatr/") + (synopsis "Annotation of genomic regions to genomic annotations") + (description + "Given a set of genomic sites/regions (e.g. ChIP-seq peaks, CpGs, +differentially methylated CpGs or regions, SNPs, etc.) it is often of interest +to investigate the intersecting genomic annotations. Such annotations include +those relating to gene models (promoters, 5'UTRs, exons, introns, and 3'UTRs), +CpGs (CpG islands, CpG shores, CpG shelves), or regulatory sequences such as +enhancers. The annotatr package provides an easy way to summarize and +visualize the intersection of genomic sites/regions with genomic +annotations.") + (license license:gpl3))) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8aba7f1c5f..8dbcd5dd33 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7245,18 +7245,19 @@ Bioconductor, CRAN, and Github.") (define-public r-biocviews (package (name "r-biocviews") - (version "1.52.0") + (version "1.52.2") (source (origin (method url-fetch) (uri (bioconductor-uri "biocViews" version)) (sha256 (base32 - "1wc7a953n6qrlh9azzg1q68rk99h3xkbs82wq0yk6h2vb2c5r3zk")))) + "0qwrsd9fcpkv7hhzy1scnj7ahdxi6cjary28kqk6b36gkzmnrw4r")))) (properties `((upstream-name . "biocViews"))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) + ("r-biocmanager" ,r-biocmanager) ("r-graph" ,r-graph) ("r-rbgl" ,r-rbgl) ("r-rcurl" ,r-rcurl) @@ -7372,13 +7373,13 @@ S4Vectors package itself.") (define-public r-iranges (package (name "r-iranges") - (version "2.18.0") + (version "2.18.1") (source (origin (method url-fetch) (uri (bioconductor-uri "IRanges" version)) (sha256 (base32 - "0g06y6xlm2q7p7g7phfc8qj14pqpgbb0mkyjzkfgsrwjmzvpwy6m")))) + "1d64sh43pfc9vj2l7y7x6sb44l67wlnn3dzygp7ws0smn06mardq")))) (properties `((upstream-name . "IRanges"))) (build-system r-build-system) @@ -7452,13 +7453,13 @@ names in their natural, rather than lexicographic, order.") (define-public r-edger (package (name "r-edger") - (version "3.26.3") + (version "3.26.4") (source (origin (method url-fetch) (uri (bioconductor-uri "edgeR" version)) (sha256 (base32 - "12889lwcray2cw0skzy1xp1y3siiz6n5cwx8ni86m7r671p6zmb2")))) + "013glavk6a1wpyq3q35k343bdp6rf27w30q59i4kf47rp3i37g15")))) (properties `((upstream-name . "edgeR"))) (build-system r-build-system) (propagated-inputs @@ -7480,13 +7481,13 @@ CAGE.") (define-public r-variantannotation (package (name "r-variantannotation") - (version "1.30.0") + (version "1.30.1") (source (origin (method url-fetch) (uri (bioconductor-uri "VariantAnnotation" version)) (sha256 (base32 - "1sd01yv1hnwc16412ilncrrph4gxsr9ds0nqg1czl69fqaixjn1i")))) + "144x3d3b9a3q5jy4aqrk1nf2yavwjhwlf71s7qyr4x3ms3wmvf8i")))) (properties `((upstream-name . "VariantAnnotation"))) (inputs @@ -7924,13 +7925,13 @@ as well as query and modify the browser state, such as the current viewport.") (define-public r-genomicfeatures (package (name "r-genomicfeatures") - (version "1.36.0") + (version "1.36.1") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "17jy7lrpdaafd8g5v6j70xsypi0lqljdqmhv9f2r1xpyg3yjd84p")))) + "02psq3jfgghdydwbydb1j792lvfg44l5npb44mx8d54ckr8658dd")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) @@ -9040,14 +9041,14 @@ TAB-Seq.") (define-public r-sva (package (name "r-sva") - (version "3.32.0") + (version "3.32.1") (source (origin (method url-fetch) (uri (bioconductor-uri "sva" version)) (sha256 (base32 - "100jwi43y4xdqb5lldx1ld58jg9icdjgz6c7ylx95gspipnkbgjp")))) + "0jj6klfha5v5qmx2sjblf1an6s2zqd7mmgsp7sfmh4k2jpqi3jm9")))) (build-system r-build-system) (propagated-inputs `(("r-genefilter" ,r-genefilter) @@ -9369,14 +9370,14 @@ structure (pcaRes) to provide a common interface to the PCA results.") (define-public r-msnbase (package (name "r-msnbase") - (version "2.10.0") + (version "2.10.1") (source (origin (method url-fetch) (uri (bioconductor-uri "MSnbase" version)) (sha256 (base32 - "1lqdlyvs2c9g55zf8gnw142ps4jid644fhfvclnax7sjjwrqdjzv")))) + "0z63yqazkycq0zbbarq9ida6al35hv3g7g9g7s7bss4gh0hk7lhd")))) (properties `((upstream-name . "MSnbase"))) (build-system r-build-system) (propagated-inputs @@ -10568,13 +10569,13 @@ libraries.") (define-public r-scater (package (name "r-scater") - (version "1.12.1") + (version "1.12.2") (source (origin (method url-fetch) (uri (bioconductor-uri "scater" version)) (sha256 (base32 - "0k4jc0xc2n49saylcjrg7laxq4mchg4nv06nrbc6cp4vzpf33jh5")))) + "16a17161xlhh6qpna9qxph3anlc7ydgyrczmy4alfiw8si7pzmxa")))) (build-system r-build-system) (propagated-inputs `(("r-beachmat" ,r-beachmat) @@ -10603,14 +10604,14 @@ quality control.") (define-public r-scran (package (name "r-scran") - (version "1.12.0") + (version "1.12.1") (source (origin (method url-fetch) (uri (bioconductor-uri "scran" version)) (sha256 (base32 - "19cyjjzgmhswni6js4bhbj5djp976sl9n648kk7viazgkspql884")))) + "17mknpkvs7mgnlbf2hv9k7rwbx2vlg60yrwfyb8nn3nxsb6vm7yn")))) (build-system r-build-system) (propagated-inputs `(("r-beachmat" ,r-beachmat) @@ -12535,15 +12536,15 @@ once. This package provides tools to perform Drop-seq analyses.") (define-public pigx-rnaseq (package (name "pigx-rnaseq") - (version "0.0.5") + (version "0.0.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/BIMSBbioinfo/pigx_rnaseq/" - "releases/download/v" version + "releases/download/v." version "/pigx_rnaseq-" version ".tar.gz")) (sha256 (base32 - "05gn658zpj9xki5dbs728z9zxq1mcm25hkwr5vzwqxsfi15l5f2l")))) + "1w7cwbbz1sbvbyqh5c60iqcjfs3qsppmdgxqa1i0w5wwb9mkh27m")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f ; not supported @@ -12566,7 +12567,6 @@ once. This package provides tools to perform Drop-seq analyses.") ("trim-galore" ,trim-galore) ("htseq" ,htseq) ("samtools" ,samtools) - ("bedtools" ,bedtools) ("r-minimal" ,r-minimal) ("r-rmarkdown" ,r-rmarkdown) ("r-ggplot2" ,r-ggplot2) @@ -12603,7 +12603,7 @@ expression report comparing samples in an easily configurable manner.") (define-public pigx-chipseq (package (name "pigx-chipseq") - (version "0.0.40") + (version "0.0.41") (source (origin (method url-fetch) (uri (string-append "https://github.com/BIMSBbioinfo/pigx_chipseq/" @@ -12611,7 +12611,7 @@ expression report comparing samples in an easily configurable manner.") "/pigx_chipseq-" version ".tar.gz")) (sha256 (base32 - "0y9x62cfwzhsp82imnawyamxp58bcb00yjxdy44spylqnjdlsaj8")))) + "0akbxdmsjsq5fzbwaap04hqjpsfgv1l6yrc2pwgbya1xgqvcq6vy")))) (build-system gnu-build-system) ;; parts of the tests rely on access to the network (arguments '(#:tests? #f)) @@ -14754,3 +14754,34 @@ ATAC-seq results. It was written to make it easier to spot differences that might be caused by ATAC-seq library prep or sequencing. The main program, @code{ataqv}, examines aligned reads and reports some basic metrics.") (license license:gpl3+))) + +(define-public r-psiplot + (package + (name "r-psiplot") + (version "2.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kcha/psiplot.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08438h16cfry5kqh3y9hs8q1b1a8bxhblsm75knviz5r6q0n1jxh")))) + (build-system r-build-system) + (propagated-inputs + `(("r-mass" ,r-mass) + ("r-dplyr" ,r-dplyr) + ("r-tidyr" ,r-tidyr) + ("r-purrr" ,r-purrr) + ("r-readr" ,r-readr) + ("r-magrittr" ,r-magrittr) + ("r-ggplot2" ,r-ggplot2))) + (home-page "https://github.com/kcha/psiplot") + (synopsis "Plot percent spliced-in values of alternatively-spliced exons") + (description + "PSIplot is an R package for generating plots of @dfn{percent +spliced-in} (PSI) values of alternatively-spliced exons that were computed by +vast-tools, an RNA-Seq pipeline for alternative splicing analysis. The plots +are generated using @code{ggplot2}.") + (license license:expat))) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 16ed15c237..50786d9f21 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -184,6 +184,7 @@ or false to signal an error." ((string=? system "powerpc64le-linux") "/lib/ld64.so.2") ((string=? system "alpha-linux") "/lib/ld-linux.so.2") ((string=? system "s390x-linux") "/lib/ld64.so.1") + ((string=? system "riscv64-linux") "/lib/ld-linux-riscv64-lp64d.so.1") ;; XXX: This one is used bare-bones, without a libc, so add a case ;; here just so we can keep going. diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 459d691c45..c435e72824 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Corentin Bocquillon <corentin@nybble.fr> -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> ;;; Copyright © 2018 Tomáš ÄŒech <sleep_walker@gnu.org> ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> @@ -242,7 +242,7 @@ other lower-level build files.") (define-public osc (package (name "osc") - (version "0.165.0") + (version "0.165.1") (source (origin (method git-fetch) @@ -251,8 +251,7 @@ other lower-level build files.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "0l6iw8a040l60ixxdms9rxajm38vqfdwgij2bm7ahgv1akza64jk")))) + (base32 "16p4z34ziy4z2w7mfpclk13x1w2p69wivkdwp0224x18r2fwj67v")))) (build-system python-build-system) (arguments `(#:phases @@ -269,7 +268,7 @@ other lower-level build files.") (inputs `(("python-m2crypto" ,python-m2crypto) ("python-pycurl" ,python-pycurl) - ("rpm" ,rpm))) ; for python-rpm + ("rpm" ,rpm))) ; for python-rpm (home-page "https://github.com/openSUSE/osc") (synopsis "Open Build Service command line tool") (description "@command{osc} is a command line interface to the Open Build diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 20a2e5aabf..cc6257ba35 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -108,7 +108,7 @@ any small or embedded system.") (define-public toybox (package (name "toybox") - (version "0.8.0") + (version "0.8.1") (source (origin (method url-fetch) (uri (string-append @@ -116,7 +116,7 @@ any small or embedded system.") version ".tar.gz")) (sha256 (base32 - "0mirj977zxsxnfaiqndwgsn9calgg312d817fi1hkfbd8kcyrk73")))) + "1czxzvyggm157z8wgxbk8k0n675p1gig9xvrcijsplh9p1i1xi0s")))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 005b21ad7b..dce992a0c5 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -98,6 +98,7 @@ "third_party/angle/third_party/vulkan-tools" ;ASL2.0 "third_party/angle/third_party/vulkan-validation-layers" ;ASL2.0 "third_party/apple_apsl" ;APSL2.0 + "third_party/axe-core" ;MPL2.0 "third_party/blink" ;BSD-3, LGPL2+ "third_party/boringssl" ;OpenSSL/ISC (Google additions are ISC) "third_party/boringssl/src/third_party/fiat" ;Expat @@ -117,13 +118,14 @@ "third_party/ced" ;BSD-3 "third_party/cld_3" ;ASL2.0 "third_party/crashpad" ;ASL2.0 + "third_party/crashpad/crashpad/third_party/lss" ;ASL2.0 "third_party/crashpad/crashpad/third_party/zlib/zlib_crashpad.h" ;Zlib "third_party/crc32c" ;BSD-3 "third_party/cros_system_api" ;BSD-3 "third_party/dav1d" ;BSD-2 + "third_party/dawn" ;ASL2.0 "third_party/dom_distiller_js" ;BSD-3 "third_party/emoji-segmenter" ;ASL2.0 - "third_party/fips181" ;BSD-3 "third_party/flatbuffers" ;ASL2.0 "third_party/glslang" ;BSD-3, Expat, ASL2.0 "third_party/google_input_tools" ;ASL2.0 @@ -166,6 +168,7 @@ "third_party/pdfium/third_party/bigint" ;Public domain, BSD-3 "third_party/pdfium/third_party/skia_shared" ;BSD-3 "third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType + "third_party/pffft" ;the "FFTPACK" license, similar to BSD-3 "third_party/ply" ;BSD-3 "third_party/polymer" ;BSD-3 "third_party/protobuf" ;BSD-3 @@ -223,54 +226,58 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %chromium-version "74.0.3729.169") -(define %ungoogled-revision "d2beaeff47a6e97b8909163147ad6b4058238f36") -(define %debian-revision "debian/74.0.3729.108-1") +(define %chromium-version "75.0.3770.80") +(define %ungoogled-revision "5d8abc38b43a62f379615a0dc972b29d9aebb4b4") +(define %debian-revision "debian/75.0.3770.80-1") (define package-revision "0") - (define %package-version (string-append %chromium-version "-" package-revision "." (string-take %ungoogled-revision 7))) +(define %chromium-origin + (origin + (method url-fetch) + (uri (string-append "https://commondatastorage.googleapis.com" + "/chromium-browser-official/chromium-" + %chromium-version ".tar.xz")) + (sha256 + (base32 + "1mk6gb3iif8i6zq41wjn3lhqqlqp1syzpav1nj0170l7v348p0ns")))) + +(define %ungoogled-origin + (origin + (method git-fetch) + (uri (git-reference (url "https://github.com/Eloston/ungoogled-chromium") + (commit %ungoogled-revision))) + (file-name (git-file-name "ungoogled-chromium" + (string-take %ungoogled-revision 7))) + (sha256 + (base32 + "1vk8jzzsn20ysn4nlz84mwwhfa9nnywzd1lrahlhcky9pf6xzpwa")))) + +(define %debian-origin + (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/chromium-team/chromium.git") + (commit %debian-revision))) + (file-name (git-file-name "debian-chromium-packaging" + (if (string-prefix? "debian/" %debian-revision) + (cadr (string-split %debian-revision #\/)) + (string-take %debian-revision 7)))) + (sha256 + (base32 + "16z4bncc2q1d5bymywq8291bzkcvba447ql3vsq20rwcdjckyimx")))) + ;; This is a "computed" origin that does the following: ;; *) Runs the Ungoogled scripts on a pristine Chromium tarball. ;; *) Applies Debians Chromium patches, for their unbundling and GCC work. ;; *) Prunes all third_party directories that are not explicitly preserved. ;; *) Adjusts "GN" build files such that system libraries are preferred. (define ungoogled-chromium-source - (let ((chromium-source - (origin - (method url-fetch) - (uri (string-append "https://commondatastorage.googleapis.com" - "/chromium-browser-official/chromium-" - %chromium-version ".tar.xz")) - (sha256 - (base32 - "1d0c3asfhqh6wlzngajcl0v2wn573m1jd1zqci9bcm3z048043q7")))) - (ungoogled-source - (origin - (method git-fetch) - (uri (git-reference (url "https://github.com/Eloston/ungoogled-chromium") - (commit %ungoogled-revision))) - (file-name (git-file-name "ungoogled-chromium" - (string-take %ungoogled-revision 7))) - (sha256 - (base32 - "04schaaqhnkrgh0p1p0wyjd5aybpxmj3kfnyipwy5nh7d39afymc")))) - (debian-source - (origin - (method git-fetch) - (uri (git-reference - (url "https://salsa.debian.org/chromium-team/chromium.git") - (commit %debian-revision))) - (file-name (git-file-name "debian-chromium-packaging" - (if (string-prefix? "debian/" %debian-revision) - (cadr (string-split %debian-revision #\/)) - (string-take %debian-revision 7)))) - (sha256 - (base32 - "1bn0c86sxkkxgdz0i88y0zh4zr39l6379r2rhgk3b3qbvwz25s3j"))))) - + (let ((chromium-source %chromium-origin) + (ungoogled-source %ungoogled-origin) + (debian-source %debian-origin)) (origin (method computed-origin-method) (file-name (string-append "ungoogled-chromium-" %package-version ".tar.xz")) @@ -335,7 +342,6 @@ from forcing GEXP-PROMISE." (when (and (> (string-length line) 1) ;; Skip the Debian-specific ones. (not (string-prefix? "debianization/" line)) - (not (string-prefix? "gcc6/" line)) ;; And those that conflict with Ungoogled. (not (any (cute string-suffix? <> line) '("widevine-buildflag.patch" @@ -434,6 +440,7 @@ from forcing GEXP-PROMISE." "enable_reporting=false" "enable_service_discovery=false" "enable_swiftshader=false" + "enable_vr=false" "enable_widevine=false" ;; Disable type-checking for the Web UI to avoid a Java dependency. "closure_compile=false" diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 8db1136be0..2b18629cca 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> @@ -128,7 +128,16 @@ in compression.") `(#:phases (modify-phases %standard-phases (add-after 'unpack 'enter-source - (lambda _ (chdir "contrib/minizip") #t))))) + (lambda _ (chdir "contrib/minizip") #t)) + (add-after 'install 'remove-crypt-h + (lambda* (#:key outputs #:allow-other-keys) + ;; Remove <minizip/crypt.h> because it interferes with libc's + ;; <crypt.h> given that 'minizip.pc' says "-I…/include/minizip". + ;; Fedora does the same: + ;; <https://src.fedoraproject.org/rpms/zlib/c/4d2785ec3116947872f6f32dc4104e6d36d8a7a4?branch=master>. + (let ((out (assoc-ref outputs "out"))) + (delete-file (string-append out "/include/minizip/crypt.h")) + #t)))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 6c48af4fc9..fd69c44c22 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Dan Frumin <dfrumin@cs.ru.nl> ;;; ;;; This file is part of GNU Guix. @@ -43,7 +43,7 @@ (define-public coq (package (name "coq") - (version "8.9.0") + (version "8.9.1") (source (origin (method git-fetch) @@ -52,7 +52,7 @@ (commit (string-append "V" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "01ad7az6f95w16xya7979lk32agy22lf4bqgqf5qpnarpkpxhbw8")))) + (base32 "1p4z967s18wkblayv12ygqsrqlyk5ax1pz40yf4kag8pva6gblhk")))) (native-search-paths (list (search-path-specification (variable "COQPATH") @@ -499,7 +499,7 @@ uses Ltac to synthesize the substitution operation.") (define-public coq-equations (package (name "coq-equations") - (version "1.2-beta2") + (version "1.2") (source (origin (method git-fetch) (uri (git-reference @@ -508,7 +508,7 @@ uses Ltac to synthesize the substitution operation.") (file-name (git-file-name name version)) (sha256 (base32 - "0y2zwv7jxs1crprj5qvg46h0v9wyfn99ln40yskq91y9h1lj5h3j")))) + "1q3wvicr43bgy7xn1diwh4j43mnrhprrc2xd22qlbz9cl6bhf8bj")))) (build-system gnu-build-system) (native-inputs `(("ocaml" ,ocaml) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 9c060c70da..9e95bacd65 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -108,17 +108,19 @@ operating system functions.") (package (name "dashel") (version "1.3.3") - (home-page "https://github.com/aseba-community/dashel") - (source (origin - (method url-fetch) - (uri (string-append home-page "/archive/" version ".tar.gz")) - (sha256 - (base32 - "1ckzac1rsw3cxmpdpwcqv46jyp7risk5ybq6jjiizbqn7labf6dw")) - (file-name (string-append name "-" version ".tar.gz")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aseba-community/dashel.git") + (commit version))) + (sha256 + (base32 "0anks2l2i2qp0wlzqck1qgpq15a3l6dg8lw2h8s4nsj7f61lffwy")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) - (arguments '(#:tests? #f)) ;no tests + (arguments '(#:tests? #f)) ; no tests (native-inputs `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/aseba-community/dashel") (synopsis "Data stream helper encapsulation library") (description "Dashel is a data stream helper encapsulation C++ library. It provides a @@ -130,22 +132,23 @@ combination of these streams.") (define-public xsimd (package (name "xsimd") - (version "4.1.2") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/QuantStack/xsimd/archive/" - version ".tar.gz")) - (sha256 - (base32 - "0x05l4xpqr9b66sm6lkf48n6x7999ks921x6k2hzkkg6mh3gqd46")) - (file-name (string-append name "-" version ".tar.gz")))) - (home-page "https://github.com/QuantStack/xsimd") + (version "7.2.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/QuantStack/xsimd.git") + (commit version))) + (sha256 + (base32 "1ny2qin1j4h35mljivh8z52kwdyjxf4yxlzb8j52ji91v2ccc88j")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - `(#:test-target "xtest")) + `(#:configure-flags (list "-DBUILD_TESTS=ON") + #:test-target "xtest")) (native-inputs `(("googletest" ,googletest))) + (home-page "https://github.com/QuantStack/xsimd") (synopsis "C++ wrappers for SIMD intrinsics and math implementations") (description "xsimd provides a unified means for using SIMD features for library authors. Namely, it enables manipulation of batches of numbers with diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 199dfbdbe4..356595ff33 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -738,6 +738,8 @@ and vice-versa.") ("js-strftime" ,js-strftime) ("js-highlight" ,js-highlight) ("js-es5-shim" ,js-es5-shim))) + (native-inputs + `(("uglify-js" ,uglify-js))) (home-page "http://shiny.rstudio.com") (synopsis "Easy interactive web applications with R") (description @@ -983,14 +985,14 @@ coordinates.") (define-public r-geosphere (package (name "r-geosphere") - (version "1.5-7") + (version "1.5-10") (source (origin (method url-fetch) (uri (cran-uri "geosphere" version)) (sha256 (base32 - "186qdm5niq7v3d4w4rngx71znsgi44hnam7698bsx9ar5mg5b6wx")))) + "15xlgsmn0vwky1l13n6acdz6jn2b2na3gf6x367y3qh1f5w4zkan")))) (build-system r-build-system) (propagated-inputs `(("r-sp" ,r-sp))) (home-page "https://cran.r-project.org/web/packages/geosphere") @@ -2066,14 +2068,14 @@ topics for ecologists (ISBN 978-0-691-12522-0).") (define-public r-lpsolve (package (name "r-lpsolve") - (version "5.6.13") + (version "5.6.13.1") (source (origin (method url-fetch) (uri (cran-uri "lpSolve" version)) (sha256 (base32 - "13a9ry8xf5j1f2j6imqrxdgxqz3nqp9sj9b4ivyx9sid459irm6m")))) + "1f10ywlaaldgjj84vs108ly0nsbkrdgbn5d6qj7nk93j1x1xrn3a")))) (properties `((upstream-name . "lpSolve"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/lpSolve") @@ -2204,14 +2206,14 @@ George Marsaglia are included.") (define-public r-ksamples (package (name "r-ksamples") - (version "1.2-8") + (version "1.2-9") (source (origin (method url-fetch) (uri (cran-uri "kSamples" version)) (sha256 (base32 - "15d5q5vpp4wx5rk5kjxjdxpwc8mkq5sbdz8gi07iscrvhzb5rzfr")))) + "1zs22p68d6320kcylisnk0b5wmpapxkyz15py09czxzw7npw8gms")))) (properties `((upstream-name . "kSamples"))) (build-system r-build-system) (propagated-inputs @@ -2817,14 +2819,14 @@ color labels, layout, etc.") (define-public r-stringdist (package (name "r-stringdist") - (version "0.9.5.1") + (version "0.9.5.2") (source (origin (method url-fetch) (uri (cran-uri "stringdist" version)) (sha256 (base32 - "0gap1g9xwhp0zxqsznkc2carpvi80z03prr4q8m528684lznx2xa")))) + "0nw8c317qkfq63pr0prl0hx522ddfq4cbgixb5r4pq3fxk9z303l")))) (build-system r-build-system) (home-page "https://github.com/markvanderloo/stringdist") (synopsis "Approximate string matching and string distance functions") @@ -2892,14 +2894,14 @@ Laplace approximation and adaptive Gauss-Hermite quadrature.") (define-public r-jomo (package (name "r-jomo") - (version "2.6-7") + (version "2.6-8") (source (origin (method url-fetch) (uri (cran-uri "jomo" version)) (sha256 (base32 - "0lyvi32aikkvwdj0y2hc13kmmi0cw1icg8z9lcw10l8326sxm0vf")))) + "097zfdcqc3a45ay8xxbraqh8xsfyivskkdmc2b4ca4n979lx8vyb")))) (build-system r-build-system) (propagated-inputs `(("r-lme4" ,r-lme4) @@ -3494,14 +3496,14 @@ timeout. It can also poll several processes at once.") (define-public r-tsp (package (name "r-tsp") - (version "1.1-6") + (version "1.1-7") (source (origin (method url-fetch) (uri (cran-uri "TSP" version)) (sha256 (base32 - "1ym97xl2icjpfkrici0wig29w06bb704hp51v7h5liygjlwpkhlc")))) + "0rxxhvqi55869dg2p82hzg5kvgcqf9h60cjcg00k3pv9aw4x07kb")))) (properties `((upstream-name . "TSP"))) (build-system r-build-system) (propagated-inputs `(("r-foreach" ,r-foreach))) @@ -3581,14 +3583,14 @@ Markdown documents.") (define-public r-seriation (package (name "r-seriation") - (version "1.2-3") + (version "1.2-7") (source (origin (method url-fetch) (uri (cran-uri "seriation" version)) (sha256 (base32 - "1q6hw4hjw224b4y0dc0j630v2pgj6sn455nwkilb70w8k31hpk92")))) + "0dbz5b5msy4fr2whhphyriqk1xc6305zpjq59rrwxyz3d7rzwpa6")))) (build-system r-build-system) (propagated-inputs `(("r-cluster" ,r-cluster) @@ -3713,14 +3715,14 @@ to variables on the left-hand side of the assignment.") (define-public r-pillar (package (name "r-pillar") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (cran-uri "pillar" version)) (sha256 (base32 - "1c8rwwh677vc92f4k6qj4mxl3acran1iqdv5dj6r1dyv7fvmcvfx")))) + "0mcc09caxm69pghhz6b8vawj9ni63aijv5qba53pg4ph7rxclwgm")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) @@ -3831,14 +3833,14 @@ supports arbitrary vertex/edge/graph attributes.") (define-public r-statnet-common (package (name "r-statnet-common") - (version "4.2.0") + (version "4.3.0") (source (origin (method url-fetch) (uri (cran-uri "statnet.common" version)) (sha256 (base32 - "0q942g6kqmqxfss1cxb3yg8y5r1k1h5cyy99s1cfisrn6hqc6xhi")))) + "0ng90i0wm9wlyhjbnmnylc1bbqw396p1dr7f402dyry9x9ck6jl3")))) (properties `((upstream-name . "statnet.common"))) (build-system r-build-system) @@ -4031,14 +4033,14 @@ financial trading strategies.") (define-public r-tseries (package (name "r-tseries") - (version "0.10-46") + (version "0.10-47") (source (origin (method url-fetch) (uri (cran-uri "tseries" version)) (sha256 (base32 - "08kjw0bfj5gfcrxpblwqxwna8a5g9gnr7ya61qb02r263pyhm50j")))) + "0yzvc9djp3angvxdxqi60wi726y76ablsb71q88ycvw0avgpf8r0")))) (build-system r-build-system) (propagated-inputs `(("r-quadprog" ,r-quadprog) @@ -4995,14 +4997,14 @@ additional external tools on any platform.") (define-public r-openxlsx (package (name "r-openxlsx") - (version "4.1.0") + (version "4.1.0.1") (source (origin (method url-fetch) (uri (cran-uri "openxlsx" version)) (sha256 (base32 - "1n7z22pm78xa77fvn77kdn68az6xzxk36y11sqf0w6h6adri4yxb")))) + "1lflygpi1z4rlb1c6g6wsmi334maiiy7jhpg6ph4sw8lpvg12w4b")))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp) @@ -5859,14 +5861,14 @@ intervals.") (define-public r-snakecase (package (name "r-snakecase") - (version "0.10.0") + (version "0.11.0") (source (origin (method url-fetch) (uri (cran-uri "snakecase" version)) (sha256 (base32 - "0325zkpyqa15lx7biq2cbimr2773332bp4jvcvnl00bjx41ia2fm")))) + "1ky1x2cp5rd0ffd9m1fji9sq4z4jsrpxzg30brw8bb4ihfjj114r")))) (build-system r-build-system) (propagated-inputs `(("r-stringi" ,r-stringi) @@ -5931,22 +5933,22 @@ information are missing.") (define-public r-sjlabelled (package (name "r-sjlabelled") - (version "1.0.17") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "sjlabelled" version)) (sha256 (base32 - "00c0c22ynpihgf2bvmcfnkvqwqvxax2zzb7wldsmg2f7z5a32aa6")))) + "0rnmlwpp41h04dzfjd5ncvzjzs43slaimb4v2in1axznv3haafyc")))) (build-system r-build-system) (propagated-inputs - `(("r-dplyr" ,r-dplyr) - ("r-haven" ,r-haven) + `(("r-haven" ,r-haven) ("r-insight" ,r-insight) ("r-magrittr" ,r-magrittr) ("r-purrr" ,r-purrr) - ("r-rlang" ,r-rlang))) + ("r-rlang" ,r-rlang) + ("r-tidyselect" ,r-tidyselect))) (home-page "https://github.com/strengejacke/sjlabelled") (synopsis "Labelled data utility functions") (description @@ -6290,14 +6292,14 @@ Group (Non-)Overlap considerations.") (define-public r-refgenome (package (name "r-refgenome") - (version "1.7.3.1") + (version "1.7.7") (source (origin (method url-fetch) (uri (cran-uri "refGenome" version)) (sha256 (base32 - "1s4lxv5pqk6d0f0a9iclgv88yl346fwvzgraxh0gwpbym1yhh787")))) + "1za89bn3am1zgvm641qi1ab6kaqpll4rb9p9f1sjwvcgqq6065g5")))) (properties `((upstream-name . "refGenome"))) (build-system r-build-system) (propagated-inputs @@ -6362,14 +6364,14 @@ containing one or more SNPs that evolved under directional selection.") (define-public r-proc (package (name "r-proc") - (version "1.14.0") + (version "1.15.0") (source (origin (method url-fetch) (uri (cran-uri "pROC" version)) (sha256 (base32 - "0ki1pvj5iaki81crapvwqllg5avn5qlvv62axnsdkdcmv9xc3wg0")))) + "1dxxkwdhxfnj2znq4c5ggrr9m5klh5pmfxg17rz59vr2hfb73m24")))) (properties `((upstream-name . "pROC"))) (build-system r-build-system) (propagated-inputs @@ -7786,14 +7788,14 @@ correlation, censored, ordered and multivariate problems.") (define-public r-bayesplot (package (name "r-bayesplot") - (version "1.6.0") + (version "1.7.0") (source (origin (method url-fetch) (uri (cran-uri "bayesplot" version)) (sha256 (base32 - "0in9cq2ybpa7njrwqx4l6nc8i01cjswsvzwlyiw465pi74aapr57")))) + "0h23sbfny2hcipvvfhq5aiwdh1vanizn7f8lpb9kffypxhcd7v7w")))) (build-system r-build-system) (inputs `(("pandoc" ,ghc-pandoc) @@ -7802,8 +7804,11 @@ correlation, censored, ordered and multivariate problems.") `(("r-dplyr" ,r-dplyr) ("r-ggplot2" ,r-ggplot2) ("r-ggridges" ,r-ggridges) + ("r-glue" ,r-glue) ("r-reshape2" ,r-reshape2) - ("r-rlang" ,r-rlang))) + ("r-rlang" ,r-rlang) + ("r-tibble" ,r-tibble) + ("r-tidyselect" ,r-tidyselect))) (home-page "http://mc-stan.org/bayesplot") (synopsis "Plotting for Bayesian models") (description @@ -7845,25 +7850,26 @@ detection, parallelism through BLAS and parallel user templates.") (define-public r-sjstats (package (name "r-sjstats") - (version "0.17.4") + (version "0.17.5") (source (origin (method url-fetch) (uri (cran-uri "sjstats" version)) (sha256 (base32 - "012hp9m17xzjnsfvjjz2wdfgxm3irsrfx0zmahfnfmgdrwxd5vk5")))) + "1x9ybvz84vgaabmqp4z6crbv5q6kqjg6msk1spbr11zx9dbj06ca")))) (build-system r-build-system) (propagated-inputs - `(("r-broom" ,r-broom) + `(("r-bayestestr" ,r-bayestestr) + ("r-broom" ,r-broom) ("r-dplyr" ,r-dplyr) ("r-emmeans" ,r-emmeans) ("r-insight" ,r-insight) ("r-lme4" ,r-lme4) ("r-magrittr" ,r-magrittr) ("r-mass" ,r-mass) - ("r-matrix" ,r-matrix) ("r-modelr" ,r-modelr) + ("r-performance" ,r-performance) ("r-purrr" ,r-purrr) ("r-rlang" ,r-rlang) ("r-sjlabelled" ,r-sjlabelled) @@ -7918,14 +7924,14 @@ differentiation.") (define-public r-bayestestr (package (name "r-bayestestr") - (version "0.1.0") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "bayestestR" version)) (sha256 (base32 - "1m6gj55z3shm3m3mgqj8nk73wij67y617sl04rbj400wz9qrhfva")))) + "0729j4fdxkkvmh99nmny38dywidzgmipdjqbi2ljxygsn4jg7ysy")))) (properties `((upstream-name . "bayestestR"))) (build-system r-build-system) (propagated-inputs @@ -7943,14 +7949,14 @@ ROPE percentage and pd).") (define-public r-performance (package (name "r-performance") - (version "0.1.0") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "performance" version)) (sha256 (base32 - "19lfx25hkavzbycrh6hq4v24a0dz4s60ryq6jyihjlxgrb9g7cnw")))) + "1pzd6z7i1jxr2xi1shg3d0bxlbpmjl7kpmwgjnfys6syv57znd1z")))) (build-system r-build-system) (propagated-inputs `(("r-bayestestr" ,r-bayestestr) @@ -8797,14 +8803,14 @@ isosurfaces.") (define-public r-ks (package (name "r-ks") - (version "1.11.4") + (version "1.11.5") (source (origin (method url-fetch) (uri (cran-uri "ks" version)) (sha256 (base32 - "0d5i8458s8ri9pcx2jm003z1ajk7ha3pmw1sr6lgn6a8d7wgmvqb")))) + "06ymx244yknmpl6935l4pafqbm4gcbpnhqg7rinql6rrfr9mcrag")))) (build-system r-build-system) (propagated-inputs `(("r-fnn" ,r-fnn) @@ -9761,14 +9767,14 @@ the combination of non-negative and non-positive constraints.") (define-public r-iso (package (name "r-iso") - (version "0.0-17") + (version "0.0-18") (source (origin (method url-fetch) (uri (cran-uri "Iso" version)) (sha256 (base32 - "0lljc99sdzdqj6d56qbsggibr6pkdwkh821bj70ianikyvmdc1y0")))) + "014mm5b1f7i6nwlz3kyg1biph0y542kcx5bd13p68cv5a928qzid")))) (properties `((upstream-name . "Iso"))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) @@ -10481,14 +10487,14 @@ Differences with other sparse matrix packages are: (define-public r-fields (package (name "r-fields") - (version "9.8-1") + (version "9.8-3") (source (origin (method url-fetch) (uri (cran-uri "fields" version)) (sha256 (base32 - "1zb44bm9mwbnld2q915nxxji3hqa025cmlaar7da35lyqlrjl30v")))) + "1q9x68dczjym56v7x90x4x5br59vj3dww6w8v42zd3yl17h7c1h1")))) (build-system r-build-system) (propagated-inputs `(("r-maps" ,r-maps) @@ -10724,14 +10730,14 @@ But it can also be used to do data analysis for small scale data sets.") (define-public r-cmprsk (package (name "r-cmprsk") - (version "2.2-7") + (version "2.2-8") (source (origin (method url-fetch) (uri (cran-uri "cmprsk" version)) (sha256 (base32 - "1imr3wpnj4g57n2x4ryahl4lk8lvq9y2r7319zv3k82mznha8bcm")))) + "1nacbzx950ygaqgnj0949skhwpzar5i3xlscd44jsimk2gsppx6z")))) (build-system r-build-system) (propagated-inputs `(("r-survival" ,r-survival))) @@ -10751,14 +10757,14 @@ JASA, 94:496-509.") (define-public r-etm (package (name "r-etm") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) (uri (cran-uri "etm" version)) (sha256 (base32 - "0ws103b3pmli0z4xbyfxkly2wnnnxnnwc0r66qjjqjrlvm7pffl1")))) + "1yivbq8y0ijcl1m4nir4q9hp4pi6iphwxgjprygsdf7vp98wq677")))) (build-system r-build-system) (propagated-inputs `(("r-data-table" ,r-data-table) @@ -10777,14 +10783,14 @@ model with finite state space using the Aalen-Johansen estimator.") (define-public r-epi (package (name "r-epi") - (version "2.35") + (version "2.37") (source (origin (method url-fetch) (uri (cran-uri "Epi" version)) (sha256 (base32 - "1z3959761ryv54y6vsrxxvhrwzz50xrxn55pqh5y7lrxh91zdsvl")))) + "1lanr9x0c6w22406p56j7cwk6wck8njq6pscb4gzc613d68zj1lk")))) (properties `((upstream-name . "Epi"))) (build-system r-build-system) (propagated-inputs @@ -11020,14 +11026,14 @@ machine or distributed on a compute cluster.") (define-public r-rsvd (package (name "r-rsvd") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "rsvd" version)) (sha256 (base32 - "0vjhrvnkl9rmvl8sv2kac5sd10z3fgxymb676ynxzc2pmhydy3an")))) + "1faskhf5j2bj9f971qljsmh182g3rnyilj1wwijz530a6skxidzz")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) @@ -11155,14 +11161,14 @@ algorithms) can be computed and partitioned matrices can be plotted.") (define-public r-upsetr (package (name "r-upsetr") - (version "1.3.3") + (version "1.4.0") (source (origin (method url-fetch) (uri (cran-uri "UpSetR" version)) (sha256 (base32 - "08vj7l92b8fpqyqwxshll2mhk3yhgyr74axvr2lf29z78bapymhz")))) + "007i0njnjjy7vbrxabwav7a1kk2n0hn2mkvqsdzzfk10ckp5y7im")))) (properties `((upstream-name . "UpSetR"))) (build-system r-build-system) (propagated-inputs @@ -12895,21 +12901,21 @@ SELECT or UPDATE queries to an end-point.") (define-public r-bookdown (package (name "r-bookdown") - (version "0.10") + (version "0.11") (source (origin (method url-fetch) (uri (cran-uri "bookdown" version)) (sha256 (base32 - "0xk57p9iyj7rqrwb89q3pm8p29ca615fj1h9blf5yb3zhga4bjk3")))) + "0w4fkv5fqiaqgkx44p0s161imf29zir9742126xkz1pl1j25jn1r")))) (build-system r-build-system) (propagated-inputs `(("r-htmltools" ,r-htmltools) ("r-knitr" ,r-knitr) ("r-rmarkdown" ,r-rmarkdown) ("r-tinytex" ,r-tinytex) - ("r-yaml" ,r-yaml) - ("r-xfun" ,r-xfun))) + ("r-xfun" ,r-xfun) + ("pandoc" ,ghc-pandoc))) (home-page "https://github.com/rstudio/bookdown") (synopsis "Authoring books and technical documents with R markdown") (description "This package provides output formats and utilities for @@ -12941,14 +12947,14 @@ that accept short and long options.") (define-public r-wgcna (package (name "r-wgcna") - (version "1.67") + (version "1.68") (source (origin (method url-fetch) (uri (cran-uri "WGCNA" version)) (sha256 (base32 - "09387w85lxvwr8ax2i2h602b4dgfv4wbvsl9aj1q0b1vfs4rkk69")))) + "1s7gy5vd7x67hpgli8r7ba2z99w3psiyv5hqmrh94zw141dg210a")))) (properties `((upstream-name . "WGCNA"))) (build-system r-build-system) (propagated-inputs @@ -14398,14 +14404,14 @@ includes data sets from oceanography.") (define-public r-ggfortify (package (name "r-ggfortify") - (version "0.4.6") + (version "0.4.7") (source (origin (method url-fetch) (uri (cran-uri "ggfortify" version)) (sha256 (base32 - "1clyha9f9ygma64xbgi78lxsp1203f2ashqhhdpm71nr6w91bm88")))) + "1wk9j0xg5hj9i1vf62qjiphv8cbsgq7y6baay3pfl3wyb2dwgci0")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm new file mode 100644 index 0000000000..b480b6fe56 --- /dev/null +++ b/gnu/packages/crates-io.scm @@ -0,0 +1,92 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> +;;; +;;; 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 <http://www.gnu.org/licenses/>. + +(define-module (gnu packages crates-io) + #:use-module (guix build-system cargo) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages)) + +(define-public rust-unicode-xid + (package + (name "rust-unicode-xid") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "unicode-xid" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1z57lqh4s18rr4x0j4fw4fmp9hf9346h0kmdgqsqx0fhjr3k0wpw")))) + (build-system cargo-build-system) + (home-page + "https://github.com/unicode-rs/unicode-xid") + (synopsis "Determine Unicode XID related properties") + (description "Determine whether characters have the XID_Start +or XID_Continue properties according to Unicode Standard Annex #31.") + ;; Dual licensed. + (license (list license:asl2.0 license:expat)))) + +(define-public rust-proc-macro2 + (package + (name "rust-proc-macro2") + (version "0.4.27") + (source + (origin + (method url-fetch) + (uri (crate-uri "proc-macro2" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "05c92v787snyaq4ss16vxc9mdv6zndfgsdq8k3hnnyffmsf7ycad")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-unicode-xid" ,rust-unicode-xid)) + #:cargo-development-inputs (("rust-quote" ,rust-quote)))) + (home-page "https://github.com/alexcrichton/proc-macro2") + (synopsis "Stable implementation of the upcoming new `proc_macro` API") + (description "This package provides a stable implementation of the upcoming new +`proc_macro` API. Comes with an option, off by default, to also reimplement itself +in terms of the upstream unstable API.") + ;; Dual licensed. + (license (list license:asl2.0 license:expat)))) + +(define-public rust-quote + (package + (name "rust-quote") + (version "0.6.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "quote" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1nw0klza45hf127kfyrpxsxd5jw2l6h21qxalil3hkr7bnf7kx7s")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2)))) + (home-page "https://github.com/dtolnay/quote") + (synopsis "Quasi-quoting macro quote!(...)") + (description "Quasi-quoting macro quote!(...)") + ;; Dual licensed. + (license (list license:asl2.0 license:expat)))) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 9fcf3bd780..3d36dc6198 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -40,7 +40,8 @@ #:export (cross-binutils cross-libc cross-gcc - cross-newlib?)) + cross-newlib? + cross-kernel-headers)) (define-syntax %xgcc ;; GCC package used as the basis for cross-compilation. It doesn't have to @@ -286,18 +287,19 @@ target that libc." (define* (cross-kernel-headers target #:optional + (linux-headers linux-libre-headers) (xgcc (cross-gcc target)) (xbinutils (cross-binutils target))) "Return headers depending on TARGET." (define xlinux-headers - (package (inherit linux-libre-headers) - (name (string-append (package-name linux-libre-headers) + (package (inherit linux-headers) + (name (string-append (package-name linux-headers) "-cross-" target)) (arguments (substitute-keyword-arguments `(#:implicit-cross-inputs? #f - ,@(package-arguments linux-libre-headers)) + ,@(package-arguments linux-headers)) ((#:phases phases) `(alist-replace 'build @@ -310,7 +312,7 @@ target that libc." ,phases)))) (native-inputs `(("cross-gcc" ,xgcc) ("cross-binutils" ,xbinutils) - ,@(package-native-inputs linux-libre-headers))))) + ,@(package-native-inputs linux-headers))))) (define xgnumach-headers (package (inherit gnumach-headers) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 39b6446c67..6bee8cb31a 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -75,7 +75,7 @@ (define-public libsodium (package (name "libsodium") - (version "1.0.17") + (version "1.0.18") (source (origin (method url-fetch) (uri (list (string-append @@ -86,7 +86,7 @@ "releases/old/libsodium-" version ".tar.gz"))) (sha256 (base32 - "1cf2d9v1gylz1qcy2zappbf526qfmph6gd6fnn3w2b347vixmhqc")))) + "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g")))) (build-system gnu-build-system) (synopsis "Portable NaCl-based crypto library") (description diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 42cc205047..f7693cf57d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2019 Jack Hill <jackhill@jackhill.us> ;;; ;;; This file is part of GNU Guix. ;;; @@ -108,6 +109,7 @@ #:use-module (guix download) #:use-module (guix bzr-download) #:use-module (guix git-download) + #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system perl) @@ -928,8 +930,7 @@ organized in a hash table or B+ tree.") (assoc-ref %build-inputs "bash:include") "/include/bash")))) - (native-inputs `(("emacs" ,emacs-minimal) - ("bc" ,bc) + (native-inputs `(("bc" ,bc) ("bash:include" ,bash "include") ("check" ,check) ("libuuid" ,util-linux) @@ -948,6 +949,26 @@ types are supported, as is encryption.") (license license:gpl3+) (home-page "https://www.gnu.org/software/recutils/"))) +(define-public emacs-recutils + (package + (inherit recutils) + (name "emacs-recutils") + (build-system emacs-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "etc") + #t))))) + (native-inputs '()) + (inputs '()) + (synopsis "Emacs mode for working with recutils database files") + (description "This package provides an Emacs major mode @code{rec-mode} +for working with GNU Recutils text-based, human-editable databases. It +supports editing, navigation, and querying of recutils database files +including field and record folding."))) + (define-public rocksdb (package (name "rocksdb") @@ -2398,14 +2419,14 @@ You might also want to install the following optional dependencies: (define-public python-alembic (package (name "python-alembic") - (version "1.0.2") + (version "1.0.10") (source (origin (method url-fetch) (uri (pypi-uri "alembic" version)) (sha256 (base32 - "0asqz9mwc4w8bsar1icv3ik9jslxrj3gv3yxgmhc6nc6r9qbkg04")))) + "1dwl0264r6ri2jyrjr68am04x538ab26xwy4crqjnnhm4alwm3c2")))) (build-system python-build-system) (native-inputs `(("python-mock" ,python-mock) diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 4fd1ac2e2f..dabb1f421e 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -124,14 +124,14 @@ in between these sequences may be different in both content and length.") (define-public liburcu (package (name "liburcu") - (version "0.11.0") + (version "0.11.1") (source (origin (method url-fetch) (uri (string-append "https://www.lttng.org/files/urcu/" "userspace-rcu-" version ".tar.bz2")) (sha256 (base32 - "1rxk5vbkbmqlsnjnvkjz0pkx2076mqnq6jzblpmz8rk29x66kx8s")))) + "0l1kxgzch4m8fxiz2hc8fwg56hrvzzspp7n0svnl7i7iycdrgfcj")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) ; for tests diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index ba19547898..f94f49c51b 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -32,7 +32,7 @@ (define-public debian-archive-keyring (package (name "debian-archive-keyring") - (version "2018.1") + (version "2019.1") (source (origin (method git-fetch) @@ -42,7 +42,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "136vr5dj7w0dz563qdghsndcfcqm2m8d4j1dyiq9dzx5vd0rcpcw")))) + "0bphwji3ywk1zi5bq8bhqk7l51fwjy1idwsw7zfqnxca8m5wvw1g")))) (build-system gnu-build-system) (arguments '(#:test-target "verify-results" @@ -117,7 +117,7 @@ contains the archive keys used for that.") (define-public debootstrap (package (name "debootstrap") - (version "1.0.111") + (version "1.0.114") (source (origin (method git-fetch) @@ -127,7 +127,7 @@ contains the archive keys used for that.") (file-name (git-file-name name version)) (sha256 (base32 - "1b8s00a2kvaajqhjlms3q2dk3gqv6g4yq9h843jal1pm66zsx19n")))) + "147308flz9y8g6f972izi3szmsywf5f8xm64z2smy1cayd340i63")))) (build-system gnu-build-system) (arguments `(#:phases @@ -154,6 +154,11 @@ contains the archive keys used for that.") (("/usr") ubuntu)) (substitute* "debootstrap" (("=/usr") (string-append "=" out))) + ;; Ensure PATH works both in guix and within the debian chroot + ;; workaround for: https://bugs.debian.org/929889 + (substitute* "functions" + (("PATH=/sbin:/usr/sbin:/bin:/usr/bin") + "PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin")) (substitute* (find-files "scripts" ".") (("/usr/share/zoneinfo") (string-append tzdata "/share/zoneinfo"))) #t))) @@ -184,9 +189,5 @@ contains the archive keys used for that.") (description "Debootstrap is used to create a Debian base system from scratch, without requiring the availability of @code{dpkg} or @code{apt}. It does this by downloading .deb files from a mirror site, and carefully -unpacking them into a directory which can eventually be chrooted into. - -It is recommended to run @code{debootstrap --foreign --arch=...} and then -@code{chroot} into the directory, set the PATH and run @code{debootstrap ---second-stage} after.") +unpacking them into a directory which can eventually be chrooted into.") (license license:gpl2))) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 881ac93680..9f4dc59cc8 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -218,7 +218,7 @@ It comes with a German-English dictionary with approximately 270,000 entries.") (define-public grammalecte (package (name "grammalecte") - (version "1.1") + (version "1.1.1") (source (origin (method url-fetch/zipbomb) @@ -226,7 +226,7 @@ It comes with a German-English dictionary with approximately 270,000 entries.") "Grammalecte-fr-v" version ".zip")) (sha256 (base32 - "031d6cn1wn7ps3j38vx6s8z2gjp9nqgiypqm3bfbhxqcammyhian")))) + "1al4c3976wgxijxghxqb1banarj82hwad51kln87xj2r5kwcfm05")))) (build-system python-build-system) (home-page "https://grammalecte.net") (synopsis "French spelling and grammar checker") diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 491f7ce881..778529436b 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz> +;;; Copyright © 2019 Leo Famulari <leo@famulari.name> ;;; ;;; This file is part of GNU Guix. ;;; @@ -341,32 +342,31 @@ and can dramatically shorten the lifespan of the drive if left unchecked.") (define-public gparted (package (name "gparted") - (version "0.33.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gparted/gparted/gparted-" version "/gparted-" version ".tar.gz")) (sha256 - (base32 "1ml1ky3s75lbxr91p608q3prsdh9x899mw7nbgk252pqhg4vh8sh")))) + (base32 + "0mdvn85jvy72ff7nds3dakx9kzknh8gx1z8i0w2sf970q03qp2z4")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; tests require a network connection - #:configure-flags '("--disable-scrollkeeper"))) + ;; Tests require access to paths outside the build container, such + ;; as '/dev/disk/by-id' + `(#:tests? #f)) (inputs `(("util-linux" ,util-linux) ("parted" ,parted) ("glib" ,glib) - ("gtkmm" ,gtkmm-2) + ("gtkmm" ,gtkmm) ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("gnome-doc-utils" ,gnome-doc-utils) - ("docbook-xml" ,docbook-xml-4.2) - ("python" ,python-2) - ("python-libxml2" ,python2-libxml2) - ("which" ,which))) + ("yelp-tools" ,yelp-tools) + ("itstool" ,itstool))) (native-inputs `(("intltool" ,intltool) + ("lvm2" ,lvm2) ; for tests ("pkg-config" ,pkg-config))) (home-page "https://gparted.org/") (synopsis "Partition editor to graphically manage disk partitions") diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 29d8ae4eb9..0b8f742c38 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -75,6 +75,15 @@ ("linux-pam" ,linux-pam) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) + + ;; Some user-defined themes use QtQuick components internally. Adding + ;; QtQuick & co. here; they end up in QML2_IMPORT_PATH thanks to + ;; 'wrap-qt-program'. + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols2" ,qtquickcontrols2) + ("qtsvg" ,qtsvg) + ("shadow" ,shadow) ("wayland" ,wayland))) (arguments diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 2ef50bd0f7..dcef7370bd 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -41,13 +41,13 @@ (define-public python-django (package (name "python-django") - (version "1.11.20") + (version "1.11.21") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "0h90kdq8r4y8wa73hdxmyy5psnwlg61dcq3qsa098cpfiyh9vaa3")))) + "0adhcw8sx2mgwk9y2j760y96pqbip1ni3sf2v2ls5zxc9x93wwms")))) (build-system python-build-system) (arguments '(#:modules ((srfi srfi-1) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 869789552e..98aaad7e63 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -27,7 +27,10 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages compression) + #:use-module (gnu packages databases) + #:use-module (gnu packages fonts) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages game-development) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -373,3 +376,107 @@ keyboard is also available if the child does not have any other specialized device.") (home-page "https://bipede.fr/contrib/") (license license:gpl3))) + +(define-public childsplay + (package + (name "childsplay") + (version "3.4") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/schoolsplay/" + "childsplay-" version ".tgz")) + (sha256 + (base32 + "0z7yp2swjnbz51vn2zyfnjn40jq38l5mbh15yafmx1z3vn2z1m77")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2 + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unbundle-dejavu-font + (lambda* (#:key inputs #:allow-other-keys) + (let* ((dejavu-dir + (string-append (assoc-ref inputs "font-dejavu") + "/share/fonts/truetype")) + (dejavu-font + (string-append dejavu-dir + "/DejaVuSansCondensed-Bold.ttf"))) + (substitute* "SPConstants.py" + (("^(TTF(BOLD)? = ).*" _ prefix) + (string-append prefix "'" dejavu-font "'\n"))) + (for-each (lambda (f) (delete-file f)) + (find-files "lib/SPData" "DejaVu")) + #t))) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pixmaps (string-append out "/share/pixmaps")) + (share (string-append out "/share/childsplay")) + (doc (string-append out "/share/doc/" ,name "-",version))) + ;; Install icon. + (install-file "lib/SPData/themes/childsplay/logo_cp.svg" pixmaps) + ;; Install data. + (mkdir-p share) + (for-each (lambda (f) + (copy-recursively f (string-append share "/" f))) + '("alphabet-sounds" "lib" "locale" "SPWidgets")) + (for-each (lambda (f) (install-file f share)) + (find-files "." "\\.(py|dev|db)$")) + ;; Install documentation. + (mkdir-p doc) + (copy-recursively "docs" doc) + #t))) + (add-after 'install 'create-executable + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((python (string-append (assoc-ref inputs "python") + "/bin/python")) + (out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (executable (string-append bin "/childsplay"))) + (mkdir-p bin) + (call-with-output-file executable + (lambda (file) + (format file + "~a ~a" + python + (string-append out "/share/childsplay/childsplay.py")))) + (chmod executable #o555) + #t))) + (add-after 'install 'create-desktop-file + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (applications (string-append out "/share/applications"))) + (mkdir-p applications) + (call-with-output-file + (string-append applications "/childsplay.desktop") + (lambda (file) + (format file + "[Desktop Entry]~@ + Name=Childsplay~@ + Comment=Suite of educational games for young children~@ + Comment[ca]=Conjunt de jocs educatius per a xiquets~@ + Comment[es]=Conjunto de juegos educativos para niños~@ + Comment[de]=Sammlung mit lehrreichen Spielen für kleine Kinder~@ + Exec=~a/bin/childsplay.py~@ + Terminal=false~@ + Icon=logo_cp.svg~@ + Type=Application~@ + Categories=Application;Game;Education;KidsGame;~@ + Keywords=suite;children;games;young;educational;~%" + out))) + #t)))))) + (inputs + `(("font-dejavu" ,font-dejavu) + ("pygame" ,python2-pygame) + ("sqlalchemy" ,python2-sqlalchemy))) + (synopsis "Suite of educational games for young children") + (description "Childsplay is a collection of educational activities +for young children. Childsplay can be used at home, kindergartens and +pre-schools. Childsplay is a fun and safe way to let young children +use the computer and at the same time teach them a little math, +letters of the alphabet, spelling, eye-hand coordination, etc.") + (home-page "http://www.schoolsplay.org") + (license license:gpl3+))) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 09be3a75a3..4f365cf205 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -160,13 +160,19 @@ static analysis of the ELF binaries at hand.") (package (name "libelf") (version "0.8.13") - (source (origin - (method url-fetch) - (uri (string-append "http://www.mr511.de/software/libelf-" - version ".tar.gz")) - (sha256 - (base32 - "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr")))) + (source + (origin + (method url-fetch) + (uri (list + ;; As of May 2019, the original URL at mr511.de redirects to a + ;; domain that doesn't resolve. Use these two mirrors instead. + (string-append "https://fossies.org/linux/misc/old/" + "libelf-" version ".tar.gz") + (string-append "https://ftp.osuosl.org/pub/blfs/conglomeration/" + "libelf/libelf-" version ".tar.gz"))) + (sha256 + (base32 + "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr")))) (build-system gnu-build-system) (arguments `(#:phases @@ -183,7 +189,8 @@ static analysis of the ELF binaries at hand.") (%current-system)) '("--host=aarch64-unknown-linux-gnu") '())))))))) - (home-page "http://www.mr511.de/software/english.html") + (home-page (string-append "https://web.archive.org/web/20181111033959/" + "http://www.mr511.de/software/english.html")) (synopsis "ELF object file access library") (description "Libelf is a C library to access ELF object files.") (license lgpl2.0+))) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index beb35c8122..81f668409a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -33,7 +33,7 @@ ;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org> ;;; Copyright © 2017, 2018, 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com> -;;; Copyright © 2018 Mathieu Lirzin <mthl@gnu.org> +;;; Copyright © 2018, 2019 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018, 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2018, 2019 Jack Hill <jackhill@jackhill.us> @@ -47,6 +47,7 @@ ;;; Copyright © 2019 mikadoZero <mikadozero@yandex.com> ;;; Copyright © 2019 Gabriel Hondet <gabrielhondet@gmail.com> ;;; Copyright © 2019 LaFreniere, Joseph <joseph@lafreniere.xyz> +;;; Copyright © 2019 Amar Singh <nly@disroot.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -545,6 +546,35 @@ handful of functions that are not resource-specific.") for editing Racket's Scribble documentation syntax in Emacs.") (license license:gpl3+)))) +(define-public emacs-shroud + (package + (name "emacs-shroud") + (version "1.15.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/o-nly/emacs-shroud.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wvm4lxqcc1p8v7rpqal3bnqgnpk1gs7v18i83f6cvi5d88jkgdg")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-bui" ,emacs-bui) + ("emacs-dash" ,emacs-dash) + ("emacs-f" ,emacs-f) + ("emacs-s" ,emacs-s) + ("gnupg" ,gnupg) + ("shroud" ,shroud))) + (home-page "https://github.com/o-nly/emacs-shroud") + (synopsis "Emacs interface to the Shroud password manager") + (description + "This package provides an Emacs interface to the Shroud password manager, +using the Buffers User Interface library. You can view, copy, and edit secrets +from within Emacs.") + (license license:gpl3+))) + (define-public emacs-unpackaged-el (let ((commit "f4df7f8dfea715e893b2223adda32545803f5cce") (revision "1")) @@ -667,6 +697,37 @@ programs.") (define-public haskell-mode (deprecated-package "haskell-mode" emacs-haskell-mode)) +(define-public emacs-dante + (let ((commit "149dded24ca9cdff09a3d859e4b62638db4aadda") + (revision "1")) + (package + (name "emacs-dante") + (version (git-version "1.5" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jyp/dante") + (commit commit))) + (sha256 + (base32 + "0i7kj3d6pfys6si9va5f36qzifyac9mahdl0qh40rya9m0syrkla")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-f" ,emacs-f) + ("emacs-flycheck" ,emacs-flycheck) + ("emacs-haskell-mode" ,emacs-haskell-mode) + ("emacs-s" ,emacs-s) + ("emacs-company" ,emacs-company) + ("emacs-lcr" ,emacs-lcr))) + (home-page "https://github.com/jyp/dante") + (synopsis "Minor mode for interactive Haskell") + (description + "This package provides a minor mode for Haskell development that +supports type hints, definition-jumping, completion, and more.") + (license license:gpl3+)))) + (define-public emacs-flycheck (package (name "emacs-flycheck") @@ -777,7 +838,7 @@ in certain cases. It also enables recursion for anonymous functions.") (define-public emacs-xr (package (name "emacs-xr") - (version "1.11") + (version "1.12") (source (origin (method url-fetch) @@ -785,7 +846,7 @@ in certain cases. It also enables recursion for anonymous functions.") "https://elpa.gnu.org/packages/xr-" version ".tar")) (sha256 (base32 - "0xwfs2mkmgf63sfp5jwmw0ybc8pa0rlxh5aqwb348ddgmclv322f")))) + "1vv87h0h8ldc1mbsn45w5z1m6jq8j2js4xz23a9ixdby06g60y3g")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/xr.html") (synopsis "Convert string regexp to rx notation") @@ -804,10 +865,33 @@ skip set strings, which are arguments to @code{skip-chars-forward} and @code{skip-chars-backward}.") (license license:gpl3+))) +(define-public emacs-reformatter + (package + (name "emacs-reformatter") + (version "0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/purcell/reformatter.el.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0hhy6x1bkwlhdlarsgm06g3am4yh02yqv8qs34szpzgy53x84qah")))) + (build-system emacs-build-system) + (home-page "https://github.com/purcell/reformatter.el") + (synopsis "Define commands which run reformatters on the current buffer") + (description + "This library lets elisp authors easily define an idiomatic command to +reformat the current buffer using a command-line program, together with an +optional minor mode which can apply this command automatically on save.") + (license license:gpl3+))) + (define-public emacs-relint (package (name "emacs-relint") - (version "1.7") + (version "1.8") (source (origin (method url-fetch) @@ -815,7 +899,7 @@ skip set strings, which are arguments to @code{skip-chars-forward} and "https://elpa.gnu.org/packages/relint-" version ".el")) (sha256 (base32 - "0h9nc84yv5lmbaa8any6i3bqcn6xn1gy6cv6kqaywn0nnqrm17i1")))) + "1bl6m2h7131acbmr0kqfnjjpv2syiv2mxfnm61g874ynnvkmmkm3")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-xr" ,emacs-xr))) (home-page "https://github.com/mattiase/relint") @@ -2500,6 +2584,28 @@ evaluated in the browser, just like Emacs does with an inferior Lisp process in Lisp modes.") (license license:unlicense))) +(define-public emacs-litable + (let ((commit "b0278f3f8dcff424bfbdfdefb545b1fbff33206f")) + (package + (name "emacs-litable") + (version (git-version "0.1" "0" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Fuco1/litable.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0bny40hv9a024n01clxns351cs4j4ifhgcc7m4743xncqf612p7g")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash))) + (home-page "https://github.com/Fuco1/litable/") + (synopsis "Dynamic evaluation replacement with Emacs") + (description "This packages provides dynamic evaluation in Emacs.") + (license license:gpl3+)))) + (define-public emacs-string-inflection (package (name "emacs-string-inflection") @@ -4074,23 +4180,29 @@ well as completely new features.") (license license:gpl3+))) (define-public emacs-highlight-symbol - (package - (name "emacs-highlight-symbol") - (version "1.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/nschum/highlight-symbol.el.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "09z13kv2g21kjjkkm3iyaz93sdjmdy2d563r8n7r7ng94acrn7f6")))) - (build-system emacs-build-system) - (home-page "https://nschum.de/src/emacs/highlight-symbol") - (synopsis "Automatic and manual symbol highlighting for Emacs") - (description - "Use @code{highlight-symbol} to toggle highlighting of the symbol at + ;; We prefer a more recent commit that provides an option to squelch + ;; echo-area alerts that can drown out useful information like eldoc + ;; messages. + (let ((commit "7a789c779648c55b16e43278e51be5898c121b3a") + (version "1.3") + (revision "1")) + (package + (name "emacs-highlight-symbol") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nschum/highlight-symbol.el.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "19cgyk0sh8nsmf3jbi92i8qsdx4l4yilfq5jj9zfdbj9p5gvwx96")))) + (build-system emacs-build-system) + (home-page "https://nschum.de/src/emacs/highlight-symbol/") + (synopsis "Automatic and manual symbol highlighting for Emacs") + (description + "Use @code{highlight-symbol} to toggle highlighting of the symbol at point throughout the current buffer. Use @code{highlight-symbol-mode} to keep the symbol at point highlighted. @@ -4103,7 +4215,7 @@ bindings @code{M-p} and @code{M-p} for navigation. When regardless of @code{highlight-symbol-idle-delay}. @code{highlight-symbol-query-replace} can be used to replace the symbol. ") - (license license:gpl2+))) + (license license:gpl2+)))) (define-public emacs-hl-todo (package @@ -4131,16 +4243,17 @@ regexp that matches all known keywords.") (define-public emacs-perspective (package (name "emacs-perspective") - (version "1.12") + (version "2.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/nex3/perspective-el/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/nex3/perspective-el.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "078ahh0kmhdylq5ib9c81c76kz1n02xwc83pm729d00i84ibviic")))) + "0pd5sqrrz6y3md20yh6ffy32jdcgb1gc9b4j14pm6r54bqxik68h")))) (build-system emacs-build-system) (home-page "https://github.com/nex3/perspective-el") (synopsis "Switch between named \"perspectives\"") @@ -4223,19 +4336,17 @@ after buffer changes.") (define-public emacs-realgud (package (name "emacs-realgud") - (version "1.4.5") + (version "1.5.0") (source (origin - (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/realgud-" - version ".tar")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/realgud/realgud/") + (commit version))) (sha256 (base32 - "108wgxg7fb4byaiasgvbxv2hq7b00biq9f0mh9hy6vw4160y5w24")) - (patches - ;; Patch awaiting inclusion upstream (see: - ;; https://github.com/realgud/realgud/pull/226). - (search-patches "emacs-realgud-fix-configure-ac.patch")))) + "0xnick9016wxrgi8v0lycvxhyz8l2k4nfvdpjc5yq476vwrjfzbz")) + (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments `(#:tests? #t @@ -4254,11 +4365,6 @@ after buffer changes.") (setenv "HOME" (getenv "TMPDIR")))) (add-before 'patch-el-files 'remove-realgud-pkg.el (lambda _ - ;; XXX: This file is auto-generated at some point and causes - ;; substitute* to crash during the `patch-el-files' phase with: - ;; ERROR: In procedure stat: No such file or directory: - ;; "./realgud-pkg.el" - (delete-file "./realgud-pkg.el") ;; FIXME: `patch-el-files' crashes on this file with error: ;; unable to locate "bashdb". (delete-file "./test/test-regexp-bashdb.el")))) @@ -4397,6 +4503,33 @@ splitting the input text by spaces and re-building it into a regular expression.") (license license:gpl3+))) +(define-public emacs-ivy-pass + (let ((commit "5b523de1151f2109fdd6a8114d0af12eef83d3c5") + (revision "1")) + (package + (name "emacs-ivy-pass") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ecraven/ivy-pass.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18crb4zh2pjf0cmv3b913m9vfng27girjwfqc3mk7vqd1r5a49yk")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-ivy" ,emacs-ivy) + ("emacs-password-store" ,emacs-password-store) + ("password-store" ,password-store))) + (home-page "https://github.com/ecraven/ivy-pass") + (synopsis "Ivy interface for password store (pass)") + (description "This package provides an Ivy interface for working with +the password store @code{pass}.") + (license license:gpl3)))) + (define-public emacs-ivy-yasnippet (let ((commit "32580b4fd23ebf9ca7dde96704f7d53df6e253cd") (revision "2")) @@ -4455,7 +4588,7 @@ show icons as well.") (define-public emacs-avy (package (name "emacs-avy") - (version "0.4.0") + (version "0.5.0") (source (origin (method git-fetch) @@ -4464,7 +4597,7 @@ show icons as well.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0rq9ab264565z83cly743nbhrd9m967apmnlhqr1gy8dm4hcy7nm")))) + (base32 "09qdni1s74i5pv8741szl5g4ynj8fxn0x65qmwa9rmfkbimnc0fs")))) (build-system emacs-build-system) (home-page "https://github.com/abo-abo/avy") (synopsis "Tree-based completion for Emacs") @@ -4554,37 +4687,35 @@ navigate code in a tree-like fashion.") (license license:gpl3+)))) (define-public emacs-lispy - ;; Release 0.26.0 was almost 3 years ago, and there have been ~772 commits - ;; since. - (let ((commit "f94cfc6b8f9c3afe7d028c366928049c011023de") - (revision "1")) - (package - (name "emacs-lispy") - (version (git-version "0.26.0" revision commit)) - (home-page "https://github.com/abo-abo/lispy") - (source (origin - (method git-fetch) - (uri (git-reference (url home-page) (commit commit))) - (sha256 - (base32 - "1bm2cpwizg1qfpm377gpx1af1hm5maw69if1csnk5vwaphmv8c4g")) - (file-name (git-file-name name version)))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-ace-window" ,emacs-ace-window) - ("emacs-iedit" ,emacs-iedit) - ("emacs-ivy" ,emacs-ivy) - ("emacs-hydra" ,emacs-hydra) - ("emacs-zoutline" ,emacs-zoutline))) - (synopsis "Modal S-expression editing") - (description - "Due to the structure of Lisp syntax it's very rare for the programmer + (package + (name "emacs-lispy") + (version "0.27.0") + (home-page "https://github.com/abo-abo/lispy") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abo-abo/lispy") + (commit version))) + (sha256 + (base32 + "1cm7f4pyl73f3vhkb7ah6bbbrj2sa7n0p31g09k7dy4zgx04bgw6")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-ace-window" ,emacs-ace-window) + ("emacs-iedit" ,emacs-iedit) + ("emacs-ivy" ,emacs-ivy) + ("emacs-hydra" ,emacs-hydra) + ("emacs-zoutline" ,emacs-zoutline))) + (synopsis "Modal S-expression editing") + (description + "Due to the structure of Lisp syntax it's very rare for the programmer to want to insert characters right before \"(\" or right after \")\". Thus unprefixed printable characters can be used to call commands when the point is at one of these special locations. Lispy provides unprefixed keybindings for S-expression editing when point is at the beginning or end of an S-expression.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-lispyville (let ((commit "d28b937f0cabd8ce61e2020fe9a733ca80d82c74") @@ -5554,7 +5685,7 @@ ack, ag, helm and pt.") (define-public emacs-helm (package (name "emacs-helm") - (version "3.1") + (version "3.2") (source (origin (method git-fetch) @@ -5563,7 +5694,7 @@ ack, ag, helm and pt.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1x3nv8zvp8vvl30bm2d83hd7zxb0ca64pc8kwb81ml9al6r3mm01")))) + (base32 "12yyprpgh2by2pd41i4z9gz55fxg0f90x03bfrsf791xwbhf6931")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async) @@ -6915,7 +7046,7 @@ highlights quasi-quoted expressions.") (define-public emacspeak (package (name "emacspeak") - (version "49.0") + (version "50.0") (source (origin (method url-fetch) @@ -6924,7 +7055,7 @@ highlights quasi-quoted expressions.") version "/emacspeak-" version ".tar.bz2")) (sha256 (base32 - "1smf26m7201z0bk49lzbw9zhbjfi6wylidfjixb8ylp6g0wnh8dx")))) + "0rsj7rzfyqmyidfsjrhjnxi2d43axx6r3gac1fhv5xkkbiiqzqkb")))) (build-system gnu-build-system) (arguments '(#:make-flags (list (string-append "prefix=" @@ -6932,13 +7063,10 @@ highlights quasi-quoted expressions.") #:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lisp (string-append out - "/share/emacs/site-lisp/emacspeak"))) - (setenv "SHELL" (which "sh")) - ;; Configure Emacspeak according to etc/install.org. - (invoke "make" "config")))) + (lambda _ + (setenv "SHELL" (which "sh")) + ;; Configure Emacspeak according to etc/install.org. + (invoke "make" "config"))) (add-after 'build 'build-espeak (lambda _ (invoke "make" "espeak"))) @@ -6955,7 +7083,7 @@ highlights quasi-quoted expressions.") (for-each (lambda (file) (copy-recursively file (string-append lisp "/" file))) - '("etc" "info" "js" "lisp" "media" "scapes" "servers" "sounds" + '("etc" "info" "js" "lisp" "media" "servers" "sounds" "stumpwm" "xsl")) ;; Make sure emacspeak is loaded from the correct directory. (substitute* "etc/emacspeak.sh" @@ -7019,26 +7147,27 @@ actually changing the buffer's text.") (license license:gpl3+))) (define-public emacs-diff-hl - (package - (name "emacs-diff-hl") - (version "1.8.5") - (source - (origin - (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/diff-hl-" - version ".tar")) - (sha256 + (package + (name "emacs-diff-hl") + (version "1.8.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dgutov/diff-hl") + (commit version))) + (sha256 (base32 - "1vxc7z7c2qs0mx7l5sa4sybi5qbzv0s79flj74p1ynw8dl3qxg3d")))) - (build-system emacs-build-system) - (home-page "https://github.com/dgutov/diff-hl") - (synopsis - "Highlight uncommitted changes using VC") - (description - "@code{diff-hl-mode} highlights uncommitted changes on the side of the + "1xlsg728mz3cwhrsqvisa0aidic67nymd9g7h4c1h3q63j39yb2s")))) + (build-system emacs-build-system) + (home-page "https://github.com/dgutov/diff-hl") + (synopsis + "Highlight uncommitted changes using VC") + (description + "@code{diff-hl-mode} highlights uncommitted changes on the side of the window (using the fringe, by default), allows you to jump between the hunks and revert them selectively.") - (license license:gpl3+))) + (license license:gpl3+))) (define-public emacs-diminish (package @@ -7994,6 +8123,30 @@ from within Emacs. Restclient runs queries from a plan-text query sheet, displays results pretty-printed in XML or JSON with @code{restclient-mode}") (license license:public-domain)))) +(define-public emacs-whitespace-cleanup-mode + (let ((commit "72427144b054b0238a86e1348c45d986b8830d9d") + (revision "1")) + (package + (name "emacs-whitespace-cleanup-mode") + (version (git-version "0.10" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/purcell/whitespace-cleanup-mode") + (commit commit))) + (sha256 + (base32 + "1zlk534jbwrsabcg3kqlzk4h4hwya60lh6q2n1v4yn4rpf5ghsag")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (home-page "https://github.com/purcell/whitespace-cleanup-mode") + (synopsis "Intelligently call @code{whitespace-cleanup} on save") + (description + "This package provides a minor mode that calls +@code{whitespace-cleanup} before saving the current buffer only if the +whitespace in the buffer was initially clean.") + (license license:gpl3+)))) + (define-public emacs-eimp (let ((version "1.4.0") (commit "2e7536fe6d8f7faf1bad7a8ae37faba0162c3b4f") @@ -8225,6 +8378,56 @@ multiplexer.") editing RPM spec files.") (license license:gpl2+))) +(define-public emacs-lcr + (package + (name "emacs-lcr") + (version "1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jyp/lcr") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0mc55icihxqpf8b05990q1lc2nj2792wcgyr73xsiqx0963sjaj8")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash))) + (home-page "https://github.com/jyp/lcr") + (synopsis "Lightweight coroutines in Emacs Lisp") + (description "This package provides macros that can translate code into +equivalent continuation-passing code, as well as miscellaneous utility +functions written in continuation-passing style.") + (license license:gpl3+))) + +(define-public emacs-attrap + (let ((commit "3b092bb8f6755a97e6ecb7623b9d2dde58beba4a") + (revision "1")) + (package + (name "emacs-attrap") + (version (git-version "1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jyp/attrap") + (commit commit))) + (sha256 + (base32 + "05d32980saji8ja1pcv65l0s3dq7w0n5hpikbf246hciy1x067pp")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-f" ,emacs-f) + ("emacs-flycheck" ,emacs-flycheck) + ("emacs-s" ,emacs-s))) + (home-page "https://github.com/jyp/attrap") + (synopsis "Fix coding error at point") + (description "This package provides a command to fix the Flycheck error +at point.") + (license license:gpl3+)))) + (define-public emacs-git-messenger (package (name "emacs-git-messenger") @@ -8355,29 +8558,32 @@ key. Optionally, a mouse pop-up can be added by binding (license license:gpl3+))) (define-public emacs-idris-mode - (package - (name "emacs-idris-mode") - (version "0.9.19") - (source - (origin - (method url-fetch) - (uri (string-append - "http://stable.melpa.org/packages/idris-mode-" - version ".tar")) - (sha256 - (base32 - "16hl2s22l3wc9drnwzw6hn7xrm49ml9lii0s6k218dgahdgsncmf")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-prop-menu" ,emacs-prop-menu))) - (home-page - "https://github.com/idris-hackers/idris-mode") - (synopsis "Major mode for editing Idris code") - (description - "This is an Emacs mode for editing Idris code. It requires the latest + (let ((commit "acc8835449475d7cd205aba213fdd3d41c38ba40") + (revision "0")) + (package + (name "emacs-idris-mode") + (version (git-version "0.9.19" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/idris-hackers/idris-mode.git") + (commit commit))) + (file-name (git-file-name name commit)) + (sha256 + (base32 + "0n9xbknc68id0mf8hbfmawi8qpvrs47ix807sk9ffv2g3ik32kk6")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-prop-menu" ,emacs-prop-menu))) + (home-page + "https://github.com/idris-hackers/idris-mode") + (synopsis "Major mode for editing Idris code") + (description + "This is an Emacs mode for editing Idris code. It requires the latest version of Idris, and some features may rely on the latest Git version of Idris.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-browse-at-remote (package @@ -9223,16 +9429,16 @@ functionality is inherited from @code{hcl-mode}.") (define-public emacs-exec-path-from-shell (package (name "emacs-exec-path-from-shell") - (version "1.11") + (version "1.12") (source (origin - (method url-fetch) - (uri (string-append - "https://stable.melpa.org/packages/exec-path-from-shell-" - version ".el")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/purcell/exec-path-from-shell") + (commit version))) (sha256 (base32 - "03qjgb81cq1l3j54lvlf98r75vmmgd06mj6qh5wa6mz4xzp4w26r")))) + "1ga8bpxngd3ph2hdiik92c612ki71qxw818i6rgx6f6a5r0sbf3p")))) (build-system emacs-build-system) (home-page "https://github.com/purcell/exec-path-from-shell") (synopsis "Get environment variables such as @var{PATH} from the shell") @@ -11752,7 +11958,7 @@ Emacs minor mode to escape sequences in code.") (define-public emacs-dashboard (package (name "emacs-dashboard") - (version "1.2.4") + (version "1.5.0") (source (origin (method git-fetch) @@ -11761,11 +11967,22 @@ Emacs minor mode to escape sequences in code.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr")))) + (base32 "0ihpcagwgc9qy70lf2y3dvx2bm5h9lnqh4sx6643cr8pp06ysbvq")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-page-break-lines" ,emacs-page-break-lines))) - (arguments '(#:include '("\\.el$" "\\.txt$" "\\.png$"))) + (arguments + '(#:include '("\\.el$" "\\.txt$" "\\.png$") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-dashboard-widgets + ;; This phase fixes compilation error. + (lambda _ + (chmod "dashboard-widgets.el" #o666) + (emacs-substitute-variables "dashboard-widgets.el" + ("dashboard-init-info" + '(format "Loaded in %s" (emacs-init-time)))) + #t))))) (home-page "https://github.com/rakanalh/emacs-dashboard") (synopsis "Startup screen extracted from Spacemacs") (description "This package provides an extensible Emacs dashboard, with @@ -12467,16 +12684,17 @@ the GIF result.") (define-public emacs-google-translate (package (name "emacs-google-translate") - (version "0.11.16") + (version "0.11.17") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/atykhonov/google-translate/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/atykhonov/google-translate/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "01n9spj1d0gjfj39x526rl3m9c28wnx9afipmf5s8y77cx3mfwhl")))) + "05ljjw7kbnszygw3w085kv57swfiiqxri2b5xvsf5dw3pc3g7j3c")))) (build-system emacs-build-system) (home-page "https://github.com/atykhonov/google-translate") (synopsis "Emacs interface to Google Translate") @@ -13405,7 +13623,7 @@ backends, including the @command{wordnet} offline backend.") (define-public emacs-editorconfig (package (name "emacs-editorconfig") - (version "0.7.14") + (version "0.8.0") (source (origin (method git-fetch) @@ -13415,7 +13633,7 @@ backends, including the @command{wordnet} offline backend.") (file-name (git-file-name name version)) (sha256 (base32 - "19j2428ij7sqvrqs7rqg1mcnv9109y6drqba40dkv3vrkk5d2yia")))) + "1b2cpqz75pivl323bs60j5rszwi787x6vy68csycikqz9mhpmjn9")))) (build-system emacs-build-system) (home-page "https://github.com/editorconfig/editorconfig-emacs") (synopsis "Define and maintain consistent coding styles between different @@ -15346,7 +15564,7 @@ well as an option for visually flashing evaluated s-expressions.") (define-public emacs-counsel-tramp (package (name "emacs-counsel-tramp") - (version "0.6.2") + (version "0.6.3") (source (origin (method git-fetch) @@ -15356,7 +15574,7 @@ well as an option for visually flashing evaluated s-expressions.") (file-name (git-file-name name version)) (sha256 (base32 - "0nz0733x2b9b5nkwivvhv5c8747dng451na1sdfbkx5x9fjs5gc7")))) + "1qy9lf7cyv6hp9mmpwh92cpdcffbxzyzchx6878d5pmk9qh6xy92")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-ivy" ,emacs-ivy))) @@ -15616,3 +15834,26 @@ verb commands which would are normally destructive (such as deletion) are provided. Those alternative commands are and bound by default to their corresponding Evil keys.") (license license:expat)))) + +(define-public emacs-xterm-color + (let ((commit "a452ab38a7cfae97078062ff8885b5d74fd1e5a6") + (version "1.8") + (revision "1")) + (package + (name "emacs-xterm-color") + (version (git-version version revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/atomontage/xterm-color.git") + (commit commit))) + (sha256 + (base32 + "02kpajb993yshhjhsizpfcbrcndyzkf4dqfipifhxxng50dhp95i")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (home-page "https://github.com/atomontage/xterm-color") + (synopsis "ANSI & xterm-256 color text property translator for Emacs") + (description "@code{xterm-color.el} is an ANSI control sequence to +text-property translator.") + (license license:bsd-2)))) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 5b9fee3c09..c32569dd1b 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -401,7 +401,7 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.") (define-public mgba (package (name "mgba") - (version "0.7.1") + (version "0.7.2") (source (origin (method git-fetch) (uri (git-reference @@ -410,7 +410,7 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.") (file-name (git-file-name name version)) (sha256 (base32 - "0q0yg2zna7gjbvpaswyykbg3lr9k3c8l8fydqa407xrgq77lahq4")) + "0g0xa1mzvan0sl1p5c784j2g5mcw9kd2b7wiahy06gy0c1nmbcnp")) (modules '((guix build utils))) (snippet ;; Make sure we don't use the bundled software. @@ -1185,7 +1185,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.209") + (version "0.210") (source (origin (method git-fetch) @@ -1195,7 +1195,7 @@ play them on systems for which they were never designed!") (file-name (git-file-name name version)) (sha256 (base32 - "08qvwmx8wbfkqxiccmcff86dsrlq6wjxf6blnhhrsbzic1ji99bh")) + "08c62mc8aajzh44q36qvmrcq404hdzh3i8wwdfnvn0c4w8dbf486")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. @@ -1344,6 +1344,7 @@ play them on systems for which they were never designed!") ("fontconfig" ,fontconfig) ("glm" ,glm) ("libjpeg" ,libjpeg-8) ;jpeg_read_header argument error in libjpeg-9 + ("libxi" ,libxi) ("libxinerama" ,libxinerama) ("lua" ,lua) ("portaudio" ,portaudio) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 11fcf0b7b0..8bec452265 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Daniel Pimentel <d4n1@member.fsf.org> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 ng0 <ng0@n0.is> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de> ;;; ;;; This file is part of GNU Guix. @@ -184,7 +184,7 @@ removable devices or support for multimedia.") (define-public terminology (package (name "terminology") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri @@ -192,7 +192,7 @@ removable devices or support for multimedia.") "terminology/terminology-" version ".tar.xz")) (sha256 (base32 - "0q1y7fadj42n23aspx9y8hm4w4xlc316wc3415wnf75ibsx08ngd")) + "0mm9v5a94369is3kaarnr3a28wy42wslzi1mcisaidlcldgv7f6p")) (modules '((guix build utils))) ;; Remove the bundled fonts. (snippet diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index e1a1e8ab6f..5b95bcb704 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -345,7 +345,7 @@ do so.") (define-public electrum (package (name "electrum") - (version "3.3.5") + (version "3.3.6") (source (origin (method url-fetch) @@ -353,7 +353,7 @@ do so.") version "/Electrum-" version ".tar.gz")) (sha256 - (base32 "1csj0n96zlajnrs39wsazfj5lmy7v7n77cdz56lr8nkmchh6k9z1")) + (base32 "0am5ki3z0yvhrz16vp2jjy5fkxxqph0mj9qqpbw3kpql65shykwz")) (modules '((guix build utils))) (snippet '(begin @@ -742,14 +742,14 @@ Ledger Blue/Nano S.") (define-public python-trezor (package (name "python-trezor") - (version "0.11.2") + (version "0.11.3") (source (origin (method url-fetch) (uri (pypi-uri "trezor" version)) (sha256 (base32 - "1f0zfki12mnhidkfxpx2lpq1xim8f35i2d64bx9lf4m26xxv9x56")))) + "0211m027vlvyqy83kwbjjjxalb04xgf1klv0h0y0f0yhj07516n7")))) (build-system python-build-system) (arguments `(#:phases @@ -770,12 +770,13 @@ Ledger Blue/Nano S.") ("python-requests" ,python-requests) ("python-typing-extensions" ,python-typing-extensions))) (native-inputs - `(("protobuf" ,protobuf) ; Tests - ("python-black" ,python-black) ; Tests - ("python-protobuf" ,python-protobuf) ; Tests - ("python-isort" ,python-isort) ; Tests - ("python-pyqt" ,python-pyqt) ; Tests - ("python-pytest" ,python-pytest))) ; Tests + ;; For tests. + `(("protobuf" ,protobuf) + ("python-black" ,python-black) + ("python-protobuf" ,python-protobuf) + ("python-isort" ,python-isort) + ("python-pyqt" ,python-pyqt) + ("python-pytest" ,python-pytest))) (home-page "https://github.com/trezor/python-trezor") (synopsis "Python library for communicating with TREZOR Hardware Wallet") (description "@code{trezor} is a Python library for communicating with diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 3a801e5c94..0ac0b7b207 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -616,15 +616,17 @@ languages, plus Greek and Cyrillic.") (define-public font-gnu-unifont (package (name "font-gnu-unifont") - (version "12.0.01") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://gnu/unifont/unifont-" version "/unifont-" - version ".tar.gz")) - (sha256 - (base32 - "059j82z6z4wqyy3261ns0zg2b2vh2wvxxfbsa9hra9xasism49vb")))) + (version "12.1.02") + (source + (origin + (method url-fetch) + (uri (list + (string-append "http://unifoundry.com/pub/unifont/unifont-" + version "/unifont-" version ".tar.gz") + (string-append "mirror://gnu/unifont/unifont-" + version "/unifont-" version ".tar.gz"))) + (sha256 + (base32 "12wdxnlyz5gl5d7h6pazcz8d7h81fwkng1xrayxsgrzh6bqdq4p8")))) (build-system gnu-build-system) (outputs '("out" ; TrueType version "pcf" ; PCF (bitmap) version diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 83854ef9c6..7b661d39ac 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros@foradis.org> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Amin Bandali <bandali@gnu.org> ;;; ;;; This file is part of GNU Guix. @@ -301,14 +301,14 @@ Includes the actual FTDI connector.") (define-public gtkwave (package (name "gtkwave") - (version "3.3.100") + (version "3.3.101") (source (origin (method url-fetch) (uri (string-append "http://gtkwave.sourceforge.net/" "gtkwave-" version ".tar.gz")) (sha256 (base32 - "1z60i5nh8dz8j9ii63fwaw7k0p3x0scp91478cxmdv4xhp4njlxa")))) + "1j6capxwgi8aj3sgqg1r7161icni9y8y93g1rl3bzd3s40jcyhsz")))) (build-system gnu-build-system) (native-inputs `(("gperf" ,gperf) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 62f6051e98..63ccd20470 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -435,7 +435,7 @@ support.") (define-public tiled (package (name "tiled") - (version "1.2.3") + (version "1.2.4") (source (origin (method git-fetch) (uri (git-reference @@ -444,7 +444,7 @@ support.") (file-name (git-file-name name version)) (sha256 (base32 - "1nfyigfkl10n9r82p1qxhpr09jn2kwalh9n5r209bcaj8dxspph8")))) + "04v738h298pvcwb70mwd1r2yj7578f6gkfzs0165j9fqy7avwm18")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) @@ -465,7 +465,7 @@ support.") (let ((out (assoc-ref outputs "out"))) (invoke "qmake" (string-append "PREFIX=" out)))))))) - (home-page "http://www.mapeditor.org/") + (home-page "https://www.mapeditor.org/") (synopsis "Tile map editor") (description "Tiled is a general purpose tile map editor. It is meant to be used for @@ -684,19 +684,17 @@ etc.") (define-public allegro (package (name "allegro") - (version "5.2.4.0") + (version "5.2.5.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/liballeg/allegro5/releases" "/download/" version "/allegro-" version ".tar.gz")) - (patches (search-patches - "allegro-mesa-18.2.5-and-later.patch")) (sha256 (base32 - "1w9a5yqi5q03b2qvmx5ff90paz0xbr9cy7i7f0xiqa65ava66q9l")))) + "06dpkfnac8w3pq36834nn2iij3ajz6prladqd0w92lq39aiqv5jr")))) (build-system cmake-build-system) - (arguments `(#:tests? #f)) ; there are no tests + (arguments `(#:tests? #f)) ; there are no tests (inputs ;; FIXME: Add the following optional inputs: xinput2, opensl, dumb `(("flac" ,flac) @@ -1321,24 +1319,15 @@ a 2D editor view.") (define-public guile-chickadee (package (name "guile-chickadee") - (version "0.3.0") + (version "0.4.0") (source (origin (method url-fetch) (uri (string-append "https://files.dthompson.us/chickadee/" "chickadee-" version ".tar.gz")) (sha256 (base32 - "0jl223dybsj5gvs7z4q60gnafj1b7kgi5mx0kj58m5knrp8qwg5h")))) + "1fdicsgls5cp0yffcm5vjmav67gv9bxhz1s3jvdvinspxb485x7l")))) (build-system gnu-build-system) - (arguments - '(#:make-flags '("GUILE_AUTO_COMPILE=0") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-godir - (lambda _ - ;; Install compiled '.go' files into the site directory. - (substitute* "Makefile.in" - (("/ccache") "/site-ccache"))))))) (propagated-inputs `(("guile-opengl" ,guile-opengl) ("guile-sdl2" ,guile-sdl2))) @@ -1521,5 +1510,4 @@ the original, ioquake3 has been cleaned up, bugs have been fixed and features added. The permanent goal is to create the open source Quake 3 distribution upon which people base their games, ports to new platforms, and other projects.") - (supported-systems '("x86_64-linux" "i686-linux")) (license license:gpl2)))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2feecaa729..b34b1e1be2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2019 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu> +;;; Copyright © 2019 Jesse Gibbons <jgibbons2357+guix@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -141,6 +142,7 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) + #:use-module (gnu packages squirrel) #:use-module (gnu packages swig) #:use-module (gnu packages tcl) #:use-module (gnu packages terminals) @@ -3490,19 +3492,36 @@ with the \"Stamp\" tool within Tux Paint.") (define-public supertux (package (name "supertux") - (version "0.5.1") + (version "0.6.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/SuperTux/supertux/" "releases/download/v" version "/SuperTux-v" version "-Source.tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1i8avad7w7ikj870z519j383ldy29r6f956bs38cbr8wk513pp69")))) + "1h1s4abirkdv4ag22zvyk6zkk64skqbjmcnnba67ps4hdzxfbhy4")) + (patches + (search-patches "supertux-fix-build-with-gcc5.patch" + "supertux-unbundle-squirrel.patch")))) (arguments '(#:tests? #f #:configure-flags '("-DINSTALL_SUBDIR_BIN=bin" - "-DENABLE_BOOST_STATIC_LIBS=OFF"))) + "-DENABLE_BOOST_STATIC_LIBS=OFF" + "-DUSE_SYSTEM_PHYSFS=ON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-squirrel-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((squirrel (assoc-ref inputs "squirrel"))) + (substitute* "CMakeLists.txt" + (("set\\(SQUIRREL_PREFIX.*") + (string-append "set(SQUIRREL_PREFIX " squirrel ")")) + (("add_dependencies\\(supertux2_lib squirrel\\)") "") + (("\\$\\{SQUIRREL_PREFIX\\}/include") + (string-append "${SQUIRREL_PREFIX}/include/squirrel")))) + #t))))) (build-system cmake-build-system) (inputs `(("sdl2" ,sdl2) ("sdl2-image" ,sdl2-image) @@ -3514,7 +3533,9 @@ with the \"Stamp\" tool within Tux Paint.") ("libogg" ,libogg) ("physfs" ,physfs) ("curl" ,curl) - ("boost" ,boost))) + ("boost" ,boost) + ("freetype" ,freetype) + ("squirrel" ,squirrel))) (native-inputs `(("pkg-config" ,pkg-config))) (synopsis "2D platformer game") (description "SuperTux is a free classic 2D jump'n run sidescroller game @@ -7312,3 +7333,51 @@ Unfortunately, Hacker is not aware of Drascula's real ambitions: DOMINATING the World and demonstrating that he is even more evil than his brother Vlad.") ;; Drascula uses a BSD-like license. (license (license:non-copyleft "file:///readme.txt")))) + +(define-public gnurobots + (package + (name "gnurobots") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gnurobots/gnurobots-" + version ".tar.gz")) + (sha256 + (base32 + "07gi3lsmbzzsjambgixj6xy79lh22km84z7bnzgwzxdy806lyvwb")))) + (build-system gnu-build-system) + (inputs + `(("glib" ,glib) + ("gtk+" ,gtk+-2) + ("vte" ,vte/gtk+-2) + ("readline" ,readline) + ("guile" ,guile-1.8))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (arguments + `(#:make-flags + (list + ;; Do not abort build on "deprecated-declarations" warnings. + "CFLAGS=-Wno-error=deprecated-declarations" + ;; Find readline headers in sub-directory. + (string-append "READLINE_CFLAGS=-I" + (assoc-ref %build-inputs "readline") + "/include/readline/")) + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (install-file "doc/Robots-HOWTO" + (string-append (assoc-ref outputs "out") + "/share/doc/gnurobots-" + ,version)) + #t))))) + (home-page "https://www.gnu.org/software/gnurobots/") + (synopsis "Program a little robot and watch it explore a world") + (description + "GNU Robots is a game in which you program a robot to explore a world +full of enemies that can hurt it, obstacles and food to be eaten. The goal of +the game is to stay alive and collect prizes. The robot program conveniently +may be written in a plain text file in the Scheme programming language.") + (license license:gpl3+))) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 94f2cf0cfb..ec5ace3519 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> +;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +37,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (gnu packages autotools) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -840,3 +842,30 @@ map, geocoding with Nominatim, or general analysis.") the texture and density of features is visible at every zoom level, instead of dropping features at lower levels.") (license license:bsd-2))) + +(define-public osmctools + (package + (name "osmctools") + (version "0.9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/osm-c-tools/osmctools") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1m8d3r1q1v05pkr8k9czrmb4xjszw6hvgsf3kn9pf0v14gpn4r8f")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (inputs + `(("zlib" ,zlib))) + (home-page "https://gitlab.com/osm-c-tools/osmctools") + (synopsis "Tools to convert, filter and update OpenStreetMap data files") + (description "This project contains a few tools which are used in the +OpenStreetMap project. They can be used to convert, filter and update +OpenStreetMap data files.") + (license license:agpl3))) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 7d6d62acda..ef80af42ea 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -176,14 +176,14 @@ color, font attributes (weight, posture), or underlining.") (define-public po4a (package (name "po4a") - (version "0.55") + (version "0.56") (source (origin (method url-fetch) (uri (string-append "https://github.com/mquinson/po4a/releases/download/v" version "/po4a-" version ".tar.gz")) (sha256 (base32 - "1qss4q5df3nsydsbggb7gg50bn0kdxq5wn8riqm9zwkiq6a4bifg")))) + "0kyhww0yw4q0m4vj8vil2wsf6sn4hidh8mqz2gjrq7gpdf83cmnr")))) (build-system perl-build-system) (arguments `(#:phases diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 700d0bbf09..70bc8db4c1 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -49,7 +49,7 @@ (define-public babl (package (name "babl") - (version "0.1.62") + (version "0.1.66") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/babl/" @@ -63,7 +63,7 @@ "/babl-" version ".tar.bz2"))) (sha256 (base32 - "047msfzj8v4sfl61a2xhd69r9rh2pjq4lzpk3j10ijyv9qbry9yw")))) + "0qx1dwbinxihwl2lmxi60qiqi402jlrdcnixx14kk6j88n9xi79n")))) (build-system gnu-build-system) (home-page "http://gegl.org/babl/") (synopsis "Image pixel format conversion library") @@ -118,7 +118,7 @@ buffers.") (define-public gimp (package (name "gimp") - (version "2.10.10") + (version "2.10.12") (source (origin (method url-fetch) (uri (string-append "https://download.gimp.org/pub/gimp/v" @@ -126,7 +126,7 @@ buffers.") "/gimp-" version ".tar.bz2")) (sha256 (base32 - "0xwck5nbpb945s1cyij3kfqw1pchbhx8i5vf5hgywyjw4r1z5l8j")))) + "0wdcr8d2ink4swn5r4v13bsiya6s3xm4ya97sdbhs4l40y7bb03x")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 9 MiB of gtk-doc HTML diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index bac5f9d008..d2be6a5127 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -447,7 +447,7 @@ from software emulation to complete hardware acceleration for modern GPUs.") '("src/xdemos/glxdemo" "src/xdemos/glxgears" "src/xdemos/glxinfo" "src/xdemos/glxheads")) #t)))))) - (home-page "http://mesa3d.org/") + (home-page "https://mesa3d.org/") (synopsis "Utility tools for Mesa") (description "The mesa-utils package contains several utility tools for Mesa: glxdemo, @@ -619,7 +619,7 @@ OpenGL graphics API.") `(("unzip" ,unzip))) (inputs `(("mesa" ,mesa))) - (home-page "http://www.lonesock.net/soil.html") + (home-page "https://www.lonesock.net/soil.html") (synopsis "OpenGL texture loading library") (description "SOIL is a tiny C library used primarily for uploading textures into @@ -724,7 +724,7 @@ mixed vector/bitmap output.") (define-public virtualgl (package (name "virtualgl") - (version "2.6.1") + (version "2.6.2") (source (origin (method git-fetch) @@ -733,7 +733,7 @@ mixed vector/bitmap output.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "04fdwm6mz76lw4iwd5m7yxjfhpa0rpxd357bv5smk5lclnlbz1bv")))) + (base32 "0yyc553xsb5n0rx7jp9p4wdbd7md07b3qrkf3ssyjavqqg908qg9")))) (arguments `(#:tests? #f ; no tests are available #:configure-flags (list diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e94707132b..8497a304da 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -162,6 +162,7 @@ #: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 trivial) #:use-module (guix download) #:use-module (guix git-download) @@ -2114,7 +2115,7 @@ Hints specification (EWMH).") (define-public gnumeric (package (name "gnumeric") - (version "1.12.44") + (version "1.12.45") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnumeric/" @@ -2122,7 +2123,7 @@ Hints specification (EWMH).") "gnumeric-" version ".tar.xz")) (sha256 (base32 - "0147962c6ybdsj57rz95nla0rls7g545wc2n7pz59zmzyd5pksk0")))) + "0c8dl1kvnj3g32qy3s92qpqpqfy0in59cx005gjvvzsflahav61h")))) (build-system glib-or-gtk-build-system) (arguments `(;; The gnumeric developers don't worry much about failing tests. @@ -3940,26 +3941,15 @@ which can read a large number of file formats.") (define-public rhythmbox (package (name "rhythmbox") - (version "3.4.2") + (version "3.4.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) - (patches - (list - ;; fmradio: Fix build with GStreamer master - (origin - (method url-fetch) - (uri (string-append - "https://gitlab.gnome.org/GNOME/rhythmbox/commit/" - "b182c6b9e1d09e601bac0b703cc5f8b159ebbc3a.patch")) - (sha256 - (base32 - "06n87xgf927djmv1vshal84nqx7g8nwgljza3g2vydhy7g2n1csq"))))) (sha256 (base32 - "0hzcns8gf5yb0rm4ss8jd8qzarcaplp5cylk6plwilsqfvxj4xn2")))) + "1yx3n7p9vmv23jsv98fxwq95n78awdxqm8idhyhxx2d6vk4w1hgx")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags @@ -4319,15 +4309,15 @@ work and the interface is well tested.") (define-public eolie (package (name "eolie") - (version "0.9.60") + (version "0.9.62") (source (origin (method url-fetch) (uri (string-append "https://gitlab.gnome.org/World/eolie/" - "uploads/3b2ceb7eb15860587db6886bfdd8a91e/" + "uploads/bb4aad19272cc636bd17f2f6602127fe/" "eolie-" version ".tar.xz")) (sha256 (base32 - "1s9gkzxa6457v6bh0q8n1ijq1chd2jwgvhk5kppsnya7kxvsx8qh")))) + "06v76hg87fnhw45dil5vvl20myvaa38n1jqsl0lmkkq6af4mk8wx")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -4441,7 +4431,7 @@ principles are simplicity and standards compliance.") (define-public d-feet (package (name "d-feet") - (version "0.3.11") + (version "0.3.14") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4449,7 +4439,7 @@ principles are simplicity and standards compliance.") name "-" version ".tar.xz")) (sha256 (base32 - "1hmrijm4d9vwzx2r8qzzsy8ccpj79l1y6cc569n9jjzqcq699p53")))) + "1m8lwiwl5jhi0x7y6x5zmd3hjplgvdjrb8a8jg74rvkygslj1p7f")))) (build-system glib-or-gtk-build-system) (arguments '(#:out-of-source? #f ; tests need to run in the source directory. @@ -4488,6 +4478,7 @@ principles are simplicity and standards compliance.") `(("gobject-introspection" ,gobject-introspection) ("gtk+" ,gtk+) ("python" ,python-wrapper) + ("hicolor-icon-theme" ,hicolor-icon-theme) ("python-pygobject" ,python-pygobject))) (home-page "https://wiki.gnome.org/Apps/DFeet") (synopsis "D-Bus debugger") @@ -5473,7 +5464,7 @@ to virtual private networks (VPNs) via OpenVPN.") (define-public mobile-broadband-provider-info (package (name "mobile-broadband-provider-info") - (version "20170310") + (version "20190116") (source (origin (method url-fetch) (uri (string-append @@ -5482,10 +5473,10 @@ to virtual private networks (VPNs) via OpenVPN.") "mobile-broadband-provider-info-" version ".tar.xz")) (sha256 (base32 - "0fxm11x8k9hxjg8l5inaldfmmjnwkay3ibjv899jra03bv4h6kql")))) + "16y5lc7pfdvai9c8xwb825zc3v46039gghbip13fqslf5gw11fic")))) (build-system gnu-build-system) (arguments - `(#:tests? #f)) ; No tests + `(#:tests? #f)) ; no tests (home-page "https://wiki.gnome.org/Projects/NetworkManager") (synopsis "Database of broadband connection configuration") (description "Database of broadband connection configuration.") @@ -5876,6 +5867,9 @@ devices using the GNOME desktop.") (("\"nm-connection-editor") (string-append "\"" nm-applet "/bin/nm-connection-editor"))) + (substitute* '("panels/user-accounts/run-passwd.c") + (("/usr/bin/passwd") + "/run/setuid-programs/passwd")) #t)))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. @@ -7970,3 +7964,95 @@ functionality.") (license (list license:lgpl2.1 license:lgpl3 ; either one of these license:openldap2.8 ; addressbook/gui/component/openldap-extract.h license:lgpl2.1+)))) ; smime/lib/* + +(define-public gthumb + (package + (name "gthumb") + (version "3.8.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/gthumb/" + (version-major+minor version) "/" + "gthumb-" version ".tar.xz")) + (sha256 + (base32 + "1l2s1facq1r6yvqjqc34aqfzlvb3nhkhn79xisxbbdlgrrxdq52f")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:configure-flags + ;; Ensure the RUNPATH contains all installed library locations. + (list (string-append "-Dc_link_args=-Wl,-rpath=" + (assoc-ref %outputs "out") + "/lib/gthumb/extensions") + (string-append "-Dcpp_link_args=-Wl,-rpath=" + (assoc-ref %outputs "out") + "/lib/gthumb/extensions")))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("glib:bin" ,glib "bin") ; for glib-compile-resources + ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache + ("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database + ("intltool" ,intltool) + ("itstool" ,itstool))) + (inputs + `(("exiv2" ,exiv2) + ("gtk" ,gtk+) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gstreamer" ,gstreamer) + ("clutter" ,clutter) + ("clutter-gst" ,clutter-gst) + ("clutter-gtk" ,clutter-gtk) + ("libjpeg" ,libjpeg) + ("libtiff" ,libtiff) + ("libraw" ,libraw))) + (home-page "https://wiki.gnome.org/Apps/Gthumb") + (synopsis "GNOME image viewer and browser") + (description "GThumb is an image viewer, browser, organizer, editor and +advanced image management tool") + (license license:gpl2+))) + +(define-public terminator + (package + (name "terminator") + (version "1.91") + (source (origin + (method url-fetch) + (uri (string-append "https://launchpad.net/" name "/" + "gtk3/" version "/" "+download/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "0sdyqwydmdnh7j6mn74vrywz35m416kqsbxbrqcnv5ak08y6xxwm")))) + (build-system python-build-system) + (native-inputs + `(("intltool" ,intltool) + ("glib:bin" ,glib "bin") ; for glib-compile-resources + ("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("gobject-introspection" ,gobject-introspection) + ("python2-pycairo" ,python2-pycairo) + ("python2-pygobject" ,python2-pygobject) + ("python2-psutil" ,python2-psutil) + ("vte" ,vte))) + (arguments + `(#:python ,python-2 ;Python 3 not supported + #: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/terminator"))) + (wrap-program prog + `("PYTHONPATH" = (,(getenv "PYTHONPATH"))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) + #t)))))) + (home-page "https://gnometerminator.blogspot.com/") + (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.") + (license license:gpl2))) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index 5b4da97e5d..2196a8c50a 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -54,7 +54,7 @@ ;; directory. (package (name "gnucash") - (version "3.4") + (version "3.5") (source (origin (method url-fetch) @@ -62,8 +62,7 @@ version "/gnucash-" version ".tar.bz2")) (sha256 (base32 - "1ms2wg4sh5gq3rpjmmnp85rh5nc9ahca1imxkvhz4d3yiwy8hm52")) - (patches (search-patches "gnucash-fix-test-transaction-failure.patch")))) + "0ibp7g6aknvnkwkin97kv04ipksy3l18dsz9qysjb7h2nr8hnvbp")))) (build-system cmake-build-system) (inputs `(("guile" ,guile-2.2) @@ -197,7 +196,7 @@ installed as well as Yelp, the Gnome help browser.") ;; This package is not public, since we use it to build the "doc" output of ;; the gnucash package (see above). It would be confusing if it were public. (define gnucash-docs - (let ((revision "a")) ;set to the empty string when no revision + (let ((revision "")) ;set to the empty string when no revision (package (name "gnucash-docs") (version (package-version gnucash)) @@ -208,7 +207,7 @@ installed as well as Yelp, the Gnome help browser.") version "/gnucash-docs-" version revision ".tar.gz")) (sha256 (base32 - "0bgjxpxgk7hy8ihn1kvd8p6vv191q5md2hz6jb9mqc4aykpvdlq7")))) + "0gjndyms413vilf5nqh39frs1691sxib8l7y9mbvcyirj1f8285k")))) (build-system gnu-build-system) ;; These are native-inputs because they are only required for building the ;; documentation. diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 230df101d5..189ad7740a 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -232,14 +232,14 @@ compatible to GNU Pth.") (define-public gnupg (package (name "gnupg") - (version "2.2.15") + (version "2.2.16") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "0m6lyphbb20i84isdxzfhcbzyc682hdrdv4aqkzmhrdksycf536b")))) + "1jqlzp9b3kpfp1dkjqskm67jjrhvf9nh3lzf45321p7m9d2qvgkc")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 825678bfc6..c2356f2a44 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -426,7 +426,7 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "60.7.0-guix1") +(define %icecat-version "60.7.0-guix2") ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -450,7 +450,7 @@ from forcing GEXP-PROMISE." (base32 "08x0nijh0ja5jza95a8y030ibk756bn7zlw3a3c4750yilfhqpqa")))) - (upstream-icecat-base-version "60.3.0") ; maybe older than base-version + (upstream-icecat-base-version "60.7.0") ; maybe older than base-version (upstream-icecat-gnu-version "1") (upstream-icecat-version (string-append upstream-icecat-base-version "-gnu" @@ -463,7 +463,7 @@ from forcing GEXP-PROMISE." "/icecat-" upstream-icecat-version ".tar.bz2")) (sha256 (base32 - "0icnl64nxcyf7dprpdpygxhabsvyhps8c3ixysj9bcdlj9q34ib1")))) + "09xqdfd8rwbn2n6m7n059qf1psbrj5v5kfzm7gg5xng22ddxawv8")))) (gnuzilla-commit (string-append "v" upstream-icecat-base-version)) (gnuzilla-source @@ -475,7 +475,7 @@ from forcing GEXP-PROMISE." (file-name (git-file-name "gnuzilla" upstream-icecat-base-version)) (sha256 (base32 - "19wal7hkbb4wvk40hs6d7a5paal2bfday08hwssm02srcbv48fj0")))) + "1vqhb0py28hnwcynbaad304ziciz1kn5bv1qg2q4f7g13js3b1hf")))) (makeicecat-patch (local-file (search-patch "icecat-makeicecat.patch")))) @@ -545,10 +545,6 @@ from forcing GEXP-PROMISE." #$upstream-icecat-gnu-version "\n")) (("^DATA=.*") "DATA=/tmp/gnuzilla/data\n") - (("^sed .* debian/" all) - (string-append "echo warning: skipped: " all)) - (("^debian/rules " all) - (string-append "echo warning: skipped: " all)) (("^find extensions/gnu/ ") "find extensions/gnu/ | sort ") (("/bin/sed") @@ -560,21 +556,19 @@ from forcing GEXP-PROMISE." (rename-file firefox-dir icecat-dir) (with-directory-excursion icecat-dir - (for-each mkdir-p '("l10n" "debian/config")) - (call-with-output-file "debian/control" (const #t)) + (mkdir "l10n") (format #t "Running makeicecat script...~%") (force-output) (invoke "bash" "/tmp/gnuzilla/makeicecat") - (for-each delete-file-recursively '("l10n" "debian"))) + (delete-file-recursively "l10n")) - (format #t (string-append "Unpacking l10n/* and debian/* from" + (format #t (string-append "Unpacking l10n/* from" " upstream IceCat tarball...~%")) (force-output) (unless (string=? icecat-dir old-icecat-dir) (symlink icecat-dir old-icecat-dir)) (invoke "tar" "xf" #+upstream-icecat-source - (string-append old-icecat-dir "/l10n") - (string-append old-icecat-dir "/debian")) + (string-append old-icecat-dir "/l10n")) (format #t "Packing new IceCat tarball...~%") (force-output) @@ -899,43 +893,16 @@ from forcing GEXP-PROMISE." (add-before 'configure 'install-desktop-entry (lambda* (#:key outputs #:allow-other-keys) ;; Install the '.desktop' file. - (define (swallow-%%-directives input output) - ;; Interpret '%%ifdef' directives found in the '.desktop' file. - (let loop ((state 'top)) - (match (read-line input 'concat) - ((? eof-object?) - #t) - ((? string? line) - (cond ((string-prefix? "%%ifdef" line) - (loop 'ifdef)) - ((string-prefix? "%%else" line) - (loop 'else)) - ((string-prefix? "%%endif" line) - (loop 'top)) - (else - (case state - ((top else) - (display line output) - (loop state)) - (else - (loop state))))))))) - - (let* ((out (assoc-ref outputs "out")) + (let* ((desktop-file "taskcluster/docker/icecat-snap/icecat.desktop") + (out (assoc-ref outputs "out")) (applications (string-append out "/share/applications"))) - (call-with-input-file "debian/icecat.desktop.in" - (lambda (input) - (call-with-output-file "debian/icecat.desktop" - (lambda (output) - (swallow-%%-directives input output))))) - - (substitute* "debian/icecat.desktop" - (("@MOZ_DISPLAY_NAME@") - "GNU IceCat") - (("^Exec=@MOZ_APP_NAME@") - (string-append "Exec=" out "/bin/icecat")) - (("@MOZ_APP_NAME@") - "icecat")) - (install-file "debian/icecat.desktop" applications) + (substitute* desktop-file + (("^Exec=icecat") (string-append "Exec=" out "/bin/icecat")) + (("IceCat") "GNU IceCat") + (("Icon=.*") "Icon=icecat\n") + (("NewWindow") "new-window") + (("NewPrivateWindow") "new-private-window")) + (install-file desktop-file applications) #t))) (add-after 'install-desktop-entry 'install-icons (lambda* (#:key outputs #:allow-other-keys) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ed0a78c6bd..2f5396dd1e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright @ 2018, 2019 Katherine Cox-Buday <cox.katherine.e@gmail.com> ;;; Copyright @ 2019 Giovanni Biscuolo <g@xelera.eu> +;;; Copyright @ 2019 Alex Griffin <a@ajgrf.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,14 +62,16 @@ (define-public go-1.4 (package (name "go") - (version "1.4.3") + ;; The C-language bootstrap of Go: + ;; https://golang.org/doc/install/source#go14 + (version "1.4-bootstrap-20171003") (source (origin (method url-fetch) (uri (string-append "https://storage.googleapis.com/golang/" - name version ".src.tar.gz")) + name version ".tar.gz")) (sha256 (base32 - "0na9yqilzpvq0bjndbibfp07wr796gf252y471cip10bbdqgqiwr")))) + "0liybk5z00hizsb5ypkbhqcawnwwa6mkwgvjjg4y3jm3ndg5pzzl")))) (build-system gnu-build-system) (outputs '("out" "doc" @@ -135,13 +138,6 @@ ("os/os_test.go" "(.+)(TestHostname.+)") ("time/format_test.go" "(.+)(TestParseInSydney.+)") - ;; Tzdata 2016g changed the name of the time zone used in this - ;; test, and the patch for Go 1.7 does not work for 1.4.3: - ;; https://github.com/golang/go/issues/17545 - ;; https://github.com/golang/go/issues/17276 - ("time/time_test.go" "(.+)(TestLoadFixed.+)") - ("time/format_test.go" "(.+)(TestParseInLocation.+)") - ("os/exec/exec_test.go" "(.+)(TestEcho.+)") ("os/exec/exec_test.go" "(.+)(TestCommandRelativeName.+)") ("os/exec/exec_test.go" "(.+)(TestCatStdin.+)") @@ -168,9 +164,7 @@ (setenv "GOOS" "linux") (setenv "GOROOT" (dirname (getcwd))) (setenv "GOROOT_FINAL" output) - ;; Go 1.4's cgo will not work with binutils >= 2.27: - ;; https://github.com/golang/go/issues/16906 - (setenv "CGO_ENABLED" "0") + (setenv "GO14TESTS" "1") (invoke "sh" "all.bash")))) (replace 'install @@ -1920,7 +1914,7 @@ values.") (define-public go-github-com-mattn-go-isatty (package (name "go-github-com-mattn-go-isatty") - (version "0.0.4") + (version "0.0.7") (source (origin (method git-fetch) @@ -1930,8 +1924,10 @@ values.") (file-name (git-file-name name version)) (sha256 (base32 - "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w")))) + "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd")))) (build-system go-build-system) + (propagated-inputs + `(("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix))) (arguments '(#:import-path "github.com/mattn/go-isatty")) (home-page "https://github.com/mattn/go-isatty") diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index badb7f867f..7c9994f128 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -36,7 +36,7 @@ (define-public gpodder (package (name "gpodder") - (version "3.10.7") + (version "3.10.9") (source (origin (method git-fetch) @@ -45,7 +45,7 @@ (commit version))) (sha256 (base32 - "0sx9rj6dpvd2xz7lak2yi0zlgr3lp2ng1fw23s39la9ly4g1835j")) + "1sdmr1sq1d4p492zp9kq3npl7p56yr0pr470z9r6xxcylax5mhfq")) (file-name (git-file-name name version)))) (build-system python-build-system) (native-inputs @@ -81,12 +81,12 @@ (for-each (lambda (f) (chmod f #o664)) - (find-files "po")))) + (find-files "po")) + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (setenv "PREFIX" (assoc-ref outputs "out")) - (invoke "make" "install") - #t)) + (invoke "make" "install"))) (add-after 'install 'wrap-gpodder (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 66e091ddbf..75212ed60e 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -175,16 +175,16 @@ coordinates as well as partial support for adjustments in global coordinate syst (define-public gpxsee (package (name "gpxsee") - (version "4.19") + (version "7.8") (source (origin - (method url-fetch) - (uri - (string-append "https://github.com/tumic0/GPXSee/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/tumic0/GPXSee") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "00j0gjldw1kn3i45dppld1pz8r4s1g7lw89k7gfvvqbjjyjih1wg")))) + "1ymqz4wrl9ghkyyqi2vrnlyvz3fc84s3p8a1dkiqlvyvj360ck9j")))) (build-system gnu-build-system) (arguments '(#:phases @@ -195,27 +195,16 @@ coordinates as well as partial support for adjustments in global coordinate syst (for-each (lambda (file) (invoke "lrelease" file)) (find-files "lang" "\\.ts")) - (substitute* "src/config.h" - (("/usr/share/gpxsee") - (string-append - (assoc-ref outputs "out") "/share/gpxsee"))) (invoke "qmake" (string-append "PREFIX=" - (assoc-ref outputs "out"))))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share/gpxsee/"))) - (install-file "GPXSee" (string-append out "/bin/GPXSee")) - (install-file "pkg/maps.txt" share)) - #t))))) + (assoc-ref outputs "out")))))))) (inputs `(("qtbase" ,qtbase))) (native-inputs `(("qttools" ,qttools))) - (home-page "http://www.gpxsee.org") - (synopsis "GPX file viewer and analyzer") + (home-page "https://www.gpxsee.org") + (synopsis "GPS log file viewer and analyzer") (description - "GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX, -TCX, KML, FIT, IGC and NMEA files.") + "GPXSee is a Qt-based GPS log file viewer and analyzer that supports +all common GPS log file formats.") (license license:gpl3))) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f05da01f7a..4fb7d3579b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -348,7 +348,10 @@ diagrams.") name "-" version ".tar.bz2")) (sha256 (base32 - "07hrabhpl6n8ajz10s0d960jdwndxs87szxyn428mpxi8cvpg1f5")))) + "07hrabhpl6n8ajz10s0d960jdwndxs87szxyn428mpxi8cvpg1f5")) + (patches + (search-patches + "gtksourceview-2-add-default-directory.patch")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 365f909c2c..191f32c321 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org> ;;; Copyright © 2016 Amirouche <amirouche@hypermove.net> -;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2016, 2019 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2017 David Thompson <davet@gnu.org> ;;; Copyright © 2017, 2018 Mathieu Othacehe <m.othacehe@gmail.com> @@ -53,8 +53,10 @@ #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) + #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gperf) + #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages hurd) #:use-module (gnu packages image) @@ -66,6 +68,7 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) + #:use-module (gnu packages noweb) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -73,14 +76,17 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages slang) #:use-module (gnu packages sqlite) + #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) + #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix hg-download) #:use-module (guix build-system gnu) #:use-module (guix build-system guile) #:use-module (guix utils) @@ -2232,3 +2238,150 @@ slashes are present and accounted for, resolving @code{.} and @code{..}, etc). Inevitably, you have to break the string up into chunks and operate on that list of components. This module takes care of that for you.") (license license:lgpl3+))) + +(define-public guile-gi + (let ((commit "26e885219ae6b31a83766564a2ecfe8c4532346f") + (revision "1")) + (package + (name "guile-gi") + (version (string-append "0.0.1-" revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spk121/guile-gi.git") + (commit commit))) + (file-name (string-append name "-" version)) + (sha256 + (base32 + "1prbzhr4sqqihb34l6yfrz6sd8nghwd3q9wvbm36jnl2n3z2nxj8")))) + (build-system gnu-build-system) + (native-inputs `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gnu-gettext) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) + (propagated-inputs `(("glib" ,glib) + ("gobject-introspection" ,gobject-introspection) + ("gssettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gtk+" ,gtk+) + ("guile-lib" ,guile-lib) + ("webkitgtk" ,webkitgtk))) + (inputs `(("guile" ,guile-2.2))) + (arguments + `(#:configure-flags '("--with-gnu-filesystem-hierarchy"))) + (home-page "https://github.com/spk121/guile-gi") + (synopsis "GObject bindings for Guile") + (description + "Guile-GI is a library for Guile that allows using GObject-based +libraries, such as GTK+3. Its README comes with the disclaimer: This is +pre-alpha code.") + (license license:gpl3+)))) + +(define-public guile-srfi-159 + (let ((commit "1bd98abda2ae4ef8f36761a167903e55c6bda7bb") + (revision "0")) + (package + (name "guile-srfi-159") + (version (git-version "0" revision commit)) + (home-page "https://bitbucket.org/bjoli/guile-srfi-159") + (source (origin + (method hg-fetch) + (uri (hg-reference (changeset commit) + (url home-page))) + (sha256 + (base32 + "1zw6cmcy7xdbfiz3nz9arqnn7l2daidaps6ixkcrc9b6k51fdv3p")) + (file-name (git-file-name name version)))) + (build-system guile-build-system) + (arguments + ;; The *-impl.scm files are actually included from module files; they + ;; should not be compiled separately, but they must be installed. + '(#:not-compiled-file-regexp "-impl\\.scm$")) + (inputs + `(("guile" ,guile-2.2))) + (synopsis "Formatting combinators for Guile") + (description + "The @code{(srfi-159)} module and its sub-modules implement the +formatting combinators specified by +@uref{https://srfi.schemers.org/srfi-159/srfi-159.html, SRFI-159}. These are +more expressive and flexible than the traditional @code{format} procedure.") + (license license:bsd-3)))) + +(define-public emacsy + (let ((commit "7d49cc1425d5d209bdb82cac0d8ea0694b8b3784") + (revision "4")) + (package + (name "emacsy") + (version (string-append "0.1.2-" revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/janneke/emacsy.git") + (commit commit))) + (file-name (string-append name "-" version)) + (sha256 + (base32 + "0k9yns1v8zn135w60sx96nqs2bm2p2dvcvlm987hkw4lbff9ii6i")))) + (build-system gnu-build-system) + (native-inputs + `(("emacsy-webkit-gtk" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/janneke/emacsy-webkit-gtk.git") + (commit "35ded1b3e997fd779a17e0c4a2c73741718562d9"))) + (file-name (string-append "emacsy-webkit-gtk" "-" version)) + (sha256 + (base32 + "1gp0li2rbp6in926r3hrww6cnh864pp46v1din2pgmd7vzzl7kg0")))) + ("hello-emacsy" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/janneke/hello-emacsy.git") + (commit "2c117e5286a261be4ff24938f3ae1d348396c538"))) + (file-name (string-append "hello-emacsy" "-" version)) + (sha256 + (base32 + "15ykd7s8axcy8ym4v71fgal4x28fxnim0pv0jmpi3dnhizr63zqn")))) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("bzip2" ,bzip2) + ("guile" ,guile-2.2) + ("gettext" ,gnu-gettext) + ("libtool" ,libtool) + ("noweb" ,noweb) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo) + ("texlive" ,texlive))) + (propagated-inputs + `(("guile-lib" ,guile-lib) + ("guile-readline" ,guile-readline) + ("freeglut" ,freeglut) + ("gssettings-desktop-schemas" ,gsettings-desktop-schemas) + ("webkitgtk" ,webkitgtk))) + (inputs `(("guile" ,guile-2.2))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-examples + (lambda _ + (copy-recursively (assoc-ref %build-inputs "emacsy-webkit-gtk") + "example/emacsy-webkit-gtk") + (copy-recursively (assoc-ref %build-inputs "hello-emacsy") + "example/hello-emacsy"))) + (add-before 'configure 'setenv + (lambda _ + (setenv "GUILE_AUTO_COMPILE" "0")))))) + (home-page "https://github.com/shanecelis/emacsy/") + (synopsis "Embeddable GNU Emacs-like library using Guile") + (description + "Emacsy is an embeddable GNU Emacs-like library that uses GNU Guile +as extension language. Emacsy can give a C program an Emacsy feel with +keymaps, minibuffer, recordable macros, history, tab completion, major +and minor modes, etc., and can also be used as a pure Guile library. It +comes with a simple counter example using GLUT and browser examples in C +using gtk+-3 and webkitgtk.") + (license license:gpl3+)))) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 4ce5d6fdb1..6b7103562f 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 rsiddharth <s@ricketyspace.net> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -118,7 +119,7 @@ requests, and the library is intended for implementing Ajax APIs.") (define-public ghc-http-types (package (name "ghc-http-types") - (version "0.12.1") + (version "0.12.3") (source (origin (method url-fetch) @@ -126,7 +127,7 @@ requests, and the library is intended for implementing Ajax APIs.") "http-types-" version ".tar.gz")) (sha256 (base32 - "1wv9k6nlvkdsxwlr7gaynphvzmvi5211gvwq96mbcxgk51a739rz")))) + "05j00b9nqmwh9zaq9y9x50k81v2pd3j7a71kd91zlnbl8xk4m2jf")))) (build-system haskell-build-system) (native-inputs `(("ghc-doctest" ,ghc-doctest) @@ -136,7 +137,6 @@ requests, and the library is intended for implementing Ajax APIs.") ("hspec-discover" ,hspec-discover))) (inputs `(("ghc-case-insensitive" ,ghc-case-insensitive) - ("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-text" ,ghc-text))) (home-page "https://github.com/aristidb/http-types") (synopsis "Generic HTTP types for Haskell") @@ -550,7 +550,7 @@ transfers.") (define-public ghc-warp (package (name "ghc-warp") - (version "3.2.23") + (version "3.2.27") (source (origin (method url-fetch) @@ -558,8 +558,7 @@ transfers.") "warp-" version "/" "warp-" version ".tar.gz")) (sha256 - (base32 - "12v9qhi4hyp0sb90yddsax16jj7x47nmqwn53sv7b5nszcxgzam0")))) + (base32 "0p2w88q0zd55ms20qylipbi0qzbf324i9r8b9qqxyds5yc1anq76")))) (build-system haskell-build-system) (inputs `(("ghc-async" ,ghc-async) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 33c9c6484d..97b4fd9a55 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2018, 2019 Timothy Sample <samplet@ngyro.com> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018, 2019 Gabriel Hondet <gabrielhondet@gmail.com> +;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1325,6 +1326,16 @@ postfix notation. For more information on stack based languages, see (base32 "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-test-issue93 + (lambda _ + ;; Tests run out of memory on a system with 2GB of available RAM, + ;; in 'issue93.a.hs' and 'issue93.n.hs'. + (substitute* "tests/Makefile" + ((" issue93.y ") " ")) + #t))))) (home-page "https://hackage.haskell.org/package/happy") (synopsis "Parser generator for Haskell") (description "Happy is a parser generator for Haskell. Given a grammar @@ -1794,7 +1805,7 @@ version 1.3).") (define-public ghc-streaming-commons (package (name "ghc-streaming-commons") - (version "0.2.1.0") + (version "0.2.1.1") (source (origin (method url-fetch) @@ -1803,7 +1814,7 @@ version 1.3).") version ".tar.gz")) (sha256 (base32 - "13fn6qmpiggwpn8lczyydgp77cyzfypwds7wxskrwir4i5cgxlfq")))) + "1lmyx3wkjsayhy5yilzvy0kf8qwmycwlk26r1d8f3cxbfhkr7s52")))) (build-system haskell-build-system) (inputs `(("ghc-async" ,ghc-async) @@ -6941,7 +6952,7 @@ upon it.") (define-public ghc-conduit-extra (package (name "ghc-conduit-extra") - (version "1.3.0") + (version "1.3.1.1") (source (origin (method url-fetch) @@ -6950,7 +6961,7 @@ upon it.") version ".tar.gz")) (sha256 (base32 - "1bi2b6kdzy5f9glq46jzsk02has95jkxqz0cchpbmnakzhjwjh9c")))) + "0jaj350vv6mbb26gdwcqz4gwzfzrjydv5pis2da49wz1npbakcfw")))) (build-system haskell-build-system) (inputs `(("ghc-conduit" ,ghc-conduit) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 82b44a4900..a5bfb28a88 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 nee <nee-git@hidamari.blue> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -429,3 +430,50 @@ imaging. It supports several HDR and LDR image formats, and it can: a comic and manga reader. It supports a variety of container formats including CBZ, CB7, CBT, LHA.") (license license:gpl2+))) + +(define-public qview + (package + (name "qview") + (version "2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jurplel/qView.git") + (commit version))) + (sha256 + (base32 + "1s29hz44rb5dwzq8d4i4bfg77dr0v3ywpvidpa6xzg7hnnv3mhi5")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ + (invoke "qmake"))) + ;; Installation process hard-codes "/usr/bin", possibly + ;; prefixed. + (add-after 'configure 'fix-install-directory + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile" + (("\\$\\(INSTALL_ROOT\\)/usr") out)) + #t))) + ;; Don't phone home or show "Checking for updates..." in the + ;; About menu. + (add-before 'build 'disable-auto-update + (lambda _ + (substitute* "src/qvaboutdialog.cpp" + (("ui->updateLabel->setText\\(updateText\\);") "") + (("requestUpdates\\(\\);") "")) + #t))))) + (inputs + `(("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtimageformats" ,qtimageformats))) + (home-page "https://interversehq.com/qview/") + (synopsis "Convenient and minimal image viewer") + (description "qView is a Qt image viewer designed with visually +minimalism and usability in mind. Its features include animated GIF +controls, file history, rotation/mirroring, and multithreaded +preloading.") + (license license:gpl3+))) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index c2aae10c87..eabb6aee41 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1553,7 +1553,7 @@ identical visual appearance.") (define-public grim (package (name "grim") - (version "1.1") + (version "1.2.0") (source (origin (method git-fetch) @@ -1562,7 +1562,7 @@ identical visual appearance.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1bcvkggqszcwy6hg8g4mch3yr25ic0baafbd90af5s5mrhrjxxxz")))) + (base32 "0brljl4zfbn5mh9hkfrfkvd27c5y9vdkgap9r1hrfy9r1x20sskn")))) (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("cairo" ,cairo) @@ -1579,7 +1579,7 @@ identical visual appearance.") (define-public slurp (package (name "slurp") - (version "1.0.1") + (version "1.2.0") (source (origin (method git-fetch) @@ -1588,7 +1588,7 @@ identical visual appearance.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "072lkwhpvr753wfqzmd994bnhbrgfavxcgqcyml7abab28sdhs1y")))) + (base32 "0580m6kaiilgsrcj608r837r37sl6a25y7w21p7d6ij20fs3gvg1")))) (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("cairo" ,cairo) diff --git a/gnu/packages/kawa.scm b/gnu/packages/kawa.scm new file mode 100644 index 0000000000..5771eeda8e --- /dev/null +++ b/gnu/packages/kawa.scm @@ -0,0 +1,53 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Carlo Zancanaro <carlo@zancanaro.id.au> +;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> +;;; +;;; 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 <http://www.gnu.org/licenses/>. + +(define-module (gnu packages kawa) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages java)) + +(define-public kawa + (package + (name "kawa") + (version "3.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/kawa/kawa-" version ".tar.gz")) + (sha256 + (base32 + "1k9qpydc64ar4aqyg3q7jmmxy503ayj85227qfhc5n6ngchqavhy")))) + (build-system gnu-build-system) + (arguments + `(#:parallel-build? #f + #:parallel-tests? #f)) + (inputs + `(("icedtea" ,icedtea-8 "jdk"))) + (home-page "https://www.gnu.org/software/kawa/") + (synopsis "Java framework and implementation of Scheme, Elisp, and more") + (description + "GNU Kawa is an implementation of the Scheme programming language that +is built on top of the Java platform. It is thus conveniently integrated +with Java and benefits from this by having a compiler, optional static +typing, and so on. Kawa also serves as a framework for implementing other +programming languages on the Java platform. Included in Kawa is qexo, a +partial implementation of XQuery in Java.") + (license license:expat))) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 962a228e4b..01da7bad60 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015, 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2016 David Thompson <davet@gnu.org> -;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2017, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> @@ -41,7 +41,7 @@ (define-public libevent (package (name "libevent") - (version "2.1.8") + (version "2.1.10") (source (origin (method url-fetch) (uri (string-append @@ -49,11 +49,7 @@ version "-stable/libevent-" version "-stable.tar.gz")) (sha256 (base32 - "1hhxnxlr0fsdv7bdmzsnhdz16fxf3jg2r6vyljcl3kj6pflcap4n")) - (patches (search-patches "libevent-2.1-dns-tests.patch" - ;; XXX: Try removing this for > 2.1.8. - ;; https://github.com/libevent/libevent/issues/452 - "libevent-2.1-skip-failing-test.patch")))) + "1c25928gdv495clxk2v1d4gkr5py7ack4gx2n7d13frnld0syr78")))) (build-system gnu-build-system) (arguments ;; This skips some of the tests which fail on armhf and aarch64. @@ -62,7 +58,7 @@ `(("python" ,python-2))) ; for 'event_rpcgen.py' (native-inputs `(("which" ,which))) - (home-page "http://libevent.org/") + (home-page "https://libevent.org/") (synopsis "Event notification library") (description "The libevent API provides a mechanism to execute a callback @@ -76,27 +72,6 @@ then add or remove events dynamically without having to change the event loop.") (license bsd-3))) -(define-public libevent-2.0 - (package - (inherit libevent) - (version "2.0.22") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/libevent/libevent/releases/download/release-" - version "-stable/libevent-" version "-stable.tar.gz")) - (sha256 - (base32 - "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki")) - (patches - (search-patches - "libevent-dns-tests.patch" - "libevent-2.0-CVE-2016-10195.patch" - "libevent-2.0-CVE-2016-10196.patch" - "libevent-2.0-CVE-2016-10197.patch" - "libevent-2.0-evbuffer-add-use-last-with-datap.patch")))) - (arguments '()))) - (define-public libev (package (name "libev") @@ -154,19 +129,6 @@ resolution, asynchronous file system operations, and threading primitives.") ;; details. Documentation is CC-BY 4.0 as of 1.12.0; see 'LICENSE-docs'. (license (list expat cc-by4.0)))) -;; This version is required for Node versions < 10. -(define-public libuv-1.19 - (package - (inherit libuv) - (version "1.19.2") - (source (origin - (method url-fetch) - (uri (string-append "https://dist.libuv.org/dist/v" version - "/libuv-v" version ".tar.gz")) - (sha256 - (base32 - "1msk9ac1z69whww88ibrwjqkd1apdla6l77cm2fwy5kigq0z5g3w")))))) - (define-public perl-anyevent (package (name "perl-anyevent") diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2e56e0034a..15473b06bd 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2018 Vasile Dumitrascu <va511e@yahoo.com> ;;; Copyright © 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2019 Stefan Stefanović <stefanx2ovic@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -143,6 +144,7 @@ ((string-prefix? "alpha" arch) "alpha") ((string-prefix? "powerpc" arch) "powerpc") ;including "powerpc64le" ((string-prefix? "s390" arch) "s390") + ((string-prefix? "riscv" arch) "riscv") (else arch)))) (define-public (system->defconfig system) @@ -169,18 +171,20 @@ defconfig. Return the appropriate make target if applicable, otherwise return "mirror://gnu/linux-libre/" version "-gnu/linux-libre-" version "-gnu.tar.xz"))) -(define-public linux-libre-headers +(define (make-linux-libre-headers version hash) (package (name "linux-libre-headers") - (version "4.14.67") + (version version) (source (origin (method url-fetch) (uri (linux-libre-urls version)) - (sha256 - (base32 - "050zvdxjy6sc64q75pr1gxsmh49chwav2pwxz8xlif39bvahnrpg")))) + (sha256 (base32 hash)))) (build-system gnu-build-system) - (native-inputs `(("perl" ,perl))) + (native-inputs `(("perl" ,perl) + ,@(if (version>=? version "4.16") + `(("flex" ,flex) + ("bison" ,bison)) + '()))) (arguments `(#:modules ((guix build gnu-build-system) (guix build utils) @@ -246,7 +250,7 @@ defconfig. Return the appropriate make target if applicable, otherwise return "/raw/34a7d9011fcfcfa38b68282fd2b1a8797e6834f0" "/debian/patches/bugfix/arm/" "arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch")) - (file-name "linux-libre-4.19-arm-export-__sync_icache_dcache.patch") + (file-name "linux-libre-arm-export-__sync_icache_dcache.patch") (sha256 (base32 "1ifnfhpakzffn4b8n7x7w5cps9mzjxlkcfz9zqak2vaw8nzvl39f")))) @@ -417,22 +421,26 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." It has been modified to remove all non-free binary blobs.") (license license:gpl2))) -(define %linux-libre-version "5.1.4") -(define %linux-libre-hash "02pzad29w2apcqsk4r4fq93539z3by8kvk1f59lb8xnl0gvhdi5v") +(define %linux-libre-version "5.1.9") +(define %linux-libre-hash "1l1nhq3giqyv7zir1sl8m32xbbpmqhsw8dgf90kf4qcnh6bvjin1") (define %linux-libre-5.1-patches (list %boot-logo-patch %linux-libre-arm-export-__sync_icache_dcache-patch)) -(define-public linux-libre +(define-public linux-libre-5.1 (make-linux-libre %linux-libre-version %linux-libre-hash '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux") #:patches %linux-libre-5.1-patches #:configuration-file kernel-config)) -(define %linux-libre-4.19-version "4.19.45") -(define %linux-libre-4.19-hash "1wiy8vzpzzml4k76nv3ycjx7ky55x7dqx3mgpjqbh73mj2gcr5bx") +(define-public linux-libre-headers-5.1 + (make-linux-libre-headers %linux-libre-version + %linux-libre-hash)) + +(define %linux-libre-4.19-version "4.19.50") +(define %linux-libre-4.19-hash "0j1p459al3y77cv2xwjx7ppghc8ixs3wm3w9a10sc3ckbq1hw8ly") (define %linux-libre-4.19-patches (list %boot-logo-patch @@ -445,8 +453,12 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.121") -(define %linux-libre-4.14-hash "1g7gyjmp056pasf9m34dqs8pa15my6hqasdd551jw8mgkbhsfnxg") +(define-public linux-libre-headers-4.19 + (make-linux-libre-headers %linux-libre-4.19-version + %linux-libre-4.19-hash)) + +(define %linux-libre-4.14-version "4.14.125") +(define %linux-libre-4.14-hash "1ms7ai7c6xspq8r2amgjfsdyl87x10dc4b1c3iacrhrxaqqmab01") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version @@ -454,15 +466,19 @@ It has been modified to remove all non-free binary blobs.") '("x86_64-linux" "i686-linux" "armhf-linux") #:configuration-file kernel-config)) +(define-public linux-libre-headers-4.14 + (make-linux-libre-headers %linux-libre-4.14-version + %linux-libre-4.14-hash)) + (define-public linux-libre-4.9 - (make-linux-libre "4.9.178" - "1ridlkymf382qnkc6hi07pkghrrxfv2avx55snjnkfcpdccvsmrb" + (make-linux-libre "4.9.181" + "0fdqfd6z73q00nracrixliw0i0b60f4z352jmzabcwy431wszar5" '("x86_64-linux" "i686-linux") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.180" - "157kfs4slii86q9yrspvqdynpiv6rff80hrrn569v6h4nkc4b7ag" + (make-linux-libre "4.4.181" + "1ird78a3pg8k6h60258g56ka86jpgiaj0q9r2jws770qgrmy324l" '("x86_64-linux" "i686-linux") #:configuration-file kernel-config #:extra-options @@ -472,21 +488,28 @@ It has been modified to remove all non-free binary blobs.") ("CONFIG_DEVPTS_MULTIPLE_INSTANCES" . #t)) %default-extra-linux-options))) -(define-public linux-libre-arm-generic +(define-public linux-libre-arm-veyron (make-linux-libre %linux-libre-version %linux-libre-hash '("armhf-linux") #:patches %linux-libre-5.1-patches - #:defconfig "multi_v7_defconfig" - #:extra-version "arm-generic")) + #:configuration-file kernel-config-veyron + #:extra-version "arm-veyron")) -(define-public linux-libre-arm-veyron +(define-public linux-libre-headers-4.14.67 + (make-linux-libre-headers "4.14.67" + "050zvdxjy6sc64q75pr1gxsmh49chwav2pwxz8xlif39bvahnrpg")) + +(define-public linux-libre-headers linux-libre-headers-4.14.67) +(define-public linux-libre linux-libre-5.1) + +(define-public linux-libre-arm-generic (make-linux-libre %linux-libre-version %linux-libre-hash '("armhf-linux") #:patches %linux-libre-5.1-patches - #:configuration-file kernel-config-veyron - #:extra-version "arm-veyron")) + #:defconfig "multi_v7_defconfig" + #:extra-version "arm-generic")) (define-public linux-libre-arm-generic-4.19 (make-linux-libre %linux-libre-4.19-version @@ -526,28 +549,6 @@ It has been modified to remove all non-free binary blobs.") #:defconfig "omap2plus_defconfig" #:extra-version "arm-omap2plus")) -(define-public vhba-module - (package - (name "vhba-module") - (version "20190410") - (source (origin - (method url-fetch) - (uri (string-append - "http://downloads.sourceforge.net/cdemu/vhba-module/vhba-module-" - version ".tar.bz2")) - (sha256 - (base32 - "1513hq130raxp9z5grj54cwfjfxj05apipxg425j0zicii59a60c")))) - (build-system linux-module-build-system) - (arguments - ;; TODO: No tests? - `(#:tests? #f)) - (home-page "https://cdemu.sourceforge.io/") - (synopsis "Kernel module that emulates SCSI devices") - (description "VHBA module provides a Virtual (SCSI) HBA, which is the link -between the CDemu userspace daemon and linux kernel.") - (license license:gpl2+))) - ;;; ;;; Linux kernel modules. @@ -933,7 +934,7 @@ slabtop, and skill.") (define-public e2fsprogs (package (name "e2fsprogs") - (version "1.44.5") + (version "1.45.2") (source (origin (method url-fetch) (uri (string-append @@ -942,7 +943,7 @@ slabtop, and skill.") name "-" version ".tar.xz")) (sha256 (base32 - "1ff56h6h1h17sj2zvlddv5c88nmbx46p1fcbh6b0s5k9kl3b6pms")))) + "02g0cm72sgz709s9pkg4mvj56m7bgs7rwnyc2cp7cvg3j6pcjlj9")))) (build-system gnu-build-system) (inputs `(("util-linux" ,util-linux))) (native-inputs `(("pkg-config" ,pkg-config) @@ -2535,7 +2536,7 @@ compliance.") (define-public wireless-regdb (package (name "wireless-regdb") - (version "2017.03.07") + (version "2019.06.03") (source (origin (method url-fetch) (uri (string-append @@ -2543,7 +2544,7 @@ compliance.") "wireless-regdb-" version ".tar.xz")) (sha256 (base32 - "1f9mcp78sdd4sci6v32vxfcl1rfjpv205jisz1p93kkfnaisy7ip")) + "1gslvh0aqdkv48jyr2ddq153mw28i7qz2ybrjj9qvkk3dgc7x4fd")) ;; We're building 'regulatory.bin' by ourselves. (snippet '(begin @@ -2551,13 +2552,25 @@ compliance.") #t)))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'gzip-determinism - (lambda _ - (substitute* "Makefile" - (("gzip") "gzip --no-name")) - #t)) - (delete 'configure)) + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'gzip-determinism + (lambda _ + (substitute* "Makefile" + (("gzip") "gzip --no-name")) + #t)) + (add-after 'unpack 'omit-signature + (lambda _ + (substitute* "Makefile" + ;; Signing requires a REGDB_PUBCERT and REGDB_PRIVKEY which we + ;; don't provide (see below). Disable it. + ((" regulatory\\.db\\.p7s") "") + ;; regulatory.db is built as a dependency of regulatory.db.p7s, + ;; but ‘make install’ depends only on the latter while installing + ;; both (and failing). Depend on it explicitly. + (("^install: " all) (string-append all "regulatory.db "))) + #t)) + (delete 'configure)) ; no configure script ;; The 'all' target of the makefile depends on $(REGDB_CHANGED), which ;; is computed and can be equal to 'maintainer-clean'; when that @@ -2565,19 +2578,22 @@ compliance.") ;; just built. Thus, build things sequentially. #:parallel-build? #f - #:tests? #f ;no tests - #:make-flags (let ((out (assoc-ref %outputs "out"))) - (list (string-append "PREFIX=" out) - (string-append "LSB_ID=Guix") - (string-append "DISTRO_PUBKEY=/dev/null") - (string-append "DISTRO_PRIVKEY=/dev/null") - (string-append "REGDB_PUBKEY=/dev/null") - - ;; Leave that empty so that db2bin.py doesn't try - ;; to sign 'regulatory.bin'. This allows us to - ;; avoid managing a key pair for the whole distro. - (string-append "REGDB_PRIVKEY="))))) - (native-inputs `(("python" ,python-2))) + #:tests? #f ; no tests + #:make-flags + (let ((out (assoc-ref %outputs "out"))) + (list (string-append "PREFIX=" out) + (string-append "FIRMWARE_PATH=$(PREFIX)/lib/firmware") + + ;; Leave this empty so that db2bin.py doesn't try to sign + ;; ‘regulatory.bin’. This allows us to avoid managing a key + ;; pair for the whole distribution. + (string-append "REGDB_PRIVKEY=") + ;; Don't generate a public key for the same reason. These are + ;; used as Makefile targets and can't be the empty string. + (string-append "REGDB_PUBCERT=/dev/null") + (string-append "REGDB_PUBKEY=/dev/null"))))) + (native-inputs + `(("python" ,python-wrapper))) (home-page "https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb") (synopsis "Wireless regulatory database") @@ -2860,12 +2876,16 @@ thanks to the use of namespaces.") (substitute* "bin/singularity.in" (("^PATH=.*" all) (string-append "#" all "\n"))) + + (substitute* (find-files "libexec/cli" "\\.exec$") + (("\\$SINGULARITY_libexecdir/singularity/bin/([a-z]+)-suid" + _ program) + (string-append "/run/setuid-programs/singularity-" + program "-helper"))) #t)))) (build-system gnu-build-system) (arguments - `(#:configure-flags - (list "--disable-suid" - "--localstatedir=/var") + `(#:configure-flags '("--localstatedir=/var") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-reference-to-squashfs-tools @@ -4052,6 +4072,39 @@ Linux kernel to retrieve and control processor features related to power saving, such as frequency and voltage scaling.") (license license:gpl2))) +(define-public x86-energy-perf-policy + (package + (name "x86-energy-perf-policy") + (version (package-version linux-libre)) + (source (package-source linux-libre)) + (build-system gnu-build-system) + (arguments + '(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'enter-subdirectory + (lambda _ + (chdir "tools/power/x86/x86_energy_perf_policy") + #t)) + (delete 'configure) + (add-before 'build 'fix-makefile + (lambda _ + (substitute* "Makefile" (("/usr") "")) + #t))) + #:make-flags + (let ((out (assoc-ref %outputs "out"))) + (list (string-append "DESTDIR=" out) + (string-append "LDFLAGS=-Wl,-rpath=" out "/lib"))))) + (supported-systems '("i686-linux" "x86_64-linux")) + (home-page (package-home-page linux-libre)) + (synopsis "Display and update Intel-CPU energy-performance policy") + (description + "@command{x86_energy_perf_policy} displays and updates energy-performance +policy settings specific to Intel Architecture Processors. Settings are +accessed via Model Specific Register (MSR) updates, no matter if the Linux +cpufreq sub-system is enabled or not.") + (license license:gpl2))) + (define-public haveged (package (name "haveged") @@ -4329,15 +4382,16 @@ developers.") (define-public radeontop (package (name "radeontop") - (version "1.1") - (home-page "https://github.com/clbr/radeontop/") - (source (origin - (method url-fetch) - (uri (string-append home-page "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1fv06j5c99imvzkac3j40lgjhr5b2i77fnyffhlvj92bli1fm1c6")))) + (version "1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/clbr/radeontop.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1b1m30r2nfwqkajqw6m01xmfhlq83z1qylyijxg7962mp9x2k0gw")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -4361,6 +4415,7 @@ developers.") ("libpciaccess" ,libpciaccess) ("libxcb" ,libxcb) ("ncurses" ,ncurses))) + (home-page "https://github.com/clbr/radeontop/") (synopsis "Usage monitor for AMD Radeon graphics") (description "RadeonTop monitors resource consumption on supported AMD Radeon Graphics Processing Units (GPUs), either in real time as bar graphs on @@ -4592,10 +4647,19 @@ interface in sysfs, which can be accomplished with the included udev rules.") ("sed" ,sed) ("usbutils" ,usbutils) ("util-linux" ,util-linux) - ("wireless-tools" ,wireless-tools))) + ("wireless-tools" ,wireless-tools) + ,@(if (let ((system (or (%current-target-system) + (%current-system)))) + (or (string-prefix? "i686-" system) + (string-prefix? "x86_64-" system))) + `(("x86-energy-perf-policy" ,x86-energy-perf-policy)) + '()))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) + #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script (add-before 'build 'setenv @@ -4633,30 +4697,34 @@ interface in sysfs, which can be accomplished with the included udev rules.") (let* ((bin (string-append (assoc-ref outputs "out") "/bin")) (bin-files (find-files bin ".*"))) (define (bin-directory input-name) - (string-append (assoc-ref inputs input-name) "/bin")) + (let ((p (assoc-ref inputs input-name))) + (and p (string-append p "/bin")))) (define (sbin-directory input-name) (string-append (assoc-ref inputs input-name) "/sbin")) (for-each (lambda (program) (wrap-program program `("PATH" ":" prefix ,(append - (map bin-directory '("bash" - "coreutils" - "dbus" - "eudev" - "grep" - "inetutils" - "kmod" - "perl" - "sed" - "usbutils" - "util-linux")) - (map sbin-directory '("ethtool" - "hdparm" - "iw" - "pciutils" - "rfkill" - "wireless-tools")))))) + (filter-map bin-directory + '("bash" + "coreutils" + "dbus" + "eudev" + "grep" + "inetutils" + "kmod" + "perl" + "sed" + "usbutils" + "util-linux" + "x86-energy-perf-policy")) + (filter-map sbin-directory + '("ethtool" + "hdparm" + "iw" + "pciutils" + "rfkill" + "wireless-tools")))))) bin-files) #t)))))) (home-page "http://linrunner.de/en/tlp/tlp.html") diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 167c4433b1..dfc58d469f 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2019 Katherine Cox-Buday <cox.katherine.e@gmail.com> ;;; Copyright © 2019 Jesse Gildersleve <jessejohngildersleve@protonmail.com> +;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,8 +46,10 @@ #:use-module (gnu packages admin) #:use-module (gnu packages base) #:use-module (gnu packages bdw-gc) + #:use-module (gnu packages bison) #:use-module (gnu packages compression) #:use-module (gnu packages ed) + #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) @@ -5321,3 +5324,48 @@ port within a range.") (define-public ecl-find-port (sbcl-package->ecl-package sbcl-find-port)) + +(define-public txr + (package + (name "txr") + (version "216") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.kylheku.com/cgit/txr/snapshot/txr-" + version + ".tar.bz2")) + (patches (search-patches "txr-shell.patch")) + (sha256 + (base32 + "07cxdpc9zsqd0c2668g00dqjpd6zc4mfdn74aarr6d2hpzdhh937")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("cc=gcc") + #:phases (modify-phases %standard-phases + (add-after 'configure 'fix-tests + (lambda _ + (substitute* "tests/017/realpath.tl" + (("/usr/bin") "/")) + (substitute* "tests/017/realpath.expected" + (("/usr/bin") "/")) + #t)) + (replace 'check + (lambda _ + (zero? (system* "make" "tests"))))))) + (native-inputs + `(("bison" ,bison) + ("flex" ,flex))) + (inputs + `(("libffi" ,libffi))) + (synopsis "General-purpose, multi-paradigm programming language") + (description + "TXR is a general-purpose, multi-paradigm programming language. It +comprises two languages integrated into a single tool: a text scanning and +extraction language referred to as the TXR Pattern Language (sometimes just +\"TXR\"), and a general-purpose dialect of Lisp called TXR Lisp. TXR can be +used for everything from \"one liner\" data transformation tasks at the +command line, to data scanning and extracting scripts, to full application +development in a wide-range of areas.") + (home-page "https://nongnu.org/txr/") + (license license:bsd-2))) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 3e98ac45a3..67ea736284 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -573,16 +573,16 @@ in terms of new algorithms.") (define-public rxcpp (package (name "rxcpp") - (version "4.0.0") + (version "4.1.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ReactiveX/RxCpp/archive/v" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ReactiveX/RxCpp.git") + (commit (string-append "v" version)))) (sha256 - (base32 - "0y2isr8dy2n1yjr9c5570kpc9lvdlch6jv0jvw000amwn5d3krsh")) - (file-name (string-append name "-" version ".tar.gz")))) + (base32 "1rdpa3jlc181jd08nk437aar085h28i45s6nzrv65apb3xyyz0ij")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments `(#:phases diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 114ef32a9d..7f9dc8e13f 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -351,14 +351,14 @@ aliasing facilities to work just as they would on normal mail.") (define-public mutt (package (name "mutt") - (version "1.11.4") + (version "1.12.0") (source (origin (method url-fetch) (uri (string-append "https://bitbucket.org/mutt/mutt/downloads/" "mutt-" version ".tar.gz")) (sha256 (base32 - "0098pr4anmq2a0id8wfi2vci3cgcfwf9k4q411w22xn8lrz3aldn")) + "13zr2fpql33sdbsjsiaa952js5bvphc1x4lqsj36qyzdhj3l84na")) (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs @@ -581,7 +581,7 @@ and corrections. It is based on a Bayesian filter.") (define-public offlineimap (package (name "offlineimap") - (version "7.2.3") + (version "7.2.4") (source (origin (method git-fetch) (uri (git-reference @@ -590,7 +590,7 @@ and corrections. It is based on a Bayesian filter.") (file-name (git-file-name name version)) (sha256 (base32 - "18sdnhjldn8zs03bgqy1qa3ikmlfvyxcvwp3nbnv1a74biccqbpa")))) + "0h5q5nk2p2vx86w6rrbs7v70h81dpqqr68x6l3klzl3m0yj9agb1")))) (build-system python-build-system) (native-inputs `(("asciidoc" ,asciidoc))) @@ -847,14 +847,14 @@ invoking @command{notifymuch} from the post-new hook.") (define-public notmuch (package (name "notmuch") - (version "0.28.4") + (version "0.29") (source (origin (method url-fetch) (uri (string-append "https://notmuchmail.org/releases/notmuch-" - version ".tar.gz")) + version ".tar.xz")) (sha256 (base32 - "1jjnhs4xs4gksvg0a9qn68rxrj41im5bh58snka2pkj20nxwmcds")))) + "0rg4jp0wlsham76rx9fmlpmcbv3n9vsd81vrzqvh6jrwlnmjds88")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index f234d2c860..c2a6aaf011 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -79,8 +79,7 @@ (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -136,14 +135,14 @@ actions.") (package (name "mate-icon-theme") (version "1.22.0") - (source (origin - (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "090vfxpn1b1wwvkilv1j3cx4swdm4z0s7xyvhvqhdzj58zsf2000")))) + (source + (origin + (method url-fetch) + (uri (string-append "mirror://mate/" (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "090vfxpn1b1wwvkilv1j3cx4swdm4z0s7xyvhvqhdzj58zsf2000")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -159,14 +158,14 @@ actions.") (package (name "mate-icon-theme-faenza") (version "1.20.0") - (source (origin - (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna")))) + (source + (origin + (method url-fetch) + (uri (string-append "mirror://mate/" (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna")))) (build-system gnu-build-system) (arguments `(#:phases @@ -197,11 +196,11 @@ from Mint-X-F and Faenza-Fresh icon packs.") (package (name "mate-themes") (version "3.22.19") - (source (origin - (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/themes/" - (version-major+minor version) "/mate-themes-" - version ".tar.xz")) + (source + (origin + (method url-fetch) + (uri (string-append "mirror://mate/themes/" (version-major+minor version) + "/mate-themes-" version ".tar.xz")) (sha256 (base32 "1ycb8b8r0s8d1h1477135mynr53s5781gdb2ap8xlvj2g58492wq")))) @@ -225,14 +224,14 @@ themes for both gtk+-2 and gtk+-3.") (package (name "mate-desktop") (version "1.22.0") - (source (origin - (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "09gn840p6qds21kxab4pidjd53g76s76i7178fdibrz462mda217")))) + (source + (origin + (method url-fetch) + (uri (string-append "mirror://mate/" (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "09gn840p6qds21kxab4pidjd53g76s76i7178fdibrz462mda217")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -259,14 +258,14 @@ desktop and the mate-about program.") (package (name "libmateweather") (version "1.22.0") - (source (origin - (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1ribgcwl4ncfbcf9bkcbxrgc7yzajdnxg12837psngymkqswlp6a")))) + (source + (origin + (method url-fetch) + (uri (string-append "mirror://mate/" (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1ribgcwl4ncfbcf9bkcbxrgc7yzajdnxg12837psngymkqswlp6a")))) (build-system gnu-build-system) (arguments '(#:configure-flags @@ -308,8 +307,7 @@ the MATE desktop environment.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -349,8 +347,7 @@ configurations (profiles).") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -417,8 +414,7 @@ configuration program to choose applications starting on login.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -460,8 +456,7 @@ configuration program to choose applications starting on login.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -490,8 +485,7 @@ sound systems.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -519,14 +513,14 @@ MATE desktop environment.") (package (name "mate-menus") (version "1.22.0") - (source (origin - (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1lkakbf2f1815c146z4xp5f0h4lim6jzr02681wbvzalc6k97v5c")))) + (source + (origin + (method url-fetch) + (uri (string-append "mirror://mate/" (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1lkakbf2f1815c146z4xp5f0h4lim6jzr02681wbvzalc6k97v5c")))) (build-system gnu-build-system) (arguments `(#:phases @@ -563,8 +557,7 @@ assorted menu related utility programs.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -637,8 +630,7 @@ Interactive Weather Information Network (IWIN). (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -674,8 +666,7 @@ mate-volume-control, a MATE volume control application and applet.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -748,8 +739,7 @@ infamous 'Wanda the Fish'.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -852,8 +842,7 @@ infamous 'Wanda the Fish'.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -911,8 +900,7 @@ icons on the MATE desktop. It works on local and remote file systems.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -966,8 +954,7 @@ icons on the MATE desktop. It works on local and remote file systems.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -1026,8 +1013,7 @@ of various aspects of your desktop.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -1077,8 +1063,7 @@ for use with MATE or as a standalone window manager.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -1117,8 +1102,7 @@ sessions, panels, menus, file management, and preferences.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -1149,8 +1133,7 @@ sessions, panels, menus, file management, and preferences.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -1172,8 +1155,7 @@ can be used as backgrounds in the MATE Desktop environment.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -1214,8 +1196,7 @@ Re-decorates windows on un-maximise. (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -1286,8 +1267,7 @@ can be used as backgrounds in the MATE Desktop environment.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -1339,8 +1319,7 @@ can be used as backgrounds in the MATE Desktop environment.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -1390,8 +1369,7 @@ can be used as backgrounds in the MATE Desktop environment.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -1444,8 +1422,7 @@ can be used as backgrounds in the MATE Desktop environment.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -1495,8 +1472,7 @@ can be used as backgrounds in the MATE Desktop environment.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -1536,8 +1512,7 @@ MATE Desktop to monitor your system resources and usage.") (source (origin (method url-fetch) - (uri (string-append "https://pub.mate-desktop.org/releases/" - (version-major+minor version) "/" + (uri (string-append "mirror://mate/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5e0df6e409..7bb9bc84a3 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1692,7 +1692,7 @@ September 2004}") (define-public petsc (package (name "petsc") - (version "3.10.4") + (version "3.11.2") (source (origin (method url-fetch) @@ -1700,7 +1700,7 @@ September 2004}") (uri (string-append "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/" "petsc-lite-" version ".tar.gz")) (sha256 - (base32 "0fk16944zh3473ra198kdkxdn08rq7b6ap838hxy1mh1i0hb488r")))) + (base32 "1645nwwcp9bcnfnxikk480mhbbacdvhsay2c401818hk97dqj5nx")))) (outputs '("out" ; libraries and headers "examples")) ; ~30MiB of examples (build-system gnu-build-system) @@ -1845,7 +1845,11 @@ scientific applications modeled by partial differential equations.") ``("--with-mpiexec=mpirun" ,(string-append "--with-mpi-dir=" (assoc-ref %build-inputs "openmpi")) - ,@(delete "--with-mpi=0" ,cf))))) + ,@(delete "--with-mpi=0" ,cf))) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'mpi-setup + ,%openmpi-setup))))) (synopsis "Library to solve PDEs (with complex scalars and MPI support)"))) (define-public python-petsc4py @@ -1910,7 +1914,7 @@ savings are consistently > 5x.") (define-public slepc (package (name "slepc") - (version "3.10.1") + (version "3.11.1") (source (origin (method url-fetch) @@ -1918,10 +1922,11 @@ savings are consistently > 5x.") version ".tar.gz")) (sha256 (base32 - "188j1a133q91h8pivpnzwcf78kz8dvz2nzf6ndnjygdbqb48fizn")))) + "1yq84q9wannc8xwapxpay4ypdd675picwi395hhsdvng9q6hf5j8")))) (build-system gnu-build-system) (native-inputs - `(("python" ,python-2))) + `(("python" ,python-2) + ("petsc:examples" ,petsc "examples"))) ;for gmakegen.py script (inputs `(("arpack" ,arpack-ng) ("gfortran" ,gfortran))) @@ -1933,7 +1938,10 @@ savings are consistently > 5x.") `(,(string-append "--with-arpack-dir=" (assoc-ref %build-inputs "arpack") "/lib")) #:make-flags ;honor (parallel-job-count) - `(,(format #f "MAKE_NP=~a" (parallel-job-count))) + `(,(format #f "MAKE_NP=~a" (parallel-job-count)) + ,(string-append "PETSCCONFIGDIR=" + (assoc-ref %build-inputs "petsc:examples") + "/share/petsc/examples/config")) #:phases (modify-phases %standard-phases (replace 'configure @@ -2752,7 +2760,7 @@ to BMP, JPEG or PNG image formats.") (define-public maxima (package (name "maxima") - (version "5.42.2") + (version "5.43.0") (source (origin (method url-fetch) @@ -2760,7 +2768,7 @@ to BMP, JPEG or PNG image formats.") version "-source/" name "-" version ".tar.gz")) (sha256 (base32 - "0kdncy6137sg3rradirxzj10mkcvafxd892zlclwhr9sa7b12zhn")) + "0xyahp4c6509haxh4n1swiqm3421gplkdisa0zypclh3252sbzfw")) (patches (search-patches "maxima-defsystem-mkdir.patch")))) (build-system gnu-build-system) (inputs @@ -2794,11 +2802,18 @@ to BMP, JPEG or PNG image formats.") (let* ((sed (string-append (assoc-ref inputs "sed") "/bin/sed")) (coreutils (assoc-ref inputs "coreutils")) (dirname (string-append coreutils "/bin/dirname")) - (head (string-append coreutils "/bin/head"))) + (head (string-append coreutils "/bin/head")) + (perl (string-append (assoc-ref inputs "perl") "/bin/perl")) + (python (string-append (assoc-ref inputs "python") + "/bin/python3"))) (substitute* "src/maxima.in" (("sed ") (string-append sed " ")) (("dirname") dirname) (("head") head)) + (substitute* "doc/info/Makefile.in" + (("/usr/bin/env perl") perl)) + (substitute* "doc/info/build_html.sh.in" + (("python") python)) #t))) (add-before 'check 'pre-check (lambda _ @@ -2830,9 +2845,6 @@ to BMP, JPEG or PNG image formats.") (mkdir-p "share/emacs") (mkdir-p "share/doc") (symlink - (string-append datadir "/emacs/") - (string-append out "/share/emacs/site-lisp")) - (symlink (string-append datadir "/doc/") (string-append out "/share/doc/maxima")) (with-atomic-file-replacement @@ -2863,7 +2875,7 @@ point numbers.") (define-public wxmaxima (package (name "wxmaxima") - (version "19.03.1") + (version "19.05.7") (source (origin (method git-fetch) @@ -2873,7 +2885,7 @@ point numbers.") (file-name (git-file-name name version)) (sha256 (base32 - "1qkf4jg86xnn3wk3782ffmfz12axb92dkjagcz3ffzw2wi1rclml")))) + "0zaz71fh156b9inrxf86scnix247al5pl9v18cxhjxcm0lanqxdp")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal))) @@ -3553,6 +3565,7 @@ in finite element programs.") (inputs `(("mpi" ,openmpi) ;;Supported only with MPI: + ("hdf5" ,hdf5-parallel-openmpi) ;TODO: have petsc-openmpi propagate? ("p4est" ,p4est-openmpi) ("petsc" ,petsc-openmpi) ("slepc" ,slepc-openmpi) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index c2430f5ee9..7bdd122f2b 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -28,6 +28,7 @@ #:use-module (gnu packages man) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages texinfo) #:use-module (guix build-system gnu) #:use-module (guix download) @@ -35,7 +36,7 @@ #:use-module (guix licenses) #:use-module (guix packages)) -(define-public nyacc +(define-public nyacc-0.86 (package (name "nyacc") (version "0.86.0") @@ -58,6 +59,37 @@ extensive examples, including parsers for the Javascript and C99 languages.") (home-page "https://savannah.nongnu.org/projects/nyacc") (license (list gpl3+ lgpl3+)))) +(define-public nyacc + (package + (inherit nyacc-0.86) + (version "0.94.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://savannah/nyacc/nyacc-" + version ".tar.gz")) + (sha256 + (base32 + "12qnzwm1n3j8z7hbr9hy2wka9a1aasm2rvnpnvdxkjcsbdzj8fn4")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* (find-files "." "^Makefile\\.in$") + (("^SITE_SCM_DIR =.*") + "SITE_SCM_DIR = \ +@prefix@/share/guile/site/@GUILE_EFFECTIVE_VERSION@\n") + (("^SITE_SCM_GO_DIR =.*") + "SITE_SCM_GO_DIR = \ +@prefix@/lib/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n") + (("^INFODIR =.*") + "INFODIR = @prefix@/share/info\n") + (("^DOCDIR =.*") + "DOCDIR = @prefix@/share/doc/$(PACKAGE_TARNAME)\n")) + #t)))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-2.2))))) + (define-public mes (package (name "mes") @@ -73,7 +105,10 @@ extensive examples, including parsers for the Javascript and C99 languages.") (supported-systems '("i686-linux" "x86_64-linux")) (propagated-inputs `(("mescc-tools" ,mescc-tools) - ("nyacc" ,nyacc))) + + ;; XXX: MesCC appears to enter an infinite loop (?) while building + ;; crt1.o when we switch to nyacc 0.94. + ("nyacc" ,nyacc-0.86))) (native-inputs `(("guile" ,guile-2.2) ,@(let ((target-system (or (%current-target-system) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 827b7f800e..7d036ad473 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -371,15 +371,14 @@ authentication.") (define-public pidgin (package (name "pidgin") - (version "2.12.0") + (version "2.13.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pidgin/Pidgin/" - version "/" name "-" version ".tar.bz2")) + version "/pidgin-" version ".tar.bz2")) (sha256 - (base32 - "1y5p2mq3bfw35b66jsafmbva0w5gg1k99y9z8fyp3jfksqv3agcc")) + (base32 "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7")) (patches (search-patches "pidgin-add-search-path.patch")))) (build-system glib-or-gtk-build-system) (native-inputs @@ -403,13 +402,13 @@ authentication.") ;; TODO: gstreamer: patches needed to support gstreamer-1.0 or later ;; TODO: farstream ;; TODO: meanwhile - ;; TODO: network-manager ;; TODO: gtkspell ;; TODO: libxephyr ;; TODO: libgadu ("libxslt" ,libxslt) ("avahi" ,avahi) ("ncurses" ,ncurses) + ("network-manager" ,network-manager) ("sqlite" ,sqlite) ("libice" ,libice) ("libsm" ,libsm) @@ -420,7 +419,6 @@ authentication.") (list "--disable-gtkspell" "--disable-tcl" "--disable-meanwhile" - "--disable-nm" ; XXX remove when we have network-manager "--disable-vv" ; XXX remove when we have farstream and gstreamer "--disable-gstreamer" ; XXX patches needed to support gstreamer-1.0 "--enable-cyrus-sasl" @@ -433,7 +431,7 @@ authentication.") (files (list (string-append "lib/purple-" (version-major version)) "lib/pidgin"))))) - (home-page "http://www.pidgin.im/") + (home-page "https://www.pidgin.im/") (synopsis "Graphical multi-protocol instant messaging client") (description "Pidgin is a modular instant messaging client that supports many popular diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index a9e6e054e1..668045c5eb 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -91,7 +91,7 @@ interfacing MPD in the C, C++ & Objective C languages.") (define-public mpd (package (name "mpd") - (version "0.21.8") + (version "0.21.9") (source (origin (method url-fetch) (uri @@ -100,7 +100,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "/mpd-" version ".tar.xz")) (sha256 (base32 - "0mwpkbjsljj1khlnnjanvw3pgxbhsdl0bh2k9bxnpijn2gqq7q13")))) + "0ghda8g9q0bi6nrvl6n756d8f45spqpblkh77mnb4k9gmiv57qir")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'... diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 9ee5206b33..1c0a4f3982 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1315,16 +1315,16 @@ Editor. It is compatible with Power Tab Editor 1.7 and Guitar Pro.") (define-public jalv-select (package (name "jalv-select") - (version "0.8") + (version "1.3") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/brummer10/jalv_select.git") - (commit (string-append "V" version)))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0gqh768sbvn9ffyx1vqg9i57py9x9v4l65bk6wjsvgga4d7m83k1")))) + "15yanq1wra0hyh6x72ji7pk562iddg476g3vksj495x91zhnl6vm")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -1337,8 +1337,6 @@ Editor. It is compatible with Power Tab Editor 1.7 and Guitar Pro.") (substitute* "jalv.select.cpp" (("echo \\$PATH.*tr ':'.*xargs ls") (string-append "ls -1 " (assoc-ref inputs "jalv") "/bin"))) - (substitute* "jalv.select.h" - (("gtkmm.h") "gtkmm-2.4/gtkmm.h")) #t)) (add-before 'reset-gzip-timestamps 'make-manpages-writable (lambda* (#:key outputs #:allow-other-keys) @@ -3727,7 +3725,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke (define-public musescore (package (name "musescore") - (version "3.0.5") + (version "3.1") (source (origin (method git-fetch) (uri (git-reference @@ -3736,7 +3734,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke (file-name (git-file-name name version)) (sha256 (base32 - "1inf6zdyh6yspjv1i7g6rw9wn90vki1s2qgilkp0j4aphayj4mic")) + "07xkn8gnnqzhj9cn1li5qpm2rfm86bmxbbfd76i1jx4v999icn0j")) (modules '((guix build utils))) (snippet ;; Un-bundle OpenSSL and remove unused libraries. diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index bb11154978..2ea65f270c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1485,15 +1485,15 @@ procedure calls (RPCs).") (define-public openvswitch (package (name "openvswitch") - (version "2.10.1") + (version "2.11.1") (source (origin (method url-fetch) (uri (string-append - "http://openvswitch.org/releases/openvswitch-" + "https://www.openvswitch.org/releases/openvswitch-" version ".tar.gz")) (sha256 (base32 - "103wi6k8xal0z1pyy680gms56skagh6jawa2ja588ljr55jcg4sg")))) + "1p5mv44jaslvrr1ym15smqna19y0gi4vqcsyj58625vv9bj6laf1")))) (build-system gnu-build-system) (arguments '(;; FIXME: many tests fail with: @@ -1529,7 +1529,7 @@ procedure calls (RPCs).") `(("libcap-ng" ,libcap-ng) ("openssl" ,openssl))) (synopsis "Virtual network switch") - (home-page "http://www.openvswitch.org/") + (home-page "https://www.openvswitch.org/") (description "Open vSwitch is a multilayer virtual switch. It is designed to enable massive network automation through programmatic extension, while still diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 2772f56d9f..df59a42c74 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,14 +45,14 @@ (define-public node (package (name "node") - (version "9.11.1") + (version "10.15.3") (source (origin (method url-fetch) (uri (string-append "https://nodejs.org/dist/v" version - "/node-v" version ".tar.gz")) + "/node-v" version ".tar.xz")) (sha256 (base32 - "1vjh9zvw7wkdz6b0l99ya7mqjk0l8lbg9isr1q8rxwp400dhkk32")) + "1mcijznh481s44i59p571a38bfvcxm9f8x2l0l1005aly0kdj8jf")) (modules '((guix build utils))) (snippet `(begin @@ -83,18 +83,14 @@ "--shared-zlib" "--without-snapshot" "--with-intl=system-icu") + ;; Run only the CI tests. The default test target requires additional + ;; add-ons from NPM that are not distributed with the source. + #:test-target "test-ci-js" #:phases (modify-phases %standard-phases (add-before 'configure 'patch-files (lambda* (#:key inputs #:allow-other-keys) - ;; This phase is inherited by Node LTS, which does not have all - ;; the files listed here. Use this helper for convenience. - (define (delete-if-exists file) - (if (file-exists? file) - (delete-file file) - '())) - ;; Fix hardcoded /bin/sh references. (substitute* '("lib/child_process.js" "lib/internal/v8_prof_polyfill.js" @@ -110,17 +106,9 @@ (("'/usr/bin/env'") (string-append "'" (which "env") "'"))) - ;; FIXME: These tests depend on being able to install eslint. - ;; See https://github.com/nodejs/node/issues/17098. - (for-each delete-if-exists - '("test/parallel/test-eslint-alphabetize-errors.js" - "test/parallel/test-eslint-buffer-constructor.js" - "test/parallel/test-eslint-documented-errors.js" - "test/parallel/test-eslint-inspector-check.js")) - ;; FIXME: These tests fail in the build container, but they don't ;; seem to be indicative of real problems in practice. - (for-each delete-if-exists + (for-each delete-file '("test/async-hooks/test-ttywrap.readstream.js" "test/parallel/test-util-inspect.js" "test/parallel/test-v8-serdes.js" @@ -132,14 +120,13 @@ "test/parallel/test-net-listen-after-destroying-stdin.js" "test/parallel/test-npm-install.js" "test/sequential/test-child-process-emfile.js" - "test/sequential/test-benchmark-child-process.js" "test/sequential/test-http-regr-gh-2928.js")) ;; These tests have an expiry date: they depend on the validity of ;; TLS certificates that are bundled with the source. We want this ;; package to be reproducible forever, so remove those. ;; TODO: Regenerate certs instead. - (for-each delete-if-exists + (for-each delete-file '("test/parallel/test-tls-passphrase.js" "test/parallel/test-tls-server-verify.js")) #t)) @@ -184,9 +171,9 @@ `(("c-ares" ,c-ares) ("http-parser" ,http-parser) ("icu4c" ,icu4c) - ("libuv" ,libuv-1.19) + ("libuv" ,libuv) ("nghttp2" ,nghttp2 "lib") - ("openssl" ,openssl-1.0) + ("openssl" ,openssl) ("zlib" ,zlib))) (synopsis "Evented I/O for V8 JavaScript") (description "Node.js is a platform built on Chrome's JavaScript runtime @@ -197,16 +184,3 @@ devices.") (home-page "https://nodejs.org/") (license expat) (properties '((timeout . 3600))))) ; 1 h - -(define-public node-lts - (package - (inherit node) - (name "node-lts") - (version "8.12.0") - (source (origin - (inherit (package-source node)) - (uri (string-append "https://nodejs.org/dist/v" version - "/node-v" version ".tar.xz")) - (sha256 - (base32 - "16j1rrxkhmvpcw689ndw1raql1gz4jqn7n82z55zn63c05cgz7as")))))) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 338f98030a..bd66ab04aa 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -697,7 +697,8 @@ written in Objective Caml.") (lambda* (#:key outputs #:allow-other-keys) (format #t "~a~%" (find-files "." ".*.so")) (let ((stubdir (string-append (assoc-ref outputs "out") - "/lib/ocaml/site-lib"))) + "/lib/ocaml/site-lib/stublibs"))) + (delete-file stubdir) (mkdir-p stubdir) (install-file "src/dllnums.so" stubdir)) #t))))) @@ -1626,7 +1627,13 @@ spans without being subject to operating system calendar time adjustments.") "/lib/ocaml/site-lib/cmdliner")) #:phases (modify-phases %standard-phases - (delete 'configure)))) + (delete 'configure) + (add-before 'build 'fix-source-file-order + (lambda _ + (substitute* "build.ml" + (("Sys.readdir dir") + "let a = Sys.readdir dir in Array.sort String.compare a; a")) + #t))))) (home-page "http://erratique.ch/software/cmdliner") (synopsis "Declarative definition of command line interfaces for OCaml") (description "Cmdliner is a module for the declarative definition of command @@ -2290,6 +2297,12 @@ many additional enhancements, including: `(#:phases (modify-phases %standard-phases (delete 'check) ; tests are run by the build phase + (add-before 'build 'fix-nondeterminism + (lambda _ + (substitute* "setup.ml" + (("Sys.readdir dirname") + "let a = Sys.readdir dirname in Array.sort String.compare a; a")) + #t)) (replace 'build (lambda* (#:key inputs outputs #:allow-other-keys) (let ((files diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index a356a6dab7..e1e7d6a5a0 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -111,8 +111,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.0.1") - (commit "820429517f9cc8333704a839b4346ac4b02468c4") - (revision 1)) + (commit "4a54ed774913480c0f8dad3caf0cd627e4fa8ebf") + (revision 3)) (package (name "guix") @@ -128,7 +128,7 @@ (commit commit))) (sha256 (base32 - "1vfp7ps1k1cwn8p0gsgarlxcy982hzyvb7zqnj66jqd258a1qfgh")) + "14m4a4bn0d5hav6mrks5d7r223knx9dpswgbsc875wgr2921na2h")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -272,6 +272,7 @@ `(("bzip2" ,bzip2) ("gzip" ,gzip) ("zlib" ,zlib) ;for 'guix publish' + ("lzlib" ,lzlib) ;for 'guix publish' and 'guix substitute' ("sqlite" ,sqlite) ("libgcrypt" ,libgcrypt) @@ -547,13 +548,16 @@ transactions from C or Python.") (define-public diffoscope (package (name "diffoscope") - (version "114") + (version (git-version "115" "1" "7f3416ffd12572b42c814e43ac15cee44ef48155")) (source (origin - (method url-fetch) - (uri (pypi-uri name version)) + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/reproducible-builds/diffoscope.git") + (commit "7f3416ffd12572b42c814e43ac15cee44ef48155"))) + (file-name (git-file-name name version)) (sha256 (base32 - "07sma4izcqxdv0zi1s5fnsybvkc47c3vbpm372sg83q8l7rhizzp")))) + "1pn2rwlz5shdx7s63798wx2v7029bl5if6dlq3i2r6zsnpp0laki")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -589,7 +593,8 @@ transactions from C or Python.") #t)) (add-before 'check 'delete-failing-test (lambda _ - (delete-file "tests/test_tools.py") ;this requires /sbin to be on the path + ;; this requires /sbin to be on the path + (delete-file "tests/test_tools.py") #t))))) (inputs `(("rpm" ,rpm) ;for rpm-python ("python-file" ,python-file) @@ -598,11 +603,10 @@ transactions from C or Python.") ("python-tlsh" ,python-tlsh) ("acl" ,acl) ;for getfacl ("colordiff" ,colordiff) - ("xxd" ,xxd) - - ;; Below are modules used for tests. - ("python-pytest" ,python-pytest) - ("python-chardet" ,python-chardet))) + ("xxd" ,xxd))) + ;; Below are modules used for tests. + (native-inputs `(("python-pytest" ,python-pytest) + ("python-chardet" ,python-chardet))) (home-page "https://diffoscope.org/") (synopsis "Compare files, archives, and directories in depth") (description diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 2b844c9a1c..ed890f73c3 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -108,7 +108,7 @@ human.") (define-public keepassxc (package (name "keepassxc") - (version "2.4.1") + (version "2.4.2") (source (origin (method url-fetch) @@ -117,7 +117,7 @@ human.") version "-src.tar.xz")) (sha256 (base32 - "1aw9airx9z846p0xc0qjgy5hg35b8cxp57rvlq39n6wx4z8ppa8d")))) + "0f31lmpbkw0wrhq0qa4yw5b51bjv7vqp3ikr355qcm905456vyhm")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DWITH_XC_NETWORKING=YES" @@ -310,6 +310,15 @@ and vice versa.") (sha256 (base32 "1rimpjsdnmw8f5b7k558cic41p2qy2n2yrlqp5vh7mp4162hk0py")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-dict + (lambda* (#:key make-flags #:allow-other-keys) + (begin + (chmod (string-append "util/cracklib-format") #o755) + (apply invoke "make" "dict" make-flags) + #t)))))) (synopsis "Password checking library") (home-page "https://github.com/cracklib/cracklib") (description diff --git a/gnu/packages/patches/borg-fix-hard-link-preloading.patch b/gnu/packages/patches/borg-fix-hard-link-preloading.patch deleted file mode 100644 index 92a4e22674..0000000000 --- a/gnu/packages/patches/borg-fix-hard-link-preloading.patch +++ /dev/null @@ -1,157 +0,0 @@ -Fix a bug that would cause the test suite to hang: - -https://github.com/borgbackup/borg/issues/4350 - -Patch copied from upstream source repository: - -https://github.com/borgbackup/borg/commit/18242ab9e2f26c450b8507aa1d5eceadab8ad027 - -From 18242ab9e2f26c450b8507aa1d5eceadab8ad027 Mon Sep 17 00:00:00 2001 -From: Thomas Waldmann <tw@waldmann-edv.de> -Date: Thu, 2 May 2019 21:02:26 +0200 -Subject: [PATCH] preload chunks for hardlink slaves w/o preloaded master, - fixes #4350 - -also split the hardlink extraction test into 2 tests. - -(cherry picked from commit f33f318d816505161d1449a02ddfdeb97d6fe80a) ---- - src/borg/archive.py | 42 +++++++++++++++++++++++++++++----- - src/borg/archiver.py | 5 ++-- - src/borg/testsuite/archiver.py | 20 +++++++++------- - 3 files changed, 51 insertions(+), 16 deletions(-) - -diff --git a/src/borg/archive.py b/src/borg/archive.py -index adc1f42c..0793672a 100644 ---- a/src/borg/archive.py -+++ b/src/borg/archive.py -@@ -192,7 +192,7 @@ def __init__(self, repository, key): - self.repository = repository - self.key = key - -- def unpack_many(self, ids, filter=None, preload=False): -+ def unpack_many(self, ids, filter=None, partial_extract=False, preload=False, hardlink_masters=None): - """ - Return iterator of items. - -@@ -209,12 +209,40 @@ def unpack_many(self, ids, filter=None, preload=False): - for item in items: - if 'chunks' in item: - item.chunks = [ChunkListEntry(*e) for e in item.chunks] -+ -+ def preload(chunks): -+ self.repository.preload([c.id for c in chunks]) -+ - if filter: - items = [item for item in items if filter(item)] -+ - if preload: -- for item in items: -- if 'chunks' in item: -- self.repository.preload([c.id for c in item.chunks]) -+ if filter and partial_extract: -+ # if we do only a partial extraction, it gets a bit -+ # complicated with computing the preload items: if a hardlink master item is not -+ # selected (== not extracted), we will still need to preload its chunks if a -+ # corresponding hardlink slave is selected (== is extracted). -+ # due to a side effect of the filter() call, we now have hardlink_masters dict populated. -+ masters_preloaded = set() -+ for item in items: -+ if 'chunks' in item: # regular file, maybe a hardlink master -+ preload(item.chunks) -+ # if this is a hardlink master, remember that we already preloaded it: -+ if 'source' not in item and hardlinkable(item.mode) and item.get('hardlink_master', True): -+ masters_preloaded.add(item.path) -+ elif 'source' in item and hardlinkable(item.mode): # hardlink slave -+ source = item.source -+ if source not in masters_preloaded: -+ # we only need to preload *once* (for the 1st selected slave) -+ chunks, _ = hardlink_masters[source] -+ preload(chunks) -+ masters_preloaded.add(source) -+ else: -+ # easy: we do not have a filter, thus all items are selected, thus we need to preload all chunks. -+ for item in items: -+ if 'chunks' in item: -+ preload(item.chunks) -+ - for item in items: - yield item - -@@ -433,8 +461,10 @@ def item_filter(self, item, filter=None): - return False - return filter(item) if filter else True - -- def iter_items(self, filter=None, preload=False): -- for item in self.pipeline.unpack_many(self.metadata.items, preload=preload, -+ def iter_items(self, filter=None, partial_extract=False, preload=False, hardlink_masters=None): -+ assert not (filter and partial_extract and preload) or hardlink_masters is not None -+ for item in self.pipeline.unpack_many(self.metadata.items, partial_extract=partial_extract, -+ preload=preload, hardlink_masters=hardlink_masters, - filter=lambda item: self.item_filter(item, filter)): - yield item - -diff --git a/src/borg/archiver.py b/src/borg/archiver.py -index 957959d6..dcc20455 100644 ---- a/src/borg/archiver.py -+++ b/src/borg/archiver.py -@@ -755,7 +755,8 @@ def peek_and_store_hardlink_masters(item, matched): - else: - pi = None - -- for item in archive.iter_items(filter, preload=True): -+ for item in archive.iter_items(filter, partial_extract=partial_extract, -+ preload=True, hardlink_masters=hardlink_masters): - orig_path = item.path - if strip_components: - item.path = os.sep.join(orig_path.split(os.sep)[strip_components:]) -@@ -997,7 +998,7 @@ def item_to_tarinfo(item, original_path): - return None, stream - return tarinfo, stream - -- for item in archive.iter_items(filter, preload=True): -+ for item in archive.iter_items(filter, preload=True, hardlink_masters=hardlink_masters): - orig_path = item.path - if strip_components: - item.path = os.sep.join(orig_path.split(os.sep)[strip_components:]) -diff --git a/src/borg/testsuite/archiver.py b/src/borg/testsuite/archiver.py -index c35ad800..935b3d79 100644 ---- a/src/borg/testsuite/archiver.py -+++ b/src/borg/testsuite/archiver.py -@@ -823,7 +823,18 @@ def test_mount_hardlinks(self): - assert open('input/dir1/subdir/hardlink', 'rb').read() == b'123456' - - @requires_hardlinks -- def test_extract_hardlinks(self): -+ def test_extract_hardlinks1(self): -+ self._extract_hardlinks_setup() -+ with changedir('output'): -+ self.cmd('extract', self.repository_location + '::test') -+ assert os.stat('input/source').st_nlink == 4 -+ assert os.stat('input/abba').st_nlink == 4 -+ assert os.stat('input/dir1/hardlink').st_nlink == 4 -+ assert os.stat('input/dir1/subdir/hardlink').st_nlink == 4 -+ assert open('input/dir1/subdir/hardlink', 'rb').read() == b'123456' -+ -+ @requires_hardlinks -+ def test_extract_hardlinks2(self): - self._extract_hardlinks_setup() - with changedir('output'): - self.cmd('extract', self.repository_location + '::test', '--strip-components', '2') -@@ -839,13 +850,6 @@ def test_extract_hardlinks(self): - assert open('input/dir1/subdir/hardlink', 'rb').read() == b'123456' - assert os.stat('input/dir1/aaaa').st_nlink == 2 - assert os.stat('input/dir1/source2').st_nlink == 2 -- with changedir('output'): -- self.cmd('extract', self.repository_location + '::test') -- assert os.stat('input/source').st_nlink == 4 -- assert os.stat('input/abba').st_nlink == 4 -- assert os.stat('input/dir1/hardlink').st_nlink == 4 -- assert os.stat('input/dir1/subdir/hardlink').st_nlink == 4 -- assert open('input/dir1/subdir/hardlink', 'rb').read() == b'123456' - - def test_extract_include_exclude(self): - self.cmd('init', '--encryption=repokey', self.repository_location) --- -2.21.0 - diff --git a/gnu/packages/patches/emacs-realgud-fix-configure-ac.patch b/gnu/packages/patches/emacs-realgud-fix-configure-ac.patch deleted file mode 100644 index 8165857c87..0000000000 --- a/gnu/packages/patches/emacs-realgud-fix-configure-ac.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a293690f29407ac54a218d6d20c2142e1a0319d1 Mon Sep 17 00:00:00 2001 -From: Maxim Cournoyer <maxim.cournoyer@gmail.com> -Date: Wed, 31 Oct 2018 00:08:34 -0400 -Subject: [PATCH] configure.ac: Fix NO_CHECK_EMACS_PACKAGES elisp. - -Remove the extraneous trailing parenthesis. ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index de0d932..69bcea7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,8 +25,7 @@ AC_MSG_NOTICE("Checking prerequiste packages") - $EMACS -batch -q --no-site-file -eval \ - '(dolist (package - (quote (cl-lib loc-changes load-relative test-simple))) -- (require package)) -- )' -+ (require package))' - fi - if test $? -ne 0 ; then - AC_MSG_ERROR([Can't continue until above error is corrected.]) --- -2.19.0 - diff --git a/gnu/packages/patches/gnucash-fix-test-transaction-failure.patch b/gnu/packages/patches/gnucash-fix-test-transaction-failure.patch deleted file mode 100644 index 7b1b29f06c..0000000000 --- a/gnu/packages/patches/gnucash-fix-test-transaction-failure.patch +++ /dev/null @@ -1,54 +0,0 @@ -# This patch was submitted upstream to: https://bugs.gnucash.org/show_bug.cgi?id=797008. -From c20d74bebca516d0e391724202aad511967fe109 Mon Sep 17 00:00:00 2001 -From: Maxim Cournoyer <maxim.cournoyer@gmail.com> -Date: Wed, 2 Jan 2019 14:46:28 -0500 -Subject: [PATCH] tests: Fix a test failure in test-transaction.scm. - -With the New Year upon us, a test which was hard-coded to use 2018 now -failed. - -Fixes issue #797008 (see: -https://bugs.gnucash.org/show_bug.cgi?id=797008). - -* gnucash/report/standard-reports/test/test-transaction.scm: -(trep-tests): Use the current year in the test string instead of a -static one. ---- - gnucash/report/standard-reports/test/test-transaction.scm | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/gnucash/report/standard-reports/test/test-transaction.scm b/gnucash/report/standard-reports/test/test-transaction.scm -index 755aba298..ae3fbd5c1 100644 ---- a/gnucash/report/standard-reports/test/test-transaction.scm -+++ b/gnucash/report/standard-reports/test/test-transaction.scm -@@ -5,6 +5,7 @@ - (use-modules (gnucash report stylesheets)) - (use-modules (gnucash report report-system)) - (use-modules (gnucash report report-system test test-extras)) -+(use-modules (srfi srfi-19)) - (use-modules (srfi srfi-64)) - (use-modules (gnucash engine test srfi64-extras)) - (use-modules (sxml simple)) -@@ -643,7 +644,8 @@ - (set-option! options "General" "Show original currency amount" #t) - (set-option! options "Sorting" "Primary Key" 'date) - (set-option! options "Sorting" "Primary Subtotal for Date Key" 'none) -- (let* ((sxml (options->sxml options "dual columns"))) -+ (let* ((sxml (options->sxml options "dual columns")) -+ (current-year (date->string (current-date) "~y"))) - (test-equal "dual amount column, with original currency headers" - (list "Date" "Num" "Description" "Memo/Notes" "Account" - "Debit (USD)" "Credit (USD)" "Debit" "Credit") -@@ -652,7 +654,8 @@ - (list "Grand Total" "$2,280.00" "$2,280.00") - (get-row-col sxml -1 #f)) - (test-equal "dual amount column, first transaction correct" -- (list "01/03/18" "$103 income" "Root.Asset.Bank" "$103.00" "$103.00") -+ (list (string-append "01/03/" current-year) "$103 income" -+ "Root.Asset.Bank" "$103.00" "$103.00") - (get-row-col sxml 1 #f))) - ) - --- -2.19.0 - diff --git a/gnu/packages/patches/gtksourceview-2-add-default-directory.patch b/gnu/packages/patches/gtksourceview-2-add-default-directory.patch new file mode 100644 index 0000000000..c4b5052b81 --- /dev/null +++ b/gnu/packages/patches/gtksourceview-2-add-default-directory.patch @@ -0,0 +1,33 @@ +From fc401acb15f15d487c942437b6fb429289dd3c67 Mon Sep 17 00:00:00 2001 +From: Julien Lepiller <julien@lepiller.eu> +Date: Fri, 31 May 2019 13:22:25 +0200 +Subject: [PATCH] Add installation directory as a default directory. + +In Guix, this library is installed in a separate directory in the store, +and it's typically not installed system-wide in a fixed directory. Add +the store path to the set of default directories so dependents can find +default langs and source highlighting scheme. +--- + gtksourceview/gtksourceview-utils.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/gtksourceview/gtksourceview-utils.c b/gtksourceview/gtksourceview-utils.c +index 6f06bab..c3467d5 100644 +--- a/gtksourceview/gtksourceview-utils.c ++++ b/gtksourceview/gtksourceview-utils.c +@@ -66,6 +66,12 @@ _gtk_source_view_get_default_dirs (const char *basename, + basename, + NULL)); + ++ /* installed dir */ ++ g_ptr_array_add (dirs, g_build_filename (DATADIR, ++ SOURCEVIEW_DIR, ++ basename, ++ NULL)); ++ + g_ptr_array_add (dirs, NULL); + + return (gchar**) g_ptr_array_free (dirs, FALSE); +-- +2.21.0 + diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index 2a11bf0b70..7d4f774c83 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -3,10 +3,10 @@ in a snippet without network access. After this patch is applied, some additional changes will be made using 'substitute*'. diff --git a/makeicecat b/makeicecat -index aa46b94..db27a86 100644 +index 5a4390b..fcfa143 100644 --- a/makeicecat +++ b/makeicecat -@@ -36,75 +36,75 @@ export DEBFULLNAME="Ruben Rodriguez" +@@ -29,55 +29,55 @@ SOURCEDIR=icecat-$FFVERSION DATA="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/data @@ -25,6 +25,7 @@ index aa46b94..db27a86 100644 -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 24C6F355 -gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc +-echo -n 0a5f0c1d8d1e9443d85083d37fec32e5cc15c1001ea992d49745490065b4a023 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - - -echo Extracting Firefox tarball -tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -36,6 +37,7 @@ index aa46b94..db27a86 100644 +# 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 24C6F355 +# gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc ++# echo -n 0a5f0c1d8d1e9443d85083d37fec32e5cc15c1001ea992d49745490065b4a023 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +# +# echo Extracting Firefox tarball +# tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -43,43 +45,6 @@ index aa46b94..db27a86 100644 +# mv firefox-${FFVERSION} $SOURCEDIR ############################################################################### - # Retrieve /debian from Ubuntu - ############################################################################### - --rm -rf firefox.$CODENAME --bzr branch https://code.launchpad.net/~mozillateam/firefox/firefox.$CODENAME --cd firefox.$CODENAME --bzr revert -r$REVISION --echo '3.0 (native)' > debian/source/format -- --for PATCH in ubuntu-bookmarks.patch ubuntu-ua-string-changes.patch unity-menubar.patch ubuntu-search-defaults.patch fix-make-package-tests-without-webrtc.patch revert-upstream-search-engine-changes.patch --do -- rm debian/patches/$PATCH -- sed "/$PATCH/d" -i debian/patches/series --done --sed "/test-/d" -i debian/patches/series --cd .. -- --mv firefox.$CODENAME/debian $SOURCEDIR --rm -rf firefox.$CODENAME -+# rm -rf firefox.$CODENAME -+# bzr branch https://code.launchpad.net/~mozillateam/firefox/firefox.$CODENAME -+# cd firefox.$CODENAME -+# bzr revert -r$REVISION -+# echo '3.0 (native)' > debian/source/format -+# -+# for PATCH in ubuntu-bookmarks.patch ubuntu-ua-string-changes.patch unity-menubar.patch ubuntu-search-defaults.patch fix-make-package-tests-without-webrtc.patch revert-upstream-search-engine-changes.patch -+# do -+# rm debian/patches/$PATCH -+# sed "/$PATCH/d" -i debian/patches/series -+# done -+# sed "/test-/d" -i debian/patches/series -+# cd .. -+# -+# mv firefox.$CODENAME/debian $SOURCEDIR -+# rm -rf firefox.$CODENAME - - ############################################################################### # Retrieve l10n ############################################################################### @@ -133,19 +98,10 @@ index aa46b94..db27a86 100644 #for patch in $DATA/patches/*; do # echo Patching with file: $patch -@@ -720,7 +720,7 @@ debian/rules debian/control - touch -d "yesterday" debian/control - debian/rules debian/control - --echo | dch -b -D stable -v "$ICECATVERSION" "Converted into IceCat (http://www.gnu.org/software/gnuzilla/)" -+# echo | dch -b -D stable -v "$ICECATVERSION" "Converted into IceCat (http://www.gnu.org/software/gnuzilla/)" - sed "1s/firefox/icecat/" -i debian/changelog - - touch configure js/src/configure -@@ -734,6 +734,6 @@ sed 's/777/755/;' -i toolkit/crashreporter/google-breakpad/Makefile.in +@@ -590,6 +590,6 @@ sed 's/777/755/;' -i toolkit/crashreporter/google-breakpad/Makefile.in + # Fix CVE-2012-3386 /bin/sed 's/chmod a+w/chmod u+w/' -i ./js/src/ctypes/libffi/Makefile.in ./toolkit/crashreporter/google-breakpad/Makefile.in ./toolkit/crashreporter/google-breakpad/src/third_party/glog/Makefile.in || true - -cd .. -echo Packaging tarball -tar cfj icecat-$ICECATVERSION.tar.bz2 $SOURCEDIR diff --git a/gnu/packages/patches/libevent-2.0-CVE-2016-10195.patch b/gnu/packages/patches/libevent-2.0-CVE-2016-10195.patch deleted file mode 100644 index bffe2c454c..0000000000 --- a/gnu/packages/patches/libevent-2.0-CVE-2016-10195.patch +++ /dev/null @@ -1,41 +0,0 @@ -Fix CVE-2016-10195 (buffer overread in libevent's DNS code): - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-10195 -https://github.com/libevent/libevent/issues/317 - -Patch copied from upstream source repository: - -https://github.com/libevent/libevent/commit/96f64a022014a208105ead6c8a7066018449d86d - -From 3c570970516f48da35f42fef98276531fcc0abaa Mon Sep 17 00:00:00 2001 -From: Azat Khuzhin <a3at.mail@gmail.com> -Date: Mon, 1 Feb 2016 17:32:09 +0300 -Subject: [PATCH] evdns: name_parse(): fix remote stack overread - ---- - evdns.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/evdns.c b/evdns.c -index 60b10485..137c24ea 100644 ---- a/evdns.c -+++ b/evdns.c -@@ -960,7 +960,6 @@ name_parse(u8 *packet, int length, int *idx, char *name_out, int name_out_len) { - - for (;;) { - u8 label_len; -- if (j >= length) return -1; - GET8(label_len); - if (!label_len) break; - if (label_len & 0xc0) { -@@ -981,6 +980,7 @@ name_parse(u8 *packet, int length, int *idx, char *name_out, int name_out_len) { - *cp++ = '.'; - } - if (cp + label_len >= end) return -1; -+ if (j + label_len > length) return -1; - memcpy(cp, packet + j, label_len); - cp += label_len; - j += label_len; --- -2.11.0 - diff --git a/gnu/packages/patches/libevent-2.0-CVE-2016-10196.patch b/gnu/packages/patches/libevent-2.0-CVE-2016-10196.patch deleted file mode 100644 index 03f96e938b..0000000000 --- a/gnu/packages/patches/libevent-2.0-CVE-2016-10196.patch +++ /dev/null @@ -1,41 +0,0 @@ -Fix CVE-2016-10196 (buffer overflow in evutil): - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-10196 -https://github.com/libevent/libevent/issues/318 - -Patch copied from upstream source repository: - -https://github.com/libevent/libevent/commit/329acc18a0768c21ba22522f01a5c7f46cacc4d5 - -From 28bdc2f3f62259d21ccaf7be2b60ef0a53e6f342 Mon Sep 17 00:00:00 2001 -From: Azat Khuzhin <a3at.mail@gmail.com> -Date: Sun, 31 Jan 2016 00:57:16 +0300 -Subject: [PATCH] evutil_parse_sockaddr_port(): fix buffer overflow - ---- - evutil.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/evutil.c b/evutil.c -index 33445170..e2dfe6e4 100644 ---- a/evutil.c -+++ b/evutil.c -@@ -1808,12 +1808,12 @@ evutil_parse_sockaddr_port(const char *ip_as_string, struct sockaddr *out, int * - - cp = strchr(ip_as_string, ':'); - if (*ip_as_string == '[') { -- int len; -+ size_t len; - if (!(cp = strchr(ip_as_string, ']'))) { - return -1; - } -- len = (int) ( cp-(ip_as_string + 1) ); -- if (len > (int)sizeof(buf)-1) { -+ len = ( cp-(ip_as_string + 1) ); -+ if (len > sizeof(buf)-1) { - return -1; - } - memcpy(buf, ip_as_string+1, len); --- -2.11.0 - diff --git a/gnu/packages/patches/libevent-2.0-CVE-2016-10197.patch b/gnu/packages/patches/libevent-2.0-CVE-2016-10197.patch deleted file mode 100644 index c62a328627..0000000000 --- a/gnu/packages/patches/libevent-2.0-CVE-2016-10197.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix CVE-2016-10197 (out of bounds read on empty hostnames in evdns): - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-10197 -https://github.com/libevent/libevent/issues/332 - -Patch copied from upstream source repository: - -https://github.com/libevent/libevent/commit/ec65c42052d95d2c23d1d837136d1cf1d9ecef9e - -From a0305cec166a5bc89f1eb362510cc4cd25ecc0bc Mon Sep 17 00:00:00 2001 -From: Azat Khuzhin <a3at.mail@gmail.com> -Date: Fri, 25 Mar 2016 00:33:47 +0300 -Subject: [PATCH] evdns: fix searching empty hostnames - ---- - evdns.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/evdns.c b/evdns.c -index 137c24ea..6191c677 100644 ---- a/evdns.c -+++ b/evdns.c -@@ -3122,9 +3122,12 @@ search_set_from_hostname(struct evdns_base *base) { - static char * - search_make_new(const struct search_state *const state, int n, const char *const base_name) { - const size_t base_len = strlen(base_name); -- const char need_to_append_dot = base_name[base_len - 1] == '.' ? 0 : 1; -+ char need_to_append_dot; - struct search_domain *dom; - -+ if (!base_len) return NULL; -+ need_to_append_dot = base_name[base_len - 1] == '.' ? 0 : 1; -+ - for (dom = state->head; dom; dom = dom->next) { - if (!n--) { - /* this is the postfix we want */ --- -2.11.0 - diff --git a/gnu/packages/patches/libevent-2.0-evbuffer-add-use-last-with-datap.patch b/gnu/packages/patches/libevent-2.0-evbuffer-add-use-last-with-datap.patch deleted file mode 100644 index 0253700bf6..0000000000 --- a/gnu/packages/patches/libevent-2.0-evbuffer-add-use-last-with-datap.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a8769ef12d7e223e33fc47bed03fba2bfa2f3536 Mon Sep 17 00:00:00 2001 -From: Marcus Sundberg <marcus@marcussundberg.com> -Date: Sat, 26 Mar 2016 20:11:43 +0100 -Subject: [PATCH] evbuffer_add: Use last_with_datap if set, not last. - -evbuffer_add() would always put data in the last chain, even if there -was available space in a previous chain, and in doing so it also -failed to update last_with_datap, causing subsequent calls to other -functions that do look at last_with_datap to add data in the middle -of the evbuffer instead of at the end. - -Fixes the evbuffer_add() part of issue #335, and the evbuffer/add2 and -evbuffer/add3 tests, and also prevents wasting space available in the -chain pointed to by last_with_datap. ---- - buffer.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/buffer.c b/buffer.c -index 7cca0e8a..f378b731 100644 ---- a/buffer.c -+++ b/buffer.c -@@ -1732,7 +1732,11 @@ evbuffer_add(struct evbuffer *buf, const void *data_in, size_t datlen) - goto done; - } - -- chain = buf->last; -+ if (*buf->last_with_datap == NULL) { -+ chain = buf->last; -+ } else { -+ chain = *buf->last_with_datap; -+ } - - /* If there are no chains allocated for this buffer, allocate one - * big enough to hold all the data. */ --- -2.12.0 - diff --git a/gnu/packages/patches/libevent-2.1-dns-tests.patch b/gnu/packages/patches/libevent-2.1-dns-tests.patch deleted file mode 100644 index 091752a49d..0000000000 --- a/gnu/packages/patches/libevent-2.1-dns-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -Disable tests that rely on usable DNS lookups, which aren't available -in build chroots. - ---- libevent-2.0.21-stable/test/regress_dns.c 2013-01-20 22:32:09.000000000 +0100 -+++ libevent-2.0.21-stable/test/regress_dns.c 2013-01-20 22:32:30.000000000 +0100 -@@ -2120,10 +2120,6 @@ - - struct testcase_t dns_testcases[] = { - DNS_LEGACY(server, TT_FORK|TT_NEED_BASE), -- DNS_LEGACY(gethostbyname, TT_FORK|TT_NEED_BASE|TT_NEED_DNS|TT_OFF_BY_DEFAULT), -- DNS_LEGACY(gethostbyname6, TT_FORK|TT_NEED_BASE|TT_NEED_DNS|TT_OFF_BY_DEFAULT), -- DNS_LEGACY(gethostbyaddr, TT_FORK|TT_NEED_BASE|TT_NEED_DNS|TT_OFF_BY_DEFAULT), -- { "resolve_reverse", dns_resolve_reverse, TT_FORK|TT_OFF_BY_DEFAULT, NULL, NULL }, - { "search_empty", dns_search_empty_test, TT_FORK|TT_NEED_BASE, &basic_setup, NULL }, - { "search", dns_search_test, TT_FORK|TT_NEED_BASE, &basic_setup, NULL }, - { "search_lower", dns_search_lower_test, TT_FORK|TT_NEED_BASE, &basic_setup, NULL }, -@@ -2163,9 +2159,6 @@ - - { "client_fail_requests", dns_client_fail_requests_test, - TT_FORK|TT_NEED_BASE, &basic_setup, NULL }, -- { "client_fail_requests_getaddrinfo", -- dns_client_fail_requests_getaddrinfo_test, -- TT_FORK|TT_NEED_BASE, &basic_setup, NULL }, - - END_OF_TESTCASES - }; diff --git a/gnu/packages/patches/libevent-2.1-skip-failing-test.patch b/gnu/packages/patches/libevent-2.1-skip-failing-test.patch deleted file mode 100644 index d9ea1d422d..0000000000 --- a/gnu/packages/patches/libevent-2.1-skip-failing-test.patch +++ /dev/null @@ -1,24 +0,0 @@ -These fail on 32-bit due to an overflow bug in the test program. - -See test/regress_util.c:1448. - -Upstream bug URL: - -https://github.com/libevent/libevent/issues/452 - -diff --git a/test/regress_util.c b/test/regress_util.c -index ef6a1487..4de501fc 100644 ---- a/test/regress_util.c -+++ b/test/regress_util.c -@@ -1413,9 +1413,9 @@ static struct date_rfc1123_case { - { 1323648000, "Mon, 12 Dec 2011 00:00:00 GMT"}, - #ifndef _WIN32 - /** In win32 case we have max "23:59:59 January 18, 2038, UTC" for time32 */ -- { 4294967296, "Sun, 07 Feb 2106 06:28:16 GMT"} /* 2^32 */, -+ //{ 4294967296, "Sun, 07 Feb 2106 06:28:16 GMT"} /* 2^32 */, - /** In win32 case we have max "23:59:59, December 31, 3000, UTC" for time64 */ -- {253402300799, "Fri, 31 Dec 9999 23:59:59 GMT"} /* long long future no one can imagine */, -+ //{253402300799, "Fri, 31 Dec 9999 23:59:59 GMT"} /* long long future no one can imagine */, - { 1456704000, "Mon, 29 Feb 2016 00:00:00 GMT"} /* leap year */, - #endif - { 1435708800, "Wed, 01 Jul 2015 00:00:00 GMT"} /* leap second */, diff --git a/gnu/packages/patches/libevent-dns-tests.patch b/gnu/packages/patches/libevent-dns-tests.patch deleted file mode 100644 index 6ff8aaaa7b..0000000000 --- a/gnu/packages/patches/libevent-dns-tests.patch +++ /dev/null @@ -1,16 +0,0 @@ -Disable tests that rely on usable DNS lookups, which aren't available -in build chroots. - ---- libevent-2.0.21-stable/test/regress_dns.c 2013-01-20 22:32:09.000000000 +0100 -+++ libevent-2.0.21-stable/test/regress_dns.c 2013-01-20 22:32:30.000000000 +0100 -@@ -1827,10 +1827,6 @@ end: - - struct testcase_t dns_testcases[] = { - DNS_LEGACY(server, TT_FORK|TT_NEED_BASE), -- DNS_LEGACY(gethostbyname, TT_FORK|TT_NEED_BASE|TT_NEED_DNS), -- DNS_LEGACY(gethostbyname6, TT_FORK|TT_NEED_BASE|TT_NEED_DNS), -- DNS_LEGACY(gethostbyaddr, TT_FORK|TT_NEED_BASE|TT_NEED_DNS), -- { "resolve_reverse", dns_resolve_reverse, TT_FORK, NULL, NULL }, - { "search", dns_search_test, TT_FORK|TT_NEED_BASE, &basic_setup, NULL }, - { "search_cancel", dns_search_cancel_test, - TT_FORK|TT_NEED_BASE, &basic_setup, NULL }, diff --git a/gnu/packages/patches/polkit-CVE-2018-19788.patch b/gnu/packages/patches/polkit-CVE-2018-19788.patch deleted file mode 100644 index 58cde6c5dc..0000000000 --- a/gnu/packages/patches/polkit-CVE-2018-19788.patch +++ /dev/null @@ -1,197 +0,0 @@ -Fix CVE-2018-19788: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-19788 -https://gitlab.freedesktop.org/polkit/polkit/issues/74 - -Patch copied from upstream source repository: - -https://gitlab.freedesktop.org/polkit/polkit/commit/2cb40c4d5feeaa09325522bd7d97910f1b59e379 - -From 2cb40c4d5feeaa09325522bd7d97910f1b59e379 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> -Date: Mon, 3 Dec 2018 10:28:58 +0100 -Subject: [PATCH] Allow negative uids/gids in PolkitUnixUser and Group objects - -(uid_t) -1 is still used as placeholder to mean "unset". This is OK, since -there should be no users with such number, see -https://systemd.io/UIDS-GIDS#special-linux-uids. - -(uid_t) -1 is used as the default value in class initialization. - -When a user or group above INT32_MAX is created, the numeric uid or -gid wraps around to negative when the value is assigned to gint, and -polkit gets confused. Let's accept such gids, except for -1. - -A nicer fix would be to change the underlying type to e.g. uint32 to -not have negative values. But this cannot be done without breaking the -API, so likely new functions will have to be added (a -polkit_unix_user_new variant that takes a unsigned, and the same for -_group_new, _set_uid, _get_uid, _set_gid, _get_gid, etc.). This will -require a bigger patch. - -Fixes https://gitlab.freedesktop.org/polkit/polkit/issues/74. ---- - src/polkit/polkitunixgroup.c | 15 +++++++++++---- - src/polkit/polkitunixprocess.c | 12 ++++++++---- - src/polkit/polkitunixuser.c | 13 ++++++++++--- - 3 files changed, 29 insertions(+), 11 deletions(-) - -diff --git a/src/polkit/polkitunixgroup.c b/src/polkit/polkitunixgroup.c -index c57a1aa..309f689 100644 ---- a/src/polkit/polkitunixgroup.c -+++ b/src/polkit/polkitunixgroup.c -@@ -71,6 +71,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixGroup, polkit_unix_group, G_TYPE_OBJECT, - static void - polkit_unix_group_init (PolkitUnixGroup *unix_group) - { -+ unix_group->gid = -1; /* (git_t) -1 is not a valid GID under Linux */ - } - - static void -@@ -100,11 +101,14 @@ polkit_unix_group_set_property (GObject *object, - GParamSpec *pspec) - { - PolkitUnixGroup *unix_group = POLKIT_UNIX_GROUP (object); -+ gint val; - - switch (prop_id) - { - case PROP_GID: -- unix_group->gid = g_value_get_int (value); -+ val = g_value_get_int (value); -+ g_return_if_fail (val != -1); -+ unix_group->gid = val; - break; - - default: -@@ -131,9 +135,9 @@ polkit_unix_group_class_init (PolkitUnixGroupClass *klass) - g_param_spec_int ("gid", - "Group ID", - "The UNIX group ID", -- 0, -+ G_MININT, - G_MAXINT, -- 0, -+ -1, - G_PARAM_CONSTRUCT | - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | -@@ -166,9 +170,10 @@ polkit_unix_group_get_gid (PolkitUnixGroup *group) - */ - void - polkit_unix_group_set_gid (PolkitUnixGroup *group, -- gint gid) -+ gint gid) - { - g_return_if_fail (POLKIT_IS_UNIX_GROUP (group)); -+ g_return_if_fail (gid != -1); - group->gid = gid; - } - -@@ -183,6 +188,8 @@ polkit_unix_group_set_gid (PolkitUnixGroup *group, - PolkitIdentity * - polkit_unix_group_new (gint gid) - { -+ g_return_val_if_fail (gid != -1, NULL); -+ - return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_GROUP, - "gid", gid, - NULL)); -diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c -index 972b777..b02b258 100644 ---- a/src/polkit/polkitunixprocess.c -+++ b/src/polkit/polkitunixprocess.c -@@ -159,9 +159,14 @@ polkit_unix_process_set_property (GObject *object, - polkit_unix_process_set_pid (unix_process, g_value_get_int (value)); - break; - -- case PROP_UID: -- polkit_unix_process_set_uid (unix_process, g_value_get_int (value)); -+ case PROP_UID: { -+ gint val; -+ -+ val = g_value_get_int (value); -+ g_return_if_fail (val != -1); -+ polkit_unix_process_set_uid (unix_process, val); - break; -+ } - - case PROP_START_TIME: - polkit_unix_process_set_start_time (unix_process, g_value_get_uint64 (value)); -@@ -239,7 +244,7 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) - g_param_spec_int ("uid", - "User ID", - "The UNIX user ID", -- -1, -+ G_MININT, - G_MAXINT, - -1, - G_PARAM_CONSTRUCT | -@@ -303,7 +308,6 @@ polkit_unix_process_set_uid (PolkitUnixProcess *process, - gint uid) - { - g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process)); -- g_return_if_fail (uid >= -1); - process->uid = uid; - } - -diff --git a/src/polkit/polkitunixuser.c b/src/polkit/polkitunixuser.c -index 8bfd3a1..234a697 100644 ---- a/src/polkit/polkitunixuser.c -+++ b/src/polkit/polkitunixuser.c -@@ -72,6 +72,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixUser, polkit_unix_user, G_TYPE_OBJECT, - static void - polkit_unix_user_init (PolkitUnixUser *unix_user) - { -+ unix_user->uid = -1; /* (uid_t) -1 is not a valid UID under Linux */ - unix_user->name = NULL; - } - -@@ -112,11 +113,14 @@ polkit_unix_user_set_property (GObject *object, - GParamSpec *pspec) - { - PolkitUnixUser *unix_user = POLKIT_UNIX_USER (object); -+ gint val; - - switch (prop_id) - { - case PROP_UID: -- unix_user->uid = g_value_get_int (value); -+ val = g_value_get_int (value); -+ g_return_if_fail (val != -1); -+ unix_user->uid = val; - break; - - default: -@@ -144,9 +148,9 @@ polkit_unix_user_class_init (PolkitUnixUserClass *klass) - g_param_spec_int ("uid", - "User ID", - "The UNIX user ID", -- 0, -+ G_MININT, - G_MAXINT, -- 0, -+ -1, - G_PARAM_CONSTRUCT | - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | -@@ -182,6 +186,7 @@ polkit_unix_user_set_uid (PolkitUnixUser *user, - gint uid) - { - g_return_if_fail (POLKIT_IS_UNIX_USER (user)); -+ g_return_if_fail (uid != -1); - user->uid = uid; - } - -@@ -196,6 +201,8 @@ polkit_unix_user_set_uid (PolkitUnixUser *user, - PolkitIdentity * - polkit_unix_user_new (gint uid) - { -+ g_return_val_if_fail (uid != -1, NULL); -+ - return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_USER, - "uid", uid, - NULL)); --- -2.18.1 - diff --git a/gnu/packages/patches/racket-store-checksum-override.patch b/gnu/packages/patches/racket-store-checksum-override.patch index 6c9cd5198a..236c843de1 100644 --- a/gnu/packages/patches/racket-store-checksum-override.patch +++ b/gnu/packages/patches/racket-store-checksum-override.patch @@ -7,12 +7,8 @@ because the store is immutable. This patch makes Racket ignore checksums for files in the store. See <https://debbugs.gnu.org/30680> for details. ---- - collects/compiler/private/cm-minimal.rkt | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) -diff --git a/collects/compiler/private/cm-minimal.rkt b/collects/compiler/private/cm-minimal.rkt -index a5a5407..15af6b8 100644 +--- --- a/collects/compiler/private/cm-minimal.rkt +++ b/collects/compiler/private/cm-minimal.rkt @@ -7,6 +7,7 @@ @@ -20,10 +16,10 @@ index a5a5407..15af6b8 100644 racket/path racket/promise + racket/string - openssl/sha1 + file/sha1 setup/collects - compiler/compilation-path -@@ -543,6 +544,10 @@ + setup/cross-system +@@ -940,6 +941,10 @@ #f (list src-hash recorded-hash))) @@ -34,16 +30,13 @@ index a5a5407..15af6b8 100644 (define (rkt->ss p) (if (path-has-extension? p #".rkt") (path-replace-extension p #".ss") -@@ -595,7 +600,8 @@ - (trace-printf "newer src... ~a > ~a" path-time path-zo-time) - ;; If `sha1-only?', then `maybe-compile-zo' returns a #f or thunk: - (maybe-compile-zo sha1-only? deps path->mode roots path orig-path read-src-syntax up-to-date collection-cache new-seen)] -- [(different-source-sha1-and-dep-recorded path deps) -+ [(and (not (store-reference? path)) -+ (different-source-sha1-and-dep-recorded path deps)) - => (lambda (difference) - (trace-printf "different src hash... ~a" difference) - ;; If `sha1-only?', then `maybe-compile-zo' returns a #f or thunk: --- -2.18.0 - +@@ -1015,6 +1020,7 @@ + (trace-printf "newer src... ~a > ~a" path-time path-zo-time) + (maybe-compile-zo deps path->mode roots path orig-path read-src-syntax up-to-date collection-cache new-seen + #:trying-sha1? sha1-only?)] +- [(different-source-sha1-and-dep-recorded path deps) ++ [(and (not (store-reference? path)) ++ (different-source-sha1-and-dep-recorded path deps)) + => (lambda (difference) + (trace-printf "different src hash ~a for ~a..." difference path) + (maybe-compile-zo deps path->mode roots path orig-path read-src-syntax up-to-date collection-cache new-seen \ No newline at end of file diff --git a/gnu/packages/patches/supertux-fix-build-with-gcc5.patch b/gnu/packages/patches/supertux-fix-build-with-gcc5.patch new file mode 100644 index 0000000000..6393215ca1 --- /dev/null +++ b/gnu/packages/patches/supertux-fix-build-with-gcc5.patch @@ -0,0 +1,75 @@ +Taken from https://github.com/SuperTux/supertux/commit/a75317ef0a94847d9b6a7833b9c6652ef29edde3. +This patch fixes building with gcc versions earlier than 6. + +From a75317ef0a94847d9b6a7833b9c6652ef29edde3 Mon Sep 17 00:00:00 2001 +From: Ingo Ruhnke <grumbel@gmail.com> +Date: Fri, 28 Dec 2018 22:45:35 +0100 +Subject: [PATCH] Add workaround for backwards compatibilty with gcc5 + +Fixes #1014 +--- + src/video/gl/gl_painter.cpp | 11 ++++++----- + src/video/ttf_surface.cpp | 16 +++++++++------- + 2 files changed, 15 insertions(+), 12 deletions(-) + +diff --git a/src/video/gl/gl_painter.cpp b/src/video/gl/gl_painter.cpp +index 5e0d1e7b1e..32fb7a09b6 100644 +--- a/src/video/gl/gl_painter.cpp ++++ b/src/video/gl/gl_painter.cpp +@@ -37,12 +37,13 @@ namespace { + + inline std::tuple<GLenum, GLenum> blend_factor(Blend blend) + { ++ using B = std::tuple<GLenum, GLenum>; + switch(blend) { +- case Blend::NONE: return {GL_ONE, GL_ZERO}; +- case Blend::BLEND: return {GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA}; +- case Blend::ADD: return {GL_SRC_ALPHA, GL_ONE}; +- case Blend::MOD: return {GL_DST_COLOR, GL_ZERO}; +- default: return {GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA}; ++ case Blend::NONE: return B(GL_ONE, GL_ZERO); ++ case Blend::BLEND: return B(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); ++ case Blend::ADD: return B(GL_SRC_ALPHA, GL_ONE); ++ case Blend::MOD: return B(GL_DST_COLOR, GL_ZERO); ++ default: return B(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + } + } + +diff --git a/src/video/ttf_surface.cpp b/src/video/ttf_surface.cpp +index 7c9505004f..b41d67b2c8 100644 +--- a/src/video/ttf_surface.cpp ++++ b/src/video/ttf_surface.cpp +@@ -55,12 +55,13 @@ TTFSurface::create(const TTFFont& font, const std::string& text) + SDL_SetSurfaceColorMod(text_surface.get(), 0, 0, 0); + SDL_SetSurfaceBlendMode(text_surface.get(), SDL_BLENDMODE_BLEND); + ++ using P = std::tuple<int, int>; + const std::initializer_list<std::tuple<int, int> > positions[] = { + {}, +- {{0, 0}}, +- {{-1, 0}, {1, 0}, {0, -1}, {0, 1}}, +- {{-2, 0}, {2, 0}, {0, -2}, {0, 2}, +- {-1, -1}, {1, -1}, {-1, 1}, {1, 1}} ++ {P{0, 0}}, ++ {P{-1, 0}, P{1, 0}, P{0, -1}, P{0, 1}}, ++ {P{-2, 0}, P{2, 0}, P{0, -2}, P{0, 2}, ++ P{-1, -1}, P{1, -1}, P{-1, 1}, P{1, 1}} + }; + + int shadow_size = std::min(2, font.get_shadow_size()); +@@ -77,11 +78,12 @@ TTFSurface::create(const TTFFont& font, const std::string& text) + SDL_SetSurfaceColorMod(text_surface.get(), 0, 0, 0); + SDL_SetSurfaceBlendMode(text_surface.get(), SDL_BLENDMODE_BLEND); + ++ using P = std::tuple<int, int>; + const std::initializer_list<std::tuple<int, int> > positions[] = { + {}, +- {{-1, 0}, {1, 0}, {0, -1}, {0, 1}}, +- {{-2, 0}, {2, 0}, {0, -2}, {0, 2}, +- {-1, -1}, {1, -1}, {-1, 1}, {1, 1}} ++ {P{-1, 0}, P{1, 0}, P{0, -1}, P{0, 1}}, ++ {P{-2, 0}, P{2, 0}, P{0, -2}, P{0, 2}, ++ P{-1, -1}, P{1, -1}, P{-1, 1}, P{1, 1}} + }; + + int border = std::min(2, font.get_border()); diff --git a/gnu/packages/patches/supertux-unbundle-squirrel.patch b/gnu/packages/patches/supertux-unbundle-squirrel.patch new file mode 100644 index 0000000000..054183b75f --- /dev/null +++ b/gnu/packages/patches/supertux-unbundle-squirrel.patch @@ -0,0 +1,53 @@ +diff -ur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2019-05-24 17:58:19.693090158 -0400 ++++ b/CMakeLists.txt 2019-05-24 17:57:43.349473252 -0400 +@@ -375,44 +375,15 @@ + + include(ConfigureChecks) + +- +-## Also build external/squirrel +- +-if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/CMakeLists.txt) +- message(FATAL_ERROR "squirrel submodule is not checked out or ${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/CMakeLists.txt is missing") +-endif() +- + set(SQUIRREL_PREFIX ${CMAKE_BINARY_DIR}/squirrel/ex) +-ExternalProject_Add(squirrel +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/squirrel/" +- CMAKE_ARGS +- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} +- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} +- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} +- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} +- -DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX} +- -DINSTALL_INC_DIR=include) +- +-if(WIN32) +- add_library(squirrel_lib SHARED IMPORTED) +- set_target_properties(squirrel_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/bin/${CMAKE_SHARED_LIBRARY_PREFIX}squirrel${CMAKE_SHARED_LIBRARY_SUFFIX}") +- set_target_properties(squirrel_lib PROPERTIES IMPORTED_IMPLIB "${SQUIRREL_PREFIX}/lib/squirrel${CMAKE_LINK_LIBRARY_SUFFIX}") +- add_library(sqstdlib_lib SHARED IMPORTED) +- set_target_properties(sqstdlib_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/bin/${CMAKE_SHARED_LIBRARY_PREFIX}sqstdlib${CMAKE_SHARED_LIBRARY_SUFFIX}") +- set_target_properties(sqstdlib_lib PROPERTIES IMPORTED_IMPLIB "${SQUIRREL_PREFIX}/lib/sqstdlib${CMAKE_LINK_LIBRARY_SUFFIX}") +- +- #For debug run purposes +- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mk/msvc/run_supertux.bat.in" "${PROJECT_BINARY_DIR}/run_supertux.bat") +-else() +- add_library(squirrel_lib STATIC IMPORTED) +- set_target_properties(squirrel_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}squirrel_static${CMAKE_STATIC_LIBRARY_SUFFIX}") +- add_library(sqstdlib_lib STATIC IMPORTED) +- set_target_properties(sqstdlib_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}sqstdlib_static${CMAKE_STATIC_LIBRARY_SUFFIX}") +-endif() + + include_directories(SYSTEM ${SQUIRREL_PREFIX}/include) + ++add_library(squirrel_lib SHARED IMPORTED) ++set_target_properties(squirrel_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}squirrel${CMAKE_SHARED_LIBRARY_SUFFIX}") ++add_library(sqstdlib_lib SHARED IMPORTED) ++set_target_properties(sqstdlib_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}sqstdlib${CMAKE_SHARED_LIBRARY_SUFFIX}") ++ + ## Also build external/tinygettext + + if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/CMakeLists.txt) diff --git a/gnu/packages/patches/txr-shell.patch b/gnu/packages/patches/txr-shell.patch new file mode 100644 index 0000000000..a4abb73eac --- /dev/null +++ b/gnu/packages/patches/txr-shell.patch @@ -0,0 +1,59 @@ +Use the current shell instead of trying to find another one and +failing to do so. + +diff --git a/configure b/configure +index f1adb919..7891b4dc 100755 +--- a/configure ++++ b/configure +@@ -26,28 +26,6 @@ + # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-# +-# The #!/bin/sh might be some legacy piece of crap, +-# not even up to 1990 POSIX.2 spec. So the first step +-# is to look for a better shell in some known places +-# and re-execute ourselves with that interpreter. +-# +- +-if test x$txr_shell = x ; then +- for shell in /bin/bash /usr/bin/bash /usr/xpg4/bin/sh ; do +- if test -x $shell ; then +- txr_shell=$shell +- break +- fi +- done +- if test x$txr_shell = x ; then +- echo "No known POSIX shell found: falling back on /bin/sh, which may not work" +- txr_shell=/bin/sh +- fi +- export txr_shell +- exec $txr_shell $0 ${@+"$@"} +-fi +- + set -u + + # +@@ -190,13 +168,6 @@ while [ $# -gt 0 ] ; do + exit 1 + fi + +- eval "var_exists=\${$var+y}" +- +- if [ "$var_exists" != y ] ; then +- printf "$0: nonexistent option: '%s'\n" "$1" +- exit 1 +- fi +- + eval "$var='$val'" + + eval "var_given_exists=\${${var}_given+y}" +@@ -208,6 +179,8 @@ while [ $# -gt 0 ] ; do + shift + done + ++txr_shell=$CONFIG_SHELL ++ + # + # If --help was given (or --help=<nonempty> or help=<nonempty>) then + # print help and exit. The termination status is failed, to indicate diff --git a/gnu/packages/patches/usb-modeswitch-accept-config-arg.patch b/gnu/packages/patches/usb-modeswitch-accept-config-arg.patch new file mode 100644 index 0000000000..9c050f7ee6 --- /dev/null +++ b/gnu/packages/patches/usb-modeswitch-accept-config-arg.patch @@ -0,0 +1,42 @@ +--- old/usb_modeswitch.tcl 1970-01-01 01:00:00.000000000 +0100 ++++ usb_modeswitch.tcl 2019-06-12 08:39:42.140000000 +0200 +@@ -41,7 +41,7 @@ + global scsi usb config match device flags setup devdir loginit + + set flags(config) "" +-Log "[ParseGlobalConfig]" ++Log "[ParseGlobalConfig $argv]" + + if {$flags(stordelay) > 0} { + SetStorageDelay $flags(stordelay) +@@ -496,9 +496,21 @@ + # end of proc {MatchDevice} + + +-proc {ParseGlobalConfig} {} { ++proc {ParseGlobalConfig} {argv} { + + global flags ++ ++set configFileParam "" ++for {set i 0} {$i < [llength $argv]} {incr i} { ++ switch -glob -- [set v [lindex $argv $i]] { ++ --config-file=* { ++ set configFileParam $v ++ } ++ } ++} ++if {$configFileParam != ""} { ++ set configFile [string range $configFileParam [string length "--config-file="] end] ++} else { + set configFile "" + set places [list /etc/usb_modeswitch.conf /etc/sysconfig/usb_modeswitch /etc/default/usb_modeswitch] + foreach cfg $places { +@@ -507,6 +519,7 @@ + break + } + } ++} + if {$configFile == ""} {return} + + set rc [open $configFile r] diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index f6197b98ee..687864c008 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2019 Christopher Baines <mail@cbaines.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,8 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages check) + #:use-module (gnu packages databases) + #:use-module (gnu packages django) #:use-module (gnu packages file) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) @@ -300,3 +303,167 @@ directories, and has support for many popular version control systems. Meld helps you review code changes and understand patches. It might even help you to figure out what is going on in that merge you keep avoiding.") (license gpl2))) + +(define-public patchwork + (package + (name "patchwork") + (version "2.1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/getpatchwork/patchwork.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06ng5pv6744w98zkyfm0ldkmpdgnsql3gbbbh6awq61sr2ndr3qw")))) + (build-system python-build-system) + (arguments + `(;; TODO: Tests require a running database + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (add-after 'unpack 'replace-wsgi.py + (lambda* (#:key inputs outputs #:allow-other-keys) + (delete-file "patchwork/wsgi.py") + (call-with-output-file "patchwork/wsgi.py" + (lambda (port) + ;; Embed the PYTHONPATH containing the dependencies, as well + ;; as the python modules in this package in the wsgi.py file, + ;; as this will ensure they are available at runtime. + (define pythonpath + (string-append (getenv "PYTHONPATH") + ":" + (site-packages inputs outputs))) + (display + (string-append " +import os, sys + +sys.path.extend('" pythonpath "'.split(':')) + +from django.core.wsgi import get_wsgi_application + +# By default, assume that patchwork is running as a Guix service, which +# provides the settings as the 'guix.patchwork.settings' Python module. +# +# When using httpd, it's hard to set environment variables, so rely on the +# default set here. +os.environ['DJANGO_SETTINGS_MODULE'] = os.getenv( + 'DJANGO_SETTINGS_MODULE', + 'guix.patchwork.settings' # default +) + +application = get_wsgi_application()\n") port))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "DJANGO_SETTINGS_MODULE" "patchwork.settings.dev") + (invoke "python" "-Wonce" "./manage.py" "test" "--noinput")) + #t)) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (out-site-packages (site-packages inputs outputs))) + (for-each (lambda (directory) + (copy-recursively + directory + (string-append out-site-packages directory))) + '(;; Contains the python code + "patchwork" + ;; Contains the templates for the generated HTML + "templates")) + (delete-file-recursively + (string-append out-site-packages "patchwork/tests")) + + ;; Install patchwork related tools + (for-each (lambda (file) + (install-file file (string-append out "/bin"))) + (list + (string-append out-site-packages + "patchwork/bin/pwclient") + (string-append out-site-packages + "patchwork/bin/parsemail.sh") + (string-append out-site-packages + "patchwork/bin/parsemail-batch.sh"))) + + ;; Delete the symlink to pwclient, and replace it with the + ;; actual file, as this can cause issues when serving the file + ;; from a webserver. + (let ((template-pwclient (string-append + out-site-packages + "patchwork/templates/patchwork/pwclient"))) + (delete-file template-pwclient) + (copy-file (string-append out-site-packages + "patchwork/bin/pwclient") + template-pwclient)) + + ;; Collect the static assets, this includes JavaScript, CSS and + ;; fonts. This is a standard Django process when running a + ;; Django application for regular use, and includes assets for + ;; dependencies like the admin site from Django. + ;; + ;; The intent here is that you can serve files from this + ;; directory through a webserver, which is recommended when + ;; running Django applications. + (let ((static-root + (string-append out "/share/patchwork/htdocs"))) + (mkdir-p static-root) + (copy-file "patchwork/settings/production.example.py" + "patchwork/settings/assets.py") + (setenv "DJANGO_SECRET_KEY" "dummyvalue") + (setenv "DJANGO_SETTINGS_MODULE" "patchwork.settings.assets") + (setenv "STATIC_ROOT" static-root) + (invoke "./manage.py" "collectstatic" "--no-input")) + + ;; The lib directory includes example configuration files that + ;; may be useful when deploying patchwork. + (copy-recursively "lib" + (string-append + out "/share/doc/" ,name "-" ,version))) + #t)) + ;; The hasher script is used from the post-receive.hook + (add-after 'install 'install-hasher + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (out-site-packages (site-packages inputs outputs)) + (out-hasher.py (string-append out-site-packages + "/patchwork/hasher.py"))) + (chmod out-hasher.py #o555) + (symlink out-hasher.py (string-append out "/bin/hasher"))) + #t)) + ;; Create a patchwork specific version of Django's command line admin + ;; utility. + (add-after 'install 'install-patchwork-admin + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/bin")) + (call-with-output-file (string-append out "/bin/patchwork-admin") + (lambda (port) + (simple-format port "#!~A +import os, sys + +if __name__ == \"__main__\": + from django.core.management import execute_from_command_line + + execute_from_command_line(sys.argv)" (which "python")))) + (chmod (string-append out "/bin/patchwork-admin") #o555)) + #t))))) + (inputs + `(("python-wrapper" ,python-wrapper))) + (propagated-inputs + `(("python-django" ,python-django) + ;; TODO: Make this configurable + ("python-psycopg2" ,python-psycopg2) + ("python-mysqlclient" ,python-mysqlclient) + ("python-django-filter" ,python-django-filter) + ("python-djangorestframework" ,python-djangorestframework) + ("python-django-debug-toolbar" ,python-django-debug-toolbar))) + (synopsis "Web based patch tracking system") + (description + "Patchwork is a patch tracking system. It takes in emails containing +patches, and displays the patches along with comments and state information. +Users can login allowing them to change the state of patches.") + (home-page "http://jk.ozlabs.org/projects/patchwork/") + (license gpl2+))) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 2bf53d1c1e..b2e3edca18 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -132,14 +132,14 @@ data as produced by digital cameras.") (define-public libgphoto2 (package (name "libgphoto2") - (version "2.5.22") + (version "2.5.23") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gphoto/libgphoto/" version "/libgphoto2-" version ".tar.bz2")) (sha256 (base32 - "0n6f6nagys775ib483nka1sbclhkm1dz3n5z3lgaz1m9m5x35mqm")))) + "0bc5x2bkqbfi4hbkz8ab5xc0bkks9vvks1vygxhdh3x498v27byq")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs @@ -163,14 +163,14 @@ from digital cameras.") (define-public gphoto2 (package (name "gphoto2") - (version "2.5.20") + (version "2.5.23") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gphoto/gphoto/" version "/gphoto2-" version ".tar.bz2")) (sha256 (base32 - "1xj80abkzvqrd6g1j1q946lhbp03gyapyxdwbhc0y14g1ash6vx3")))) + "1laqwhxr0xhbykmp0dhd3j4rr2lhj5y228s31afnqxp700hhk1yz")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 68043051b5..62444308db 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -58,7 +58,7 @@ (define-public php (package (name "php") - (version "7.3.5") + (version "7.3.6") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -66,7 +66,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "0wi4vd1c3ylsv7cs5b74pkspybb22qwk6fs5r2as3m3glhw1h0g1")) + "0r51aiff2abbr3d2swhvja0wm56sjxzqbciabcvvq3m3v9kqkz7y")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -255,6 +255,10 @@ ;; but the bug report suggests the issue was in ;; the bundled gd, not upstream. "ext/gd/tests/bug77272.phpt" + ;; Expected invalid XBM but got EOF before image was + ;; complete. It's a warning in both cases and test + ;; result is the same. + "ext/gd/tests/bug77973.phpt" ;; XXX: These iconv tests have the expected outcome, ;; but with different error messages. diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index ccb8ebf8f8..ac24adef43 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -43,16 +43,15 @@ (define-public polkit (package (name "polkit") - (version "0.115") + (version "0.116") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/polkit/releases/" name "-" version ".tar.gz")) - (patches (search-patches "polkit-CVE-2018-19788.patch")) (sha256 (base32 - "0c91y61y4gy6p91cwbzg32dhavw4b7fflg370rimqhdxpzdfr1rg")) + "1c9lbpndh5zis22f154vjrhnqw65z8s85nrgl42v738yf6g0q5w8")) (modules '((guix build utils))) (snippet '(begin @@ -90,7 +89,7 @@ `(("expat" ,expat) ("linux-pam" ,linux-pam) ("elogind" ,elogind) - ("mozjs" ,mozjs-52) + ("mozjs" ,mozjs-60) ("nspr" ,nspr))) (propagated-inputs `(("glib" ,glib))) ; required by polkit-gobject-1.pc @@ -101,6 +100,9 @@ ("gobject-introspection" ,gobject-introspection))) (arguments `(#:configure-flags '("--sysconfdir=/etc" + ;; XXX: MozJS 60 requires the C++11 ABI or higher. + ;; Remove when the default compiler is >= GCC 6. + "CXXFLAGS=-std=gnu++11" "--enable-man-pages") #:phases (modify-phases %standard-phases diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 6248be0c9b..d9065e8b15 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -357,14 +357,14 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-cryptography-vectors (package (name "python-cryptography-vectors") - (version "2.6.1") + (version "2.7") (source (origin (method url-fetch) (uri (pypi-uri "cryptography_vectors" version)) (sha256 (base32 - "1bsqcv3h49dzqnyn29ijq8r7k1ra8ikl1y9qcpcns9nbvhaq3wq3")))) + "1g38zw90510azyfrj6mxbslx2gp9yrnv5dac0w2819k9ssdznbgi")))) (build-system python-build-system) (home-page "https://github.com/pyca/cryptography") (synopsis "Test vectors for the cryptography package") @@ -379,14 +379,14 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-cryptography (package (name "python-cryptography") - (version "2.6.1") + (version "2.7") (source (origin (method url-fetch) (uri (pypi-uri "cryptography" version)) (sha256 (base32 - "19iwz5avym5zl6jrrrkym1rdaa9h61j20ph4cswsqgv8xg5j3j16")))) + "1inlnr36kl36551c9rcad99jmhk81v33by3glkadwdcgmi17fd76")))) (build-system python-build-system) (inputs `(("openssl" ,openssl))) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f889e50590..41585c0022 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -57,6 +57,7 @@ #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages django) + #:use-module (gnu packages groff) #:use-module (gnu packages libffi) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -1541,6 +1542,19 @@ supports url redirection and retries, and also gzip and deflate decoding.") (base32 "0sispclx263lybbk19zp1n9yhg8xxx4jddypzgi24vpjaqnsbwlc")))) (build-system python-build-system) + (arguments + ;; FIXME: The 'pypi' release does not contain tests. + '(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-reference-to-groff + (lambda _ + (substitute* "awscli/help.py" + (("if not self._exists_on_path\\('groff'\\):") "") + (("raise ExecutableNotFoundError\\('groff'\\)") "") + (("cmdline = \\['groff'") + (string-append "cmdline = ['" (which "groff") "'"))) + #t))))) (propagated-inputs `(("python-colorama" ,python-colorama) ("python-botocore" ,python-botocore) @@ -1548,9 +1562,8 @@ supports url redirection and retries, and also gzip and deflate decoding.") ("python-docutils" ,python-docutils) ("python-pyyaml" ,python-pyyaml) ("python-rsa" ,python-rsa))) - (arguments - ;; FIXME: The 'pypi' release does not contain tests. - '(#:tests? #f)) + (inputs + `(("groff" ,groff))) (home-page "https://aws.amazon.com/cli/") (synopsis "Command line client for AWS") (description "AWS CLI provides a unified command line interface to the @@ -1647,13 +1660,13 @@ minimum of WSGI.") (define-public python-flask (package (name "python-flask") - (version "1.0.2") + (version "1.0.3") (source (origin (method url-fetch) - (uri (pypi-uri "flask" version)) + (uri (pypi-uri "Flask" version)) (sha256 (base32 - "0j6f4a9rpfh25k1gp7azqhnni4mb4fgy50jammgjgddw1l3w0w92")))) + "1wxnhjlxwwjhjxmghykjhllpahv5pkdc5hln4ab6nab43s26sz5d")))) (build-system python-build-system) (arguments '(#:phases diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a921d2aab8..ee6e3df6dd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -157,14 +157,14 @@ (define-public python-psutil (package (name "python-psutil") - (version "5.4.3") + (version "5.6.2") (source (origin (method url-fetch) (uri (pypi-uri "psutil" version)) (sha256 (base32 - "063v69x7spyclyaxrd3gmzj3p16q5ayg97xqhwb1kyn22a9pwip2")))) + "1v95vb5385qscfdvphv8l2w22bmir3d7yhpi02n58v3mlqy1r3l2")))) (build-system python-build-system) (arguments ;; FIXME: some tests does not return and times out. @@ -193,14 +193,14 @@ pidof, tty, taskset, pmap.") (define-public python-shapely (package (name "python-shapely") - (version "1.6.3") + (version "1.6.4.post2") (source (origin (method url-fetch) (uri (pypi-uri "Shapely" version)) (sha256 (base32 - "0svc58dzcw9gj92b4sgq35sdxkf85z0qwlzxarkzq4bp3h8jy58l")))) + "03r42fmd9alp6r3q95ad6rldq2f7n1wimrw53zy5kpn33yv7pf64")))) (build-system python-build-system) (native-inputs `(("python-cython" ,python-cython) @@ -3170,7 +3170,7 @@ provides additional functionality on the produced Mallard documents.") (replace 'check (lambda _ (invoke "python" "runtests.py" "-vv")))))) - (home-page "http://cython.org/") + (home-page "https://cython.org/") (synopsis "C extensions for Python") (description "Cython is an optimising static compiler for both the Python programming language and the extended Cython programming language. It makes @@ -5388,14 +5388,14 @@ libxml2 and libxslt.") (define-public python-beautifulsoup4 (package (name "python-beautifulsoup4") - (version "4.6.3") + (version "4.7.1") (source (origin (method url-fetch) (uri (pypi-uri "beautifulsoup4" version)) (sha256 (base32 - "041dhalzjciw6qyzzq7a2k4h1yvyk76xigp35hv5ibnn448ydy4h")))) + "0j2kycz2dxgx68xzjm7rxg5xn6v61gq5ifvxyg99slmqkybnal4l")))) (build-system python-build-system) (arguments `(#:phases @@ -5407,6 +5407,8 @@ libxml2 and libxslt.") ;; distribution. (replace 'check (lambda _ (invoke "./convert-py3k")))))) + (propagated-inputs + `(("python-soupsieve" ,python-soupsieve))) (home-page "https://www.crummy.com/software/BeautifulSoup/bs4/") (synopsis @@ -5450,14 +5452,17 @@ Soup 4. It aims to provide selecting, matching, and filtering using modern CSS selectors. Soup Sieve currently provides selectors from the CSS level 1 specifications up through the latest CSS level 4 drafts and beyond (though some are not yet implemented).") + (properties `((python2-variant . ,(delay python2-soupsieve)))) (license license:expat))) (define-public python2-soupsieve - (let ((base (package-with-python2 python-soupsieve))) + (let ((base (package-with-python2 (strip-python2-variant python-soupsieve)))) (package (inherit base) (propagated-inputs - `(("python2-backports-functools-lru-cache" ,python2-backports-functools-lru-cache)))))) + `(("python2-backports-functools-lru-cache" + ,python2-backports-functools-lru-cache) + ,@(package-propagated-inputs base)))))) (define-public python-netifaces (package @@ -12139,7 +12144,7 @@ current test, while only declaring the test-specific fields") ;; 'parse_funcs' ;; during test setup. `(#:tests? #f)) - (home-page "http://toolkit.translatehouse.org") + (home-page "https://toolkit.translatehouse.org") (synopsis "Tools and API for translation and localization engineering") (description "Tools and API for translation and localization engineering. It contains diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index f37fb064a2..a64944080b 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -30,7 +30,7 @@ (define-public re2 (package (name "re2") - (version "2019-04-01") + (version "2019-06-01") (home-page "https://github.com/google/re2") (source (origin (method git-fetch) @@ -38,7 +38,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "018b8z3fgcr02rmhxdz80r363k40938cbgmk1c9b46k6xkc4q0hd")))) + "01613z66wgiffdngbq3031rwd92jf87j93h7y5mn8hlx19gg5k4j")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 3e5ab72f20..9962cbdcb5 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -437,7 +437,7 @@ implementation techniques and as an expository tool.") (define-public racket (package (name "racket") - (version "7.0") + (version "7.3") (source (origin (method url-fetch) (uri (list (string-append "http://mirror.racket-lang.org/installers/" @@ -447,7 +447,7 @@ implementation techniques and as an expository tool.") version "/racket-" version "-src.tgz"))) (sha256 (base32 - "1glv5amsp9xp480d4yr63hhm9kkyav06yl3a6p489nkr4cln0j9a")) + "0h6072njhb87rkz4arijvahxgjzn8r14s4wns0ijvxm89bg136yl")) (patches (search-patches "racket-store-checksum-override.patch")))) (build-system gnu-build-system) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 2e8cec8ffb..b6b28b7d06 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; @@ -523,15 +523,14 @@ sound and device input (keyboards, joysticks, mice, etc.).") (define-public guile-sdl2 (package (name "guile-sdl2") - (version "0.3.1") + (version "0.4.0") (source (origin (method url-fetch) - (uri (string-append - "https://files.dthompson.us/guile-sdl2/guile-sdl2-" - version ".tar.gz")) + (uri (string-append "https://files.dthompson.us/guile-sdl2/" + "guile-sdl2-" version ".tar.gz")) (sha256 (base32 - "0bw7x2lx90k4banc5k7yfkn3as93y25gr1xdr225ll7lmij21k64")))) + "0zcxwgyadwpbhq6h5mv2569c3kalgra26zc186y9fqiyyzmh1v9s")))) (build-system gnu-build-system) (arguments '(#:make-flags '("GUILE_AUTO_COMPILE=0") diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 9ed983db98..49152dc3fd 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2019 Meiyo Peng <meiyo.peng@gmail.com> +;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,7 @@ #:use-module (gnu packages bison) #:use-module (gnu packages documentation) #:use-module (gnu packages groff) + #:use-module (gnu packages guile) #:use-module (gnu packages libbsd) #:use-module (gnu packages libedit) #:use-module (gnu packages ncurses) @@ -789,3 +791,38 @@ is commonly written.") (home-page "https://www.oilshell.org/") (license (list psfl ; The Oil sources include a patched Python 2 source tree asl2.0)))) + +(define-public gash + (package + (name "gash") + (version "0.1") + (source + (origin (method url-fetch) + (uri (string-append "mirror://savannah/gash/gash-" + version ".tar.gz")) + (sha256 + (base32 + "00m3lif64zyxd41cnk208kc81nl6qz659676qgiaqgwrw0brzrid")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "Makefile.in" + (("^moddir = (.*)/guile/(.*)" _ before after) + (string-append "moddir = " before "/guile/site/" + after)) + (("^ccachedir = (.*)/ccache/(.*)" _ before after) + (string-append "ccachedir = " before + "/site-ccache/" after))) + #t)))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-2.2))) + (home-page "https://savannah.nongnu.org/projects/gash/") + (synopsis "POSIX-compatible shell written in Guile Scheme") + (description "Gash is a POSIX-compatible shell written in Guile +Scheme. It provides both the shell interface, as well as a Guile +library for parsing shell scripts. Gash is designed to bootstrap Bash +as part of the Guix bootstrap process.") + (license gpl3+))) diff --git a/gnu/packages/slang.scm b/gnu/packages/slang.scm index 185d441919..5a37480f67 100644 --- a/gnu/packages/slang.scm +++ b/gnu/packages/slang.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -87,14 +87,14 @@ slsh, which is part of the S-Lang distribution.") (define-public newt (package (name "newt") - (version "0.52.20") + (version "0.52.21") (source (origin (method url-fetch) - (uri (string-append "https://pagure.io/releases/" - name "/" name "-" version ".tar.gz")) + (uri (string-append "https://pagure.io/releases/newt/" + "newt-" version ".tar.gz")) (sha256 (base32 - "1g3dpfnvaw7vljbr7nzq1rl88d6r8cmrvvng9inphgzwxxmvlrld")))) + "0cdvbancr7y4nrj8257y5n45hmhizr8isynagy4fpsnpammv8pi6")))) (build-system gnu-build-system) (outputs '("out" "python")) (inputs diff --git a/gnu/packages/squirrel.scm b/gnu/packages/squirrel.scm index 1da0ad9fe3..2c3ed6e570 100644 --- a/gnu/packages/squirrel.scm +++ b/gnu/packages/squirrel.scm @@ -19,37 +19,65 @@ (define-module (gnu packages squirrel) #:use-module (gnu packages) #:use-module (gnu packages cmake) + #:use-module (gnu packages sphinx) #:use-module (guix build-system cmake) - #:use-module (guix git-download) + #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build utils) #:use-module (guix packages) #:use-module (guix utils)) (define-public squirrel - (let ((commit "51137b84e66c4d526809fd8a59f4ba1d38138c76")) - (package - (name "squirrel") - (version "3.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/albertodemichelis/squirrel.git") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0vbiv1q3qcy2vj8y0b9a2ckswl9ld398n3jnxijvwddrjgya5zav")))) - (build-system cmake-build-system) - (arguments - '(#:tests? #f)) ; no tests - (native-inputs - `(("cmake" ,cmake))) - (home-page "https://squirrel-lang.org/") - (synopsis "High level imperative, object-oriented programming language") - (description - "Squirrel is a high level imperative, object-oriented programming + (package + (name "squirrel") + (version "3.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/squirrel/squirrel3/" + "squirrel " version " stable/squirrel_" + (string-join (string-split version #\.) "_") + "_stable.tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1jyh1523zrrnh9swanfrda0s14mvwc9431dh07g0nx74hbxsfia8")))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags '("-DDISABLE_STATIC=ON") + #:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc-dir (string-append out "/share/doc/squirrel"))) + (for-each + (lambda (file) + (install-file (string-append "../squirrel3/" file) doc-dir)) + '("COPYRIGHT" "HISTORY" "README" + "doc/sqstdlib3.pdf" "doc/squirrel3.pdf"))) + #t)) + (add-after 'install 'install-headers + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (include-dir (string-append out "/include/squirrel"))) + (mkdir-p include-dir) + (for-each + (lambda (header-file) + (copy-recursively header-file + (string-append include-dir + "/" + (basename header-file)))) + (find-files "../squirrel3/include"))) + #t))))) + (native-inputs + `(("cmake" ,cmake) + ("python-sphinx" ,python-sphinx))) + (home-page "https://squirrel-lang.org/") + (synopsis "High level imperative, object-oriented programming language") + (description + "Squirrel is a high level imperative, object-oriented programming language, designed to be a light-weight scripting language that fits in the size, memory bandwidth, and real-time requirements of applications like video games.") - (license license:expat)))) + (license license:expat))) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 06f0aa1e75..156a329627 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1327,13 +1327,13 @@ for template use among CRAN packages.") (define-public r-evaluate (package (name "r-evaluate") - (version "0.13") + (version "0.14") (source (origin (method url-fetch) (uri (cran-uri "evaluate" version)) (sha256 (base32 - "0igvc27rsqxcswjb9slnpi5d509rffxn1y5d82hgqvv970nl3p2q")))) + "0a2y7j534gbgixkwj9r1z76l2vssw4g1hznzbpclc076wkdqpj58")))) (build-system r-build-system) (home-page "https://github.com/hadley/evaluate") (synopsis "Parsing and evaluation tools for R") @@ -1404,13 +1404,13 @@ data derived from /etc/mime.types in UNIX-type systems.") (define-public r-markdown (package (name "r-markdown") - (version "0.9") + (version "1.0") (source (origin (method url-fetch) (uri (cran-uri "markdown" version)) (sha256 (base32 - "08xzs4bcf12jxp0276m6xqvq8kcgg5qp6fxrvsz6r9x73jjccs1h")))) + "19nrz0ba1yd5kicd65crkkz2r3kialm2hm6zdkp495l2s5r80b8p")))) (build-system r-build-system) ;; Skip check phase because the tests require the r-knitr package to be ;; installed. This prevents installation failures. Knitr normally @@ -1670,14 +1670,14 @@ like tidy evaluation.") (define-public r-tibble (package (name "r-tibble") - (version "2.1.1") + (version "2.1.3") (source (origin (method url-fetch) (uri (cran-uri "tibble" version)) (sha256 (base32 - "111jl0hdjhh7hkydxvsr5l19gb0ylxq7xrkc28awnc9pzglpgis5")))) + "06jfayiip8j8ibdhw3fvxn4n8aqbqhwanrszpzlsf92xdfgfm34s")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) @@ -1731,14 +1731,14 @@ database.") (define-public r-dbplyr (package (name "r-dbplyr") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (cran-uri "dbplyr" version)) (sha256 (base32 - "0f4gfkzl07gfwihyc747kdnzxahaw2g28wli4jmikrvczldvjqjx")))) + "15fs66qq2p20gi3y2jlcsw27ach8rwkkkgr1mz2qbiyddbsjks6g")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) @@ -2333,14 +2333,14 @@ collation, and NAMESPACE files.") (define-public r-openssl (package (name "r-openssl") - (version "1.3") + (version "1.4") (source (origin (method url-fetch) (uri (cran-uri "openssl" version)) (sha256 (base32 - "1gx4mk7js1irzkql5rgk48ja9c6mm28ccxz483ngbhdd57az90qw")))) + "0mh4xwb9wnn5j2n1zzmjldqjqv2nn4wdidiixxciaqrqsi0l9834")))) (build-system r-build-system) (inputs `(("libressl" ,libressl))) @@ -2695,14 +2695,14 @@ certain criterion, e.g., it contains a certain regular file.") (define-public r-rmarkdown (package (name "r-rmarkdown") - (version "1.12") + (version "1.13") (source (origin (method url-fetch) (uri (cran-uri "rmarkdown" version)) (sha256 (base32 - "0milpdaf4nd36kq6sci9wc5dhwswl4w9c9fychfbppgjsgfp6kfv")))) + "1vv3b8nlw8ra19492rjg3na42lwh3xr5a2jy2ia81fvvs846pywn")))) (properties `((upstream-name . "rmarkdown"))) (build-system r-build-system) (propagated-inputs @@ -2714,6 +2714,7 @@ certain criterion, e.g., it contains a certain regular file.") ("r-mime" ,r-mime) ("r-stringr" ,r-stringr) ("r-tinytex" ,r-tinytex) + ("r-xfun" ,r-xfun) ("r-yaml" ,r-yaml) ("ghc-pandoc" ,ghc-pandoc))) (home-page "http://rmarkdown.rstudio.com") @@ -2881,13 +2882,13 @@ ldap, and also supports cookies, redirects, authentication, etc.") (define-public r-xml (package (name "r-xml") - (version "3.98-1.19") + (version "3.98-1.20") (source (origin (method url-fetch) (uri (cran-uri "XML" version)) (sha256 (base32 - "1axyfa56q45x7z4zd56aasdn9hz9niv2vv5qm1zp9i94vyic9cc1")))) + "0n28m8iz1wfgixr7fjswl238c5w9kggsrw0c8hdzp859dqvqdbs6")))) (properties `((upstream-name . "XML"))) (build-system r-build-system) @@ -3364,14 +3365,14 @@ Stochastic Neighbor Embedding using a Barnes-Hut implementation.") (define-public r-e1071 (package (name "r-e1071") - (version "1.7-1") + (version "1.7-2") (source (origin (method url-fetch) (uri (cran-uri "e1071" version)) (sha256 (base32 - "1zlxz3da216q6v6r4ff60il121xwz7g7m639vzdwglhw3jjh8psw")))) + "0lipj692rjjw8rrhqh2k9i5dh8y2sjrw9q53rwm32irhx2f2j73j")))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class))) @@ -4314,13 +4315,13 @@ mechanism.") (define-public r-zoo (package (name "r-zoo") - (version "1.8-5") + (version "1.8-6") (source (origin (method url-fetch) (uri (cran-uri "zoo" version)) (sha256 (base32 - "09p8gmd5ifz80ahnhiianarsr5xx3nz76jzp90d7v3fjffcrcww7")))) + "1k1pmzr9nfwbxq1xf0jzn3nawv4sgnkxkgzxnm1i887jcbrs85r2")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) @@ -4470,13 +4471,13 @@ Wall Street Journal, among others. This package also provides (define-public r-statmod (package (name "r-statmod") - (version "1.4.30") + (version "1.4.32") (source (origin (method url-fetch) (uri (cran-uri "statmod" version)) (sha256 (base32 - "07v4x8af60alcw6vbiwf5fp25bhra61kvxz9kqx64lszm0i1fb4x")))) + "083yyp84xj85zg4bhz7i90bqzl3p6155ch4abwsfc9k1lv7s2rrg")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/statmod") (native-inputs @@ -4771,14 +4772,14 @@ and resampling-based inference.") (define-public r-prabclus (package (name "r-prabclus") - (version "2.2-7") + (version "2.3-1") (source (origin (method url-fetch) (uri (cran-uri "prabclus" version)) (sha256 (base32 - "0h2nml8ri27mhfs2p6ngb6kfd6lyq30sc6813yybpskkrb6gs1pb")))) + "1h5k13w8mmmdy74l145zh64f339wy78z1nlg8xr3zg23gmv98cpg")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass) @@ -4967,14 +4968,14 @@ of the points.") (define-public r-fpc (package (name "r-fpc") - (version "2.1-11.2") + (version "2.2-2") (source (origin (method url-fetch) (uri (cran-uri "fpc" version)) (sha256 (base32 - "0wjjp9xn283acfg6cm1wa6fsi7pf0z97227hrnlpmprks3mbj8kr")))) + "1lzqxi2jzc753j4356b949isx2nccd32mw2ch665q78nxccp145n")))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class) @@ -4986,8 +4987,7 @@ of the points.") ("r-mclust" ,r-mclust) ("r-mvtnorm" ,r-mvtnorm) ("r-prabclus" ,r-prabclus) - ("r-robustbase" ,r-robustbase) - ("r-trimcluster" ,r-trimcluster))) + ("r-robustbase" ,r-robustbase))) (home-page "https://cran.r-project.org/web/packages/fpc") (synopsis "Flexible procedures for clustering") (description @@ -5139,14 +5139,14 @@ using modular prediction and response module classes.") (define-public r-quantreg (package (name "r-quantreg") - (version "5.38") + (version "5.40") (source (origin (method url-fetch) (uri (cran-uri "quantreg" version)) (sha256 (base32 - "1vvvnk291f0dccg04l3nsnk585gq75sk0b2vdbrqv3lczvv18nw1")))) + "1srni6lkgvy44ljxndz2j9ca702z2wy81f6z6mbbi6h06ni11qw6")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) @@ -5270,14 +5270,14 @@ Companion to Applied Regression, Third Edition, Sage.") (define-public r-car (package (name "r-car") - (version "3.0-2") + (version "3.0-3") (source (origin (method url-fetch) (uri (cran-uri "car" version)) (sha256 (base32 - "0l3wyc9ia0ypcbap2p39slazfpbl84mjzydqvpsywrzdiyxajnfz")))) + "0vy3g3bjljd2al8xb9qr45f98is7yppc9jilqn7b6zvf5yqpr07s")))) (build-system r-build-system) (propagated-inputs `(("r-abind" ,r-abind) @@ -5377,14 +5377,14 @@ are computed via non-Monte Carlo methods.") (define-public r-numderiv (package (name "r-numderiv") - (version "2016.8-1") + (version "2016.8-1.1") (source (origin (method url-fetch) (uri (cran-uri "numDeriv" version)) (sha256 (base32 - "07ni52rwiap4wilfz94w5mrqaxr59axxmgn57857ip4p6qkiss0v")))) + "0idk02pqkziik932bd8k72d1q775g1is3m4bc861pcxfz6gx3i6q")))) (properties `((upstream-name . "numDeriv"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/numDeriv") diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 25c27d6a9d..4f3fa05aa7 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -55,14 +55,14 @@ (define-public ceph (package (name "ceph") - (version "13.2.5") + (version "13.2.6") (source (origin (method url-fetch) (uri (string-append "https://download.ceph.com/tarballs/ceph-" version ".tar.gz")) (sha256 (base32 - "0jbs6l763clbqnq2s5jksn44yf71rhcnk85cw64fqvmv0r4ch71n")) + "13f5qs7jpxprplk4irwlx90mc9gvm48fvd3q471xcqc3n6z1qywz")) (patches (search-patches "ceph-skip-unittest_blockdev.patch" "ceph-skip-collect-sys-info-test.patch" diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index acc9eda152..cd3dd0de54 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -30,7 +30,7 @@ (define-public syncthing (package (name "syncthing") - (version "1.1.2") + (version "1.1.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -38,7 +38,7 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "0x2203xa4fxadj7ra7l2ac285j3gi1qgghpkssl4hkcq0kjmxqrk")) + "0pkb9vdb10lnlk6sgg6hxgkdjnvxx90cfdf8vgrc5sljzm5qhr6l")) (modules '((guix build utils))) ;; Delete bundled ("vendored") free software source code. (snippet '(begin @@ -418,7 +418,7 @@ address of the default LAN gateway.") (define-public go-github-com-lib-pq (package (name "go-github-com-lib-pq") - (version "1.0.0") + (version "1.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -427,7 +427,7 @@ address of the default LAN gateway.") (file-name (git-file-name name version)) (sha256 (base32 - "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i")))) + "0g64wlg1l1ybq4x44idksl4pgm055s58jxc6r6x4qhqm5q76h0km")))) (build-system go-build-system) (arguments `(#:import-path "github.com/lib/pq" @@ -443,7 +443,7 @@ database/sql package.") (define-public go-github-com-oschwald-geoip2-golang (package (name "go-github-com-oschwald-geoip2-golang") - (version "1.1.0") + (version "1.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -452,7 +452,7 @@ database/sql package.") (file-name (git-file-name name version)) (sha256 (base32 - "0v698bzs8lb59cqpsa9cf4sl8rdsvnnmaravhbfn6g6i511ppclr")))) + "0jivzl15jb8n16rm1b2w97kf7vna5dd3kcz865wfi233qay075j2")))) (build-system go-build-system) (propagated-inputs `(("go-github-com-oschwald-maxminddb-golang" diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm index b8f324274a..5e427ffe63 100644 --- a/gnu/packages/tbb.scm +++ b/gnu/packages/tbb.scm @@ -28,7 +28,7 @@ (define-public tbb (package (name "tbb") - (version "2019_U6") + (version "2019_U8") (source (origin (method git-fetch) (uri (git-reference @@ -37,7 +37,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1zbf06l659vq6s5wp3ln96ycwcd42caffan5vilqvqyxqvjljyic")) + "0z0kh1a5g28gckcxlv3x7qqskh5fsl8knf2ypbbvk7z9ln9k3wfq")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 84454b2e0e..f742e86a6b 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -924,7 +924,7 @@ tmux.") (define-public kitty (package (name "kitty") - (version "0.13.3") + (version "0.14.2") (home-page "https://sw.kovidgoyal.net/kitty/") (source (origin @@ -935,7 +935,7 @@ tmux.") (file-name (git-file-name name version)) (sha256 (base32 - "1y0vd75j8g61jdj8miml79w5ri3pqli5rv9iq6zdrxvzfa4b2rmb")) + "15iv3k7iryf10n8n67d37x24pzcarq97a3dr42lbld00k1lx19az")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 1052d588f3..eb853da1bf 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -259,7 +259,7 @@ required structures.") (define-public openssl (package (name "openssl") - (version "1.1.1b") + (version "1.1.1c") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -271,7 +271,7 @@ required structures.") "/openssl-" version ".tar.gz"))) (sha256 (base32 - "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw")) + "142c7zdlz06hjrrvinb9f276czc78bnkyhd9xma621qmmmwk1yzn")) (patches (search-patches "openssl-1.1-c-rehash-in.patch")))) (build-system gnu-build-system) (outputs '("out" diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index c1e136915b..730cb421de 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -140,7 +140,7 @@ windows.") (define-public tmux-xpanes (package (name "tmux-xpanes") - (version "4.1.0") + (version "4.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -149,7 +149,7 @@ windows.") (file-name (git-file-name name version)) (sha256 (base32 - "11yz6rh2ckd1z8q80n8giv2gcz2i22fgf3pnfxq96qrzflb0d96a")))) + "13q02vdk229chgbn547wwv29cj4njvz02lmw840g8qmwh73qb2pi")))) (build-system trivial-build-system) (inputs `(("bash" ,bash))) diff --git a/gnu/packages/usb-modeswitch.scm b/gnu/packages/usb-modeswitch.scm new file mode 100644 index 0000000000..8f1cf9df60 --- /dev/null +++ b/gnu/packages/usb-modeswitch.scm @@ -0,0 +1,166 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de> +;;; +;;; 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 <http://www.gnu.org/licenses/>. + +(define-module (gnu packages usb-modeswitch) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) + #:use-module (gnu packages) + #:use-module (gnu packages base) + #:use-module (gnu packages compression) + #:use-module (gnu packages embedded) + #:use-module (gnu packages libusb) + #:use-module (gnu packages pkg-config)) + +(define-public usb-modeswitch-data + (package + (name "usb-modeswitch-data") + (version "20170806") + (source (origin + (method url-fetch) + (uri (string-append + "http://www.draisberghof.de/usb_modeswitch/" + "usb-modeswitch-data-" version ".tar.bz2")) + (sha256 + (base32 + "0b1wari3aza6qjggqd0hk2zsh93k1q8scgmwh6f8wr0flpr3whff")))) + (build-system trivial-build-system) + (native-inputs `(("tar" ,tar) + ("bzip2" ,bzip2))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((source (assoc-ref %build-inputs "source")) + (tar (assoc-ref %build-inputs "tar")) + (bzip2 (assoc-ref %build-inputs "bzip2")) + (files (string-append "usb-modeswitch-data-" + ,(package-version this-package))) + (share-dir (string-append %output "/share")) + (doc-dir (string-append share-dir "/doc/")) + (license-dir (string-append doc-dir + (strip-store-file-name %output))) + (udev-dir (string-append %output "/udev"))) + (copy-file source "data.tar.bz2") + (invoke (string-append bzip2 "/bin/bzip2") "-d" "data.tar.bz2") + (invoke (string-append tar "/bin/tar") "xvf" "data.tar") + (copy-recursively (string-append files "/usb_modeswitch.d") + (string-append share-dir "/usb_modeswitch.d")) + (install-file (string-append files "/40-usb_modeswitch.rules") + udev-dir) + (install-file (string-append files "/COPYING") license-dir))))) + (home-page "http://www.draisberghof.de/usb_modeswitch/") + (synopsis "Data package for USB_ModeSwitch") + (description "This packages contains data about devices and a UDEV rules +file for use with USB_ModeSwitch.") + (license license:gpl2+))) + +(define-public usb-modeswitch + (package + (name "usb-modeswitch") + (version "2.5.2") + (source (origin + (method url-fetch) + (uri (string-append + "http://www.draisberghof.de/usb_modeswitch/" + "usb-modeswitch-" version ".tar.bz2")) + (sha256 + (base32 + "19ifi80g9ns5dmspchjvfj4ykxssq9yrci8m227dgb3yr04srzxb")) + (modules '((guix build utils))) + (snippet + ;; Remove bundled jimtcl. + '(begin + (delete-file-recursively "jim") + #t)) + (patches + (search-patches "usb-modeswitch-accept-config-arg.patch")))) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("libusb" ,libusb) + ("jimtcl" ,jimtcl) + ("usb-modeswitch-data" ,usb-modeswitch-data))) + (outputs '("out" "dispatcher")) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; does not support `make check` + #:make-flags (list "CC=gcc") + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'install + (lambda* (#:key source outputs inputs #:allow-other-keys) + (let* ((source (assoc-ref inputs "source")) + (jimtcl (assoc-ref inputs "jimtcl")) + (data (assoc-ref inputs "usb-modeswitch-data")) + (out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man1 (string-append out "/share/man/man1")) + (dispatcher-out (assoc-ref outputs "dispatcher")) + (udev (string-append dispatcher-out "/lib/udev")) + (etc (string-append dispatcher-out "/etc")) + (dispatcher-bin (string-append dispatcher-out "/bin")) + (dispatcher-man1 (string-append dispatcher-out + "/share/man/man1"))) + (begin + ;; Users can install the default output and + ;; usb-modeswitch-data and then modeswitch their USB device + ;; by running e.g.: + ;; + ;; sudo usb_modeswitch -c \ + ;; ~/.guix-profile/share/usb_modeswitch.d/12d1\:14fe \ + ;; -v 0x12d1 -p 0x14fe + ;; + ;; But it is simpler to use the usb-modeswitch-service-type + ;; that installs a UDEV rules file which invokes a shell + ;; script in lib/udev (also called `usb_modeswitch' like the + ;; main binary) which, in turn, invokes the program + ;; `usb_modeswitch_dispatcher'. Normal users should not + ;; invoke this dispatcher directly, so it is a separate output. + (install-file "usb_modeswitch" bin) + (install-file "usb_modeswitch.conf" etc) + (install-file "usb_modeswitch.1" man1) + (install-file "usb_modeswitch_dispatcher.1" dispatcher-man1) + + (substitute* "usb_modeswitch.sh" + (("PATH=") "PATH=$PATH:") ; we do not want hardcoded FHS path + (("init_path=") "init_path=/does/not/exist")) ; no /sbin/init + (rename-file "usb_modeswitch.sh" "usb_modeswitch") + (install-file "usb_modeswitch" udev) + + (rename-file "usb_modeswitch.tcl" "usb_modeswitch_dispatcher") + (substitute* "usb_modeswitch_dispatcher" + (("/usr/bin/tclsh") + (string-append jimtcl "/bin/jimsh")) + (("/usr/sbin") bin) + (("/usr/share/usb_modeswitch") + (string-append data "/share/usb_modeswitch.d"))) + (install-file "usb_modeswitch_dispatcher" + dispatcher-bin) + #t))))))) + (home-page "http://www.draisberghof.de/usb_modeswitch/") + (synopsis "Mode switching tool for controlling `multi-mode' USB devices") + (description "USB_ModeSwitch is a mode switching tool for controlling USB +devices with multiple @dfn{modes}. When plugged in for the first time many +USB devices (primarily high-speed WAN modems) act like a flash storage +containing installers for Windows drivers. USB_ModeSwitch replays the +sequence the Windows drivers would send to switch their mode from storage to +modem (or whatever the thing is supposed to do).") + (license license:gpl2+))) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 938fdac227..410de1cbba 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -146,14 +146,14 @@ as well as the classic centralized workflow.") (name "git") ;; XXX When updating Git, check if the special 'git-source' input to cgit ;; needs to be updated as well. - (version "2.21.0") + (version "2.22.0") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "0a0d0b07rmvs985zpndxxy0vzr0vq53kq5kyd68iv6gf8gkirjwc")))) + "17zj6jwx3s6bybd290f1mj5iym1r64560rmnf0p63x4akxclp7hm")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -166,7 +166,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "0lgcynqbjmfsvhfk14jvqyvb1xiyqgkgznb707vha38wjcjdqs1g")))) + "0fpfqw0h4g4v478fscic8z714i0ls5w7946vzhmq31lf7nizsb2f")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook-xsl" ,docbook-xsl) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c5b83c8c8c..8a0dc29cc5 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -671,14 +671,14 @@ SMPTE 314M.") (define-public libmatroska (package (name "libmatroska") - (version "1.5.0") + (version "1.5.2") (source (origin (method url-fetch) (uri (string-append "https://dl.matroska.org/downloads/" "libmatroska/libmatroska-" version ".tar.xz")) (sha256 - (base32 "07md2gvy3x92ym2k449740mdji6mhknlajkndnhi507s4wcdrvzh")))) + (base32 "0qn9lfs0877wbv581yxw2gywxywxpvwslc5q07q4f7bqpyzxxiha")))) (build-system cmake-build-system) (inputs `(("libebml" ,libebml))) @@ -1013,7 +1013,7 @@ videoformats depend on the configuration flags of ffmpeg.") (define-public vlc (package (name "vlc") - (version "3.0.6") + (version "3.0.7") (source (origin (method url-fetch) (uri (string-append @@ -1022,7 +1022,7 @@ videoformats depend on the configuration flags of ffmpeg.") "/vlc-" version ".tar.xz")) (sha256 (base32 - "1lvyyahv6g9zv7m5g5qinyrwmw47zdsd5ysimb862j7kw15nvh8q")))) + "05irswyg9acflxzy4vfyvgi643r72vsvagv118zawjqg1wagxdaw")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) @@ -1446,7 +1446,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2019.05.11") + (version "2019.05.20") (source (origin (method url-fetch) (uri (string-append "https://github.com/rg3/youtube-dl/releases/" @@ -1454,7 +1454,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "1y272jgdqwhf2njzqfln80zb2pmw83rvp6lxza6wghb7cld249j1")))) + "18xwdfvpkqrnj0kb8xj8hgwhgiqpv7x7x7zzr4x3vynb9grcv9m8")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion @@ -1565,7 +1565,7 @@ other site that youtube-dl supports.") (define-public you-get (package (name "you-get") - (version "0.4.1270") + (version "0.4.1302") (source (origin (method git-fetch) (uri (git-reference @@ -1574,7 +1574,7 @@ other site that youtube-dl supports.") (file-name (git-file-name name version)) (sha256 (base32 - "123g6x8sh32v4yn4ss55lfw7j79hgl3l6aiwgrk4ndq7dzhnz46q")))) + "1fwwzslv1vpjr8q0fq10dbngr8zai1n3d6na700cgpky4j9y0y99")))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg))) ; for multi-part and >=1080p videos @@ -2192,14 +2192,14 @@ tools, XML authoring components, and an extensible plug-in based API.") (define-public v4l-utils (package (name "v4l-utils") - (version "1.12.5") + (version "1.16.6") (source (origin (method url-fetch) (uri (string-append "https://linuxtv.org/downloads/v4l-utils" "/v4l-utils-" version ".tar.bz2")) (sha256 (base32 - "03g2b4rivrilimcp57mwrlsa3qvrxmk4sza08mygwmqbvcnic606")))) + "1bkqlrizx0j2rd6ybam2x17bjrpwzl4v4szmnzm3cmixis3w3npr")))) (build-system gnu-build-system) (arguments '(#:configure-flags @@ -2862,7 +2862,7 @@ many codecs and formats supported by libmediainfo.") (define-public livemedia-utils (package (name "livemedia-utils") - (version "2019.03.06") + (version "2019.05.29") (source (origin (method url-fetch) (uri (string-append @@ -2870,10 +2870,10 @@ many codecs and formats supported by libmediainfo.") version ".tar.gz")) (sha256 (base32 - "1gasdl95yjabv811knkmy5laj21a54z1jdfq36jdj984k1nw5l0b")))) + "08i63jr8ihn1xiq5z5n3yls3yz6li5sg0s454l56p5bcvbrw81my")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests + '(#:tests? #f ; no tests #:make-flags (list "CC=gcc" (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib") diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 8789060b3c..7f2db9980e 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 HiPhish <hiphish@posteo.de> +;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu> ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +31,7 @@ #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages acl) #:use-module (gnu packages admin) ; For GNU hostname @@ -52,6 +54,7 @@ #: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 ruby) #:use-module (gnu packages serialization) #:use-module (gnu packages shells) @@ -730,7 +733,7 @@ are detected, the user is notified."))) (define-public neovim (package (name "neovim") - (version "0.3.5") + (version "0.3.7") (source (origin (method git-fetch) @@ -740,7 +743,7 @@ are detected, the user is notified."))) (file-name (git-file-name name version)) (sha256 (base32 - "113lrr9gwimvvzlkwlishm4cjqcf30xq9jfxn7vh41ckgnbiwf3w")))) + "1j6w5jvq5v7kf7diad91qs1acr427nidnk9s24yyrz0hwdd1c2lh")))) (build-system cmake-build-system) (arguments `(#:modules ((srfi srfi-26) @@ -888,3 +891,29 @@ from the @command{vi}-editor: @end enumerate With the package comes a plugin to use vifm as a vim file selector.") (license license:gpl2+))) + +(define-public python-pynvim + (package + (name "python-pynvim") + (version "0.3.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "pynvim" version)) + (sha256 + (base32 + "01dybk4vs452pljn1q3il5z2sd313ki0lgiglc0xmjc6wp290r6g")))) + (build-system python-build-system) + (propagated-inputs + `(("python-greenlet" ,python-greenlet) + ("python-msgpack" ,python-msgpack))) + (arguments + `(#:tests? #f)) + (home-page "https://github.com/neovim/pynvim") + (synopsis "Python client and plugin host for neovim") + (description "Pynvim implements support for python plugins in neovim. It +also works as a library for connecting to and scripting neovim processes +through its msgpack-rpc API.") + (license license:asl2.0))) + +(define-public python2-pynvim + (package-with-python2 python-pynvim)) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 0c607e60c8..fdcd4521e8 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -456,14 +456,14 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers (define-public wireguard (package (name "wireguard") - (version "0.0.20190406") + (version "0.0.20190601") (source (origin (method url-fetch) (uri (string-append "https://git.zx2c4.com/WireGuard/snapshot/" "WireGuard-" version ".tar.xz")) (sha256 (base32 - "0ns1s31mfkj7nmapsnx126rj7xlydv7jv8infx5fg58byynz61ig")))) + "0s2mys78whsr0yw045a132iqx6nfy3c6hppiskbln5x04hc4ca3m")))) (build-system gnu-build-system) (outputs '("out" ; The WireGuard userspace tools "kernel-patch")) ; A patch to build Linux with WireGuard support diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 2e5605657e..6b151f0a31 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -271,7 +271,7 @@ API.") (define-public shaderc (package (name "shaderc") - (version "2018.0") + (version "2019.0") (source (origin (method git-fetch) @@ -281,7 +281,7 @@ API.") (file-name (git-file-name name version)) (sha256 (base32 - "0qigmj0riw43pgjn5f6kpvk72fajssz1lc2aiqib5qvmj9rqq3hl")))) + "1l5mmyxhzsbp0a6y2d86i8jmf46c6bjgjkdgkr5l8hmhflmm7gi2")))) (build-system meson-build-system) (arguments `(#:tests? #f ; FIXME: Tests fail. diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index 4940156db5..2c1562fb49 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -31,12 +31,13 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages gnunet) #:use-module (gnu packages libidn) - #:use-module (gnu packages python) - #:use-module (gnu packages perl) - #:use-module (gnu packages web) #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages tls) + #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -102,7 +103,7 @@ in downloaded documents to relative links.") (lambda _ (substitute* "wgetpaste" ((" poundpython\"") "\"") - (("-poundpython") "-dpaste")) + (("-poundpython") "-bpaste")) ; dpaste blocks tor users #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) @@ -123,11 +124,12 @@ in downloaded documents to relative links.") ,(delete-duplicates (map (lambda (command) (dirname (which command))) (list "bash" "mktemp" "sed" "sort" "tee" "tr" - "wget"))))) + "wget" "xclip"))))) #t)))) #:tests? #f)) ; no test target (inputs - `(("wget" ,wget))) + `(("wget" ,wget) + ("xclip" ,xclip))) (home-page "http://wgetpaste.zlin.dk/") (synopsis "Script that automates pasting to a number of pastebin services") (description diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 59716928f5..63916d1cc3 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -310,7 +310,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "4.8") + (version "4.10") (source (origin (method git-fetch) @@ -320,7 +320,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "0npm44zdys78qbqqyvjczqqjdgacpsfds3jxyy1y4yj2xjqzagsq")))) + "0kl5718c4xk8d1va1jb5jaa2n0vw3l0hi6bpc7siaww1fp64hy98")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -366,7 +366,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0dd1vw3bq47ypdpflgmmbi68pjw5z3wz26kfwvnkxqbp28fapfa8")))) + "041d3km85iqbshspy9av1fxjwq18xldrb18j04xl2fmpv1hq3pas")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("faudio" ,faudio) ("ffmpeg" ,ffmpeg) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 01c30c8198..f0589e98f1 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1140,7 +1140,7 @@ functionality to display information about the most commonly used services.") (define-public wlroots (package (name "wlroots") - (version "0.5.0") + (version "0.6.0") (source (origin (method git-fetch) @@ -1149,7 +1149,7 @@ functionality to display information about the most commonly used services.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1phiidyddzgaxy4gbqwmykxn0y8za6y5mp66l9dpd9i6fml153yq")))) + (base32 "1rdcmll5b8w242n6yfjpsaprq280ck2jmbz46dxndhignxgda7k4")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Dlogind-provider=elogind") @@ -1185,7 +1185,7 @@ modules for building a Wayland compositor.") (define-public sway (package (name "sway") - (version "1.0") + (version "1.1.1") (source (origin (method git-fetch) @@ -1194,7 +1194,7 @@ modules for building a Wayland compositor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "09cndc2nl39d3l7g5634xp0pxcz60pvc5277mfw89r22mh0j78rx")))) + (base32 "0yhn9zdg9mzfhn97c440lk3pw6122nrhx0is5sqmvgr6p814f776")))) (build-system meson-build-system) (arguments `(#:phases @@ -1231,7 +1231,7 @@ modules for building a Wayland compositor.") (define-public swayidle (package (name "swayidle") - (version "1.2") + (version "1.3") (source (origin (method git-fetch) @@ -1240,7 +1240,7 @@ modules for building a Wayland compositor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0b65flajwn2i6k2kdxxgw25w7ikzzmm595f4j5x1wac1rb0yah9w")))) + (base32 "04agcbhc473jkk7npb40i94ny8naykxzpjcw2lvl05kxv65y5d9v")))) (build-system meson-build-system) (inputs `(("wayland" ,wayland))) (native-inputs `(("pkg-config" ,pkg-config) @@ -1254,7 +1254,7 @@ modules for building a Wayland compositor.") (define-public swaylock (package (name "swaylock") - (version "1.3") + (version "1.4") (source (origin (method git-fetch) @@ -1263,7 +1263,7 @@ modules for building a Wayland compositor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "093nv1y9wyg48rfxhd36qdljjry57v1vkzrlc38mkf6zvsq8j7wb")))) + (base32 "1ii9ql1mxkk2z69dv6bg1x22nl3a46iww764wqjiv78x08xpk982")))) (build-system meson-build-system) (inputs `(("cairo" ,cairo) ("gdk-pixbuf" ,gdk-pixbuf) @@ -1279,3 +1279,29 @@ modules for building a Wayland compositor.") (synopsis "Screen locking utility for Wayland compositors") (description "Swaylock is a screen locking utility for Wayland compositors.") (license license:expat))) ; MIT license + +(define-public swaybg + (package + (name "swaybg") + (version "1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/swaywm/swaybg.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1lmqz5bmig90gq2m7lwf02d2g7z4hzf8fhqz78c8vk92c6p4xwbc")))) + (build-system meson-build-system) + (inputs `(("cairo" ,cairo) + ("gdk-pixbuf" ,gdk-pixbuf) + ("wayland" ,wayland))) + (native-inputs `(("git" ,git) + ("pkg-config" ,pkg-config) + ("scdoc" ,scdoc) + ("wayland-protocols" ,wayland-protocols))) + (home-page "https://github.com/swaywm/sway") + (synopsis "Screen wallpaper utility for Wayland compositors") + (description "Swaybg is a wallpaper utility for Wayland compositors.") + (license license:expat))) ; MIT license diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index c3ddf9f866..c518508360 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1023,3 +1023,45 @@ the libburnia libraries. It can blank CD/DVD/BD(-RW)s, burn and create iso images, audio CDs, as well as burn personal compositions of data to either CD/DVD/BD.") (license gpl2+))) + +(define-public mousepad + (package + (name "mousepad") + (version "0.4.1") + (source (origin + (method url-fetch) + (uri (string-append "http://archive.xfce.org/src/apps/mousepad/" + (version-major+minor version) "/mousepad-" + version ".tar.bz2")) + (sha256 + (base32 + "12si6fvhp68wz4scr339c23jxqq5ywn5nf4w55jld5lxjadkg9rr")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--enable-gtk3" + ;; Use the GSettings keyfile backend rather than + ;; DConf. + "--enable-keyfile-settings") + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gtksourceview (assoc-ref inputs "gtksourceview"))) + (wrap-program (string-append out "/bin/mousepad") + ;; For language-specs. + `("XDG_DATA_DIRS" ":" prefix (,(string-append gtksourceview + "/share"))))) + #t))))) + (native-inputs + `(("intltool" ,intltool) + ("glib" ,glib "bin") ; for glib-compile-schemas. + ("pkg-config" ,pkg-config))) + (inputs + `(("gtk+" ,gtk+) + ("gtksourceview" ,gtksourceview-3))) + (home-page "https://git.xfce.org/apps/mousepad/") + (synopsis "Simple text editor for Xfce") + (description + "Mousepad is a graphical text editor for Xfce based on Leafpad.") + (license gpl2+))) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 32bbec2181..ee454251a0 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -85,14 +85,14 @@ things the parser might find in the XML document (like start tags).") (define-public libebml (package (name "libebml") - (version "1.3.7") + (version "1.3.9") (source (origin (method url-fetch) (uri (string-append "https://dl.matroska.org/downloads/libebml/" "libebml-" version ".tar.xz")) (sha256 - (base32 "1x79b35dj5d2x7xf7ql83w2cr0v5n2vsd08q6y6grmw4yn3lq973")))) + (base32 "0j65r6i7s2k67c8f9wa653mqpxmfhdl67kjxrc1n5910ig6wddn6")))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -1086,7 +1086,7 @@ C++ programming language.") (define-public tinyxml2 (package (name "tinyxml2") - (version "4.0.1") + (version "7.0.1") (source (origin (method git-fetch) @@ -1095,10 +1095,8 @@ C++ programming language.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1a0skfi8rzk53qcxbv88qlvhlqzvsvg4hm20dnx4zw7vrn6anr9y")))) + (base32 "1sf6sch1kawrna2f9dc8f4xl836acqcddkghzdib0s7dl48m9r7m")))) (build-system cmake-build-system) - (arguments - `(#:tests? #f)) ; no tests (synopsis "Small XML parser for C++") (description "TinyXML2 is a small and simple XML parsing library for the C++ programming language.") diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ed718c5539..68501139e0 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5079,7 +5079,7 @@ over Xlib, including: (define-public xorg-server (package (name "xorg-server") - (version "1.20.4") + (version "1.20.5") (source (origin (method url-fetch) @@ -5088,7 +5088,7 @@ over Xlib, including: "xorg-server-" version ".tar.bz2")) (sha256 (base32 - "1vk6j7hmigfill9x8m7a6vvgb3s50ji2yf6yprbgqfz9xf9x83zy")) + "17dc3g8cc55nbkx3np64dsz04n621dnzjmcc9wys0xbyyd1q47d8")) (patches (list ;; See: @@ -5210,7 +5210,16 @@ draggable titlebars and borders.") (define-public xorg-server-for-tests (hidden-package (package - (inherit xorg-server)))) + (inherit xorg-server) + (version "1.20.4") + (source (origin + (inherit (package-source xorg-server)) + (uri (string-append + "mirror://xorg/individual/xserver/" + "xorg-server-" version ".tar.bz2")) + (sha256 + (base32 + "1vk6j7hmigfill9x8m7a6vvgb3s50ji2yf6yprbgqfz9xf9x83zy"))))))) (define-public xorg-server-xwayland (package |