diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-08-13 20:39:08 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-08-13 20:39:32 +0200 |
| commit | b86c019efbc5c4ea35f3cd6d2f52985f40e49e6c (patch) | |
| tree | 01c8ec8d4172c2834bef1e8859d6ca8b99338470 | |
| parent | 25bd72678ae4048b0b84ee82bc5f2644367e9715 (diff) | |
| parent | 7b38f045c04fe69001ff5c2f04486cc51a69ae82 (diff) | |
| download | guix-b86c019efbc5c4ea35f3cd6d2f52985f40e49e6c.tar guix-b86c019efbc5c4ea35f3cd6d2f52985f40e49e6c.tar.gz | |
Merge branch 'staging' into core-updates
76 files changed, 1384 insertions, 672 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 080b091b31..85f51210a3 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11141,7 +11141,7 @@ This is the type for statically-configured network interfaces. @end defvr @deffn {Scheme Procedure} static-networking-service @var{interface} @var{ip} @ - [#:netmask #f] [#:gateway #f] [#:name-servers @code{'()}] + [#:netmask #f] [#:gateway #f] [#:name-servers @code{'()}] @ [#:requirement @code{'(udev)}] Return a service that starts @var{interface} with address @var{ip}. If @var{netmask} is true, use it as the network mask. If @var{gateway} is true, diff --git a/gnu/local.mk b/gnu/local.mk index 9eb6360375..1e2ce8f49e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -649,6 +649,7 @@ dist_patch_DATA = \ %D%/packages/patches/elogind-glibc-2.27.patch \ %D%/packages/patches/einstein-build.patch \ %D%/packages/patches/emacs-exec-path.patch \ + %D%/packages/patches/emacs-exwm-fix-fullscreen-issue.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ @@ -803,6 +804,7 @@ dist_patch_DATA = \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ + %D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/jacal-fix-texinfo.patch \ %D%/packages/patches/jamvm-arm.patch \ @@ -918,12 +920,14 @@ dist_patch_DATA = \ %D%/packages/patches/luit-posix.patch \ %D%/packages/patches/luminance-hdr-qt-printer.patch \ %D%/packages/patches/lvm2-static-link.patch \ + %D%/packages/patches/lxc-CVE-2018-6556.patch \ %D%/packages/patches/lxsession-use-gapplication.patch \ %D%/packages/patches/lyx-2.2.3-fix-test.patch \ %D%/packages/patches/mailutils-uninitialized-memory.patch \ %D%/packages/patches/make-glibc-compat.patch \ %D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/mariadb-gcc-ice.patch \ + %D%/packages/patches/mariadb-client-test-32bit.patch \ %D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-sfml-2.3.patch \ %D%/packages/patches/maxima-defsystem-mkdir.patch \ @@ -980,7 +984,6 @@ dist_patch_DATA = \ %D%/packages/patches/ola-readdir-r.patch \ %D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \ - %D%/packages/patches/openblas-fix-tests-i686.patch \ %D%/packages/patches/openexr-missing-samples.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openldap-CVE-2017-9287.patch \ @@ -1030,7 +1033,6 @@ dist_patch_DATA = \ %D%/packages/patches/plink-1.07-unclobber-i.patch \ %D%/packages/patches/plink-endian-detection.patch \ %D%/packages/patches/plotutils-libpng-jmpbuf.patch \ - %D%/packages/patches/polkit-drop-test.patch \ %D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portmidi-modular-build.patch \ %D%/packages/patches/potrace-tests.patch \ @@ -1042,7 +1044,6 @@ dist_patch_DATA = \ %D%/packages/patches/psm-ldflags.patch \ %D%/packages/patches/psm-repro.patch \ %D%/packages/patches/pulseaudio-fix-mult-test.patch \ - %D%/packages/patches/pulseaudio-glibc-2.27.patch \ %D%/packages/patches/pulseaudio-longer-test-timeout.patch \ %D%/packages/patches/pybugz-encode-error.patch \ %D%/packages/patches/pybugz-stty.patch \ @@ -1206,6 +1207,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/wpa-supplicant-CVE-2017-13082.patch \ + %D%/packages/patches/wpa-supplicant-CVE-2018-14526.patch \ %D%/packages/patches/wpa-supplicant-fix-key-reuse.patch \ %D%/packages/patches/wpa-supplicant-fix-zeroed-keys.patch \ %D%/packages/patches/wpa-supplicant-fix-nonce-reuse.patch \ @@ -1230,7 +1232,6 @@ dist_patch_DATA = \ %D%/packages/patches/xinetd-fix-fd-leak.patch \ %D%/packages/patches/xinetd-CVE-2013-4342.patch \ %D%/packages/patches/xmodmap-asprintf.patch \ - %D%/packages/patches/xorg-server-rotate-fb.patch \ %D%/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch \ %D%/packages/patches/zathura-plugindir-environment-variable.patch \ %D%/packages/patches/zstd-fix-stdin-list-without-tty.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 73772166ab..edc1349c46 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1048,6 +1048,7 @@ commands and their arguments.") version ".tar.gz")) (patches (search-patches "wpa-supplicant-CVE-2017-13082.patch" + "wpa-supplicant-CVE-2018-14526.patch" "wpa-supplicant-fix-key-reuse.patch" "wpa-supplicant-fix-zeroed-keys.patch" "wpa-supplicant-fix-nonce-reuse.patch" diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 58d67f2ebb..89f2275ebe 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1393,6 +1393,14 @@ especially for creating reverb effects. It supports impulse responses with 1, (base32 "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm")))) (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-configure + (lambda _ + (substitute* "configure" + ;; Install to <out/lib> regardless of platform. + (("libnn=lib64") "libnn=lib")) + #t))))) (inputs `(("alsa-lib" ,alsa-lib) ("readline" ,readline))) diff --git a/gnu/packages/autogen.scm b/gnu/packages/autogen.scm index f3ab30b10a..5fc61fc70e 100644 --- a/gnu/packages/autogen.scm +++ b/gnu/packages/autogen.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,7 +32,7 @@ (define-public autogen (package (name "autogen") - (version "5.18.12") + (version "5.18.14") (source (origin (method url-fetch) @@ -39,12 +40,12 @@ "/autogen-" version ".tar.xz")) (sha256 (base32 - "1n5zq4872sakvz9c7ncsdcfp0z8rsybsxvbmhkpbd19ii0pacfxy")))) + "1r06gam7sicb9ssn02mhv6r0g5vr4k0l0c67shpqa5i172cspizz")))) (build-system gnu-build-system) - (native-inputs `(("perl" ,perl) ;for doc generator mdoc - ("pkg-config" ,pkg-config))) - (inputs `(("which" ,which) - ("guile" ,guile-2.0))) + (native-inputs `(("pkg-config" ,pkg-config) + ("which" ,which))) + (inputs `(("guile" ,guile-2.0) + ("perl" ,perl))) ; for doc generator mdoc (arguments '(#:phases (modify-phases %standard-phases @@ -54,8 +55,7 @@ (substitute* (append (find-files "agen5/test" "\\.test$") (find-files "autoopts/test" "\\.(test|in)$")) - (("/bin/sh") sh) - (("/usr/bin/tr") "tr")) + (("/bin/sh") sh)) #t)))))) (home-page "https://www.gnu.org/software/autogen/") (synopsis "Automated program generator") diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 9884f58fc3..ca880d6c05 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -105,6 +105,15 @@ (substitute* "duplicity/gpginterface.py" (("self.call = 'gpg'") (string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'"))) + + ;; This matches up with an unreleased upstream fix, it should be + ;; removed when the package is updated + ;; https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/revision/1308 + (substitute* "duplicity/gpg.py" + (("--no-secmem-warning'\\)") + "--no-secmem-warning') + gnupg.options.extra_args.append('--ignore-mdc-error')")) + (substitute* '("testing/functional/__init__.py" "testing/overrides/bin/lftp") (("/bin/sh") (which "sh"))) @@ -485,8 +494,21 @@ detection, and lossless compression.") (modules '((guix build utils))) (snippet '(begin + ;; Delete files generated by Cython. We used to have a regex + ;; that created the list of generated files but Borg has + ;; added new non-generated C files that cause the regex to + ;; generate the wrong list. (for-each delete-file - (find-files "borg" "^(c|h|p).*\\.c$")) + '("src/borg/algorithms/checksums.c" + "src/borg/chunker.c" + "src/borg/compress.c" + "src/borg/crypto/low_level.c" + "src/borg/hashindex.c" + "src/borg/item.c" + "src/borg/platform/darwin.c" + "src/borg/platform/freebsd.c" + "src/borg/platform/linux.c" + "src/borg/platform/posix.c")) ;; Remove bundled shared libraries. (with-directory-excursion "src/borg/algorithms" (for-each delete-file-recursively @@ -853,6 +875,15 @@ is like a time machine for your data. ") ,version) (invoke "go" "run" "build.go")))) + (replace 'check + (lambda _ + (with-directory-excursion (string-append + "src/github.com/restic/restic-" + ,version) + ;; unexpected error: fusermount: exit status 1 + (delete-file "cmd/restic/integration_fuse_test.go") + (invoke "go" "run" "build.go" "--test")))) + (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 849225bd78..13572b0c75 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13030,7 +13030,7 @@ methylation and segmentation.") (define-public pigx-scrnaseq (package (name "pigx-scrnaseq") - (version "0.0.6") + (version "0.0.7") (source (origin (method url-fetch) (uri (string-append "https://github.com/BIMSBbioinfo/pigx_scrnaseq/" @@ -13038,7 +13038,7 @@ methylation and segmentation.") "/pigx_scrnaseq-" version ".tar.gz")) (sha256 (base32 - "0fvdymnka598z2ka7zk6rwrf9dq89p5lyd2y9swvyg72hn1jwjai")))) + "131zarirv16w8653m0d66jgjnwqfsxqc0hix0rypssz4d83bl51j")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -13061,6 +13061,7 @@ methylation and segmentation.") ("python-loompy" ,python-loompy) ("ghc-pandoc" ,ghc-pandoc-1) ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc-with-pandoc-1) + ("samtools" ,samtools) ("snakemake" ,snakemake-4) ("star" ,star) ("r-minimal" ,r-minimal) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index aaae0a0a6e..1c9b41ef5b 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -25,6 +25,7 @@ #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages compression) @@ -76,16 +77,16 @@ makes a few sacrifices to acquire fast full and incremental build times.") (define-public bear (package (name "bear") - (version "2.3.11") + (version "2.3.12") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/rizsotto/Bear/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/rizsotto/Bear") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1m0w0wqnz983l7fpp5p9pdsqr7n3ybrzp8ywjcvn0rihsrzj65j6")))) + "1zzz2yiiny9pm4h6ayb82xzxc2j5djcpf8va2wagcw92m7w6miqw")))) (build-system cmake-build-system) (inputs `(("python" ,python-wrapper))) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 384fc57317..3659115960 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> +;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -769,3 +770,43 @@ to produce new complete file system images or add-on images to be appended to the read file system image. Supported extensions to ISO 9660 are Rock Ridge, Joliet, AAIP, zisofs.") (license gpl2+))) + +(define-public cdrkit-libre + (package + (name "cdrkit-libre") + (version "1.1.11") + (source (origin + (method url-fetch) + ;; cdrkit.org is dead. + ;; + ;; ‘cdrkit-libre’ removes a couple of problematic files, + ;; see <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32165#14>. + (uri (string-append + "https://repo.parabola.nu/other/cdrkit-libre/cdrkit-libre-" + version ".tar.gz")) + (sha256 + (base32 + "0g2zyzb56czh429qy87lvaddzjnlcq8c616ddxsmsshz3clhyzrh")))) + (build-system cmake-build-system) + (inputs + `(("bzip2" ,bzip2) + ("libcap" ,libcap) + ("perl" ,perl) + ("zlib" ,zlib))) + (arguments + `(#:tests? #f ;no tests + #:phases + (modify-phases %standard-phases + (add-after 'install 'old-cdrecord + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion (string-append (assoc-ref outputs "out") + "/bin") + (symlink "genisoimage" "mkisofs") + (symlink "wodim" "cdrecord")) + #t))))) + (home-page "https://repo.parabola.nu/other/cdrkit-libre/") + (synopsis "Command-line CD/DVD recorder") + (description "Cdrkit is a suite of programs for recording CDs and DVDs, +blanking CD-RW media, creating ISO-9660 file system images, extracting audio +CD data, and more. It's mostly compatible with @code{cdrtools}.") + (license gpl2+))) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index c206fd8664..bdae21ff64 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -661,13 +661,13 @@ sfArk file format to the uncompressed sf2 format.") (package (name "libmspack") (home-page "https://cabextract.org.uk/libmspack/") - (version "0.7") + (version "0.7.1") (source (origin (method url-fetch) (uri (string-append home-page name "-" version "alpha.tar.gz")) (sha256 - (base32 "0wi7ydq8vjiq0kfnpkj2d6vll2s49x38bywnsdqphqb0vdn53q1n")))) + (base32 "0zn4vwzk5ankgd0l88cipan19pzbzv0sm3fba17lvqwka3dp1acp")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static"))) @@ -1231,7 +1231,7 @@ install: libbitshuffle.so (define-public java-snappy (package (name "java-snappy") - (version "1.1.7") + (version "1.1.7.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/xerial/snappy-java/archive/" @@ -1239,7 +1239,7 @@ install: libbitshuffle.so (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0q4kxz2n97czf6g5gzq0d8yz22cgiaj7wp51rzsswh3bi99bpgg5")))) + "1p557vdv006ysgxbpp83krmq0066k46108vyiyka69w8i4i8rbbm")))) (build-system ant-build-system) (arguments `(#:jar-name "snappy.jar" @@ -1313,8 +1313,8 @@ install: libbitshuffle.so ("perl" ,perl))) (home-page "https://github.com/xerial/snappy-java") (synopsis "Compression/decompression algorithm in Java") - (description "Snappy-java is a Java port of the snappy, a fast C++ -compresser/decompresser.") + (description "Snappy-java is a Java port of snappy, a fast C++ +compressor/decompressor.") (license license:asl2.0))) (define-public java-snappy-1 diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 08bbda12e0..a0fbd7738a 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -144,19 +144,19 @@ tunneling, and so on.") (define-public kurly (package (name "kurly") - (version "1.2.1") + (version "1.2.2") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/davidjpeacock/kurly.git") + (url "https://gitlab.com/davidjpeacock/kurly.git") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "01kp33gvzxmk6ipz7323wqwmbc90q2mwzsjig8rzpqsm4kji5hi6")))) + "003jv2k45hg2svhjpy5253ccd250vi2r17x2zhm51iw54kgwxipm")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/davidjpeacock/kurly" + `(#:import-path "gitlab.com/davidjpeacock/kurly" #:install-source? #f #:phases (modify-phases %standard-phases @@ -169,20 +169,20 @@ tunneling, and so on.") (with-directory-excursion source (install-file "README.md" doc) (mkdir-p man) - (copy-file "meta/kurly.man" + (copy-file "doc/kurly.man" (string-append man "/kurly.1"))) #t)))))) (inputs `(("go-github-com-alsm-ioprogress" ,go-github-com-alsm-ioprogress) ("go-github-com-aki237-nscjar" ,go-github-com-aki237-nscjar) - ("go-github-com-davidjpeacock-cli" ,go-github-com-davidjpeacock-cli))) + ("go-github-com-urfave-cli" ,go-github-com-urfave-cli))) (synopsis "Command-line HTTP client") (description "kurly is an alternative to the @code{curl} program written in Go. kurly is designed to operate in a similar manner to curl, with select features. Notably, kurly is not aiming for feature parity, but common flags and mechanisms particularly within the HTTP(S) realm are to be expected. kurly does not offer a replacement for libcurl.") - (home-page "https://github.com/davidjpeacock/kurly") + (home-page "https://gitlab.com/davidjpeacock/kurly") (license license:asl2.0))) (define-public guile-curl diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 5561d05a1b..5820314289 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -627,7 +627,7 @@ Language.") (define-public mariadb (package (name "mariadb") - (version "10.1.33") + (version "10.1.35") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.org/f/" @@ -635,7 +635,22 @@ Language.") name "-" version ".tar.gz")) (sha256 (base32 - "0bax748j4srsyhw5cs5jvwigndh0zwmf4r2cjvhja31ckx8jqccl")))) + "0k9walaglwmwdwmkq48ir17g98n83vliyyg5wck22rjgxn2xk4cy")) + (patches (search-patches "mariadb-gcc-ice.patch" + "mariadb-client-test-32bit.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete bundled snappy and xz. + (delete-file-recursively "storage/tokudb/PerconaFT/third_party") + + ;; Preserve CMakeLists.txt for these. + (for-each (lambda (file) + (unless (string-suffix? "CMakeLists.txt" file) + (delete-file file))) + (append (find-files "extra/yassl") + (find-files "pcre") (find-files "zlib"))) + #t)))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -649,6 +664,12 @@ Language.") ;; For now, disable the features that that use libarchive (xtrabackup). "-DWITH_LIBARCHIVE=OFF" + ;; Ensure the system libraries are used. + "-DWITH_JEMALLOC=yes" + "-DWITH_PCRE=system" + "-DWITH_SSL=system" + "-DWITH_ZLIB=system" + "-DDEFAULT_CHARSET=utf8" "-DDEFAULT_COLLATION=utf8_general_ci" "-DMYSQL_DATADIR=/var/lib/mysql" @@ -662,26 +683,89 @@ Language.") "-DINSTALL_SUPPORTFILESDIR=share/mysql/support-files" "-DINSTALL_MYSQLSHAREDIR=share/mysql" "-DINSTALL_DOCDIR=share/mysql/docs" - "-DINSTALL_SHAREDIR=share/mysql") + "-DINSTALL_SHAREDIR=share") #:phases (modify-phases %standard-phases + (add-after 'unpack 'unbundle + (lambda _ + ;; The bundled PCRE in MariaDB has a patch that was upstreamed + ;; in version 8.34. Unfortunately the upstream patch behaves + ;; slightly differently and the build system fails to detect it. + ;; See <https://bugs.exim.org/show_bug.cgi?id=2173>. + ;; XXX: Consider patching PCRE instead. + (substitute* "cmake/pcre.cmake" + ((" OR NOT PCRE_STACK_SIZE_OK") "")) + + (substitute* "storage/tokudb/PerconaFT/ft/CMakeLists.txt" + ;; Remove dependency on these CMake targets. + ((" build_lzma build_snappy") "")) + + (substitute* "storage/tokudb/PerconaFT/CMakeLists.txt" + ;; This file checks that the bundled sources are present and + ;; declares build procedures for them. We don't need that. + (("^include\\(TokuThirdParty\\)") "")) - ;; Apply this patch that's only needed on ARM. - ,@(if (and (not (%current-target-system)) - (string=? "armhf-linux" (%current-system))) - `((add-after 'unpack 'apply-patch - (lambda* (#:key inputs #:allow-other-keys) - (let ((patch (assoc-ref inputs "gcc-ice-patch"))) - (invoke "patch" "-p1" "--force" - "--input" patch) - #t)))) - '()) - - (add-before - 'configure 'pre-configure - (lambda _ - (setenv "CONFIG_SHELL" (which "sh")) - #t)) + #t)) + (add-after 'unpack 'adjust-tests + (lambda _ + (let ((disabled-tests + '(;; These fail because root@hostname == root@localhost in + ;; the build environment, causing a user count mismatch. + ;; See <https://jira.mariadb.org/browse/MDEV-7761>. + "main.join_cache" + "main.explain_non_select" + "roles.acl_statistics" + + ;; FIXME: This test fails on i686: + ;; -myisampack: Can't create/write to file (Errcode: 17 "File exists") + ;; +myisampack: Can't create/write to file (Errcode: 17 "File exists) + ;; When running "myisampack --join=foo/t3 foo/t1 foo/t2" + ;; (all three tables must exist and be identical) + ;; in a loop it produces the same error around 1/240 times. + ;; montywi on #maria suggested removing the real_end check in + ;; "strings/my_vsnprintf.c" on line 503, yet it still does not + ;; reach the ending quote occasionally. Disable it for now. + "main.myisampack" + ;; FIXME: This test fails on armhf-linux: + "mroonga/storage.index_read_multiple_double")) + + ;; This file contains a list of known-flaky tests for this + ;; release. Append our own items. + (unstable-tests (open-file "mysql-test/unstable-tests" "a"))) + (for-each (lambda (test) + (format unstable-tests "~a : ~a\n" + test "Disabled in Guix")) + disabled-tests) + (close-port unstable-tests) + + (substitute* "mysql-test/mysql-test-run.pl" + (("/bin/ls") (which "ls")) + (("/bin/sh") (which "sh"))) + #t))) + (add-before 'configure 'disable-plugins + (lambda _ + (let ((disable-plugin (lambda (name) + (call-with-output-file + (string-append "plugin/" name + "/CMakeLists.txt") + (lambda (port) + (format port "\n"))))) + (disabled-plugins '(;; XXX: Causes a test failure. + "disks"))) + (for-each disable-plugin disabled-plugins) + #t))) + (replace 'check + (lambda* (#:key (tests? #t) #:allow-other-keys) + (if tests? + (with-directory-excursion "mysql-test" + (invoke "./mtr" "--verbose" + "--retry=3" + "--testcase-timeout=40" + "--suite-timeout=600" + "--parallel" (number->string (parallel-job-count)) + "--skip-test-list=unstable-tests")) + (format #t "test suite not run~%")) + #t)) (add-after 'install 'post-install (lambda* (#:key outputs #:allow-other-keys) @@ -694,14 +778,15 @@ Language.") (with-directory-excursion out (for-each delete-file-recursively '("data" "mysql-test" "sql-bench" - "share/man/man1/mysql-test-run.pl.1"))) + "share/man/man1/mysql-test-run.pl.1")) + ;; Delete huge mysqltest executables. + (for-each delete-file (find-files "bin" "test")) + ;; And static libraries. + (for-each delete-file (find-files "lib" "\\.a$"))) #t)))))) (native-inputs `(("bison" ,bison) - ("perl" ,perl) - ,@(if (string=? "armhf-linux" (%current-system)) - `(("gcc-ice-patch" ,(search-patch "mariadb-gcc-ice.patch"))) - '()))) + ("perl" ,perl))) (inputs `(("jemalloc" ,jemalloc) ("libaio" ,libaio) @@ -709,7 +794,12 @@ Language.") ("ncurses" ,ncurses) ("openssl" ,openssl) ("pcre" ,pcre) + ("snappy" ,snappy) + ("xz" ,xz) ("zlib" ,zlib))) + ;; The test suite is very resource intensive and can take more than three + ;; hours on a x86_64 system. Give slow and busy machines some leeway. + (properties '((timeout . 64800))) ;18 hours (home-page "https://mariadb.org/") (synopsis "SQL database server") (description @@ -721,14 +811,14 @@ as a drop-in replacement of MySQL.") (define-public postgresql (package (name "postgresql") - (version "10.4") + (version "10.5") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "0j000bcs9w8wrllg8m7j1lxsd3n2x0yzkack5p35cmxx20iq2q0v")))) + "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-uuid=e2fs") @@ -1456,7 +1546,7 @@ valid SQL query.") (define-public unixodbc (package (name "unixodbc") - (version "2.3.4") + (version "2.3.6") (source (origin (method url-fetch) (uri @@ -1464,7 +1554,7 @@ valid SQL query.") "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-" version ".tar.gz")) (sha256 - (base32 "0f8y88rcc2akjvjv5y66yx7k0ms9h1s0vbcfy25j93didflhj59f")))) + (base32 "0sads5b8cmmj526gyjba7ccknl1vbhkslfqshv1yqln08zv3gdl8")))) (build-system gnu-build-system) (synopsis "Data source abstraction library") (description "Unixodbc is a library providing an API with which to access diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index ffa442f4d6..a8ac3feaa7 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -103,7 +103,7 @@ and BOOTP/TFTP for network booting of diskless machines.") (define-public isc-bind (package (name "bind") - (version "9.12.2") + (version "9.12.2-P1") (source (origin (method url-fetch) (uri (string-append @@ -111,7 +111,7 @@ and BOOTP/TFTP for network booting of diskless machines.") version ".tar.gz")) (sha256 (base32 - "0ll46igs9xfq2qclc5wzqsnj3zv7ssga0544gm24s1m7765lqslz")))) + "192ld6w8f4n46hvdmmzzrfkd28apf4dwmbpbi3j2q1d2p315ajww")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 15b893c30d..52dde26f44 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -243,7 +243,7 @@ easy.") (define-public snap (package (name "snap") - (version "4.1.2.7") + (version "4.2.1.3") (source (origin (method git-fetch) @@ -253,7 +253,7 @@ easy.") (file-name (git-file-name name version)) (sha256 (base32 - "0cy3jhqqpmivqnfm9kmlnh3fhf3m3y4xqhikblk8vfjprh6vmcvd")))) + "0n32hg8rx6alk5j58l76gzmicrg1bp7jagz5mh1zrg7591aicjal")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 2ac7e010e7..3a8419ee83 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6290,7 +6290,8 @@ It should enable you to implement low-level X11 applications.") version ".tar")) (sha256 (base32 - "11xd2w4h3zdwkdxypvmcz8s7q72cn76lfr9js77jbizyj6b04lr0")))) + "11xd2w4h3zdwkdxypvmcz8s7q72cn76lfr9js77jbizyj6b04lr0")) + (patches (search-patches "emacs-exwm-fix-fullscreen-issue.patch")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-xelb" ,emacs-xelb))) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index fd2a5af0cb..2cbd4854ec 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -825,28 +825,19 @@ Luhn and family of ISO/IEC 7064 check digit algorithms. ") (define-public python-duniterpy (package (name "python-duniterpy") - (version "0.43.2") + (version "0.43.7") (source (origin (method git-fetch) ;; Pypi's default URI is missing "requirements.txt" file. (uri (git-reference - (url "https://github.com/duniter/duniter-python-api.git") + (url "https://git.duniter.org/clients/python/duniterpy.git") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "1ch4f150k1p1l876pp08p5rxqhpv5xfbxdw6njcmr06hspv8v8x4")))) + "19m36z98361bqxjdb65597j2kxbly491927c6p9z47s1vxc3raaq")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; Among 108 tests, a single one is failing: FAIL: - ;; test_from_pubkey. Remove it. - (add-after 'unpack 'remove-failing-test - (lambda _ - (delete-file "tests/documents/test_crc_pubkey.py") - #t))))) (propagated-inputs `(("python-aiohttp" ,python-aiohttp) ("python-base58" ,python-base58) @@ -854,7 +845,7 @@ Luhn and family of ISO/IEC 7064 check digit algorithms. ") ("python-libnacl" ,python-libnacl) ("python-pylibscrypt" ,python-pylibscrypt) ("python-pypeg2" ,python-pypeg2))) - (home-page "https://github.com/duniter/duniter-python-api") + (home-page "https://git.duniter.org/clients/python/duniterpy") (synopsis "Python implementation of Duniter API") (description "@code{duniterpy} is an implementation of @uref{https://github.com/duniter/duniter/, duniter} API. Its diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a76a36ff58..8ad4b467c6 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -148,14 +148,14 @@ freedesktop.org project.") (define-public libinput (package (name "libinput") - (version "1.11.1") + (version "1.11.3") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" name "-" version ".tar.xz")) (sha256 (base32 - "1z7i8vk0i61npkdqwsk85wp9v4yjlvylqnyydikjqnbsrjp9abk4")))) + "01nb1shnl871d939wgfd7nc9svclcnfjfhlq64b4yns2dvcr24gk")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false"))) @@ -475,7 +475,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") (define-public wayland-protocols (package (name "wayland-protocols") - (version "1.14") + (version "1.15") (source (origin (method url-fetch) (uri (string-append @@ -483,7 +483,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") "wayland-protocols-" version ".tar.xz")) (sha256 (base32 - "1xknjcfhqvdi1s4iq4kk1q61fg2rar3g8q4vlqarpd324imqjj4n")))) + "1qlyf9cllr2p339xxplznh023qcwj5iisp02ikx7ps349dx75fys")))) (build-system gnu-build-system) (inputs `(("wayland" ,wayland))) diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index f3211d9031..f687b9814d 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -46,7 +46,7 @@ (define-public lftp (package (name "lftp") - (version "4.8.3") + (version "4.8.4") (source (origin (method url-fetch) ;; See https://lftp.tech/get.html for mirrors. @@ -58,7 +58,7 @@ "ftp/lftp/lftp-" version ".tar.xz"))) (sha256 (base32 - "12y77jlfs4x4zvcah92mw2h2sb4j0bvbaxkh3wwsm8gs392ywyny")))) + "0qks22357xv9y6ripmf5j2n5svh8j5z0yniphfk89sjwkqg2gg2f")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -74,7 +74,8 @@ (lambda _ (substitute* "tests/Makefile" (("(ftp-cls-l|ftp-list|http-get)\\$\\(EXEEXT\\)") "") - (("lftp-https-get ") ""))))) + (("lftp-https-get ") "")) + #t))) #:configure-flags (list (string-append "--with-readline=" (assoc-ref %build-inputs "readline"))))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6d4ce1f17d..453f732a5d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -67,11 +67,22 @@ #:use-module (gnu packages admin) #:use-module (gnu packages audio) #:use-module (gnu packages avahi) + #:use-module (gnu packages bash) + #:use-module (gnu packages bison) #:use-module (gnu packages boost) + #:use-module (gnu packages check) + #:use-module (gnu packages cmake) + #:use-module (gnu packages compression) + #:use-module (gnu packages curl) #:use-module (gnu packages crypto) + #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages docbook) + #:use-module (gnu packages flex) #:use-module (gnu packages fltk) + #:use-module (gnu packages fonts) + #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages fribidi) #:use-module (gnu packages game-development) @@ -82,67 +93,56 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnuzilla) #:use-module (gnu packages gperf) #:use-module (gnu packages graphics) + #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) + #:use-module (gnu packages icu4c) + #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages less) #:use-module (gnu packages libcanberra) #:use-module (gnu packages libedit) #:use-module (gnu packages libunwind) + #:use-module (gnu packages linux) + #:use-module (gnu packages lua) #:use-module (gnu packages haskell) #:use-module (gnu packages mp3) #:use-module (gnu packages music) #:use-module (gnu packages multiprecision) - #:use-module (gnu packages icu4c) - #:use-module (gnu packages image) #:use-module (gnu packages ncurses) #:use-module (gnu packages netpbm) #:use-module (gnu packages networking) #:use-module (gnu packages ocaml) + #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) + #:use-module (gnu packages perl-check) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages qt) #:use-module (gnu packages readline) - #:use-module (gnu packages textutils) - #:use-module (gnu packages xorg) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages databases) #:use-module (gnu packages shells) #:use-module (gnu packages sdl) + #:use-module (gnu packages serialization) #:use-module (gnu packages swig) - #:use-module (gnu packages texinfo) - #:use-module (gnu packages check) - #:use-module (gnu packages fonts) - #:use-module (gnu packages fontutils) - #:use-module (gnu packages gstreamer) - #:use-module (gnu packages bash) - #:use-module (gnu packages perl) - #:use-module (gnu packages perl-check) - #:use-module (gnu packages qt) - #:use-module (gnu packages compression) - #:use-module (gnu packages pulseaudio) - #:use-module (gnu packages linux) - #:use-module (gnu packages xiph) - #:use-module (gnu packages curl) - #:use-module (gnu packages lua) - #:use-module (gnu packages video) - #:use-module (gnu packages xml) #:use-module (gnu packages tcl) - #:use-module (gnu packages xdisorg) + #:use-module (gnu packages texinfo) + #:use-module (gnu packages textutils) #:use-module (gnu packages tls) - #:use-module (gnu packages pcre) - #:use-module (gnu packages cyrus-sasl) - #:use-module (gnu packages messaging) #:use-module (gnu packages upnp) - #:use-module (gnu packages wxwidgets) - #:use-module (gnu packages bison) - #:use-module (gnu packages flex) - #:use-module (gnu packages cmake) - #:use-module (gnu packages gnuzilla) - #:use-module (gnu packages icu4c) - #:use-module (gnu packages networking) + #:use-module (gnu packages video) #:use-module (gnu packages vulkan) #:use-module (gnu packages web) + #:use-module (gnu packages wxwidgets) + #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xorg) + #:use-module (gnu packages xiph) + #:use-module (gnu packages xml) + #:use-module (gnu packages messaging) + #:use-module (gnu packages networking) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system haskell) @@ -1483,34 +1483,53 @@ are primarily in English, however some in other languages are provided.") "/" version "/irrlicht-" version ".zip")) (sha256 (base32 - "0cz4z4dwrv5ypl19ll67wl6jjpy5k6ly4vr042w4br88qq5jhazl")))) + "0cz4z4dwrv5ypl19ll67wl6jjpy5k6ly4vr042w4br88qq5jhazl")) + (patches (search-patches "irrlicht-use-system-libs.patch")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file-recursively + '("bin" ; bundled compiled Windows binaries" + "source/Irrlicht/MacOSX" + "source/Irrlicht/bzip2" + "source/Irrlicht/jpeglib" + "source/Irrlicht/libpng" + "source/Irrlicht/lzma" + "source/Irrlicht/zlib")) + (delete-file "source/Irrlicht/glext.h") + (delete-file "source/Irrlicht/glxext.h") + (delete-file "source/Irrlicht/wglext.h") + #t)))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-build-env + (add-after 'unpack 'chdir-to-source + (lambda _ + ;; The actual source is buried a few directories deep. + (chdir "source/Irrlicht/") + #t)) + (add-after 'chdir-to-source 'fix-build-env (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* "Makefile" (("INSTALL_DIR = /usr/local/lib") - (string-append "INSTALL_DIR = " out "/lib"))) + (string-append "INSTALL_DIR = " out "/lib")) + ;; Add '-fpermissive' to the CXXFLAGS + (("-Wall") "-Wall -fpermissive")) ; CImageLoaderJPG.cpp ;; The Makefile assumes these directories exist. (mkdir-p (string-append out "/lib")) (mkdir-p (string-append out "/include"))))) - (replace 'unpack - (lambda* (#:key source #:allow-other-keys) - (and (zero? (system* "unzip" source)) - ;; The actual source is buried a few directories deep. - (chdir (string-append "irrlicht-" ,version - "/source/Irrlicht/"))))) (delete 'configure)) ; no configure script #:tests? #f ; no check target #:make-flags '("CC=gcc" "sharedlib"))) - (native-inputs - `(("unzip" ,unzip))) (inputs - `(("mesa" ,mesa) - ("glu" ,glu))) + `(("bzip2" ,bzip2) + ("libjpeg" ,libjpeg) + ("libpng" ,libpng) + ("libx11" ,libx11) + ("libxxf86vm" ,libxxf86vm) + ("mesa" ,mesa))) (synopsis "3D game engine written in C++") (description "The Irrlicht Engine is a high performance realtime 3D engine written in @@ -1578,36 +1597,28 @@ match, cannon keep, and grave-itation pit.") (name "minetest-data") (version "0.4.17") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/minetest/minetest_game/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/minetest/minetest_game") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0pa9skjwbq27aky6dgr7g3mb0a7c5rpa6xmz2qh0nm618z5hgazh")))) + "1g8iw2pya32ifljbdx6z6rpcinmzm81i9minhi2bi1d500ailn7s")))) (build-system trivial-build-system) (native-inputs - `(("source" ,source) - ("tar" ,tar) - ("gzip" ,(@ (gnu packages compression) gzip)))) + `(("source" ,source))) (arguments `(#:modules ((guix build utils)) #:builder (begin (use-modules (guix build utils)) - (let ((tar (string-append (assoc-ref %build-inputs "tar") - "/bin/tar")) - (install-dir (string-append + (let ((install-dir (string-append %output - "/share/minetest/games/minetest_game")) - (path (string-append (assoc-ref %build-inputs - "gzip") - "/bin"))) - (setenv "PATH" path) - (invoke tar "xvf" (assoc-ref %build-inputs "source")) - (chdir (string-append "minetest_game-" ,version)) + "/share/minetest/games/minetest_game"))) (mkdir-p install-dir) - (copy-recursively "." install-dir) + (copy-recursively + (assoc-ref %build-inputs "source") + install-dir) #t)))) (synopsis "Main game data for the Minetest game engine") (description @@ -1620,20 +1631,25 @@ match, cannon keep, and grave-itation pit.") (name "minetest") (version "0.4.17.1") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/minetest/minetest/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/minetest/minetest") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0ngb3h6hw0zbsr6isjpyp4fach0g4nbn6bxxv9g354plac6d89fd")))) + "19sfblgh9mchkgw32n7gdvm7a8a9jxsl9cdlgmxn9bk9m939a2sg")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "lib") #t)))) (build-system cmake-build-system) (arguments '(#:configure-flags (list "-DRUN_IN_PLACE=0" "-DENABLE_FREETYPE=1" "-DENABLE_GETTEXT=1" + "-DENABLE_SYSTEM_JSONCPP=TRUE" (string-append "-DIRRLICHT_INCLUDE_DIR=" (assoc-ref %build-inputs "irrlicht") "/include/irrlicht") @@ -1648,18 +1664,21 @@ match, cannon keep, and grave-itation pit.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("irrlicht" ,irrlicht) - ("libpng" ,libpng) + `(("curl" ,curl) + ("freetype" ,(@ (gnu packages fontutils) freetype)) + ("gettext" ,gettext-minimal) + ("gmp" ,gmp) + ("irrlicht" ,irrlicht) + ("jsoncpp" ,jsoncpp) ("libjpeg" ,libjpeg) - ("libxxf86vm" ,libxxf86vm) - ("mesa" ,mesa) + ("libpng" ,libpng) ("libogg" ,libogg) ("libvorbis" ,libvorbis) - ("openal" ,openal) - ("freetype" ,(@ (gnu packages fontutils) freetype)) - ("curl" ,curl) + ("libxxf86vm" ,libxxf86vm) ("luajit" ,luajit) - ("gettext" ,gettext-minimal) + ("mesa" ,mesa) + ("ncurses" ,ncurses) + ("openal" ,openal) ("sqlite" ,sqlite))) (propagated-inputs `(("minetest-data" ,minetest-data))) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index bde6e55607..28e283640d 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -224,7 +224,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "18.1.2") + (version "18.1.5") (source (origin (method url-fetch) @@ -236,7 +236,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1ydivzm4c2k53b65lvm11d62z140xlmd7viw63bl5cm5idjg02q7")) + "1sldv7l3g6jfx0yn16kvxlik1qiy037lypdqpvsqc0v6lvqydnv9")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1365661b81..83344de2a6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org> -;;; Copyright © 2016 Leo Famulari <leo@famulari.name> +;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016 David Craven <david@craven.ch> @@ -1177,7 +1177,7 @@ XML/CSS rendering engine.") (define-public libgsf (package (name "libgsf") - (version "1.14.42") + (version "1.14.43") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1185,7 +1185,7 @@ XML/CSS rendering engine.") name "-" version ".tar.xz")) (sha256 (base32 - "1hhdz0ymda26q6bl5ygickkgrh998lxqq4z9i8dzpcvqna3zpzr9")))) + "05pf3h0dha3s20ddsrljbx7m94qyiqs5igwxx1ql0vlsdlylx50j")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) @@ -4008,39 +4008,26 @@ DAV, and others.") (define-public gusb (package (name "gusb") - (version "0.2.9") + (version "0.3.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/hughsie/libgusb/archive/" - "gusb_" - (string-join (string-split version #\.) - "_") - ".tar.gz")) + version ".tar.gz")) (sha256 (base32 - "1500mgpidmnjfkcz1fzqkbqv547iy1cvr8bwf3k9vqgqcjx3844n")))) - (build-system gnu-build-system) + "1wa9787ww7s1kl9jml6kiyrjgimlgagq4jmgdj7xcpsx83w10qxk")))) + (build-system meson-build-system) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. - ("gobject-introspection" ,gobject-introspection) + `(("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("vala" ,vala) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) ("gtk-doc" ,gtk-doc))) (propagated-inputs ;; Both of these are required by gusb.pc. `(("glib" ,glib) ("libusb" ,libusb))) (arguments - `(#:tests? #f ; libusb fails to initialize. Wonder what that is. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ - (and (zero? (system* "gtkdocize")) - (zero? (system* "autoreconf" "-vif")))))))) + `(#:tests? #f)) ;libusb fails to initialize. Wonder what that is. (home-page "https://github.com/hughsie/libgusb") (synopsis "GLib binding for libusb1") (description @@ -4196,7 +4183,11 @@ a secret password store, an adblocker, and a modern UI.") ;; subsystem ;; FAIL '(#:tests? #f - #:glib-or-gtk? #t)) + #:glib-or-gtk? #t + #:configure-flags + ;; Otherwise, the RUNPATH will lack the final 'epiphany' path component. + (list (string-append "-Dc_link_args=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib/epiphany")))) (propagated-inputs `(("dconf" ,dconf))) (native-inputs diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 7a4660cc8d..eb17b96492 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -186,13 +186,13 @@ authentication and support for SSL3 and TLS.") (define-public gnurl (package (name "gnurl") - (version "7.60.0") + (version "7.61.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gnunet/" name "-" version ".tar.Z")) (sha256 (base32 - "0klf3h339dznbm903474mjjysrarz09s1wiypnbai3xnfjamha99")))) + "1h03zkd9mp4xb5icirl3bfd64r5x8j9ka1hw9qd0n1ql1w0ilz23")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 1.5 MiB of man3 pages diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ba60d1372a..b6bf89a75b 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages autotools) @@ -252,6 +254,72 @@ in C/C++.") ("icu4c" ,icu4c) ("zlib" ,zlib))))) +(define-public mozjs-52 + ;; No releases yet at <https://archive.mozilla.org/pub/spidermonkey/releases/>. + ;; While we could take a snapshot of the complete mozilla-esr52 repository at + ;; <https://treeherder.mozilla.org/#/jobs?repo=mozilla-esr52&filter-searchStr=sm-tc>, + ;; we take the Debian version instead, because it is easier to work with. + (let ((commit "6507e63cc416fd7a3269e390efe712f8b56f374a") + (revision "1")) + (package (inherit mozjs-38) + (version (git-version "52.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/gnome-team/mozjs52.git") + (commit commit))) + (file-name (git-file-name "mozjs" version)) + (sha256 + (base32 + "1ny0s53r8wn4byys87h784xrq1xg767akmfm6gqrbvrz57mlm3q2")))) + (arguments + `(#:tests? #f ; depends on repository metadata + #:configure-flags + '("--enable-ctypes" + "--enable-optimize" + "--enable-pie" + "--enable-readline" + "--enable-shared-js" + "--enable-system-ffi" + "--with-system-icu" + "--with-system-nspr" + "--with-system-zlib" + + ;; Intl API requires bundled ICU. + "--without-intl-api") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-and-chdir + (lambda* (#:key inputs #:allow-other-keys) + ;; This patch prevents a segfault when executing JS_Init(). + ;; The build does not fail without this patch, but the + ;; configure phase of the gjs package would fail. + ;; See https://bugzilla.mozilla.org/show_bug.cgi?id=1176787 + (make-file-writable "js/src/old-configure.in") + (make-file-writable "js/src/old-configure") + (make-file-writable "mozglue/build/moz.build") + (invoke "patch" "-p1" "--force" + "--input" "debian/patches/disable-mozglue.patch") + (invoke "touch" "js/src/configure") + (chdir "js/src") + #t)) + (replace 'configure + (lambda* (#:key inputs outputs configure-flags #:allow-other-keys) + ;; The configure script does not accept environment variables + ;; as arguments. + (let ((out (assoc-ref outputs "out"))) + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh")) + (setenv "AUTOCONF" (string-append (assoc-ref inputs "autoconf") + "/bin/autoconf")) + (apply invoke "./configure" + (cons (string-append "--prefix=" out) + configure-flags)))))))) + (native-inputs + `(("autoconf" ,autoconf-2.13) + ("automake" ,automake) + ,@(package-native-inputs mozjs-38)))))) + (define-public nspr (package (name "nspr") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 445533b0c2..20b203aa6f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -552,31 +552,6 @@ jar struct to manage the cookies added to the cookie jar.") (home-page "https://github.com/aki237/nscjar") (license license:expat)))) -(define-public go-github-com-davidjpeacock-cli - (let ((commit "8ba6f23b6e36d03666a14bd9421f5e3efcb59aca") - (revision "0")) - (package - (name "go-github-com-davidjpeacock-cli") - (version (git-version "1.19.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/davidjpeacock/cli.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "01s53ny3p0fdx64rnwcnmjj4xpc5adihnh6islsfq5z1ph2phhnj")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/davidjpeacock/cli")) - (synopsis "Build command-line interfaces in Go") - (description "@code{cli} is a package for building command line -interfaces in Go. The goal is to enable developers to write fast and -distributable command line applications in an expressive way.") - (home-page "https://github.com/davidjpeacock/cli") - (license license:expat)))) - (define-public go-github.com-jessevdk-go-flags (package (name "go-github.com-jessevdk-go-flags") diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index ad5ff8ed1e..6632c9a1a3 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018 Alex Kost <alezost@gmail.com> +;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -456,6 +457,71 @@ virtual reality, scientific visualization and modeling.") ;; LGPL 2.1, but with 4 exceptions. This version is called OSGPL. (license license:lgpl2.1))) +(define-public povray + (package + (name "povray") + (version "3.7.0.8") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/POV-Ray/povray") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1q114n4m3r7qy3yn954fq7p46rg7ypdax5fazxr9yj1jklf1lh6z")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete bundled libraries. + (delete-file-recursively "libraries") + #t)))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("boost" ,boost) + ("libjpeg" ,libjpeg) + ("libpng" ,libpng) + ("libtiff" ,libtiff) + ("openexr" ,openexr) + ("sdl" ,sdl) + ("zlib" ,zlib))) + (arguments + '(#:configure-flags + (list "COMPILED_BY=Guix" + (string-append "--with-boost-libdir=" + (assoc-ref %build-inputs "boost") "/lib") + "CXXFLAGS=-std=c++11" + "--disable-optimiz-arch") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'run-prebuild + (lambda _ + (setenv "HOME" (getcwd)) + (with-directory-excursion "unix" + (substitute* "prebuild.sh" + (("/bin/sh") (which "sh"))) + (invoke "sh" "prebuild.sh")) + #t)) + ;; The bootstrap script is run by the prebuild script in the + ;; "run-prebuild" phase. + (delete 'bootstrap)))) + (synopsis "Tool for creating three-dimensional graphics") + (description + "@code{POV-Ray} is short for the Persistence of Vision Raytracer, a tool +for producing high-quality computer graphics. @code{POV-Ray} creates +three-dimensional, photo-realistic images using a rendering technique called +ray-tracing. It reads in a text file containing information describing the +objects and lighting in a scene and generates an image of that scene from the +view point of a camera also described in the text file. Ray-tracing is not a +fast process by any means, but it produces very high quality images with +realistic reflections, shading, perspective and other effects.") + (home-page "http://www.povray.org/") + (license license:agpl3+))) + (define-public rapicorn (package (name "rapicorn") diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 951ca93fbf..63d18fce5c 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -102,7 +102,7 @@ arrays of data.") (define-public gstreamer (package (name "gstreamer") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) @@ -111,7 +111,7 @@ arrays of data.") version ".tar.xz")) (sha256 (base32 - "0v0qqfj6klkirhbcxwgw1sq6x67456ckjadlhnzsji0m4q6jpn18")))) + "029fi3v0vrravysgfwhfkrb3ndg64sjmigbb0iwr7wpkk5r15mjb")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments @@ -150,7 +150,7 @@ This package provides the core library and elements.") (define-public gst-plugins-base (package (name "gst-plugins-base") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) @@ -158,7 +158,7 @@ This package provides the core library and elements.") name "-" version ".tar.xz")) (sha256 (base32 - "1d8d1gfd4jnymyhb0f1pxdhapsx4v1nilk03bndmv0id131wf9hh")))) + "0z0wy0p0nxxqhsis3n517d6ykldm02g7rca9fhq9kxb9m05yidx4")))) (build-system gnu-build-system) (outputs '("out" "doc")) (propagated-inputs @@ -205,7 +205,7 @@ for the GStreamer multimedia library.") (define-public gst-plugins-good (package (name "gst-plugins-good") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) @@ -214,7 +214,7 @@ for the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "0wlim4kapb2vc11fcjdlx31zn5ja3xw3kq1jflvk4sknvcnhdv1l")))) + "1bfa4n6xhr4v4wga8pv1y00rm1aka498snw6kgszy2w624l5wmy0")))) (build-system gnu-build-system) (inputs `(("aalib" ,aalib) @@ -264,14 +264,14 @@ developers consider to have good quality code and correct functionality.") (define-public gst-plugins-bad (package (name "gst-plugins-bad") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "06nn43f65mr872apljfiq8jnmwa8r7z26n1frprgvaijh28ccxra")))) + "1bqy3dn7q4kdkd4lqznyly8fv854d0hhncv88jk6ai4rf3dbgyil")))) (outputs '("out" "doc")) (build-system gnu-build-system) (arguments @@ -340,7 +340,7 @@ par compared to the rest.") (define-public gst-plugins-ugly (package (name "gst-plugins-ugly") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) @@ -348,7 +348,7 @@ par compared to the rest.") name "/" name "-" version ".tar.xz")) (sha256 (base32 - "1lz1kx9h5mlp9ahmgavv99nkg6j0rrjks2ws820yym1zn45l7wng")))) + "0s9xrz8knfv06fj1nbv3iq4xj7dj4cnzj3xvgb7zs89rv7crgq2m")))) (build-system gnu-build-system) (inputs `(("gst-plugins-base" ,gst-plugins-base) @@ -378,7 +378,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") (define-public gst-libav (package (name "gst-libav") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) (uri (string-append @@ -386,18 +386,16 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") name "-" version ".tar.xz")) (sha256 (base32 - "1782crqgl1bqlkr67s0qmb3ihcjdjpljd6kynqs9zyzjs810my7g")))) + "1pknqpjxq1l3vlprdsmxxwk0lwqa555fqd543k9vphngqlwiqdca")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Drop bundled ffmpeg. + (delete-file-recursively "gst-libs/ext/libav") + #t)))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--with-system-libav") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-/bin/sh - (lambda _ - (substitute* "gst-libs/ext/libav/configure" - (("#! /bin/sh") - (string-append "#! "(which "sh")))) - #t))))) + '(#:configure-flags '("--with-system-libav"))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) @@ -416,7 +414,7 @@ compression formats through the use of the libav library.") (define-public python-gst (package (name "python-gst") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) (uri (string-append @@ -424,7 +422,7 @@ compression formats through the use of the libav library.") "gst-python-" version ".tar.xz")) (sha256 (base32 - "1ls7j5iy7irinf7d7nm6r4qw3d1ddpr8fm4k5n6zfhz3am4p1ihv")))) + "08nb011acyvlz48fqh8c084k0dlssz9b7wha7zzk797inidbwh6w")))) (build-system gnu-build-system) (arguments ;; XXX: Factorize python-sitedir with python-build-system. diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 0ff92c763d..d2f4c9d05b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1672,7 +1672,7 @@ new Date();")) '("jdk" "openjdk-src" "corba-drop" "jaxp-drop" "jaxws-drop" "jdk-drop" "langtools-drop" "hotspot-drop"))))))) -(define-public icedtea icedtea-7) +(define-public icedtea icedtea-8) (define-public ant/java8 @@ -3679,7 +3679,8 @@ on the XPP3 API (XML Pull Parser)."))) "115l5pqblirdkmzi32dxx7gbcm4jy0s14y5wircr6h8jdr9aix00")))) (build-system ant-build-system) (propagated-inputs - `(("java-aqute-bndlib" ,java-aqute-bndlib))) + `(("java-aqute-bndlib" ,java-aqute-bndlib) + ("java-aqute-libg" ,java-aqute-libg))) (arguments `(#:build-target "compile" ;; The tests require an old version of Janino, which no longer compiles diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 25c99f1c73..3dc7a4bbf2 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -584,14 +584,14 @@ Microsoft Visio documents of all versions.") (define-public libodfgen (package (name "libodfgen") - (version "0.1.6") + (version "0.1.7") (source (origin (method url-fetch) - (uri (string-append "http://dev-www.libreoffice.org/src/" - name "-" version ".tar.bz2")) + (uri (string-append "mirror://sourceforge/libwpd/" name "/" + name "-" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1hn91bm6dni7n3frh7lpbj3mjqmdrpn12ipq8rswd9445y4j2yrc")))) + "0cdq48wlpp8m0qmndybv64r0m4vh0qsqx69cn6ms533cjlgljgij")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b25c5854b2..d7958ac470 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -398,8 +398,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.17.11") -(define %linux-libre-hash "0c0ryl8rnzizr0x2gj9kprj9wfjz536574fnn46r0ww3szrzdm78") +(define %linux-libre-version "4.17.13") +(define %linux-libre-hash "07z4yisl4krz1ja6123xp32g00nx6ajsc9x1lywmmpvvjilsz4ax") (define-public linux-libre (make-linux-libre %linux-libre-version @@ -407,8 +407,8 @@ It has been modified to remove all non-free binary blobs.") %linux-compatible-systems #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.59") -(define %linux-libre-4.14-hash "1mf22i8a71qs04x4wfqmm21clj4jnqia6rpk7jbh3r3vjfjjbd1d") +(define %linux-libre-4.14-version "4.14.61") +(define %linux-libre-4.14-hash "0jr0qi3473fn32cyisp3baf68sfr6vir5ydaphmqmz379ymxxm0z") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version @@ -417,14 +417,14 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.116" - "1v5138a5317ddrl0zvlip18586si68ccw6y5wdxgpkh8ixvcamy6" + (make-linux-libre "4.9.118" + "0zh9l0r828jjbmmqp0hwkjm34ly8kqhfddlyigmliz0j39dg0137" %intel-compatible-systems #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.145" - "1c8lcibc6f8194ix3paip30jb9cqvn4lni6jjskyrmavcfy4rlbp" + (make-linux-libre "4.4.146" + "1gpshdkn2rfg8kkf2qb2z30yk1lgzndk0fn1bvnrmfmx7swc45w8" %intel-compatible-systems #:configuration-file kernel-config)) @@ -1800,16 +1800,15 @@ compressed, transparent to other programs, without decompressing them.") (define-public numactl (package (name "numactl") - (version "2.0.11") + (version "2.0.12") (source (origin (method url-fetch) (uri (string-append - "ftp://oss.sgi.com/www/projects/libnuma/download/numactl-" - version - ".tar.gz")) + "https://github.com/numactl/numactl/releases/download/v" + version "/" name "-" version ".tar.gz")) (sha256 (base32 - "0qbqa9gac2vlahrngi553hws2mqgqdwv2lc69a3yx4gq6l90j325")))) + "0ad7mpi3vacbfnx3aqxnvgsj64yp3mav9yxnaz8ancjv7wvdmfsm")))) (build-system gnu-build-system) (arguments '(;; There's a 'test' target, but it requires NUMA support in the kernel @@ -1819,7 +1818,7 @@ compressed, transparent to other programs, without decompressing them.") ;; NUMA is apparently not supported on armhf, see ;; http://www.spinics.net/lists/linux-numa/msg01157.html (supported-systems (delete "armhf-linux" %supported-systems)) - (home-page "http://oss.sgi.com/projects/libnuma/") + (home-page "https://github.com/numactl/numactl") (synopsis "Tools for non-uniform memory access (NUMA) machines") (description "NUMA stands for Non-Uniform Memory Access, in other words a system whose @@ -4281,7 +4280,7 @@ re-use code and to avoid re-inventing the wheel.") (define-public libnftnl (package (name "libnftnl") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) @@ -4289,7 +4288,7 @@ re-use code and to avoid re-inventing the wheel.") "libnftnl-" version ".tar.bz2")) (sha256 (base32 - "0v4gywcjvv2vg4zk632al1zv3ad0lx87nshynv110l8n3fhsq3pc")))) + "1wmgjfcb35mscb2srzia5931srygywrs1aznxmg67v177x0nasjx")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 98592ad090..add7f1b40c 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Roel Janssen <roel@gnu.org> ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,7 +42,7 @@ (define-public llvm (package (name "llvm") - (version "6.0.0") + (version "6.0.1") (source (origin (method url-fetch) @@ -49,7 +50,7 @@ version "/llvm-" version ".src.tar.xz")) (sha256 (base32 - "0224xvfg6h40y5lrbnb9qaq3grmdc5rg00xq03s1wxjfbf8krx8z")))) + "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn")))) (build-system cmake-build-system) (native-inputs `(("python" ,python-2) ;bytes->str conversion in clang>=3.7 needs python-2 @@ -243,11 +244,11 @@ code analysis tools.") (define-public clang-runtime (clang-runtime-from-llvm llvm - "16m7rvh3w6vq10iwkjrr1nn293djld3xm62l5zasisaprx117k6h")) + "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl")) (define-public clang (clang-from-llvm llvm clang-runtime - "0cnznvfyl3hgbg8gj58pmwf0pvd2sv5k3ccbivy6q6ggv7c6szg0" + "0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w" #:patches '("clang-6.0-libc-search-path.patch"))) (define-public llvm-3.9.1 diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 3d7b0e4632..5e5933932b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -300,7 +300,7 @@ operating systems.") (define-public neomutt (package (name "neomutt") - (version "20180323") + (version "20180716") (source (origin (method url-fetch) @@ -308,7 +308,7 @@ operating systems.") "/archive/" name "-" version ".tar.gz")) (sha256 (base32 - "12v7zkm809cvjxfz0n7jb4qa410ns1ydyf0gjin99vbdrlj88jac")))) + "0072in2d6znwqq461shsaxlf40r4zr7w3j9848qvm4xlh1lq52dx")))) (build-system gnu-build-system) (inputs `(("cyrus-sasl" ,cyrus-sasl) @@ -1206,7 +1206,7 @@ facilities for checking incoming mail.") (define-public dovecot (package (name "dovecot") - (version "2.3.1") + (version "2.3.2.1") (source (origin (method url-fetch) @@ -1214,7 +1214,7 @@ facilities for checking incoming mail.") (version-major+minor version) "/" name "-" version ".tar.gz")) (sha256 (base32 - "14zva4f8k64x86sm9n21cp2yvrpph6k6k52bm22a00pxjwdq50q8")))) + "0d2ffbicgl3wswbnyjbw6qigz7r1aqzprpchbwp5cynw122i2raa")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -2364,7 +2364,7 @@ operators and scripters.") (define-public alpine (package (name "alpine") - (version "2.21.999") + (version "2.21.9999") (source (origin (method url-fetch) @@ -2373,11 +2373,11 @@ operators and scripters.") ;; the patched version, and so do we to not break expectations. ;; http://alpine.freeiz.com/alpine/readme/README.patches (uri (string-append "http://repo.or.cz/alpine.git/snapshot/" - "349642a84039a4b026513c32a3b4f8594acd50df.tar.gz")) + "d3e6f3932f2af9deca8eed09e30a55e9bd524362.tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1rkvlfk3q7h9jcvaj91pk7l087bq4b38j30060jaw21zz94b90np")))) + "0w4qyybfdxi29r2z3giq0by6aa6v6nrgibh1xgv4d1vwwq4hw35w")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "CC=gcc") @@ -2554,3 +2554,47 @@ and binaries. It supports offline reading, scoring and killfiles, yEnc, NZB, PGP handling, multiple servers, and secure connections.") ;; License of the docs: fdl-1.1; Others: gpl2. (license (list fdl1.1+ gpl2)))) + +(define-public imapfilter + (package + (name "imapfilter") + (version "2.6.11") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/lefcha/imapfilter/archive/" + "v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yslvwr3w5fnl06gfrp0lim8zdlasx3cvgd2fsqi0695xnb9bsms")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + "CC=gcc") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'fix-include-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((pcre (assoc-ref inputs "pcre"))) + (substitute* "src/Makefile" + (("INCDIRS =") + (string-append "INCDIRS =" + "-I" pcre "/include"))) + #t)))))) + (native-inputs + `(("lua" ,lua) + ("pcre" ,pcre) + ("openssl" ,openssl))) + (home-page "https://github.com/lefcha/imapfilter") + (synopsis "IMAP mail filtering utility") + (description "IMAPFilter is a mail filtering utility. It connects +to remote mail servers using IMAP, sends searching queries to the server and +processes mailboxes based on the results. It can be used to delete, copy, +move, flag, etc. messages residing in mailboxes at the same or different mail +servers. The 4rev1 and 4 versions of IMAP are supported.") + (license license:expat))) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f07c83dc0d..50de120e07 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -276,22 +276,20 @@ enough to be used effectively as a scientific calculator.") (define-public double-conversion (package (name "double-conversion") - (version "1.1.5") + (version "3.0.0") + (home-page "https://github.com/google/double-conversion") (source (origin (method url-fetch) - (uri (string-append - "https://github.com/floitsch/double-conversion/archive/v" - version ".tar.gz")) + (uri (string-append home-page "/archive/v" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0cnr8xhyjfxijay8ymkqcph3672wp2lj23qhdmr3m4kia5kpdf83")))) + "059r1czs28ljjd388pn6l3njg1ghbf1cv3q9nkxv3dj2a8siabqm")))) (build-system cmake-build-system) (arguments '(#:test-target "test" #:configure-flags '("-DBUILD_SHARED_LIBS=ON" "-DBUILD_TESTING=ON"))) - (home-page "https://github.com/floitsch/double-conversion") (synopsis "Conversion routines for IEEE doubles") (description "The double-conversion library provides binary-decimal and decimal-binary @@ -2830,7 +2828,7 @@ parts of it.") (define-public openblas (package (name "openblas") - (version "0.3.0") + (version "0.3.2") (source (origin (method url-fetch) @@ -2839,7 +2837,7 @@ parts of it.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "14a9vyvp2k5zpd0axbnqk0d3khc1v3cck10nb5fj7d2sgn8490ky")))) + "0b20km2jv7m6qiylrlvhq2vnmkmilb633mr8rhqmgbn1wqrp58jq")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -2878,16 +2876,6 @@ parts of it.") #:phases (modify-phases %standard-phases (delete 'configure) - ;; Conditionally apply a patch on i686 to avoid rebuilding - ;; all architectures. FIXME: This should be moved to the - ;; (source (patches ...)) field in the next rebuild cycle. - ,@(if (string-prefix? "i686" (or (%current-target-system) - (%current-system))) - `((add-after 'unpack 'fix-tests - (lambda* (#:key inputs #:allow-other-keys) - (invoke "patch" "-p1" - "--input" (assoc-ref inputs "i686-fix-tests.patch"))))) - '()) (add-before 'build 'set-extralib (lambda* (#:key inputs #:allow-other-keys) ;; Get libgfortran found when building in utest. @@ -2899,11 +2887,6 @@ parts of it.") `(("fortran-lib" ,gfortran "lib"))) (native-inputs `(("cunit" ,cunit) - ,@(if (string-prefix? "i686" (or (%current-target-system) - (%current-system))) - `(("i686-fix-tests.patch" - ,(search-patch "openblas-fix-tests-i686.patch"))) - '()) ("fortran" ,gfortran) ("perl" ,perl))) (home-page "http://www.openblas.net/") diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 8bde7b1525..a108e3405b 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -24,6 +24,7 @@ #:use-module (gnu packages commencement) #:use-module (gnu packages cross-base) #:use-module (gnu packages gcc) + #:use-module (gnu packages graphviz) #:use-module (gnu packages guile) #:use-module (gnu packages man) #:use-module (gnu packages package-management) @@ -75,15 +76,14 @@ extensive examples, including parsers for the Javascript and C99 languages.") (let ((triplet "i686-unknown-linux-gnu")) (package (name "mes") - (version "0.16.1") + (version "0.17") (source (origin (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/mes" - "/-/archive/v" version - "/mes-" version ".tar.gz")) + (uri (string-append "http://alpha.gnu.org/gnu/mes/" + "mes-" version ".tar.gz")) (sha256 (base32 - "0qghlbx2qn674q8vckxpzsd0p845kclg457bw6r25jpmslgm0bz2")))) + "1j32x4zqy2cqjlg9m35f2411mwac2b0p5ch4hm99gddmfbxzgyhg")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (propagated-inputs @@ -98,27 +98,19 @@ extensive examples, including parsers for the Javascript and C99 languages.") `(("i686-linux-binutils" ,(cross-binutils triplet)) ("i686-linux-gcc" ,(cross-gcc triplet))) '()) + ("graphviz" ,graphviz) ("help2man" ,help2man) - ("perl" ,perl) ;build-aux/gitlog-to-changelog + ("perl" ,perl) ; build-aux/gitlog-to-changelog ("texinfo" ,texinfo))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'generate-changelog - (lambda _ - (with-output-to-file "ChangeLog" - (lambda () - (display "Please run - build-aux/gitlog-to-changelog --srcdir=<git-checkout> > ChangeLog\n"))) - #t)) - (delete 'strip)))) ; binutil's strip b0rkes MesCC/M1/hex2 binaries + `(#:strip-binaries? #f)) ; binutil's strip b0rkes MesCC/M1/hex2 binaries (synopsis "Scheme interpreter and C compiler for full source bootstrapping") (description - "Mes [Maxwell Equations of Software] aims to create full source + "GNU Mes [Maxwell Equations of Software] aims to create full source bootstrapping for GuixSD. It consists of a mutual self-hosting [close to Guile-] Scheme interpreter prototype in C and a Nyacc-based C compiler in [Guile] Scheme.") - (home-page "https://gitlab.com/janneke/mes") + (home-page "https://gnu.org/software/mes") (license gpl3+)))) (define-public mescc-tools diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 98a65dcd3d..a76bf4f235 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -873,7 +873,7 @@ protocols.") (define-public c-toxcore (package (name "c-toxcore") - (version "0.2.4") + (version "0.2.5") (source (origin (method url-fetch) @@ -882,7 +882,7 @@ protocols.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0sdszy079f82ncrgq1wsjpk2374n5hm4las75gj3lrdhljl15izl")))) + "1n6j3brfz7kp9a7dd1xnwsa29whrb24zglbz1130l3n8vars7n4s")))) (arguments `(#:tests? #f)) ; FIXME: Testsuite seems to stay stuck on test 3. Disable ; for now. diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index f7f34e9dc3..3e96f2c475 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -37,14 +37,14 @@ (define-public mingw-w64 (package (name "mingw-w64") - (version "5.0.3") + (version "5.0.4") (source (origin (method url-fetch) (uri (string-append "https://sourceforge.net/projects/mingw-w64/files/mingw-w64/" "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) (sha256 - (base32 "1d4wrjfdlq5xqpv9zg6ssw4lm8jnv6522xf7d6zbjygmkswisq1a")) + (base32 "00zq3z1hbzd5yzmskskjg79xrzwsqx7ihyprfaxy4hb897vf29sm")) (patches (search-patches "mingw-w64-5.0rc2-gcc-4.9.3.patch")))) (native-inputs `(("xgcc-core" ,(cross-gcc %mingw-triplet)) ("xbinutils" ,(cross-binutils %mingw-triplet)))) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 0185b8fd9c..c5ee4293ba 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1472,16 +1472,16 @@ reverb effects.") (define-public setbfree (package (name "setbfree") - (version "0.8.5") + (version "0.8.7") (source (origin - (method url-fetch) - (uri - (string-append "https://github.com/pantherb/setBfree/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pantherb/setBfree") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0qfccny0hh9lq54272mzmxvfz2jmzcgigjkjwn6v9h6n00gi5bw4")))) + "0r2i8cp0gfzqp6scrxwwf7pn7lk2j9kmf8cx7bqjvgfyn251dw3j")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target @@ -1996,7 +1996,7 @@ capabilities, custom envelopes, effects, etc.") (define-public yoshimi (package (name "yoshimi") - (version "1.5.8") + (version "1.5.8.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/yoshimi/" @@ -2004,7 +2004,7 @@ capabilities, custom envelopes, effects, etc.") "/yoshimi-" version ".tar.bz2")) (sha256 (base32 - "0gwsr5srzy28hwqhfzrc8pswysmyra8kbww3bxfx8bq4mdjifdj6")))) + "1kg7d6mnzdwzsqhrf7pmrf1hzgfpbpm5lv8xkaz32wiv391qrnxc")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are no tests @@ -3516,7 +3516,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke (define-public musescore (package (name "musescore") - (version "2.3.1") + (version "2.3.2") (source (origin (method git-fetch) (uri (git-reference @@ -3525,7 +3525,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke (file-name (git-file-name name version)) (sha256 (base32 - "00inrw9g8g34g74bhg5gp0rr5nydhjraiyn7vpl7kaqi5yzmhawd")) + "0ncv0xfmq87plqa43cm0fpidlwzz1nq5s7h7139llrbc36yp3pr1")) (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 90967b9b1f..937d6f75ba 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2017, 2018 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016, 2017 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2016 Raimon Grau <raimonster@gmail.com> @@ -23,6 +23,8 @@ ;;; Copyright © 2018 Tonton <tonton@riseup.net> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018 Theodoros Foradis <theodoros@foradis.org> +;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -577,7 +579,7 @@ of the same name.") (define-public wireshark (package (name "wireshark") - (version "2.6.1") + (version "2.6.2") (source (origin (method url-fetch) @@ -585,7 +587,7 @@ of the same name.") version ".tar.xz")) (sha256 (base32 - "126dvd6myjbxjr69dy9vzzdda2lmjy1wwwc6gcs5djb46jy5nvmb")))) + "153h6prxamv5a62f3pfadkry0y57696xrgxfy2gfy5xswdg8kcj9")))) (build-system gnu-build-system) (inputs `(("c-ares" ,c-ares) ("glib" ,glib) @@ -1965,3 +1967,115 @@ Features: @item Destination IP blacklist @end itemize") (license license:asl2.0)))) + +(define-public net-snmp + (package + (name "net-snmp") + (version "5.8") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/net-snmp/net-snmp/" + version "/net-snmp-" version ".tar.gz")) + (sha256 + (base32 + "1pvajzj9gmj56dmwix0ywmkmy2pglh6nny646hkm7ghfhh03bz5j")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Drop bundled libraries. + (delete-file-recursively "snmplib/openssl") + #t)))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + ;; XXX: With parallel build enabled, Perl modules may not get linked with + ;; libnetsnmp. See e.g. <https://bugzilla.novell.com/show_bug.cgi?id=819497>. + #:parallel-build? #f + #:configure-flags + (list (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") + "/lib") + "--with-logfile=/var/log/snmpd.log") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "testing/fulltests/support/simple_TESTCONF.sh" + (("NETSTAT=\"\"") + (string-append "NETSTAT=\"" (which "netstat") "\""))) + (substitute* '("testing/fulltests/default/T065agentextend_simple" + "testing/fulltests/default/T115agentxperl_simple") + (("/usr/bin/env") (which "env"))) + (substitute* "testing/fulltests/default/T065agentextend_sh_simple" + (("/bin/sh") (which "sh"))) + ;; These tests require network access. + (for-each delete-file + '("testing/fulltests/default/T070com2sec_simple" + "testing/fulltests/default/T071com2sec6_simple")) + #t)) + (add-after 'unpack 'patch-Makefile.PL + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile.in" + (("Makefile.PL -NET") + (string-append "Makefile.PL PREFIX=" + (assoc-ref outputs "out") + " INSTALLDIRS=site" " NO_PERLLOCAL=1" + " -NET"))) + #t))))) + (inputs + `(("perl" ,perl) + ("openssl" ,openssl) + ("libnl" ,libnl))) + ;; These inputs are only needed for tests. + (native-inputs + `(("net-tools" ,net-tools) + ("coreutils" ,coreutils) + ("grep" ,grep))) + (home-page "http://www.net-snmp.org/") + (synopsis "Simple Network Management Protocol library and tools") + (description "The @dfn{Simple Network Management Protocol} (SNMP) is a +widely used protocol for monitoring the health and welfare of network +equipment (e.g. routers), computer equipment and even devices like UPSs. +Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c and +SNMP v3 using both IPv4 and IPv6.") + (license (list license:bsd-3 + (license:non-copyleft + "http://www.net-snmp.org/about/license.html" + "CMU/UCD copyright notice"))))) + +(define-public ubridge + (package + (name "ubridge") + (version "0.9.14") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/GNS3/ubridge/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1hivb8wqkk5047bdl2vbsbcvkmam1107hx1ahy4virq2bkqki1fj")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no tests + #:make-flags '("CC=gcc") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'install 'set-bindir + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") + "/bin"))) + (mkdir-p bin) + (substitute* "Makefile" + (("\\$\\(BINDIR\\)") bin) + (("\tsetcap cap_net.*$") ""))) + #t))))) + (inputs + `(("libpcap" ,libpcap))) + (home-page "https://github.com/GNS3/ubridge/") + (synopsis "Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces") + (description "uBridge is a simple program to create user-land bridges +between various technologies. Currently, bridging between UDP tunnels, +Ethernet and TAP interfaces is supported. Packet capture is also supported.") + (license license:gpl3+))) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 58b8ca235c..6c3d245058 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -893,14 +893,14 @@ Microsoft cabinet (.@dfn{CAB}) files.") (define-public msitools (package (name "msitools") - (version "0.97") + (version "0.98") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0pn6izlgwi4ngpk9jk2n38gcjjpk29nm15aad89bg9z3k9n2hnrs")))) + "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -921,7 +921,7 @@ for packaging and deployment of cross-compiled Windows applications.") (define-public libostree (package (name "libostree") - (version "2018.5") + (version "2018.7") (source (origin (method url-fetch) (uri (string-append @@ -929,7 +929,7 @@ for packaging and deployment of cross-compiled Windows applications.") version "/libostree-" version ".tar.xz")) (sha256 (base32 - "0q82d6rvp119nx7ck7j63a591kz8vg7v465kf9ygh8kzg875l3xd")))) + "1nc310lv36psxn5yslkxlgi9gjxwqpwqzkg2pldgpwrlv6gkagj8")))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/emacs-exwm-fix-fullscreen-issue.patch b/gnu/packages/patches/emacs-exwm-fix-fullscreen-issue.patch new file mode 100644 index 0000000000..5c9bd36598 --- /dev/null +++ b/gnu/packages/patches/emacs-exwm-fix-fullscreen-issue.patch @@ -0,0 +1,27 @@ +From 13a14579cc1bb772735f895dd5b4b90c6812f3ee Mon Sep 17 00:00:00 2001 +From: Chris Feng <chris.w.feng@gmail.com> +Date: Sun, 29 Jul 2018 00:00:00 +0000 +Subject: [PATCH] Fix issues with destroying full screen X windows + +* exwm-manage.el (exwm-manage--unmanage-window): Set the Emacs window +of an full screen X window as non-dedicated before killing its buffer +so as not to cause other side effects. +--- + exwm-manage.el | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/exwm-manage.el b/exwm-manage.el +index a0a9e05..349157f 100644 +--- a/exwm-manage.el ++++ b/exwm-manage.el +@@ -392,6 +392,10 @@ manager is shutting down." + :window window :parent exwm--root :x 0 :y 0)) + (xcb:+request exwm--connection + (make-instance 'xcb:DestroyWindow :window container)))) ++ (when (exwm-layout--fullscreen-p) ++ (let ((window (get-buffer-window))) ++ (when window ++ (set-window-dedicated-p window nil)))) + (exwm-manage--set-client-list) + (xcb:flush exwm--connection)) + (let ((kill-buffer-func diff --git a/gnu/packages/patches/irrlicht-use-system-libs.patch b/gnu/packages/patches/irrlicht-use-system-libs.patch new file mode 100644 index 0000000000..e764f411d3 --- /dev/null +++ b/gnu/packages/patches/irrlicht-use-system-libs.patch @@ -0,0 +1,202 @@ +This patch is a combination of the two following patches with minor +changes to the install code +https://sources.debian.org/src/irrlicht/1.8.4+dfsg1-1/debian/patches/debian/link-against-needed-libs.diff/ +https://sources.debian.org/src/irrlicht/1.8.4+dfsg1-1/debian/patches/debian/use-system-libs.diff/ + + +--- + include/IrrCompileConfig.h | 26 +++++++++------------ + source/Irrlicht/CIrrDeviceLinux.h | 2 +- + source/Irrlicht/COpenGLExtensionHandler.h | 8 +++---- + source/Irrlicht/COpenGLSLMaterialRenderer.h | 2 +- + source/Irrlicht/Makefile | 15 ++++++------ + 5 files changed, 25 insertions(+), 28 deletions(-) + +diff --git a/include/IrrCompileConfig.h b/include/IrrCompileConfig.h +index 6bb0589..2216353 100644 +--- a/include/IrrCompileConfig.h ++++ b/include/IrrCompileConfig.h +@@ -238,6 +238,17 @@ for Windows based systems. You also have to set #define UNICODE for this to comp + #undef _IRR_WCHAR_FILESYSTEM
+ #endif
+
++//! Define _IRR_COMPILE_WITH_ZLIB_ to enable compiling the engine using zlib.
++/** This enables the engine to read from compressed .zip archives. If you
++disable this feature, the engine can still read archives, but only uncompressed
++ones. */
++#define _IRR_COMPILE_WITH_ZLIB_
++
++//! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht.
++/** If this is commented out, Irrlicht will try to compile using the zlib installed in the system.
++ This is only used when _IRR_COMPILE_WITH_ZLIB_ is defined. */
++#undef _IRR_USE_NON_SYSTEM_ZLIB_
++
+ //! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
+ /** This enables the engine to read jpeg images. If you comment this out,
+ the engine will no longer read .jpeg images. */
+@@ -249,10 +260,7 @@ the engine will no longer read .jpeg images. */ + //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
+ This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
+-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
+-#ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
+-#endif
+
+ //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
+ /** This enables the engine to read png images. If you comment this out,
+@@ -265,10 +273,7 @@ the engine will no longer read .png images. */ + //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
+ This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
+-#define _IRR_USE_NON_SYSTEM_LIB_PNG_
+-#ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
+ #undef _IRR_USE_NON_SYSTEM_LIB_PNG_
+-#endif
+
+ //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
+ /** If _IRR_D3D_NO_SHADER_DEBUGGING is undefined in IrrCompileConfig.h,
+@@ -602,10 +607,7 @@ ones. */ + /** If this is commented out, Irrlicht will try to compile using the zlib
+ installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
+ defined. */
+-#define _IRR_USE_NON_SYSTEM_ZLIB_
+-#ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
+ #undef _IRR_USE_NON_SYSTEM_ZLIB_
+-#endif
+ //! Define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_ if you want to read AES-encrypted ZIP archives
+ #define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_
+ #ifdef NO_IRR_COMPILE_WITH_ZIP_ENCRYPTION_
+@@ -623,18 +625,12 @@ library. */ + /** If this is commented out, Irrlicht will try to compile using the bzlib
+ installed on the system. This is only used when _IRR_COMPILE_WITH_BZLIB_ is
+ defined. */
+-#define _IRR_USE_NON_SYSTEM_BZLIB_
+-#ifdef NO_IRR_USE_NON_SYSTEM_BZLIB_
+ #undef _IRR_USE_NON_SYSTEM_BZLIB_
+-#endif
+ //! Define _IRR_COMPILE_WITH_LZMA_ if you want to use LZMA compressed zip files.
+ /** LZMA is a very efficient compression code, known from 7zip. Irrlicht
+ currently only supports zip archives, though. */
+-#define _IRR_COMPILE_WITH_LZMA_
+-#ifdef NO_IRR_COMPILE_WITH_LZMA_
+ #undef _IRR_COMPILE_WITH_LZMA_
+ #endif
+-#endif
+
+ //! Define __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_ if you want to mount folders as archives
+ #define __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_
+diff --git a/source/Irrlicht/CIrrDeviceLinux.h b/source/Irrlicht/CIrrDeviceLinux.h +index 4d2a2c6..8cf24ba 100644 +--- a/source/Irrlicht/CIrrDeviceLinux.h ++++ b/source/Irrlicht/CIrrDeviceLinux.h +@@ -22,7 +22,7 @@ + #define GLX_GLXEXT_LEGACY 1
+ #include <GL/glx.h>
+ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
+-#include "glxext.h"
++#include <GL/glxext.h>
+ #endif
+ #endif
+
+diff --git a/source/Irrlicht/COpenGLExtensionHandler.h b/source/Irrlicht/COpenGLExtensionHandler.h +index 1b77bad..3886a0e 100644 +--- a/source/Irrlicht/COpenGLExtensionHandler.h ++++ b/source/Irrlicht/COpenGLExtensionHandler.h +@@ -35,7 +35,7 @@ + #endif
+ #include <OpenGL/gl.h>
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+- #include "glext.h"
++ #include <GL/glext.h>
+ #endif
+ #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+@@ -48,7 +48,7 @@ + #define NO_SDL_GLEXT
+ #include <SDL/SDL_video.h>
+ #include <SDL/SDL_opengl.h>
+- #include "glext.h"
++ #include <GL/glext.h>
+ #else
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ #define GL_GLEXT_LEGACY 1
+@@ -60,9 +60,9 @@ + #include <GL/gl.h>
+ #include <GL/glx.h>
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+- #include "glext.h"
++ #include <GL/glext.h>
+ #undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
+- #include "glxext.h"
++ #include <GL/glxext.h>
+ #endif
+ #endif
+
+diff --git a/source/Irrlicht/COpenGLSLMaterialRenderer.h b/source/Irrlicht/COpenGLSLMaterialRenderer.h +index ff71150..f8a6007 100644 +--- a/source/Irrlicht/COpenGLSLMaterialRenderer.h ++++ b/source/Irrlicht/COpenGLSLMaterialRenderer.h +@@ -25,7 +25,7 @@ + #include <GL/gl.h>
+ #endif
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+- #include "glext.h"
++ #include <GL/glext.h>
+ #endif
+ #endif
+
+diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile +index 67a3899..d9ea7f3 100644 +--- a/source/Irrlicht/Makefile ++++ b/source/Irrlicht/Makefile +@@ -43,7 +43,7 @@ IRRIMAGEOBJ = CColorConverter.o CImage.o CImageLoaderBMP.o CImageLoaderDDS.o CIm + CImageWriterBMP.o CImageWriterJPG.o CImageWriterPCX.o CImageWriterPNG.o CImageWriterPPM.o CImageWriterPSD.o CImageWriterTGA.o
+ IRRVIDEOOBJ = CVideoModeList.o CFPSCounter.o $(IRRDRVROBJ) $(IRRIMAGEOBJ)
+ IRRSWRENDEROBJ = CSoftwareDriver.o CSoftwareTexture.o CTRFlat.o CTRFlatWire.o CTRGouraud.o CTRGouraudWire.o CTRNormalMap.o CTRStencilShadow.o CTRTextureFlat.o CTRTextureFlatWire.o CTRTextureGouraud.o CTRTextureGouraudAdd.o CTRTextureGouraudNoZ.o CTRTextureGouraudWire.o CZBuffer.o CTRTextureGouraudVertexAlpha2.o CTRTextureGouraudNoZ2.o CTRTextureLightMap2_M2.o CTRTextureLightMap2_M4.o CTRTextureLightMap2_M1.o CSoftwareDriver2.o CSoftwareTexture2.o CTRTextureGouraud2.o CTRGouraud2.o CTRGouraudAlpha2.o CTRGouraudAlphaNoZ2.o CTRTextureDetailMap2.o CTRTextureGouraudAdd2.o CTRTextureGouraudAddNoZ2.o CTRTextureWire2.o CTRTextureLightMap2_Add.o CTRTextureLightMapGouraud2_M4.o IBurningShader.o CTRTextureBlend.o CTRTextureGouraudAlpha.o CTRTextureGouraudAlphaNoZ.o CDepthBuffer.o CBurningShader_Raster_Reference.o
+-IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o
++IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o
+ IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o
+ IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o
+ ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o
+@@ -56,14 +56,14 @@ BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o + EXTRAOBJ =
+ LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
+ $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
+- $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \
+- $(BZIP2OBJ) $(EXTRAOBJ)
++ $(IRRGUIOBJ) $(LIBAESGM) \
++ $(EXTRAOBJ)
+
+ ###############
+ #Compiler flags
+-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
++CXXINCS = -I../../include # -Izlib -Ijpeglib -Ilibpng
+ CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
+-CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
++CXXFLAGS += -Wall -pipe -fno-exceptions -fstrict-aliasing
+ ifndef NDEBUG
+ CXXFLAGS += -g -D_DEBUG
+ else
+@@ -88,7 +88,7 @@ STATIC_LIB = libIrrlicht.a + LIB_PATH = ../../lib/$(SYSTEM)
+ INSTALL_DIR = /usr/local/lib
+ sharedlib install: SHARED_LIB = libIrrlicht.so
+-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
++staticlib sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lX11 -lz -lpng -ljpeg -lbz2
+ staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
+
+ #OSX specific options
+@@ -153,7 +153,8 @@ install install_osx: + $(RM) -r $(INSTALL_DIR)/../include/irrlicht
+ mkdir -p $(INSTALL_DIR)/../include/irrlicht
+ cp ../../include/*.h $(INSTALL_DIR)/../include/irrlicht/
+- cp $(LIB_PATH)/$(SHARED_FULLNAME) $(INSTALL_DIR)
++ cp $(LIB_PATH)/$(SHARED_FULLNAME) $(INSTALL_DIR) || true
++ cp $(LIB_PATH)/$(STATIC_LIB) $(INSTALL_DIR) || true
+ cd $(INSTALL_DIR) && ln -s -f $(SHARED_FULLNAME) $(SONAME)
+ cd $(INSTALL_DIR) && ln -s -f $(SONAME) $(SHARED_LIB)
+ # ldconfig -n $(INSTALL_DIR)
+-- +2.18.0 + diff --git a/gnu/packages/patches/lxc-CVE-2018-6556.patch b/gnu/packages/patches/lxc-CVE-2018-6556.patch new file mode 100644 index 0000000000..7eab7101f1 --- /dev/null +++ b/gnu/packages/patches/lxc-CVE-2018-6556.patch @@ -0,0 +1,116 @@ +Fix CVE-2018-6556: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6556 +https://bugzilla.suse.com/show_bug.cgi?id=988348#c8 + +Patch copied from upstream source repository: + +https://github.com/lxc/lxc/commit/c1cf54ebf251fdbad1e971679614e81649f1c032 + +From c1cf54ebf251fdbad1e971679614e81649f1c032 Mon Sep 17 00:00:00 2001 +From: Christian Brauner <christian.brauner@ubuntu.com> +Date: Wed, 25 Jul 2018 19:56:54 +0200 +Subject: [PATCH] CVE 2018-6556: verify netns fd in lxc-user-nic + +Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com> +--- + src/lxc/cmd/lxc_user_nic.c | 35 ++++++++++++++++++++++++++++++++--- + src/lxc/utils.c | 12 ++++++++++++ + src/lxc/utils.h | 5 +++++ + 3 files changed, 49 insertions(+), 3 deletions(-) + +diff --git a/src/lxc/cmd/lxc_user_nic.c b/src/lxc/cmd/lxc_user_nic.c +index ec9cd97e0..c5beb6c8d 100644 +--- a/src/lxc/cmd/lxc_user_nic.c ++++ b/src/lxc/cmd/lxc_user_nic.c +@@ -1179,12 +1179,41 @@ int main(int argc, char *argv[]) + exit(EXIT_FAILURE); + } + } else if (request == LXC_USERNIC_DELETE) { +- netns_fd = open(args.pid, O_RDONLY); ++ char opath[LXC_PROC_PID_FD_LEN]; ++ ++ /* Open the path with O_PATH which will not trigger an actual ++ * open(). Don't report an errno to the caller to not leak ++ * information whether the path exists or not. ++ * When stracing setuid is stripped so this is not a concern ++ * either. ++ */ ++ netns_fd = open(args.pid, O_PATH | O_CLOEXEC); + if (netns_fd < 0) { +- usernic_error("Could not open \"%s\": %s\n", args.pid, +- strerror(errno)); ++ usernic_error("Failed to open \"%s\"\n", args.pid); ++ exit(EXIT_FAILURE); ++ } ++ ++ if (!fhas_fs_type(netns_fd, NSFS_MAGIC)) { ++ usernic_error("Path \"%s\" does not refer to a network namespace path\n", args.pid); ++ close(netns_fd); ++ exit(EXIT_FAILURE); ++ } ++ ++ ret = snprintf(opath, sizeof(opath), "/proc/self/fd/%d", netns_fd); ++ if (ret < 0 || (size_t)ret >= sizeof(opath)) { ++ close(netns_fd); ++ exit(EXIT_FAILURE); ++ } ++ ++ /* Now get an fd that we can use in setns() calls. */ ++ ret = open(opath, O_RDONLY | O_CLOEXEC); ++ if (ret < 0) { ++ usernic_error("Failed to open \"%s\": %s\n", args.pid, strerror(errno)); ++ close(netns_fd); + exit(EXIT_FAILURE); + } ++ close(netns_fd); ++ netns_fd = ret; + } + + if (!create_db_dir(LXC_USERNIC_DB)) { +diff --git a/src/lxc/utils.c b/src/lxc/utils.c +index 530b1f81a..3b854e35b 100644 +--- a/src/lxc/utils.c ++++ b/src/lxc/utils.c +@@ -2544,6 +2544,18 @@ bool has_fs_type(const char *path, fs_type_magic magic_val) + return has_type; + } + ++bool fhas_fs_type(int fd, fs_type_magic magic_val) ++{ ++ int ret; ++ struct statfs sb; ++ ++ ret = fstatfs(fd, &sb); ++ if (ret < 0) ++ return false; ++ ++ return is_fs_type(&sb, magic_val); ++} ++ + bool lxc_nic_exists(char *nic) + { + #define __LXC_SYS_CLASS_NET_LEN 15 + IFNAMSIZ + 1 +diff --git a/src/lxc/utils.h b/src/lxc/utils.h +index 6a0bebded..0805f5d0d 100644 +--- a/src/lxc/utils.h ++++ b/src/lxc/utils.h +@@ -95,6 +95,10 @@ + #define CGROUP2_SUPER_MAGIC 0x63677270 + #endif + ++#ifndef NSFS_MAGIC ++#define NSFS_MAGIC 0x6e736673 ++#endif ++ + /* Useful macros */ + /* Maximum number for 64 bit integer is a string with 21 digits: 2^64 - 1 = 21 */ + #define LXC_NUMSTRLEN64 21 +@@ -580,6 +584,7 @@ extern void *must_realloc(void *orig, size_t sz); + /* __typeof__ should be safe to use with all compilers. */ + typedef __typeof__(((struct statfs *)NULL)->f_type) fs_type_magic; + extern bool has_fs_type(const char *path, fs_type_magic magic_val); ++extern bool fhas_fs_type(int fd, fs_type_magic magic_val); + extern bool is_fs_type(const struct statfs *fs, fs_type_magic magic_val); + extern bool lxc_nic_exists(char *nic); + extern int lxc_make_tmpfile(char *template, bool rm); diff --git a/gnu/packages/patches/mariadb-client-test-32bit.patch b/gnu/packages/patches/mariadb-client-test-32bit.patch new file mode 100644 index 0000000000..02017e324d --- /dev/null +++ b/gnu/packages/patches/mariadb-client-test-32bit.patch @@ -0,0 +1,37 @@ +From 93efa48a7b972fc463406603574a4d508eefe792 Mon Sep 17 00:00:00 2001 +From: Sergei Golubchik <serg@mariadb.org> +Date: Sun, 13 May 2018 18:50:21 +0200 +Subject: [PATCH] fix failing main.mysql_client_test test on 32bit + +in `ulonglong=ulong*uint` multiplication +is done in ulong, wrapping around on 32bit. + +This became visible after C/C changed the +default charset to utf8, thus changing +mbmaxlem from 1 to 3. +--- + tests/mysql_client_fw.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c +index f69eb28a2871..4d036887629a 100644 +--- a/tests/mysql_client_fw.c ++++ b/tests/mysql_client_fw.c +@@ -768,7 +768,7 @@ static void do_verify_prepare_field(MYSQL_RES *result, + { + MYSQL_FIELD *field; + CHARSET_INFO *cs; +- ulonglong expected_field_length; ++ ulonglong expected_field_length= length; + + if (!(field= mysql_fetch_field_direct(result, no))) + { +@@ -777,7 +777,7 @@ static void do_verify_prepare_field(MYSQL_RES *result, + } + cs= get_charset(field->charsetnr, 0); + DIE_UNLESS(cs); +- if ((expected_field_length= length * cs->mbmaxlen) > UINT_MAX32) ++ if ((expected_field_length*= cs->mbmaxlen) > UINT_MAX32) + expected_field_length= UINT_MAX32; + if (!opt_silent) + { diff --git a/gnu/packages/patches/meson-for-build-rpath.patch b/gnu/packages/patches/meson-for-build-rpath.patch index 04c07d05bf..ef9a73f07c 100644 --- a/gnu/packages/patches/meson-for-build-rpath.patch +++ b/gnu/packages/patches/meson-for-build-rpath.patch @@ -2,8 +2,7 @@ This patch removes a part of meson that clears the rpath upon installation. This will only be applied to a special version of meson, used for the meson-build-system. -Patch for Meson 0.42.0 by Peter Mikkelsen <petermikkelsen10@gmail.com> -Adjusted for Meson 0.47.1 by Ricardo Wurmus <rekado@elephly.net> +Original patch for Meson 0.42.0 by Peter Mikkelsen <petermikkelsen10@gmail.com> --- meson-0.47.1/mesonbuild/minstall.py.old 2018-08-10 11:01:27.812327013 +0200 +++ meson-0.47.1/mesonbuild/minstall.py 2018-08-10 11:01:51.940368505 +0200 diff --git a/gnu/packages/patches/openblas-fix-tests-i686.patch b/gnu/packages/patches/openblas-fix-tests-i686.patch deleted file mode 100644 index 3325546ea3..0000000000 --- a/gnu/packages/patches/openblas-fix-tests-i686.patch +++ /dev/null @@ -1,35 +0,0 @@ -Fix a test failure on some i686 systems: - -https://github.com/xianyi/OpenBLAS/issues/1575 - -This patch is a squashed version of these commits: - -https://github.com/xianyi/OpenBLAS/pull/1583 - -diff --git a/kernel/x86/KERNEL.NEHALEM b/kernel/x86/KERNEL.NEHALEM -index 835520ef..65b03ae5 100644 ---- a/kernel/x86/KERNEL.NEHALEM -+++ b/kernel/x86/KERNEL.NEHALEM -@@ -1,3 +1 @@ - include $(KERNELDIR)/KERNEL.PENRYN --SSWAPKERNEL = ../arm/swap.c --DSWAPKERNEL = ../arm/swap.c -diff --git a/kernel/x86/swap.S b/kernel/x86/swap.S -index 54b00b33..e30c2789 100644 ---- a/kernel/x86/swap.S -+++ b/kernel/x86/swap.S -@@ -138,6 +138,14 @@ - /* INCX != 1 or INCY != 1 */ - - .L14: -+ cmpl $0, %ebx -+ jne .L141 -+ cmpl $0, %ecx -+ jne .L141 -+/* INCX == 0 and INCY == 0 */ -+ jmp .L27 -+ -+.L141: - movl %edx, %eax - sarl $2, %eax - jle .L28 diff --git a/gnu/packages/patches/polkit-drop-test.patch b/gnu/packages/patches/polkit-drop-test.patch deleted file mode 100644 index 2fd0c8bdf6..0000000000 --- a/gnu/packages/patches/polkit-drop-test.patch +++ /dev/null @@ -1,18 +0,0 @@ -Drop test failing with the following message: -FAIL: polkitbackendjsauthoritytest -================================== -/PolkitBackendJsAuthority/get_admin_identities: Error getting system bus: Could not connect: No such file or directoryError loading /var/run/ConsoleKit/database: Error statting file /var/run/ConsoleKit/database: No such file or directory - - -diff -ru polkit-0.112.old/test/Makefile.in polkit-0.112/test/Makefile.in ---- polkit-0.112.old/test/Makefile.in 2013-07-08 22:52:13.000000000 +0200 -+++ polkit-0.112/test/Makefile.in 2014-11-09 18:43:47.000000000 +0100 -@@ -388,7 +388,7 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = mocklibc . polkit polkitbackend -+SUBDIRS = mocklibc . polkit - AM_CFLAGS = $(GLIB_CFLAGS) - noinst_LTLIBRARIES = libpolkit-test-helper.la - libpolkit_test_helper_la_SOURCES = polkittesthelper.c polkittesthelper.h diff --git a/gnu/packages/patches/pulseaudio-glibc-2.27.patch b/gnu/packages/patches/pulseaudio-glibc-2.27.patch deleted file mode 100644 index 79d86abeee..0000000000 --- a/gnu/packages/patches/pulseaudio-glibc-2.27.patch +++ /dev/null @@ -1,67 +0,0 @@ -Copied from: -https://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/?id=dfb0460fb4743aec047cdf755a660a9ac2d0f3fb - - -From dfb0460fb4743aec047cdf755a660a9ac2d0f3fb Mon Sep 17 00:00:00 2001 -From: Tanu Kaskinen <tanuk@iki.fi> -Date: Wed, 24 Jan 2018 03:51:49 +0200 -Subject: [PATCH] memfd-wrappers: only define memfd_create() if not already - defined - -glibc 2.27 is to be released soon, and it will provide memfd_create(). -If glibc provides the function, we must not define it ourselves, -otherwise building fails due to conflict between the two implementations -of the same function. - -BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=104733 ---- - configure.ac | 3 +++ - src/pulsecore/memfd-wrappers.h | 7 ++++--- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0084c86e..0eb44b08 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -610,6 +610,9 @@ AS_IF([test "x$enable_memfd" = "xyes" && test "x$HAVE_MEMFD" = "x0"], - [AC_MSG_ERROR([*** Your Linux kernel does not support memfd shared memory. - *** Use linux v3.17 or higher for such a feature.])]) - -+AS_IF([test "x$HAVE_MEMFD" = "x1"], -+ AC_CHECK_FUNCS([memfd_create])) -+ - AC_SUBST(HAVE_MEMFD) - AM_CONDITIONAL([HAVE_MEMFD], [test "x$HAVE_MEMFD" = x1]) - AS_IF([test "x$HAVE_MEMFD" = "x1"], AC_DEFINE([HAVE_MEMFD], 1, [Have memfd shared memory.])) -diff --git a/src/pulsecore/memfd-wrappers.h b/src/pulsecore/memfd-wrappers.h -index 3bed9b2b..c7aadfd3 100644 ---- a/src/pulsecore/memfd-wrappers.h -+++ b/src/pulsecore/memfd-wrappers.h -@@ -20,13 +20,14 @@ - License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. - ***/ - --#ifdef HAVE_MEMFD -+#if defined(HAVE_MEMFD) && !defined(HAVE_MEMFD_CREATE) - - #include <sys/syscall.h> - #include <fcntl.h> - - /* -- * No glibc wrappers exist for memfd_create(2), so provide our own. -+ * Before glibc version 2.27 there was no wrapper for memfd_create(2), -+ * so we have to provide our own. - * - * Also define memfd fcntl sealing macros. While they are already - * defined in the kernel header file <linux/fcntl.h>, that file as -@@ -63,6 +64,6 @@ static inline int memfd_create(const char *name, unsigned int flags) { - #define F_SEAL_WRITE 0x0008 /* prevent writes */ - #endif - --#endif /* HAVE_MEMFD */ -+#endif /* HAVE_MEMFD && !HAVE_MEMFD_CREATE */ - - #endif --- -2.16.2 - diff --git a/gnu/packages/patches/wpa-supplicant-CVE-2018-14526.patch b/gnu/packages/patches/wpa-supplicant-CVE-2018-14526.patch new file mode 100644 index 0000000000..d3d5cbc46a --- /dev/null +++ b/gnu/packages/patches/wpa-supplicant-CVE-2018-14526.patch @@ -0,0 +1,53 @@ +Fix CVE-2018-14526: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-14526 +https://w1.fi/security/2018-1/unauthenticated-eapol-key-decryption.txt + +Patch downloaded from upstream: + +https://w1.fi/security/2018-1/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch + +From 3e34cfdff6b192fe337c6fb3f487f73e96582961 Mon Sep 17 00:00:00 2001 +From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> +Date: Sun, 15 Jul 2018 01:25:53 +0200 +Subject: [PATCH] WPA: Ignore unauthenticated encrypted EAPOL-Key data + +Ignore unauthenticated encrypted EAPOL-Key data in supplicant +processing. When using WPA2, these are frames that have the Encrypted +flag set, but not the MIC flag. + +When using WPA2, EAPOL-Key frames that had the Encrypted flag set but +not the MIC flag, had their data field decrypted without first verifying +the MIC. In case the data field was encrypted using RC4 (i.e., when +negotiating TKIP as the pairwise cipher), this meant that +unauthenticated but decrypted data would then be processed. An adversary +could abuse this as a decryption oracle to recover sensitive information +in the data field of EAPOL-Key messages (e.g., the group key). +(CVE-2018-14526) + +Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> +--- + src/rsn_supp/wpa.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff -upr wpa_supplicant-2.6.orig/src/rsn_supp/wpa.c wpa_supplicant-2.6/src/rsn_supp/wpa.c +--- wpa_supplicant-2.6.orig/src/rsn_supp/wpa.c 2016-10-02 21:51:11.000000000 +0300 ++++ wpa_supplicant-2.6/src/rsn_supp/wpa.c 2018-08-08 16:55:11.506831029 +0300 +@@ -2016,6 +2016,17 @@ int wpa_sm_rx_eapol(struct wpa_sm *sm, c + + if ((sm->proto == WPA_PROTO_RSN || sm->proto == WPA_PROTO_OSEN) && + (key_info & WPA_KEY_INFO_ENCR_KEY_DATA)) { ++ /* ++ * Only decrypt the Key Data field if the frame's authenticity ++ * was verified. When using AES-SIV (FILS), the MIC flag is not ++ * set, so this check should only be performed if mic_len != 0 ++ * which is the case in this code branch. ++ */ ++ if (!(key_info & WPA_KEY_INFO_MIC)) { ++ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, ++ "WPA: Ignore EAPOL-Key with encrypted but unauthenticated data"); ++ goto out; ++ } + if (wpa_supplicant_decrypt_key_data(sm, key, ver, key_data, + &key_data_len)) + goto out; diff --git a/gnu/packages/patches/xorg-server-rotate-fb.patch b/gnu/packages/patches/xorg-server-rotate-fb.patch deleted file mode 100644 index f47036b2a7..0000000000 --- a/gnu/packages/patches/xorg-server-rotate-fb.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit a85e94a50c94b07574c8701a3ff3c1243f4257f4 -Author: Olivier Fourdan <ofourdan@redhat.com> -Date: Fri Jun 15 08:57:12 2018 +0200 - - modesetting: use drmmode_bo_import() for rotate_fb - - drmmode_shadow_allocate() still uses drmModeAddFB() which may fail if - the format is not as expected, preventing from using a rotated output. - - Change it to use the new function drmmode_bo_import() which takes care - of calling the drmModeAddFB2() API. - - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106715 - Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> - Tested-by: Tomas Pelka <tpelka@redhat.com> - Reviewed-by: Lyude Paul <lyude@redhat.com> - -diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c -index 859a21a9d..ec11b3f56 100644 ---- a/hw/xfree86/drivers/modesetting/drmmode_display.c -+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c -@@ -1794,11 +1794,8 @@ drmmode_shadow_allocate(xf86CrtcPtr crtc, int width, int height) - return NULL; - } - -- ret = drmModeAddFB(drmmode->fd, width, height, crtc->scrn->depth, -- drmmode->kbpp, -- drmmode_bo_get_pitch(&drmmode_crtc->rotate_bo), -- drmmode_bo_get_handle(&drmmode_crtc->rotate_bo), -- &drmmode_crtc->rotate_fb_id); -+ ret = drmmode_bo_import(drmmode, &drmmode_crtc->rotate_bo, -+ &drmmode_crtc->rotate_fb_id); - - if (ret) { - ErrorF("failed to add rotate fb\n"); diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 224b0e8d64..a68e369912 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> -;;; Copyright © 2015 Leo Famulari <leo@famulari.name> +;;; Copyright © 2015, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. @@ -32,9 +32,10 @@ #:use-module (gnu packages file) #:use-module (gnu packages gawk) #:use-module (gnu packages less) + #:use-module (gnu packages mail) + #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages python) - #:use-module (gnu packages mail) #:use-module (gnu packages xml)) (define-public patchutils @@ -209,3 +210,25 @@ list, and commands that can search that database. It allows users to track the status of a patch, apply patches, and search for patches---all that from the command-line or from Emacs via its Notmuch integration.") (license gpl2+)))) + +(define-public vbindiff + (package + (name "vbindiff") + (version "3.0_beta5") + (source (origin + (method url-fetch) + (uri (string-append "https://www.cjmweb.net/vbindiff/vbindiff-" + version ".tar.gz")) + (sha256 + (base32 + "1f1kj4jki08bnrwpzi663mjfkrx4wnfpzdfwd2qgijlkx5ysjkgh")))) + (build-system gnu-build-system) + (inputs + `(("ncurses" ,ncurses))) + (home-page "https://www.cjmweb.net/vbindiff/") + (synopsis "Console-based tool for comparing binary data") + (description "Visual Binary Diff (@command{vbindiff}) displays files in +hexadecimal and ASCII (or EBCDIC). It can also display two files at once, and +highlight the differences between them. It works well with large files (up to 4 +GiB).") + (license gpl2+))) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index d972761586..d5369f3b6d 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -31,7 +31,7 @@ (define-public pciutils (package (name "pciutils") - (version "3.5.6") + (version "3.6.1") (source (origin (method url-fetch) (uri (string-append @@ -39,7 +39,7 @@ version ".tar.xz")) (sha256 (base32 - "08dvsk1b5m1r7qqzsm849h4glq67mngf8zw7bg0102ff1jwywipk")))) + "1q39hh8scgvqppk1clzjh7yiq5p2r0knv52g3qzmdhsir4f47h7w")))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index f5f4f95b71..4026fa2092 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -644,14 +644,14 @@ line tools for batch rendering @command{pdfdraw}, rewriting files (define-public qpdf (package (name "qpdf") - (version "6.0.0") + (version "8.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qpdf/qpdf/" version "/qpdf-" version ".tar.gz")) (sha256 (base32 - "0csj2p2gkxrc0rk8ykymlsdgfas96vzf1dip3y1x7z1q9plwgzd9")) + "1m3hcgip6bzjx4gd7wq1328p8zi3pq5savzncdyln6l0lcklh7vx")) (modules '((guix build utils))) (snippet ;; Replace shebang with the bi-lingual shell/Perl trick to remove @@ -683,9 +683,9 @@ eval '(exit $?0)' && eval 'exec perl -wS \"$0\" ${1+\"$@\"}' `(("pkg-config" ,pkg-config) ("perl" ,perl))) (propagated-inputs - `(("pcre" ,pcre))) - (inputs - `(("zlib" ,zlib))) + ;; In Requires.private of libqpdf.pc. + `(("libjpeg-turbo" ,libjpeg-turbo) + ("zlib" ,zlib))) (synopsis "Command-line tools and library for transforming PDF files") (description "QPDF is a command-line program that does structural, content-preserving @@ -693,7 +693,9 @@ transformations on PDF files. It could have been called something like pdf-to-pdf. It includes support for merging and splitting PDFs and to manipulate the list of pages in a PDF file. It is not a PDF viewer or a program capable of converting PDF into other formats.") - (license license:clarified-artistic) + ;; Prior to the 7.0 release, QPDF was licensed under Artistic 2.0. + ;; Users can still choose to use the old license at their option. + (license (list license:asl2.0 license:clarified-artistic)) (home-page "http://qpdf.sourceforge.net/"))) (define-public xournal diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 4eb68c0270..ab0ca08528 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -179,14 +179,14 @@ colors, styles, options and details.") (define-public asymptote (package (name "asymptote") - (version "2.44") + (version "2.47") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asymptote/" version "/asymptote-" version ".src.tgz")) (sha256 (base32 - "1rs9v95g19ri6ra2m921jf2yr9avqnzfybrqxilsld98xpqx56vg")))) + "0zc24n2vwzxdfmcppqfk3fkqlb4jmvswzi3bz232kxl7dyiyb971")))) (build-system gnu-build-system) ;; Note: The 'asy' binary retains a reference to docdir for use with its ;; "help" command in interactive mode, so adding a "doc" output is not diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index a3dbc4ff79..7cc5205faa 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Huang Ying <huang.ying.caritas@gmail.com> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,7 +43,7 @@ (define-public polkit (package (name "polkit") - (version "0.113") + (version "0.115") (source (origin (method url-fetch) (uri (string-append @@ -50,12 +51,15 @@ name "-" version ".tar.gz")) (sha256 (base32 - "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71")) - (patches (search-patches "polkit-drop-test.patch")) + "0c91y61y4gy6p91cwbzg32dhavw4b7fflg370rimqhdxpzdfr1rg")) (modules '((guix build utils))) (snippet '(begin (use-modules (guix build utils)) + ;; Disable broken test. + (substitute* "test/Makefile.in" + (("SUBDIRS = mocklibc . polkit polkitbackend") + "SUBDIRS = mocklibc . polkit")) (substitute* "configure" ;; Replace libsystemd-login with libelogind. (("libsystemd-login") "libelogind") @@ -66,7 +70,7 @@ (("systemd") "elogind")) (substitute* "src/polkitbackend/polkitbackendsessionmonitor-systemd.c" (("systemd") "elogind")) - (substitute* "src/polkitbackend/polkitbackendjsauthority.c" + (substitute* "src/polkitbackend/polkitbackendjsauthority.cpp" (("systemd") "elogind")) ;; GuixSD's polkit service stores actions under @@ -85,7 +89,7 @@ `(("expat" ,expat) ("linux-pam" ,linux-pam) ("elogind" ,elogind) - ("mozjs" ,mozjs) + ("mozjs" ,mozjs-52) ("nspr" ,nspr))) (propagated-inputs `(("glib" ,glib))) ; required by polkit-gobject-1.pc diff --git a/gnu/packages/profiling.scm b/gnu/packages/profiling.scm index b2def45ccf..07da23aa15 100644 --- a/gnu/packages/profiling.scm +++ b/gnu/packages/profiling.scm @@ -140,13 +140,13 @@ performance measurement opportunites across the hardware and software stack.") (define-public otf2 (package (name "otf2") - (version "2.1") + (version "2.1.1") (source (origin (method url-fetch) (uri (string-append "http://www.vi-hps.org/upload/packages/otf2/otf2-" version ".tar.gz")) - (sha256 (base32 "1lyaqhdfaqm1kd23yk71g71vkscw83s7m57j017y768h8sh8xlwa")))) + (sha256 (base32 "1ls7rz6qwnqbkifpafc95bnfh3m9xbs74in8zxlnhfbgwx11nn81")))) (native-inputs `(("python" ,python))) (outputs '("doc" ; 18MB "lib" diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index bac92eafa9..35d499522b 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages algebra) + #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) #:use-module (gnu packages check) @@ -122,7 +124,7 @@ rates.") (define-public pulseaudio (package (name "pulseaudio") - (version "11.1") + (version "12.2") (source (origin (method url-fetch) (uri (string-append @@ -130,7 +132,7 @@ rates.") name "-" version ".tar.xz")) (sha256 (base32 - "17ndr6kc7hpv4ih4gygwlcpviqifbkvnk4fbwf4n25kpb991qlpj")) + "0ma0p8iry7fil7qb4pm2nx2pm65kq9hk9xc4r5wkf14nqbzni5l0")) (modules '((guix build utils))) (snippet ;; Disable console-kit support by default since it's deprecated @@ -141,7 +143,6 @@ rates.") (string-append "#" all "\n"))) #t)) (patches (search-patches - "pulseaudio-glibc-2.27.patch" "pulseaudio-fix-mult-test.patch" "pulseaudio-longer-test-timeout.patch")))) (build-system gnu-build-system) @@ -153,13 +154,6 @@ rates.") (assoc-ref %outputs "out") "/lib/udev/rules.d")) #:phases (modify-phases %standard-phases - (replace 'bootstrap - ;; TODO: Remove this custom bootstrap phase when - ;; pulseaudio-glibc-2.27.patch is removed. - (lambda _ - (patch-shebang "git-version-gen") - (setenv "NOCONFIGURE" "1") - (invoke "bash" "bootstrap.sh"))) (add-before 'check 'pre-check (lambda _ ;; 'tests/lock-autospawn-test.c' wants to create a file @@ -174,25 +168,21 @@ rates.") `(("alsa-lib" ,alsa-lib) ("bluez" ,bluez) ("sbc" ,sbc) - ("speex" ,speex) + ("speexdsp" ,speexdsp) ("libsndfile" ,libsndfile) - ("libsamplerate" ,libsamplerate) + ("jack" ,jack-1) ; For routing the output to jack. ("dbus" ,dbus) ("glib" ,glib) - ("intltool" ,intltool) - ("m4" ,m4) ("libltdl" ,libltdl) ("fftwf" ,fftwf) ("avahi" ,avahi) - ("eudev" ,eudev) ;for the detection of hardware audio devices - ("check" ,check))) + ("eudev" ,eudev))) ;for the detection of hardware audio devices (native-inputs - `(("pkg-config" ,pkg-config) - ;; TODO: Remove "autoconf", "automake", and "libtool" from - ;; native-inputs when pulseaudio-glibc-2.27.patch is removed. - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) + `(("check" ,check) + ("glib:bin" ,glib "bin") + ("intltool" ,intltool) + ("m4" ,m4) + ("pkg-config" ,pkg-config))) (propagated-inputs ;; 'libpulse*.la' contain `-lgdbm' and `-lcap', so propagate them. `(("libcap" ,libcap) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index eba1cc9186..fde21d35f8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3742,7 +3742,7 @@ atlas_libs = openblas (add-installed-pythonpath inputs outputs) (with-directory-excursion "/tmp" (invoke "python" "-c" - "import scipy; scipy.test('full', verbose=2)"))))))) + "import scipy; scipy.test(verbose=2)"))))))) (home-page "https://www.scipy.org/") (synopsis "The Scipy library provides efficient numerical routines") (description "The SciPy library is one of the core packages that make up diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 1618b29b06..ff79b90fcd 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -264,14 +264,14 @@ ideal (e.g. in LV2 implementations or embedded applications).") (define-public sord (package (name "sord") - (version "0.16.0") + (version "0.16.2") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/sord-" version ".tar.bz2")) (sha256 (base32 - "0nh3i867g9z4kdlnk82cg2kcw8r02qgifxvkycvzb4vfjv4v4g4x")))) + "13fshxwpipjrvsah1m2jw1kf022z2q5vpw24bzcznglgvms13x89")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index aa4cae6f97..908dfd5751 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1830,13 +1830,13 @@ Mocha stubbing and mocking library with Bacon, a small RSpec clone.") (define-public ruby-net-ssh (package (name "ruby-net-ssh") - (version "4.1.0") + (version "4.2.0") (source (origin (method url-fetch) (uri (rubygems-uri "net-ssh" version)) (sha256 (base32 - "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q")))) + "07c4v97zl1daabmri9zlbzs6yvkl56z1q14bw74d53jdj0c17nhx")))) (build-system ruby-build-system) (native-inputs `(("bundler" ,bundler) @@ -5033,17 +5033,17 @@ in standard Ruby syntax.") (home-page "https://github.com/ruby/rake") (license license:expat))) -(define-public ruby-childprocess +(define-public ruby-childprocess-0.6 (package (name "ruby-childprocess") - (version "0.9.0") + (version "0.6.3") (source (origin (method url-fetch) (uri (rubygems-uri "childprocess" version)) (sha256 (base32 - "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p")))) + "1p3f43scdzx9zxmy2kw5zsc3az6v46nq4brwcxmnscjy4w4racbv")))) (build-system ruby-build-system) (arguments `(#:tests? #f)) @@ -5057,3 +5057,16 @@ in standard Ruby syntax.") programs running in the background, in Ruby.") (home-page "http://github.com/enkessler/childprocess") (license license:expat))) + +(define-public ruby-childprocess + (package + (inherit ruby-childprocess-0.6) + (name "ruby-childprocess") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "childprocess" version)) + (sha256 + (base32 + "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p")))))) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 28bffb44bb..0695f8c7d2 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -303,21 +303,19 @@ safety and thread safety guarantees.") (package-native-inputs base-rust)))))) (define-public mrustc - (let ((commit "b5b70897015ee70d62ddda9711c256ca7c720e0f") - (revision "3") - (rustc-version "1.19.0")) + (let ((rustc-version "1.19.0")) (package (name "mrustc") - (version (git-version "0.0.0" revision commit)) + (version "0.8.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/thepowersgang/mrustc.git") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1d6jr6agiy598ab8lax0h9dfn9n67wg906y1f46l1c27sz3w82lb")))) + "0a7v8ccyzp1sdkwni8h1698hxpfz2sxhcpx42n6l2pbm0rbjp08i")))) (outputs '("out" "cargo")) (build-system gnu-build-system) (inputs @@ -335,7 +333,12 @@ safety and thread safety guarantees.") "/bin/llvm-config")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'unpack-target-compiler + (add-after 'unpack 'patch-date + (lambda _ + (substitute* "Makefile" + (("shell date") "shell date -d @1")) + #t)) + (add-after 'patch-date 'unpack-target-compiler (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "minicargo.mk" ;; Don't try to build LLVM. diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 58e3f02db8..ffc90472d8 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -274,29 +274,6 @@ structs in the Go programming language.") (home-page "https://github.com/d4l3k/messagediff") (license expat)))) -(define-public go-github-com-edsrzf-mmap-go - (let ((commit "0bce6a6887123b67a60366d2c9fe2dfb74289d2e") - (revision "0")) - (package - (name "go-github-com-edsrzf-mmap-go") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/edsrzf/mmap-go") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1am4m2k451bksnbiqj6lxknk4lsgmrhv0q3ajqac818vj0cpfgs9")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/edsrzf/mmap-go")) - (synopsis "Go implementation of mmap") - (description "This packages provides a Go implementation of mmap.") - (home-page "https://github.com/edsrzf/mmap-go") - (license bsd-3)))) - (define-public go-github-com-gobwas-glob (let ((commit "51eb1ee00b6d931c66d229ceeb7c31b985563420") (revision "0")) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 3db5796b4c..6eaaffba40 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -143,8 +143,8 @@ as well as the classic centralized workflow.") (define-public git (package (name "git") - ;; XXX When updating Git, check if the special 'git:src' input to cgit needs - ;; to be updated as well. + ;; XXX When updating Git, check if the special 'git-source' input to cgit + ;; needs to be updated as well. (version "2.18.0") (source (origin (method url-fetch) @@ -419,7 +419,7 @@ everything from small to very large projects with speed and efficiency.") (define-public libgit2 (package (name "libgit2") - (version "0.26.5") + (version "0.26.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/libgit2/libgit2/" @@ -427,7 +427,7 @@ everything from small to very large projects with speed and efficiency.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1adhq7pk9zdj85i5j4xzimq39qy6wpsi4h9fb8vc8jsncr8qmqjj")) + "0qjn1v5q282v8jih8rqjdqxr5v4n4manr0c8i3nnrf6sxd3xssbn")) (patches (search-patches "libgit2-mtime-0.patch")) ;; Remove bundled software. @@ -558,9 +558,7 @@ collaboration using typical untrusted file hosts or services.") (define-public cgit (package (name "cgit") - ;; XXX When updating cgit, try removing the special 'git:src' input and - ;; using the source of the git package. - (version "1.1") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append @@ -568,7 +566,7 @@ collaboration using typical untrusted file hosts or services.") version ".tar.xz")) (sha256 (base32 - "142qcgs8dwnzhymn0a7xx47p9fc2z5wrb86ah4a9iz0mpqlsz288")))) + "1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; XXX: fail to build the in-source git. @@ -580,7 +578,7 @@ collaboration using typical untrusted file hosts or services.") (lambda* (#:key inputs #:allow-other-keys) ;; Unpack the source of git into the 'git' directory. (invoke "tar" "--strip-components=1" "-C" "git" "-xf" - (assoc-ref inputs "git:src")))) + (assoc-ref inputs "git-source")))) (add-after 'unpack 'patch-absolute-file-names (lambda* (#:key inputs #:allow-other-keys) (define (quoted-file-name input path) @@ -642,16 +640,8 @@ collaboration using typical untrusted file hosts or services.") ("bzip2" ,bzip2) ("xz" ,xz))) (inputs - `(;; Cgit directly accesses some internal Git interfaces that changed in - ;; Git 2.12. Try removing this special input and using the source of the - ;; Git package for cgit > 1.1. - ("git:src" - ,(origin - (method url-fetch) - (uri "mirror://kernel.org/software/scm/git/git-2.10.5.tar.xz") - (sha256 - (base32 - "1r2aa19gnrvm2y4fqcvpw1g9l72n48axqmpgv18s6d0y2p72vhzj")))) + `(;; Building cgit requires a Git source tree. + ("git-source" ,(package-source git)) ("openssl" ,openssl) ("groff" ,groff) ("python" ,python) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 605e461a6c..f81dbe5244 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -559,7 +559,7 @@ libebml is a C++ library to read and write EBML files.") (define-public libva (package (name "libva") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) @@ -571,7 +571,7 @@ libebml is a C++ library to read and write EBML files.") (string-append "https://www.freedesktop.org/software/vaapi/releases/" "libva/libva-" version "/libva-" version ".tar.bz2"))) (sha256 - (base32 "03sb1b3fxw8myf9kz6rxw5f3v1p0vfmk34779qx0q8fk24x9bypk")))) + (base32 "1wjfrs261fp9wkhgpmrlz5smnhxrmsk31way646x6i2mg16a0v3g")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -650,6 +650,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") ("soxr" ,soxr) ("speex" ,speex) ("twolame" ,twolame) + ("vidstab" ,vidstab) ("x265" ,x265) ("xvid" ,xvid) ("zlib" ,zlib))) @@ -701,8 +702,6 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") ;; --enable-libutvideo enable Ut Video encoding and decoding via ;; libutvideo [no] ;; --enable-libv4l2 enable libv4l2/v4l-utils [no] - ;; --enable-libvidstab enable video stabilization using - ;; vid.stab [no] ;; --enable-libvo-aacenc enable AAC encoding via libvo-aacenc [no] ;; --enable-libvo-amrwbenc enable AMR-WB encoding via ;; libvo-amrwbenc [no] @@ -730,6 +729,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") "--enable-libspeex" "--enable-libtheora" "--enable-libtwolame" + "--enable-libvidstab" "--enable-libvorbis" "--enable-libvpx" "--enable-libxvid" @@ -1257,7 +1257,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2018.07.29") + (version "2018.08.04") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1265,7 +1265,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "18rszvvpw9zyqfjysydvl24jf0hlpfcd22fgqsijhsq7bznwr9jj")))) + "1hcx99qbbyigc8k98c8bcc6a2wnhq6493fmrkl7rysc8krlxr0pm")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion @@ -3034,3 +3034,27 @@ project, which is released into the public domain, as well as ISO 14496-12:2005 online.") (home-page "https://github.com/danielgtaylor/qtfaststart") (license license:expat))) + +(define-public vidstab + (package + (name "vidstab") + (version "1.1.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/georgmartius/vid.stab/" + "archive/v" version ".tar.gz")) + (sha256 + (base32 + "1fy03n343djfdi19msac81833v5iivpv635yjzrx9nkfwm9s1lhl")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f)) ; tests are not run as part of standard build process + (home-page "http://public.hronopik.de/vid.stab/") + (synopsis "Video stabilization library") + (description "Vidstab is a video stabilization library which can be used +with FFmpeg. A video acquired using a hand-held camera or a camera mounted on a +vehicle typically suffers from undesirable shakes and jitters. Activities such +as surfing, skiing, riding and walking while shooting videos are especially +prone to erratic camera shakes. Vidstab targets these video contents to help +create smoother and stable videos.") + (license license:gpl2+))) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index e4120de38f..8e7eded5e1 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -94,7 +94,7 @@ (define-public qemu (package (name "qemu") - (version "2.12.0") + (version "2.12.1") (source (origin (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" @@ -102,7 +102,7 @@ (patches (search-patches "qemu-CVE-2018-11806.patch")) (sha256 (base32 - "1z66spkm1prvhbq7h5mfnp0i6mmamsb938fqmdfvyrgzc7rh34z6")))) + "0krnp2wvggpchc7fdlmyasqy7j17baz8asr2g05x0v00w003hn1k")))) (build-system gnu-build-system) (arguments '(;; Running tests in parallel can occasionally lead to failures, like: @@ -347,6 +347,7 @@ all common programming languages. Vala bindings are also provided.") (uri (string-append "https://linuxcontainers.org/downloads/lxc/lxc-" version ".tar.gz")) + (patches (search-patches "lxc-CVE-2018-6556.patch")) (sha256 (base32 "1nyml98k28sc5sda0260cmby4irkpnhpwgmx4yhqy10wpr4nr625")))) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index a8442cb7a6..f256e21187 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -163,7 +163,7 @@ interpretation of the specifications for these languages.") (define-public vulkan-headers (package (name "vulkan-headers") - (version "1.1.77.0") + (version "1.1.82.0") (source (origin (method url-fetch) @@ -172,7 +172,7 @@ interpretation of the specifications for these languages.") "archive/sdk-" version ".tar.gz")) (sha256 (base32 - "05pgaqyj516lmzdr4clxll5gvr5zb29sfjhs2d7mkryqs6zk5xdj")))) + "1rbra47f1dkw5bjzvm0k9s2f89c2x80j904ply4bxks7sl3xlwyz")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. @@ -195,7 +195,7 @@ interpretation of the specifications for these languages.") "archive/sdk-" version ".tar.gz")) (sha256 (base32 - "1zg86b5wba9l14ry3ap7yzgd9hwzxxr0rjgwhnv14n75aqpwv02d")))) + "032vfysb8mi19c2lx08vc6k9mbzxmiy17wp7a22vpgwwv69kxkc6")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". @@ -251,7 +251,7 @@ and the ICD.") "archive/sdk-" version ".tar.gz")) (sha256 (base32 - "1imbiw8crrkxgsjkgmv5x6s9yx89g6v3r2s5qfm5h31pv6lyzshm")))) + "175qhfg9lxxfm5zks6jxaybcxamwd9q5kvjq8ikf2dbmskgybr92")))) (build-system cmake-build-system) (inputs `(("glslang" ,glslang) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 56bfa6ab28..397f4a3133 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -199,7 +199,7 @@ and the GTK+ toolkit.") (define-public lynx (package (name "lynx") - (version "2.8.9dev.19") + (version "2.8.9rel.1") (source (origin (method url-fetch) (uri (string-append @@ -207,7 +207,7 @@ and the GTK+ toolkit.") "/lynx" version ".tar.bz2")) (sha256 (base32 - "17wfiad2ha4y15pmwv55j0l9z1z1pcgcasrc6hwbgv0hhdpp08q2")))) + "15cmyyma2kz1hfaa6mwjgli8zwdzq3jv0q2cl6nwzycjfwyijzrq")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("perl" ,perl))) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7588adea0c..8262d9af67 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -813,7 +813,7 @@ for efficient socket-like bidirectional reliable communication channels.") (define-public libpsl (package (name "libpsl") - (version "0.20.1") + (version "0.20.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/rockdaboot/libpsl/" @@ -821,7 +821,7 @@ for efficient socket-like bidirectional reliable communication channels.") "/libpsl-" version ".tar.gz")) (sha256 (base32 - "17r18y25ka2ck2ykfidbg4a7jpyzmkqwrzplgqjp7mwd2l9rc6cm")))) + "03sn3fbcrmgl9x2f1gc6rbrdlbrnwbhrnkgi733gqb95cvmhmzgq")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -4086,14 +4086,14 @@ a pure C99 library.") (define-public uwsgi (package (name "uwsgi") - (version "2.0.17") + (version "2.0.17.1") (source (origin (method url-fetch) (uri (string-append "https://projects.unbit.it/downloads/uwsgi-" version ".tar.gz")) (sha256 (base32 - "1wlbaairsmhp6bx5wv282q9pgh6w7w6yrb8vxjznfaxrinsfkhix")))) + "0xxjb9dyivq5531birvxq2gnyxf2x5q7gz54440acra6qwsq4cfj")))) (build-system gnu-build-system) (outputs '("out" "python")) (arguments @@ -4946,7 +4946,7 @@ tools like SSH (Secure Shell) to reach the outside world.") (define-public stunnel (package (name "stunnel") - (version "5.47") + (version "5.48") (source (origin (method url-fetch) @@ -4954,7 +4954,7 @@ tools like SSH (Secure Shell) to reach the outside world.") version ".tar.gz")) (sha256 (base32 - "02qx0b0dd38rfcl9vfd6zq1pcg5gv0z2mxw5z3p2pfbfk7dpbrn4")))) + "1pxqn9ixl80nrhfq12igyi874653jclji56hh9w24snf0aixa48h")))) (build-system gnu-build-system) (native-inputs ;; For tests. diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 10cd788af2..0eab2df22c 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -55,14 +55,14 @@ (define-public webkitgtk (package (name "webkitgtk") - (version "2.20.3") + (version "2.20.4") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "1n0dy94bm7wvxln4jis1gp8plv8n4a01g41724zsf5psg1yk16sp")))) + "0cmfjbfxssgrwhgqmk7kqws91k6pha519bnyjrfsgy640max2zfc")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no tests diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a076cbbb1d..e83f07bc54 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -455,7 +455,7 @@ desktop environment.") (define-public xmonad (package (name "xmonad") - (version "0.13") + (version "0.14") (synopsis "Tiling window manager") (source (origin (method url-fetch) @@ -463,12 +463,13 @@ desktop environment.") name "-" version ".tar.gz")) (sha256 (base32 - "1jh3lcs20qpna36fa5a0r174xqrsxhj10x1rm5vwf64zariipy7r")))) + "0lq3k0ap7jxrrswpd954mqa6h8diccbif5srcgbmr39y6y8x0mm4")))) (build-system haskell-build-system) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) ("ghc-mtl" ,ghc-mtl) ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-semigroups" ,ghc-semigroups) ("ghc-setlocale" ,ghc-setlocale) ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-x11" ,ghc-x11))) @@ -489,7 +490,7 @@ desktop environment.") Comment=~a~@ Exec=~a/bin/xmonad~@ Type=Application~%" ,name ,synopsis %output))))))))) - (home-page "http://xmonad.org") + (home-page "https://xmonad.org") (description "Xmonad is a tiling window manager for X. Windows are arranged automatically to tile the screen without gaps or overlap, maximising screen @@ -547,7 +548,7 @@ Haskell, no knowledge of the language is required to install and use it.") (define-public ghc-xmonad-contrib (package (name "ghc-xmonad-contrib") - (version "0.13") + (version "0.14") (source (origin (method url-fetch) @@ -555,7 +556,7 @@ Haskell, no knowledge of the language is required to install and use it.") "xmonad-contrib-" version ".tar.gz")) (sha256 (base32 - "0vj72jhfng6y7hv5frx2v99jvl3jn9rbpk2j7xw9vydiwmzq4q57")))) + "1660w3xhbfrlq8b8s1rviq2mcn1vyqpypli4023gqxwry52brk6y")))) (build-system haskell-build-system) (propagated-inputs `(("ghc-mtl" ,ghc-mtl) @@ -566,7 +567,7 @@ Haskell, no knowledge of the language is required to install and use it.") ("ghc-x11" ,ghc-x11) ("ghc-x11-xft" ,ghc-x11-xft) ("xmonad" ,xmonad))) - (home-page "http://xmonad.org") + (home-page "https://xmonad.org") (synopsis "Third party extensions for xmonad") (description "Third party tiling algorithms, configurations, and scripts to Xmonad, a diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index d6ca5278f5..a6d9555966 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -640,7 +640,7 @@ to find buttons, etc, on the screen to click on.") (define-public xlockmore (package (name "xlockmore") - (version "5.55") + (version "5.56") (source (origin (method url-fetch) (uri (list (string-append "http://sillycycle.com/xlock/" @@ -651,7 +651,7 @@ to find buttons, etc, on the screen to click on.") name "-" version ".tar.xz"))) (sha256 (base32 - "1y3f76rq2nd10fgi2rx81aj6pijglmm661vjsxi05hpg35dzmwfl")))) + "1dg1n79rnswhxqz36mxnl5lp8p37i9fbibnzzyrqknmvf2s8xpd0")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list (string-append "--enable-appdefaultdir=" diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b238ea4aad..47a7f11499 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2387,7 +2387,7 @@ XC-APPGROUP, XTEST.") (define-public libevdev (package (name "libevdev") - (version "1.5.6") + (version "1.5.9") (source (origin (method url-fetch) @@ -2395,7 +2395,7 @@ XC-APPGROUP, XTEST.") name "-" version ".tar.xz")) (sha256 (base32 - "1256ypz93039n6km4macg158fpmjgylhmcmk20pnklxicsfpxv7c")))) + "0xca343ff12wh6nsq76r0nbsfrm8dypjrzm4fqz9vv9v8i8kfrp1")))) (build-system gnu-build-system) (native-inputs `(("python" ,python))) (home-page "https://www.freedesktop.org/wiki/Software/libevdev/") @@ -4566,7 +4566,7 @@ cannot be adequately worked around on the client side of the wire.") (define-public libxinerama (package (name "libxinerama") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) @@ -4576,7 +4576,7 @@ cannot be adequately worked around on the client side of the wire.") ".tar.bz2")) (sha256 (base32 - "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs")))) + "086p0axqj57nvkaqa6r00dnr9kyrn1m8blgf0zjy25zpxkbxn200")))) (build-system gnu-build-system) (propagated-inputs `(("xorgproto" ,xorgproto))) @@ -5070,7 +5070,7 @@ over Xlib, including: (define-public xorg-server (package (name "xorg-server") - (version "1.20.0") + (version "1.20.1") (source (origin (method url-fetch) @@ -5079,7 +5079,7 @@ over Xlib, including: name "-" version ".tar.bz2")) (sha256 (base32 - "1rnka3sp8yg2bir0bjjhwn33jikj8qd8ckqcxrs94w05bwc7v5lx")) + "0679942x1ma2p30vlvqylpjc5v1ak1pgqysnqrj82nz7dzl9zjar")) (patches (list ;; See: @@ -5093,8 +5093,7 @@ over Xlib, including: (sha256 (base32 "0mm70y058r8s9y9jiv7q2myv0ycnaw3iqzm7d274410s0ik38w7q")) - (file-name "xorg-server-use-intel-only-on-pre-gen4.diff")) - (search-patch "xorg-server-rotate-fb.patch"))))) + (file-name "xorg-server-use-intel-only-on-pre-gen4.diff")))))) (build-system gnu-build-system) (propagated-inputs `(("libpciaccess" ,libpciaccess) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 9fad9af99f..921914ccdf 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -419,7 +419,7 @@ FILE-SYSTEM." '((gnu build file-systems))) (shepherd-service (provision (list (file-system->shepherd-service-name file-system))) - (requirement `(root-file-system + (requirement `(root-file-system udev ,@(map dependency->shepherd-service-name dependencies))) (documentation "Check, mount, and unmount the given file system.") (start #~(lambda args diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index e894e1472d..fddf899092 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -58,12 +58,6 @@ (let ((module (resolve-interface '(gnu packages build-tools)))) (module-ref module 'meson-for-build))) -(define (default-patchelf) - "Return the default patchelf package." - ;; Lazily resolve the binding to avoid a circular dependency. - (let ((module (resolve-interface '(gnu packages elf)))) - (module-ref module 'patchelf))) - (define* (lower name #:key source inputs native-inputs outputs system target (meson (default-meson)) @@ -81,15 +75,6 @@ (system system) (build-inputs `(("meson" ,meson) ("ninja" ,ninja) - ;; XXX PatchELF fails to build on armhf, so we skip - ;; the 'fix-runpath' phase there for now. It is used - ;; to avoid superfluous entries in RUNPATH as described - ;; in <https://bugs.gnu.org/28444#46>, so armhf may now - ;; have different runtime dependencies from other arches. - ,@(if (not (string-prefix? "arm" (or (%current-target-system) - (%current-system)))) - `(("patchelf" ,(default-patchelf))) - '()) ,@native-inputs)) (host-inputs `(,@(if source `(("source" ,source)) @@ -147,10 +132,7 @@ has a 'meson.build' file." #:inputs %build-inputs #:search-paths ',(map search-path-specification->sexp search-paths) - #:phases - (if (string-prefix? "arm" ,system) - (modify-phases build-phases (delete 'fix-runpath)) - build-phases) + #:phases build-phases #:configure-flags ,configure-flags #:build-type ,build-type #:tests? ,tests? diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index d79b4d503b..d79a2d55ed 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -173,7 +173,7 @@ to the default GNU unpack strategy." (define* (generate-jar-indices #:key outputs #:allow-other-keys) "Generate file \"META-INF/INDEX.LIST\". This file does not use word wraps -and is preferred over \"META-INF/MAINFEST.MF\", which does use word wraps, +and is preferred over \"META-INF/MANIFEST.MF\", which does use word wraps, by Java when resolving dependencies. So we make sure to create it so that grafting works - and so that the garbage collector doesn't collect dependencies of this jar file." @@ -245,7 +245,9 @@ repack them. This is necessary to ensure that archives are reproducible." (replace 'build build) (replace 'check check) (replace 'install install) - (add-after 'install 'generate-jar-indices generate-jar-indices) + (add-after 'install 'reorder-jar-content + strip-jar-timestamps) + (add-after 'reorder-jar-content 'generate-jar-indices generate-jar-indices) (add-after 'generate-jar-indices 'strip-jar-timestamps strip-jar-timestamps))) diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm index 9724764424..f6b8b49801 100644 --- a/guix/build/meson-build-system.scm +++ b/guix/build/meson-build-system.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,18 +46,13 @@ (prefix (assoc-ref outputs "out")) (args `(,(string-append "--prefix=" prefix) ,(string-append "--buildtype=" build-type) + ,(string-append "-Dc_link_args=-Wl,-rpath=" + (assoc-ref outputs "out") "/lib") + ,(string-append "-Dcpp_link_args=-Wl,-rpath=" + (assoc-ref outputs "out") "/lib") ,@configure-flags ,source-dir))) - ;; Meson lacks good facilities for dealing with RUNPATH, so we - ;; add the output "lib" directory here to avoid doing that in - ;; many users. Related issues: - ;; * <https://github.com/mesonbuild/meson/issues/314> - ;; * <https://github.com/mesonbuild/meson/issues/3038> - ;; * <https://github.com/NixOS/nixpkgs/issues/31222> - (unless (getenv "LDFLAGS") - (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib"))) - (mkdir build-dir) (chdir build-dir) (apply invoke "meson" args))) @@ -148,8 +144,13 @@ for example libraries only needed for the tests." (replace 'configure configure) (replace 'build build) (replace 'check check) - (replace 'install install) - (add-after 'strip 'fix-runpath fix-runpath))) + ;; XXX: We used to have 'fix-runpath' here, but it appears no longer + ;; necessary with newer Meson. However on 'core-updates' there is a + ;; useful 'strip-runpath' procedure to ensure no bogus directories in + ;; RUNPATH (remember that we tell Meson to not touch RUNPATH in + ;; (@ (gnu packages build-tools) meson-for-build)), so it should be + ;; re-added there sans the augment-rpath calls (which are not needed). + (replace 'install install))) (define* (meson-build #:key inputs phases #:allow-other-keys #:rest args) diff --git a/guix/import/cabal.scm b/guix/import/cabal.scm index 1b8bda6f4e..13c2f3f48c 100644 --- a/guix/import/cabal.scm +++ b/guix/import/cabal.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> +;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -831,9 +832,9 @@ See the manual for limitations."))))))) (test-suites (make-cabal-section evaluated-sexp 'test-suite)) (flags (make-cabal-section evaluated-sexp 'flag)) (eval-environment '()) - (custom-setup (match - (make-cabal-section evaluated-sexp 'custom-setup) - ((x) x)))) + (custom-setup (match (make-cabal-section evaluated-sexp 'custom-setup) + ((x) x) + (_ #f)))) (make-cabal-package name version license home-page-or-hackage source-repository synopsis description executables lib test-suites flags eval-environment custom-setup))) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 6f80d84b70..3b138f8c98 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Nils Gillmann <ng0@n0.is> +;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -178,8 +179,9 @@ object." (define (cabal-custom-setup-dependencies->names cabal) "Return the list of custom-setup dependencies from the CABAL package object." - (let* ((custom-setup-dependencies (and=> (cabal-package-custom-setup cabal) - cabal-custom-setup-dependencies))) + (let* ((custom-setup-dependencies (or (and=> (cabal-package-custom-setup cabal) + cabal-custom-setup-dependencies) + '()))) (map cabal-dependency-name custom-setup-dependencies))) (define (filter-dependencies dependencies own-name) |