diff options
33 files changed, 304 insertions, 348 deletions
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 372cf63c68..ac99d6b1a3 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -145,6 +145,7 @@ the #:references-graphs parameter of 'derivation'." (_ #f)) (apply invoke qemu "-nographic" "-no-reboot" + "-smp" (number->string (parallel-job-count)) "-m" (number->string memory-size) "-object" "rng-random,filename=/dev/urandom,id=guixsd-vm-rng" "-device" "virtio-rng-pci,rng=guixsd-vm-rng" diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 49fcc511e6..2ec873dab5 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3701,7 +3701,7 @@ library.") (define-public faudio (package (name "faudio") - (version "19.04") + (version "19.05") (source (origin (method git-fetch) @@ -3710,7 +3710,7 @@ library.") (commit version))) (file-name (string-append name "-" version "-checkout")) (sha256 - (base32 "00lqf8bjcwm4k8yky9jmqghkxijcm2lxspb9zyl1270yqmj05kiw")))) + (base32 "1dja2ykixk1ycqda116cg9fy4qg364dqj88amfln0r9pnsj2kbxk")))) (arguments '(#:tests? #f ; No tests. #:configure-flags '("-DFFMPEG=ON"))) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 0be1102683..3fa65c5115 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2021,13 +2021,13 @@ create data based on random numbers and yet remain repeatable.") (define-public python-nose-timer (package (name "python-nose-timer") - (version "0.7.4") + (version "0.7.5") (source (origin (method url-fetch) (uri (pypi-uri "nose-timer" version)) (sha256 - (base32 "04inck7l1sgkjbiinhifxk45wk2b3czbwh1x2a390hi183fq1q12")))) + (base32 "05wzkc88vbzw62pqkvhl33211b90kns0lny70b7qw62rcg4flzk4")))) (build-system python-build-system) (propagated-inputs `(("python-nose" ,python-nose) @@ -2079,13 +2079,13 @@ time by mocking the datetime module.") (define-public python-flexmock (package (name "python-flexmock") - (version "0.10.3") + (version "0.10.4") (source (origin (method url-fetch) (uri (pypi-uri "flexmock" version)) (sha256 (base32 - "031c624pdqm7cc0xh4yz5k69gqxn2bbrjz13s17684q5shn0ik21")))) + "0b6qw3grhgx58kxlkj7mdma7xdvlj02zabvcf7w2qifnfjwwwcsh")))) (build-system python-build-system) (home-page "https://flexmock.readthedocs.org") (synopsis "Testing library for Python") diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 329fb3bff5..41cc10a8bb 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -93,9 +93,6 @@ "third_party/angle/src/third_party/compiler" ;BSD-2 "third_party/angle/src/third_party/libXNVCtrl" ;Expat "third_party/angle/src/third_party/trace_event" ;BSD-3 - "third_party/angle/third_party/glslang" ;BSD-3 - "third_party/angle/third_party/spirv-headers" ;Expat - "third_party/angle/third_party/spirv-tools" ;Expat "third_party/angle/third_party/vulkan-headers" ;ASL2.0 "third_party/angle/third_party/vulkan-loader" ;ASL2.0 "third_party/angle/third_party/vulkan-tools" ;ASL2.0 @@ -123,9 +120,12 @@ "third_party/crashpad/crashpad/third_party/zlib/zlib_crashpad.h" ;Zlib "third_party/crc32c" ;BSD-3 "third_party/cros_system_api" ;BSD-3 + "third_party/dav1d" ;BSD-2 "third_party/dom_distiller_js" ;BSD-3 + "third_party/emoji-segmenter" ;ASL2.0 "third_party/fips181" ;BSD-3 "third_party/flatbuffers" ;ASL2.0 + "third_party/glslang" ;BSD-3, Expat, ASL2.0 "third_party/google_input_tools" ;ASL2.0 "third_party/google_input_tools/third_party/closure_library" ;ASL2.0 "third_party/google_input_tools/third_party/closure_library/third_party/closure" ;Expat @@ -223,9 +223,9 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %chromium-version "73.0.3683.103") -(define %ungoogled-revision "4c7fb6d1a86602999f30b58ef8b331b2115c5ad8") -(define %debian-revision "debian/73.0.3683.75-1") +(define %chromium-version "74.0.3729.131") +(define %ungoogled-revision "9e33022f3ac7de2a12e3c7a7923799c9bbbf8194") +(define %debian-revision "debian/74.0.3729.108-1") (define package-revision "0") (define %package-version (string-append %chromium-version "-" @@ -246,7 +246,7 @@ from forcing GEXP-PROMISE." %chromium-version ".tar.xz")) (sha256 (base32 - "1bskjr7yiwvdab1b5mp36y6964xqpgks6dqazm4qifwqvqcw80pb")))) + "11m9mlzrqzmz7rhl0ff7lry2s4yjrdkfi36qfv48m1cg5y2cfy6i")))) (ungoogled-source (origin (method git-fetch) @@ -256,7 +256,7 @@ from forcing GEXP-PROMISE." (string-take %ungoogled-revision 7))) (sha256 (base32 - "0njx505il07d237fzgbhciy78rz7h77r2ai5crbnsx2gdr9kpvd1")))) + "08whx582p3a2nivkj7kwin09a8acybr00z6344smb9xjlxy9rkp4")))) (debian-source (origin (method git-fetch) @@ -269,7 +269,7 @@ from forcing GEXP-PROMISE." (string-take %debian-revision 7)))) (sha256 (base32 - "1pq0l3m7frf9ygxc1gva1191fxf3d1phaaqp7g3b70mgbabp0mxi"))))) + "1bn0c86sxkkxgdz0i88y0zh4zr39l6379r2rhgk3b3qbvwz25s3j"))))) (origin (method computed-origin-method) @@ -335,6 +335,7 @@ from forcing GEXP-PROMISE." (when (and (> (string-length line) 1) ;; Skip the Debian-specific ones. (not (string-prefix? "debianization/" line)) + (not (string-prefix? "gcc6/" line)) ;; And those that conflict with Ungoogled. (not (any (cute string-suffix? <> line) '("widevine-buildflag.patch" @@ -458,6 +459,7 @@ from forcing GEXP-PROMISE." "use_system_lcms2=true" "use_system_libdrm=true" "use_system_libjpeg=true" + "use_system_libopenjpeg2=true" "use_system_libpng=true" "use_system_zlib=true" "use_gnome_keyring=false" ;deprecated by libsecret diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d282ee8ad3..3942c2fb0c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -792,14 +792,14 @@ application framework for R, making it easy to create attractive dashboards.") (define-public r-shinyfiles (package (name "r-shinyfiles") - (version "0.7.2") + (version "0.7.3") (source (origin (method url-fetch) (uri (cran-uri "shinyFiles" version)) (sha256 (base32 - "0dlcjrw96x72grg6j915070x8x98l7629pn86gf148iknflm7gd5")))) + "01as3l9ffj5dwac0vviais2x5l3027zxlj67kcvkdwxaj5hql33i")))) (properties `((upstream-name . "shinyFiles"))) (build-system r-build-system) (propagated-inputs @@ -1950,14 +1950,14 @@ or excesses over a high threshold.") (define-public r-lmtest (package (name "r-lmtest") - (version "0.9-36") + (version "0.9-37") (source (origin (method url-fetch) (uri (cran-uri "lmtest" version)) (sha256 (base32 - "0sym9sm1vl6bbgq01jhz1plxqmgh8hrgrn7rw0mwvsalcn6id7xy")))) + "02nasm0j2vwkhz11dxqixs23msy1s3yj0jps6949fmgh9gwjkjfx")))) (build-system r-build-system) (propagated-inputs `(("r-zoo" ,r-zoo))) @@ -2593,14 +2593,14 @@ provided.") (define-public r-ipred (package (name "r-ipred") - (version "0.9-8") + (version "0.9-9") (source (origin (method url-fetch) (uri (cran-uri "ipred" version)) (sha256 (base32 - "01xcg3c121ndfpz9dirqxszknh4yb1p222p7f1wbwwhdrg1i27cw")))) + "0vs1hqfx7yd0xdbmfsf2gim7spkni0845cj6gswn0nhdfdq7ma0d")))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class) @@ -5632,14 +5632,14 @@ references and Rd files.") (define-public r-officer (package (name "r-officer") - (version "0.3.3") + (version "0.3.4") (source (origin (method url-fetch) (uri (cran-uri "officer" version)) (sha256 (base32 - "1ggdp8pbspn24sjshx1h48klivrx401vwk2df49j4wpwxh6dx26y")))) + "1m4b3mcn5j5q3nq0jp1nranh4rdb8vxcpabn6ryqk9m6709fvhjz")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) @@ -11671,19 +11671,20 @@ compatible with @code{rzmq} are also provided.") (define-public r-repr (package (name "r-repr") - (version "0.19.2") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "repr" version)) (sha256 (base32 - "1mhhzakkagb8z568yx3p2ixs8fcifm7f8l2yq285zrz8jmnpckfx")))) + "0j8z4sl67fgnbywkhgg0bns68mbgf9iqnw4qiym2rjy1b08fpclq")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) ("r-htmltools" ,r-htmltools) - ("r-jsonlite" ,r-jsonlite))) + ("r-jsonlite" ,r-jsonlite) + ("r-pillar" ,r-pillar))) (home-page "https://cran.r-project.org/web/packages/repr/") (synopsis "Serializable representations") (description @@ -11717,14 +11718,14 @@ running IRkernel session.") (define-public r-irkernel (package (name "r-irkernel") - (version "0.8.15") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "IRkernel" version)) (sha256 (base32 - "1n0nc3paij8fgbp7l2b4405zk9k4y3gdi2bz6z8x6j0h5mi6k6a6")))) + "0i5gpis2g30zi96h9r9awbw4724xd6p4sv8y7shyfzgc4qccpizp")))) (properties `((upstream-name . "IRkernel"))) (build-system r-build-system) (arguments diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 2f7ea3ba8b..9302f00537 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -131,15 +131,16 @@ communication, encryption, decryption, signatures, etc.") (define-public signify (package (name "signify") - (version "24") + (version "25") + (home-page "https://github.com/aperezdc/signify") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/aperezdc/signify/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0594vyvkq176xxzaz9xbq8qs0xdnr8s9gkd1prblwpdvnzmw0xvc")))) + "0zg0rffxwj2a71s1bllhrn491xsmirg9sshpq8f3vl25lv4c2cnq")))) (build-system gnu-build-system) ;; TODO Build with libwaive (described in README.md), to implement something ;; like OpenBSD's pledge(). @@ -159,7 +160,6 @@ communication, encryption, decryption, signatures, etc.") (description "The signify utility creates and verifies cryptographic signatures using the elliptic curve Ed25519. This is a Linux port of the OpenBSD tool of the same name.") - (home-page "https://github.com/aperezdc/signify") ;; This package includes third-party code that was originally released under ;; various non-copyleft licenses. See the source files for clarification. (license (list license:bsd-3 license:bsd-4 license:expat license:isc diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index afe5cc2b7b..15e7971b4f 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -49,88 +49,6 @@ #:use-module (gnu packages xfce) #:use-module (gnu packages xorg)) -(define-public greenisland - (package - (name "greenisland") - (version "0.9.0.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/greenisland/greenisland" - "/releases/download/v" version "/" - "greenisland-" version ".tar.xz")) - (sha256 - (base32 - "1flmha31hmii6m2mdvmn1q5dc0fhnvgc4lp1b4wgkz20y7x4f1fm")))) - (build-system cmake-build-system) - (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules) - ("dbus" ,dbus) - ("glib:bin" ,glib "bin") - ("pkg-config" ,pkg-config) - ("xorg-server" ,xorg-server))) - (inputs - `(("elogind" ,elogind) - ("eudev" ,eudev) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("libdrm" ,libdrm) - ("libinput" ,libinput-minimal) - ("libxcursor" ,libxcursor) - ("libxkbcommon" ,libxkbcommon) - ("libx11" ,libx11) - ("mesa" ,mesa) - ("qtbase" ,qtbase) - ("qtdeclarative" ,qtdeclarative) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols) - ("xcb-util-cursor" ,xcb-util-cursor))) - (arguments - `(#:configure-flags - (list (string-append "-DPLUGIN_INSTALL_DIR=" - (assoc-ref %outputs "out") "/plugins") - (string-append "-DQML_INSTALL_DIR=" - (assoc-ref %outputs "out") "/qml")) - #:modules ((guix build cmake-build-system) - (guix build qt-utils) - (guix build utils)) - #:imported-modules (,@%cmake-build-system-modules - (guix build qt-utils)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-udev-tests - (lambda _ ; FIXME: Build env doesn't contain /dev/sda - (substitute* "tests/auto/platform/tst_udev.cpp" - (("QVERIFY") "// QVERIFY") - (("QCOMPARE") "// QCOMPARE")))) - (replace 'check - (lambda _ - (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "ctest" "."))) - (add-before 'check 'check-setup - (lambda _ - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - (setenv "XDG_RUNTIME_DIR" (getcwd)) - #t)) - (add-after 'install 'wrap-programs - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program out "greenisland") - (wrap-qt-program out "greenisland-launcher") - (wrap-qt-program out "greenisland-screencaster") - (wrap-qt-program out "greenisland-wayland-scanner") - #t)))))) - (synopsis "QtQuick Wayland compositor and shell for desktop and mobile") - (description "Green Island provides a full blown Wayland compositor for -QtQuick as well as pluggable hardware abstraction, extensions, tools and a -Qt-style API for Wayland clients.") - (home-page "http://hawaiios.org") - ;; Choice of license at the user's opinion. - (license (list license:gpl2 license:gpl3 license:lgpl2.1 license:lgpl3)))) - (define-public sddm (package (name "sddm") diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 92c2dd3184..367f46f264 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -774,7 +774,7 @@ in certain cases. It also enables recursion for anonymous functions.") (define-public emacs-xr (package (name "emacs-xr") - (version "1.10") + (version "1.11") (source (origin (method url-fetch) @@ -782,7 +782,7 @@ in certain cases. It also enables recursion for anonymous functions.") "https://elpa.gnu.org/packages/xr-" version ".tar")) (sha256 (base32 - "16p68rj5h609pnbp7y0jiiq1zkbksh4qqi1q8yby3ldj5x9sfpwc")))) + "0xwfs2mkmgf63sfp5jwmw0ybc8pa0rlxh5aqwb348ddgmclv322f")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/xr.html") (synopsis "Convert string regexp to rx notation") @@ -804,7 +804,7 @@ skip set strings, which are arguments to @code{skip-chars-forward} and (define-public emacs-relint (package (name "emacs-relint") - (version "1.6") + (version "1.7") (source (origin (method url-fetch) @@ -812,7 +812,7 @@ skip set strings, which are arguments to @code{skip-chars-forward} and "https://elpa.gnu.org/packages/relint-" version ".el")) (sha256 (base32 - "17nyy3zqpqgs22lrrpdm0k56xnhj5l3y2y3lnmhcqw63xksgbsyk")))) + "0h9nc84yv5lmbaa8any6i3bqcn6xn1gy6cv6kqaywn0nnqrm17i1")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-xr" ,emacs-xr))) (home-page "https://github.com/mattiase/relint") @@ -970,14 +970,14 @@ regexp-like arguments to @code{skip-chars-forward} and (define-public emacs-emms (package (name "emacs-emms") - (version "5.1") + (version "5.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/emms/emms-" version ".tar.gz")) (sha256 (base32 - "149ddczyx6x10zn4mn8g0rll1rwf4yciv8x6j0qdnlbwszblx2x6")) + "0cvpfdkagkpi8g02w8f7wzrpdk2ihas0mn5m9fr882xjdfshl21z")) (modules '((guix build utils))) (snippet '(begin @@ -7908,6 +7908,7 @@ the actual transformations.") (source (origin (method git-fetch) (uri (git-reference (url home-page) (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "0lvwvq6sl80sha9fq5m4568sg534dhmifyjqw75bqddcbf3by84x")))) @@ -12019,6 +12020,7 @@ This code is still alpha.") (uri (git-reference (url "https://github.com/egh/zotxt-emacs.git") (commit "23a4a9f74a658222027d53a9a83cd4bcc583ca8b"))) + (file-name (git-file-name name version)) (sha256 (base32 "09fq3w9yk9kn6bz7y9kgpiw612dvj3yzsdk734js6zgb0p8lfd2c")))) (build-system emacs-build-system) @@ -12510,6 +12512,7 @@ e.g: @code{from:Peter to:Anne flag:attach search term}.") (uri (git-reference (url "https://github.com/emacs-helm/helm-pass") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "0vglaknmir3yv4iwibwn8r40ran8d04gcyp99hx73ldmf3zqpnxv")))) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 9a210b474f..bc1c841edc 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -934,7 +934,7 @@ Luhn and family of ISO/IEC 7064 check digit algorithms. ") (define-public python-duniterpy (package (name "python-duniterpy") - (version "0.53.0") + (version "0.53.1") (source (origin (method git-fetch) @@ -945,7 +945,7 @@ Luhn and family of ISO/IEC 7064 check digit algorithms. ") (file-name (git-file-name name version)) (sha256 (base32 - "1km585xlv6dm693s5x6apcnx3ixvz08g8yjfclszhy4jakhpv0ya")))) + "10dbikajnxh5jhcyhhsy2alv9d0qc6i57p4pvbkdf095cnj4qrvr")))) (build-system python-build-system) (arguments ;; Tests fail with "AttributeError: module 'attr' has no attribute 's'". diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a84cb3b97a..fa8bb3cad1 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -232,7 +232,7 @@ the freedesktop.org XDG Base Directory specification.") (define-public elogind (package (name "elogind") - (version "241.2") + (version "241.3") (source (origin (method git-fetch) (uri (git-reference @@ -241,7 +241,7 @@ the freedesktop.org XDG Base Directory specification.") (file-name (git-file-name name version)) (sha256 (base32 - "1ragysp4kh1vj3zpz1aprh5h4k3hmp3i5q55pimpabdpkdfbv2fc")))) + "0jpb55prqq5cm3w2gy9766cbaqknjvbrbniyshb8bz1q31vf4jlq")))) (build-system meson-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8400849be2..6732639e51 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Roel Janssen <roel@gnu.org> -;;; Copyright © 2017, 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018 okapi <okapi@firemail.cc> ;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2018 Madalin Ionel-Patrascu <madalinionel.patrascu@mdc-berlin.de> @@ -105,6 +105,8 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) + #:use-module (gnu packages haskell) + #:use-module (gnu packages haskell-crypto) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) @@ -113,6 +115,7 @@ #:use-module (gnu packages libedit) #:use-module (gnu packages libunwind) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages lua) #:use-module (gnu packages man) #:use-module (gnu packages maths) @@ -6998,3 +7001,133 @@ pursue their favorite interesting flight simulation idea, and last but certainly not least as a fun, realistic, and challenging desktop flight simulator.") (license license:gpl2+))) + +(define-public jumpnbump + (package + (name "jumpnbump") + (version "1.60") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/LibreGames/jumpnbump.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gwi58ck4magvdim8wmxdqnsi0fqdpvqia9kcc7q73nqf34jjz3v")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:tests? #f ;no test + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configure script + (add-after 'unpack 'fix-sdl-path + ;; XXX: For some reason, `sdl2-config' reports stand-alone SDL + ;; directory, not SDL-union provided as an input to the package. + ;; We force the latter with "--prefix=" option. + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Makefile" + (("sdl2-config" command) + (string-append command " --prefix=" (assoc-ref inputs "sdl")))) + #t))))) + (inputs + `(("bzip2" ,bzip2) + ("sdl" ,(sdl-union (list sdl2 sdl2-mixer sdl2-net))) + ("zlib" ,zlib))) + (native-inputs + `(("gettext" ,gettext-minimal))) ;for msgfmt + (home-page "https://gitlab.com/LibreGames/jumpnbump") + (synopsis "Multiplayer platform game with bunnies") + (description "You, as a bunny, have to jump on your opponents to make them +explode. It is a true multiplayer game; you cannot play this alone. You can +play with up to four players simultaneously. It has network support.") + (license license:gpl2+))) + +(define-public hedgewars + (package + (name "hedgewars") + (version "0.9.25") + (source (origin + (method url-fetch) + (uri (string-append "https://www.hedgewars.org/download/releases/" + "hedgewars-src-" version ".tar.bz2")) + (sha256 + (base32 + "08x7fqpy0hpnbfq2k06g522xayi7s53bca819zfhalvqnqs76pdk")))) + (build-system cmake-build-system) + (arguments + ;; XXX: Engine is built as Pascal source code, requiring Free Pascal + ;; Compiler, which we haven't packaged yet. With the flag below, we use + ;; a Pascal to C translator and Clang instead. + `(#:configure-flags (list "-DBUILD_ENGINE_C=ON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-failing-test + ;; XXX: Remove single failing test. Note: it is marked + ;; a "non-critical" test. + (lambda _ + (delete-file-recursively "tests/lua_noncritical") + #t)) + (add-after 'unpack 'fix-compiler + ;; XXX: Flag BUILD_ENGINE_C, as set above, implies using Clang to + ;; compile files. However, using `clang' globally leads to the + ;; error: qtbase-5.11.3/include/qt5/QtCore/qglobal.h:45:12: fatal + ;; error: 'type_traits' file not found. + ;; + ;; Therefore, we make sure to use `c++' everywhere but in the + ;; engine. + (lambda _ + (substitute* "project_files/hwc/CMakeLists.txt" + (("find_package\\(SDL2_ttf 2 REQUIRED\\)" all) + (string-append all "\n" + "set(CMAKE_C_COMPILER ${CLANG_EXECUTABLE})\n" + "set(CMAKE_CXX_COMPILER ${CLANG_EXECUTABLE})"))) + (substitute* "CMakeLists.txt" + (("set\\(CMAKE_C(XX)?_COMPILER" all) (string-append "#" all))) + #t)) + (replace 'check + (lambda _ + (invoke "ctest")))))) + (inputs + `(("ffmpeg" ,ffmpeg) + ("freeglut" ,freeglut) + ("ghc-entropy" ,ghc-entropy) + ("ghc-hslogger" ,ghc-hslogger) + ("ghc-network" ,ghc-network) + ("ghc-random" ,ghc-random) + ("ghc-regex-tdfa" ,ghc-regex-tdfa) + ("ghc-sandi" ,ghc-sandi) + ("ghc-sha" ,ghc-sha) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-vector" ,ghc-vector) + ("ghc-zlib" ,ghc-zlib) + ("glew" ,glew) + ("libpng" ,libpng) + ("lua" ,lua-5.1) + ("physfs" ,physfs) + ("qtbase" ,qtbase) + ("sdl" ,(sdl-union + (list sdl2 sdl2-mixer sdl2-net sdl2-ttf sdl2-image))))) + (native-inputs + `(("clang" ,clang) + ("ghc" ,ghc) + ("pkg-config" ,pkg-config) + ("qttools" ,qttools))) + (home-page "https://hedgewars.org/") + (synopsis "Turn-based artillery game featuring fighting hedgehogs") + (description + "Hedgewars is a turn based strategy, artillery, action and comedy game, +featuring the antics of pink hedgehogs with attitude as they battle from the +depths of hell to the depths of space. + +As commander, it's your job to assemble your crack team of hedgehog soldiers +and bring the war to your enemy.") + ;; Software as a whole is licensed under GPL-2 terms. Artwork and + ;; scripts are distributed under various terms. + (license (list license:gpl2 + license:bsd-2 license:bsd-3 license:cc-by3.0 license:cc0 + license:expat license:fdl1.3+ license:public-domain + license:zlib)))) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 7b4ce685f7..72f450c5f7 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -158,6 +158,8 @@ the X-Consortium license.") (base32 "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-static"))) ;; The pkg-config file lists "freetype2" as Requires.private. (propagated-inputs `(("freetype" ,freetype))) (inputs `(("libx11" ,libx11) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a9e7c20105..8e3b7a406a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2324,7 +2324,7 @@ editors, IDEs, etc.") (package (inherit vte) (name "vte-ng") - (version "0.54.2.a") + (version "0.56.2.a") (home-page "https://github.com/thestinger/vte-ng") (source (origin (method git-fetch) @@ -2332,10 +2332,11 @@ editors, IDEs, etc.") (file-name (git-file-name name version)) (sha256 (base32 - "1r7d9m07cpdr4f7rw3yx33hmp4jmsk0dn5byq5wgksb2qjbc4ags")))) + "1lmba6i0abifmvvfb1q63ql6zh6d38148kp6skmkggiib2hi5dki")))) (native-inputs `(("gtk-doc" ,gtk-doc) ("gperf" ,gperf) + ("gcc" ,gcc-7) ("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) @@ -2344,6 +2345,9 @@ editors, IDEs, etc.") `(#:phases (modify-phases %standard-phases (replace 'bootstrap (lambda _ + ;; Work around GCC7 problem: <https://bugs.gnu.org/30756>. + (for-each unsetenv '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) + (setenv "NOCONFIGURE" "true") (invoke "sh" "autogen.sh")))))) (synopsis "Enhanced VTE terminal widget") diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4b4a4b5e00..61c6119322 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8483,6 +8483,7 @@ JSON (JavaScript Object Notation) is a lightweight data-interchange format.") (uri (git-reference (url "https://github.com/bitemyapp/esqueleto") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "0lz1qxms7cfg5p3j37inlych0r2fwhm8xbarcys3df9m7jy9nixa")))) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index bcd3f98ce0..9664d749fb 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3225,7 +3225,7 @@ sharing common test data, and test runners for running tests.") (define-public java-plexus-utils (package (name "java-plexus-utils") - (version "3.0.24") + (version "3.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/codehaus-plexus/" @@ -3233,7 +3233,7 @@ sharing common test data, and test runners for running tests.") version ".tar.gz")) (sha256 (base32 - "1mlwpc6fms24slygv5yvi6fi9hcha2fh0v73p5znpi78bg36i2js")))) + "1ihfigar20lvk4pinii7dq05i173xphhw4iyrk6gjfy04m01j2lz")))) (build-system ant-build-system) ;; FIXME: The default build.xml does not include a target to install ;; javadoc files. @@ -3266,7 +3266,8 @@ cli/shell/BourneShell.java" (delete-file "cli/CommandlineTest.java")) #t))))) (native-inputs - `(("java-junit" ,java-junit))) + `(("java-hamcrest-core" ,java-hamcrest-core) + ("java-junit" ,java-junit))) (home-page "http://codehaus-plexus.github.io/plexus-utils/") (synopsis "Common utilities for the Plexus framework") (description "This package provides various Java utility classes for the @@ -3415,14 +3416,14 @@ reusing it in maven.") (define-public java-plexus-archiver (package (name "java-plexus-archiver") - (version "3.5") + (version "4.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/codehaus-plexus/plexus-archiver" "/archive/plexus-archiver-" version ".tar.gz")) (sha256 (base32 - "0iv1j7khra6icqh3jndng3iipfmkc7l5jq2y802cm8r575v75pyv")))) + "0ry6i92gli0mvdmfih2vgs0lkf9yvx18h2ajxim66yg6yipnp0hg")))) (build-system ant-build-system) (arguments `(#:jar-name "plexus-archiver.jar" @@ -3438,6 +3439,11 @@ reusing it in maven.") (delete-file "src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java") #t)) + (add-before 'check 'fix-test-building + (lambda _ + (substitute* "build.xml" + (("srcdir=\"src/test\"") "srcdir=\"src/test/java\"")) + #t)) (add-before 'build 'copy-resources (lambda _ (mkdir-p "build/classes/META-INF/plexus") @@ -3454,7 +3460,8 @@ reusing it in maven.") ("snappy" ,java-snappy) ("java-jsr305" ,java-jsr305))) (native-inputs - `(("junit" ,java-junit) + `(("java-hamcrest-core" ,java-hamcrest-core) + ("junit" ,java-junit) ("classworld" ,java-plexus-classworlds) ("xbean" ,java-geronimo-xbean-reflect) ("xz" ,java-tukaani-xz) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 58073b6170..e885aaab39 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -271,7 +271,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") (define-public kodi (package (name "kodi") - (version "18.1") + (version "18.2") (source (origin (method git-fetch) (uri (git-reference @@ -280,7 +280,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") (file-name (git-file-name name version)) (sha256 (base32 - "1w26aqvzxv4c70gcd1vw1pldapsc2xcacwq9b7dqx5m44j0zx1dc")) + "1yzi8171p1mnszyf80lqkl05ql25n73s5gn8pcgvv4jph4yvasnq")) (patches (search-patches "kodi-skip-test-449.patch" "kodi-set-libcurl-ssl-parameters.patch")) (snippet diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 08592bb770..4eeb801c70 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3864,6 +3864,7 @@ client and server.") (uri (git-reference (url "https://github.com/gwkkwg/trivial-backtrace.git") (commit commit))) + (file-name (git-file-name "trivial-backtrace" version)) (sha256 (base32 "10p41p43skj6cimdg8skjy7372s8v2xpkg8djjy0l8rm45i654k1")))) (build-system asdf-build-system/sbcl) @@ -3895,6 +3896,7 @@ backtrace portably.") (uri (git-reference (url "https://github.com/jdz/rfc2388.git") (commit commit))) + (file-name (git-file-name "rfc2388" version)) (sha256 (base32 "0phh5n3clhl9ji8jaxrajidn22d3f0aq87mlbfkkxlnx2pnw694k")))) (build-system asdf-build-system/sbcl) @@ -3944,6 +3946,7 @@ RFC 1321 by R. Rivest, published April 1992.") (uri (git-reference (url "https://github.com/cl-plus-ssl/cl-plus-ssl.git") (commit commit))) + (file-name (git-file-name "cl+ssl" version)) (sha256 (base32 "1845i1pafmqb6cdlr53yaqy67kjrhkvbx6c37ca15cw70vhdr3z9")))) (build-system asdf-build-system/sbcl) @@ -4018,6 +4021,7 @@ Rosenberg's CL packages.") (uri (git-reference (url "http://git.kpe.io/cl-base64.git") (commit (string-append "v" version)))) + (file-name (git-file-name "cl-base64" version)) (sha256 (base32 "1dw6j7n6gsd2qa0p0rbsjxj00acxx3i9ca1qkgl0liy8lpnwkypl")))) (build-system asdf-build-system/sbcl) @@ -4247,6 +4251,7 @@ PROPER-LIST, ASSOCIATION-LIST, PROPERTY-LIST and TUPLE.") (uri (git-reference (url "https://github.com/m2ym/cl-syntax.git") (commit "03f0c329bbd55b8622c37161e6278366525e2ccc"))) + (file-name (git-file-name "cl-syntax" version)) (sha256 (base32 "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y")))) (build-system asdf-build-system/sbcl) @@ -4439,6 +4444,7 @@ Lisp. It is intended to be a replacement of PURI.") (uri (git-reference (url "https://github.com/fukamachi/myway.git") (commit commit))) + (file-name (git-file-name "myway" version)) (sha256 (base32 "0briia9bk3lbr0frnx39d1qg6i38dm4j6z9w3yga3d40k6df4a90")))) (build-system asdf-build-system/sbcl) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 844e393a9e..ddd01189fb 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1148,7 +1148,7 @@ which can add many functionalities to the base client.") (define-public msmtp (package (name "msmtp") - (version "1.8.3") + (version "1.8.4") (source (origin (method url-fetch) @@ -1156,7 +1156,7 @@ which can add many functionalities to the base client.") "/msmtp-" version ".tar.xz")) (sha256 (base32 - "1d4jdgrx4czp66nnwdsy938lzr4llhwyy0715pwg0j6h6gyyxciw")))) + "1xr926lyy44baqdgv9q0sw5z6ll2cb4lx2g4lgpgbqn8bglpzpg5")))) (build-system gnu-build-system) (inputs `(("libsecret" ,libsecret) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 2d7d54dd9d..d383f16255 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -686,13 +686,13 @@ gets and puts artifacts through HTTP(S) using Apache HttpClient-4.x."))) (define-public maven-artifact (package (name "maven-artifact") - (version "3.6.0") + (version "3.6.1") (source (origin (method url-fetch) (uri (string-append "https://archive.apache.org/dist/maven/" "maven-3/" version "/source/" "apache-maven-" version "-src.tar.gz")) - (sha256 (base32 "17jrqfqwn569jgnv8m4pqc27csssb0rf6mznpq61l5bnbd6hl75k")) + (sha256 (base32 "0grw9zp166ci53rd7qkyy2qmwmik37xhiz1z84jpm0msyvzj2n82")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index efba539fa8..33acbbec4e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -406,6 +406,7 @@ repository-wide uninstallability checks.") (uri (git-reference (url "https://github.com/ocaml/opam-file-format") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "0fqb99asnair0043hhc8r158d6krv5nzvymd0xwycr5y72yrp0hv")))) @@ -1355,6 +1356,7 @@ following a very simple s-expression syntax.") (uri (git-reference (url (string-append home-page ".git")) (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "16kas19iwm4afijv3yxd250s08absabmdcb4yj57wc8r4fmzv5dm")))) @@ -1743,6 +1745,7 @@ simple (yet expressive) query language to select the tests to run.") (uri (git-reference (url "https://github.com/alainfrisch/ppx_tools.git") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw")))) (build-system ocaml-build-system) @@ -2954,7 +2957,14 @@ the plugins facilitate extensibility, and the frontends serve as entry points.") `(("camlp4" ,camlp4))) (arguments `(#:build-flags (list "--profile" "realease") - #:tests? #f)) + #:test-target "camomile-test" + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-usr-share + (lambda* (#:key outputs #:allow-other-keys) + (substitute* '("Camomile/jbuild" "configure.ml") + (("/usr/share") (string-append (assoc-ref outputs "out") "/share"))) + #t))))) (synopsis "Comprehensive Unicode library") (description "Camomile is a Unicode library for OCaml. Camomile provides Unicode character type, UTF-8, UTF-16, UTF-32 strings, conversion to/from about @@ -3470,18 +3480,18 @@ than yojson), with 25-35% space savings.") (define-public ocaml-yojson (package (name "ocaml-yojson") - (version "1.4.1") + (version "1.7.0") (home-page "https://github.com/ocaml-community/yojson") (source (origin (method git-fetch) (uri (git-reference (url (string-append home-page ".git")) - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0nwsfkmqpyfab4rxq76q8ff7giyanghw08094jyrp275v99zdjr9")))) + "0zncsw8bgbkh1pfvfc7nh628hfj84lgx6jwhp9ashj3z1z0w3xjn")))) (build-system dune-build-system) (arguments `(#:test-target ".")) @@ -3489,7 +3499,8 @@ than yojson), with 25-35% space savings.") `(("ocaml-biniou" ,ocaml-biniou) ("ocaml-easy-format" ,ocaml-easy-format))) (native-inputs - `(("ocaml-cppo" ,ocaml-cppo))) + `(("ocaml-alcotest" ,ocaml-alcotest) + ("ocaml-cppo" ,ocaml-cppo))) (synopsis "Low-level JSON library for OCaml") (description "Yojson is an optimized parsing and printing library for the JSON format. It addresses a few shortcomings of json-wheel including 2x @@ -3551,7 +3562,8 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") (native-inputs `(("ocaml-findlib" ,ocaml-findlib))) (arguments - '(#:tests? #f)) ;; Errors in tests in version 3.2.2 + '(#:jbuild? #t + #:tests? #f)) ;; Errors in tests in version 3.2.2 (synopsis "Context sensitive completion for OCaml in Vim and Emacs") (description "Merlin is an editor service that provides modern IDE features for OCaml. Emacs and Vim support is provided out-of-the-box. @@ -4204,6 +4216,7 @@ storage of large amounts of data.") (uri (git-reference (url "https://github.com/janestreet/ppx_hash.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p")))) @@ -4230,13 +4243,13 @@ hash functions from type exrpessions and definitions.") (uri (git-reference (url "https://github.com/janestreet/ppx_enumerate.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr")))) (build-system dune-build-system) (arguments - ;; No tests - `(#:tests? #f)) + `(#:tests? #f)) ; no test suite (propagated-inputs `(("ocaml-base" ,ocaml-base) ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) @@ -4610,6 +4623,7 @@ packages.") (uri (git-reference (url "https://github.com/janestreet/ppx_typerep_conv.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0a13dpfrrg0rsm8qni1bh7pqcda30l70z8r6yzi5a64bmwk7g5ah")))) @@ -4872,6 +4886,7 @@ thousands of times faster than fork. (uri (git-reference (url "https://github.com/janestreet/core.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0pzl8n09z4f3i7z2wq4cjxfqrr8mj6xcdp7rbg0nxap2zdhjgvrq")))) diff --git a/gnu/packages/patches/kodi-set-libcurl-ssl-parameters.patch b/gnu/packages/patches/kodi-set-libcurl-ssl-parameters.patch index f977c6dd98..2f60737e30 100644 --- a/gnu/packages/patches/kodi-set-libcurl-ssl-parameters.patch +++ b/gnu/packages/patches/kodi-set-libcurl-ssl-parameters.patch @@ -4,13 +4,14 @@ connections work we can set them based on SSL_CERT_DIR and SSL_CERT_FILE. --- a/xbmc/filesystem/CurlFile.cpp +++ b/xbmc/filesystem/CurlFile.cpp @@ -626,5 +626,9 @@ - // Setup allowed TLS/SSL ciphers. New versions of cURL may deprecate things that are still in use. if (!m_cipherlist.empty()) g_curlInterface.easy_setopt(h, CURLOPT_SSL_CIPHER_LIST, m_cipherlist.c_str()); -+ + + // Load certificate data from environment paths + g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_CAPATH, getenv("SSL_CERT_DIR")); + g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_CAINFO, getenv("SSL_CERT_FILE")); ++ + // enable HTTP2 support. default: CURL_HTTP_VERSION_1_1. Curl >= 7.62.0 defaults to CURL_HTTP_VERSION_2TLS + g_curlInterface.easy_setopt(h, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0); +- } - - void CCurlFile::SetRequestHeaders(CReadState* state)
\ No newline at end of file diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index c7e6fcb6e9..68043051b5 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -58,7 +58,7 @@ (define-public php (package (name "php") - (version "7.3.4") + (version "7.3.5") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -66,7 +66,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "10rvj9dn41213w0q2l123rn6sycr29syik88czprhpv5z2hrzrvg")) + "0wi4vd1c3ylsv7cs5b74pkspybb22qwk6fs5r2as3m3glhw1h0g1")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -191,7 +191,9 @@ ;; arm can be a lot slower, so a time-related test fails "ext/fileinfo/tests/cve-2014-3538-nojit.phpt" "ext/pcre/tests/bug76514.phpt" - "ext/pcre/tests/preg_match_error3.phpt"))) + "ext/pcre/tests/preg_match_error3.phpt" + "ext/standard/tests/general_functions/var_export-locale.phpt" + "ext/standard/tests/general_functions/var_export_basic1.phpt"))) '()) ;; Drop tests that are known to fail. @@ -320,6 +322,8 @@ "ext/mbstring/tests/bug77370.phpt" "ext/mbstring/tests/bug77371.phpt" "ext/mbstring/tests/bug77381.phpt" + "ext/mbstring/tests/mbregex_stack_limit.phpt" + "ext/mbstring/tests/mbregex_stack_limit2.phpt" "ext/ldap/tests/ldap_set_option_error.phpt" ;; Sometimes cannot start the LDAP server. diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9370f59e2e..934b8ac557 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5261,8 +5261,8 @@ techniques and a terse syntax.") ("ruby-netrc" ,ruby-netrc))) (native-inputs `(("bundler" ,bundler) - ("ruby-webmock", ruby-webmock-2) - ("ruby-rspec", ruby-rspec))) + ("ruby-webmock" ,ruby-webmock-2) + ("ruby-rspec" ,ruby-rspec))) (synopsis "Simple HTTP and REST client for Ruby") (description "@code{rest-client} provides a simple HTTP and REST client for Ruby, diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 9dbb3713ee..3e5ab72f20 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -620,178 +620,6 @@ an isolated heap allowing multiple VMs to run simultaneously in different OS threads.") (license bsd-3))) -(define-public scmutils - (let () - (define (system-suffix) - (cond - ((string-prefix? "x86_64" (or (%current-target-system) - (%current-system))) - "x86-64") - (else "i386"))) - - (package - (name "scmutils") - (version "20160827") - (source - (origin - (method url-fetch/tarbomb) - (modules '((guix build utils))) - (snippet '(begin - ;; Remove binary code - (delete-file-recursively "scmutils/mit-scheme") - #t)) - (uri (string-append "http://groups.csail.mit.edu/mac/users/gjs/6946" - "/scmutils-tarballs/" name "-" version - "-x86-64-gnu-linux.tar.gz")) - (sha256 - (base32 "00ly5m0s4dy5kxravjaqlpii5zcnr6b9nqm0607lr7xcs52i4j8b")))) - (build-system gnu-build-system) - (inputs - `(("mit-scheme" ,mit-scheme) - ("emacs" ,emacs-minimal))) - (arguments - `(#:tests? #f ;; no tests-suite - #:modules ((guix build gnu-build-system) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-utils)) - #:phases - (modify-phases %standard-phases - (replace 'configure - ;; No standard build procedure is used. We set the correct - ;; runtime path in the custom build system. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; Required to find .bci files at runtime. - (with-directory-excursion "scmutils" - (rename-file "src" "scmutils")) - (substitute* "scmutils/scmutils/load.scm" - (("/usr/local/scmutils/") - (string-append out "/lib/mit-scheme-" - ,(system-suffix) "/"))) - #t))) - (replace 'build - ;; Compile the code and build a band. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (make-img (string-append - "echo '(load \"load\") " - "(disk-save \"edwin-mechanics.com\")'" - "| mit-scheme"))) - (with-directory-excursion "scmutils/scmutils" - (and (zero? (system "mit-scheme < compile.scm")) - (zero? (system make-img)))) - #t))) - (add-before 'install 'fix-directory-names - ;; Correct directory names in the startup script. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (scm-root (assoc-ref inputs "mit-scheme"))) - (substitute* "bin/mechanics" - (("ROOT=\"\\$\\{SCMUTILS_ROOT:-/.*\\}\"") - (string-append - "ROOT=\"${SCMUTILS_ROOT:-" scm-root "}\"\n" - "LIB=\"${ROOT}/lib/mit-scheme-" - ,(system-suffix) ":" - out "/lib/mit-scheme-" ,(system-suffix) "\"")) - (("EDWIN_INFO_DIRECTORY=.*\n") "") - (("SCHEME=.*\n") - (string-append "SCHEME=\"${ROOT}/bin/scheme " - "--library ${LIB}\"\n")) - (("export EDWIN_INFO_DIRECTORY") "")) - #t))) - (add-before 'install 'emacs-tags - ;; Generate Emacs's tags for easy reference to source - ;; code. - (lambda* (#:key inputs outputs #:allow-other-keys) - (with-directory-excursion "scmutils/scmutils" - (apply invoke "etags" (find-files "." "\\.scm"))) - #t)) - (replace 'install - ;; Copy files to the store. - (lambda* (#:key outputs #:allow-other-keys) - (define* (copy-files-to-directory files dir - #:optional (delete? #f)) - (for-each (lambda (f) - (copy-file f (string-append dir "/" f)) - (when delete? (delete-file f))) - files)) - - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (doc (string-append out "/share/doc/" - ,name "-" ,version)) - (lib (string-append out "/lib/mit-scheme-" - ,(system-suffix) - "/scmutils"))) - (for-each mkdir-p (list lib doc bin)) - (with-directory-excursion "scmutils/scmutils" - (copy-files-to-directory '("COPYING" "LICENSE") - doc #t) - (for-each delete-file (find-files "." "\\.bin")) - (copy-files-to-directory '("edwin-mechanics.com") - (string-append lib "/..") #t) - (copy-recursively "." lib)) - (with-directory-excursion "bin" - (copy-files-to-directory (find-files ".") bin)) - (with-directory-excursion "scmutils/manual" - (copy-files-to-directory (find-files ".") doc)) - #t))) - (add-after 'install 'emacs-helpers - ;; Add convenience Emacs commands to easily load the - ;; Scmutils band in an MIT-Scheme buffer inside of Emacs - ;; and to easily load code tags. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (mit-root (assoc-ref inputs "mit-scheme")) - (emacs-lisp-dir - (string-append out "/share/emacs/site-lisp" - "/guix.d/" ,name "-" ,version)) - (el-file (string-append emacs-lisp-dir - "/scmutils.el")) - (lib-relative-path - (string-append "/lib/mit-scheme-" - ,(system-suffix)))) - (mkdir-p emacs-lisp-dir) - (call-with-output-file el-file - (lambda (p) - (format p - ";;;###autoload -(defun scmutils-load () - (interactive) - (require 'xscheme) - (let ((mit-root \"~a\") - (scmutils \"~a\")) - (run-scheme - (concat mit-root \"/bin/scheme --library \" - mit-root \"~a:\" scmutils \"~a\" - \" --band edwin-mechanics.com\" - \" --emacs\")))) - -;;;###autoload -(defun scmutils-load-tags () - (interactive) - (let ((scmutils \"~a\")) - (visit-tags-table (concat scmutils \"/TAGS\")))) -" - mit-root out - lib-relative-path - lib-relative-path - (string-append out lib-relative-path - "/scmutils")))) - (emacs-generate-autoloads ,name emacs-lisp-dir) - (emacs-byte-compile-directory emacs-lisp-dir) - #t)))))) - (home-page - "http://groups.csail.mit.edu/mac/users/gjs/6946/linux-install.htm") - (synopsis "Scmutils library for MIT Scheme") - (description "The Scmutils system is an integrated library of -procedures, embedded in the programming language Scheme, and intended to -support teaching and research in mathematical physics and electrical -engineering.") - (license gpl2+)))) - (define-public sicp (let ((commit "225c172f9b859902a64a3c5dd5e1f9ac1a7382de")) (package diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 21f925937a..2e8cec8ffb 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net> +;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -403,6 +404,22 @@ directory.") (propagated-inputs (propagated-inputs-with-sdl2 sdl-mixer)))) +(define-public sdl2-net + (package (inherit sdl-net) + (name "sdl2-net") + (version "2.0.1") + (source + (origin + (method url-fetch) + (uri + (string-append "http://www.libsdl.org/projects/SDL_net/release/" + "SDL2_net-" version ".tar.gz")) + (sha256 + (base32 + "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm")))) + (propagated-inputs + (propagated-inputs-with-sdl2 sdl-net)))) + (define-public sdl2-ttf (package (inherit sdl-ttf) (name "sdl2-ttf") diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 5edb37366e..8aa3f0caef 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -109,6 +109,7 @@ readers and is needed to communicate with such devices through the (uri (git-reference (url "https://github.com/Fedict/eid-mw") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "1q82fw63xzrnrgh1wyh457hal6vfdl6swqfq7l6kviywiwlzx7kd")))) (build-system glib-or-gtk-build-system) diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 52e4f4f7f6..1e9dfadf02 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com> +;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,7 +98,7 @@ system to use the host GPU to accelerate 3D rendering.") (define-public spice-protocol (package (name "spice-protocol") - (version "0.12.15") + (version "0.14.0") (source (origin (method url-fetch) (uri (string-append @@ -105,7 +106,7 @@ system to use the host GPU to accelerate 3D rendering.") "spice-protocol-" version ".tar.bz2")) (sha256 (base32 - "06b461i4jv741in8617jjpfk28wk7zs9p7841njkf4sbm8xv4kcb")))) + "1b3f44c13pqsp7aabmcinfbmgl79038bp5548l5pjs16lcfam95n")))) (build-system gnu-build-system) (synopsis "Protocol headers for the SPICE protocol") (description "SPICE (the Simple Protocol for Independent Computing @@ -114,6 +115,19 @@ which allows users to view a desktop computing environment.") (home-page "https://www.spice-space.org") (license (list license:bsd-3 license:lgpl2.1+)))) +(define-public spice-protocol-0.12 + (package + (inherit spice-protocol) + (version "0.12.15") + (source (origin + (method url-fetch) + (uri (string-append + "https://www.spice-space.org/download/releases/" + "spice-protocol-" version ".tar.bz2")) + (sha256 + (base32 + "06b461i4jv741in8617jjpfk28wk7zs9p7841njkf4sbm8xv4kcb")))))) + (define-public spice-gtk (package (name "spice-gtk") @@ -134,7 +148,7 @@ which allows users to view a desktop computing environment.") ("gst-plugins-good" ,gst-plugins-good) ("gst-plugins-bad" ,gst-plugins-bad) ("gst-plugins-ugly" ,gst-plugins-ugly) - ("spice-protocol" ,spice-protocol) + ("spice-protocol" ,spice-protocol-0.12) ;; These are required by the pkg-config files. ("gtk+" ,gtk+) @@ -188,7 +202,7 @@ which allows users to view a desktop computing environment.") (define-public spice (package (name "spice") - (version "0.14.1") + (version "0.14.2") (source (origin (method url-fetch) (uri (string-append @@ -196,7 +210,7 @@ which allows users to view a desktop computing environment.") "spice-server/spice-" version ".tar.bz2")) (sha256 (base32 - "068mb9l7wzk4k4c65bzvpw5fyyzh81rb6z81skgdxvh67pk5vb8y")))) + "19r999py9v9c7md2bb8ysj809ag1hh6djl1ik8jcgx065s4b60xj")))) (build-system gnu-build-system) (propagated-inputs `(("openssl" ,openssl) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 390800495a..cc9fa69a32 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2596,13 +2596,13 @@ well as additional utilities such as panel and axis annotation functions.") (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.9.300.2.0") + (version "0.9.400.2.0") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "02zha49v6s8g39dcmk5dz0pygx0jibgmcwsyzybp9wmlqxnmdvip")))) + "01bf8jdlzndmqqzw16lpwx7zz1hkykd001dxxd9rzrgmn86f2xvs")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) ;; All needed for vignettes diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index d0531b0c14..a3ea05538b 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -115,7 +115,7 @@ configurable through a graphical wizard.") (define-public termite (package (name "termite") - (version "14") + (version "15") (source (origin (method git-fetch) @@ -127,7 +127,7 @@ configurable through a graphical wizard.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0dmz9rpc2fdvcwhcmjnhb48ixn403gxpq03g334d1hgjw2hsyx7x")))) + "0hp1x6lj098m3jgna274wv5dv60lnzg22297di68g4hw9djjyd2k")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 517b7259a4..86c5870f8f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1446,7 +1446,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2019.04.24") + (version "2019.04.30") (source (origin (method url-fetch) (uri (string-append "https://github.com/rg3/youtube-dl/releases/" @@ -1454,7 +1454,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "1kzz3y2q6798mwn20i69imf48kb04gx3rznfl06hb8qv5zxm9gqz")))) + "1s43adnky8ayhjwmgmiqy6rmmygd4c23v36jhy2lzr2jpn8l53z1")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index dd4ef3094e..87839490b2 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -126,6 +126,8 @@ (assoc-ref %outputs "out") "/libexec/samba-wrapper") "--audio-drv-list=alsa,pa,sdl") + ;; Make build and test output verbose to facilitate investigation upon failure. + #:make-flags '("V=1") #:phases (modify-phases %standard-phases (replace 'configure @@ -177,10 +179,6 @@ exec smbd $@"))) (chmod "samba-wrapper" #o755) (install-file "samba-wrapper" libexec)) #t)) - (add-before 'check 'make-gtester-verbose - (lambda _ - ;; Make GTester verbose to facilitate investigation upon failure. - (setenv "V" "1") #t)) (add-before 'check 'disable-test-qga (lambda _ (substitute* "tests/Makefile.include" diff --git a/guix/build/clojure-utils.scm b/guix/build/clojure-utils.scm index 027777b4d1..9f7334bc8d 100644 --- a/guix/build/clojure-utils.scm +++ b/guix/build/clojure-utils.scm @@ -215,7 +215,7 @@ results from compiling LIB." (define* (include-list\exclude-list include-list exclude-list #:key all-list) - "Given INCLUDE-LIST and EXCLUDE-LIST, replace all occurences of #:all by + "Given INCLUDE-LIST and EXCLUDE-LIST, replace all occurrences of #:all by slicing ALL-LIST into them and compute their list difference." (define (replace-#:all ls all-ls) (append-map (match-lambda diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 3316dc8dc5..749616ceb1 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -692,7 +692,7 @@ mounted at FILE." (define* (device-in-use? device) "Return #t if the block DEVICE is in use, #f otherwise. This is inspired -from fdisk_device_is_used function of util-linux. This is particulary useful +from fdisk_device_is_used function of util-linux. This is particularly useful for devices that do not appear in /proc/self/mounts like overlayfs lowerdir backend device." (let*-values (((fd) (open-fdes device O_RDONLY)) |