From 286552278abee398b301159ac9ee40798ad808ce Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 14:58:41 +0200 Subject: gnu: pugixml: Use HTTPS home page. * gnu/packages/xml.scm (pugixml)[home-page]: Use HTTPS. --- gnu/packages/xml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 47d2124612..849e35288e 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -838,7 +838,7 @@ (define-public pugixml `(#:configure-flags '("-DCMAKE_CXX_FLAGS=-shared -fPIC" "-DCMAKE_C_FLAGS=-shared -fPIC") #:tests? #f)) ; no tests - (home-page "http://pugixml.org") + (home-page "https://pugixml.org") (synopsis "Light-weight, simple and fast XML parser for C++ with XPath support") (description "pugixml is a C++ XML processing library, which consists of a DOM-like -- cgit v1.2.3 From 727ffbd56b016a3cb4a81bd0b03b17ce8164a73b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 18:28:24 +0200 Subject: gnu: pugixml: Update to 1.9. * gnu/packages/xml.scm (pugixml): Update to 1.9. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 849e35288e..6e32ffb05f 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -824,7 +824,7 @@ (define-public perl-xml-xpath (define-public pugixml (package (name "pugixml") - (version "1.8.1") + (version "1.9") (source (origin (method url-fetch) @@ -832,7 +832,7 @@ (define-public pugixml version "/pugixml-" version ".tar.gz")) (sha256 (base32 - "0fcgggry5x5bn0zhb09ij9hb0p45nb0sv0d9fw3cm1cf62hp9n80")))) + "19nv3zhik3djp4blc4vrjwrl8dfhzmal8b21sq7y907nhddx6mni")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DCMAKE_CXX_FLAGS=-shared -fPIC" -- cgit v1.2.3 From 7ee5881dc16655f682449b3ac60a8e3b900e03a2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 16:57:35 +0200 Subject: gnu: webkitgtk: Update to 2.20.1. * gnu/packages/webkit.scm (webkitgtk): Update to 2.20.1. --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index df049e15a3..4c0c955169 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -55,14 +55,14 @@ (define-module (gnu packages webkit) (define-public webkitgtk (package (name "webkitgtk") - (version "2.20.0") + (version "2.20.1") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "0g0an3pc2yz13gzpaysfgch2yp510gw1qcpk0xr8m6mx43vl1xjp")))) + "0nc9dj05dbk31ciip08b3rdsfja7ckc5mgagrj030fafza2k5r23")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no tests -- cgit v1.2.3 From 47800898032a0ed7212b978d8a4db5acc3961d5d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 18:43:42 +0200 Subject: gnu: Use HTTPS for sigrok.org home pages. * gnu/packages/electronics.scm (libsigrokdecode, sigrok-firmware-fx2lafw) (libsigrok, sigrok-cli)[home-page]: Use HTTPS. --- gnu/packages/electronics.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 60dfa509aa..933e969e26 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -91,7 +91,7 @@ (define-public libsigrokdecode `(("glib" ,glib) ("python" ,python))) (build-system gnu-build-system) - (home-page "http://www.sigrok.org/wiki/Libsigrokdecode") + (home-page "https://www.sigrok.org/wiki/Libsigrokdecode") (synopsis "Library providing (streaming) protocol decoding functionality") (description "Libsigrokdecode is a shared library written in C, which provides (streaming) protocol decoding functionality.") @@ -112,7 +112,7 @@ (define-public sigrok-firmware-fx2lafw (native-inputs `(("sdcc" ,sdcc))) (build-system gnu-build-system) - (home-page "http://www.sigrok.org/wiki/Fx2lafw") + (home-page "https://www.sigrok.org/wiki/Fx2lafw") (synopsis "Firmware for Cypress FX2 chips") (description "Fx2lafw is free firmware for Cypress FX2 chips which makes them usable as simple logic analyzer and/or oscilloscope hardware.") @@ -190,7 +190,7 @@ (define-public libsigrok ("libftdi" ,libftdi) ("libzip" ,libzip))) (build-system gnu-build-system) - (home-page "http://www.sigrok.org/wiki/Libsigrok") + (home-page "https://www.sigrok.org/wiki/Libsigrok") (synopsis "Library which provides the basic hardware access drivers for logic analyzers") (description "@code{libsigrok} is a shared library written in C which provides the basic hardware @@ -217,7 +217,7 @@ (define-public sigrok-cli ("libsigrok" ,libsigrok) ("libsigrokdecode" ,libsigrokdecode))) (build-system gnu-build-system) - (home-page "http://sigrok.org/wiki/Sigrok-cli") + (home-page "https://sigrok.org/wiki/Sigrok-cli") (synopsis "Command-line frontend for sigrok") (description "Sigrok-cli is a command-line frontend for sigrok.") (license license:gpl3+))) -- cgit v1.2.3 From bf660f726ab456ddeb3a7a63cdf5b42cce1174cc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 18:27:33 +0200 Subject: gnu: libsigrokdecode: Update to 0.5.1. * gnu/packages/electronics.scm (libsigrokdecode): Update to 0.5.1. --- gnu/packages/electronics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 933e969e26..19bf9f5d66 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Theodoros Foradis +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,7 +60,7 @@ (define-public libserialport (define-public libsigrokdecode (package (name "libsigrokdecode") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (string-append @@ -67,7 +68,7 @@ (define-public libsigrokdecode version ".tar.gz")) (sha256 (base32 - "1hfigfj1976qk11kfsgj75l20qvyq8c9p2h4mjw23d59rsg5ga2a")))) + "07mmb6s62ncqqgsc6szilj2yxixf6gg99ggbzsjlbhp4b9aqnga9")))) (outputs '("out" "doc")) (arguments `(#:phases -- cgit v1.2.3 From 7aa6e29d0cdf62d5646f8224f3d120376a43bf3e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 18:42:46 +0200 Subject: gnu: libsigrokdecode: Update phase style. * gnu/packages/electronics.scm (libsigrokdecode)[arguments]: Use INVOKE and end all phases with an explicit #t. --- gnu/packages/electronics.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 19bf9f5d66..26f90695b9 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -75,7 +75,8 @@ (define-public libsigrokdecode (modify-phases %standard-phases (add-after 'build 'build-doc (lambda _ - (zero? (system* "doxygen")))) + (invoke "doxygen") + #t)) (add-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) (copy-recursively "doxy/html-api" -- cgit v1.2.3 From eb357e24f7bbbb0348047f427d196e078c605f04 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 16:04:33 +0200 Subject: gnu: xfig: Update to 3.2.7. * gnu/packages/xfig.scm (xfig): Update to 3.2.7. --- gnu/packages/xfig.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index 3bb839f6e4..86fbd9159b 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2014 Federico Beffa -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,7 +32,7 @@ (define-module (gnu packages xfig) (define-public xfig (package (name "xfig") - (version "3.2.6a") + (version "3.2.7") (source (origin (method url-fetch) @@ -40,7 +40,7 @@ (define-public xfig name "-" version ".tar.xz")) (sha256 (base32 - "0z1636w27hvgjpq98z40k8h535b4x2xr2whkvr7bibaa89fynym8")))) + "0anlrr68knr401j7z76k6hx33w16l02dzb7szdkrc4rb2gj1rs2z")))) (build-system gnu-build-system) (native-inputs ;; For tests. -- cgit v1.2.3 From 1bb23335e63522a558594adf4ab30003eb141e31 Mon Sep 17 00:00:00 2001 From: Nikolai Merinov Date: Sun, 15 Apr 2018 10:05:14 +0200 Subject: gnu: rust: Enable more tests. * gnu/packages/rust.scm (rust-1.19)[arguments]<#:phases>[set-env]: Modify. (rust-1.23)<#:phases>[patch-cargo-tests]: New phase. (rust-1.23)<#:phases>[check]: Enable more tests. --- gnu/packages/rust.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index eaa8c48525..1112d08440 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -161,9 +161,12 @@ (define-public rust-1.19 #:phases (modify-phases %standard-phases (add-after 'unpack 'set-env - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) + ;; Disable test for cross compilation support. + (setenv "CFG_DISABLE_CROSS_TESTS" "1") (setenv "SHELL" (which "sh")) (setenv "CONFIG_SHELL" (which "sh")) + (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) ;; guix llvm-3.9.1 package installs only shared libraries (setenv "LLVM_LINK_SHARED" "1") #t)) @@ -258,7 +261,17 @@ (define-public rust-1.23 (substitute-keyword-arguments (package-arguments rust-1.19) ((#:phases phases) `(modify-phases ,phases - (add-after 'patch-tests 'fix-mtime-bug + (add-after 'patch-tests 'patch-cargo-tests + (lambda _ + (substitute* "src/tools/cargo/tests/build.rs" + (("/usr/bin/env") (which "env")) + ;; Guix llvm is compiled without asmjs-unknown-emscripten. + (("fn wasm32_final_outputs") "#[ignore]\nfn wasm32_final_outputs")) + (substitute* "src/tools/cargo/tests/death.rs" + ;; This is stuck when built in container. + (("fn ctrl_c_kills_everyone") "#[ignore]\nfn ctrl_c_kills_everyone")) + #t)) + (add-after 'patch-cargo-tests 'fix-mtime-bug (lambda* _ (substitute* "src/build_helper/lib.rs" ;; Bug in Rust code. @@ -327,7 +340,8 @@ (define ref (stat "README.md")) (invoke "./x.py" "build" "src/tools/cargo"))) (replace 'check (lambda* _ - (invoke "./x.py" "test"))) + (invoke "./x.py" "test") + (invoke "./x.py" "test" "src/tools/cargo"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (invoke "./x.py" "install") -- cgit v1.2.3 From fe61c88af93a230bee9aebb9c6c3836d153a4e0f Mon Sep 17 00:00:00 2001 From: Nikolai Merinov Date: Sun, 15 Apr 2018 10:11:37 +0200 Subject: gnu: rust: Update to 1.24.0. * gnu/packages/rust.scm (rust): Rename to... (rust-1.24): ...this. (rust): New variable. --- gnu/packages/rust.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 1112d08440..d95577e45b 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -362,7 +362,7 @@ (define ref (stat "README.md")) `("LIBRARY_PATH" ":" suffix (,(string-append libc "/lib")))) #t))))))))) -(define-public rust +(define-public rust-1.24 (let ((base-rust (rust-bootstrapped-package rust-1.23 "1.24.1" "1vv10x2h9kq7fxh2v01damdq8pvlp5acyh1kzcda9sfjx12kv99y"))) @@ -373,3 +373,25 @@ (define-public rust ((#:phases phases) `(modify-phases ,phases (delete 'fix-mtime-bug)))))))) + +(define-public rust + (let ((base-rust rust-1.24)) + (package + (inherit base-rust) + (version "1.25.0") + (source + (rust-source version + "0baxjr99311lvwdq0s38bipbnj72pn6fgbk6lcq7j555xq53mxpf")) + (native-inputs + (alist-replace "cargo-bootstrap" (list base-rust "cargo") + (alist-replace "rustc-bootstrap" (list base-rust) + (package-native-inputs base-rust)))) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'patch-cargo-tests 'patch-cargo-index-update + (lambda* _ + (substitute* "src/tools/cargo/tests/generate-lockfile.rs" + ;; This test wants to update the crate index. + (("fn no_index_update") "#[ignore]\nfn no_index_update"))))))))))) -- cgit v1.2.3 From a92bf11c49e83d67b331526a8b752bb4ab85b2aa Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 15 Apr 2018 10:13:39 +0200 Subject: gnu: Add mrustc. * gnu/packages/rust.scm (mrustc): New variable. --- gnu/packages/rust.scm | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index d95577e45b..df5d803b6b 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017, 2018 Nikolai Merinov ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Danny Milosavljevic ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +47,7 @@ (define-module (gnu packages rust) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module ((guix build utils) #:select (alist-replace)) @@ -250,6 +252,92 @@ (define (rust-bootstrapped-package base-rust version checksum) (alist-replace "rustc-bootstrap" (list base-rust) (package-native-inputs base-rust)))))) +(define-public mrustc + (let ((commit "1a16def28935548e29be0fe5a632e25c83045924") + (revision "0") + (rustc-version "1.19.0")) + (package + (name "mrustc") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/thepowersgang/mrustc.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0i5kqnzsd1rkj8qm147jx934nyn9sd1fz2b4achj9z0r00h84dh6")))) + (outputs '("out" "cargo")) + (build-system gnu-build-system) + (inputs + `(("llvm" ,llvm-3.9.1))) + (native-inputs + `(("bison" ,bison) + ("flex" ,flex) + ;; Required for the libstd sources. + ("rustc" + ,(rust-source "1.19.0" "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm")))) + (arguments + `(#:tests? #f + #:make-flags (list (string-append "LLVM_CONFIG=" + (assoc-ref %build-inputs "llvm") + "/bin/llvm-config")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-target-compiler + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "minicargo.mk" + ;; Don't try to build LLVM. + (("^[$][(]LLVM_CONFIG[)]:") "xxx:") + ;; Build for the correct target architecture. + (("^RUSTC_TARGET := x86_64-unknown-linux-gnu") + (string-append "RUSTC_TARGET := " + ,(or (%current-target-system) + (nix-system->gnu-triplet + (%current-system)))))) + (invoke "tar" "xf" (assoc-ref inputs "rustc")) + (chdir "rustc-1.19.0-src") + (invoke "patch" "-p0" "../rust_src.patch") + (chdir "..") + #t)) + (delete 'configure) + (add-after 'build 'build-minicargo + (lambda _ + (for-each (lambda (target) + (invoke "make" "-f" "minicargo.mk" target)) + '("output/libstd.hir" "output/libpanic_unwind.hir" + "output/libproc_macro.hir" "output/libtest.hir")) + ;; Technically the above already does it - but we want to be clear. + (invoke "make" "-C" "tools/minicargo"))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (tools-bin (string-append out "/tools/bin")) + (cargo-out (assoc-ref outputs "cargo")) + (cargo-bin (string-append cargo-out "/bin")) + (lib (string-append out "/lib")) + (lib/rust (string-append lib "/mrust")) + (gcc (assoc-ref inputs "gcc"))) + ;; These files are not reproducible. + (for-each delete-file (find-files "output" "\\.txt$")) + (mkdir-p lib) + (copy-recursively "output" lib/rust) + (mkdir-p bin) + (mkdir-p tools-bin) + (install-file "bin/mrustc" bin) + ;; minicargo uses relative paths to resolve mrustc. + (install-file "tools/bin/minicargo" tools-bin) + (install-file "tools/bin/minicargo" cargo-bin) + #t)))))) + (synopsis "Compiler for the Rust progamming language") + (description "Rust is a systems programming language that provides memory +safety and thread safety guarantees.") + (home-page "https://github.com/thepowersgang/mrustc") + ;; Dual licensed. + (license (list license:asl2.0 license:expat))))) + (define-public rust-1.23 (package (inherit rust-1.19) -- cgit v1.2.3 From af4ea9c5cbeb6fe9c3c694d97db07c335c2e51c9 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 15 Apr 2018 10:16:41 +0200 Subject: gnu: rust: Don't #ignore the same test twice. * gnu/packages/rust.scm (rust-1.19)[arguments]<#:phases>[patch-tests]: Don't #ignore the same test twice. --- gnu/packages/rust.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index df5d803b6b..8c5abfcbae 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -186,7 +186,9 @@ (define-public rust-1.19 "#[ignore]\nfn connect_timeout_unroutable")) ;; (substitute* "src/libstd/sys/unix/process/process_common.rs" - (("fn test_process_mask") "#[ignore]\nfn test_process_mask")) + (("#\\[cfg_attr\\(target_arch = \"arm\", ignore\\)\\] + fn test_process_mask") "#[ignore] + fn test_process_mask")) ;; Our ld-wrapper cannot process non-UTF8 bytes in LIBRARY_PATH. ;; (delete-file-recursively "src/test/run-make/linker-output-non-utf8") -- cgit v1.2.3 From 67ca98ec7818f5b63fe041bfee4ef10826635685 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 22 Mar 2018 09:14:53 +0200 Subject: gnu: rust: Don't build for "native" arch on ARM. * gnu/packages/rust.scm (rust-1.23)<#:phases>[dont-build-native]: New phase. --- gnu/packages/rust.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 8c5abfcbae..0df649c119 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -351,6 +351,12 @@ (define-public rust-1.23 (substitute-keyword-arguments (package-arguments rust-1.19) ((#:phases phases) `(modify-phases ,phases + (add-after 'unpack 'dont-build-native + (lambda _ + ;; XXX: Revisit this when we use gcc 6. + (substitute* "src/binaryen/CMakeLists.txt" + (("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") "")) + #t)) (add-after 'patch-tests 'patch-cargo-tests (lambda _ (substitute* "src/tools/cargo/tests/build.rs" -- cgit v1.2.3 From 237587f1e07f79d1d39212e05f9548ddc6856387 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 15 Apr 2018 23:45:34 +0200 Subject: gnu: rust: Disable test_process_mask tests. * gnu/packages/rust.scm (rust-1.19): Disable test_process_mask tests. --- gnu/packages/rust.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 0df649c119..0192b04ddf 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -186,8 +186,8 @@ (define-public rust-1.19 "#[ignore]\nfn connect_timeout_unroutable")) ;; (substitute* "src/libstd/sys/unix/process/process_common.rs" - (("#\\[cfg_attr\\(target_arch = \"arm\", ignore\\)\\] - fn test_process_mask") "#[ignore] + (("fn test_process_mask") "#[allow(unused_attributes)] + #[ignore] fn test_process_mask")) ;; Our ld-wrapper cannot process non-UTF8 bytes in LIBRARY_PATH. ;; -- cgit v1.2.3 From d09e31bdf66b12c9756aede3b306909a9b0235f4 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Wed, 11 Apr 2018 09:54:42 +0100 Subject: gnu: libmygpo-qt: Update to 1.1.0. * gnu/packages/music.scm (libmygpo-qt): Update to 1.1.0. [source]: Remove 'patches'. [arguments]: Do not set BUILD_WITH_QT4=OFF, it is the default. * gnu/packages/patches/libmygpo-qt-fix-jsoncreatortest.patch: Remove. * gnu/local.mk (dist_patch_DATA): Adjust. Signed-off-by: Marius Bakke --- gnu/local.mk | 1 - gnu/packages/music.scm | 10 ++---- .../patches/libmygpo-qt-fix-jsoncreatortest.patch | 41 ---------------------- 3 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 gnu/packages/patches/libmygpo-qt-fix-jsoncreatortest.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 0bdfc521c2..639dd943d6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -860,7 +860,6 @@ dist_patch_DATA = \ %D%/packages/patches/libmad-armv7-thumb-pt2.patch \ %D%/packages/patches/libmad-frame-length.patch \ %D%/packages/patches/libmad-mips-newgcc.patch \ - %D%/packages/patches/libmygpo-qt-fix-jsoncreatortest.patch \ %D%/packages/patches/libsndfile-armhf-type-checks.patch \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index bb98f5b6a1..aea7395d41 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2017 Rodger Fox ;;; Copyright © 2017, 2018 Nicolas Goaziou -;;; Copyright © 2017 Pierre Langlois +;;; Copyright © 2017, 2018 Pierre Langlois ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 nee @@ -3846,19 +3846,15 @@ (define-public libechonest (define-public libmygpo-qt (package (name "libmygpo-qt") - (version "1.0.9") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "http://stefan.derkits.at/files/" "libmygpo-qt/libmygpo-qt." version ".tar.gz")) (sha256 (base32 - "1wsgh2vjnd52rkvpncj1ycpbp84sj9hh12ija46b42z9mmqf2jm4")) - (patches - (search-patches "libmygpo-qt-fix-jsoncreatortest.patch")))) + "1kg18qrq2rsswgzhl65r3mlyx7kpqg4wwnbp4yiv6svvmadmlxl2")))) (build-system cmake-build-system) - (arguments - '(#:configure-flags '("-DBUILD_WITH_QT4=OFF"))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs diff --git a/gnu/packages/patches/libmygpo-qt-fix-jsoncreatortest.patch b/gnu/packages/patches/libmygpo-qt-fix-jsoncreatortest.patch deleted file mode 100644 index c457d592cc..0000000000 --- a/gnu/packages/patches/libmygpo-qt-fix-jsoncreatortest.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ebe2323727f8d646590245b0bf06dbc92b5808d6 Mon Sep 17 00:00:00 2001 -From: Golubev Alexander -Date: Tue, 20 Sep 2016 15:33:30 +0400 -Subject: [PATCH] JsonCreatorTest failed due to extra space - -JsonCreatorTest failed with next message: -``` -********* Start testing of mygpo::JsonCreatorTest ********* -Config: Using QTest library 4.8.6, Qt 4.8.6 -PASS : mygpo::JsonCreatorTest::initTestCase() -PASS : mygpo::JsonCreatorTest::testAddRemoveSubsToJSON() -PASS : mygpo::JsonCreatorTest::testSaveSettingsToJSON() -FAIL! : mygpo::JsonCreatorTest::testEpisodeActionListToJSON() Compared values are not the same - Actual (outString2): [{"action":"download","device":"device1","episode":"http://episode.url","podcast":"http://podcast.url","timestamp":"1998-01-01T00:01:02"},{"action":"delete","device":"device3","episode":"http://episode2.url","podcast":"http://podcast2.url","timestamp":"1920-01-01T12:01:02"},{"action":"new","device":"foodev","episode":"http://www.podtrac.com","podcast":"http://leo.am","timestamp":"1998-01-01T00:01:02"},{"action":"play","device":"foodev","episode":"http://www.podtrac.com","podcast":"http://leo.am","timestamp":"1920-01-01T12:01:02"},{"action":"play","device":"foodev","episode":"http://www.podtrac.com","podcast":"http://leo.am","position":123,"started":10,"timestamp":"1998-01-01T00:01:02","total":321},{"action":"play","device":"foodev","episode":"http://www.podtrac.com","podcast":"http://leo.am","position":10,"timestamp":"1998-01-01T00:01:02"}] - Expected (expected2): [{"action":"download","device":"device1","episode":"http://episode.url","podcast":"http: - Loc: [/var/tmp/portage/media-libs/libmygpo-qt-1.0.9-r1/work/libmygpo-qt-1.0.9/tests/JsonCreatorTest.cpp(138)] -PASS : mygpo::JsonCreatorTest::testRenameDeviceStringToJSON() -PASS : mygpo::JsonCreatorTest::testDeviceSynchronizationListsToJSON() -PASS : mygpo::JsonCreatorTest::cleanupTestCase() -Totals: 6 passed, 1 failed, 0 skipped -********* Finished testing of mygpo::JsonCreatorTest ********* -``` - -This was caused by extra space in the expected string. ---- - tests/JsonCreatorTest.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/JsonCreatorTest.cpp b/tests/JsonCreatorTest.cpp -index b15b006..feb03d5 100644 ---- a/tests/JsonCreatorTest.cpp -+++ b/tests/JsonCreatorTest.cpp -@@ -133,7 +133,7 @@ void JsonCreatorTest::testEpisodeActionListToJSON() - - output = JsonCreator::episodeActionListToJSON(episodeActions); - QString outString2 = QString::fromLatin1( output ).replace( QLatin1String(" "), QLatin1String("") ); -- QString expected2( QLatin1String( "[{\"action\":\"download\",\"device\":\"device1\",\"episode\":\"http://episode.url\",\"podcast\":\"http://podcast.url\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"delete\",\"device\":\"device3\",\"episode\":\"http://episode2.url\",\"podcast\":\"http://podcast2.url\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"new\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1920-01-01T12:01:02\" },{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":123,\"started\":10,\"timestamp\":\"1998-01-01T00:01:02\",\"total\":321},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":10,\"timestamp\":\"1998-01-01T00:01:02\"}]" ) ); -+ QString expected2( QLatin1String( "[{\"action\":\"download\",\"device\":\"device1\",\"episode\":\"http://episode.url\",\"podcast\":\"http://podcast.url\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"delete\",\"device\":\"device3\",\"episode\":\"http://episode2.url\",\"podcast\":\"http://podcast2.url\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"new\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":123,\"started\":10,\"timestamp\":\"1998-01-01T00:01:02\",\"total\":321},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":10,\"timestamp\":\"1998-01-01T00:01:02\"}]" ) ); - - QCOMPARE(outString2, expected2 ); - } -- cgit v1.2.3 From 08fda9c6c0e15c223225e780e8aa1dc5a8546ee7 Mon Sep 17 00:00:00 2001 From: Rene Date: Sat, 14 Apr 2018 12:19:52 -0500 Subject: gnu: xpad: Update to 5.0.0. * gnu/packages/gnome.scm (xpad) Update to 5.0.0. [arguments]: Add autogen phase. [native-inputs]: Add autoconf and automake. [inputs]: Remove gtk+. [native-inputs]: Add gtk+:bin. Signed-off-by: Marius Bakke --- gnu/packages/gnome.scm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 43ea75a1d4..9145f62a8b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6661,22 +6661,31 @@ (define-public gnome-calculator (define-public xpad (package (name "xpad") - (version "4.8.0") + (version "5.0.0") (source (origin (method url-fetch) - (uri (string-append "https://launchpad.net/xpad/trunk/4.8.0/+download/" + (uri (string-append "https://launchpad.net/xpad/trunk/" + version "/+download/" name "-" version ".tar.bz2")) (sha256 (base32 - "17f915yyvfa2fsavq6wh0q0dfhib28b4k1gc0292b9xdlrvy7f22")))) + "02yikxg6z9bwla09ka001ppjlpbv5kbza3za9asazm5aiz376mkb")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'run-autogen + (lambda _ + (system* "sh" "autogen.sh")))))) (native-inputs - `(("intltool" ,intltool) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gtk+:bin" ,gtk+ "bin") + ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs - `(("gtk+" ,gtk+) - ("gtksourceview" ,gtksourceview) + `(("gtksourceview" ,gtksourceview) ("libsm" ,libsm))) (home-page "https://wiki.gnome.org/Apps/Xpad") (synopsis "Virtual sticky note") -- cgit v1.2.3 From 5849c68a3db4bcb646ea63204ae68946c49f3d4c Mon Sep 17 00:00:00 2001 From: Rene Date: Sat, 14 Apr 2018 22:34:48 -0500 Subject: gnu: Add mbpfan. * gnu/packages/linux.scm (mbpfan): New variable. Signed-off-by: Marius Bakke --- gnu/packages/linux.scm | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 385b5d7920..bc1e23fc15 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016, 2017, 2018 Marius Bakke -;;; Copyright © 2016 Rene Saavedra +;;; Copyright © 2016, 2018 Rene Saavedra ;;; Copyright © 2016 Carlos Sánchez de La Lama ;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2017, 2018 Leo Famulari @@ -4593,3 +4593,39 @@ (define-public libcgroup restriction, permission handling and more. This package provides userspace interface to this kernel feature.") (license license:lgpl2.1))) + +(define-public mbpfan + (package + (name "mbpfan") + (version "2.0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/dgraziotin/mbpfan/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0wifsws9icki95hhfh4zw1hmk07ddmkcz9mg5a9jr7q2kkrk01cx")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; no tests + #:make-flags (let ((out (assoc-ref %outputs "out"))) + (list (string-append "DESTDIR=" out) + "CC=gcc")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda _ + (substitute* "Makefile" + (("/usr") "")) + #t)) + (delete 'configure)))) ; There's no configure phase. + (home-page "https://github.com/dgraziotin/mbpfan") + (synopsis "Control fan speed on Macbooks") + (description + "mbpfan is a fan control daemon for Apple Macbooks. It uses input from +the @code{coretemp} module and sets the fan speed using the @code{applesmc} +module. It can be executed as a daemon or in the foreground with root +privileges.") + (license license:gpl3+))) -- cgit v1.2.3 From fc5c5b92cf7a1f6d65079f3840df502edcf58f50 Mon Sep 17 00:00:00 2001 From: Rene Date: Sun, 15 Apr 2018 23:24:05 -0500 Subject: gnu: epiphany: Update to 3.28.1. * gnu/packages/gnome.scm (epiphany): Update to 3.28.1. [build-system]: Use meson-build-system. [native-inputs]: Add desktop-file-utils, glib:bin and gtk+:bin. [inputs]: Add gdk-pixbuf+svg and nettle. Remove gdk-pixbuf. [arguments]: Remove #:configure-flags. Signed-off-by: Marius Bakke --- gnu/packages/gnome.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9145f62a8b..aac1f08978 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4166,7 +4166,7 @@ (define-public eolie (define-public epiphany (package (name "epiphany") - (version "3.24.4") + (version "3.28.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4174,8 +4174,9 @@ (define-public epiphany name "-" version ".tar.xz")) (sha256 (base32 - "1jg59s98aljf603w24r5a3cr4fw6z88gc0warqy1946iprjgdw0m")))) - (build-system glib-or-gtk-build-system) + "0zvxrwlswxadq4zbr4f73ms141d08j0lhi6rzmj83j1s3gan88md")))) + + (build-system meson-build-system) (arguments ;; FIXME: tests run under Xvfb, but fail with: ;; /src/bookmarks/ephy-bookmarks/create: @@ -4183,18 +4184,21 @@ (define-public epiphany ;; subsystem ;; FAIL '(#:tests? #f - #:configure-flags '("CFLAGS=-std=gnu99"))) + #:glib-or-gtk? #t)) (propagated-inputs `(("dconf" ,dconf))) (native-inputs - `(("intltool" ,intltool) + `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database + ("glib:bin" ,glib "bin") ; for glib-mkenums + ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache + ("intltool" ,intltool) ("itstool" ,itstool) ("pkg-config" ,pkg-config) ("xmllint" ,libxml2))) (inputs `(("avahi" ,avahi) ("gcr" ,gcr) - ("gdk-pixbuf" ,gdk-pixbuf) ; for loading SVG files + ("gdk-pixbuf+svg" ,gdk-pixbuf+svg) ; for loading SVG files ("glib-networking" ,glib-networking) ("gnome-desktop" ,gnome-desktop) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) @@ -4203,6 +4207,7 @@ (define-public epiphany ("libnotify" ,libnotify) ("libsecret" ,libsecret) ("libxslt" ,libxslt) + ("nettle" ,nettle) ; for hogweed ("sqlite" ,sqlite) ("webkitgtk" ,webkitgtk))) (home-page "https://wiki.gnome.org/Apps/Web") -- cgit v1.2.3 From 01005901fd229570c529fc92a981d336b0e83615 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 19:08:34 +0200 Subject: gnu: Use HTTPS for more sigrok.org home pages. * gnu/packages/electronics.scm (libserialport, pulseview)[home-page]: Use HTTPS. --- gnu/packages/electronics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 26f90695b9..068aa23e36 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -51,7 +51,7 @@ (define-public libserialport (base32 "17ajlwgvyyrap8z7f16zcs59pksvncwbmd3mzf98wj7zqgczjaja")))) (build-system gnu-build-system) - (home-page "http://sigrok.org/wiki/Libserialport") + (home-page "https://sigrok.org/wiki/Libserialport") (synopsis "Library for using serial ports") (description "Libserialport is a minimal shared library written in C that is intended to take care of the OS-specific details when writing software that uses serial ports.") @@ -249,7 +249,7 @@ (define-public pulseview ("qtbase" ,qtbase) ("qtsvg" ,qtsvg))) (build-system cmake-build-system) - (home-page "http://www.sigrok.org/wiki/PulseView") + (home-page "https://www.sigrok.org/wiki/PulseView") (synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok") (description "PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI for sigrok.") -- cgit v1.2.3 From eddc4b33528880ffbf2b87cad445ac44a37edf7b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 19:51:35 +0200 Subject: gnu: pure: Update to 0.68. * gnu/packages/pure.scm (pure): Update to 0.68. --- gnu/packages/pure.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pure.scm b/gnu/packages/pure.scm index b0fd93b39b..39c1d6089f 100644 --- a/gnu/packages/pure.scm +++ b/gnu/packages/pure.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Danny Milosavljevic +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,7 +32,7 @@ (define-module (gnu packages pure) (define-public pure (package (name "pure") - (version "0.67") + (version "0.68") (source (origin (method url-fetch) @@ -40,7 +41,7 @@ (define-public pure "pure-" version ".tar.gz")) (sha256 (base32 - "1hlx5dx6n70rbg668yc97yj4jbnrv0dpfw3l9b0ffmcgr76f6ba4")))) + "0px6x5ivcdbbp2pz5n1r1cwg1syadklhjw8piqhl63n91i4r7iyb")))) (build-system gnu-build-system) (arguments `(#:make-flags (list (string-append "LDFLAGS=-Wl,-rpath=" -- cgit v1.2.3 From 800e4fd80290746fee2bf2f163c65ef2991e91f6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 19:56:00 +0200 Subject: gnu: xmobar: Update to 0.26. * gnu/packages/wm.scm (xmobar): Update to 0.36. [native-inputs]: Add GHC-HSPEC and HSPEC-DISCOVER. --- gnu/packages/wm.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 7f6d54c124..72836ebd6c 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -504,15 +504,18 @@ (define-public xmonad (define-public xmobar (package (name "xmobar") - (version "0.25") + (version "0.26") (source (origin (method url-fetch) (uri (string-append "mirror://hackage/package/xmobar/" name "-" version ".tar.gz")) (sha256 (base32 - "0382r4vzqkz76jlp2069rdbwf4gh1a22r9w4rkphcn5qflw0dlb6")))) + "19g40vqj3cs94i27f66194k7d5cazrv1lx54bz9kc0qy2npxjzgz")))) (build-system haskell-build-system) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) (inputs `(("ghc-hinotify" ,ghc-hinotify) ("ghc-http" ,ghc-http) -- cgit v1.2.3 From fa2886b7fd7bf13854de810ec8bdf1319886e987 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 20:04:19 +0200 Subject: gnu: i3lock-color: Stylistic fixes. * gnu/packages/wm.scm (i3lock-color)[arguments]: Use INVOKE and end phase with explicit #t. [inputs, native-inputs]: Fix indentation and order alphabetically. --- gnu/packages/wm.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 72836ebd6c..1ba80e24ab 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -355,24 +355,25 @@ (define-public i3lock-color "119xvdm4r6irqk0mar80hx6s8ydw26y35h7712rd7nbg7pb7i053")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;No tests included. + `(#:tests? #f ; no tests included #:phases (modify-phases %standard-phases (add-after 'unpack 'bootstrap (lambda _ - (zero? (system* "autoreconf" "-vfi"))))))) + (invoke "autoreconf" "-vfi") + #t))))) (inputs - `(("xcb-util-image" ,xcb-util-image) - ("xcb-util" ,xcb-util) + `(("cairo" ,cairo) + ("libev" ,libev) ("libxcb" ,libxcb) - ("linux-pam" ,linux-pam) ("libxkbcommon" ,libxkbcommon) - ("libev" ,libev) - ("cairo" ,cairo))) + ("linux-pam" ,linux-pam) + ("xcb-util" ,xcb-util) + ("xcb-util-image" ,xcb-util-image))) (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake))) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) (home-page "https://github.com/PandorasFox/i3lock-color") (synopsis "Screen locker with color configuration support") (description -- cgit v1.2.3 From 3dc77d40e6ede67a85c88a950cca5f291f8d64cf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 20:09:00 +0200 Subject: gnu: i3lock-color: Update to 2.11-c. * gnu/packages/wm.scm (i3lock-color): Update to 2.11-c. [inputs]: Add LIBJPEG-TURBO. --- gnu/packages/wm.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 1ba80e24ab..c015eda6f1 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -343,7 +343,7 @@ (define-public quickswitch-i3 (define-public i3lock-color (package (name "i3lock-color") - (version "2.10.1c") + (version "2.11-c") (source (origin (method url-fetch) @@ -352,7 +352,7 @@ (define-public i3lock-color (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "119xvdm4r6irqk0mar80hx6s8ydw26y35h7712rd7nbg7pb7i053")))) + "0zh7il2y6dmzym3w6r9xii5dma8pjjjlq4dm5iby7m3gvplj4q9p")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests included @@ -365,6 +365,7 @@ (define-public i3lock-color (inputs `(("cairo" ,cairo) ("libev" ,libev) + ("libjpeg" ,libjpeg-turbo) ("libxcb" ,libxcb) ("libxkbcommon" ,libxkbcommon) ("linux-pam" ,linux-pam) -- cgit v1.2.3 From 7f1d8b5cdb67b7062a6c8b12558a05b8735588aa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 20:12:40 +0200 Subject: gnu: miniupnpc: Update to 2.0.20180410. * gnu/packages/upnp.scm (miniupnpc): Update to 2.0.20180410. --- gnu/packages/upnp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 7db6b5eec5..3385d80fbc 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Sree Harsha Totakura ;;; Copyright © 2015 Federico Beffa -;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,14 +29,14 @@ (define-module (gnu packages upnp) (define-public miniupnpc (package (name "miniupnpc") - (version "2.0.20180406") + (version "2.0.20180410") (source (origin (method url-fetch) (uri (string-append "https://miniupnp.tuxfamily.org/files/" name "-" version ".tar.gz")) (sha256 - (base32 "15i9lyj72wr15b3kpcqsf97mr2hajkpwvf0lz9ps9r568yyjcwlc")))) + (base32 "08vs9012bahdwid4nsf3mi2kawcq1hvz7lzpdmiynxcbpip6sk0f")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) -- cgit v1.2.3 From c80590f646f47d4199a8452ee9f3fb4271f72803 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 20:23:10 +0200 Subject: gnu: Add perl-crypt-openssl-guess. * gnu/packages/tls.scm (perl-crypt-openssl-guess): New public variable. --- gnu/packages/tls.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 60e29bfe82..6ab5cfbc54 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Rutger Helling ;;; ;;; This file is part of GNU Guix. @@ -736,6 +736,28 @@ (define-public perl-crypt-openssl-bignum ;; At your option either gpl1+ or the Artistic License (license license:perl-license))) +(define-public perl-crypt-openssl-guess + (package + (name "perl-crypt-openssl-guess") + (version "0.11") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-" + version ".tar.gz")) + (sha256 + (base32 + "0rvi9l4ljcbhwwvspq019nfq2h2v746dk355h2nwnlmqikiihsxa")))) + (build-system perl-build-system) + (home-page "http://search.cpan.org/dist/Crypt-OpenSSL-Guess/") + (synopsis "Guess the OpenSSL include path") + (description + "The Crypt::OpenSSL::Guess Perl module provides helpers to guess the +correct OpenSSL include path. It is intended for use in your +@file{Makefile.PL}.") + (license license:perl-license))) + (define-public perl-crypt-openssl-random (package (name "perl-crypt-openssl-random") -- cgit v1.2.3 From b30c23c433ca6627484098f03ad91dd8341babb9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 20:25:37 +0200 Subject: gnu: perl-crypt-openssl-random: Update to 0.13. * gnu/packages/tls.scm (perl-crypt-openssl-random): Update to 0.13. [native-inputs]: Add PERL-CRYPT-OPENSSL-GUESS. --- gnu/packages/tls.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 6ab5cfbc54..13906b19a7 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -761,7 +761,7 @@ (define-public perl-crypt-openssl-guess (define-public perl-crypt-openssl-random (package (name "perl-crypt-openssl-random") - (version "0.11") + (version "0.13") (source (origin (method url-fetch) @@ -771,9 +771,12 @@ (define-public perl-crypt-openssl-random ".tar.gz")) (sha256 (base32 - "0yjcabkibrkafywvdkmd1xpi6br48skyk3l15ni176wvlg38335v")))) + "0vmvrb3shrzjzri3qn524dzdasbq8zhhbpc1vmq8sx68n4jhizb0")))) (build-system perl-build-system) - (inputs `(("openssl" ,openssl))) + (native-inputs + `(("perl-crypt-openssl-guess" ,perl-crypt-openssl-guess))) + (inputs + `(("openssl" ,openssl))) (arguments perl-crypt-arguments) (home-page "http://search.cpan.org/dist/Crypt-OpenSSL-Random") -- cgit v1.2.3 From fbe8ebec9e886074a3897be76eb1929c856eadd2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 20:37:07 +0200 Subject: gnu: kakoune: Update to 2018.04.13. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/text-editors.scm (kakoune): Update to 2018.04.13. Remove LET binding for the git revision and re-indent accordingly. [version, source]: Replace the git checkout with new release tarball. [arguments]: Remove ‘fix-test-permissions’ phase. [native-inputs]: Add PKG-CONFIG. --- gnu/packages/text-editors.scm | 94 +++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 49 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 42f65d8e46..6d8d800fd4 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -100,59 +100,55 @@ (define-public vis license:expat)))) ; lexers and libutf.[ch] (define-public kakoune - (let ((commit "125c8b7e80995732e0d8c87b82040025748f1b4f") - (revision "1")) - (package - (name "kakoune") - (version (string-append "0.0.0-" revision "." (string-take commit 7))) - (source - (origin - (file-name (string-append "kakoune-" version "-checkout")) - (method git-fetch) - (uri (git-reference - (url "https://github.com/mawww/kakoune.git") - (commit commit))) - (sha256 - (base32 - "19qs99l8r9p1vi5pxxx9an22fvi7xx40qw3jh2cnh2mbacawvdyb")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - ;; kakoune uses confstr with _CS_PATH to find out where to find - ;; a posix shell, but this doesn't work in the build - ;; environment. This substitution just replaces that result - ;; with the "sh" path. - (substitute* "src/shell_manager.cc" - (("if \\(m_shell.empty\\(\\)\\)" line) - (string-append "m_shell = \"" (which "sh") - "\";\n " line))) - #t)) - (delete 'configure) - ;; kakoune requires us to be in the src/ directory to build - (add-before 'build 'chdir - (lambda _ (chdir "src") #t)) - (add-before 'check 'fix-test-permissions - (lambda _ - ;; Out git downloader doesn't give us write permissions, but - ;; without them the tests fail. - (zero? (system* "chmod" "-R" "u+w" "../test"))))))) - (native-inputs `(("asciidoc" ,asciidoc) - ("ruby" ,ruby))) - (inputs `(("ncurses" ,ncurses) - ("boost" ,boost))) - (synopsis "Vim-inspired code editor") - (description - "Kakoune is a code editor heavily inspired by Vim, as such most of its + (package + (name "kakoune") + (version "2018.04.13") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/mawww/kakoune/" + "releases/download/v" version "/" + name "-" version ".tar.bz2")) + (sha256 + (base32 + "1kkzs5nrjxzd1jq7a4k7qfb5kg05871z0r3d9c0yhz9shf6wz36d")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + ;; kakoune uses confstr with _CS_PATH to find out where to find + ;; a posix shell, but this doesn't work in the build + ;; environment. This substitution just replaces that result + ;; with the "sh" path. + (substitute* "src/shell_manager.cc" + (("if \\(m_shell.empty\\(\\)\\)" line) + (string-append "m_shell = \"" (which "sh") + "\";\n " line))) + #t)) + (delete 'configure) ; no configure script + ;; kakoune requires us to be in the src/ directory to build + (add-before 'build 'chdir + (lambda _ (chdir "src") #t))))) + (native-inputs + `(("asciidoc" ,asciidoc) + ("pkg-config" ,pkg-config) + ("ruby" ,ruby))) + (inputs + `(("ncurses" ,ncurses) + ("boost" ,boost))) + (synopsis "Vim-inspired code editor") + (description + "Kakoune is a code editor heavily inspired by Vim, as such most of its commands are similar to Vi's ones, and it shares Vi's \"keystrokes as a text editing language\" model. Kakoune has a strong focus on interactivity, most commands provide immediate and incremental results, while still being competitive (as in keystroke count) with Vim.") - (home-page "http://kakoune.org/") - (license license:unlicense)))) + (home-page "http://kakoune.org/") + (license license:unlicense))) (define-public joe (package -- cgit v1.2.3 From 9d448362a1d66f16e5902e20574cab3dc7bae8bc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 20:45:11 +0200 Subject: gnu: r-lubridate: Update to 1.7.4. * gnu/packages/statistics.scm (r-lubridate): Update to 1.7.4. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 393818ab32..9fc57df7f7 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5363,14 +5363,14 @@ (define-public r-cairo (define-public r-lubridate (package (name "r-lubridate") - (version "1.7.3") + (version "1.7.4") (source (origin (method url-fetch) (uri (cran-uri "lubridate" version)) (sha256 (base32 - "1pzkqfiahnsdm3zx46asgn8fw43vlxvbh7r4cn70c7ffmxabzzrc")))) + "14a823il77w3wmmnzr89vwrqp50y56dh5raycnaw6c8nv5xsh32i")))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp) -- cgit v1.2.3 From 8998583417ce282bd87514d053b559162515aabf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 20:47:35 +0200 Subject: gnu: r-ade4: Update to 1.7-11. * gnu/packages/statistics.scm (r-ade4): Update to 1.7-11. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 9fc57df7f7..2488e1fd83 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1904,14 +1904,14 @@ (define-public r-coda (define-public r-ade4 (package (name "r-ade4") - (version "1.7-10") + (version "1.7-11") (source (origin (method url-fetch) (uri (cran-uri "ade4" version)) (sha256 (base32 - "0zk81x0yn30gbyc0jpzyw1nxd08ccihl6vyk0ijvj3aw3nr5flc6")))) + "0wm54wcpn87rdh6vyw04cr8vgba899y6jsl61f22bmlvx6d7kkac")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass))) -- cgit v1.2.3 From e354b032231b06e0ee01abf4c1c56f367ff92081 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 21:15:11 +0200 Subject: gnu: r-yaml: Update to 2.1.18. * gnu/packages/statistics.scm (r-yaml): Update to 2.1.18. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 2488e1fd83..4c33183a1e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1331,13 +1331,13 @@ (define-public r-markdown (define-public r-yaml (package (name "r-yaml") - (version "2.1.17") + (version "2.1.18") (source (origin (method url-fetch) (uri (cran-uri "yaml" version)) (sha256 (base32 - "10y6wnv2v8k396far29haqv2s82p4zm04rrsxk183wg19gb51was")))) + "15m4q5krfqg0avvqg9i2g6ns4757lk6zbyrwbx5c5bgh51glvd8v")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/yaml/") (synopsis "Methods to convert R data to YAML and back") -- cgit v1.2.3 From 361cee71245d216a0cdc938dc366019ddcb94fcb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 21:15:30 +0200 Subject: gnu: r-hms: Update to 0.4.2. * gnu/packages/statistics.scm (r-hms): Update to 0.4.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 4c33183a1e..2a119312f3 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2377,14 +2377,14 @@ (define-public r-withr (define-public r-hms (package (name "r-hms") - (version "0.4.1") + (version "0.4.2") (source (origin (method url-fetch) (uri (cran-uri "hms" version)) (sha256 (base32 - "0vr7k3a7k52a5yf67bwzl88lkjz09v1avw5axdk1y9v3nz33zl2h")))) + "1g6hslk3z0xga38r71irxq802wskg6nv804mp8y9f7i2wfrj0y55")))) (build-system r-build-system) (propagated-inputs `(("r-rlang" ,r-rlang) -- cgit v1.2.3 From ee280cea93dc7c2895aa7b1e0b2fb3ba68410e56 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Apr 2018 22:01:10 +0200 Subject: gnu: r-matrix: Update to 1.2-14. * gnu/packages/statistics.scm (r-matrix): Update to 1.2-14. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 2a119312f3..62d8b2b2c2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -466,14 +466,14 @@ (define-public r-lattice (define-public r-matrix (package (name "r-matrix") - (version "1.2-13") + (version "1.2-14") (source (origin (method url-fetch) (uri (cran-uri "Matrix" version)) (sha256 (base32 - "1j4fyn2r3ds51hrxch738gn7d9qvpi4b01n0rxzw5jpv28rnpyvx")))) + "15hknim84nj3f54vkchca5ac0c3ip15v1by18k5parmn8wsl19j9")))) (properties `((upstream-name . "Matrix"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 05341cc97b3d4cbfe12b0814342ca95f5fcc4ee1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 02:36:33 +0200 Subject: gnu: xonsh: Update to 0.6.1. * gnu/packages/shells.scm (xonsh): Update to 0.6.1. --- gnu/packages/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 69bc09a3a9..f5e7b7a7c0 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -357,14 +357,14 @@ (define-public zsh (define-public xonsh (package (name "xonsh") - (version "0.6.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (pypi-uri "xonsh" version)) (sha256 (base32 - "1ikd1xg4iyjqp51y8g8n6c4y39bgx85xnb4bdd3zibkqac3lrahr")) + "09rrfcwpirbxmjjqnsbyn7lwm1wyn41z5zhkbnv57i5hcgs72kx6")) (modules '((guix build utils))) (snippet `(begin -- cgit v1.2.3 From 08baa9ace978319ce7ecfd3a254cb75c2ceb7522 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 02:44:26 +0200 Subject: gnu: neofetch: Update to 3.4.0. * gnu/packages/admin.scm (neofetch): Update to 3.4.0. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2cab8e74e4..42b1a57b60 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2312,7 +2312,7 @@ (define-public fabric (define-public neofetch (package (name "neofetch") - (version "3.3.0") + (version "3.4.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/dylanaraps/neofetch/" @@ -2320,7 +2320,7 @@ (define-public neofetch (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "15p69q0jchfms1fpb4i7kq8b28w2xpgh2zmynln618qxv1myf228")))) + "18rhamy910ig03rr55y9x5i6pf78yj9xc6jpm6nfh3gqja7340rb")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are no tests -- cgit v1.2.3 From 77009de71b1e4d79c9561c4d30b41f4ede24aa6c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 03:13:37 +0200 Subject: gnu: libtorrent-rasterbar: Update to 1.1.7. * gnu/packages/bittorrent.scm (libtorrent-rasterbar): Update to 1.1.7. --- gnu/packages/bittorrent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index c6b9d74f33..ae9b3bc62d 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -375,7 +375,7 @@ (define-public mktorrent (define-public libtorrent-rasterbar (package (name "libtorrent-rasterbar") - (version "1.1.6") + (version "1.1.7") (source (origin (method url-fetch) (uri @@ -385,7 +385,7 @@ (define-public libtorrent-rasterbar "/libtorrent-rasterbar-" version ".tar.gz")) (sha256 (base32 - "1vr1a7smkwh7dc7jb9n68i0cg59wxhgywxc9kxpbs8fi9c04vixp")))) + "1agkcyjs7xscx4sgkg2ri4nm4v736xsg3br2v8jcrph86dlbycw1")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From b1e415404c18371c954696afe25d0a65300ed0db Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 03:18:00 +0200 Subject: gnu: ethtool: Update to 4.16. * gnu/packages/networking.scm (ethtool): Update to 4.16. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b2e16e0077..b9fb0166f2 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -368,14 +368,14 @@ (define-public libndp (define-public ethtool (package (name "ethtool") - (version "4.15") + (version "4.16") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/network/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "06pr3s7wg2pbvfbf7js61bgh3caff4qf50nqqk3cgz9z90rgvxvi")))) + "00ss07jc7p276d83f6jpafgwyc9yiribciyqcgx9j86v49kpm5py")))) (build-system gnu-build-system) (home-page "https://www.kernel.org/pub/software/network/ethtool/") (synopsis "Display or change Ethernet device settings") -- cgit v1.2.3 From a0e0f9d743053cb70d0298794757b18669900b6f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 03:33:48 +0200 Subject: gnu: ruby-crass: Update to 1.0.4. * gnu/packages/ruby.scm (ruby-crass): Update to 1.0.4. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 67dc6badfe..95de222ac3 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2998,13 +2998,13 @@ (define-public ruby-activesupport (define-public ruby-crass (package (name "ruby-crass") - (version "1.0.3") + (version "1.0.4") (source (origin (method url-fetch) (uri (rubygems-uri "crass" version)) (sha256 (base32 - "1czijxlagzpzwchr2ldrgfi7kywg08idjpq37ndcmwh4fmz72c4l")))) + "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi")))) (build-system ruby-build-system) (native-inputs `(("bundler" ,bundler) -- cgit v1.2.3 From c33a27ceb8388cf918716fe1729d640594504c67 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 03:39:32 +0200 Subject: gnu: man-db: Update to 2.8.3. * gnu/packages/man.scm (man-db): Update to 2.8.3. --- gnu/packages/man.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 257cabbbb6..3c7fda7585 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -58,14 +58,14 @@ (define-public libpipeline (define-public man-db (package (name "man-db") - (version "2.8.2") + (version "2.8.3") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/man-db/man-db-" version ".tar.xz")) (sha256 (base32 - "0p0cvv5ykvyzq33qyfik11p2s0d2j75ans1avj9xv3c8vy3zzga5")))) + "1b641kcgjvyc41pj67dn4p0zvwlj1vx3l6nf7qdcc7kf6v5a2cjr")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 688c907634bbd48413f6a4eef0f88149479c92af Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 03:40:07 +0200 Subject: gnu: ruby-instantiator: Update to 0.0.7. * gnu/packages/ruby.scm (ruby-instantiator): Update to 0.0.7. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 95de222ac3..98bb5bd110 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1617,13 +1617,13 @@ (define-public ruby-bond (define-public ruby-instantiator (package (name "ruby-instantiator") - (version "0.0.6") + (version "0.0.7") (source (origin (method url-fetch) (uri (rubygems-uri "instantiator" version)) (sha256 (base32 - "0mfmqhg9xrv9i8i1kmphf15ywddhivyh2z3ccl0xjw8qy54zr21i")))) + "0w07w3gkyqr7m0vz5h13vm8b411660qywjm2xxxgdjv4wb3fazbr")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit v1.2.3 From 87abf4a844dbdf3163749c6df731425d1d6c731b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 03:44:18 +0200 Subject: gnu: flatbuffers: Update to 1.9.0. * gnu/packages/serialization.scm (flatbuffers): Update to 1.9.0. --- gnu/packages/serialization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 21ab341e5a..6273109351 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -420,7 +420,7 @@ (define-public python-cbor (define-public flatbuffers (package (name "flatbuffers") - (version "1.8.0") + (version "1.9.0") (source (origin (method url-fetch) @@ -428,7 +428,7 @@ (define-public flatbuffers version ".tar.gz")) (sha256 (base32 - "0blc978wc5h91662vai24xj92c3bx56y6hzid90qva7il302jl64")))) + "1qs7sa9q4q6hs12yp875lvrv6393178qcmqs1ziwmjk088g4k9aw")))) (build-system cmake-build-system) (arguments '(#:build-type "Release" -- cgit v1.2.3 From 91653e074fb92981b9b1a89f1391aedac806e65a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 03:45:02 +0200 Subject: gnu: loksh: Update to 6.3. * gnu/packages/shells.scm (loksh): Update to 6.3. --- gnu/packages/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index f5e7b7a7c0..8f3aa9b5f1 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -575,7 +575,7 @@ (define-public oksh (define-public loksh (package (name "loksh") - (version "6.2") + (version "6.3") (source (origin (method url-fetch) @@ -584,7 +584,7 @@ (define-public loksh (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "16mgxby77wgjg1ybp4fb9cvi7a4a387xmfivdxnhphg0vhyr8qd3")))) + "0i1b60g1p19s5cnzz0nmjzjnxywm9szzyp1rcwfcx3gmzvrwr2sc")))) (build-system gnu-build-system) (inputs `(("libbsd" ,libbsd))) -- cgit v1.2.3 From 95e5aed0cd55c9744f6b1b6bce4071eecb167807 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 03:46:07 +0200 Subject: gnu: python-ruamel.yaml: Update to 0.15.37. * gnu/packages/serialization.scm (python-ruamel.yaml): Update to 0.15.37. --- gnu/packages/serialization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 6273109351..c3d355972f 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -368,14 +368,14 @@ (define-public nlohmann-json-cpp (define-public python-ruamel.yaml (package (name "python-ruamel.yaml") - (version "0.15.35") + (version "0.15.37") (source (origin (method url-fetch) (uri (pypi-uri "ruamel.yaml" version)) (sha256 (base32 - "0xggyfaj6vprggahf7cq8kp9j79rb7hn8ndk3bxj2sxvwhhliiwd")))) + "0629xzlwbddfwp8lkjz3mpvxhml9kx17cfs8aydzg55idzcl562h")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit v1.2.3 From 506cbdb3c59ba4c122d13f317583ae8064aad72a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 03:50:33 +0200 Subject: gnu: qtserialbus: Update to 5.9.5. * gnu/packages/qt.scm (qtserialbus): Update to 5.9.5. --- gnu/packages/qt.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 0584a5ddeb..8cbce37916 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Thomas Danckaert ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Quiliro -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. @@ -1018,7 +1018,7 @@ (define-public qtserialport (define-public qtserialbus (package (inherit qtsvg) (name "qtserialbus") - (version "5.9.4") + (version "5.9.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1027,7 +1027,7 @@ (define-public qtserialbus version ".tar.xz")) (sha256 (base32 - "1i6b7w9z30mzzi0dcmrxx1scpzpnnw2fag1igvrnzvw1jwp414ff")))) + "0gz5xsskv02yy078yffxyn8rdlklf4rsgnqrziyz5ywxwdh96gn5")))) (inputs `(("qtbase" ,qtbase) ("qtserialport" ,qtserialport))) -- cgit v1.2.3 From c972f171602033411f6f8cf31f666eddc251d77b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 03:52:20 +0200 Subject: gnu: qtscxml: Update to 5.9.5. * gnu/packages/qt.scm (qtscxml): Update to 5.9.5. --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8cbce37916..1ad9687e0b 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1276,7 +1276,7 @@ (define-public qtgamepad (define-public qtscxml (package (inherit qtsvg) (name "qtscxml") - (version "5.9.4") + (version "5.9.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1285,7 +1285,7 @@ (define-public qtscxml version ".tar.xz")) (sha256 (base32 - "0x8bjp9jzib4kfn7rbricw4qr259qqsdbrz0dw39453s2m7cbv0x")) + "0knp328cinawz6xbhf9wd6h6gbwp74rb5cpmlr8gv3g5a7fjlsh1")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 7dbf4888dcd80212e2cc34a1b813f18a1a55c65e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 03:54:52 +0200 Subject: gnu: qtdatavis3d: Update to 5.9.5. * gnu/packages/qt.scm (qtdatavis3d): Update to 5.9.5. --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 1ad9687e0b..08db0a7e67 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1390,7 +1390,7 @@ (define-public qtcharts (define-public qtdatavis3d (package (inherit qtsvg) (name "qtdatavis3d") - (version "5.9.4") + (version "5.9.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1399,7 +1399,7 @@ (define-public qtdatavis3d version ".tar.xz")) (sha256 (base32 - "1ggwfnqf17mp5dkfr82q1qrimkb6wv3304vl8mjv1nq0zisckhjv")))) + "0i1zd7lcakhicfpqj7dlw8hzk8x5i4ddk1427jhxcpja48l4jxy5")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests -- cgit v1.2.3 From c4a58d04f9fdf7dfb88bb93de75f932e9c51013c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 04:29:15 +0200 Subject: gnu: xterm: Update to 332. * gnu/packages/xorg.scm (xterm): Update to 332. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 9216ccb8b8..1e427941d5 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5770,7 +5770,7 @@ (define-public xmessage (define-public xterm (package (name "xterm") - (version "331") + (version "332") (source (origin (method url-fetch) (uri (list @@ -5780,7 +5780,7 @@ (define-public xterm name "-" version ".tgz"))) (sha256 (base32 - "047gk58hvj64974sg259ss5gixj7pac6halmjfz4cc6r1yimds4s")))) + "0zdjiik4ravc3zld5c9i2ndrvazjmwiwbgl2c21348762wki2jsx")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-wide-chars" "--enable-load-vt-fonts" -- cgit v1.2.3 From 70020ebe2b2e9aaeeb8896db72c1af7d4142ac00 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 04:33:41 +0200 Subject: gnu: youtube-dl: Update to 2018.04.16. * gnu/packages/video.scm (youtube-dl): Update to 2018.04.16. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b4e7e6ad82..5284577420 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1160,7 +1160,7 @@ (define-public libvpx (define-public youtube-dl (package (name "youtube-dl") - (version "2018.03.14") + (version "2018.04.16") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1168,7 +1168,7 @@ (define-public youtube-dl version ".tar.gz")) (sha256 (base32 - "0j8j797gqc29fd5ra3cjvwkp8dgvigdydsj0zzjs05zccfqrj9lh")))) + "046zg8pww2xg1yibh7c1a8jcg8f1znr4hsz1l1da03djcp6na99d")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 3e34ba43cbc42e4bfe7d4dc2a321c60da8f7cdae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 04:34:09 +0200 Subject: gnu: you-get: Update to 0.4.1060. * gnu/packages/video.scm (you-get): Update to 0.4.1060. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5284577420..e959accf6a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1278,7 +1278,7 @@ (define-public youtube-dl-gui (define-public you-get (package (name "you-get") - (version "0.4.1040") + (version "0.4.1060") (source (origin (method url-fetch) (uri (string-append @@ -1287,7 +1287,7 @@ (define-public you-get (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0257p9bn426rv0cjk2j5hsx6cg7dz5gpjwlqq0sy1axa47phis46")))) + "1pq7c2ay42aan7ykpmddzh6ylq0qsq8a27pk68m5imaxi6abbwsz")))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg))) ; for multi-part and >=1080p videos -- cgit v1.2.3 From 84f95d5548a9851839787fdda15ebe8be8c1d17d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 04:43:02 +0200 Subject: gnu: cbatticon: Update to 1.6.8. * gnu/packages/admin.scm (cbatticon): Update to 1.6.8. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 42b1a57b60..aed997e5bc 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1960,14 +1960,14 @@ (define-public di (define-public cbatticon (package (name "cbatticon") - (version "1.6.7") + (version "1.6.8") (source (origin (method url-fetch) (uri (string-append "https://github.com/valr/" name "/archive/" version ".tar.gz")) (sha256 (base32 - "1s2n49ydh7pznnf02fak4yy0wqkgi9ag7yiw1zg1lhp4m0h37hyh")) + "185lzvaijvyq7y8r7dvizhri0rf9lpc1anfgbbn4lznr1fr3z7rn")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From af62570d6febc55087b44efcdae98273a352fc50 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 05:06:05 +0200 Subject: gnu: knot: Update to 2.6.6. * gnu/packages/dns.scm (knot): Update to 2.6.6. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 5e4309ca13..5bc18b4cbc 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -490,14 +490,14 @@ (define-public yadifa (define-public knot (package (name "knot") - (version "2.6.5") + (version "2.6.6") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-dns/" name "-" version ".tar.xz")) (sha256 (base32 - "0ilxwhy7a7jdzynq586pwlgcvqd1j6ycqy9qrwvypfp20rkngk9k")) + "02h8qdkja4kic3br79svws6r2pq1ijz945238v99d998d2jxh6ci")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From de893dda28b38903d915fdf50fb754bd9cbab39f Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 17 Apr 2018 10:56:11 +0530 Subject: gnu: emacs-emms-player-mpv: Update to 0.1.0. * gnu/packages/emacs.scm (emacs-emms-player-mpv): Update to 0.1.0. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e2b901cd3a..05115bdabe 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -958,7 +958,7 @@ (define-public emms (define-public emacs-emms-player-mpv (package (name "emacs-emms-player-mpv") - (version "0.0.13") + (version "0.1.0") (source (origin (method url-fetch) @@ -967,7 +967,7 @@ (define-public emacs-emms-player-mpv (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "01i0bz7wdqzcnv5r63m9xgl07yf1nmn86dwy00rcfsn5za46y3r3")))) + "05qwbagc4i7yn7i94r1hdgj6wc5xijy1pxqv08pwsmli9rqj51n9")))) (build-system emacs-build-system) (propagated-inputs `(("emms" ,emms))) -- cgit v1.2.3 From bc5fa18ba1e46e516a73a9565a2d37ef1737ceab Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Sat, 14 Apr 2018 23:50:37 +0200 Subject: gnu: python-nbxmpp: Update to 0.6.4. * gnu/packages/messaging.scm (python-nbxmpp): Update to 0.6.4. --- gnu/packages/messaging.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 917d5ed8e1..8635cbf449 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015 Efraim Flashner ;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2016 Andy Patterson -;;; Copyright © 2016, 2017 Clément Lassieur +;;; Copyright © 2016, 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -485,14 +485,14 @@ (define-public znc (define-public python-nbxmpp (package (name "python-nbxmpp") - (version "0.6.1") + (version "0.6.4") (source (origin (method url-fetch) (uri (pypi-uri "nbxmpp" version)) (sha256 (base32 - "0qvkiscy42nhzhccszi049ws8cnhpxgc13g8naq1rsa5x9zy163c")))) + "12rfmp613alh3mi8f94008sx7x1a8c1izs3icrvw7bf4gnf2pi31")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; no tests -- cgit v1.2.3 From e2d8b4a883b0c7f91315e2dede88a0444b9b0d0b Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Sat, 14 Apr 2018 20:08:53 +0200 Subject: gnu: gajim: Update to 1.0.1. * gnu/packages/messaging.scm (gajim): Update to 1.0.1. [build-system]: Change to PYTHON-BUILD-SYSTEM. [arguments]: Remove the PYTHONPATH wrapper. Don't override "APP". Add a GI_TYPELIB_PATH wrapper. Add 'remove-test-resolver, 'start-xserver and 'install-icons phases. [native-inputs]: Add XORG-SERVER. [inputs]: Remove PYTHON2-AXOLOTL, PYTHON2-NBXMPP, PYTHON2-PYOPENSSL, PYTHON2-GNUPG, PYTHON2-PYGTK, PYTHON-2. Add ADWAITA-ICON-THEME, GNOME-KEYRING, GTK+, GTKSPELL3, HICOLOR-ICON-THEME, LIBSECRET, PYTHON-AXOLOTL, PYTHON-DBUS, PYTHON-DOCUTILS, PYTHON-GNUPG, PYTHON-NBXMPP, PYTHON-PILLOW, PYTHON-PYASN1, PYTHON-PYCAIRO, PYTHON-PYGOBJECT, PYTHON-PYOPENSSL, PYTHON-QRCODE. --- gnu/packages/messaging.scm | 84 +++++++++++++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 8635cbf449..2b3284ba6f 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -510,7 +510,7 @@ (define-public python2-nbxmpp (define-public gajim (package (name "gajim") - (version "0.16.9") + (version "1.0.1") (source (origin (method url-fetch) (uri (string-append "https://gajim.org/downloads/" @@ -518,36 +518,74 @@ (define-public gajim "/gajim-" version ".tar.bz2")) (sha256 (base32 - "0v08zdvpqaig0wxpxn1l8rsj3wr3fqvnagn8cnvch17vfqv9gcr1")))) - (build-system gnu-build-system) + "16ynws10vhx6rhjjjmzw6iyb3hc19823xhx4gsb14hrc7l8vzd1c")))) + (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (add-after 'install 'wrap-program (lambda* (#:key outputs #:allow-other-keys) - ;; Make sure all Python scripts run with the correct PYTHONPATH. - (let ((out (assoc-ref outputs "out")) - (path (getenv "PYTHONPATH"))) - (for-each (lambda (name) - (let ((file (string-append out "/bin/" name))) - ;; Wrapping destroys identification of intended - ;; application, so we need to override "APP". - (substitute* file - (("APP=`basename \\$0`") - (string-append "APP=" name))) - (wrap-program file - `("PYTHONPATH" ":" prefix (,path))))) - '("gajim" "gajim-remote" "gajim-history-manager"))) + (let ((out (assoc-ref outputs "out"))) + (for-each + (lambda (name) + (let ((file (string-append out "/bin/" name)) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program file + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))) + '("gajim" "gajim-remote" "gajim-history-manager"))) + #t)) + (add-before 'check 'remove-test-resolver + ;; This test requires network access. + (lambda _ + (substitute* "test/runtests.py" + (("'integration.test_resolver',") "")) + #t)) + (add-before 'check 'start-xserver + ;; Tests require a running X server. + (lambda* (#:key inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref inputs "xorg-server")) + (display ":1")) + (setenv "DISPLAY" display) + (zero? (system (string-append xorg-server "/bin/Xvfb " + display " &")))))) + (add-after 'install 'install-icons + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (adwaita (string-append + (assoc-ref inputs "adwaita-icon-theme") + "/share/icons/Adwaita")) + (hicolor (string-append + (assoc-ref inputs "hicolor-icon-theme") + "/share/icons/hicolor")) + (icons (string-append + out "/lib/python" + ,(version-major+minor (package-version python)) + "/site-packages/gajim/data/icons"))) + (with-directory-excursion icons + (symlink adwaita "Adwaita") + (copy-recursively hicolor "hicolor"))) #t))))) (native-inputs - `(("intltool" ,intltool))) + `(("intltool" ,intltool) + ("xorg-server" ,xorg-server))) (inputs - `(("python2-axolotl" ,python2-axolotl) - ("python2-nbxmpp" ,python2-nbxmpp) - ("python2-pyopenssl" ,python2-pyopenssl) - ("python2-gnupg" ,python2-gnupg) - ("python2-pygtk" ,python2-pygtk) - ("python" ,python-2))) + `(("adwaita-icon-theme" ,adwaita-icon-theme) + ("gnome-keyring" ,gnome-keyring) + ("gtk+" ,gtk+) + ("gtkspell3" ,gtkspell3) + ("hicolor-icon-theme" ,hicolor-icon-theme) + ("libsecret" ,libsecret) + ("python-axolotl" ,python-axolotl) + ("python-dbus" ,python-dbus) + ("python-docutils" ,python-docutils) + ("python-gnupg" ,python-gnupg) + ("python-nbxmpp" ,python-nbxmpp) + ("python-pillow" ,python-pillow) + ("python-pyasn1" ,python-pyasn1) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject) + ("python-pyopenssl" ,python-pyopenssl) + ("python-qrcode" ,python-qrcode))) (home-page "https://gajim.org/") (synopsis "Jabber (XMPP) client") (description "Gajim is a feature-rich and easy to use Jabber/XMPP client. -- cgit v1.2.3 From 6d047cc42902d715eb0e298d5f4a5c245a97f7e1 Mon Sep 17 00:00:00 2001 From: Gábor Boskovits Date: Sat, 14 Apr 2018 21:04:29 +0200 Subject: gnu: Add java-slfj4-api-bootstrap. * gnu/packages/java.scm (java-slf4j-api-bootstrap): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/java.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a3395ad7da..fecfbb0ddf 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5640,6 +5640,15 @@ (define-public java-slf4j-api time.") (license license:expat))) +(define java-slf4j-api-bootstrap + (package + (inherit java-slf4j-api) + (name "java-slf4j-api-bootstrap") + (inputs `()) + (arguments + (substitute-keyword-arguments (package-arguments java-slf4j-api) + ((#:tests? _ #f) #f))))) + (define-public java-slf4j-simple (package (name "java-slf4j-simple") -- cgit v1.2.3 From 288a59590e18d265b843bc13dfee0919e9cce4fd Mon Sep 17 00:00:00 2001 From: Gábor Boskovits Date: Sat, 14 Apr 2018 22:33:31 +0200 Subject: gnu: Add java-aqute-libg-bootstrap. * gnu/packages/java.scm (java-aqute-libg-bootstrap): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/java.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index fecfbb0ddf..5d1bdd7575 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6890,6 +6890,15 @@ (define-public java-aqute-libg ("java-osgi-cmpn" ,java-osgi-cmpn) ("osgi" ,java-osgi-core))))) +(define java-aqute-libg-bootstrap + (package + (inherit java-aqute-libg) + (name "java-aqute-libg-bootstrap") + (inputs + `(("slf4j-bootstrap" ,java-slf4j-api-bootstrap) + ,@(delete `("slf4j" ,java-slf4j-api) + (package-inputs java-aqute-libg)))))) + (define-public java-aqute-bndlib (package (inherit java-aqute-bnd-annotation) -- cgit v1.2.3 From 869803aa5ed2fec13cf8583183dccf2dce9604ce Mon Sep 17 00:00:00 2001 From: Gábor Boskovits Date: Sat, 14 Apr 2018 22:33:32 +0200 Subject: gnu: Add java-aqute-bndlib-bootstrap. * gnu/packages/java.scm (java-aqute-bndlib-bootstrap): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/java.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5d1bdd7575..0f0144b8ee 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6922,6 +6922,17 @@ (define-public java-aqute-bndlib ("promise" ,java-osgi-util-promise) ("osgi" ,java-osgi-core))))) +(define java-aqute-bndlib-bootstrap + (package + (inherit java-aqute-bndlib) + (name "java-aqute-bndlib-bootstrap") + (inputs + `(("slf4j-bootstrap" ,java-slf4j-api-bootstrap) + ("java-aqute-libg-bootstrap" ,java-aqute-libg-bootstrap) + ,@(delete `("slf4j" ,java-slf4j-api) + (delete `("java-aqute-libg" ,java-aqute-libg) + (package-inputs java-aqute-bndlib))))))) + (define-public java-ops4j-pax-tinybundles (package (name "java-ops4j-pax-tinybundles") -- cgit v1.2.3 From bfb4004d3463a6857ff0aaeb9513a55c262970f0 Mon Sep 17 00:00:00 2001 From: Gábor Boskovits Date: Sat, 14 Apr 2018 22:33:33 +0200 Subject: gnu: Add java-asm-bootstrap. * gnu/packages/java.scm (java-asm-bootstrap): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/java.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 0f0144b8ee..500f27dcf2 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3526,6 +3526,21 @@ (define-public java-asm complex transformations and code analysis tools.") (license license:bsd-3))) +(define java-asm-bootstrap + (package + (inherit java-asm) + (name "java-asm-bootstrap") + (arguments + (substitute-keyword-arguments (package-arguments java-asm) + ((#:tests? _) #f))) + (native-inputs `()) + (propagated-inputs + `(("java-aqute-bndlib" ,java-aqute-bndlib-bootstrap) + ("java-aqute-libg" ,java-aqute-libg-bootstrap) + ,@(delete `("java-aqute-bndlib" ,java-aqute-bndlib) + (delete `("java-aqute-libg", java-aqute-libg) + (package-inputs java-asm))))))) + (define-public java-cglib (package (name "java-cglib") -- cgit v1.2.3 From 82bead7537d395507071489979576bfc0be44f73 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 15 Apr 2018 15:21:49 +0200 Subject: gnu: Add emacs-ergoemacs-mode. * gnu/packages/emacs.scm (emacs-ergoemacs-mode): New variable. --- gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 05115bdabe..d94d92f80a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7567,6 +7567,32 @@ (define-public emacs-emmet-mode used with SGML-like languages: XML, HTML, XHTML, XSL, etc.") (license license:gpl3+))) +(define-public emacs-ergoemacs-mode + (let ((commit "3ce23bba3cb50562693860f87f3528c471d603ba") + (revision "1")) + (package + (name "emacs-ergoemacs-mode") + (version (git-version "5.16.10.12" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ergoemacs/ergoemacs-mode.git") + (commit commit))) + (sha256 + (base32 + "1s3b9bridl78hh1mxmdk9nqlmqhibbaxk0a1cixmsf23s06w8w6l")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-undo-tree" ,emacs-undo-tree))) + (home-page "https://ergoemacs.github.io/") + (synopsis "Emacs mode based on common modern interface and ergonomics") + (description + "This package provides an efficient Emacs keybinding set based on +statistics of command frequency, and supports common shortcuts for open, +close, copy, cut, paste, undo, redo.") + (license license:gpl3+)))) + (define-public emacs-password-store (package (name "emacs-password-store") -- cgit v1.2.3 From 8d3dda021a4cc66f79305a2146c895d1613a8ba6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 17 Apr 2018 12:48:48 +0200 Subject: gnu: r-rcurl: Respect CURL_CA_BUNDLE variable. Fixes * gnu/packages/statistics.scm (r-rcurl)[arguments]: Patch options to respect CURL_CA_BUNDLE if no "cainfo" option is provided. --- gnu/packages/statistics.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 62d8b2b2c2..cb839a85a3 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2734,6 +2734,18 @@ (define-public r-rcurl "0l7qi45jxlf898n0jazabnam1yyczvqfdknd00bdirhhiplpd1sc")))) (properties `((upstream-name . "RCurl"))) (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'respect-CURL_CA_BUNDLE + (lambda _ + (substitute* "R/options.S" + (("\\.els = rev\\(merge\\(list\\(\\.\\.\\.\\), \\.opts\\)\\)" m) + (string-append "\ +certs = Sys.getenv(\"CURL_CA_BUNDLE\") +if (certs != \"\") { .opts = merge.list(.opts, list(cainfo=certs)) } +" m))) + #t))))) (inputs `(("libcurl" ,curl))) (propagated-inputs -- cgit v1.2.3 From a05a637ccc52e0057150678492c829ddc30f8163 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 19 Mar 2018 21:13:33 -0400 Subject: gnu: emacs-idris-mode: Fix source hash. * gnu/packages/emacs.scm (emacs-idris-mode)[source]: Fix hash. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index d94d92f80a..ba75b295a6 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6713,7 +6713,7 @@ (define-public emacs-idris-mode version ".tar")) (sha256 (base32 - "0ld4kfwnyyhlsnj5f6cbn4is4mpxdqalk2aifkw02r00mbr9n294")))) + "02r1qqsxi6qk7q4cj6a6pygbj856dcw9vcmhfh0ib92j41v77q6y")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-prop-menu" ,emacs-prop-menu))) -- cgit v1.2.3 From 8366a67b0a27b2bb9190ff45d8fd97b42e0d021d Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 17 Apr 2018 19:20:41 +0200 Subject: gnu: mrustc: Update to 0.0.0-1.4f98e43. * gnu/packages/rust.scm (mrustc): Update to 0.0.0-1.4f98e43. --- gnu/packages/rust.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 0192b04ddf..9ba2c42c68 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -255,8 +255,8 @@ (define (rust-bootstrapped-package base-rust version checksum) (package-native-inputs base-rust)))))) (define-public mrustc - (let ((commit "1a16def28935548e29be0fe5a632e25c83045924") - (revision "0") + (let ((commit "4f98e4322ef7aabd3bbef8cd93c0980cd6eeeed1") + (revision "1") (rustc-version "1.19.0")) (package (name "mrustc") @@ -269,7 +269,7 @@ (define-public mrustc (file-name (git-file-name name version)) (sha256 (base32 - "0i5kqnzsd1rkj8qm147jx934nyn9sd1fz2b4achj9z0r00h84dh6")))) + "1hk1x2iv64il5g2n3z06d6h219hnxg1w84lj7vi1lydqa65qk92p")))) (outputs '("out" "cargo")) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 71653653ea39410d91ea7cc06cbb71790cc4da3c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 14 Apr 2018 19:36:12 -0400 Subject: gnu: subversion: Update to 1.10.0. * gnu/packages/version-control.scm (subversion): Update to 1.10.0. (arguments): Patch a hidden shebang in a new 'patch-test-sh' phase. (inputs): Add lz4 and utf8proc. Switch from python-2 to python-wrapper@3. --- gnu/packages/version-control.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index cccdb31fb1..71ede4f549 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -90,6 +90,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages sdl) #:use-module (gnu packages swig) #:use-module (gnu packages tcl) + #:use-module (gnu packages textutils) #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages) @@ -1069,7 +1070,7 @@ (define-public neon (define-public subversion (package (name "subversion") - (version "1.8.19") + (version "1.10.0") (source (origin (method url-fetch) (uri @@ -1080,7 +1081,7 @@ (define-public subversion "subversion-" version ".tar.bz2"))) (sha256 (base32 - "1gp6426gkdza6ni2whgifjcmjb4nq34ljy07yxkrhlarvfq6ks2n")))) + "115mlvmf663w16mc3xyypnaizq401vbypc56hl2ylzc3pcx3zwic")))) (build-system gnu-build-system) (arguments '(#:phases @@ -1096,6 +1097,11 @@ (define-public subversion (substitute* "libtool" (("\\\\`ls") (string-append "\\`" coreutils "/bin/ls"))) #t))) + (add-before 'build 'patch-test-sh + (lambda _ + (substitute* "subversion/tests/libsvn_repos/repos-test.c" + (("#!/bin/sh") (string-append "#!" (which "sh")))) + #t)) (add-after 'install 'install-perl-bindings (lambda* (#:key outputs #:allow-other-keys) ;; Follow the instructions from 'subversion/bindings/swig/INSTALL'. @@ -1124,10 +1130,12 @@ (define-public subversion (inputs `(("apr" ,apr) ("apr-util" ,apr-util) + ("lz4" ,lz4) ("serf" ,serf) ("perl" ,perl) - ("python" ,python-2) ; incompatible with Python 3 (print syntax) + ("python" ,python-wrapper) ("sqlite" ,sqlite) + ("utf8proc" ,utf8proc) ("zlib" ,zlib))) (home-page "https://subversion.apache.org/") (synopsis "Revision control system") -- cgit v1.2.3 From 269d0858c6c01145b07be8ebb170e448894b112a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 17 Apr 2018 16:53:23 -0400 Subject: gnu: Move the Go standard libraries to (gnu packages golang). * gnu/packages/syncthing.scm (go-golang-org-x-crypto-bcrypt, go-golang-org-x-crypto-blowfish, go-golang-org-x-crypto-pbkdf2, go-golang-org-x-crypto-tea, go-golang-org-x-crypto-salsa20, go-golang-org-x-crypto-cast5, go-golang-org-x-crypto-twofish, go-golang-org-x-crypto-xtea, go-golang-org-x-net-ipv4, go-golang-org-x-net-bpf, go-golang-org-x-net-context, go-golang-org-x-net-internal-iana, go-golang-org-x-net-ipv6, go-golang-org-x-net-proxy, go-golang-org-x-sys-unix, go-golang-org-x-text-transform, go-golang-org-x-text-unicode-norm, go-golang-org-x-time-rate): Move these packages ... * gnu/packages/golang.scm: ... to here. --- gnu/packages/golang.scm | 566 ++++++++++++++++++++++++++++++++++++++++++++ gnu/packages/syncthing.scm | 569 +-------------------------------------------- 2 files changed, 568 insertions(+), 567 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e0ce1032f7..e2fbd54a56 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -691,3 +691,569 @@ (define-public go-github-com-hashicorp-hcl expressing configuration which is easy for both humans and machines to read.") (home-page "https://github.com/hashicorp/hcl") (license license:mpl2.0)))) + +(define-public go-golang-org-x-crypto-bcrypt + (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") + (revision "1")) + (package + (name "go-golang-org-x-crypto-bcrypt") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/crypto") + (commit commit))) + (file-name (string-append "go.googlesource.com-crypto-" + version "-checkout")) + (sha256 + (base32 + "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/crypto/bcrypt" + #:unpack-path "golang.org/x/crypto" + #:phases + (modify-phases %standard-phases + (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable + (lambda* (#:key outputs #:allow-other-keys) + (map (lambda (file) + (make-file-writable file)) + (find-files + (string-append (assoc-ref outputs "out") + "/src/golang.org/x/crypto/ed25519/testdata") + ".*\\.gz$")) + #t))))) + (synopsis "Bcrypt in Go") + (description "This package provides a Go implementation of the bcrypt +password hashing function.") + (home-page "https://go.googlesource.com/crypto/") + (license license:bsd-3)))) + +(define-public go-golang-org-x-crypto-blowfish + (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") + (revision "1")) + (package + (name "go-golang-org-x-crypto-blowfish") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/crypto") + (commit commit))) + (file-name (string-append "go.googlesource.com-crypto-" + version "-checkout")) + (sha256 + (base32 + "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/crypto/blowfish" + #:unpack-path "golang.org/x/crypto" + #:phases + (modify-phases %standard-phases + (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable + (lambda* (#:key outputs #:allow-other-keys) + (map (lambda (file) + (make-file-writable file)) + (find-files + (string-append (assoc-ref outputs "out") + "/src/golang.org/x/crypto/ed25519/testdata") + ".*\\.gz$")) + #t))))) + (synopsis "Blowfish in Go") + (description "This package provides a Go implementation of the Blowfish +symmetric-key block cipher.") + (home-page "https://go.googlesource.com/crypto/") + (license license:bsd-3)))) + +(define-public go-golang-org-x-crypto-pbkdf2 + (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") + (revision "1")) + (package + (name "go-golang-org-x-crypto-pbkdf2") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/crypto") + (commit commit))) + (file-name (string-append "go.googlesource.com-crypto-" + version "-checkout")) + (sha256 + (base32 + "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/crypto/pbkdf2" + #:unpack-path "golang.org/x/crypto" + #:phases + (modify-phases %standard-phases + (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable + (lambda* (#:key outputs #:allow-other-keys) + (map (lambda (file) + (make-file-writable file)) + (find-files + (string-append (assoc-ref outputs "out") + "/src/golang.org/x/crypto/ed25519/testdata") + ".*\\.gz$")) + #t))))) + (synopsis "PBKDF2 in Go") + (description "This package provides a Go implementation of the PBKDF2 key +derivation function.") + (home-page "https://go.googlesource.com/crypto/") + (license license:bsd-3)))) + +(define-public go-golang-org-x-crypto-tea + (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") + (revision "1")) + (package + (name "go-golang-org-x-crypto-tea") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/crypto") + (commit commit))) + (file-name (string-append "go.googlesource.com-crypto-" + version "-checkout")) + (sha256 + (base32 + "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/crypto/tea" + #:unpack-path "golang.org/x/crypto" + #:phases + (modify-phases %standard-phases + (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable + (lambda* (#:key outputs #:allow-other-keys) + (map (lambda (file) + (make-file-writable file)) + (find-files + (string-append (assoc-ref outputs "out") + "/src/golang.org/x/crypto/ed25519/testdata") + ".*\\.gz$")) + #t))))) + (synopsis "Tiny Encryption Algorithm (TEA) in Go") + (description "This packages a Go implementation of the Tiny Encryption +Algorithm (TEA) block cipher.") + (home-page "https://go.googlesource.com/crypto/") + (license license:bsd-3)))) + +(define-public go-golang-org-x-crypto-salsa20 + (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") + (revision "1")) + (package + (name "go-golang-org-x-crypto-salsa20") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/crypto") + (commit commit))) + (file-name (string-append "go.googlesource.com-crypto-" + version "-checkout")) + (sha256 + (base32 + "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/crypto/salsa20" + #:unpack-path "golang.org/x/crypto" + #:phases + (modify-phases %standard-phases + (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable + (lambda* (#:key outputs #:allow-other-keys) + (map (lambda (file) + (make-file-writable file)) + (find-files + (string-append (assoc-ref outputs "out") + "/src/golang.org/x/crypto/ed25519/testdata") + ".*\\.gz$")) + #t))))) + (synopsis "Salsa20 in Go") + (description "This packages provides a Go implementation of the Salsa20 +stream cipher.") + (home-page "https://go.googlesource.com/crypto/") + (license license:bsd-3)))) + +(define-public go-golang-org-x-crypto-cast5 + (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") + (revision "1")) + (package + (name "go-golang-org-x-crypto-cast5") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/crypto") + (commit commit))) + (file-name (string-append "go.googlesource.com-crypto-" + version "-checkout")) + (sha256 + (base32 + "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/crypto/cast5" + #:unpack-path "golang.org/x/crypto" + #:phases + (modify-phases %standard-phases + (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable + (lambda* (#:key outputs #:allow-other-keys) + (map (lambda (file) + (make-file-writable file)) + (find-files + (string-append (assoc-ref outputs "out") + "/src/golang.org/x/crypto/ed25519/testdata") + ".*\\.gz$")) + #t))))) + (synopsis "Cast5 in Go") + (description "This packages provides a Go implementation of the Cast5 +symmetric-key block cipher.") + (home-page "https://go.googlesource.com/crypto/") + (license license:bsd-3)))) + +(define-public go-golang-org-x-crypto-twofish + (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") + (revision "1")) + (package + (name "go-golang-org-x-crypto-twofish") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/crypto") + (commit commit))) + (file-name (string-append "go.googlesource.com-crypto-" + version "-checkout")) + (sha256 + (base32 + "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/crypto/twofish" + #:unpack-path "golang.org/x/crypto" + #:phases + (modify-phases %standard-phases + (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable + (lambda* (#:key outputs #:allow-other-keys) + (map (lambda (file) + (make-file-writable file)) + (find-files + (string-append (assoc-ref outputs "out") + "/src/golang.org/x/crypto/ed25519/testdata") + ".*\\.gz$")) + #t))))) + (synopsis "Twofish in Go") + (description "This packages provides a Go implementation of the Twofish +symmetric-key block cipher.") + (home-page "https://go.googlesource.com/crypto/") + (license license:bsd-3)))) + +(define-public go-golang-org-x-crypto-xtea + (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") + (revision "1")) + (package + (name "go-golang-org-x-crypto-xtea") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/crypto") + (commit commit))) + (file-name (string-append "go.googlesource.com-crypto-" + version "-checkout")) + (sha256 + (base32 + "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/crypto/xtea" + #:unpack-path "golang.org/x/crypto" + #:phases + (modify-phases %standard-phases + (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable + (lambda* (#:key outputs #:allow-other-keys) + (map (lambda (file) + (make-file-writable file)) + (find-files + (string-append (assoc-ref outputs "out") + "/src/golang.org/x/crypto/ed25519/testdata") + ".*\\.gz$")) + #t))))) + (synopsis "eXtended Tiny Encryption Algorithm (XTEA) in Go") + (description "This package provides a Go implementation of the eXtended +Tiny Encryption Algorithm (XTEA) block cipher.") + (home-page "https://go.googlesource.com/crypto/") + (license license:bsd-3)))) + +(define-public go-golang-org-x-net-ipv4 + (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") + (revision "1")) + (package + (name "go-golang-org-x-net-ipv4") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/net") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/net/ipv4" + #:unpack-path "golang.org/x/net")) + (synopsis "Go IPv4 support") + (description "This package provides @code{ipv4}, which implements IP-level +socket options for the Internet Protocol version 4.") + (home-page "https://go.googlesource.com/net") + (license license:bsd-3)))) + +(define-public go-golang-org-x-net-bpf + (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") + (revision "1")) + (package + (name "go-golang-org-x-net-bpf") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/net") + (commit commit))) + (file-name (string-append "go.googlesource.com-net-" + version "-checkout")) + (sha256 + (base32 + "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/net/bpf" + #:unpack-path "golang.org/x/net")) + (synopsis "Berkeley Packet Filters (BPF) in Go") + (description "This packages provides a Go implementation of the Berkeley +Packet Filter (BPF) virtual machine.") + (home-page "https://go.googlesource.com/net/") + (license license:bsd-3)))) + +(define-public go-golang-org-x-net-context + (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") + (revision "1")) + (package + (name "go-golang-org-x-net-context") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/net") + (commit commit))) + (file-name (string-append "go.googlesource.com-net-" + version "-checkout")) + (sha256 + (base32 + "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/net/context" + #:unpack-path "golang.org/x/net")) + (synopsis "Golang Context type") + (description "This packages provides @code{context}, which defines the +Context type, which carries deadlines, cancelation signals, and other +request-scoped values across API boundaries and between processes.") + (home-page "https://go.googlesource.com/net/") + (license license:bsd-3)))) + +(define-public go-golang-org-x-net-internal-iana + (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") + (revision "1")) + (package + (name "go-golang-org-x-net-internal-iana") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/net") + (commit commit))) + (file-name (string-append "go.googlesource.com-net-" + version "-checkout")) + (sha256 + (base32 + "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/net/internal/iana" + #:unpack-path "golang.org/x/net")) + (synopsis "Go support for assigned numbers (IANA)") + (description "This packages provides @code{iana}, which provides protocol +number resources managed by the Internet Assigned Numbers Authority (IANA).") + (home-page "https://go.googlesource.com/net/") + (license license:bsd-3)))) + +(define-public go-golang-org-x-net-ipv6 + (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") + (revision "1")) + (package + (name "go-golang-org-x-net-ipv6") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/net") + (commit commit))) + (file-name (string-append "go.googlesource.com-net-" + version "-checkout")) + (sha256 + (base32 + "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/net/ipv6" + #:unpack-path "golang.org/x/net")) + (synopsis "Go IPv6 support") + (description "This packages provides @code{ipv6}, which implements +IP-level socket options for the Internet Protocol version 6.") + (home-page "https://go.googlesource.com/net") + (license license:bsd-3)))) + +(define-public go-golang-org-x-net-proxy + (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") + (revision "1")) + (package + (name "go-golang-org-x-net-proxy") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/net") + (commit commit))) + (file-name (string-append "go.googlesource.com-net-" + version "-checkout")) + (sha256 + (base32 + "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/net/proxy" + #:unpack-path "golang.org/x/net/")) + (synopsis "Go support for network proxies") + (description "This packages provides @code{proxy}, which provides support +for a variety of protocols to proxy network data.") + (home-page "https://go.googlesource.com/net") + (license license:bsd-3)))) + +(define-public go-golang-org-x-sys-unix + (let ((commit "83801418e1b59fb1880e363299581ee543af32ca") + (revision "1")) + (package + (name "go-golang-org-x-sys-unix") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/sys") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ilykaanvnzb27d42kmbr4i37hcn7hgqbx98z945gy63aa8dskji")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/sys/unix" + #:unpack-path "golang.org/x/sys" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda _ + (pk (getcwd)) + (substitute* "src/golang.org/x/sys/unix/syscall_unix_test.go" + (("/usr/bin") "/tmp")) + #t))))) + (synopsis "Go support for low-level system interaction") + (description "This package provides @code{unix}, which offers Go support +for low-level interaction with the operating system.") + (home-page "https://go.googlesource.com/sys") + (license license:bsd-3)))) + +(define-public go-golang-org-x-text-transform + (let ((commit "e19ae1496984b1c655b8044a65c0300a3c878dd3") + (revision "1")) + (package + (name "go-golang-org-x-text-transform") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/text") + (commit commit))) + (file-name (string-append "go.googlesource.com-text-" + version "-checkout")) + (sha256 + (base32 + "1cvnnx8nwx5c7gr6ajs7sldhbqh52n7h6fsa3i21l2lhx6xrsh4w")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/text/transform" + #:unpack-path "golang.org/x/text")) + (synopsis "Go text transformation") + (description "This package provides @code{transform}, which provides +reader and writer wrappers that transform the bytes passing through. Example +transformations provided by other packages include normalization and conversion +between character sets.") + (home-page "https://go.googlesource.com/text") + (license license:bsd-3)))) + +(define-public go-golang-org-x-text-unicode-norm + (let ((commit "e19ae1496984b1c655b8044a65c0300a3c878dd3") + (revision "1")) + (package + (name "go-golang-org-x-text-unicode-norm") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/text") + (commit commit))) + (file-name (string-append "go.googlesource.com-text-" + version "-checkout")) + (sha256 + (base32 + "1cvnnx8nwx5c7gr6ajs7sldhbqh52n7h6fsa3i21l2lhx6xrsh4w")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/text/unicode/norm" + #:unpack-path "golang.org/x/text")) + (synopsis "Unicode normalization in Go") + (description "This package provides @code{norm}, which contains types and +functions for normalizing Unicode strings.") + (home-page "https://go.googlesource.com/text") + (license license:bsd-3)))) + +(define-public go-golang-org-x-time-rate + (let ((commit "6dc17368e09b0e8634d71cac8168d853e869a0c7") + (revision "1")) + (package + (name "go-golang-org-x-time-rate") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/time") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1fx4cf5fpdz00g3c7vxzy92hdcg0vh4yqw00qp5s52j72qixynbk")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/time/rate" + #:unpack-path "golang.org/x/time")) + (propagated-inputs + `(("go-golang-org-x-net-context" ,go-golang-org-x-net-context))) + (synopsis "Rate limiting in Go") + (description "This package provides @{rate}, which implements rate +limiting in Go.") + (home-page "https://godoc.org/golang.org/x/time/rate") + (license license:bsd-3)))) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 4c607600d3..4a584b1f9a 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -23,7 +23,8 @@ (define-module (gnu packages syncthing) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix licenses)) + #:use-module (guix licenses) + #:use-module (gnu packages golang)) (define-public syncthing (package @@ -904,302 +905,6 @@ (define* (go-golang-org-x-crypto-union #:optional (home-page (package-home-page go-golang-org-x-crypto-bcrypt)) (license (package-license go-golang-org-x-crypto-bcrypt)))) -(define-public go-golang-org-x-crypto-bcrypt - (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") - (revision "1")) - (package - (name "go-golang-org-x-crypto-bcrypt") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/crypto") - (commit commit))) - (file-name (string-append "go.googlesource.com-crypto-" - version "-checkout")) - (sha256 - (base32 - "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/crypto/bcrypt" - #:unpack-path "golang.org/x/crypto" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (string-append (assoc-ref outputs "out") - "/src/golang.org/x/crypto/ed25519/testdata") - ".*\\.gz$")) - #t))))) - (synopsis "Bcrypt in Go") - (description "This package provides a Go implementation of the bcrypt -password hashing function.") - (home-page "https://go.googlesource.com/crypto/") - (license bsd-3)))) - -(define-public go-golang-org-x-crypto-blowfish - (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") - (revision "1")) - (package - (name "go-golang-org-x-crypto-blowfish") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/crypto") - (commit commit))) - (file-name (string-append "go.googlesource.com-crypto-" - version "-checkout")) - (sha256 - (base32 - "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/crypto/blowfish" - #:unpack-path "golang.org/x/crypto" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (string-append (assoc-ref outputs "out") - "/src/golang.org/x/crypto/ed25519/testdata") - ".*\\.gz$")) - #t))))) - (synopsis "Blowfish in Go") - (description "This package provides a Go implementation of the Blowfish -symmetric-key block cipher.") - (home-page "https://go.googlesource.com/crypto/") - (license bsd-3)))) - -(define-public go-golang-org-x-crypto-pbkdf2 - (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") - (revision "1")) - (package - (name "go-golang-org-x-crypto-pbkdf2") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/crypto") - (commit commit))) - (file-name (string-append "go.googlesource.com-crypto-" - version "-checkout")) - (sha256 - (base32 - "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/crypto/pbkdf2" - #:unpack-path "golang.org/x/crypto" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (string-append (assoc-ref outputs "out") - "/src/golang.org/x/crypto/ed25519/testdata") - ".*\\.gz$")) - #t))))) - (synopsis "PBKDF2 in Go") - (description "This package provides a Go implementation of the PBKDF2 key -derivation function.") - (home-page "https://go.googlesource.com/crypto/") - (license bsd-3)))) - -(define-public go-golang-org-x-crypto-tea - (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") - (revision "1")) - (package - (name "go-golang-org-x-crypto-tea") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/crypto") - (commit commit))) - (file-name (string-append "go.googlesource.com-crypto-" - version "-checkout")) - (sha256 - (base32 - "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/crypto/tea" - #:unpack-path "golang.org/x/crypto" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (string-append (assoc-ref outputs "out") - "/src/golang.org/x/crypto/ed25519/testdata") - ".*\\.gz$")) - #t))))) - (synopsis "Tiny Encryption Algorithm (TEA) in Go") - (description "This packages a Go implementation of the Tiny Encryption -Algorithm (TEA) block cipher.") - (home-page "https://go.googlesource.com/crypto/") - (license bsd-3)))) - -(define-public go-golang-org-x-crypto-salsa20 - (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") - (revision "1")) - (package - (name "go-golang-org-x-crypto-salsa20") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/crypto") - (commit commit))) - (file-name (string-append "go.googlesource.com-crypto-" - version "-checkout")) - (sha256 - (base32 - "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/crypto/salsa20" - #:unpack-path "golang.org/x/crypto" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (string-append (assoc-ref outputs "out") - "/src/golang.org/x/crypto/ed25519/testdata") - ".*\\.gz$")) - #t))))) - (synopsis "Salsa20 in Go") - (description "This packages provides a Go implementation of the Salsa20 -stream cipher.") - (home-page "https://go.googlesource.com/crypto/") - (license bsd-3)))) - -(define-public go-golang-org-x-crypto-cast5 - (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") - (revision "1")) - (package - (name "go-golang-org-x-crypto-cast5") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/crypto") - (commit commit))) - (file-name (string-append "go.googlesource.com-crypto-" - version "-checkout")) - (sha256 - (base32 - "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/crypto/cast5" - #:unpack-path "golang.org/x/crypto" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (string-append (assoc-ref outputs "out") - "/src/golang.org/x/crypto/ed25519/testdata") - ".*\\.gz$")) - #t))))) - (synopsis "Cast5 in Go") - (description "This packages provides a Go implementation of the Cast5 -symmetric-key block cipher.") - (home-page "https://go.googlesource.com/crypto/") - (license bsd-3)))) - -(define-public go-golang-org-x-crypto-twofish - (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") - (revision "1")) - (package - (name "go-golang-org-x-crypto-twofish") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/crypto") - (commit commit))) - (file-name (string-append "go.googlesource.com-crypto-" - version "-checkout")) - (sha256 - (base32 - "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/crypto/twofish" - #:unpack-path "golang.org/x/crypto" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (string-append (assoc-ref outputs "out") - "/src/golang.org/x/crypto/ed25519/testdata") - ".*\\.gz$")) - #t))))) - (synopsis "Twofish in Go") - (description "This packages provides a Go implementation of the Twofish -symmetric-key block cipher.") - (home-page "https://go.googlesource.com/crypto/") - (license bsd-3)))) - -(define-public go-golang-org-x-crypto-xtea - (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") - (revision "1")) - (package - (name "go-golang-org-x-crypto-xtea") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/crypto") - (commit commit))) - (file-name (string-append "go.googlesource.com-crypto-" - version "-checkout")) - (sha256 - (base32 - "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/crypto/xtea" - #:unpack-path "golang.org/x/crypto" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (string-append (assoc-ref outputs "out") - "/src/golang.org/x/crypto/ed25519/testdata") - ".*\\.gz$")) - #t))))) - (synopsis "eXtended Tiny Encryption Algorithm (XTEA) in Go") - (description "This package provides a Go implementation of the eXtended -Tiny Encryption Algorithm (XTEA) block cipher.") - (home-page "https://go.googlesource.com/crypto/") - (license bsd-3)))) - (define* (go-golang-org-x-net-union #:optional (packages (list go-golang-org-x-net-ipv4 go-golang-org-x-net-bpf @@ -1229,195 +934,6 @@ (define* (go-golang-org-x-net-union #:optional (home-page (package-home-page go-golang-org-x-net-ipv4)) (license (package-license go-golang-org-x-net-ipv4)))) -(define-public go-golang-org-x-net-ipv4 - (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") - (revision "1")) - (package - (name "go-golang-org-x-net-ipv4") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/net") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/net/ipv4" - #:unpack-path "golang.org/x/net")) - (synopsis "Go IPv4 support") - (description "This package provides @code{ipv4}, which implements IP-level -socket options for the Internet Protocol version 4.") - (home-page "https://go.googlesource.com/net") - (license bsd-3)))) - -(define-public go-golang-org-x-net-bpf - (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") - (revision "1")) - (package - (name "go-golang-org-x-net-bpf") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/net") - (commit commit))) - (file-name (string-append "go.googlesource.com-net-" - version "-checkout")) - (sha256 - (base32 - "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/net/bpf" - #:unpack-path "golang.org/x/net")) - (synopsis "Berkeley Packet Filters (BPF) in Go") - (description "This packages provides a Go implementation of the Berkeley -Packet Filter (BPF) virtual machine.") - (home-page "https://go.googlesource.com/net/") - (license bsd-3)))) - -(define-public go-golang-org-x-net-context - (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") - (revision "1")) - (package - (name "go-golang-org-x-net-context") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/net") - (commit commit))) - (file-name (string-append "go.googlesource.com-net-" - version "-checkout")) - (sha256 - (base32 - "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/net/context" - #:unpack-path "golang.org/x/net")) - (synopsis "Golang Context type") - (description "This packages provides @code{context}, which defines the -Context type, which carries deadlines, cancelation signals, and other -request-scoped values across API boundaries and between processes.") - (home-page "https://go.googlesource.com/net/") - (license bsd-3)))) - -(define-public go-golang-org-x-net-internal-iana - (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") - (revision "1")) - (package - (name "go-golang-org-x-net-internal-iana") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/net") - (commit commit))) - (file-name (string-append "go.googlesource.com-net-" - version "-checkout")) - (sha256 - (base32 - "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/net/internal/iana" - #:unpack-path "golang.org/x/net")) - (synopsis "Go support for assigned numbers (IANA)") - (description "This packages provides @code{iana}, which provides protocol -number resources managed by the Internet Assigned Numbers Authority (IANA).") - (home-page "https://go.googlesource.com/net/") - (license bsd-3)))) - -(define-public go-golang-org-x-net-ipv6 - (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") - (revision "1")) - (package - (name "go-golang-org-x-net-ipv6") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/net") - (commit commit))) - (file-name (string-append "go.googlesource.com-net-" - version "-checkout")) - (sha256 - (base32 - "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/net/ipv6" - #:unpack-path "golang.org/x/net")) - (synopsis "Go IPv6 support") - (description "This packages provides @code{ipv6}, which implements -IP-level socket options for the Internet Protocol version 6.") - (home-page "https://go.googlesource.com/net") - (license bsd-3)))) - -(define-public go-golang-org-x-net-proxy - (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") - (revision "1")) - (package - (name "go-golang-org-x-net-proxy") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/net") - (commit commit))) - (file-name (string-append "go.googlesource.com-net-" - version "-checkout")) - (sha256 - (base32 - "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/net/proxy" - #:unpack-path "golang.org/x/net/")) - (synopsis "Go support for network proxies") - (description "This packages provides @code{proxy}, which provides support -for a variety of protocols to proxy network data.") - (home-page "https://go.googlesource.com/net") - (license bsd-3)))) - -(define-public go-golang-org-x-sys-unix - (let ((commit "83801418e1b59fb1880e363299581ee543af32ca") - (revision "1")) - (package - (name "go-golang-org-x-sys-unix") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/sys") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ilykaanvnzb27d42kmbr4i37hcn7hgqbx98z945gy63aa8dskji")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/sys/unix" - #:unpack-path "golang.org/x/sys" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-tests - (lambda _ - (pk (getcwd)) - (substitute* "src/golang.org/x/sys/unix/syscall_unix_test.go" - (("/usr/bin") "/tmp")) - #t))))) - (synopsis "Go support for low-level system interaction") - (description "This package provides @code{unix}, which offers Go support -for low-level interaction with the operating system.") - (home-page "https://go.googlesource.com/sys") - (license bsd-3)))) - (define* (go-golang-org-x-text-union #:optional (packages (list go-golang-org-x-text-transform go-golang-org-x-text-unicode-norm))) @@ -1443,60 +959,6 @@ (define* (go-golang-org-x-text-union #:optional (home-page (package-home-page go-golang-org-x-text-transform)) (license (package-license go-golang-org-x-text-transform)))) -(define-public go-golang-org-x-text-transform - (let ((commit "e19ae1496984b1c655b8044a65c0300a3c878dd3") - (revision "1")) - (package - (name "go-golang-org-x-text-transform") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/text") - (commit commit))) - (file-name (string-append "go.googlesource.com-text-" - version "-checkout")) - (sha256 - (base32 - "1cvnnx8nwx5c7gr6ajs7sldhbqh52n7h6fsa3i21l2lhx6xrsh4w")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/text/transform" - #:unpack-path "golang.org/x/text")) - (synopsis "Go text transformation") - (description "This package provides @code{transform}, which provides -reader and writer wrappers that transform the bytes passing through. Example -transformations provided by other packages include normalization and conversion -between character sets.") - (home-page "https://go.googlesource.com/text") - (license bsd-3)))) - -(define-public go-golang-org-x-text-unicode-norm - (let ((commit "e19ae1496984b1c655b8044a65c0300a3c878dd3") - (revision "1")) - (package - (name "go-golang-org-x-text-unicode-norm") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/text") - (commit commit))) - (file-name (string-append "go.googlesource.com-text-" - version "-checkout")) - (sha256 - (base32 - "1cvnnx8nwx5c7gr6ajs7sldhbqh52n7h6fsa3i21l2lhx6xrsh4w")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/text/unicode/norm" - #:unpack-path "golang.org/x/text")) - (synopsis "Unicode normalization in Go") - (description "This package provides @code{norm}, which contains types and -functions for normalizing Unicode strings.") - (home-page "https://go.googlesource.com/text") - (license bsd-3)))) - (define-public go-github-com-audriusbutkevicius-pfilter (let ((commit "9dca34a5b530bfc9843fa8aa2ff08ff9821032cb") (revision "2")) @@ -1572,33 +1034,6 @@ (define-public go-github-com-pkg-errors (home-page "https://github.com/pkg/errors") (license bsd-2)))) -(define-public go-golang-org-x-time-rate - (let ((commit "6dc17368e09b0e8634d71cac8168d853e869a0c7") - (revision "1")) - (package - (name "go-golang-org-x-time-rate") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/time") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1fx4cf5fpdz00g3c7vxzy92hdcg0vh4yqw00qp5s52j72qixynbk")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/time/rate" - #:unpack-path "golang.org/x/time")) - (propagated-inputs - `(("go-golang-org-x-net-context" ,go-golang-org-x-net-context))) - (synopsis "Rate limiting in Go") - (description "This package provides @{rate}, which implements rate -limiting in Go.") - (home-page "https://godoc.org/golang.org/x/time/rate") - (license bsd-3)))) - (define-public go-github-com-petermattis-goid (let ((commit "3db12ebb2a599ba4a96bea1c17b61c2f78a40e02") (revision "0")) -- cgit v1.2.3 From 217b8c2e061a5b637e198f1ed9960d4abe2b0a46 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 16:48:25 +0200 Subject: gnu: perl: Replace with 5.26.2 [fixes CVE-2018-{6797,6798,6913}]. * gnu/packages/perl.scm (perl-5.26.2): New public variable. (perl)[replacement]: New field. --- gnu/packages/perl.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 50273d31e4..34eef565b1 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Raoul J.P. Bonnal -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2017 Adriano Peluso ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Leo Famulari @@ -59,6 +59,7 @@ (define-public perl (package (name "perl") (version "5.26.1") + (replacement perl-5.26.2) (source (origin (method url-fetch) (uri (string-append "mirror://cpan/src/5.0/perl-" @@ -155,6 +156,19 @@ (define-public perl (home-page "http://www.perl.org/") (license gpl1+))) ; or "Artistic" +;; Fixes CVE-2018-6797, CVE-2018-6798, and CVE-2018-6913. +;; See . +(define-public perl-5.26.2 + (package/inherit perl + (version "5.26.2") + (source (origin + (inherit (package-source perl)) + (uri (string-append "mirror://cpan/src/5.0/perl-" + version ".tar.gz")) + (sha256 + (base32 + "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp")))))) + (define-public perl-algorithm-c3 (package (name "perl-algorithm-c3") -- cgit v1.2.3 From af5638b803fb0e9507d53631c91ee5730ad5c9a8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Apr 2018 16:07:52 +0200 Subject: gnu: samba: Update to 4.7.7. * gnu/packages/samba.scm (samba): Update to 4.7.7. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index d84f52ffc5..fda1ad3e5b 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -148,14 +148,14 @@ (define (install dir) (define-public samba (package (name "samba") - (version "4.7.6") + (version "4.7.7") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/samba/stable/" "samba-" version ".tar.gz")) (sha256 (base32 - "0vkxqp3wh7bpn1fd45lznmrpn2ma1fq75yq28vi08rggr07y7v8y")))) + "0c81x2ncnvz3mi6fjj81clm1mh049d3ip3fj031l44qclxpx3yi9")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 74601e456ba0a952f5199ad8c88051fd54a91134 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Apr 2018 16:38:03 +0200 Subject: gnu: Remove unneeded import. * gnu/packages/texinfo.scm: Remove unused (gnu packages linux) import. --- gnu/packages/texinfo.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 30f593d0ad..4acc2b811f 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -26,9 +26,8 @@ (define-module (gnu packages texinfo) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages compression) - #:use-module (gnu packages perl) - #:use-module (gnu packages linux) - #:use-module (gnu packages ncurses)) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages perl)) (define-public texinfo (package -- cgit v1.2.3 From 4bdf6b254f3a7bddd9bb5e54eae36cca3114a72e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Apr 2018 00:30:20 +0200 Subject: gnu: nginx: Update to 1.14.0. * gnu/packages/web.scm (nginx): Update to 1.14.0. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2892702e76..050e1a1229 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -186,14 +186,14 @@ (define-public nginx (name "nginx") ;; Consider updating the nginx-documentation package if the nginx package is ;; updated. - (version "1.13.12") + (version "1.14.0") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "1pl5ii1w2ycxprxk8zdnxlpdd1dia6hyrns7mnqkm3fv5ihgb4pv")))) + "1d9c0avfpbwvzyg53b59ks8shpnrxnbnshcd7ziizflsyv5vw5ax")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("pcre" ,pcre) -- cgit v1.2.3 From fb02f7bb3e76fe4b3dfe3c8685c671bd4572c0c0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 05:19:20 +0200 Subject: gnu: r-callr: Update to 2.0.3. * gnu/packages/cran.scm (r-callr): Update to 2.0.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6ce0ed1424..88ee6614e9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -164,14 +164,14 @@ (define-public r-reprex (define-public r-callr (package (name "r-callr") - (version "2.0.2") + (version "2.0.3") (source (origin (method url-fetch) (uri (cran-uri "callr" version)) (sha256 (base32 - "0m51p39vfwldxv6h8x4y9w3laf8q9bldhfqhlcrlx3xhy3irb1bp")))) + "1k3mflgn10hcvy74y4pbigpv74zb66fz1phfd3c8isqmn88xbxzi")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit v1.2.3 From e81ef082d08acdfeae6fc2d0b78645b3122234e8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 05:19:47 +0200 Subject: gnu: r-ape: Update to 5.1. * gnu/packages/cran.scm (r-ape): Update to 5.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 88ee6614e9..a44cc6e54b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -287,14 +287,14 @@ (define-public r-amap (define-public r-ape (package (name "r-ape") - (version "5.0") + (version "5.1") (source (origin (method url-fetch) (uri (cran-uri "ape" version)) (sha256 (base32 - "0q59pmxawz498cb9mv5m49lhiwxib8ak94yyydz7qg8b6lpd4bn3")))) + "0vm2065993wf4hdqarxqykhfz9aaj0rrb98alhkq4qw1d2kdrmdp")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice) -- cgit v1.2.3 From e7c4ad7d246284582c8b431081f848c5866ae4aa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 05:20:01 +0200 Subject: gnu: r-proxy: Update to 0.4-22. * gnu/packages/cran.scm (r-proxy): Update to 0.4-22. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a44cc6e54b..77248f01d9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -871,14 +871,14 @@ (define-public r-ggally (define-public r-proxy (package (name "r-proxy") - (version "0.4-21") + (version "0.4-22") (source (origin (method url-fetch) (uri (cran-uri "proxy" version)) (sha256 (base32 - "1vih8gsfzv97h5c8ixd1qjnn02i7fzla2p9fdj2wpisqhx0p0xv0")))) + "0l0ff8irmmvic941is290hd5vszyhaj5nfwna4v3w9c1zk5nr1ma")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/proxy") (synopsis "Distance and similarity measures") -- cgit v1.2.3 From 63ec5e661226bef65109ea6cf96074fbb59d3897 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 05:20:46 +0200 Subject: gnu: r-tseries: Update to 0.10-44. * gnu/packages/cran.scm (r-tseries): Update to 0.10-44. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 77248f01d9..0be03a1582 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2799,14 +2799,14 @@ (define-public r-quantmod (define-public r-tseries (package (name "r-tseries") - (version "0.10-43") + (version "0.10-44") (source (origin (method url-fetch) (uri (cran-uri "tseries" version)) (sha256 (base32 - "1yjxhj7l1p2przczl6frggfcr5iwda9lbcsmh0y75gbbbps14yf2")))) + "0nz6v76hsxcprpgf84al5r0p08sr9qacqal4adndz9wmg604l4ag")))) (build-system r-build-system) (propagated-inputs `(("r-quadprog" ,r-quadprog) -- cgit v1.2.3 From 3b7999a79aa1a8849b4771dc5d0afb83abc61bb0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 05:20:59 +0200 Subject: gnu: r-arules: Update to 1.6-1. * gnu/packages/cran.scm (r-arules): Update to 1.6-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0be03a1582..0ac35a909b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3613,14 +3613,14 @@ (define-public r-catdap (define-public r-arules (package (name "r-arules") - (version "1.6-0") + (version "1.6-1") (source (origin (method url-fetch) (uri (cran-uri "arules" version)) (sha256 (base32 - "14gbq5k2zkx4wc7kkfazz313ngij89qp1xmyxfg3nq3v1s84c3sl")))) + "0glfqgxr87900kigmkby2ff7qrjvd6aq595q85y056i5ckjcp615")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) -- cgit v1.2.3 From 433e85e50c91e01e5d391a2a2fddb1fd5c9b5436 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 13:19:54 +0200 Subject: gnu: libgphoto2: Update to 2.5.17. * gnu/packages/photo.scm (libgphoto2): Update to 2.5.17. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index e60af0bd36..f043b2a62a 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -109,14 +109,14 @@ (define-public libexif (define-public libgphoto2 (package (name "libgphoto2") - (version "2.5.16") + (version "2.5.17") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gphoto/libgphoto/" version "/libgphoto2-" version ".tar.bz2")) (sha256 (base32 - "01i95av28d0szyvx6l2gjv039r3205wjwjr91nfimq132rnl2mz7")))) + "0mdmjb8a07g37bb5q69h11sixw0w6y5g3kbii9z97yhklgq68x21")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 5a8cea38307cc2f292f2b62bc3d9c87e3cee1d38 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 13:27:12 +0200 Subject: gnu: gphoto2: Update to 2.5.17. * gnu/packages/photo.scm (gphoto2): Update to 2.5.17. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index f043b2a62a..437acd305d 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -140,14 +140,14 @@ (define-public libgphoto2 (define-public gphoto2 (package (name "gphoto2") - (version "2.5.15") + (version "2.5.17") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gphoto/gphoto/" version "/gphoto2-" version ".tar.bz2")) (sha256 (base32 - "0xsa12k5fz49v8y4h3zahzr427a3ylxaf0k7hybrkp43g4i1lmxf")))) + "0kslwclyyzvnxjw3gdzhlagj7l5f8lba833ipr9s0s0c4hwi0mxa")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From cbb10936f52e667cf7ccb7963fbd245100b25d75 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 20:27:05 +0200 Subject: gnu: python-pretend: Update to 1.0.9. * gnu/packages/python.scm (python-pretend): Update to 1.0.9. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e5b74a57f7..fe66d8d082 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6253,7 +6253,7 @@ (define-public python2-idna (define-public python-pretend (package (name "python-pretend") - (version "1.0.8") + (version "1.0.9") (source (origin (method url-fetch) @@ -6261,7 +6261,7 @@ (define-public python-pretend "pretend/pretend-" version ".tar.gz")) (sha256 (base32 - "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk")))) + "040vm94lcbscg5p81g1icmwwwa2jm7wrd1ybmxnv1sz8rl8bh3n9")))) (build-system python-build-system) (home-page "https://github.com/alex/pretend") (synopsis "Library for stubbing in Python") -- cgit v1.2.3 From 9d39c300cf6e0d8d6bf20b26ce00a4bab5e9d04c Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 7 Apr 2018 00:11:39 -0400 Subject: gnu: nestopia-ue: Update to 1.48. * gnu/packages/emulators.scm (nestopia-ue): Update to 1.48. [source]: Simplify snippet; 3rd-party zlib is no longer bundled. [build-system]: Switch to cmake-build-system. [inputs]: Remove glu and mesa. Add libepoxy. [arguments]: Remove #:make-flags. Re-enable 'configure' phase. Remove 'remove-xdg-desktop-menu-call' and 'remove-gdkwayland-include' phases. Add 'wrap-program' phase. --- gnu/packages/emulators.scm | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 232e14b47a..79947059bd 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -993,7 +993,7 @@ (define-public mupen64plus-ui-console (define-public nestopia-ue (package (name "nestopia-ue") - (version "1.47") + (version "1.48") (source (origin (method url-fetch) (uri (string-append @@ -1002,42 +1002,34 @@ (define-public nestopia-ue (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1dzrrjmvyqks64q5l5pfly80jb6qcsbj5b3dm40fijd5xnpbapci")) + "184y05z4k4a4m4022niy625kan0rklh8gcxyynxli1fss2sjjrpv")) (modules '((guix build utils))) (snippet '(begin ;; We don't need libretro for the GNU/Linux build. - (delete-file-recursively "libretro") - ;; Use system zlib. - (delete-file-recursively "source/zlib") - (substitute* "source/core/NstZlib.cpp" - (("#include \"../zlib/zlib.h\"") "#include ")))))) - (build-system gnu-build-system) + (delete-file-recursively "libretro"))))) + (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("ao" ,ao) - ("glu" ,glu) ("gtk+" ,gtk+) ("libarchive" ,libarchive) - ("mesa" ,mesa) + ("libepoxy" ,libepoxy) ("sdl2" ,sdl2) ("zlib" ,zlib))) (arguments '(#:phases (modify-phases %standard-phases - ;; The Nestopia build system consists solely of a Makefile. - (delete 'configure) - (add-before 'build 'remove-xdg-desktop-menu-call - (lambda _ - (substitute* "Makefile" - (("xdg-desktop-menu install .*") "")))) - (add-before 'build 'remove-gdkwayland-include - (lambda _ - (substitute* "source/unix/gtkui/gtkui.h" - (("#include ") ""))))) - #:make-flags (let ((out (assoc-ref %outputs "out"))) - (list "CC=gcc" "CXX=g++" (string-append "PREFIX=" out))) + ;; This fixes the file chooser crash that happens with GTK 3. + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (nestopia (string-append out "/bin/nestopia")) + (gtk (assoc-ref inputs "gtk+")) + (gtk-share (string-append gtk "/share"))) + (wrap-program nestopia + `("XDG_DATA_DIRS" ":" prefix (,gtk-share))))))) ;; There are no tests. #:tests? #f)) (home-page "http://0ldsk00l.ca/nestopia/") -- cgit v1.2.3 From 94b22905ab4ebc8de4c42082df51de96bb824dd7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Apr 2018 09:40:06 +0300 Subject: gnu: rust: Skip test_loading_cosine test. * gnu/packages/rust.scm (rust-1.19.0)[arguments]: Modify custom 'patch-tests phase to skip test_loading_cosine test. (rust-1.24.0)[arguments]: Modify inherited 'patch-tests to point to updated code locations. --- gnu/packages/rust.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 9ba2c42c68..0a9d5bb382 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -192,6 +192,10 @@ (define-public rust-1.19 ;; Our ld-wrapper cannot process non-UTF8 bytes in LIBRARY_PATH. ;; (delete-file-recursively "src/test/run-make/linker-output-non-utf8") + (substitute* "src/librustc_back/dynamic_lib.rs" + ;; This test is known to fail on aarch64 and powerpc64le: + ;; https://github.com/rust-lang/rust/issues/45410 + (("fn test_loading_cosine") "#[ignore]\nfn test_loading_cosine")) #t))) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda* _ @@ -468,6 +472,31 @@ (define-public rust-1.24 (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) `(modify-phases ,phases + (replace 'patch-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((bash (assoc-ref inputs "bash"))) + (substitute* "src/libstd/process.rs" + ;; The newline is intentional. + ;; There's a line length "tidy" check in Rust which would + ;; fail otherwise. + (("\"/bin/sh\"") (string-append "\n\"" bash "/bin/sh\""))) + (substitute* "src/libstd/net/tcp.rs" + ;; There is no network in build environment + (("fn connect_timeout_unroutable") + "#[ignore]\nfn connect_timeout_unroutable")) + ;; + (substitute* "src/libstd/sys/unix/process/process_common.rs" + (("fn test_process_mask") "#[allow(unused_attributes)] + #[ignore] + fn test_process_mask")) + ;; Our ld-wrapper cannot process non-UTF8 bytes in LIBRARY_PATH. + ;; + (delete-file-recursively "src/test/run-make/linker-output-non-utf8") + (substitute* "src/librustc_metadata/dynamic_lib.rs" + ;; This test is known to fail on aarch64 and powerpc64le: + ;; https://github.com/rust-lang/rust/issues/45410 + (("fn test_loading_cosine") "#[ignore]\nfn test_loading_cosine")) + #t))) (delete 'fix-mtime-bug)))))))) (define-public rust -- cgit v1.2.3 From e45f399bf94b07faa7def233ec4da7f4826fc31f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 18 Apr 2018 10:56:50 -0400 Subject: gnu: qemu: Fix CVE-2018-7550. * gnu/packages/patches/qemu-CVE-2018-7550.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/virtualization.scm (qemu)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/patches/qemu-CVE-2018-7550.patch | 66 +++++++++++++++++++++++++++ gnu/packages/virtualization.scm | 1 + 3 files changed, 68 insertions(+) create mode 100644 gnu/packages/patches/qemu-CVE-2018-7550.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 639dd943d6..056a46cb79 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1061,6 +1061,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-waitress-fix-tests.patch \ + %D%/packages/patches/qemu-CVE-2018-7550.patch \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ diff --git a/gnu/packages/patches/qemu-CVE-2018-7550.patch b/gnu/packages/patches/qemu-CVE-2018-7550.patch new file mode 100644 index 0000000000..43f111e206 --- /dev/null +++ b/gnu/packages/patches/qemu-CVE-2018-7550.patch @@ -0,0 +1,66 @@ +Fix CVE-2018-7550: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7550 + +Patch copied from upstream source repository: + +https://git.qemu.org/?p=qemu.git;a=patch;h=2a8fcd119eb7c6bb3837fc3669eb1b2dfb31daf8 + +From 2a8fcd119eb7c6bb3837fc3669eb1b2dfb31daf8 Mon Sep 17 00:00:00 2001 +From: Jack Schwartz +Date: Thu, 21 Dec 2017 09:25:15 -0800 +Subject: [PATCH] multiboot: bss_end_addr can be zero + +The multiboot spec (https://www.gnu.org/software/grub/manual/multiboot/), +section 3.1.3, allows for bss_end_addr to be zero. + +A zero bss_end_addr signifies there is no .bss section. + +Suggested-by: Daniel Kiper +Signed-off-by: Jack Schwartz +Reviewed-by: Daniel Kiper +Reviewed-by: Prasad J Pandit +Signed-off-by: Kevin Wolf +--- + hw/i386/multiboot.c | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c +index 46d9c68bf5..bb8d8e4629 100644 +--- a/hw/i386/multiboot.c ++++ b/hw/i386/multiboot.c +@@ -233,12 +233,6 @@ int load_multiboot(FWCfgState *fw_cfg, + mh_entry_addr = ldl_p(header+i+28); + + if (mh_load_end_addr) { +- if (mh_bss_end_addr < mh_load_addr) { +- fprintf(stderr, "invalid mh_bss_end_addr address\n"); +- exit(1); +- } +- mb_kernel_size = mh_bss_end_addr - mh_load_addr; +- + if (mh_load_end_addr < mh_load_addr) { + fprintf(stderr, "invalid mh_load_end_addr address\n"); + exit(1); +@@ -249,8 +243,16 @@ int load_multiboot(FWCfgState *fw_cfg, + fprintf(stderr, "invalid kernel_file_size\n"); + exit(1); + } +- mb_kernel_size = kernel_file_size - mb_kernel_text_offset; +- mb_load_size = mb_kernel_size; ++ mb_load_size = kernel_file_size - mb_kernel_text_offset; ++ } ++ if (mh_bss_end_addr) { ++ if (mh_bss_end_addr < (mh_load_addr + mb_load_size)) { ++ fprintf(stderr, "invalid mh_bss_end_addr address\n"); ++ exit(1); ++ } ++ mb_kernel_size = mh_bss_end_addr - mh_load_addr; ++ } else { ++ mb_kernel_size = mb_load_size; + } + + /* Valid if mh_flags sets MULTIBOOT_HEADER_HAS_VBE. +-- +2.17.0 + diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 44a4ed2920..55ace5a56d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -88,6 +88,7 @@ (define-public qemu (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) + (patches (search-patches "qemu-CVE-2018-7550.patch")) (sha256 (base32 "11l6cs6mib16rgdrnqrhkqs033fjik316gkgfz3asbmxz38lalca")))) -- cgit v1.2.3 From 6e2729a3fb94f4a211468a0fec93e5da4595c7e2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 18 Apr 2018 12:27:33 -0400 Subject: gnu: lynx: Update to 2.8.9dev.17. * gnu/packages/web-browsers.scm (lynx): Update to 2.8.9dev.17. --- gnu/packages/web-browsers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 6c929d326d..a5ecd0b546 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -130,7 +130,7 @@ (define-public links (define-public lynx (package (name "lynx") - (version "2.8.9dev.16") + (version "2.8.9dev.17") (source (origin (method url-fetch) (uri (string-append @@ -138,7 +138,7 @@ (define-public lynx "/lynx" version ".tar.bz2")) (sha256 (base32 - "1j0vx871ghkm7fgrafnvd2ml3ywcl8d3gyhq02fhfb851c88lc84")))) + "1lvfsnrw5mmwrmn1m76q9mx287xwm3h5lg8sv7bcqilc0ywi2f54")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("perl" ,perl))) -- cgit v1.2.3 From cf10095c172b989953459ddafd12f57caf07e56e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 18 Apr 2018 16:57:54 -0400 Subject: gnu: mutt: Update to 1.9.5. * gnu/packages/mail.scm (mutt): Update to 1.9.5. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index ea367bcc33..77e4a1d800 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -257,14 +257,14 @@ (define-public fetchmail (define-public mutt (package (name "mutt") - (version "1.9.4") + (version "1.9.5") (source (origin (method url-fetch) (uri (string-append "https://bitbucket.org/mutt/mutt/downloads/" "mutt-" version ".tar.gz")) (sha256 (base32 - "1pxmw5yyizb9bqbai6lihv6zxmw0znjfb60zaldwh6hc6lkbzlgl")) + "0lsp72lm3cw490x7lhzia7h8f591bab2mr7qpscaj22fmrj7wqdz")) (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 5e3010a2ac651397e0cb69239a7d7aa3c0a5703e Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Wed, 18 Apr 2018 23:00:41 +0200 Subject: gnu: Add guile-curl. * gnu/packages/curl.scm (guile-curl): New variable. --- gnu/packages/curl.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index fbf177d9da..216d47cb71 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Roel Janssen ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +37,7 @@ (define-module (gnu packages curl) #:use-module (gnu packages golang) #:use-module (gnu packages groff) #:use-module (gnu packages gsasl) + #:use-module (gnu packages guile) #:use-module (gnu packages libidn) #:use-module (gnu packages openldap) #:use-module (gnu packages perl) @@ -193,3 +195,52 @@ (define-public kurly not offer a replacement for libcurl.") (home-page "https://github.com/davidjpeacock/kurly") (license license:asl2.0))) + +(define-public guile-curl + (package + (name "guile-curl") + (version "0.5") + (source (origin + (method url-fetch) + (uri (string-append + "http://www.lonelycactus.com/tarball/guile-curl-" + version ".tar.gz")) + (sha256 + (base32 + "1846rxgc0ylh8768lr79irc7nwjichzb7qb7lzs2k42m0i53sc46")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags (list (string-append + "--with-guilesitedir=" + (assoc-ref %outputs "out") + "/share/guile/site/2.2") + (string-append + "-with-guileextensiondir=" + (assoc-ref %outputs "out") + "/lib/guile/2.2/extensions")) + #:phases + (modify-phases %standard-phases + (add-after 'install 'patch-extension-path + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (curl.scm (string-append + out "/share/guile/site/2.2/curl.scm")) + (curl.go (string-append + out "/lib/guile/2.2/site-ccache/curl.go")) + (ext (string-append out "/lib/guile/2.2/" + "extensions/libguile-curl"))) + (substitute* curl.scm (("libguile-curl") ext)) + ;; The build system does not actually compile the Scheme module. + ;; So we can compile it and put it in the right place in one go. + (system* "guild" "compile" curl.scm "-o" curl.go)) + #t))))) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("curl" ,curl) + ("guile" ,guile-2.2))) + (home-page "http://www.lonelycactus.com/guile-curl.html") + (synopsis "Curl bindings for Guile") + (description "@code{guile-curl} is a project that has procedures that allow +Guile to do client-side URL transfers, like requesting documents from HTTP or +FTP servers. It is based on the curl library.") + (license license:gpl3+))) -- cgit v1.2.3 From 4a146957e7c43037da0c7ec76a6477257a564f35 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 18 Apr 2018 17:13:15 -0400 Subject: gnu: mpg123: Update to 1.25.10. * gnu/packages/mp3.scm (mpg123): Update to 1.25.10. --- gnu/packages/mp3.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 49313123c5..48bf33235f 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -301,7 +301,7 @@ (define-public mp3splt (define-public mpg123 (package (name "mpg123") - (version "1.25.8") + (version "1.25.10") (source (origin (method url-fetch) (uri (list (string-append "mirror://sourceforge/mpg123/mpg123/" @@ -311,7 +311,7 @@ (define-public mpg123 version ".tar.bz2"))) (sha256 (base32 - "16s9z1xc5kv1p90g42vsr9m4gq3dwjsmrj873x4i8601mvpm3nkr")))) + "08vhp8lz7d9ybhxcmkq3adwfryhivfvp0745k4r9kgz4wap3f4vc")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-default-audio=pulse"))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 16a8cb9b43e5ae827522b7571d1eeb3f1d906333 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 18 Apr 2018 17:15:41 -0400 Subject: gnu: blender: Update to 2.79b. * gnu/packages/graphics.scm (blender): Update to 2.79b. --- gnu/packages/graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index d2f1b3b0b8..fe717d0c20 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -79,14 +79,14 @@ (define-module (gnu packages graphics) (define-public blender (package (name "blender") - (version "2.79") + (version "2.79b") (source (origin (method url-fetch) (uri (string-append "https://download.blender.org/source/" "blender-" version ".tar.gz")) (sha256 (base32 - "16f84mdzkmwjmqahjj64kbyk4kagdj4mcr8qjazs1952d7kh7pm9")))) + "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c")))) (build-system cmake-build-system) (arguments (let ((python-version (version-major+minor (package-version python)))) -- cgit v1.2.3 From 30cf7070887014d337af6012816f3580e63f4504 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 9 Apr 2018 22:55:33 +0200 Subject: gnu: Add emacs-zoutline. * gnu/packages/emacs.scm (emacs-zoutline): New variable. --- gnu/packages/emacs.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ba75b295a6..79f5dac7c1 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2016, 2017, 2018 Arun Isaac ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2017 Mathieu Othacehe -;;; Copyright © 2017 Clément Lassieur +;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017, 2018 Kyle Meyer ;;; Copyright © 2017 Kei Kebreau @@ -3539,6 +3539,27 @@ (define-public emacs-iedit a temporary @code{keep-lines} or @code{occur}.") (license license:gpl3+))) +(define-public emacs-zoutline + (let ((commit "b3ee0f0e0b916838c2d2c249beba74ffdb8d5699") + (revision "0")) + (package + (name "emacs-zoutline") + (version (git-version "0.1" revision commit)) + (home-page "https://github.com/abo-abo/zoutline") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit commit))) + (sha256 + (base32 + "0sd0017piw0dis6dhpq5dkqd3acisxqgipl7dj8gmc1vnswhdwr8")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (synopsis "Simple outline library") + (description + "This library provides helpers for outlines. Outlines allow users to +navigate code in a tree-like fashion.") + (license license:gpl3+)))) + (define-public emacs-lispy (package (name "emacs-lispy") -- cgit v1.2.3 From e8360eb8ea015cf35ae67d8071e38d7f9276667f Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 9 Apr 2018 21:31:25 +0200 Subject: gnu: emacs-lispy: Change source to recent Git commit. * gnu/packages/emacs.scm (emacs-lispy): Wrap with let, and change source to the Git repository. [propagated-inputs]: Add emacs-zoutline. --- gnu/packages/emacs.scm | 51 ++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 79f5dac7c1..dde9589a58 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3561,34 +3561,37 @@ (define-public emacs-zoutline (license license:gpl3+)))) (define-public emacs-lispy - (package - (name "emacs-lispy") - (version "0.26.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/abo-abo/lispy/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "15gig95cvamw5zlw99cxggd27c18b9scznjj97gvjn2zbljcaqzl")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-ace-window" ,emacs-ace-window) - ("emacs-iedit" ,emacs-iedit) - ("emacs-ivy" ,emacs-ivy) - ("emacs-hydra" ,emacs-hydra))) - (home-page "https://github.com/abo-abo/lispy") - (synopsis "Modal S-expression editing") - (description - "Due to the structure of Lisp syntax it's very rare for the programmer to -want to insert characters right before \"(\" or right after \")\". Thus + ;; Release 0.26.0 was almost 3 years ago, and there have been ~772 commits + ;; since. + (let ((commit "a7e1cf742e72199cc75aa5e1e686991ba4a23bc4") + (revision "0")) + (package + (name "emacs-lispy") + (version (git-version "0.26.0" revision commit)) + (home-page "https://github.com/abo-abo/lispy") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit commit))) + (sha256 + (base32 + "0qg85gz5akayvhb5fmn1qx7s9847gry4g20xcnq8llr839lq28dl")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-ace-window" ,emacs-ace-window) + ("emacs-iedit" ,emacs-iedit) + ("emacs-ivy" ,emacs-ivy) + ("emacs-hydra" ,emacs-hydra) + ("emacs-zoutline" ,emacs-zoutline))) + (synopsis "Modal S-expression editing") + (description + "Due to the structure of Lisp syntax it's very rare for the programmer +to want to insert characters right before \"(\" or right after \")\". Thus unprefixed printable characters can be used to call commands when the point is at one of these special locations. Lispy provides unprefixed keybindings for S-expression editing when point is at the beginning or end of an S-expression.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-clojure-mode (package -- cgit v1.2.3 From 28ca6b35d9b5ed89c4ec65f50b80e3b320e4354d Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 9 Apr 2018 22:03:30 +0200 Subject: gnu: Add emacs-lispyville. * gnu/packages/emacs.scm (emacs-lispyville): New variable. --- gnu/packages/emacs.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index dde9589a58..a26fbd122f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3593,6 +3593,35 @@ (define-public emacs-lispy S-expression.") (license license:gpl3+)))) +(define-public emacs-lispyville + ;; Later versions need a more recent Evil, with an evil-define-key* + ;; supporting nil for the state. + (let ((commit "b4291857ed6a49a67c4ea77522889ce51fb171ab") + (revision "0")) + (package + (name "emacs-lispyville") + (version (git-version "0.1" revision commit)) + (home-page "https://github.com/noctuid/lispyville") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit commit))) + (sha256 + (base32 + "095zibzc3naknahdrnb59g9rbljy8wz9rkc7rf8avb3wxlwvxhm3")) + (file-name (git-file-name name version)))) + (propagated-inputs + `(("emacs-evil" ,emacs-evil) + ("emacs-lispy" ,emacs-lispy))) + (build-system emacs-build-system) + (synopsis "Minor mode for integrating Evil with lispy") + (description + "LispyVille's main purpose is to provide a Lisp editing environment +suited towards Evil users. It can serve as a minimal layer on top of lispy +for better integration with Evil, but it does not require the use of lispy’s +keybinding style. The provided commands allow for editing Lisp in normal +state and will work even without lispy being enabled.") + (license license:gpl3+)))) + (define-public emacs-clojure-mode (package (name "emacs-clojure-mode") -- cgit v1.2.3 From 67a51b675538065a4ec3eb06428d8a4021fdbb87 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 19 Apr 2018 00:04:41 +0200 Subject: gnu: mcron: Update to 1.1.1. Fixes . Reported by George myglc2 Clemmer . * gnu/packages/guile.scm (mcron): Update to 1.1.1. [arguments]: Change timezone in 'set-timezone' phase. Remove 'disable-schedule-test' and 'wrap-programs' phases. Add 'adjust-tests' phase. * gnu/tests/base.scm (%mcron-os): Change JOB1 to use the 'next-seconds' form. --- gnu/packages/guile.scm | 48 +++++++++++++++++++++++------------------------- gnu/tests/base.scm | 9 +++++---- 2 files changed, 28 insertions(+), 29 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 03a551a1f2..b954988712 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -661,48 +661,46 @@ (define-public guile-ncurses/gpm (define-public mcron (package (name "mcron") - (version "1.1") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mcron/mcron-" version ".tar.gz")) (sha256 (base32 - "1f547sqqfbp0k02sqk4ivwx8y9mx8l0rrx1c9rrj033av073h6xq")))) + "1i9mcp6r6my61zfiydsm3n6my41mwvl7dfala4q29qx0zn1ynlm4")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (add-before 'check 'set-timezone (lambda* (#:key inputs #:allow-other-keys) - ;; 'tests/schedule.sh' expects to be running in UTC+1. + ;; 'tests/job-specifier.scm' expects to be running in + ;; UTC-2 or something. + ;; FIXME: This issue is being investigated upstream, for + ;; now we'll just skip the tests (see below): + ;; . (let ((tzdata (assoc-ref inputs "tzdata"))) (setenv "TZDIR" (string-append tzdata "/share/zoneinfo")) - (setenv "TZ" "UTC+1") + (setenv "TZ" "UTC-2") #t))) - (add-before 'check 'disable-schedule-test + (add-before 'check 'adjust-tests (lambda _ - ;; But! As it turns out, that test additionally relies - ;; on non-deterministic behavior; see - ;; . - (substitute* "tests/schedule.sh" - (("mkdir cron") "exit 77\n")) - #t)) - (add-after 'install 'wrap-programs - (lambda* (#:key outputs #:allow-other-keys) - ;; By default mcron doesn't have its own modules in the - ;; search path, so the 'mcron' command fails to start. - (let* ((output (assoc-ref outputs "out")) - (modules (string-append output - "/share/guile/site/2.2")) - (go (string-append output - "/lib/guile/2.2/site-ccache"))) - (wrap-program (string-append output "/bin/mcron") - `("GUILE_LOAD_PATH" ":" prefix - (,modules)) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,go))) - #t)))))) + (substitute* "tests/job-specifier.scm" + ;; (getpw) fails with "entry not found" in the build + ;; environment, so pass an argument. + (("\\(getpw\\)") + "(getpwnam (getuid))") + ;; The build environment lacks an entry for root in + ;; /etc/passwd. + (("\\(getpw 0\\)") + "(getpwnam \"nobody\")") + + ;; FIXME: Skip the 4 faulty tests (see above). + (("\\(test-equal \"next-year\"" all) + (string-append "(test-skip 4)\n" all))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("tzdata" ,tzdata-for-tests))) (inputs `(("ed" ,ed) ("which" ,which) ("guile" ,guile-2.2))) diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 63d2789cc5..3faeddef6c 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -478,11 +478,12 @@ (define %test-halt (define %mcron-os ;; System with an mcron service, with one mcron job for "root" and one mcron ;; job for an unprivileged user. - (let ((job1 #~(job next-second-from + (let ((job1 #~(job '(next-second '(0 5 10 15 20 25 30 35 40 45 50 55)) (lambda () - (call-with-output-file "witness" - (lambda (port) - (display (list (getuid) (getgid)) port)))))) + (unless (file-exists? "witness") + (call-with-output-file "witness" + (lambda (port) + (display (list (getuid) (getgid)) port))))))) (job2 #~(job next-second-from (lambda () (call-with-output-file "witness" -- cgit v1.2.3 From 3ebf2c2947e60353cc63eb3d5cb8d1fa015b6332 Mon Sep 17 00:00:00 2001 From: Rouby Pierre-Antoine Date: Thu, 12 Apr 2018 10:43:10 +0200 Subject: gnu: Add launchmon. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (launchmon): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/admin.scm | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index aed997e5bc..c88f44a3f5 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2017 Christopher Allan Webber ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2018 Pierre-Antoine Rouby ;;; ;;; This file is part of GNU Guix. ;;; @@ -90,7 +91,10 @@ (define-module (gnu packages admin) #:use-module (gnu packages gnome) #:use-module (gnu packages kerberos) #:use-module (gnu packages gtk) - #:use-module (gnu packages xml)) + #:use-module (gnu packages xml) + #:use-module (gnu packages boost) + #:use-module (gnu packages elf) + #:use-module (gnu packages mpi)) (define-public aide (package @@ -2533,3 +2537,33 @@ (define-public hungrycat late.") (home-page "https://jwilk.net/software/hungrycat") (license license:expat))) + +(define-public launchmon + (package + (name "launchmon") + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/LLNL/LaunchMON/releases/download/v" + version "/" name "-v" version ".tar.gz")) + (sha256 + (base32 + "0fm3nd9mydm9v2bf7bh01dbgrfnpwkapxa3dsvy3x1z0rz61qc0x")))) + (build-system gnu-build-system) + (inputs + `(("mpi" ,openmpi) + ("munge" ,munge) + ("boost" ,boost) + ("libelf" ,libelf) + ("libgcrypt" ,libgcrypt) + ("libgpg-error" ,libgpg-error))) + (synopsis "Infrastructue for large scale tool daemon launching") + (description + "LaunchMON is a software infrastructure that enables HPC run-time +tools to co-locate tool daemons with a parallel job. Its API allows a +tool to identify all the remote processes of a job and to scalably +launch daemons into the relevant nodes.") + (home-page "https://github.com/LLNL/LaunchMON") + (supported-systems '("i686-linux" "x86_64-linux")) + (license license:lgpl2.1))) -- cgit v1.2.3 From 541dac8aee0834668e9b305fc526d41530e8bd58 Mon Sep 17 00:00:00 2001 From: Rouby Pierre-Antoine Date: Thu, 12 Apr 2018 10:43:11 +0200 Subject: gnu: Add spindle. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (spindle): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/admin.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c88f44a3f5..5b47d5faec 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2567,3 +2567,33 @@ (define-public launchmon (home-page "https://github.com/LLNL/LaunchMON") (supported-systems '("i686-linux" "x86_64-linux")) (license license:lgpl2.1))) + +(define-public spindle + (package + (name "spindle") + (version "0.10") + (source (origin + ;; We use git checkout to avoid github auto-generated tarballs + (method git-fetch) + (uri (git-reference + (url "https://github.com/hpc/Spindle.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15n3ay0qq81r5v7fif61q1vdjcq44pp2nynkh3fvbzc9fj3c39wd")))) + (build-system gnu-build-system) + (arguments '(#:configure-flags '("--enable-sec-launchmon" + "--enable-sec-munge" + "--enable-sec-none"))) + (inputs + `(("mpi" ,openmpi) + ("munge" ,munge) + ("launchmon" ,launchmon) + ("libgcrypt" ,libgcrypt))) + (synopsis "Scalable library loading in HPC environments") + (description + "Spindle is a tool for improving the performance of dynamic library and +Python loading in HPC environments.") + (home-page "https://github.com/hpc/Spindle") + (license license:lgpl2.1))) -- cgit v1.2.3 From 0818c01aefbaa7ecce5e310ec5f70886850a7f9c Mon Sep 17 00:00:00 2001 From: Diego Nicola Barbato Date: Fri, 6 Apr 2018 13:43:54 +0200 Subject: gnu: libfive: Add snippet, enable tests and remove obsolete phase. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (libfive)[source]: Add snippet to remove bundled catch. [arguments]: Remove #:tests?. Add #:test-target. Remove phase 'add-eigen-to-search-path'. Signed-off-by: Ludovic Courtès --- gnu/packages/engineering.scm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 1113cafec8..2f4e8cef52 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -580,24 +580,19 @@ (define-public libfive (sha256 (base32 "1r40kyx30wz31cwwlfvfh7fgqkxq3n8dxhswpi9qpf4r5h3l8wsn")) - (file-name (git-file-name name version)))) + (file-name (git-file-name name version)) + (snippet + ;; Remove bundled catch since we provide our own. + '(delete-file "libfive/test/catch.hpp")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; no "test" target + `(#:test-target "libfive-test" #:phases (modify-phases %standard-phases (add-after 'unpack 'remove-native-compilation (lambda _ (substitute* "CMakeLists.txt" (("-march=native") "")) - #t)) - (add-before 'build 'add-eigen-to-search-path - (lambda* (#:key inputs #:allow-other-keys) - ;; Allow things to find our own Eigen and Catch. - (let ((eigen (assoc-ref inputs "eigen"))) - (setenv "CPLUS_INCLUDE_PATH" - (string-append eigen "/include/eigen3:" - (getenv "CPLUS_INCLUDE_PATH"))) - #t)))))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 7234fbcb25f7d14354a5f6a91283c00dee31aaa5 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 10 Apr 2018 21:00:08 +0530 Subject: gnu: Add perl-file-readbackwards. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/perl.scm (perl-file-readbackwards): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/perl.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 34eef565b1..0d81a58e26 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Christopher Allan Webber ;;; Copyright © 2018 Oleg Pykhalov +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -3515,6 +3516,33 @@ (define-public perl-file-list matching a regular expression.") (home-page "http://search.cpan.org/~dopacki/File-List//"))) +(define-public perl-file-readbackwards + (package + (name "perl-file-readbackwards") + (version "1.05") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/U/UR/URI/File-ReadBackwards-" + version + ".tar.gz")) + (sha256 + (base32 + "0vldy5q0zyf1cwzwb1gv14f8vg2f21bw96b8wvkw6z2hhypn3cl2")))) + (build-system perl-build-system) + (home-page "http://search.cpan.org/dist/File-ReadBackwards/") + (synopsis "Read a file backwards by lines") + (description "This module reads a file backwards line by line. It is +simple to use, memory efficient and fast. It supports both an object and a +tied handle interface. + +It is intended for processing log and other similar text files which typically +have their newest entries appended to them. By default files are assumed to +be plain text and have a line ending appropriate to the OS. But you can set +the input record separator string on a per file basis.") + (license perl-license))) + (define-public perl-file-remove (package (name "perl-file-remove") -- cgit v1.2.3 From e118a013c8949c592df187b84216fda8cbab9d4f Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 10 Apr 2018 21:01:09 +0530 Subject: gnu: Add perl-io-all. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/perl.scm (perl-io-all): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/perl.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 0d81a58e26..aaf3e2e825 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -46,6 +46,7 @@ (define-module (gnu packages perl) #:use-module (guix build-system perl) #:use-module (gnu packages base) #:use-module (gnu packages compression) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages perl-check) #:use-module (gnu packages perl-web) #:use-module (gnu packages pkg-config)) @@ -4098,6 +4099,32 @@ (define-public perl-inline-c It also goes a bit into Perl C internals.") (license (package-license perl)))) +(define-public perl-io-all + (package + (name "perl-io-all") + (version "0.87") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/F/FR/FREW/IO-All-" + version + ".tar.gz")) + (sha256 + (base32 + "0nsd9knlbd7if2v6zwj4q978axq0w5hk8ymp61z14a821hjivqjl")))) + (build-system perl-build-system) + (propagated-inputs + `(("perl-file-mimeinfo" ,perl-file-mimeinfo) + ("perl-file-readbackwards" ,perl-file-readbackwards))) + (home-page "http://search.cpan.org/dist/IO-All/") + (synopsis "@code{IO::All} to Larry Wall!") + (description "@code{IO::All} combines all of the best Perl IO modules into +a single nifty object oriented interface to greatly simplify your everyday +Perl IO idioms. It exports a single function called io, which returns a new +@code{IO::All} object. And that object can do it all!") + (license perl-license))) + (define-public perl-io-captureoutput (package (name "perl-io-captureoutput") -- cgit v1.2.3 From 9a3fb60ca30246456b2f9a4d9406ef416dfb55f9 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 10 Apr 2018 21:01:44 +0530 Subject: gnu: Add perl-test-runvalgrind MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/perl-check.scm (perl-test-runvalgrind): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/perl-check.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 1fd725f654..832efc2b78 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Oleg Pykhalov +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ (define-module (gnu packages perl-check) #:use-module (guix licenses) #:use-module (gnu packages) + #:use-module (gnu packages valgrind) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system perl) @@ -1001,6 +1003,33 @@ (define-public perl-test-roo (description "Test::Roo provides composable, reusable tests with roles.") (license asl2.0))) +(define-public perl-test-runvalgrind + (package + (name "perl-test-runvalgrind") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-RunValgrind-" + version + ".tar.gz")) + (sha256 + (base32 + "0cfndkn2k9pcx290wcblwmrwh1ybs0grxjlsrp8fbqqbmmjpb53h")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) + (propagated-inputs + `(("perl-path-tiny" ,perl-path-tiny) + ("perl-test-trap" ,perl-test-trap) + ("valgrind" ,valgrind))) + (home-page "http://search.cpan.org/dist/Test-RunValgrind/") + (synopsis "Tests that an external program is valgrind-clean") + (description "Test::RunValgind checks weather Valgrind does not detect +errors (such as memory leaks) in an arbitrary binary executable.") + (license x11))) + (define-public perl-test-script (package (name "perl-test-script") -- cgit v1.2.3 From b164233851df8961cd112d65900c6afb08e88a8c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 9 Apr 2018 23:01:04 +0530 Subject: gnu: Add fortune-mod. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (fortune-mod): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/games.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b7eda0fdc4..f34beae3df 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -112,6 +112,7 @@ (define-module (gnu packages games) #: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) @@ -4852,3 +4853,56 @@ (define-public gzdoom (license:non-copyleft ; modified dumb "file://dumb/licence.txt" "Dumb license, explicitly GPL compatible."))))) + +(define-public fortune-mod + (package + (name "fortune-mod") + (version "2.4.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/shlomif/fortune-mod/" + "archive/" name "-" version ".tar.gz")) + (sha256 + (base32 + "1hnqpkassh7fwg2jgvybr8mw7vzfikbrhb5r22367ilfwxnl9yd2")))) + (build-system cmake-build-system) + (arguments + `(#:test-target "check" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-build-env + (lambda* (#:key inputs #:allow-other-keys) + (use-modules (guix build utils)) + (let* ((cmake-rules (assoc-ref inputs "cmake-rules"))) + (copy-file cmake-rules + (string-append "fortune-mod/cmake/" + (strip-store-file-name cmake-rules))) + (chdir "fortune-mod")))) + (add-after 'install 'fix-install-directory + ;; Move binary from "games/" to "bin/". + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (rename-file (string-append out "/games/fortune") + (string-append out "/bin/fortune")) + #t)))))) + (inputs `(("recode" ,recode))) + (native-inputs + `(("perl" ,perl) + ;; The following is only needed for tests. + ("perl-file-find-object" ,perl-file-find-object) + ("perl-test-differences" ,perl-test-differences) + ("perl-class-xsaccessor" ,perl-class-xsaccessor) + ("perl-io-all" ,perl-io-all) + ("perl-test-runvalgrind" ,perl-test-runvalgrind) + ("cmake-rules" + ,(origin + (method url-fetch) + (uri (string-append "https://bitbucket.org/shlomif/shlomif-cmake-modules/" + "raw/default/shlomif-cmake-modules/Shlomif_Common.cmake")) + (sha256 + (base32 "0kx9s1qqhhzprp1w3b67xmsns0n0v506bg5hgrshxaxpy6lqiwb2")))))) + (home-page "http://www.shlomifish.org/open-source/projects/fortune-mod/") + (synopsis "The Fortune Cookie program from BSD games") + (description "Fortune is a command-line utility which displays a random +quotation from a collection of quotes.") + (license license:bsd-4))) -- cgit v1.2.3 From d28e5ad23caa55772f8ab765193e33809ce0767d Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Thu, 19 Apr 2018 14:26:35 +0200 Subject: gnu: guile-curl: Use invoke. * gnu/packages/curl.scm (guile-curl): Use invoke instead of system*. --- gnu/packages/curl.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 216d47cb71..ae8b9600dd 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -232,8 +232,7 @@ (define-public guile-curl (substitute* curl.scm (("libguile-curl") ext)) ;; The build system does not actually compile the Scheme module. ;; So we can compile it and put it in the right place in one go. - (system* "guild" "compile" curl.scm "-o" curl.go)) - #t))))) + (invoke "guild" "compile" curl.scm "-o" curl.go))))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("curl" ,curl) -- cgit v1.2.3 From 44b98b00026e62766620dbc4330a305282d61069 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 18 Apr 2018 16:41:39 -0400 Subject: gnu: Perl: Fix a grafting failure due to a path that includes the package version. Fixes . * gnu/packages/perl.scm (perl-5.26.2): Don't use package/inherit. [arguments]: Add a 'workaround-grafting-version-bug' phase. --- gnu/packages/perl.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index aaf3e2e825..33601f3f55 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -44,6 +44,7 @@ (define-module (gnu packages perl) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) + #:use-module (guix utils) ;substitute-keyword-arguments for perl-5.26.2 #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages freedesktop) @@ -161,7 +162,8 @@ (define-public perl ;; Fixes CVE-2018-6797, CVE-2018-6798, and CVE-2018-6913. ;; See . (define-public perl-5.26.2 - (package/inherit perl + (package + (inherit perl) (version "5.26.2") (source (origin (inherit (package-source perl)) @@ -169,7 +171,22 @@ (define-public perl-5.26.2 version ".tar.gz")) (sha256 (base32 - "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp")))))) + "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp")))) + (arguments + (substitute-keyword-arguments (package-arguments perl) + ((#:phases phases) + `(modify-phases ,phases + ;; The path to libperl.so includes the Perl version number, and this + ;; is not handled by grafting. See . + (add-after 'install 'workaround-grafting-version-bug + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dir (string-append out "/lib/perl5")) + (new "5.26.2") + (old "5.26.1")) + (with-directory-excursion dir + (symlink new old)) + #t))))))))) (define-public perl-algorithm-c3 (package -- cgit v1.2.3 From 7c16af4646fac789000495064a13284691dbeb75 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Apr 2018 17:47:28 +0200 Subject: gnu: python-bcrypt: Move to (gnu packages python-crypto). * gnu/packages/password-utils.scm (python-bcrypt, python2-bcrypt): Move to ... * gnu/packages/python-crypto.scm (python-bcrypt, python2-bcrypt): ... here. * gnu/packages/python.scm: Remove unused (gnu packages password-utils) import. --- gnu/packages/password-utils.scm | 31 ------------------------------- gnu/packages/python-crypto.scm | 31 +++++++++++++++++++++++++++++++ gnu/packages/python.scm | 1 - 3 files changed, 31 insertions(+), 32 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index f4518cfeb0..923122903e 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -457,37 +457,6 @@ (define-public argon2 ;; files are CC0 only; see README.md and LICENSE for details. (license (list license:cc0 license:asl2.0)))) -(define-public python-bcrypt - (package - (name "python-bcrypt") - (version "3.1.4") - (source - (origin - (method url-fetch) - (uri (pypi-uri "bcrypt" version)) - (sha256 - (base32 - "13cyrnqwkhc70rs6dg65z4yrrr3dc42fhk11804fqmci9hvimvb7")))) - (build-system python-build-system) - (native-inputs - `(("python-pycparser" ,python-pycparser) - ("python-pytest" ,python-pytest))) - (propagated-inputs - `(("python-cffi" ,python-cffi) - ("python-six" ,python-six))) - (home-page "https://github.com/pyca/bcrypt/") - (synopsis - "Modern password hashing library") - (description - "Bcrypt is a Python module which provides a password hashing method based -on the Blowfish password hashing algorithm, as described in -@url{http://static.usenix.org/events/usenix99/provos.html,\"A Future-Adaptable -Password Scheme\"} by Niels Provos and David Mazieres.") - (license license:asl2.0))) - -(define-public python2-bcrypt - (package-with-python2 python-bcrypt)) - (define-public pass-git-helper (package (name "pass-git-helper") diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index ace0891a7d..bf868b14d7 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -48,6 +48,37 @@ (define-module (gnu packages python-crypto) #:use-module ((guix licenses) #:prefix license:) #:use-module (srfi srfi-1)) +(define-public python-bcrypt + (package + (name "python-bcrypt") + (version "3.1.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "bcrypt" version)) + (sha256 + (base32 + "13cyrnqwkhc70rs6dg65z4yrrr3dc42fhk11804fqmci9hvimvb7")))) + (build-system python-build-system) + (native-inputs + `(("python-pycparser" ,python-pycparser) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-cffi" ,python-cffi) + ("python-six" ,python-six))) + (home-page "https://github.com/pyca/bcrypt/") + (synopsis + "Modern password hashing library") + (description + "Bcrypt is a Python module which provides a password hashing method based +on the Blowfish password hashing algorithm, as described in +@url{http://static.usenix.org/events/usenix99/provos.html,\"A Future-Adaptable +Password Scheme\"} by Niels Provos and David Mazieres.") + (license license:asl2.0))) + +(define-public python2-bcrypt + (package-with-python2 python-bcrypt)) + (define-public python-passlib (package (name "python-passlib") diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fe66d8d082..ae6e38f024 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -102,7 +102,6 @@ (define-module (gnu packages python) #:use-module (gnu packages networking) #:use-module (gnu packages ncurses) #:use-module (gnu packages openstack) - #:use-module (gnu packages password-utils) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) -- cgit v1.2.3 From 2bb915e679b8a9e071f15b4caa3274fe9c6396c1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Apr 2018 17:24:40 +0300 Subject: gnu: u-boot-odroid-c2: Remove variable. U-boot for this target requires a binary blob to boot correctly. * gnu/packages/bootloaders.scm (u-boot-odroid-c2): Remove variable. --- gnu/packages/bootloaders.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 2ea78c9bac..281bb98fa9 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -443,9 +443,6 @@ (define-public u-boot-malta (define-public u-boot-beagle-bone-black (make-u-boot-package "am335x_boneblack" "arm-linux-gnueabihf")) -(define-public u-boot-odroid-c2 - (make-u-boot-package "odroid-c2" "aarch64-linux-gnu")) - (define-public u-boot-pine64-plus (let ((base (make-u-boot-package "pine64_plus" "aarch64-linux-gnu"))) (package -- cgit v1.2.3 From 259ed58fef670e71013e0ed1c26f07ef4b0fa10a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 31 Mar 2018 14:08:15 -0400 Subject: gnu: emacs-pdf-tools: Fix byte compilation. * gnu/packages/emacs.scm (emacs-pdf-tools)[arguments]: Add emacs-set-emacs-load-path phase. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a26fbd122f..e96a69c3bc 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1473,7 +1473,9 @@ (define-public emacs-pdf-tools ;; upgrading" that pdf-tools tries to perform. (emacs-substitute-variables "pdf-tools.el" ("pdf-tools-handle-upgrades" '())))) - (add-after 'emacs-patch-variables 'emacs-install + (add-after 'emacs-patch-variables 'emacs-set-emacs-load-path + (assoc-ref emacs:%standard-phases 'set-emacs-load-path)) + (add-after 'emacs-set-emacs-load-path 'emacs-install (assoc-ref emacs:%standard-phases 'install)) (add-after 'emacs-install 'emacs-build (assoc-ref emacs:%standard-phases 'build)) -- cgit v1.2.3 From d1d41db6bb7a836fd2347d965287040b6545cecf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 12 Feb 2018 23:02:11 -0500 Subject: gnu: Adapt Emacs packages to use the new check phase. * gnu/packages/emacs.scm (emacs-dash, emacs-s, emacs-string-inflection, emacs-company, emacs-clojure-mode, emacs-julia-mode, emacs-elfeed, emacs-memoize, emacs-use-package, emacs-xmlgen, emacs-json-reformat, emacs-which-key, emacs-ws-butler, emacs-git-messenger, emacs-browse-at-remote, emacs-evil-quickscope)[arguments]: Add #:tests? and #:test-command arguments to use the new check phase. (emacs-json-reformat)[inputs]: Move emacs-dash and emacs-shut-up to ... [native-inputs]: here. Add ert-runner. (emacs-company)[arguments]: Refactor fix-bin-dir phase. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 178 ++++++++++++++++--------------------------------- 1 file changed, 56 insertions(+), 122 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e96a69c3bc..0a74c4eb32 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1515,11 +1515,8 @@ (define-public emacs-dash "1pjlkrzr8n45bnp3xs3dybvy0nz3gwamrfc7vsi1nhpkkw99ihhb")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "./run-tests.sh"))))))) + `(#:tests? #t + #:test-command '("./run-tests.sh"))) (home-page "https://github.com/magnars/dash.el") (synopsis "Modern list library for Emacs") (description "This package provides a modern list API library for Emacs.") @@ -1712,11 +1709,8 @@ (define-public emacs-s "0xbl75863pcm806zg0x1lw7qznzjq2c8320k8js7apyag8q4srvh")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "./run-tests.sh"))))))) + `(#:tests? #t + #:test-command '("./run-tests.sh"))) (home-page "https://github.com/magnars/s.el") (synopsis "Emacs string manipulation library") (description "This package provides an Emacs library for manipulating @@ -2228,11 +2222,8 @@ (define-public emacs-string-inflection (native-inputs `(("ert-runner" ,ert-runner))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "ert-runner"))))))) + `(#:tests? #t + #:test-command '("ert-runner"))) (home-page "https://github.com/akicho8/string-inflection") (synopsis "Convert symbol names between different naming conventions") (description @@ -2548,7 +2539,7 @@ (define-public emacs-company (arguments `(#:phases (modify-phases %standard-phases - (add-before 'install 'check + (add-before 'check 'fix-bin-dir (lambda _ ;; The company-files-candidates-normal-root test looks ;; for the /bin directory, but the build environment has @@ -2556,7 +2547,9 @@ (define-public emacs-company ;; /tmp directory. (substitute* "test/files-tests.el" (("/bin/") "/tmp/")) - (zero? (system* "make" "test-batch"))))))) + #t))) + #:tests? #t + #:test-command '("make" "test-batch"))) (home-page "http://company-mode.github.io/") (synopsis "Modular text completion framework") (description @@ -3643,11 +3636,8 @@ (define-public emacs-clojure-mode ("emacs-s" ,emacs-s) ("ert-runner" ,ert-runner))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'check - (lambda _ - (zero? (system* "ert-runner"))))))) + `(#:tests? #t + #:test-command '("ert-runner"))) (home-page "https://github.com/clojure-emacs/clojure-mode") (synopsis "Major mode for Clojure code") (description @@ -3826,14 +3816,10 @@ (define-public emacs-julia-mode "1is4dcv6blslpzbjcg8l2jpxi8xj96q4cm0nxjxsyswpm8bw8ki0")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "emacs" "-batch" - "-l" "julia-mode.el" - "-l" "julia-mode-tests.el" - "-f" "ert-run-tests-batch-and-exit"))))))) + `(#:tests? #t + #:test-command '("emacs" "--batch" + "-l" "julia-mode-tests.el" + "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://github.com/JuliaEditorSupport/julia-emacs") (synopsis "Major mode for Julia") (description "This Emacs package provides a mode for the Julia @@ -4024,11 +4010,8 @@ (define-public emacs-elfeed "1fd1mx0q1qb9vgdzls5ppxfriyid48blg8smgjspiazp7kxakzxv")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "make" "test"))))))) + `(#:tests? #t + #:test-command '("make" "test"))) (home-page "https://github.com/skeeto/elfeed") (synopsis "Atom/RSS feed reader for Emacs") (description @@ -5201,13 +5184,11 @@ (define-public emacs-memoize "0fjwlrdm270qcrqffvarw5yhijk656q4lam79ybhaznzj0dq3xpw")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "emacs" "-batch" "-l" "memoize.el" - "-l" "memoize-test.el" - "-f" "ert-run-tests-batch-and-exit"))))))) + `(#:tests? #t + #:test-command '("emacs" "-batch" + "-l" "memoize.el" + "-l" "memoize-test.el" + "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://github.com/skeeto/emacs-memoize") (synopsis "Emacs lisp memoization library") (description "@code{emacs-memoize} is an Emacs library for @@ -5490,16 +5471,12 @@ (define-public emacs-use-package (propagated-inputs `(("emacs-diminish" ,emacs-diminish))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "emacs" "--batch" "-L" "." - "-l" "use-package-tests.el" - "-f" "ert-run-tests-batch-and-exit")) - ;; Tests fail in this release, but have been fixed in - ;; upstream commit 7956d40eed57d6c06bef36ebc174cf57d934e30d - #t))))) + ;; Tests fail in this release, but have been fixed in + ;; upstream commit 7956d40eed57d6c06bef36ebc174cf57d934e30d + `(#:tests? #f + #:test-command '("emacs" "--batch" + "-l" "use-package-tests.el" + "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://github.com/jwiegley/use-package") (synopsis "Declaration for simplifying your .emacs") (description "The use-package macro allows you to isolate package @@ -5594,13 +5571,10 @@ (define-public emacs-xmlgen "0zay490vjby3f7455r0vydmjg7q1gwc78hilpfb0rg4gwz224z8r")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "emacs" "--batch" "-L" "." - "-l" "xmlgen-test.el" - "-f" "ert-run-tests-batch-and-exit"))))))) + `(#:tests? #t + #:test-command '("emacs" "--batch" + "-l" "xmlgen-test.el" + "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://github.com/philjackson/xmlgen") (synopsis "S-expression to XML domain specific language (DSL) in Emacs Lisp") @@ -6299,32 +6273,15 @@ (define-public emacs-json-reformat "11fbq4scrgr7m0iwnzcrn2g7xvqwm2gf82sa7zy1l0nil7265p28")) (patches (search-patches "emacs-json-reformat-fix-tests.patch")))) (build-system emacs-build-system) - (propagated-inputs `(("emacs-undercover" ,emacs-undercover))) - (inputs - `(("emacs-dash" ,emacs-dash) ; for tests - ("emacs-shut-up" ,emacs-shut-up))) ; for tests + (propagated-inputs + `(("emacs-undercover" ,emacs-undercover))) + (native-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-shut-up" ,emacs-shut-up) + ("ert-runner" ,ert-runner))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda* (#:key inputs #:allow-other-keys) - (zero? (system* "emacs" "--batch" "-L" "." - "-L" (string-append - (assoc-ref inputs "emacs-undercover") - "/share/emacs/site-lisp/guix.d/undercover-" - ,(package-version emacs-undercover)) - "-L" (string-append - (assoc-ref inputs "emacs-dash") - "/share/emacs/site-lisp/guix.d/dash-" - ,(package-version emacs-dash)) - "-L" (string-append - (assoc-ref inputs "emacs-shut-up") - "/share/emacs/site-lisp/guix.d/shut-up-" - ,(package-version emacs-shut-up)) - "-l" "test/test-helper.el" - "-l" "test/json-reformat-test.el" - "-f" "ert-run-tests-batch-and-exit")) - #t))))) + `(#:tests? #t + #:test-command '("ert-runner"))) (home-page "https://github.com/gongo/json-reformat") (synopsis "Reformatting tool for JSON") (description "@code{json-reformat} provides a reformatting tool for @@ -6500,13 +6457,10 @@ (define-public emacs-which-key (file-name (string-append name "-" version ".tar.gz")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "emacs" "--batch" "-L" "." - "-l" "which-key-tests.el" - "-f" "ert-run-tests-batch-and-exit"))))))) + `(#:tests? #t + #:test-command '("emacs" "--batch" + "-l" "which-key-tests.el" + "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://github.com/justbur/emacs-which-key") (synopsis "Display available key bindings in popup") (description @@ -6535,11 +6489,8 @@ (define-public emacs-ws-butler (native-inputs `(("ert-runner" ,ert-runner))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "ert-runner" "tests"))))))) + `(#:tests? #t + #:test-command '("ert-runner" "tests"))) (home-page "https://github.com/lewang/ws-butler") (synopsis "Trim spaces from end of lines") (description @@ -6636,17 +6587,9 @@ (define-public emacs-git-messenger (propagated-inputs `(("emacs-popup" ,emacs-popup))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda* (#:key inputs #:allow-other-keys) - (zero? (system* "emacs" "--batch" "-L" "." - "-L" (string-append - (assoc-ref inputs "emacs-popup") - "/share/emacs/site-lisp/guix.d/popup-" - ,(package-version emacs-popup)) - "-l" "test/test.el" - "-f" "ert-run-tests-batch-and-exit"))))))) + `(#:tests? #t + #:test-command '("emacs" "--batch" "-l" "test/test.el" + "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://github.com/syohex/emacs-git-messenger") (synopsis "Popup commit message at current line") (description "@code{emacs-git-messenger} provides @@ -6806,11 +6749,8 @@ (define-public emacs-browse-at-remote (native-inputs `(("ert-runner" ,ert-runner))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "ert-runner"))))))) + `(#:tests? #t + #:test-command '("ert-runner"))) (home-page "https://github.com/rmuslimov/browse-at-remote") (synopsis "Open github/gitlab/bitbucket/stash page from Emacs") (description @@ -7239,16 +7179,10 @@ (define-public emacs-evil-quickscope (propagated-inputs `(("emacs-evil" ,emacs-evil))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda* (#:key inputs #:allow-other-keys) - (invoke "emacs" "--batch" "-L" - (string-append (assoc-ref inputs "emacs-evil") - "/share/emacs/site-lisp/guix.d/evil-" - ,(package-version emacs-evil)) - "-l" "evil-quickscope-tests.el" - "-f" "ert-run-tests-batch-and-exit")))))) + `(#:tests? #t + #:test-command '("emacs" "--batch" + "-l" "evil-quickscope-tests.el" + "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://github.com/blorbx/evil-quickscope") (synopsis "Target highlighting for emacs evil-mode f,F,t and T commands") (description "@code{emacs-evil-quickscope} highlights targets for Evil -- cgit v1.2.3 From 9490c411f0d9a0a9476cb7b0855f5c2461c49b38 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 12 Feb 2018 22:11:38 -0500 Subject: gnu: ert-runner: Adjust ert-runner wrapper to honor EMACSLOADPATH. * gnu/packages/emacs.scm (ert-runner): Use 'prefix instead of '= for setting the EMACSLOADPATH environment variable. Reuse the already computed EMACSLOADPATH for wrap-program. Specify the dependencies directly in the inputs field. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 97 +++++++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 56 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 0a74c4eb32..81173947c6 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6176,64 +6176,49 @@ (define-public emacs-commander ;; Tests for ert-runner have a circular dependency with ecukes, and therefore ;; cannot be run (define-public ert-runner - (let ((dependencies - `(("emacs-ansi" ,emacs-ansi) - ("emacs-commander" ,emacs-commander) - ("emacs-dash" ,emacs-dash) - ("emacs-f" ,emacs-f) - ("emacs-s" ,emacs-s) - ("emacs-shut-up" ,emacs-shut-up)))) - (package - (name "ert-runner") - (version "0.7.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/rejeep/ert-runner.el/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1657nck9i96a4xgl8crfqq0s8gflzp21pkkzwg6m3z5npjxklgwp")))) - (build-system emacs-build-system) - (inputs dependencies) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'install-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "bin/ert-runner" - (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)") - (string-append "ERT_RUNNER=\"" out - "/share/emacs/site-lisp/guix.d/" - ,name "-" ,version))) - (install-file "bin/ert-runner" (string-append out "/bin")) - (wrap-program (string-append out "/bin/ert-runner") - (list "EMACSLOADPATH" ":" '= - (append - ,(match dependencies - (((labels packages) ...) - `(map (lambda (label package version) - (string-append (assoc-ref inputs label) - "/share/emacs/site-lisp/guix.d/" - (string-drop package 6) - "-" version)) - ',labels - ',(map package-name packages) - ',(map package-version packages)))) - ;; empty element to include the default load path as - ;; determined by emacs' standard initialization - ;; procedure - (list "")))) - #t)))) - #:include (cons* "^reporters/.*\\.el$" %default-include))) - (home-page "https://github.com/rejeep/ert-runner.el") - (synopsis "Opinionated Ert testing workflow") - (description "@code{ert-runner} is a tool for Emacs projects tested + (package + (name "ert-runner") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/rejeep/ert-runner.el/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1657nck9i96a4xgl8crfqq0s8gflzp21pkkzwg6m3z5npjxklgwp")))) + (build-system emacs-build-system) + (inputs + `(("emacs-ansi" ,emacs-ansi) + ("emacs-commander" ,emacs-commander) + ("emacs-dash" ,emacs-dash) + ("emacs-f" ,emacs-f) + ("emacs-s" ,emacs-s) + ("emacs-shut-up" ,emacs-shut-up))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "bin/ert-runner" + (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)") + (string-append "ERT_RUNNER=\"" out + "/share/emacs/site-lisp/guix.d/" + ,name "-" ,version))) + (install-file "bin/ert-runner" (string-append out "/bin")) + (wrap-program (string-append out "/bin/ert-runner") + (list "EMACSLOADPATH" ":" 'prefix + (string-split (getenv "EMACSLOADPATH") #\:))) + #t)))) + #:include (cons* "^reporters/.*\\.el$" %default-include))) + (home-page "https://github.com/rejeep/ert-runner.el") + (synopsis "Opinionated Ert testing workflow") + (description "@code{ert-runner} is a tool for Emacs projects tested using ERT. It assumes a certain test structure setup and can therefore make running tests easier.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-disable-mouse (package -- cgit v1.2.3 From 76fa5e042b8b3b7f562bad16be048f5784a2f000 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 2 Mar 2018 23:11:46 +0100 Subject: gnu: guix: Add po4a input. * gnu/packages/package-management.scm (guix)[inputs]: Add po4a. --- gnu/packages/package-management.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9a5f73a1fe..a08bfaf5b7 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -244,7 +245,8 @@ (define (intern tarball) ("gettext" ,gettext-minimal) ("texinfo" ,texinfo) ("graphviz" ,graphviz) - ("help2man" ,help2man))) + ("help2man" ,help2man) + ("po4a" ,po4a))) (inputs `(("bzip2" ,bzip2) ("gzip" ,gzip) -- cgit v1.2.3 From 1848cdfb7d8ce9fb78ffc9f6771689ff9ff7e333 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 20 Apr 2018 01:06:37 +0530 Subject: gnu: emacs-memoize: Update to 1.1. * gnu/packages/emacs.scm (emacs-memoize): Update to 1.1. Re-indent. [source]: Switch to release tarball. [arguments]: Remove "-l" "memoize.el" from #:test-command. --- gnu/packages/emacs.scm | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 81173947c6..5f7107ea7e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5170,30 +5170,29 @@ (define-public emacs-helm-c-yasnippet (define-public emacs-memoize (package - (name "emacs-memoize") - (version "20130421.b55eab0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/skeeto/emacs-memoize") - (commit "b55eab0cb6ab05d941e07b8c01f1655c0cf1dd75"))) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0fjwlrdm270qcrqffvarw5yhijk656q4lam79ybhaznzj0dq3xpw")))) - (build-system emacs-build-system) - (arguments - `(#:tests? #t - #:test-command '("emacs" "-batch" - "-l" "memoize.el" - "-l" "memoize-test.el" - "-f" "ert-run-tests-batch-and-exit"))) - (home-page "https://github.com/skeeto/emacs-memoize") - (synopsis "Emacs lisp memoization library") - (description "@code{emacs-memoize} is an Emacs library for + (name "emacs-memoize") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/skeeto/emacs-memoize/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "05ijgwi4ymxx31vpjm2pn356j85cykknajn14lrzz8pn5sh0vrg4")))) + (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("emacs" "--batch" + "-l" "memoize-test.el" + "-f" "ert-run-tests-batch-and-exit"))) + (home-page "https://github.com/skeeto/emacs-memoize") + (synopsis "Emacs lisp memoization library") + (description "@code{emacs-memoize} is an Emacs library for memoizing functions.") - (license license:unlicense))) + (license license:unlicense))) (define-public emacs-linum-relative (package -- cgit v1.2.3 From 652741cf28210ebdc3eaab18e8aa243f44310ba8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 31 Mar 2018 16:01:05 -0400 Subject: gnu: emacs-deferred: Enable tests. * gnu/packages/emacs.scm (emacs-deferred)[arguments]: Add fix-makefile phase. Set #:test-command, and enable tests. [native-inputs]: Add emacs-ert-expectations, emacs-undercover and ert-runner. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 5f7107ea7e..1638b9a91b 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2487,7 +2487,24 @@ (define-public emacs-deferred "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h")) (file-name (string-append name "-" version)))) (build-system emacs-build-system) - ;; FIXME: Would need 'el-expectations' to actually run tests. + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-makefile + (lambda _ + (substitute* "Makefile" + (("\\$\\(CASK\\) exec ") "")) + #t))) + #:tests? #t + ;; FIXME: Normally we'd run the "test" target but for some reason the + ;; test-deferred target fails when run in the Guix build environment + ;; with the error: (file-error "Searching for program" "No such file or + ;; directory" "/bin/sh"). + #:test-command '("make" "test-concurrent" "test-concurrent-compiled"))) + (native-inputs + `(("emacs-ert-expectations" ,emacs-ert-expectations) + ("emacs-undercover" ,emacs-undercover) + ("ert-runner" ,ert-runner))) (synopsis "Simple asynchronous functions for Emacs Lisp") (description "The @code{deferred.el} library provides support for asynchronous tasks. -- cgit v1.2.3 From 58f427de8a1dcea298e4dcaaf3fe7c2bb2eb60c8 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 19 Apr 2018 18:54:25 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.35. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.35. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bc1e23fc15..2cab593934 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -400,8 +400,8 @@ (define-public linux-libre %linux-compatible-systems #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.34") -(define %linux-libre-4.14-hash "11gmvxngjfx4w24a1yjc98hhdl8zfh87byrslgy94faybj8dl938") +(define %linux-libre-4.14-version "4.14.35") +(define %linux-libre-4.14-hash "0dfzc2290zks1a63zld8ac0xarc8gxwwh4wsr71y8mas7gfmyqzj") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 872bda5de52a8f0514230ebc4e9680aab74f509a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 19 Apr 2018 18:55:23 -0400 Subject: gnu: linux-libre: Update to 4.16.3. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.16.3. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2cab593934..a5b1cd46d1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -391,8 +391,8 @@ (define %linux-compatible-systems '("x86_64-linux" "i686-linux" "armhf-linux")) ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.16.2") -(define %linux-libre-hash "04sma28djhr2llffnd8pmpb1jfwaqcg2sipp0jnnj1llpwj3rah7") +(define %linux-libre-version "4.16.3") +(define %linux-libre-hash "1wmx0ph8nbwidlx1dh8bi4p97b84nif9ymv00mafnn6iykdfdin0") (define-public linux-libre (make-linux-libre %linux-libre-version -- cgit v1.2.3 From aea388cf364f5a9f05ad219500b2c83c2b47f62c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 31 Mar 2018 16:09:38 -0400 Subject: gnu: emacs-realgud: Fix autogen.sh after EMACSLOADPATH is set. * gnu/packages/emacs.scm (emacs-realgud)[arguments]: Move the fix-autogen-script phase to after the set-emacs-load-path phase. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1638b9a91b..62685ef91e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3316,7 +3316,7 @@ (define-public emacs-realgud `(#:tests? #t #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-autogen-script + (add-after 'set-emacs-load-path 'fix-autogen-script (lambda _ (substitute* "autogen.sh" (("./configure") "sh configure")))) -- cgit v1.2.3 From 5368e67c4e86b7459c69675d237b356d3d1f7b1a Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 20 Apr 2018 13:42:58 +0530 Subject: gnu: emacs-realgud: Update to 1.4.5. * gnu/packages/emacs.scm (emacs-realgud): Update to 1.4.5. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 62685ef91e..d34883b561 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3302,7 +3302,7 @@ (define-public emacs-loc-changes (define-public emacs-realgud (package (name "emacs-realgud") - (version "1.4.4") + (version "1.4.5") (source (origin (method url-fetch) @@ -3310,7 +3310,7 @@ (define-public emacs-realgud version ".tar")) (sha256 (base32 - "1nc8km339ip90h1j55ahfga03v7x7rh4iycmw6yrxyzir68vwn7c")))) + "108wgxg7fb4byaiasgvbxv2hq7b00biq9f0mh9hy6vw4160y5w24")))) (build-system emacs-build-system) (arguments `(#:tests? #t -- cgit v1.2.3 From e60352e4533a313a6fcbed615bd77729010b1968 Mon Sep 17 00:00:00 2001 From: Tomáš Čech Date: Wed, 18 Apr 2018 00:28:39 +0200 Subject: gnu: Add go-golang-org-x-crypto-ssh-terminal. * gnu/packages/golang.scm (go-golang-org-x-crypto-ssh-terminal): New variable. --- gnu/packages/golang.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e2fbd54a56..485aa02c46 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Christopher Baines +;;; Copyright © 2018 Tomáš Čech ;;; ;;; This file is part of GNU Guix. ;;; @@ -1257,3 +1258,43 @@ (define-public go-golang-org-x-time-rate limiting in Go.") (home-page "https://godoc.org/golang.org/x/time/rate") (license license:bsd-3)))) + +(define-public go-golang-org-x-crypto-ssh-terminal + (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419") + (revision "1")) + (package + (name "go-golang-org-x-crypto-ssh-terminal") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/crypto") + (commit commit))) + (file-name (string-append "go.googlesource.com-crypto-" + version "-checkout")) + (sha256 + (base32 + "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx")))) + (build-system go-build-system) + (inputs + `(("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix))) + (arguments + `(#:import-path "golang.org/x/crypto/ssh/terminal" + #:unpack-path "golang.org/x/crypto" + #:phases + (modify-phases %standard-phases + (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable + (lambda* (#:key outputs #:allow-other-keys) + (map (lambda (file) + (make-file-writable file)) + (find-files + (string-append (assoc-ref outputs "out") + "/src/golang.org/x/crypto/ed25519/testdata") + ".*\\.gz$")) + #t))))) + (synopsis "Terminal functions for Go") + (description "This package provides @{terminal}, which implements +support functions for dealing with terminals, as commonly found on UNIX +systems.") + (home-page "https://go.googlesource.com/crypto/") + (license license:bsd-3)))) -- cgit v1.2.3 From 9324d92e6a3ef030193f43d21a75ca3e88fa90b4 Mon Sep 17 00:00:00 2001 From: Tomáš Čech Date: Sun, 15 Apr 2018 10:42:25 +0200 Subject: gnu: lvm2: Enable pkg-config files generation. * gnu/packages/linux.scm (lvm2)[arguments]: Enable pkg-config files generation via configure flag. --- gnu/packages/linux.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a5b1cd46d1..cf51a68e1f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2121,6 +2121,7 @@ (define-public lvm2 "/etc/lvm") "--enable-udev_sync" "--enable-udev_rules" + "--enable-pkgconfig" ;; Make sure programs such as 'dmsetup' can ;; find libdevmapper.so. -- cgit v1.2.3 From 62950ec7e9ad2e5e172cd73a5722348bf60fcc4f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 24 Mar 2018 21:37:41 -0400 Subject: gnu: Add emacs-kv. * gnu/packages/emacs.scm (emacs-kv): New variable. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index d34883b561..8379d69db2 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7300,6 +7300,32 @@ (define-public emacs-scratch-el formatting rules for that language.") (license license:bsd-2)))) +(define-public emacs-kv + (package + (name "emacs-kv") + (version "0.0.19") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nicferrier/emacs-kv.git") + (commit "721148475bce38a70e0b678ba8aa923652e8900e"))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0r0lz2s6gvy04fwnafai668jsf4546h4k6zd6isx5wpk0n33pj5m")))) + (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("emacs" "--batch" "-l" "kv-tests.el" + "-f" "ert-run-tests-batch-and-exit"))) + (home-page "https://github.com/nicferrier/emacs-kv") + (synopsis "Key/Value data structures library for Emacs Lisp") + (description "@code{emacs-kv} is a collection of tools for dealing with +key/value data structures such as plists, alists and hash-tables in Emacs +Lisp.") + (license license:gpl3+))) + (define-public emacs-esxml (package (name "emacs-esxml") -- cgit v1.2.3 From 9835a71d80c57d26e041abbc6d8ca65e4e1277c6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 24 Mar 2018 23:07:18 -0400 Subject: gnu: emacs-esxml: Fix byte compilation. * gnu/packages/emacs.scm (emacs-esxml)[arguments]: Add fix-sources phase. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 8379d69db2..b8aa9002cf 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7340,6 +7340,28 @@ (define-public emacs-esxml (base32 "00vv8a75wdklygdyr4km9mc2ismxak69c45jmcny41xl44rp9x8m")))) (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-sources + (lambda _ + ;; See: https://github.com/tali713/esxml/pull/28. + (substitute* "css-lite.el" + ((";;; main interface") + (string-append ";;; main interface\n" + "(require 'cl-lib)")) + (("mapcan") + "cl-mapcan") + (("',\\(cl-mapcan #'process-css-rule rules\\)") + "(cl-mapcan #'process-css-rule ',rules)")) + (substitute* "esxml-form.el" + ((",esxml-form-field-defn") + "#'esxml-form-field-defn")) + ;; See: https://github.com/tali713/esxml/issues/25 + (delete-file "esxpath.el") + #t))))) + (propagated-inputs + `(("emacs-kv" ,emacs-kv))) (home-page "https://github.com/tali713/esxml/") (synopsis "SXML for EmacsLisp") (description "This is XML/XHTML done with S-Expressions in EmacsLisp. -- cgit v1.2.3 From 582c122e7b05271d534e1e3a57fac10f2963ca98 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 19 Mar 2018 21:28:42 -0400 Subject: gnu: emacs-sx: Fix byte compilation. The package would fail building when attempting to create a cache directory. This has been fixed upstream but not in a tagged release. * gnu/packages/emacs.scm (emacs-sx): Update to latest git version. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b8aa9002cf..b72ea0fb3d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1738,26 +1738,31 @@ (define-public emacs-symon (license license:gpl2+))) (define-public emacs-sx - (package - (name "emacs-sx") - (version "0.4") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/vermiculus/sx.el/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1w0xghfljqg31axcnv8gzlrd8pw25nji6idnrhflq0af9qh1dw03")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-markdown-mode" ,emacs-markdown-mode))) - (home-page "https://github.com/vermiculus/sx.el/") - (synopsis "Emacs StackExchange client") - (description - "Emacs StackExchange client. Ask and answer questions on + (let ((version "20180212") + (revision "1") + (commit "833435fbf90d1c9e927d165b155f3b1ef39271de")) + (package + (name "emacs-sx") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vermiculus/sx.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1369xaxq1vy3d9yh862ddnhddikdpg2d0wv1ly00pnvdp9v4cqgd")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-markdown-mode" ,emacs-markdown-mode))) + (home-page "https://github.com/vermiculus/sx.el") + (synopsis "Emacs StackExchange client") + (description + "Emacs StackExchange client. Ask and answer questions on Stack Overflow, Super User, and other StackExchange sites.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-f (package -- cgit v1.2.3 From 1af4212ae4bf357b691896984561d8b09544784e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 20 Apr 2018 12:31:28 +0200 Subject: gnu: emacs-org, emacs-org-contrib: Update version. * gnu/packages/emacs.scm (emacs-org): Update to 9.1.10. (emacs-org-contrib): Update to 20180416. --- gnu/packages/emacs.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b72ea0fb3d..b2fd069d3a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4618,14 +4618,14 @@ (define-public emacs-org (name "emacs-org") ;; emacs-org-contrib inherits from this package. Please update its sha256 ;; checksum as well. - (version "9.1.9") + (version "9.1.10") (source (origin (method url-fetch) (uri (string-append "http://elpa.gnu.org/packages/org-" version ".tar")) (sha256 (base32 - "16yr0srfzsrzv2b1f2wjk8gb2pyhsgj2hxbscixirkxqz674c5cl")))) + "01vvq6m7r2ifyflvq5ga241qvl4j62smz0zr6jljk56b6nqi20lm")))) (build-system emacs-build-system) (home-page "https://orgmode.org/") (synopsis "Outline-based notes management and organizer") @@ -4639,14 +4639,14 @@ (define-public emacs-org-contrib (package (inherit emacs-org) (name "emacs-org-contrib") - (version "20180327") + (version "20180416") (source (origin (method url-fetch) (uri (string-append "https://orgmode.org/elpa/org-plus-contrib-" version ".tar")) (sha256 (base32 - "1y1nn0bxnh9y4a3zrqng8n639j5da5387q2314sr3a8ggy1nb93s")))) + "1f5zdfsa1fcf66hk3w57wh5385069yg0b86h57jgkcbmxkcmj6ij")))) (arguments `(#:modules ((guix build emacs-build-system) (guix build utils) -- cgit v1.2.3 From 5618193694b08855488b29fae1db42f05ca6deaf Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 20 Apr 2018 23:24:37 -0400 Subject: gnu: perl: Add more compatibility symlinks to the replacement perl. Fixes . Reported by Julien Lepiller . * gnu/packages/perl.scm (perl-5.26.2)[arguments]: Rename the 'workaround-grafting-version-bug' phase to 'install-compatibility-symlinks'. Install symlinks in $out/lib/perl5/site_perl/5.26.1 and $out/bin/perl5.26.1, in addition to $out/lib/perl5/5.26.1. Simplify the code a bit. --- gnu/packages/perl.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 33601f3f55..5b52ec071a 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -176,16 +176,16 @@ (define-public perl-5.26.2 (substitute-keyword-arguments (package-arguments perl) ((#:phases phases) `(modify-phases ,phases - ;; The path to libperl.so includes the Perl version number, and this - ;; is not handled by grafting. See . - (add-after 'install 'workaround-grafting-version-bug + ;; The path to several installed components include the Perl + ;; version number, and these is not rewritten by grafting. See + ;; and . + (add-after 'install 'install-compatibility-symlinks (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dir (string-append out "/lib/perl5")) - (new "5.26.2") - (old "5.26.1")) - (with-directory-excursion dir - (symlink new old)) + (let ((out (assoc-ref outputs "out"))) + (symlink "perl5.26.2" (string-append out "/bin/perl5.26.1")) + (symlink "5.26.2" (string-append out "/lib/perl5/5.26.1")) + (symlink "5.26.2" + (string-append out "/lib/perl5/site_perl/5.26.1")) #t))))))))) (define-public perl-algorithm-c3 -- cgit v1.2.3 From b5178b325409b1eaf953f8f3007a180cbd27b167 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Apr 2018 01:08:56 -0400 Subject: gnu: perl: Hack the replacement perl to think it is version 5.26.1. Fixes . This is a followup to commits 217b8c2e061a5b637e198f1ed9960d4abe2b0a46, 44b98b00026e62766620dbc4330a305282d61069, and 35fbe194c3da264859a5addc661b9fbc2dc8ecc7. Complications arise when grafting perl unless the version of the replacement perl matches that of the original. So, here we add 'perl/fixed', which is built from the perl-5.26.2 source but hacked to believe it is version 5.26.1. * gnu/packages/perl.scm (perl)[replacement]: Use perl/fixed, not perl-5.26.2. (perl-5.26.2): Remove compatibility symlinks. (perl/fixed): New variable. --- gnu/packages/perl.scm | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 5b52ec071a..9de8c3fdf7 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -62,7 +62,7 @@ (define-public perl (package (name "perl") (version "5.26.1") - (replacement perl-5.26.2) + (replacement perl/fixed) (source (origin (method url-fetch) (uri (string-append "mirror://cpan/src/5.0/perl-" @@ -171,22 +171,26 @@ (define-public perl-5.26.2 version ".tar.gz")) (sha256 (base32 - "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp")))) + "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp")))))) + +;; When grafting perl, complications arise when the replacement perl has a +;; different version number than the original. So, here we create a version +;; of perl-5.26.2 that thinks it is version 5.26.1. See +;; and . +(define perl/fixed + (package + (inherit perl-5.26.2) + (version "5.26.1") (arguments - (substitute-keyword-arguments (package-arguments perl) + (substitute-keyword-arguments (package-arguments perl-5.26.2) ((#:phases phases) `(modify-phases ,phases - ;; The path to several installed components include the Perl - ;; version number, and these is not rewritten by grafting. See - ;; and . - (add-after 'install 'install-compatibility-symlinks - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (symlink "perl5.26.2" (string-append out "/bin/perl5.26.1")) - (symlink "5.26.2" (string-append out "/lib/perl5/5.26.1")) - (symlink "5.26.2" - (string-append out "/lib/perl5/site_perl/5.26.1")) - #t))))))))) + (add-after 'unpack 'revert-perl-subversion + (lambda _ + (substitute* "patchlevel.h" + (("^#define PERL_SUBVERSION 2") + "#define PERL_SUBVERSION 1")) + #t)))))))) (define-public perl-algorithm-c3 (package -- cgit v1.2.3 From 15ed90b96008e7c91f89c03854b49af05dd17e99 Mon Sep 17 00:00:00 2001 From: Tomáš Čech Date: Mon, 16 Apr 2018 11:04:19 +0200 Subject: gnu: Add python-onetimepass. * gnu/packages/python.scm (python-onetimepass): New variable. --- gnu/packages/python.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ae6e38f024..c033123a35 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -50,6 +50,7 @@ ;;; Copyright © 2018 Vijayalakshmi Vedantham ;;; Copyright © 2018 Mathieu Lirzin ;;; Copyright © 2018 Adam Massmann +;;; Copyright © 2016, 2018 Tomáš Čech ;;; ;;; This file is part of GNU Guix. ;;; @@ -13126,3 +13127,21 @@ (define-public python-pybtex (description "Pybtex is a BibTeX-compatible bibliography processor written in Python. You can simply type pybtex instead of bibtex.") (license license:expat))) + +(define-public python-onetimepass + (package + (name "python-onetimepass") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "onetimepass" version)) + (sha256 + (base32 "09vagxgbq78wvq4xbikmn2hpqqsa2i96kqsmphf7dqynfv0dlsd5")))) + (build-system python-build-system) + (inputs `(("python-six" ,python-six))) + (home-page "https://github.com/tadeck/onetimepass/") + (synopsis "One-time password library") + (description "Python one-time password library for HMAC-based (HOTP) and +time-based (TOTP) passwords.") + (license license:expat))) -- cgit v1.2.3 From c59646118764f70c3fe2728e27d60419da5568fa Mon Sep 17 00:00:00 2001 From: Tomáš Čech Date: Tue, 17 Apr 2018 21:28:23 +0200 Subject: gnu: Add python2-urlgrabber. * gnu/packages/python-web (python2-urlgrabber): New variable. --- gnu/packages/python-web.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 58c5566f42..d15ad92a56 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2015, 2016 David Thompson ;;; Copyright © 2017 Mark Meyer +;;; Copyright © 2018 Tomáš Čech ;;; ;;; This file is part of GNU Guix. ;;; @@ -2486,3 +2487,24 @@ (define-public python-pastescript (define-public python2-pastescript (package-with-python2 python-pastescript)) + +(define-public python2-urlgrabber + (package + (name "python2-urlgrabber") + (version "3.10.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "urlgrabber" version)) + (sha256 + (base32 "0w1h7hlsq406bxfy2pn4i9bd003bwl0q9b7p03z3g6yl0d21ddq5")))) + (build-system python-build-system) + (arguments `(#:python ,python-2)) ; urlgrabber supports python2 only + (home-page "http://urlgrabber.baseurl.org") + (synopsis "High-level cross protocol url-grabber") + (description "@code{urlgrabber} is Python2 library that unifies access to +files available on web, FTP or locally. It supports HTTP, FTP and file:// +protocols, it supports features like HTTP keep-alive, reget, throttling and +more.") + (license license:lgpl2.1+))) + -- cgit v1.2.3 From 2f6912180897134b8f8c77804bb894751bc6a721 Mon Sep 17 00:00:00 2001 From: Tomáš Čech Date: Tue, 17 Apr 2018 21:57:35 +0200 Subject: gnu: Add python-m2crypto, python2-m2crypto. * gnu/packages/python-crypto.scm (python-m2crypto): New variable. (python2-m2crypto): New variable. --- gnu/packages/python-crypto.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index bf868b14d7..d82cfeb422 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016, 2017 Arun Isaac ;;; Copyright © 2017 Carlo Zancanaro +;;; Copyright © 2018 Tomáš Čech ;;; ;;; This file is part of GNU Guix. ;;; @@ -789,3 +790,30 @@ (define-public python-pycryptodome (define-public python2-pycryptodome (package-with-python2 python-pycryptodome)) + +(define-public python-m2crypto + (package + (name "python-m2crypto") + (version "0.29.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "M2Crypto" version)) + (sha256 + (base32 "1h16gpilrnlzc0iyj1mnd1iqh8wchzjsxjqw9n344glimg2s5zm0")))) + (build-system python-build-system) + (inputs `(("openssl" ,openssl))) + (propagated-inputs `(("python-typing" ,python-typing))) + (home-page "https://gitlab.com/m2crypto/m2crypto") + (synopsis "Python crypto and TLS toolkit") + (description "@code{M2Crypto} is a complete Python wrapper for OpenSSL +featuring RSA, DSA, DH, EC, HMACs, message digests, symmetric ciphers +(including AES); TLS functionality to implement clients and servers; HTTPS +extensions to Python's httplib, urllib, and xmlrpclib; unforgeable HMAC'ing +AuthCookies for web session management; FTP/TLS client and server; S/MIME; +M2Crypto can also be used to provide TLS for Twisted. Smartcards supported +through the Engine interface.") + (license license:expat))) + +(define-public python2-m2crypto + (package-with-python2 python-m2crypto)) -- cgit v1.2.3 From 9a5884023543e2ff6f421c766883ee467d3f2537 Mon Sep 17 00:00:00 2001 From: Tomáš Čech Date: Tue, 17 Apr 2018 22:26:35 +0200 Subject: gnu: Add osc. * gnu/packages/build-tools.scm (osc): New variable. --- gnu/packages/build-tools.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 98d12a12f6..09cb7c9e97 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Corentin Bocquillon ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Fis Trivial +;;; Copyright © 2018 Tomáš Čech ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,8 @@ (define-module (gnu packages build-tools) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) + #:use-module (gnu packages python-web) #:use-module (gnu packages ninja) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) @@ -171,3 +174,43 @@ (define-public premake4 other lower-level build files.") (home-page "https://premake.github.io") (license license:bsd-3))) + +(define-public osc + (package + (name "osc") + (version "0.162.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/openSUSE/" name + "/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0b4kpm96ns4smqyfjysbk2p78d36x44xprpna8zz85q1y5xn57aj")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2 ; Module is python2 only. + #:phases + (modify-phases %standard-phases + (add-after 'install 'fix-filename-and-remove-unused + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin/"))) + ;; Main osc tool is renamed in spec file, not setup.py, let's + ;; do that too. + (rename-file + (string-append bin "osc-wrapper.py") + (string-append bin "osc")) + ;; Remove unused and broken script. + (delete-file (string-append bin "osc_hotshot.py")) + #t)))))) + (inputs + `(("python2-m2crypto" ,python2-m2crypto) + ("python2-pycurl" ,python2-pycurl) + ("python2-urlgrabber" ,python2-urlgrabber))) + (home-page "https://github.com/openSUSE/osc") + (synopsis "Open Build Service command line tool") + (description "@command{osc} is a command line interface to the Open Build +Service. It allows you to checkout, commit, perform reviews etc. The vast +majority of the OBS functionality is available via commands and the rest can +be reached via direct API calls.") + (license license:gpl2+))) -- cgit v1.2.3 From 3fe49e50153fec1dabac35e262a0888044f79aa6 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Apr 2018 03:02:57 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.95. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.95. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cf51a68e1f..e28f09fda9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -410,8 +410,8 @@ (define-public linux-libre-4.14 #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.94" - "1ff6g1pq16l95bpw4bfagdg4dd49mgfrg9z7l7s6r9z7qp14cd7m" + (make-linux-libre "4.9.95" + "06i756gbglxa2m4lib4p0fff5m2fm4s6f9aqc58i8lihnjqpkldk" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 6b2752526b6237b54dc399d20fe560370281800c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Apr 2018 05:20:24 -0400 Subject: gnu: uget: Remove duplicate 'native-inputs' field. * gnu/packages/bittorrent.scm (uget)[native-inputs]: Remove duplicate field initializer. --- gnu/packages/bittorrent.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index ae9b3bc62d..9df4f097ac 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -315,8 +315,6 @@ (define-public uget (base32 "0919cf7lfk1djdl003cahqjvafdliv7v2l8r5wg95n4isqggdk75")))) (build-system gnu-build-system) - (native-inputs - `(("intltool" ,intltool))) (inputs `(("curl" ,curl) ("gtk+" ,gtk+) -- cgit v1.2.3 From 0ccb104354a1f4824f56d579aa574e3c9df7737f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Apr 2018 05:22:00 -0400 Subject: gnu: go-github-com-vitrun-qart-qr: Remove duplicate 'description' field. * gnu/packages/syncthing.scm (go-github-com-vitrun-qart-qr)[description]: Remove duplicate 'description' field. --- gnu/packages/syncthing.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 4a584b1f9a..ea24be2058 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -857,8 +857,6 @@ (define-public go-github-com-vitrun-qart-qr `(#:import-path "github.com/vitrun/qart/qr" #:unpack-path "github.com/vitrun/qart")) (synopsis "Qart component for generating QR codes") - (description "This package, a component of @code{qart}, provides -@code{qr}, for QR code generation.") (description "This package provides a library for embedding human-meaningful graphics in QR codes. However, instead of scribbling on redundant pieces and relying on error correction to preserve the meaning, -- cgit v1.2.3 From 841f833171c59054d3d32430f9107431d440df71 Mon Sep 17 00:00:00 2001 From: Tomáš Čech Date: Sat, 21 Apr 2018 17:37:12 +0200 Subject: gnu: python-onetimepass: Make python-six a propagated input. * gnu/packages/python.scm (python-onetimepass)[inputs]: Move python-six from here... [propagated-inputs]: ...to here. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c033123a35..f36e4c770d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13139,7 +13139,7 @@ (define-public python-onetimepass (sha256 (base32 "09vagxgbq78wvq4xbikmn2hpqqsa2i96kqsmphf7dqynfv0dlsd5")))) (build-system python-build-system) - (inputs `(("python-six" ,python-six))) + (propagated-inputs `(("python-six" ,python-six))) (home-page "https://github.com/tadeck/onetimepass/") (synopsis "One-time password library") (description "Python one-time password library for HMAC-based (HOTP) and -- cgit v1.2.3 From c80629e7c2840c72effe398b351af9038f9cd44a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 21 Apr 2018 23:04:11 +0300 Subject: gnu: freefall: Fix compilation error. * gnu/packages/linux.scm (freefall)[arguments]: Add make-flag to set CC=gcc. --- gnu/packages/linux.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e28f09fda9..1d9585e7f1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3307,7 +3307,8 @@ (define-public freefall (substitute* "freefall.c" (("alarm\\(2\\)") "alarm(5)"))))) #:make-flags (list (string-append "PREFIX=" - (assoc-ref %outputs "out"))) + (assoc-ref %outputs "out")) + "CC=gcc") #:tests? #f)) ;no tests (home-page (package-home-page linux-libre)) (synopsis "Free-fall protection for spinning laptop hard drives") -- cgit v1.2.3 From 785f40dfbc5e8511a1c6ed9cd8d8b40e0f03a857 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 21 Apr 2018 23:22:43 +0300 Subject: gnu: spindle: Limit supported systems. * gnu/packages/admin.scm (spindle)[supported-system]: New field. --- gnu/packages/admin.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5b47d5faec..8d32518973 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2596,4 +2596,6 @@ (define-public spindle "Spindle is a tool for improving the performance of dynamic library and Python loading in HPC environments.") (home-page "https://github.com/hpc/Spindle") + ;; This package supports x86_64 and PowerPC64 + (supported-systems '("x86_64-linux")) (license license:lgpl2.1))) -- cgit v1.2.3 From c43ea99b3986c9db21ed32219e64e9848b1c001b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:27:43 +0200 Subject: gnu: r-minimal: Update to 3.4.4. * gnu/packages/statistics.scm (r-minimal): Update to 3.4.4. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index cb839a85a3..dc422c3647 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -115,7 +115,7 @@ (define-public pspp (define-public r-minimal (package (name "r-minimal") - (version "3.4.3") + (version "3.4.4") (source (origin (method url-fetch) (uri (string-append "mirror://cran/src/base/R-" @@ -123,7 +123,7 @@ (define-public r-minimal version ".tar.gz")) (sha256 (base32 - "09pl0w01fr09bsrwd7nz2r5psysj0z93w4chz3hm2havvqqvhg3s")))) + "0dq3jsnwsb5j3fhl0wi3p5ycv8avf8s5j1y4ap3d2mkjmcppvsdk")))) (build-system gnu-build-system) (arguments `(#:disallowed-references (,tzdata-for-tests) -- cgit v1.2.3 From ac6672d539d49f296d21f89bb1f5dead8aea1fa2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:28:00 +0200 Subject: gnu: r-cluster: Update to 2.0.7-1. * gnu/packages/statistics.scm (r-cluster): Update to 2.0.7-1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index dc422c3647..1e784c9b63 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -361,14 +361,14 @@ (define-public r-class (define-public r-cluster (package (name "r-cluster") - (version "2.0.7") + (version "2.0.7-1") (source (origin (method url-fetch) (uri (cran-uri "cluster" version)) (sha256 (base32 - "0nf2hnsv5rhw6399b4gk1rj5c8hfc6ajfnkh3qbwfx3cz4asrg45")))) + "1grxbifbc4nwig25dmjgkympnbzb4al0w6k1c0ibdhpk1h4l20di")))) (build-system r-build-system) (inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From 6fa9cf1abb99f8b71ae7a38fdd0b09736c700a57 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:28:11 +0200 Subject: gnu: r-nlme: Update to 3.1-137. * gnu/packages/statistics.scm (r-nlme): Update to 3.1-137. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 1e784c9b63..8b2e4f70ff 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -488,14 +488,14 @@ (define-public r-matrix (define-public r-nlme (package (name "r-nlme") - (version "3.1-131.1") + (version "3.1-137") (source (origin (method url-fetch) (uri (cran-uri "nlme" version)) (sha256 (base32 - "1xafi670a9jzb52kqxkacxfmy0viac3aql5byfq86kgkgla2sg0y")))) + "11vyxxc0n36vb8d8g02zr0402ymicvbifwdsqm7gy9iqqnwrn101")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From 1aa2ad5b32aec7b76b8731aa2533990158641fc3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:28:22 +0200 Subject: gnu: r-survival: Update to 2.42-3. * gnu/packages/statistics.scm (r-survival): Update to 2.42-3. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 8b2e4f70ff..fc52b5b38b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -593,14 +593,14 @@ (define-public r-spatial (define-public r-survival (package (name "r-survival") - (version "2.41-3") + (version "2.42-3") (source (origin (method url-fetch) (uri (cran-uri "survival" version)) (sha256 (base32 - "07cnr0hnki6ybbjll54l4s5lllhk19vni5f8m0mvsfp99ls7qygk")))) + "15pasbfzmg2r5bfpsadp9ia4cpybqz6n1kwm7ma02ykzf7bk4xx0")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) -- cgit v1.2.3 From ff91ed7d56b106711b56ffb94ddfd4cef26894df Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:31:51 +0200 Subject: gnu: r-rsqlite: Update to 2.1.0. * gnu/packages/statistics.scm (r-rsqlite): Update to 2.1.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index fc52b5b38b..3cad681b2a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2694,13 +2694,13 @@ (define-public r-blob (define-public r-rsqlite (package (name "r-rsqlite") - (version "2.0") + (version "2.1.0") (source (origin (method url-fetch) (uri (cran-uri "RSQLite" version)) (sha256 (base32 - "1xpg1i1jkzkzv44k512k90c2vvl960pl2d4a3spwcha6yclyc3vz")))) + "0hknfqcgijdapx1ryy20zy68qmm8wsb1hjx4n4hmkgl552z82q5d")))) (properties `((upstream-name . "RSQLite"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 4184649940a5302a7af2375bae8e7b4fa18b6972 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:32:04 +0200 Subject: gnu: r-xml: Update to . * gnu/packages/statistics.scm (r-xml): Update to . --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 3cad681b2a..6a2777a10f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2766,13 +2766,13 @@ (define-public r-rcurl (define-public r-xml (package (name "r-xml") - (version "3.98-1.10") + (version "3.98-1.11") (source (origin (method url-fetch) (uri (cran-uri "XML" version)) (sha256 (base32 - "1faza9bbllp67lf1yv1sllxc3iv8llz52m9diazhq322iqbh97m1")))) + "18izvlg2x9mzr6yb3yf02ghwbyn00frki3av4lpc44r22m4djnsh")))) (properties `((upstream-name . "XML"))) (build-system r-build-system) -- cgit v1.2.3 From 30d76d442ae616cdf1db2544d75ce66a810eac6e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:32:16 +0200 Subject: gnu: r-futile-options: Update to 1.0.1. * gnu/packages/statistics.scm (r-futile-options): Update to 1.0.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 6a2777a10f..a49eb1880b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2854,13 +2854,13 @@ (define-public r-lambda-r (define-public r-futile-options (package (name "r-futile-options") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "futile.options" version)) (sha256 (base32 - "1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f")))) + "0w15agpi88y3qkv6fl72zy2pzyplzgvnj41a4ixhg64mw1sck73s")))) (properties `((upstream-name . "futile.options"))) (build-system r-build-system) -- cgit v1.2.3 From 75a40e89d938d3da2bc0c9657beb15ad95e4ccbf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:32:29 +0200 Subject: gnu: r-lme4: Update to 1.1-17. * gnu/packages/statistics.scm (r-lme4): Update to 1.1-17. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a49eb1880b..a76f1cbfc7 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5071,14 +5071,14 @@ (define-public r-nloptr (define-public r-lme4 (package (name "r-lme4") - (version "1.1-16") + (version "1.1-17") (source (origin (method url-fetch) (uri (cran-uri "lme4" version)) (sha256 (base32 - "0p5x9ki4dq8058mc7k9wdnlh60z1xa3wk2nmf71wl7w59m4szh92")))) + "0czwdy1s8h3slaw73pz0h8qmqczf5135fz6i46i2dv1ql2pbq49x")))) (build-system r-build-system) (native-inputs `(("r-rcpp" ,r-rcpp) -- cgit v1.2.3 From 4fe0efddfe81a73f7193059b7a590c526cc3bb53 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:32:50 +0200 Subject: gnu: r-htmlwidgets: Update to 1.2. * gnu/packages/web.scm (r-htmlwidgets): Update to 1.2. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 050e1a1229..05e119e71d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3893,13 +3893,13 @@ (define-public r-htmltools (define-public r-htmlwidgets (package (name "r-htmlwidgets") - (version "1.0") + (version "1.2") (source (origin (method url-fetch) (uri (cran-uri "htmlwidgets" version)) (sha256 (base32 - "09lkmzh35l1420sg0dyh4vgyishqx3g8xmgs2y9z7lbi09xgwwwr")))) + "04c4d0mfcy3dkdlbxnaccpdgxvyxfdwfmmh5djim6v9hyg0j2z8s")))) (build-system r-build-system) (propagated-inputs `(("r-htmltools" ,r-htmltools) -- cgit v1.2.3 From 61c868e1f5ae6857c40af5056bf9f639da1b1610 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:33:03 +0200 Subject: gnu: r-shinydashboard: Update to 0.7.0. * gnu/packages/web.scm (r-shinydashboard): Update to 0.7.0. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 05e119e71d..2b5085600b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5434,13 +5434,13 @@ (define-public r-shiny (define-public r-shinydashboard (package (name "r-shinydashboard") - (version "0.6.1") + (version "0.7.0") (source (origin (method url-fetch) (uri (cran-uri "shinydashboard" version)) (sha256 (base32 - "14zi7g5wrngy6lwi9xpvaid7727m6rfdijbb89al9likfhjqzqqy")))) + "10yqcqqcxgfqwkmscqwvvgr710im583qsqnsqkfpisjvkqp10yqb")))) (build-system r-build-system) ;; The directory inst/AdminLTE/ contains a minified JavaScript file. ;; Regenerate it from the included sources. -- cgit v1.2.3 From 2bcf5fd337983ddb5cd4f10fb040f8491df72903 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:33:17 +0200 Subject: gnu: r-subplex: Update to 1.5-4. * gnu/packages/maths.scm (r-subplex): Update to 1.5-4. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f4ebd886be..353aa41167 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3830,14 +3830,14 @@ (define-public mcrl2 (define-public r-subplex (package (name "r-subplex") - (version "1.5-2") + (version "1.5-4") (source (origin (method url-fetch) (uri (cran-uri "subplex" version)) (sha256 (base32 - "1v9xrnkapnq7v1jbhlg32ignklzf2vn8rqpayc8pzk8wvz53r33g")))) + "10cbgbx1bgsax5z7gz6716g360xpq4mvq19cf4qqrxv02mmwz57z")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From 8cf7b28ffef6ef59c8733f5e186e65967a83af3d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:33:33 +0200 Subject: gnu: r-igraph: Update to 1.2.1. * gnu/packages/graph.scm (r-igraph): Update to 1.2.1. [inputs]: Add glpk and zlib. [propagated-inputs]: Remove r-irlba. --- gnu/packages/graph.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 74fbe9e84e..a9ee949855 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -98,23 +98,24 @@ (define-public python-igraph (define-public r-igraph (package (name "r-igraph") - (version "1.1.2") + (version "1.2.1") (source (origin (method url-fetch) (uri (cran-uri "igraph" version)) (sha256 (base32 - "1v26wyk52snh8z6m5p7yqwcd9dbqifhm57j112i9x53ppi0npcc9")))) + "1hcr6b1lz030lgay1bz8y8sxaf2j93ds8n8gsqr6qhssz141hd2m")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) (inputs `(("gmp" ,gmp) - ("libxml2" ,libxml2))) + ("glpk" ,glpk) + ("libxml2" ,libxml2) + ("zlib" ,zlib))) (propagated-inputs - `(("r-irlba" ,r-irlba) - ("r-magrittr" ,r-magrittr) + `(("r-magrittr" ,r-magrittr) ("r-matrix" ,r-matrix) ("r-pkgconfig" ,r-pkgconfig))) (home-page "http://igraph.org") -- cgit v1.2.3 From 5895f238d746dfaebb4e80c25c8e954dc681a302 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:34:06 +0200 Subject: gnu: r-maps: Update to 3.3.0. * gnu/packages/geo.scm (r-maps): Update to 3.3.0. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 9c7c071db0..46389de779 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -499,14 +499,14 @@ (define-public spatialite-gui (define-public r-maps (package (name "r-maps") - (version "3.2.0") + (version "3.3.0") (source (origin (method url-fetch) (uri (cran-uri "maps" version)) (sha256 (base32 - "0577f3b5d3a7djl7r0miy9mzr6xq6jb32p8nyrma7m2azasbwyj3")))) + "05i2ppl5z4p8rawgqmy3z4ia05fcblpq1vvrmrkgkkpdlhczx6hr")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/maps") (synopsis "Draw geographical maps") -- cgit v1.2.3 From 2ef5ab87491cda162f2198a56b1fe450141ce42c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:34:15 +0200 Subject: gnu: r-mapproj: Update to 1.2.6. * gnu/packages/geo.scm (r-mapproj): Update to 1.2.6. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 46389de779..0ec3d6e756 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -518,14 +518,14 @@ (define-public r-maps (define-public r-mapproj (package (name "r-mapproj") - (version "1.2-5") + (version "1.2.6") (source (origin (method url-fetch) (uri (cran-uri "mapproj" version)) (sha256 (base32 - "0rjz37r4rizk2c6jaf54f0kfb60dqv6b262cnhiwjl55d4x6l0pk")))) + "1rggww8cbwv0vzlj5afzhbsbngg4bzj5znbkz7wmxsbshfbsm9b2")))) (build-system r-build-system) (propagated-inputs `(("r-maps" ,r-maps))) (home-page "https://cran.r-project.org/web/packages/mapproj") -- cgit v1.2.3 From 3db5d04cccc4b0a05e51ba5bd369b0530a82bc61 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:34:43 +0200 Subject: gnu: r-vegan: Update to 2.5-1. * gnu/packages/bioinformatics.scm (r-vegan): Update to 2.5-1. [propagated-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0e9e6b13fd..6cfe251d15 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6083,19 +6083,20 @@ (define-public r-centipede (define-public r-vegan (package (name "r-vegan") - (version "2.4-6") + (version "2.5-1") (source (origin (method url-fetch) (uri (cran-uri "vegan" version)) (sha256 (base32 - "175mqr42mmxy98gpf3rky8alnkw3w1k90ggdw3cispl36841p76w")))) + "0pynr02d1xngda6c3va8fc4nxpgfkawhzcnz1ws4dnarp9b1w90r")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) (propagated-inputs `(("r-cluster" ,r-cluster) + ("r-knitr" ,r-knitr) ("r-lattice" ,r-lattice) ("r-mass" ,r-mass) ("r-mgcv" ,r-mgcv) -- cgit v1.2.3 From 4207770218f2041c34e0061bb21bdf081fb76ec0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:34:55 +0200 Subject: gnu: r-dexseq: Update to 1.24.4. * gnu/packages/bioinformatics.scm (r-dexseq): Update to 1.24.4. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6cfe251d15..460fbc473f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6252,14 +6252,14 @@ (define-public r-deseq2 (define-public r-dexseq (package (name "r-dexseq") - (version "1.24.3") + (version "1.24.4") (source (origin (method url-fetch) (uri (bioconductor-uri "DEXSeq" version)) (sha256 (base32 - "0xip73hlbr3zry9d7ly9vvvsbb3xjcmfa09lr9fdy528dwjrf084")))) + "1a80yv742fx5c7qav7imsdybphf0d5bixsqyf8w5zng7fk8j16d5")))) (properties `((upstream-name . "DEXSeq"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 0bd5c7b859cef32defedc04181bbe7bd8c4f7c70 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:35:04 +0200 Subject: gnu: r-genomicalignments: Update to 1.14.2. * gnu/packages/bioinformatics.scm (r-genomicalignments): Update to 1.14.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 460fbc473f..21a2400ba2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7590,13 +7590,13 @@ (define-public r-summarizedexperiment (define-public r-genomicalignments (package (name "r-genomicalignments") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicAlignments" version)) (sha256 (base32 - "033p6fw46sn7w2yyn14nb9qcnkf30cl0nv6zh014ixflm3iifz39")))) + "1659nj1xps7vliy5955i51x6hvrf16n1z0dfh10mmpaaswn2d2mv")))) (properties `((upstream-name . "GenomicAlignments"))) (build-system r-build-system) -- cgit v1.2.3 From fc6d3e26064bbdc1edce8797f0b08820406b5692 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:35:20 +0200 Subject: gnu: r-ggbio: Update to 1.26.1. * gnu/packages/bioinformatics.scm (r-ggbio): Update to 1.26.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 21a2400ba2..00c2ec37da 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10171,14 +10171,14 @@ (define-public r-biovizbase (define-public r-ggbio (package (name "r-ggbio") - (version "1.26.0") + (version "1.26.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ggbio" version)) (sha256 (base32 - "1bqxfqy0hff87ax92z4lfbjz01ndrz7x8pzm6dlkdmi52p30krm9")))) + "1xlmlngn27iwnr21s9di4059kav1a7c1sajx08wja8yn8f7j06hp")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) -- cgit v1.2.3 From 8defca1d943fd5ed2164e07e307f54e2888276eb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:35:31 +0200 Subject: gnu: r-gprofiler: Update to 0.6.6. * gnu/packages/bioinformatics.scm (r-gprofiler): Update to 0.6.6. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 00c2ec37da..46a8eb2a67 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10223,14 +10223,14 @@ (define-public r-ggbio (define-public r-gprofiler (package (name "r-gprofiler") - (version "0.6.4") + (version "0.6.6") (source (origin (method url-fetch) (uri (cran-uri "gProfileR" version)) (sha256 (base32 - "1cka02zbz1rbppm782qpxk1xn9qxbrv2gp5rgf970j906hxm2y0b")))) + "1n6cj12j102b4x9vhyl4dljp1i0r43p23cnhqbx4als2xfxdlqgi")))) (properties `((upstream-name . "gProfileR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From fb1dcfac46f075fe217b88c0b66f916588fd8886 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:35:42 +0200 Subject: gnu: r-erma: Update to 0.10.1. * gnu/packages/bioinformatics.scm (r-erma): Update to 0.10.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 46a8eb2a67..7ee5a5f486 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10341,14 +10341,14 @@ (define-public r-homo-sapiens (define-public r-erma (package (name "r-erma") - (version "0.10.0") + (version "0.10.1") (source (origin (method url-fetch) (uri (bioconductor-uri "erma" version)) (sha256 (base32 - "0gcfs9g8vvdv5vmq9b21kd8sq5mizjj49nfzd4in9zvp4b9v7x1g")))) + "1fi8nc6fbd7i4p9i9hli31xplmdpsxqcdrb8v3nf8fx9klllbdav")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) -- cgit v1.2.3 From b6d7deca559c4476b4c3165b096a4386ddf66db6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:35:55 +0200 Subject: gnu: r-ldblock: Update to 1.8.1. * gnu/packages/bioinformatics.scm (r-ldblock): Update to 1.8.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7ee5a5f486..1b1b95442f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10377,14 +10377,14 @@ (define-public r-erma (define-public r-ldblock (package (name "r-ldblock") - (version "1.8.0") + (version "1.8.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ldblock" version)) (sha256 (base32 - "18nfsixh6d2wfrb9laqsgly5w1frzihhak683k0p8fdf51h4aqba")))) + "1q8dz8wcq1r7kr635s9q21g36sxkdybk8khhpa4p57qv8r0gppl0")))) (build-system r-build-system) (propagated-inputs `(("r-erma" ,r-erma) -- cgit v1.2.3 From 80323c3c13c90003bf2c8081c0bf9d95fa44e18a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:36:05 +0200 Subject: gnu: r-hitc: Update to 1.22.1. * gnu/packages/bioinformatics.scm (r-hitc): Update to 1.22.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1b1b95442f..57b3fd5d8e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10594,13 +10594,13 @@ (define-public r-fithic (define-public r-hitc (package (name "r-hitc") - (version "1.22.0") + (version "1.22.1") (source (origin (method url-fetch) (uri (bioconductor-uri "HiTC" version)) (sha256 (base32 - "0288xa1jy6nzvz2ha07csmp6dirjw5r7p9vy69q2wsbyzr02ymkp")))) + "0da1jw9my2n2gihs31zyn14wwr23d8v2vij39ll7rm6fma3ydfbl")))) (properties `((upstream-name . "HiTC"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From aeca5f0c5bc074c2a77082f7685e578f170db09c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:36:15 +0200 Subject: gnu: r-scran: Update to 1.6.9. * gnu/packages/bioinformatics.scm (r-scran): Update to 1.6.9. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 57b3fd5d8e..a000d9d1fc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10842,14 +10842,14 @@ (define-public r-scater (define-public r-scran (package (name "r-scran") - (version "1.6.8") + (version "1.6.9") (source (origin (method url-fetch) (uri (bioconductor-uri "scran" version)) (sha256 (base32 - "07wniyrh2fhhkz28v0bfgpvpi1hkkn2cvhacrvvvck142j79944x")))) + "0cs64cnf0xjcgmawr210y99j3gxs6aqgh8081n9827kkqnx2y5dm")))) (build-system r-build-system) (propagated-inputs `(("r-beachmat" ,r-beachmat) -- cgit v1.2.3 From 41e8bd77f3645c61adba01b1291aa370fdb88362 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:37:51 +0200 Subject: gnu: r-selectr: Update to 0.4-1. * gnu/packages/cran.scm (r-selectr): Update to 0.4-1. [propagated-inputs]: Add r-r6. --- gnu/packages/cran.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0ac35a909b..1bd995df94 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -113,16 +113,18 @@ (define-public r-rvest (define-public r-selectr (package (name "r-selectr") - (version "0.3-2") + (version "0.4-1") (source (origin (method url-fetch) (uri (cran-uri "selectr" version)) (sha256 (base32 - "0kdrj64rqg4z6hg92y9r2h602a2i73r5rnlpg23ys33d5d32n8jy")))) + "1jp27rxks4w29l47k42869hp8hnkzq2rnvsqbr44wd19fqb2zm4b")))) (build-system r-build-system) - (propagated-inputs `(("r-stringr" ,r-stringr))) + (propagated-inputs + `(("r-stringr" ,r-stringr) + ("r-r6" ,r-r6))) (home-page "https://sjp.co.nz/projects/selectr/") (synopsis "Translate CSS selectors to XPath expressions") (description -- cgit v1.2.3 From 1d612cefc83c4c330ed825d5837a9958e0105c75 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:38:13 +0200 Subject: gnu: r-readxl: Update to 1.1.0. * gnu/packages/cran.scm (r-readxl): Update to 1.1.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1bd995df94..9dde1e8981 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -192,14 +192,14 @@ (define-public r-callr (define-public r-readxl (package (name "r-readxl") - (version "1.0.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "readxl" version)) (sha256 (base32 - "1bf7gxw9r11m4llyymplxiaa4gzgyj4bwmwad5in756pzq3jzmpv")))) + "05ii8knrg4jji6h7bv6bfpn279b6x52yrskdx5rv7b0hcpy22gdn")))) (build-system r-build-system) (propagated-inputs `(("r-cellranger" ,r-cellranger) -- cgit v1.2.3 From 0e947804464c9ff729b79f93664572181653b54b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:38:28 +0200 Subject: gnu: r-plogr: Update to 0.2.0. * gnu/packages/cran.scm (r-plogr): Update to 0.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9dde1e8981..39d4add137 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -406,14 +406,14 @@ (define-public r-pastecs (define-public r-plogr (package (name "r-plogr") - (version "0.1-1") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "plogr" version)) (sha256 (base32 - "13zliqlbkl8b04k9ga0sx5jsh7k867gracgl84l2a9kcqy9mqx92")))) + "0a8dhzlna79ggyhfr0nncgh15a9n6r0dsz664pz0ah323wpblqqf")))) (build-system r-build-system) (home-page "https://github.com/krlmlr/plogr") (synopsis "R bindings for the plog C++ logging library") -- cgit v1.2.3 From dfd7299957ea42853e12e7bdfef2e1a792341c92 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:38:39 +0200 Subject: gnu: r-rcpp: Update to 0.12.16. * gnu/packages/cran.scm (r-rcpp): Update to 0.12.16. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 39d4add137..8316f3958b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -426,13 +426,13 @@ (define-public r-plogr (define-public r-rcpp (package (name "r-rcpp") - (version "0.12.15") + (version "0.12.16") (source (origin (method url-fetch) (uri (cran-uri "Rcpp" version)) (sha256 - (base32 "1pnv6sl4vdn69ygmgrb1b3gsigfdcfb56wnzikic93l8gkvdsvxv")))) + (base32 "1rm8hcy72p1jvxikvmkwg20pjqmvmfvqb45lfghmddp2adp67qfl")))) (build-system r-build-system) (home-page "http://www.rcpp.org") (synopsis "Seamless R and C++ integration") -- cgit v1.2.3 From eb575e95fbb3ed3296a6fb5fd90e252a495be11b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:38:50 +0200 Subject: gnu: r-bindr: Update to 0.1.1. * gnu/packages/cran.scm (r-bindr): Update to 0.1.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8316f3958b..cda56e66b2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -450,14 +450,14 @@ (define-public r-rcpp (define-public r-bindr (package (name "r-bindr") - (version "0.1") + (version "0.1.1") (source (origin (method url-fetch) (uri (cran-uri "bindr" version)) (sha256 (base32 - "0d95ifm0x4mrfzi20xf39f5pzd7rfzqsld0vjqf6xzga5rhnd8fc")))) + "1l05fpk2yql3jka321c0bdgx6mqq9pvfrg2844lbjfpbgjkmqy3w")))) (build-system r-build-system) (home-page "https://github.com/krlmlr/bindr") (synopsis "Parametrized active bindings") -- cgit v1.2.3 From 9f17c0560f0d6be11d0bb4cc751ac1c08e54f88c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:38:59 +0200 Subject: gnu: r-bindrcpp: Update to 0.2.2. * gnu/packages/cran.scm (r-bindrcpp): Update to 0.2.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cda56e66b2..75eaad82ae 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -469,14 +469,14 @@ (define-public r-bindr (define-public r-bindrcpp (package (name "r-bindrcpp") - (version "0.2") + (version "0.2.2") (source (origin (method url-fetch) (uri (cran-uri "bindrcpp" version)) (sha256 (base32 - "0l1l22zl87wiyl79m3gj2vlxmkhxvrkl4alhyy08h55q7hqs3vyh")))) + "0rz4ibjdjsxl99ff3ha79z7cnjmilx4rx58fk9kk7ld9xc4hf4s8")))) (build-system r-build-system) (propagated-inputs `(("r-bindr" ,r-bindr) -- cgit v1.2.3 From cf0da489ff7e650fcfa501e4c7a60aa6ae4bd0dd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:39:10 +0200 Subject: gnu: r-globaloptions: Update to 0.0.13. * gnu/packages/cran.scm (r-globaloptions): Update to 0.0.13. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 75eaad82ae..38d0167a4d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -556,14 +556,14 @@ (define-public r-shape (define-public r-globaloptions (package (name "r-globaloptions") - (version "0.0.12") + (version "0.0.13") (source (origin (method url-fetch) (uri (cran-uri "GlobalOptions" version)) (sha256 (base32 - "1abpc03cfvazbwj2sx6qgngs5pgpzysvxkana20hyvb4n7ws77f0")))) + "04jvha0mafslqz5nr99xjylg9n2x31gj9v4mgyg7qcmfwpqyw3ch")))) (properties `((upstream-name . "GlobalOptions"))) (build-system r-build-system) (home-page "https://github.com/jokergoo/GlobalOptions") -- cgit v1.2.3 From 9ebfdcd36c75cfa96cd5ff4fad10ec17e4103c6d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:39:25 +0200 Subject: gnu: r-rmpi: Update to 0.6-7. * gnu/packages/cran.scm (r-rmpi): Update to 0.6-7. [native-inputs]: Add pkg-config. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 38d0167a4d..8b22b55d06 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -938,19 +938,21 @@ (define-public r-rmtstat (define-public r-rmpi (package (name "r-rmpi") - (version "0.6-6") + (version "0.6-7") (source (origin (method url-fetch) (uri (cran-uri "Rmpi" version)) (sha256 (base32 - "0fm6z049aaq2c9xagm8n64d9560hg9d8hyb0m359fii672nhkz6q")))) + "1b62gs7w1xqadqd7ir41jnxlcf14gcqfxd0915kn9ckdlsdrh0sw")))) (properties `((upstream-name . "Rmpi"))) (build-system r-build-system) (arguments `(#:configure-flags '("--configure-args=\"--with-Rmpi-type=OPENMPI\""))) (inputs `(("openmpi" ,openmpi))) + (native-inputs + `(("pkg-config" ,pkg-config))) (home-page "http://www.stats.uwo.ca/faculty/yu/Rmpi") (synopsis "R interface to message-passing interface (MPI)") (description -- cgit v1.2.3 From 3e00e3a88514879a7800380c4d83792a4ceaffda Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:40:16 +0200 Subject: gnu: r-lava: Update to 1.6.1. * gnu/packages/cran.scm (r-lava): Update to 1.6.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8b22b55d06..b94c85f820 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1368,14 +1368,14 @@ (define-public r-squarem (define-public r-lava (package (name "r-lava") - (version "1.6") + (version "1.6.1") (source (origin (method url-fetch) (uri (cran-uri "lava" version)) (sha256 (base32 - "02xf5d968raz9gnq5ywy04wz29xpdyca1hm79vbbg1mcxvzdl1dz")))) + "11k9npmzp3nk2qx0h1dwwfc37j4ddd9y54bppxby0ffnb8qlpw1k")))) (build-system r-build-system) (propagated-inputs `(("r-numderiv" ,r-numderiv) -- cgit v1.2.3 From 9ee81a36aa483fac61e32d8d5acba60295b2d5e0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:40:38 +0200 Subject: gnu: r-prodlim: Update to 2018.04.18. * gnu/packages/cran.scm (r-prodlim): Update to 2018.04.18. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b94c85f820..7fb52e0691 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1415,14 +1415,14 @@ (define-public r-drr (define-public r-prodlim (package (name "r-prodlim") - (version "1.6.1") + (version "2018.04.18") (source (origin (method url-fetch) (uri (cran-uri "prodlim" version)) (sha256 (base32 - "0m51rkivx1zr6whdqwj66jpnkmp4385m06kkha3dp8qqf4jna9iz")))) + "1aslq87sqwikh8chxc378r38146y7kv79zz0kcq3j93ivx7va8jb")))) (build-system r-build-system) (propagated-inputs `(("r-kernsmooth" ,r-kernsmooth) -- cgit v1.2.3 From 2ab8cbcd1f5c6fd5141809583fc29ef8b8ec9b57 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:41:02 +0200 Subject: gnu: r-stringdist: Update to 0.9.4.7. * gnu/packages/cran.scm (r-stringdist): Update to 0.9.4.7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7fb52e0691..1d55781596 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1765,14 +1765,14 @@ (define-public r-corrplot (define-public r-stringdist (package (name "r-stringdist") - (version "0.9.4.6") + (version "0.9.4.7") (source (origin (method url-fetch) (uri (cran-uri "stringdist" version)) (sha256 (base32 - "0j5b7hr53nr9xq44famkpwzi4khix93ffani5pwldqkf8bpdvhci")))) + "1qg80wmcrpkba9njvgjdg15bgw7ddks40kkfh5x61as9lhchy4i4")))) (build-system r-build-system) (home-page "https://github.com/markvanderloo/stringdist") (synopsis "Approximate string matching and string distance functions") -- cgit v1.2.3 From 1d310349bbf195a15fe9862407af5c17a631bdd6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:41:24 +0200 Subject: gnu: r-xts: Update to 0.10-2. * gnu/packages/cran.scm (r-xts): Update to 0.10-2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1d55781596..b01b4041e0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1990,14 +1990,14 @@ (define-public r-rsofia (define-public r-xts (package (name "r-xts") - (version "0.10-1") + (version "0.10-2") (source (origin (method url-fetch) (uri (cran-uri "xts" version)) (sha256 (base32 - "1j9ddh9v9081zrqlpylsk13fldilhjdyaw6r6pa726fhgnrsf8a2")))) + "1i11fczks4lh8rpi6xbm9bm7f3jpcp6xw03kv178g3n3361qhmc1")))) (build-system r-build-system) (propagated-inputs `(("r-zoo" ,r-zoo))) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From cb9f404187ef5fb8c2ba0e472e226ca4cc4d7b9d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:41:42 +0200 Subject: gnu: r-tinytex: Update to 0.5. * gnu/packages/cran.scm (r-tinytex): Update to 0.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b01b4041e0..5da02ecb13 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2559,14 +2559,14 @@ (define-public r-uuid (define-public r-tinytex (package (name "r-tinytex") - (version "0.3") + (version "0.5") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "0mhxlr4709mca9jshnah5i7yjyy6k12s933619p7p9c8nbqj39cn")))) + "1pg4jfyvandjwz3lmr38pbqi9d045iwkk3xklhsfhhxq6aviq9p7")))) (build-system r-build-system) (home-page "https://github.com/yihui/tinytex") (synopsis "Helper functions for TeX Live and compiling LaTeX documents") -- cgit v1.2.3 From d087f47d61f9a8dd3513aa622e678f6435bef24f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:42:06 +0200 Subject: gnu: r-quantmod: Update to 0.4-13. * gnu/packages/cran.scm (r-quantmod): Update to 0.4-13. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5da02ecb13..78e48df686 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2779,14 +2779,14 @@ (define-public r-sapa (define-public r-quantmod (package (name "r-quantmod") - (version "0.4-12") + (version "0.4-13") (source (origin (method url-fetch) (uri (cran-uri "quantmod" version)) (sha256 (base32 - "0y7gh0k1s10vdsfch8777avbhf99mc9crikvx7ahqrw0j631vmhq")))) + "16aldg96z7amp5mr90nb8127yy04gxsihfr26km5p3cx3j117yv0")))) (build-system r-build-system) (propagated-inputs `(("r-curl" ,r-curl) -- cgit v1.2.3 From 7bd6ecd7fa6c698a75b828a194a90560fdfe31a7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:42:20 +0200 Subject: gnu: r-psych: Update to 1.8.3.3. * gnu/packages/cran.scm (r-psych): Update to 1.8.3.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 78e48df686..789a81cd57 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3327,14 +3327,14 @@ (define-public r-signal (define-public r-psych (package (name "r-psych") - (version "1.7.8") + (version "1.8.3.3") (source (origin (method url-fetch) (uri (cran-uri "psych" version)) (sha256 (base32 - "0daismb8pdk392vdy304hqx0m3jx62gx3a0hygjygc125rhfla7k")))) + "1zhp8j81nkzd65168zdw9ylypb9n07ajan21x0wqcn8jdbg970sg")))) (build-system r-build-system) (propagated-inputs `(("r-foreign" ,r-foreign) -- cgit v1.2.3 From 2acc0e5f8f8b1147e4a35adf0566d4324521b290 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 08:42:36 +0200 Subject: gnu: r-gsubfn: Update to 0.7. * gnu/packages/cran.scm (r-gsubfn): Update to 0.7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 789a81cd57..bddeb66660 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3358,14 +3358,14 @@ (define-public r-psych (define-public r-gsubfn (package (name "r-gsubfn") - (version "0.6-6") + (version "0.7") (source (origin (method url-fetch) (uri (cran-uri "gsubfn" version)) (sha256 (base32 - "196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv")))) + "00j6b8b6xsx6v370h220x233rpk6asca78165y3d48jpwvwisdc9")))) (build-system r-build-system) (propagated-inputs `(("r-proto" ,r-proto))) (home-page "http://gsubfn.googlecode.com") -- cgit v1.2.3 From f1c7a2428044136b41a2cc6cd344c4c7c20d5a22 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 09:21:49 +0200 Subject: gnu: Add r-cardata. * gnu/packages/statistics.scm (r-cardata): New variable. --- gnu/packages/statistics.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a76f1cbfc7..55b087cd78 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5123,6 +5123,26 @@ (define-public r-pbkrtest bootstrap test for generalized linear mixed models.") (license license:gpl2+))) +(define-public r-cardata + (package + (name "r-cardata") + (version "3.0-1") + (source + (origin + (method url-fetch) + (uri (cran-uri "carData" version)) + (sha256 + (base32 + "193pdwgw6gk19v7swk1kwphg3vqdmpsgi555g9nyz93sa39j7r8j")))) + (properties `((upstream-name . "carData"))) + (build-system r-build-system) + (home-page "https://r-forge.r-project.org/projects/car/") + (synopsis "Data Sets for the book Companion to Applied Regression") + (description + "This package provides datasets to accompany J. Fox and S. Weisberg, An R +Companion to Applied Regression, Third Edition, Sage.") + (license license:gpl2+))) + (define-public r-car (package (name "r-car") -- cgit v1.2.3 From ce4e81cb868307ab9ab84c4b07596a57ad0e57c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 09:22:14 +0200 Subject: gnu: Add r-magic. * gnu/packages/cran.scm (r-magic): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bddeb66660..2f4b2e5367 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1480,6 +1480,29 @@ (define-public r-timedate calendar objects.") (license license:gpl2+))) +(define-public r-magic + (package + (name "r-magic") + (version "1.5-8") + (source + (origin + (method url-fetch) + (uri (cran-uri "magic" version)) + (sha256 + (base32 + "083cgpp3v03li0h8597b3g21pd9lkbmn9pyssblnhc800mpc52vz")))) + (build-system r-build-system) + (propagated-inputs + `(("r-abind" ,r-abind))) + (home-page "https://github.com/RobinHankin/magic.git") + (synopsis "Create and investigate magic squares") + (description + "This package provides a collection of efficient, vectorized algorithms +for the creation and investigation of magic squares and hypercubes, including +a variety of functions for the manipulation and analysis of arbitrarily +dimensioned arrays.") + (license license:gpl2))) + (define-public r-ddalpha (package (name "r-ddalpha") -- cgit v1.2.3 From 9604429d7bf76ce39b600dde120bc4b372af54a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 09:22:24 +0200 Subject: gnu: Add r-geometry. * gnu/packages/cran.scm (r-geometry): New variable. --- gnu/packages/cran.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2f4b2e5367..1c540a3c46 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1503,6 +1503,36 @@ (define-public r-magic dimensioned arrays.") (license license:gpl2))) +(define-public r-geometry + (package + (name "r-geometry") + (version "0.3-6") + (source + (origin + (method url-fetch) + (uri (cran-uri "geometry" version)) + (sha256 + (base32 + "0s09vi0rr0smys3an83mz6fk41bplxyz4myrbiinf4qpk6n33qib")))) + (build-system r-build-system) + (propagated-inputs `(("r-magic" ,r-magic))) + (home-page "http://geometry.r-forge.r-project.org/") + (synopsis "Mesh generation and surface tesselation") + (description + "This package makes the qhull library available in R, in a similar manner +as in Octave. Qhull computes convex hulls, Delaunay triangulations, halfspace +intersections about a point, Voronoi diagrams, furthest-site Delaunay +triangulations, and furthest-site Voronoi diagrams. It runs in 2-d, 3-d, 4-d, +and higher dimensions. It implements the Quickhull algorithm for computing +the convex hull. Qhull does not support constrained Delaunay triangulations, +or mesh generation of non-convex objects, but the package does include some R +functions that allow for this. Currently the package only gives access to +Delaunay triangulation and convex hull computation.") + ;; The Qhull sources are included and are distributed under a custom + ;; non-copyleft license. The R sources are released under GPL version 2. + (license (list license:gpl2 + (license:non-copyleft "http://www.qhull.org/COPYING.txt"))))) + (define-public r-ddalpha (package (name "r-ddalpha") -- cgit v1.2.3 From 4f18423358f4dc9ee2bab9b4617fe42c3c71ef5e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 09:22:34 +0200 Subject: gnu: r-ddalpha: Update to 1.3.2. * gnu/packages/cran.scm (r-ddalpha): Update to 1.3.2. [propagated-inputs]: Add r-geometry. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1c540a3c46..0ee8693896 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1536,18 +1536,19 @@ (define-public r-geometry (define-public r-ddalpha (package (name "r-ddalpha") - (version "1.3.1.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (cran-uri "ddalpha" version)) (sha256 (base32 - "13w8ir5rd80rka4mq343zd4wn93vfw870lzfqrd3cxgwb1bwcw7y")))) + "1i2zcz20zy9xd42kdz09njbkq07mj2pp6f07z6dnwi5hrmvhbh9r")))) (build-system r-build-system) (propagated-inputs `(("r-bh" ,r-bh) ("r-class" ,r-class) + ("r-geometry" ,r-geometry) ("r-mass" ,r-mass) ("r-rcpp" ,r-rcpp) ("r-robustbase" ,r-robustbase) -- cgit v1.2.3 From 0edd2fd18622e4263f36164eac082be31581105c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 09:23:06 +0200 Subject: gnu: r-ggridges: Update to 0.5.0. * gnu/packages/cran.scm (r-ggridges): Update to 0.5.0. [propagated-inputs]: Add r-withr. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0ee8693896..8d15415b1a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2230,19 +2230,20 @@ (define-public r-scatterplot3d (define-public r-ggridges (package (name "r-ggridges") - (version "0.4.1") + (version "0.5.0") (source (origin (method url-fetch) (uri (cran-uri "ggridges" version)) (sha256 (base32 - "0kfa3icqdalqdg1klxjrhfl7if35d3wnsiyl86bprw5dyqyh3lh3")))) + "1znvsbl3px8dddpjgdrygnpz4s685wizi0jnjvx2hrz58i0chjqj")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) ("r-plyr" ,r-plyr) - ("r-scales" ,r-scales))) + ("r-scales" ,r-scales) + ("r-withr" ,r-withr))) (home-page "https://github.com/clauswilke/ggridges") (synopsis "Ridgeline plots in ggplot2") (description -- cgit v1.2.3 From 4b1f7a3e905026a55492d4db177a988dd1f2ca21 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 09:23:31 +0200 Subject: gnu: Add r-openxlsx. * gnu/packages/cran.scm (r-openxlsx): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8d15415b1a..94f7489efc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3763,3 +3763,26 @@ (define-public r-abc measuring the accuracy of ABC estimates, and to calculate the misclassification probabilities of different models.") (license license:gpl3+))) + +(define-public r-openxlsx + (package + (name "r-openxlsx") + (version "4.0.17") + (source + (origin + (method url-fetch) + (uri (cran-uri "openxlsx" version)) + (sha256 + (base32 + "1mq4lasp12kc30sxcsmz9gskd114l8s7z7wd6svv2nm8qllrhsqi")))) + (build-system r-build-system) + (propagated-inputs `(("r-rcpp" ,r-rcpp))) + (home-page "https://github.com/awalker89/openxlsx") + (synopsis "Read, write and edit XLSX files") + (description + "This package simplifies the creation of Excel @code{.xlsx} files by +providing a high level interface to writing, styling and editing worksheets. +Through the use of Rcpp, read/write times are comparable to the @code{xlsx} +and @code{XLConnect} packages with the added benefit of removing the +dependency on Java.") + (license license:gpl3))) -- cgit v1.2.3 From c9920f25976bd947311023056f58c716a65da6c9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 09:23:42 +0200 Subject: gnu: Add r-rio. * gnu/packages/cran.scm (r-rio): New variable. --- gnu/packages/cran.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 94f7489efc..0b54ed0c0f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3786,3 +3786,37 @@ (define-public r-openxlsx and @code{XLConnect} packages with the added benefit of removing the dependency on Java.") (license license:gpl3))) + +(define-public r-rio + (package + (name "r-rio") + (version "0.5.10") + (source + (origin + (method url-fetch) + (uri (cran-uri "rio" version)) + (sha256 + (base32 + "158xg3vj0glk3fslwi6fywwmfym2b6kn3fdmjligdfy5lf68khix")))) + (build-system r-build-system) + (propagated-inputs + `(("r-curl" ,r-curl) + ("r-data-table" ,r-data-table) + ("r-foreign" ,r-foreign) + ("r-haven" ,r-haven) + ("r-openxlsx" ,r-openxlsx) + ("r-readxl" ,r-readxl) + ("r-tibble" ,r-tibble))) + (home-page "https://github.com/leeper/rio") + (synopsis "Swiss-army knife for data I/O") + (description + "This package provides streamlined data import and export infrastructure +by making assumptions that the user is probably willing to make: @code{import} +and @code{export} determine the data structure from the file extension, +reasonable defaults are used for data import and export (e.g., +@code{stringsAsFactors=FALSE}), web-based import is natively +supported (including from SSL/HTTPS), compressed files can be read directly +without explicit decompression, and fast import packages are used where +appropriate. An additional convenience function, @code{convert}, provides a +simple method for converting between file types.") + (license license:gpl2))) -- cgit v1.2.3 From 08dac3d9e674b1412edd000f55caaef45ae0ab4c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 09:23:50 +0200 Subject: gnu: Add r-maptools. * gnu/packages/cran.scm (r-maptools): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0b54ed0c0f..12f848974c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3820,3 +3820,31 @@ (define-public r-rio appropriate. An additional convenience function, @code{convert}, provides a simple method for converting between file types.") (license license:gpl2))) + +(define-public r-maptools + (package + (name "r-maptools") + (version "0.9-2") + (source + (origin + (method url-fetch) + (uri (cran-uri "maptools" version)) + (sha256 + (base32 + "075lmb3b62171cw2dg8fv1vwmvfzg39r1ji7jwb8s5k9dz88ry1v")))) + (build-system r-build-system) + (propagated-inputs + `(("r-foreign" ,r-foreign) + ("r-lattice" ,r-lattice) + ("r-sp" ,r-sp))) + (home-page "http://r-forge.r-project.org/projects/maptools/") + (synopsis "Tools for reading and handling spatial objects") + (description + "This package provides a set of tools for manipulating and reading +geographic data, in particular ESRI Shapefiles. It includes binary access to +GSHHG shoreline files. The package also provides interface wrappers for +exchanging spatial objects with other R packages.") + ;; The C source files from shapelib are released under the Expat license. + ;; The R code is released under GPL version 2 or later. + (license (list license:gpl2+ + license:expat)))) -- cgit v1.2.3 From 500224cb4cce6872f595ef0652991bfb606f12c3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 09:24:06 +0200 Subject: gnu: r-car: Update to 3.0-0. * gnu/packages/statistics.scm (r-car): Update to 3.0-0. [propagated-inputs]: Add r-abind, r-cardata, r-lme4, r-maptools, r-nlme, and r-rio. --- gnu/packages/statistics.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 55b087cd78..891274f0e2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5146,21 +5146,27 @@ (define-public r-cardata (define-public r-car (package (name "r-car") - (version "2.1-6") + (version "3.0-0") (source (origin (method url-fetch) (uri (cran-uri "car" version)) (sha256 (base32 - "14l4d9j87xnb0bz2wgqqbxnlnbcdfb5vx2fw6kdxj91kyrk6lhnj")))) + "1ks2jaav8lbxhzw56vpbnysjk3pvpmqh6avd574k0bha1226k81h")))) (build-system r-build-system) (propagated-inputs - `(("r-mass" ,r-mass) + `(("r-abind" ,r-abind) + ("r-cardata" ,r-cardata) + ("r-lme4" ,r-lme4) + ("r-maptools" ,r-maptools) + ("r-mass" ,r-mass) ("r-mgcv" ,r-mgcv) + ("r-nlme" ,r-nlme) ("r-nnet" ,r-nnet) ("r-pbkrtest" ,r-pbkrtest) - ("r-quantreg" ,r-quantreg))) + ("r-quantreg" ,r-quantreg) + ("r-rio" ,r-rio))) (home-page "https://r-forge.r-project.org/projects/car/") (synopsis "Companion to applied regression") (description -- cgit v1.2.3 From 284179bbb395000957be4b891be5cf1f76d88c39 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 09:27:09 +0200 Subject: gnu: Add r-later. * gnu/packages/cran.scm (r-later): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 12f848974c..cc81815bdb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3848,3 +3848,26 @@ (define-public r-maptools ;; The R code is released under GPL version 2 or later. (license (list license:gpl2+ license:expat)))) + +(define-public r-later + (package + (name "r-later") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "later" version)) + (sha256 + (base32 + "0z9jymmclkq9zcg1fd8p6gsnm5z1sn3n9pfz3bs03qjrkbizgrvz")))) + (build-system r-build-system) + (propagated-inputs + `(("r-bh" ,r-bh) + ("r-rcpp" ,r-rcpp) + ("r-rlang" ,r-rlang))) + (home-page "https://github.com/r-lib/later") + (synopsis "Utilities for delaying function execution") + (description + "This package provides tools to execute arbitrary R or C functions some +time after the current time, after the R execution stack has emptied.") + (license license:gpl2+))) -- cgit v1.2.3 From d9d66ba963bafaac706044b23407794167f69eab Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 09:27:17 +0200 Subject: gnu: Add r-promises. * gnu/packages/cran.scm (r-promises): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cc81815bdb..88be6b3d44 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3871,3 +3871,31 @@ (define-public r-later "This package provides tools to execute arbitrary R or C functions some time after the current time, after the R execution stack has emptied.") (license license:gpl2+))) + +(define-public r-promises + (package + (name "r-promises") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "promises" version)) + (sha256 + (base32 + "0n2mlv6bvfb4yhgcml696l9vkbw21pz0smqylivr606z99rwgny2")))) + (build-system r-build-system) + (propagated-inputs + `(("r-later" ,r-later) + ("r-magrittr" ,r-magrittr) + ("r-r6" ,r-r6) + ("r-rcpp" ,r-rcpp) + ("r-rlang" ,r-rlang))) + (home-page "https://rstudio.github.io/promises") + (synopsis "Abstractions for promise-based asynchronous programming") + (description + "This package provides fundamental abstractions for doing asynchronous +programming in R using promises. Asynchronous programming is useful for +allowing a single R process to orchestrate multiple tasks in the background +while also attending to something else. Semantics are similar to JavaScript +promises, but with a syntax that is idiomatic R.") + (license license:expat))) -- cgit v1.2.3 From 5150a52d036e4853a64a05b1ef37b89fb6b8757f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 09:27:35 +0200 Subject: gnu: r-httpuv: Update to 1.4.0. * gnu/packages/web.scm (r-httpuv): Update to 1.4.0. [propagated-inputs]: Add r-bh, r-later, and r-promises. --- gnu/packages/web.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2b5085600b..f6e9c9c8fe 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3785,15 +3785,19 @@ (define-public python2-feedparser (define-public r-httpuv (package (name "r-httpuv") - (version "1.3.6.2") + (version "1.4.0") (source (origin (method url-fetch) (uri (cran-uri "httpuv" version)) (sha256 (base32 - "0h3hkw575b211bxma23inbq1565wkhiapgasd539h219apqs534f")))) + "076blaj0vzwfgx212lvgscczmiy9n13izdshrm6xb9vpcmklm95m")))) (build-system r-build-system) (native-inputs `(("r-rcpp" ,r-rcpp))) + (propagated-inputs + `(("r-bh" ,r-bh) + ("r-later" ,r-later) + ("r-promises" ,r-promises))) (home-page "https://github.com/rstudio/httpuv") (synopsis "HTTP and WebSocket server library for R") (description -- cgit v1.2.3 From 6ab97ed56a08a161dce54b790aa7d134546bcbd1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 22:24:40 +0200 Subject: gnu: r-lambda-r: Update to 1.2.2. * gnu/packages/statistics.scm (r-lambda-r): Update to 1.2.2. [arguments]: Remove. [native-inputs]: Remove. [propagated-inputs]: Add r-formatr. --- gnu/packages/statistics.scm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 891274f0e2..f3fa7271a7 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2820,28 +2820,17 @@ (define-public r-xnomial (define-public r-lambda-r (package (name "r-lambda-r") - (version "1.2") + (version "1.2.2") (source (origin (method url-fetch) (uri (cran-uri "lambda.r" version)) (sha256 (base32 - "0vql32np716dpd0kjn7s7wgawd02ysgp2a5il4kb19nlw661ii3x")))) + "05cfaq9dbgdnmmj3d6ggmsw300qgiw8k7f6h6k0ylv63cf3v6pkq")))) (properties `((upstream-name . "lambda.r"))) (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'check 'delete-test-log - ;; The test report contains time stamps and is not important for - ;; the installed package. - (lambda* (#:key outputs #:allow-other-keys) - (delete-file-recursively - (string-append (assoc-ref outputs "out") - "/site-library/lambda.r/unitTests")) - #t))))) - (native-inputs - `(("r-runit" ,r-runit))) + (propagated-inputs + `(("r-formatr" ,r-formatr))) (home-page "https://cran.r-project.org/web/packages/lambda.r") (synopsis "Functional programming extension for R") (description -- cgit v1.2.3 From 3cf9ae2f758d130fe4e9dcb3535bd5b8b4bb0377 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 22:25:43 +0200 Subject: gnu: Add r-dosnow. * gnu/packages/cran.scm (r-dosnow): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 88be6b3d44..ec1f2e10f4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3899,3 +3899,27 @@ (define-public r-promises while also attending to something else. Semantics are similar to JavaScript promises, but with a syntax that is idiomatic R.") (license license:expat))) + +(define-public r-dosnow + (package + (name "r-dosnow") + (version "1.0.16") + (source + (origin + (method url-fetch) + (uri (cran-uri "doSNOW" version)) + (sha256 + (base32 + "13ir4a8252h4yvp5ir9xnwack1kn58i4ny6sf2qdc12zspn3850n")))) + (properties `((upstream-name . "doSNOW"))) + (build-system r-build-system) + (propagated-inputs + `(("r-foreach" ,r-foreach) + ("r-iterators" ,r-iterators) + ("r-snow" ,r-snow))) + (home-page "https://cran.r-project.org/web/packages/doSNOW") + (synopsis "Foreach parallel adaptor for the snow package") + (description + "This package provides a parallel backend for the @code{%dopar%} function +using the @code{snow} package.") + (license license:gpl2))) -- cgit v1.2.3 From c36ce4763550deb521009ed3c5e83911e4e85005 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 22:25:50 +0200 Subject: gnu: r-seurat: Update to 2.3.0. * gnu/packages/bioinformatics.scm (r-seurat): Update to 2.3.0. [propagated-inputs]: Add r-cluster, r-dosnow, r-fitdistrplus, r-foreach, r-lmtest, r-png, and r-rann. --- gnu/packages/bioinformatics.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a000d9d1fc..a060139755 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9638,13 +9638,13 @@ (define-public r-msnid (define-public r-seurat (package (name "r-seurat") - (version "2.2.1") + (version "2.3.0") (source (origin (method url-fetch) (uri (cran-uri "Seurat" version)) (sha256 (base32 - "1sr82nf38hq07avrfn8vlrzjq7dfm4pcr8l1nh6mnglcql2bk9z2")) + "0kp3lw1s896zkjd6x2wp8qcg7wnm5b40g8vihps13f1m7j4nx7r0")) ;; Delete pre-built jar. (snippet '(begin (delete-file "inst/java/ModularityOptimizer.jar") @@ -9674,11 +9674,15 @@ (define-public r-seurat (propagated-inputs `(("r-ape" ,r-ape) ("r-caret" ,r-caret) + ("r-cluster" ,r-cluster) ("r-cowplot" ,r-cowplot) ("r-diffusionmap" ,r-diffusionmap) + ("r-dosnow" ,r-dosnow) ("r-dplyr" ,r-dplyr) ("r-dtw" ,r-dtw) + ("r-fitdistrplus" ,r-fitdistrplus) ("r-fnn" ,r-fnn) + ("r-foreach" ,r-foreach) ("r-fpc" ,r-fpc) ("r-gdata" ,r-gdata) ("r-ggplot2" ,r-ggplot2) @@ -9690,13 +9694,16 @@ (define-public r-seurat ("r-igraph" ,r-igraph) ("r-irlba" ,r-irlba) ("r-lars" ,r-lars) + ("r-lmtest" ,r-lmtest) ("r-mass" ,r-mass) ("r-matrix" ,r-matrix) ("r-metap" ,r-metap) ("r-mixtools" ,r-mixtools) ("r-pbapply" ,r-pbapply) ("r-plotly" ,r-plotly) + ("r-png" ,r-png) ("r-ranger" ,r-ranger) + ("r-rann" ,r-rann) ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-rcpp" ,r-rcpp) ("r-rcppeigen" ,r-rcppeigen) -- cgit v1.2.3 From 2cf42ec611810e2ff7c3ed42192128e3d6a2478b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Apr 2018 23:07:10 +0200 Subject: gnu: r-httpuv: Update to 1.4.1. * gnu/packages/web.scm (r-httpuv): Update to 1.4.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f6e9c9c8fe..2b88e6920d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3785,13 +3785,13 @@ (define-public python2-feedparser (define-public r-httpuv (package (name "r-httpuv") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (cran-uri "httpuv" version)) (sha256 (base32 - "076blaj0vzwfgx212lvgscczmiy9n13izdshrm6xb9vpcmklm95m")))) + "1pndv0h870ygibk0bmg9ayzkls60jqscrsyk39k29gy2pvm9ha5y")))) (build-system r-build-system) (native-inputs `(("r-rcpp" ,r-rcpp))) (propagated-inputs -- cgit v1.2.3 From e33498b86835beb6c85376e5763426406afb3e94 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 22 Apr 2018 09:42:14 +0300 Subject: gnu: cran.scm: Add missing module. This is a follow-up to 9ebfdcd36c75cfa96cd5ff4fad10ec17e4103c6d. * gnu/packages/cran.scm: Import pkg-config. --- gnu/packages/cran.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ec1f2e10f4..9dc075ffb8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -35,6 +35,7 @@ (define-module (gnu packages cran) #:use-module (gnu packages maths) #:use-module (gnu packages mpi) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages statistics) #:use-module (gnu packages web)) -- cgit v1.2.3 From f1104d900978900addad731dfec4e0e6e5765fbe Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Sat, 16 Dec 2017 00:52:42 -0800 Subject: services: Add dhcpd-service-type and . * doc/guix.texi (Networking Services): Document it. * gnu/services/networking.scm (dhcpd-service-type): Add it. (dhcpd-configuration, dhcpd-configuration?): Add it. (dhcpd-configuration-package): Add it. (dhcpd-configuration-config-file): Add it. (dhcpd-configuration-version): Add it. (dhcpd-configuration-run-directory): Add it. (dhcpd-configuration-lease-file): Add it. (dhcpd-configuration-pid-file): Add it. (dhcpd-configuration-interfaces): Add it. * gnu/tests/networking.scm (minimal-dhcpd-v4-config-file) (dhcpd-v4-configuration, %dhcpd-os, run-dhcpd-test, %test-dhcpd): New variables. --- doc/guix.texi | 45 +++++++++++++++++++++ gnu/services/networking.scm | 78 ++++++++++++++++++++++++++++++++++++ gnu/tests/networking.scm | 97 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 219 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 1bf9685542..75886e94b3 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -10694,6 +10694,51 @@ Return a service that runs @var{dhcp}, a Dynamic Host Configuration Protocol (DHCP) client, on all the non-loopback network interfaces. @end deffn +@deffn {Scheme Procedure} dhcpd-service-type +This type defines a service that runs a DHCP daemon. To create a +service of this type, you must supply a @code{}. +For example: + +@example +(service dhcpd-service-type + (dhcpd-configuration + (config-file (local-file "my-dhcpd.conf")) + (interfaces '("enp0s25")))) +@end example +@end deffn + +@deftp {Data Type} dhcpd-configuration +@table @asis +@item @code{package} (default: @code{isc-dhcp}) +The package that provides the DHCP daemon. This package is expected to +provide the daemon at @file{sbin/dhcpd} relative to its output +directory. The default package is the +@uref{http://www.isc.org/products/DHCP, ISC's DHCP server}. +@item @code{config-file} (default: @code{#f}) +The configuration file to use. This is required. It will be passed to +@code{dhcpd} via its @code{-cf} option. This may be any ``file-like'' +object (@pxref{G-Expressions, file-like objects}). See @code{man +dhcpd.conf} for details on the configuration file syntax. +@item @code{version} (default: @code{"4"}) +The DHCP version to use. The ISC DHCP server supports the values ``4'', +``6'', and ``4o6''. These correspond to the @code{dhcpd} program +options @code{-4}, @code{-6}, and @code{-4o6}. See @code{man dhcpd} for +details. +@item @code{run-directory} (default: @code{"/run/dhcpd"}) +The run directory to use. At service activation time, this directory +will be created if it does not exist. +@item @code{pid-file} (default: @code{"/run/dhcpd/dhcpd.pid"}) +The PID file to use. This corresponds to the @code{-pf} option of +@code{dhcpd}. See @code{man dhcpd} for details. +@item @code{interfaces} (default: @code{'()}) +The names of the network interfaces on which dhcpd should listen for +broadcasts. If this list is not empty, then its elements (which must be +strings) will be appended to the @code{dhcpd} invocation when starting +the daemon. It may not be necessary to explicitly specify any +interfaces here; see @code{man dhcpd} for details. +@end table +@end deftp + @defvr {Scheme Variable} static-networking-service-type This is the type for statically-configured network interfaces. @c TODO Document data structures. diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 6ac440fd26..be34f32395 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -57,6 +57,18 @@ (define-module (gnu services networking) static-networking-service static-networking-service-type dhcp-client-service + + dhcpd-service-type + dhcpd-configuration + dhcpd-configuration? + dhcpd-configuration-package + dhcpd-configuration-config-file + dhcpd-configuration-version + dhcpd-configuration-run-directory + dhcpd-configuration-lease-file + dhcpd-configuration-pid-file + dhcpd-configuration-interfaces + %ntp-servers ntp-configuration @@ -341,6 +353,72 @@ (define* (dhcp-client-service #:key (dhcp isc-dhcp)) Protocol (DHCP) client, on all the non-loopback network interfaces." (service dhcp-client-service-type dhcp)) +(define-record-type* + dhcpd-configuration make-dhcpd-configuration + dhcpd-configuration? + (package dhcpd-configuration-package ; + (default isc-dhcp)) + (config-file dhcpd-configuration-config-file ;file-like + (default #f)) + (version dhcpd-configuration-version ;"4", "6", or "4o6" + (default "6")) + (run-directory dhcpd-configuration-run-directory + (default "/run/dhcpd")) + (lease-file dhcpd-configuration-lease-file + (default "/var/db/dhcpd.leases")) + (pid-file dhcpd-configuration-pid-file + (default "/run/dhcpd/dhcpd.pid")) + ;; list of strings, e.g. (list "enp0s25") + (interfaces dhcpd-configuration-interfaces + (default '()))) + +(define dhcpd-shepherd-service + (match-lambda + (($ package config-file version run-directory + lease-file pid-file interfaces) + (unless config-file + (error "Must supply a config-file")) + (list (shepherd-service + ;; Allow users to easily run multiple versions simultaneously. + (provision (list (string->symbol + (string-append "dhcpv" version "-daemon")))) + (documentation (string-append "Run the DHCPv" version " daemon")) + (requirement '(networking)) + (start #~(make-forkexec-constructor + '(#$(file-append package "/sbin/dhcpd") + #$(string-append "-" version) + "-lf" #$lease-file + "-pf" #$pid-file + "-cf" #$config-file + #$@interfaces) + #:pid-file #$pid-file)) + (stop #~(make-kill-destructor))))))) + +(define dhcpd-activation + (match-lambda + (($ package config-file version run-directory + lease-file pid-file interfaces) + (with-imported-modules '((guix build utils)) + #~(begin + (unless (file-exists? #$run-directory) + (mkdir #$run-directory)) + ;; According to the DHCP manual (man dhcpd.leases), the lease + ;; database must be present for dhcpd to start successfully. + (unless (file-exists? #$lease-file) + (with-output-to-file #$lease-file + (lambda _ (display "")))) + ;; Validate the config. + (invoke + #$(file-append package "/sbin/dhcpd") "-t" "-cf" + #$config-file)))))) + +(define dhcpd-service-type + (service-type + (name 'dhcpd) + (extensions + (list (service-extension shepherd-root-service-type dhcpd-shepherd-service) + (service-extension activation-service-type dhcpd-activation))))) + (define %ntp-servers ;; Default set of NTP servers. These URLs are managed by the NTP Pool project. ;; Within Guix, Leo Famulari is the administrative contact diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index d7d9166fa7..171c636e5f 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -29,7 +29,7 @@ (define-module (gnu tests networking) #:use-module (gnu packages bash) #:use-module (gnu packages networking) #:use-module (gnu services shepherd) - #:export (%test-inetd %test-openvswitch)) + #:export (%test-inetd %test-openvswitch %test-dhcpd)) (define %inetd-os ;; Operating system with 2 inetd services. @@ -243,3 +243,98 @@ (define %test-openvswitch (name "openvswitch") (description "Test a running OpenvSwitch configuration.") (value (run-openvswitch-test)))) + + +;;; +;;; DHCP Daemon +;;; + +(define minimal-dhcpd-v4-config-file + (plain-file "dhcpd.conf" + "\ +default-lease-time 600; +max-lease-time 7200; + +subnet 192.168.1.0 netmask 255.255.255.0 { + range 192.168.1.100 192.168.1.200; + option routers 192.168.1.1; + option domain-name-servers 192.168.1.2, 192.168.1.3; + option domain-name \"dummy.domain.name.abc123xyz\"; +} +")) + +(define dhcpd-v4-configuration + (dhcpd-configuration + (config-file minimal-dhcpd-v4-config-file) + (version "4") + (interfaces '("eth0")))) + +(define %dhcpd-os + (simple-operating-system + (static-networking-service "eth0" "192.168.1.4" + #:netmask "255.255.255.0" + #:gateway "192.168.1.1" + #:name-servers '("192.168.1.2" "192.168.1.3")) + (service dhcpd-service-type dhcpd-v4-configuration))) + +(define (run-dhcpd-test) + (define os + (marionette-operating-system %dhcpd-os + #:imported-modules '((gnu services herd)))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (gnu build marionette) + (ice-9 popen) + (ice-9 rdelim) + (srfi srfi-64)) + + (define marionette + (make-marionette (list #$(virtual-machine os)))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "dhcpd") + + (test-assert "pid file exists" + (marionette-eval + '(file-exists? + #$(dhcpd-configuration-pid-file dhcpd-v4-configuration)) + marionette)) + + (test-assert "lease file exists" + (marionette-eval + '(file-exists? + #$(dhcpd-configuration-lease-file dhcpd-v4-configuration)) + marionette)) + + (test-assert "run directory exists" + (marionette-eval + '(file-exists? + #$(dhcpd-configuration-run-directory dhcpd-v4-configuration)) + marionette)) + + (test-assert "dhcpd is alive" + (marionette-eval + '(begin + (use-modules (gnu services herd) + (srfi srfi-1)) + (live-service-running + (find (lambda (live) + (memq 'dhcpv4-daemon + (live-service-provision live))) + (current-services)))) + marionette)) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "dhcpd-test" test)) + +(define %test-dhcpd + (system-test + (name "dhcpd") + (description "Test a running DHCP daemon configuration.") + (value (run-dhcpd-test)))) -- cgit v1.2.3 From f347c24acc14e080dc2801561edca0d525a90257 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 22 Apr 2018 12:18:31 +0300 Subject: gnu: freeimage: Use bundled libjxr. * gnu/packages/image.scm (freeimage)[source]: Don't delete bundled LibJXR directory. [arguments]: Modify make-flags to not include external jxrlib. [inputs]: Remove libjxr. * gnu/packages/patches/freeimage-unbundle.patch: Modify to not unbundle libjxr. --- gnu/packages/image.scm | 8 +++++--- gnu/packages/patches/freeimage-unbundle.patch | 18 +++--------------- 2 files changed, 8 insertions(+), 18 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index e27b9223dd..7ed18cf1a6 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -724,7 +724,8 @@ (define-public freeimage (for-each (lambda (dir) (delete-file-recursively (string-append "Source/" dir))) - '("LibJPEG" "LibJXR" "LibOpenJPEG" "LibPNG" "LibRawLite" + '("LibJPEG" "LibOpenJPEG" "LibPNG" "LibRawLite" + ;; "LibJXR" "LibWebP" "OpenEXR" "ZLib")))) (patches (search-patches "freeimage-unbundle.patch" "freeimage-CVE-2015-0852.patch" @@ -760,14 +761,15 @@ (define-public freeimage ;; We need '-fpermissive' for Source/FreeImage.h. ;; libjxr doesn't have a pkg-config file. (string-append "CFLAGS+=-O2 -fPIC -fvisibility=hidden -fpermissive " - "-I" (assoc-ref %build-inputs "libjxr") "/include/jxrlib")) + ;"-I" (assoc-ref %build-inputs "libjxr") "/include/jxrlib" + )) #:tests? #f)) ; no check target (native-inputs `(("pkg-config" ,pkg-config) ("unzip" ,unzip))) (inputs `(("libjpeg" ,libjpeg) - ("libjxr" ,libjxr) + ;("libjxr" ,libjxr) ("libpng" ,libpng) ("libraw" ,libraw) ("libtiff" ,libtiff) diff --git a/gnu/packages/patches/freeimage-unbundle.patch b/gnu/packages/patches/freeimage-unbundle.patch index 2727d9fbda..ca907d3276 100644 --- a/gnu/packages/patches/freeimage-unbundle.patch +++ b/gnu/packages/patches/freeimage-unbundle.patch @@ -25,7 +25,7 @@ diff -rupN FreeImage/gensrclist.sh FreeImage-new/gensrclist.sh #!/bin/sh -DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib" -+DIRLIST=". Source Source/Metadata Source/FreeImageToolkit" ++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJXR Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib" echo "VER_MAJOR = 3" > Makefile.srcs echo "VER_MINOR = 17.0" >> Makefile.srcs @@ -90,8 +90,8 @@ diff -rupN FreeImage/Makefile.gnu FreeImage-new/Makefile.gnu -# LibJXR -CXXFLAGS += -D__ANSI__ -CXXFLAGS += $(INCLUDE) -+override CFLAGS += $(INCLUDE) -D__ANSI__ -I/usr/include/jxrlib $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib) -+override LDFLAGS += -ljpeg -ljpegxr -ljxrglue $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib) ++override CFLAGS += $(INCLUDE) -D__ANSI__ $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib) ++override LDFLAGS += -ljpeg $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib) ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) - CFLAGS += -fPIC @@ -215,18 +215,6 @@ diff -rupN FreeImage/Source/FreeImage/PluginJPEG.cpp FreeImage-new/Source/FreeIm } #include "FreeImage.h" -diff -rupN FreeImage/Source/FreeImage/PluginJXR.cpp FreeImage-new/Source/FreeImage/PluginJXR.cpp ---- FreeImage/Source/FreeImage/PluginJXR.cpp 2015-03-02 02:07:08.000000000 +0100 -+++ FreeImage-new/Source/FreeImage/PluginJXR.cpp 2015-09-05 02:13:52.043353343 +0200 -@@ -23,7 +23,7 @@ - #include "Utilities.h" - #include "../Metadata/FreeImageTag.h" - --#include "../LibJXR/jxrgluelib/JXRGlue.h" -+#include - - // ========================================================== - // Plugin Interface diff -rupN FreeImage/Source/FreeImage/PluginPNG.cpp FreeImage-new/Source/FreeImage/PluginPNG.cpp --- FreeImage/Source/FreeImage/PluginPNG.cpp 2015-03-10 20:16:12.000000000 +0100 +++ FreeImage-new/Source/FreeImage/PluginPNG.cpp 2015-09-05 02:13:52.044353363 +0200 -- cgit v1.2.3 From 5c1052039e52949cdff080961c3e3cc95d5cf6a6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 22 Apr 2018 15:56:42 +0300 Subject: gnu: gcompris-qt: Update to 0.90. * gnu/packages/education.scm (gcompris-qt): Update to 0.90. [source, home-page]: Use https. [arguments]: Add 'wrap-executable phase to declare the QT_PLUGIN_PATH and QML2_IMPORT_PATH without needing propagated inputs. [native-inputs]: Add qttools. [inputs]: Remove qt, add qtbase, qtdeclarative, qtgraphicaleffects, qtmultimedia, qtquickcontrols, qtsensors, qtsvg, qtxmlpatterns. --- gnu/packages/education.scm | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index e8fb1e64d6..58f06c3106 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016, 2017 Ricardo Wurmus ;;; Copyright © 2016 Hartmut Goebel -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -107,29 +107,54 @@ (define-public gcompris (define-public gcompris-qt (package (name "gcompris-qt") - (version "0.70") + (version "0.90") (source (origin (method url-fetch) (uri (string-append - "http://gcompris.net/download/qt/src/gcompris-qt-" + "https://gcompris.net/download/qt/src/gcompris-qt-" version ".tar.xz")) (sha256 (base32 - "01r7i8dmwb2nlfyp0y0mzs8yydmvn5gq7xn1w7g21lysak1mliwa")))) + "1i5adxnhig849qxwi3c4v7r84q6agx1zxkd69fh4y7lcmq2qiaza")))) (build-system cmake-build-system) (arguments - ;; Qml_box2d is unmaintained and not actually required for building - '(#:configure-flags (list "-DQML_BOX2D_MODULE=disabled") + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/gcompris-qt") + `("QT_PLUGIN_PATH" ":" prefix + ,(map (lambda (label) + (string-append (assoc-ref inputs label) + "/lib/qt5/plugins")) + '("qtbase" "qtdeclarative" "qtmultimedia" "qtsvg"))) + `("QML2_IMPORT_PATH" ":" prefix + ,(map (lambda (label) + (string-append (assoc-ref inputs label) + "/lib/qt5/qml")) + '("qtdeclarative" "qtgraphicaleffects" + "qtmultimedia" "qtquickcontrols")))) + #t)))) + #:configure-flags (list "-DQML_BOX2D_MODULE=disabled") #:tests? #f)) ; no test target (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("gettext" ,gettext-minimal) - ("perl" ,perl))) + ("perl" ,perl) + ("qttools" ,qttools))) (inputs `(("python-2" ,python-2) - ("qt" ,qt))) ; Cannot find qtquick at runtime with modular qt. - (home-page "http://gcompris.net/index-en.html") + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtmultimedia" ,qtmultimedia) + ("qtquickcontrols" ,qtquickcontrols) + ("qtsensors" ,qtsensors) + ("qtsvg" ,qtsvg) + ("qtxmlpatterns" ,qtxmlpatterns))) + (home-page "https://gcompris.net/index-en.html") (synopsis "Educational games for small children") (description "Gcompris offers a large collection of educational games for small -- cgit v1.2.3 From 3ae45eb435121b89ba79c9aa0b9bdf21c0b18841 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 22 Apr 2018 13:30:16 -0400 Subject: audacity: Update to 2.2.2. * gnu/packages/audio.scm (audacity): Update to 2.2.2. --- gnu/packages/audio.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 4456540c4d..d468899065 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -284,14 +284,15 @@ (define-public ardour (define-public audacity (package (name "audacity") - (version "2.2.1") + (version "2.2.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/audacity/audacity/archive" "/Audacity-" version ".tar.gz")) (sha256 - (base32 "1n05r8b4rnf9fas0py0is8cm97s3h65dgvqkk040aym5d1x6wd7z")) + (base32 + "18q7i77ynihx7xp45lz2lv0k0wrh6736pcrivlpwrxjgbvyqx7km")) (patches (search-patches "audacity-build-with-system-portaudio.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 3d7f9cbe75918b8afb0353557cf8f4f1263def1c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Apr 2018 22:59:46 +0200 Subject: gnu: pigx-chipseq: Update to 0.0.15. * gnu/packages/bioinformatics.scm (pigx-chipseq): Update to 0.0.15. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a060139755..3e93d94651 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12822,7 +12822,7 @@ (define-public pigx-rnaseq (define-public pigx-chipseq (package (name "pigx-chipseq") - (version "0.0.10") + (version "0.0.15") (source (origin (method url-fetch) (uri (string-append "https://github.com/BIMSBbioinfo/pigx_chipseq/" @@ -12830,7 +12830,7 @@ (define-public pigx-chipseq "/pigx_chipseq-" version ".tar.gz")) (sha256 (base32 - "13w99bkr0w4j28ms0yzpl1x6fkpdqay0vh495q3x20bcilsjwnf1")))) + "11v9v3vyda0sv4cl45nki7mm4v4bjfcdq7a70kcvi9h465nq66wg")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; parts of the tests rely on access to the network -- cgit v1.2.3 From b8a251d76ec2255ce9a80022f4b439689366f73a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 19 Apr 2018 17:19:02 +0200 Subject: gnu: libfive: Snippet returns a Boolean. Reported by Mark H Weaver . * gnu/packages/engineering.scm (libfive)[source](snippet): Return #t. --- gnu/packages/engineering.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 2f4e8cef52..52d0010693 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 David Thompson -;;; Copyright © 2016, 2017 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2016, 2017 Theodoros Foradis ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -583,7 +583,9 @@ (define-public libfive (file-name (git-file-name name version)) (snippet ;; Remove bundled catch since we provide our own. - '(delete-file "libfive/test/catch.hpp")))) + '(begin + (delete-file "libfive/test/catch.hpp") + #t)))) (build-system cmake-build-system) (arguments `(#:test-target "libfive-test" -- cgit v1.2.3 From c51e592d6c5d68ba6e21c925cfed9ed1fe06ef3d Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Fri, 13 Apr 2018 16:28:09 +0200 Subject: gnu: Add emacs-elisp-slime-nav. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-elisp-slime-nav): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b2fd069d3a..3ddca5be4a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7932,3 +7932,25 @@ (define-public emacs-epkg You could get a Epkg package list by invoking @code{epkg-list-packages} in Emacs.") (license license:gpl3+)))) + +(define-public emacs-elisp-slime-nav + (package + (name "emacs-elisp-slime-nav") + (version "0.9") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/purcell/elisp-slime-nav/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vq7ym1q47p97gxrv45c9gm96d23xbp237vkmakikj6grngxjfb2")))) + (build-system emacs-build-system) + (home-page "https://github.com/purcell/elisp-slime-nav") + (synopsis "Make @code{M-.} and @code{M-,} work for elisp like they do in SLIME") + (description + "This package provides SLIME's convenient @code{M-.}and @code{M-,} navigation +in @code{emacs-lisp-mode}, together with an elisp equivalent of +@code{slime-describe-symbol}.") + (license license:gpl3+))) -- cgit v1.2.3 From 01224157b7714ff5a7931475943f9479d09c62a3 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 21 Apr 2018 10:37:20 +0100 Subject: gnu: Add ocproxy. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/vpn.scm (ocproxy): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/vpn.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 070b695651..6ba3677a90 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Julien Lepiller +;;; Copyright © 2018 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,9 +33,11 @@ (define-module (gnu packages vpn) #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages check) + #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) + #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -206,6 +209,39 @@ (define-public vpnc-scripts the entire VPN in a network namespace accessible only through SSH.") (license license:gpl2+)))) +(define-public ocproxy + (package + (name "ocproxy") + (version "1.60") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/cernekee/ocproxy/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1b4rg3xq5jnrp2l14sw0msan8kqhdxmsd7gpw9lkiwvxy13pcdm7")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (inputs + `(("libevent" ,libevent))) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'autogen + (lambda _ (invoke "sh" "autogen.sh")))))) + (home-page "https://github.com/cernekee/ocproxy") + (synopsis "OpenConnect proxy") + (description + "User-level @dfn{SOCKS} and port forwarding proxy for OpenConnect based +on LwIP. When using ocproxy, OpenConnect only handles network activity that +the user specifically asks to proxy, so the @dfn{VPN} interface no longer +\"hijacks\" all network traffic on the host.") + (license license:bsd-3))) + (define-public openconnect (package (name "openconnect") -- cgit v1.2.3 From 0ed7498a460af9b0175d3f6919858d0d40d5ccc1 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sun, 22 Apr 2018 11:08:29 +0800 Subject: gnu: Add src. * gnu/packages/version-control.scm (src): New variable. --- gnu/packages/version-control.scm | 50 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 71ede4f549..b82abaf9ed 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Oleg Pykhalov +;;; Copyright © 2018 Sou Bunnbu ;;; ;;; This file is part of GNU Guix. ;;; @@ -1912,3 +1913,52 @@ (define-public gource Contributors to the source code appear and disappear as they contribute to specific files and directories.") (license license:gpl3+))) + +(define-public src + (package + (name "src") + (version "1.18") + (source (origin + (method url-fetch) + (uri (string-append + "http://www.catb.org/~esr/src/src-" version ".tar.gz")) + (sha256 + (base32 + "0n0skhvya8w2az45h2gsafxy8m2mvqas64nrgxifcmrzfv0rf26c")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags + (list (string-append "prefix=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no 'configure' script + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (prog (string-append out "/bin/src")) + (rcs (assoc-ref inputs "rcs"))) + (wrap-program prog + `("PATH" ":" prefix (,(string-append rcs "/bin")))) + #t))) + (replace 'check + (lambda _ + (setenv "HOME" (getenv "TMPDIR")) + (invoke "git" "config" "--global" "user.name" "guix") + (invoke "git" "config" "--global" "user.email" "guix") + (invoke "./srctest")))))) + (native-inputs + ;; For testing. + `(("git" ,git) + ("perl" ,perl))) + (inputs + `(("python" ,python-wrapper) + ("rcs" ,rcs))) + (synopsis "Simple revision control") + (home-page "http://www.catb.org/~esr/src/") + (description + "SRC (or src) is simple revision control, a version-control system for +single-file projects by solo developers and authors. It modernizes the +venerable RCS, hence the anagrammatic acronym. The design is tuned for use +cases like all those little scripts in your @file{~/bin} directory, or a +directory full of HOWTOs.") + (license license:bsd-2))) -- cgit v1.2.3 From de7f03ce0a45cc82da856a11595e9132f78a0605 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sun, 22 Apr 2018 19:30:08 +0800 Subject: gnu: Add runc. * gnu/packages/virtualization.scm (runc): New variable. --- gnu/packages/virtualization.scm | 61 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 55ace5a56d..59b4c63293 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Danny Milosavljevic +;;; Copyright © 2018 Sou Bunnbu ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages golang) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages libusb) @@ -63,9 +65,11 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system python) #:use-module (guix download) - #:use-module ((guix licenses) #:select (gpl2 gpl2+ gpl3+ lgpl2.1 lgpl2.1+)) + #:use-module ((guix licenses) #:select (gpl2 gpl2+ gpl3+ lgpl2.1 lgpl2.1+ + asl2.0)) #:use-module (guix packages) #:use-module (guix utils) #:use-module (srfi srfi-1)) @@ -772,3 +776,58 @@ (define-public lookingglass ;; This package requires SSE instructions. (supported-systems '("i686-linux" "x86_64-linux")) (license gpl2+))) + +(define-public runc + (package + (name "runc") + (version "1.0.0-rc5") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/opencontainers/runc/releases/" + "download/v" version "/runc.tar.xz")) + (sha256 + (base32 + "081avdzwnqpk368wbaihlzsypaxpj42d7699h7jgp0fks14x4103")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/opencontainers/runc" + #:install-source? #f + #:tests? #f ; FIXME: 20/139 tests fail. + #:phases + (modify-phases %standard-phases + (replace 'unpack + (lambda* (#:key source import-path #:allow-other-keys) + ;; Unpack the tarball into 'runc' instead of 'runc-1.0.0-rc5'. + (let ((dest (string-append "src/" import-path))) + (mkdir-p dest) + (invoke "tar" "-C" (string-append "src/" import-path) + "--strip-components=1" + "-xvf" source)))) + (replace 'build + (lambda* (#:key import-path #:allow-other-keys) + (chdir (string-append "src/" import-path)) + ;; XXX: requires 'go-md2man'. + ;; (invoke "make" "man") + (invoke "make"))) + ;; (replace 'check + ;; (lambda _ + ;; (invoke "make" "localunittest"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "make" "install" "install-bash" + (string-append "PREFIX=" out)))))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libseccomp" ,libseccomp))) + (synopsis "Open container initiative runtime") + (home-page "https://www.opencontainers.org/") + (description + "@command{runc} is a command line client for running applications +packaged according to the +@uref{https://github.com/opencontainers/runtime-spec/blob/master/spec.md, Open +Container Initiative (OCI) format} and is a compliant implementation of the +Open Container Initiative specification.") + (license asl2.0))) -- cgit v1.2.3 From 06079c196c426cd84242c4e55b7227bcc5ecf290 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 23 Apr 2018 08:07:10 +0200 Subject: gnu: ffmpeg: Update to 4.0. * gnu/packages/video.scm (ffmpeg): Update to 4.0. * gnu/packages/video.scm (ffmpeg@3.4): New variable. * gnu/packages/video.scm (ffmpeg-git): Remove variable. * gnu/packages/video.scm (mpv)[inputs]: Build with ffmpeg instead of ffmpeg-git. * gnu/packages/gstreamer.scm (gst-libav)[inputs]: Build with ffmpeg@3.4 instead of ffmpeg. * gnu/packages/messaging.scm (qtox)[inputs]: Build with ffmpeg@3.4 instead of ffmpeg. * gnu/packages/emulators.scm (dolphin-emu)[inputs]: Build with ffmpeg@3.4 instead of ffmpeg. * gnu/packages/gnunet.scm (libextractor)[inputs]: Build with ffmpeg@3.4 instead of ffmpeg. --- gnu/packages/emulators.scm | 2 +- gnu/packages/gnunet.scm | 2 +- gnu/packages/gstreamer.scm | 2 +- gnu/packages/messaging.scm | 2 +- gnu/packages/video.scm | 37 +++++++++++++++---------------------- 5 files changed, 19 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 79947059bd..75b191c067 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -186,7 +186,7 @@ (define-public dolphin-emu ("bluez" ,bluez) ("curl" ,curl) ("eudev" ,eudev) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("font-wqy-microhei" ,font-wqy-microhei) ("freetype" ,freetype) ("glew" ,glew) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index b6062625c0..880fb9f09e 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -88,7 +88,7 @@ (define-public libextractor `(("exiv2" ,exiv2) ("bzip2" ,bzip2) ("flac" ,flac) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("file" ,file) ;libmagic, for the MIME plug-in ("glib" ,glib) ("gstreamer" ,gstreamer) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 6747c388d5..4eef9e741d 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -403,7 +403,7 @@ (define-public gst-libav ("python" ,python))) (inputs `(("gst-plugins-base" ,gst-plugins-base) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("orc" ,orc) ("zlib" ,zlib))) (home-page "https://gstreamer.freedesktop.org/") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 2b3284ba6f..237a315239 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -913,7 +913,7 @@ (define-public qtox ,(list (string-append (assoc-ref inputs "qtsvg") "/lib/qt5/plugins/")))))))))) (inputs - `(("ffmpeg" ,ffmpeg) + `(("ffmpeg" ,ffmpeg-3.4) ("filteraudio" ,filteraudio) ("glib" ,glib) ("gtk+" ,gtk+-2) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e959accf6a..1966d44dfd 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -597,14 +597,14 @@ (define-public libva (define-public ffmpeg (package (name "ffmpeg") - (version "3.4.2") + (version "4.0") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "0h6prjn1ijkzzhkyj8mazp0wpx7m0n9ycadjxagf9czqirbyk4ib")))) + "0gx4ngnhi5glmxh38603qy5n6vq8bl1cr4sqd1xff95i82pmv57d")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) @@ -770,6 +770,18 @@ (define-public ffmpeg audio/video codec library.") (license license:gpl2+))) +(define-public ffmpeg-3.4 + (package + (inherit ffmpeg) + (version "3.4.2") + (source (origin + (method url-fetch) + (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" + version ".tar.xz")) + (sha256 + (base32 + "0h6prjn1ijkzzhkyj8mazp0wpx7m0n9ycadjxagf9czqirbyk4ib")))))) + (define-public ffmpeg-2.8 (package (inherit ffmpeg) @@ -790,25 +802,6 @@ (define-public ffmpeg-2.8 flag)) ,flags)))))) -;; Annoyingly enough, the latest mpv release does not build with the stable -;; release of ffmpeg. Use a git commit until the situation is fixed. -(define-public ffmpeg-git - (let ((commit "3f887440677328c9cfed97ad81d14051ffa32aae") - (revision "1")) - (package - (inherit ffmpeg) - (name "ffmpeg-git") - (version (string-append "3.4-" revision "." (string-take commit 9))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/FFmpeg/FFmpeg.git") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1b7n3g4m2rbvrwsgbfl8wl91z42g1ld42clwxs8qpl9ny5rwz6sq"))))))) - (define-public vlc (package (name "vlc") @@ -1032,7 +1025,7 @@ (define-public mpv (inputs `(("alsa-lib" ,alsa-lib) ("enca" ,enca) - ("ffmpeg" ,ffmpeg-git) + ("ffmpeg" ,ffmpeg) ("jack" ,jack-1) ("ladspa" ,ladspa) ("lcms" ,lcms) -- cgit v1.2.3 From 050e5756781cdfed2d790e15c67bc48c9aced131 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 22 Apr 2018 16:01:28 +0200 Subject: gnu: Add wpa-supplicant-gui. * gnu/packages/admin.scm (wpa-supplicant-gui): New public variable. --- gnu/packages/admin.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8d32518973..1dc5d2b241 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2017 Ben Sturmfels ;;; Copyright © 2017 Ethan R. Jones ;;; Copyright © 2017 Christopher Allan Webber -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; @@ -58,6 +58,8 @@ (define-module (gnu packages admin) #:use-module (gnu packages lua) #:use-module (gnu packages guile) #:use-module (gnu packages gettext) + #:use-module (gnu packages imagemagick) + #:use-module (gnu packages inkscape) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) @@ -76,6 +78,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) + #:use-module (gnu packages qt) #:use-module (gnu packages terminals) #:use-module (gnu packages texinfo) #:use-module (gnu packages groff) @@ -1136,6 +1139,51 @@ (define-public wpa-supplicant (string-append dir "/wpa_supplicant.conf"))) #t)))))))) +(define-public wpa-supplicant-gui + (package + (inherit wpa-supplicant) + (name "wpa-supplicant-gui") + (inputs `(("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ,@(package-inputs wpa-supplicant))) + (native-inputs + ;; For icons. + `(("imagemagick" ,imagemagick) + ("inkscape" ,inkscape) + ,@(package-native-inputs wpa-supplicant))) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "wpa_supplicant/wpa_gui-qt4") + #t)) + (delete 'configure) + (replace 'build + (lambda _ + (invoke "qmake" "wpa_gui.pro") + (invoke "make" "-j" (number->string (parallel-job-count))) + (invoke "make" "-C" "icons"))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (qt '("qtbase" "qtsvg"))) + (substitute* "wpa_gui.desktop" + (("Exec=wpa_gui") + (string-append "Exec=" out "/bin/wpa_gui"))) + (install-file "wpa_gui" (string-append out "/bin")) + (install-file "wpa_gui.desktop" + (string-append out "/share/applications")) + (copy-recursively "icons/hicolor" + (string-append out "/share/icons/hicolor")) + (wrap-program (string-append out "/bin/wpa_gui") + `("QT_PLUGIN_PATH" ":" prefix + ,(map (lambda (label) + (string-append (assoc-ref inputs label) + "/lib/qt5/plugins/")) + qt))) + #t)))))) + (synopsis "Graphical user interface for WPA supplicant"))) + (define-public wakelan (package (name "wakelan") -- cgit v1.2.3 From b981f77722ed296aa1198a4de61115db7dfc30a1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Apr 2018 01:11:23 +0200 Subject: gnu: libwebp: Update to 1.0.0. * gnu/packages/image.scm (libwebp): Update to 1.0.0. [source]: Change to GIT-FETCH. [arguments]: Add 'bootstrap' phase. --- gnu/packages/image.scm | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 7ed18cf1a6..bbfd621a93 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -846,16 +846,18 @@ (define-public vigra (define-public libwebp (package (name "libwebp") - (version "0.6.1") + (version "1.0.0") (source (origin - (method url-fetch) - (uri (string-append - "http://downloads.webmproject.org/releases/webp/libwebp-" version - ".tar.gz")) + ;; No tarballs are provided for >0.6.1. + (method git-fetch) + (uri (git-reference + (url "https://chromium.googlesource.com/webm/libwebp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1ayq2zq0zbgf5yizbm32zh7p1vb8kibw74am6am1n5cz5mw3ql06")))) + "1w8jzdbr1s4238ygyrlxryycss3f2z6d9amxdq8m82nl3l6skar4")))) (build-system gnu-build-system) (inputs `(("freeglut" ,freeglut) @@ -863,10 +865,18 @@ (define-public libwebp ("libjpeg" ,libjpeg) ("libpng" ,libpng) ("libtiff" ,libtiff))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (arguments '(#:configure-flags '("--enable-libwebpmux" "--enable-libwebpdemux" - "--enable-libwebpdecoder"))) + "--enable-libwebpdecoder") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda _ + (invoke "autoreconf" "-vif")))))) (home-page "https://developers.google.com/speed/webp/") (synopsis "Lossless and lossy image compression") (description -- cgit v1.2.3 From 14534d7fcdb545ac7d5a4c58633886dac4ed262a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Apr 2018 01:14:40 +0200 Subject: gnu: feh: Update to 2.26. * gnu/packages/image-viewers.scm (feh): Update to 2.26. --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index ae7ae0f519..1f0a9e46e1 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -59,7 +59,7 @@ (define-module (gnu packages image-viewers) (define-public feh (package (name "feh") - (version "2.25.1") + (version "2.26") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -67,7 +67,7 @@ (define-public feh name "-" version ".tar.bz2")) (sha256 (base32 - "197sm78bm33dvahr5nxqkbmpmdn4b13ahc9mrgn1l7n104bg4phc")))) + "11kckzwk3b734l0n4j41k40liq1v2lbbj1gzir5qc386g7fvzmmi")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From 89f9ffffe5ed15a9c8ff73e82211670d0f4c078b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Apr 2018 18:25:27 +0200 Subject: gnu: slop: Update to 7.4. * gnu/packages/xdisorg.scm (slop): Update to 7.4. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 5855273ab8..51844d8a70 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -499,7 +499,7 @@ (define-public scrot (define-public slop (package (name "slop") - (version "7.3.49") + (version "7.4") (source (origin (method url-fetch) (uri (string-append @@ -508,7 +508,7 @@ (define-public slop (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0gxi174vi13ldjaf776s2jcdyy379lnwwml29nk1bkzj5d5gpghm")))) + "1kpdrikgpjb4fpxalb6pjcih5njv1w9cnrjj5612ywdv1q5mjs48")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no "check" target -- cgit v1.2.3 From 0b909ab6bb8a8520ebb7d1293e419589d213b5f3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Apr 2018 18:25:47 +0200 Subject: gnu: maim: Update to 5.5. * gnu/packages/xdisorg.scm (maim): Update to 5.5. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 51844d8a70..8c0ca25972 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -532,7 +532,7 @@ (define-public slop (define-public maim (package (name "maim") - (version "5.4.68") + (version "5.5") (source (origin (method url-fetch) (uri (string-append @@ -541,7 +541,7 @@ (define-public maim (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0f54s7csrxjd5r9anqqa92diwmzdplpws3llmbr6g3c0l6bp8815")))) + "02blbimjdckbcb04crhv0k2vxnp3rcgskyq66sk0v13l2h52849v")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no "check" target -- cgit v1.2.3 From bb5c508c12db269017cec41350f30ac1e3edd644 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Apr 2018 18:18:41 +0200 Subject: gnu: Use ffmpeg@3.4 in packages not ready for 4.0. * gnu/packages/cdrom.scm (dvdstyler)[inputs]: Change FFMPEG with FFMPEG-3.4. * gnu/packages/video.scm (mlt, motion, simplescreenrecorder)[inputs]: Likewise. * gnu/packages/music.scm (moc, pianobar)[inputs]: Likewise. --- gnu/packages/cdrom.scm | 2 +- gnu/packages/music.scm | 4 ++-- gnu/packages/video.scm | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 3d35ff51f4..5f9117c637 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -392,7 +392,7 @@ (define-public dvdstyler ("fontconfig" ,fontconfig) ("libexif" ,libexif) ("libjpeg" ,libjpeg) - ("ffmpeg" ,ffmpeg))) + ("ffmpeg" ,ffmpeg-3.4))) (native-inputs `(("pkg-config" ,pkg-config) ("flex" ,flex) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index aea7395d41..c27055e0c1 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2391,7 +2391,7 @@ (define-public pianobar ("curl" ,curl) ("libgcrypt" ,libgcrypt) ("json-c" ,json-c) - ("ffmpeg" ,ffmpeg))) + ("ffmpeg" ,ffmpeg-3.4))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "http://6xq.net/projects/pianobar/") @@ -2792,7 +2792,7 @@ (define-public moc `(("alsa-lib" ,alsa-lib) ("curl" ,curl) ("faad2" ,faad2) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("file" ,file) ("jack" ,jack-1) ("libid3tag" ,libid3tag) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 1966d44dfd..dc5a375664 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1847,7 +1847,7 @@ (define-public mlt #t))))) (inputs `(("alsa-lib" ,alsa-lib) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("fftw" ,fftw) ("libxml2" ,libxml2) ("jack" ,jack-1) @@ -2082,7 +2082,7 @@ (define-public simplescreenrecorder ;; As a result, they are omitted. Please add them back if problems appear. (inputs `(("alsa-lib" ,alsa-lib) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("glu" ,glu) ("jack" ,jack-1) ("libxi" ,libxi) @@ -2794,7 +2794,7 @@ (define-public motion ("pkg-config" ,pkg-config))) (inputs `(("libjpeg" ,libjpeg) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("sqlite" ,sqlite))) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 2784b35f90a7e659ae30c0e24380ecea42557f7d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Apr 2018 19:55:58 +0200 Subject: gnu: moc: Remove obsolete snippet. * gnu/packages/music.scm (moc)[source](snippet): Remove. --- gnu/packages/music.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c27055e0c1..4a7a3157dd 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2780,13 +2780,7 @@ (define-public moc name "-" version ".tar.bz2")) (sha256 (base32 - "026v977kwb0wbmlmf6mnik328plxg8wykfx9ryvqhirac0aq39pk")) - (modules '((guix build utils))) - (snippet - ;; Remove use of __DATE__ and __TIME__ for reproducibility. - '(substitute* "main.c" - (("printf \\(\" Built : %s\", __DATE__\\);") "") - (("printf \\(\" %s\", __TIME__\\);") ""))))) + "026v977kwb0wbmlmf6mnik328plxg8wykfx9ryvqhirac0aq39pk")))) (build-system gnu-build-system) (inputs `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3 From 845688f0096abe2eeba032f594108430d69fc8e8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 23 Apr 2018 22:32:03 +0200 Subject: gnu: grammalecte: Update to 0.6.4. * gnu/packages/dictionaries.scm (grammalecte): Update to 0.6.4. [arguments]: Remove unnecessary fix. --- gnu/packages/dictionaries.scm | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 965002a94d..55f250182d 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -213,7 +213,7 @@ (define-public ding (define-public grammalecte (package (name "grammalecte") - (version "0.6.3.1") + (version "0.6.4") (source (origin (method url-fetch/zipbomb) @@ -221,21 +221,8 @@ (define-public grammalecte "Grammalecte-fr-v" version ".zip")) (sha256 (base32 - "0jlzrhpx9qvjdq679w188p86x09yfjf3l0h4scjl9w26yyp53gr8")))) + "13var1gi3gb2bwi7k21bn2pla0rs17cd7kc3mc5a2nsyqgsrzxfw")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-setup - ;; Fix typos in "setup.py". In particular, add the new - ;; "graphspell" module introduced in 0.6.2. Reported upstream: - ;; - (lambda _ - (substitute* "setup.py" - (("packages=\\['grammalecte', 'grammalecte.fr'\\],") - "packages=['grammalecte', 'grammalecte.fr', 'grammalecte.graphspell'],") - (("_dictionaries/French.bdic") "graphspell/_dictionaries/fr.bdic")) - #t))))) (home-page "https://www.dicollecte.org") (synopsis "French spelling and grammar checker") (description "Grammalecte is a grammar checker dedicated to the French -- cgit v1.2.3 From d5a48184d11763bc40bc4347a9b0368193982489 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 23 Apr 2018 18:16:45 +0200 Subject: gnu: fortune-mod: Use a stable URL for the CMake rules. * gnu/packages/games.scm (fortune-mod)[inputs]: Use a stable URL for "cmake-rules". --- gnu/packages/games.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f34beae3df..e5f8350f6a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4898,7 +4898,8 @@ (define-public fortune-mod ,(origin (method url-fetch) (uri (string-append "https://bitbucket.org/shlomif/shlomif-cmake-modules/" - "raw/default/shlomif-cmake-modules/Shlomif_Common.cmake")) + "raw/c505713d7a7cda608f97f01577e5868a711b883e/" + "shlomif-cmake-modules/Shlomif_Common.cmake")) (sha256 (base32 "0kx9s1qqhhzprp1w3b67xmsns0n0v506bg5hgrshxaxpy6lqiwb2")))))) (home-page "http://www.shlomifish.org/open-source/projects/fortune-mod/") -- cgit v1.2.3 From d4bd876267d334e54f88429362464268961174c0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 24 Apr 2018 09:52:24 +0200 Subject: gnu: hop: Update hash of source tarball, which was modified in place. Fixes . Reported by Tobias Geerinckx-Rice . * gnu/packages/scheme.scm (hop)[source]: Update sha256. --- gnu/packages/scheme.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index c9e1a15255..daa46f7101 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2018 Ludovic Courtès ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016 Federico Beffa ;;; Copyright © 2016 Ricardo Wurmus @@ -300,7 +300,7 @@ (define-public hop version ".tar.gz")) (sha256 (base32 - "09m7pahjsp7wxzd20cdph9j3mgf2nq5dyckcjljcd40m25v85kks")))) + "0bvq79vxcpgwydwi923cxb5w9isx2x8r3d0xndbdhacmmsw1m811")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 230bd4bb608bd2538fba26c8e89af53d7976f40a Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 24 Apr 2018 10:03:05 +0200 Subject: gnu: c-toxcore: Update to 0.2.2. * gnu/packages/messaging.scm (c-toxcore): Update to 0.2.2. [arguments]: Disable tests. --- gnu/packages/messaging.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 237a315239..cce64f7346 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -802,7 +802,7 @@ (define-public libtoxcore (define-public c-toxcore (package (name "c-toxcore") - (version "0.1.11") + (version "0.2.2") (source (origin (method url-fetch) @@ -811,7 +811,10 @@ (define-public c-toxcore (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "040vwihl1r5159vzimmnff75iqfg53vhnfi5wcb3cd0c2r51idl5")))) + "18bfqx0ylbas9gs91rkspf04l5fjjcl0mxm1gfs2d59bv65mvcm3")))) + (arguments + `(#:tests? #f)) ; FIXME: Testsuite seems to stay stuck on test 3. Disable + ; for now. (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From c11df2e879b7e5fb40187325a1d32435cb918ca6 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 24 Apr 2018 10:05:06 +0200 Subject: gnu: utox: Update to 0.17.0. * gnu/packages/messaging.scm (utox): Update to 0.17.0. [source]: Use git-fetch instead of url-fetch. [arguments]: Add "-DENABLE_TESTS=on" configure-flag. --- gnu/packages/messaging.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index cce64f7346..1839b2910d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -832,23 +832,26 @@ (define-public c-toxcore (define-public utox (package (name "utox") - (version "0.16.1") + (version "0.17.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/uTox/uTox/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/uTox/uTox.git") + (commit "v0.17.0") + (recursive? #t))) ;; Needed for 'minini' git submodule. + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "14xl72y4w1x2kk0cvkcr9pmywllm0r9w2grjqiknwn95pw6yxz6q")))) + "12wbq883il7ikldayh8hm0cjfrkp45vn05xx9s1jbfz6gmkidyar")))) (build-system cmake-build-system) (arguments - `(#:phases + `(#:configure-flags '("-DENABLE_TESTS=on") + #:phases (modify-phases %standard-phases (add-before 'build 'patch-absolute-filename-libgtk-3 (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "../uTox-0.16.1/src/xlib/gtk.c" + (substitute* "../source/src/xlib/gtk.c" (("libgtk-3.so") (string-append (assoc-ref inputs "gtk+") "/lib/libgtk-3.so"))))) -- cgit v1.2.3 From 089abfc1431bd3e2a2c82c841942be3be2ad0134 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 24 Apr 2018 10:05:52 +0200 Subject: gnu: qtox: Update to 1.15.0. * gnu/packages/messaging.scm (qtox): Update to 1.15.0. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1839b2910d..e3c3634179 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -890,14 +890,14 @@ (define-public utox (define-public qtox (package (name "qtox") - (version "1.13.0") + (version "1.15.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/qTox/qTox/archive/v" version ".tar.gz")) (sha256 (base32 - "0dyplmlqhg4zbg7hdzp3iqppn9xgp7pds5k6w6byjcqhb9zv91ca")) + "0bmnx6m33qn9nx40yy268x4wnvv2y7bvm41hzrlbhsiaph7kg583")) (file-name (string-append name "-" version ".tar.gz")))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From c0069835b1616e8de6733a9c4782b975050769d7 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 24 Apr 2018 10:06:32 +0200 Subject: gnu: toxic: Update to 0.8.2. * gnu/packages/messaging.scm (toxic): Update to 0.8.2. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index e3c3634179..fd1c330cea 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1536,14 +1536,14 @@ (define-public libircclient (define-public toxic (package (name "toxic") - (version "0.8.0") + (version "0.8.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/JFreegman/toxic/archive/v" version ".tar.gz")) (sha256 (base32 - "0166lqb47f4kj34mhi57aqmnk9mh4hsicmbdsj6ag54sy1zicy20")) + "1dx6z7k0zpsd7dpysdy23f0hnm49qlikb0mq8fg0y01dsz9vxgak")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From b45bfc9ca825cdeff67c61459ee417592e34d073 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Tue, 24 Apr 2018 17:28:50 +0800 Subject: gnu: android-udev-rules: Update to 20180112. * gnu/packages/android.scm (android-udev-rules): Update to 20180112. --- gnu/packages/android.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 637cda0205..92de9736f1 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -341,7 +341,7 @@ (define-public mkbootimg (define-public android-udev-rules (package (name "android-udev-rules") - (version "20171113") + (version "20180112") (source (origin (method git-fetch) @@ -350,7 +350,7 @@ (define-public android-udev-rules (commit version))) (file-name (string-append name "-" version "-checkout")) (sha256 - (base32 "11gcnk6wjc2sw05hwi4xphvx9ksmkpvsdziaczymqxkaads3f1dy")))) + (base32 "13gj79nnd04szqlrrzzkdr6wi1fky08pi7x8xfbg0jj3d3v0giah")))) (build-system trivial-build-system) (native-inputs `(("source" ,source))) (arguments -- cgit v1.2.3 From be65267f93d9c1981000b4fcbaffc477b452b568 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 24 Apr 2018 12:13:12 +0200 Subject: gnu: virt-viewer: Update to 6.0. * gnu/packages/spice.scm (virt-viewer): Update to 6.0. --- gnu/packages/spice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 521be54c49..38d4a3a6bd 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -302,7 +302,7 @@ (define-public spice-vdagent (define-public virt-viewer (package (name "virt-viewer") - (version "5.0") + (version "6.0") (source (origin (method url-fetch) (uri (string-append @@ -310,7 +310,7 @@ (define-public virt-viewer "virt-viewer-" version ".tar.gz")) (sha256 (base32 - "0blbp1wkw8ahss9va0bmcz2yx18j0mvm6fzrzhh2ly3sja5ysb8b")))) + "1chqrf658niivzfh85cbwkbv9vyg8sv1mv3i31vawkfsfdvvsdwh")))) (build-system gnu-build-system) (inputs `(("gtk+" ,gtk+) -- cgit v1.2.3 From a5b56a5346ce14c2d5f02ef3e1b4964d8dd4f8d5 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Tue, 24 Apr 2018 13:33:56 +0200 Subject: gnu: Add r-diffbind. * gnu/packages/bioconductor.scm (r-diffbind): New variable. --- gnu/packages/bioconductor.scm | 44 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 09581d9fde..e43b3ff928 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -23,6 +23,8 @@ (define-module (gnu packages bioconductor) #:use-module (guix download) #:use-module (guix build-system r) #:use-module (gnu packages) + #:use-module (gnu packages cran) + #:use-module (gnu packages compression) #:use-module (gnu packages statistics) #:use-module (gnu packages bioinformatics)) @@ -70,3 +72,45 @@ (define-public r-regioner customizable permutation tests to assess the association between genomic region sets and other genomic features.") (license license:artistic2.0))) + +(define-public r-diffbind + (package + (name "r-diffbind") + (version "2.6.6") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "DiffBind" version)) + (sha256 + (base32 + "1sm5h6nq77hjfis6kr1nqyizcxgfz87dgpqc4fxlfqkmsd9n3vkp")))) + (properties `((upstream-name . "DiffBind"))) + (build-system r-build-system) + (inputs + `(("zlib" ,zlib))) + (propagated-inputs + `(("r-amap" ,r-amap) + ("r-biocparallel" ,r-biocparallel) + ("r-deseq2" ,r-deseq2) + ("r-dplyr" ,r-dplyr) + ("r-edger" ,r-edger) + ("r-genomicalignments" ,r-genomicalignments) + ("r-ggrepel" ,r-ggrepel) + ("r-gplots" ,r-gplots) + ("r-iranges" ,r-iranges) + ("r-lattice" ,r-lattice) + ("r-limma" ,r-limma) + ("r-locfit" ,r-locfit) + ("r-rcolorbrewer" , r-rcolorbrewer) + ("r-rcpp" ,r-rcpp) + ("r-rsamtools" ,r-rsamtools) + ("r-s4vectors" ,r-s4vectors) + ("r-systempiper" ,r-systempiper) + ("r-zlibbioc" ,r-zlibbioc))) + (home-page "http://bioconductor.org/packages/DiffBind") + (synopsis "Differential binding analysis of ChIP-Seq peak data") + (description + "This package computes differentially bound sites from multiple +ChIP-seq experiments using affinity (quantitative) data. Also enables +occupancy (overlap) analysis and plotting functions.") + (license license:artistic2.0))) -- cgit v1.2.3 From 6d94bf6baa221bde0e6906df49b79fa289d33e19 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Tue, 24 Apr 2018 13:34:29 +0200 Subject: gnu: Add r-ripseeker. * gnu/packages/bioconductor.scm (r-ripseeker): New variable. --- gnu/packages/bioconductor.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e43b3ff928..4c212ecf02 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -114,3 +114,36 @@ (define-public r-diffbind ChIP-seq experiments using affinity (quantitative) data. Also enables occupancy (overlap) analysis and plotting functions.") (license license:artistic2.0))) + +(define-public r-ripseeker + (package + (name "r-ripseeker") + (version "1.18.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "RIPSeeker" version)) + (sha256 + (base32 + "0bqkzwrncww7il36273chkd3gfxmii7p566ycki9qij419pwr35y")))) + (properties `((upstream-name . "RIPSeeker"))) + (build-system r-build-system) + (propagated-inputs + `(("r-s4vectors" ,r-s4vectors) + ("r-iranges" ,r-iranges) + ("r-genomicranges" ,r-genomicranges) + ("r-summarizedexperiment" ,r-summarizedexperiment) + ("r-rsamtools" ,r-rsamtools) + ("r-genomicalignments" ,r-genomicalignments) + ("r-rtracklayer" ,r-rtracklayer))) + (home-page "http://bioconductor.org/packages/RIPSeeker") + (synopsis + "Identifying protein-associated transcripts from RIP-seq experiments") + (description + "This package infers and discriminates RIP peaks from RIP-seq alignments +using two-state HMM with negative binomial emission probability. While +RIPSeeker is specifically tailored for RIP-seq data analysis, it also provides +a suite of bioinformatics tools integrated within this self-contained software +package comprehensively addressing issues ranging from post-alignments +processing to visualization and annotation.") + (license license:gpl2))) -- cgit v1.2.3 From acc6e6955f5d481cf984cafb0459d3489feda99e Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 17 Apr 2018 21:29:41 +0200 Subject: gnu: Add python2-pynacl. * gnu/packages/python-crypto.scm (python2-pynacl): New variable. --- gnu/packages/python-crypto.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index d82cfeb422..dda1024b39 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -619,6 +619,9 @@ (define-public python-pynacl of improving usability, security and speed.") (license license:asl2.0))) +(define-public python2-pynacl + (package-with-python2 python-pynacl)) + (define-public python2-pgpdump (package (name "python2-pgpdump") -- cgit v1.2.3 From 09e3cf583437ce421215dd28d2b94f574458b311 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 17 Apr 2018 21:31:05 +0200 Subject: gnu: ansible: Add missing inputs * gnu/packages/admin.scm (ansible)[native-inputs]: Add python2-bcrypt and python2-pynacl. --- gnu/packages/admin.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 1dc5d2b241..5e2cf2d7ad 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1574,7 +1574,9 @@ (define-public ansible (patches (search-patches "ansible-wrap-program-hack.patch")))) (build-system python-build-system) (native-inputs - `(("python2-pycrypto" ,python2-pycrypto) + `(("python2-bcrypt" ,python2-bcrypt) + ("python2-pycrypto" ,python2-pycrypto) + ("python2-pynacl" ,python2-pynacl) ("python2-httplib2" ,python2-httplib2) ("python2-passlib" ,python2-passlib) ("python2-nose" ,python2-nose) -- cgit v1.2.3 From a6ae9ffd6a133828644099453731eac155d6d367 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Tue, 24 Apr 2018 13:55:35 +0200 Subject: gnu: Add r-multtest. * gnu/packages/bioconductor.scm (r-multtest): New variable. --- gnu/packages/bioconductor.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 4c212ecf02..7cf6811d52 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -147,3 +147,41 @@ (define-public r-ripseeker package comprehensively addressing issues ranging from post-alignments processing to visualization and annotation.") (license license:gpl2))) + +(define-public r-multtest + (package + (name "r-multtest") + (version "2.34.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "multtest" version)) + (sha256 + (base32 + "0n11rd49xl2vn3ldmfips7d3yb70l8npjcqsxyswr9ypjhgzkv9j")))) + (build-system r-build-system) + (propagated-inputs + `(("r-survival" ,r-survival) + ("r-biocgenerics" ,r-biocgenerics) + ("r-biobase" ,r-biobase) + ("r-mass" ,r-mass))) + (home-page "http://bioconductor.org/packages/multtest") + (synopsis "Resampling-based multiple hypothesis testing") + (description + "This package can do non-parametric bootstrap and permutation +resampling-based multiple testing procedures (including empirical Bayes +methods) for controlling the family-wise error rate (FWER), generalized +family-wise error rate (gFWER), tail probability of the proportion of +false positives (TPPFP), and false discovery rate (FDR). Several choices +of bootstrap-based null distribution are implemented (centered, centered +and scaled, quantile-transformed). Single-step and step-wise methods are +available. Tests based on a variety of T- and F-statistics (including +T-statistics based on regression parameters from linear and survival models +as well as those based on correlation parameters) are included. When probing +hypotheses with T-statistics, users may also select a potentially faster null +distribution which is multivariate normal with mean zero and variance +covariance matrix derived from the vector influence function. Results are +reported in terms of adjusted P-values, confidence regions and test statistic +cutoffs. The procedures are directly applicable to identifying differentially +expressed genes in DNA microarray experiments.") + (license license:lgpl3))) -- cgit v1.2.3 From 793f83efe1a13671c4e72dbe095a9984b13e69b3 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Tue, 24 Apr 2018 13:58:01 +0200 Subject: gnu: Add r-chippeakanno. * gnu/packages/bioconductor.scm (r-chippeakanno): New variable. --- gnu/packages/bioconductor.scm | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7cf6811d52..9a00baa89b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -185,3 +185,53 @@ (define-public r-multtest cutoffs. The procedures are directly applicable to identifying differentially expressed genes in DNA microarray experiments.") (license license:lgpl3))) + +(define-public r-chippeakanno + (package + (name "r-chippeakanno") + (version "3.12.7") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "ChIPpeakAnno" version)) + (sha256 + (base32 + "1zab489d7a6bh6ylc68x6yn47gdkmr7p3677grx9l2qafrryjr04")))) + (properties `((upstream-name . "ChIPpeakAnno"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-go-db" ,r-go-db) + ("r-biomart" ,r-biomart) + ("r-bsgenome" ,r-bsgenome) + ("r-genomicfeatures" ,r-genomicfeatures) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-matrixstats" ,r-matrixstats) + ("r-annotationdbi" ,r-annotationdbi) + ("r-limma" ,r-limma) + ("r-multtest" ,r-multtest) + ("r-rbgl" ,r-rbgl) + ("r-graph" ,r-graph) + ("r-biocinstaller" ,r-biocinstaller) + ("r-regioner" ,r-regioner) + ("r-dbi" ,r-dbi) + ("r-ensembldb" ,r-ensembldb) + ("r-biobase" ,r-biobase) + ("r-seqinr" ,r-seqinr) + ("r-idr" ,r-idr) + ("r-genomicalignments" ,r-genomicalignments) + ("r-summarizedexperiment" ,r-summarizedexperiment) + ("r-rsamtools" ,r-rsamtools) + ("r-venndiagram" ,r-venndiagram))) + (home-page "http://bioconductor.org/packages/ChIPpeakAnno") + (synopsis "Peaks annotation from ChIP-seq and ChIP-chip experiments") + (description + "The package includes functions to retrieve the sequences around the peak, +obtain enriched Gene Ontology (GO) terms, find the nearest gene, exon, miRNA or +custom features such as most conserved elements and other transcription factor +binding sites supplied by users. Starting 2.0.5, new functions have been added +for finding the peaks with bi-directional promoters with summary statistics +(peaksNearBDP), for summarizing the occurrence of motifs in peaks +(summarizePatternInPeaks) and for adding other IDs to annotated peaks or +enrichedGO (addGeneIDs).") + (license license:gpl2+))) -- cgit v1.2.3 From fdc3a05d1bcef69223ce8f776c16dd5a51f6baa0 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Tue, 24 Apr 2018 14:03:42 +0200 Subject: gnu: Add r-snowfall. * gnu/packages/cran.scm (r-snowfall): New variable. --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9dc075ffb8..77e5054314 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3924,3 +3924,25 @@ (define-public r-dosnow "This package provides a parallel backend for the @code{%dopar%} function using the @code{snow} package.") (license license:gpl2))) + +(define-public r-snowfall + (package + (name "r-snowfall") + (version "1.84-6.1") + (source (origin + (method url-fetch) + (uri (cran-uri "snowfall" version)) + (sha256 + (base32 "13941rlw1jsdjsndp1plzj1cq5aqravizkrqn6l25r9im7rnsi2w")))) + (build-system r-build-system) + (propagated-inputs + `(("r-snow" ,r-snow))) + (home-page "http://cran.r-project.org/web/packages/snowfall/") + (synopsis "Easier cluster computing") + (description "This package is a usability wrapper around snow for easier +development of parallel R programs. This package offers e.g. extended error +checks, and additional functions. All functions work in sequential mode, too, +if no cluster is present or wished. The package is also designed as connector +to the cluster management tool @code{sfCluster}, but can also used without +it.") + (license license:gpl2+))) -- cgit v1.2.3 From 164502d819c610553823fa63567e55b3a323721f Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Tue, 24 Apr 2018 14:11:19 +0200 Subject: gnu: Add r-marray. * gnu/packages/bioconductor.scm (r-marray): New variable. --- gnu/packages/bioconductor.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 9a00baa89b..b8498b74d7 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -235,3 +235,23 @@ (define-public r-chippeakanno (summarizePatternInPeaks) and for adding other IDs to annotated peaks or enrichedGO (addGeneIDs).") (license license:gpl2+))) + +(define-public r-marray + (package + (name "r-marray") + (version "1.56.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "marray" version)) + (sha256 + (base32 "14c93i86yc7jn4ax8p4l0z6v9xisw1bv7gzb4a0gbxhxn7mddaic")))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-limma" ,r-limma))) + (home-page "http://bioconductor.org/packages/marray") + (synopsis "Exploratory analysis for two-color spotted microarray data") + (description "This package contains class definitions for two-color spotted +microarray data. It also includes fuctions for data input, diagnostic plots, +normalization and quality checking.") + (license license:lgpl2.0+))) -- cgit v1.2.3 From 0416a0d4d5c38a9352d965b71d1eb9d966ed7db9 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Tue, 24 Apr 2018 14:11:51 +0200 Subject: gnu: Add r-cghbase. * gnu/packages/bioconductor.scm (r-cghbase): New variable. --- gnu/packages/bioconductor.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index b8498b74d7..87c0c68f33 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -255,3 +255,23 @@ (define-public r-marray microarray data. It also includes fuctions for data input, diagnostic plots, normalization and quality checking.") (license license:lgpl2.0+))) + +(define-public r-cghbase + (package + (name "r-cghbase") + (version "1.38.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "CGHbase" version)) + (sha256 + (base32 "0fynvcsjdbgp69i0nxrc8ni58rhb1kx9k5r3nb91n9i8s43gjqlm")))) + (properties `((upstream-name . "CGHbase"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-marray" ,r-marray))) + (home-page "http://bioconductor.org/packages/CGHbase") + (synopsis "Base functions and classes for arrayCGH data analysis") + (description "This package contains functions and classes that are needed by +the @code{arrayCGH} packages.") + (license license:gpl2+))) -- cgit v1.2.3 From 67ee83d6c30b7b73facf1f9a7c981d05399ff190 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Tue, 24 Apr 2018 14:12:15 +0200 Subject: gnu: Add r-cghcall. * gnu/packages/bioconductor.scm (r-cghcall): New variable. --- gnu/packages/bioconductor.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 87c0c68f33..9b1d8667a6 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -275,3 +275,26 @@ (define-public r-cghbase (description "This package contains functions and classes that are needed by the @code{arrayCGH} packages.") (license license:gpl2+))) + +(define-public r-cghcall + (package + (name "r-cghcall") + (version "2.40.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "CGHcall" version)) + (sha256 + (base32 "11pi6awz3858yb4s0z3qf3kcmsdgp6d4aj41g4lfix1sv5amllch")))) + (properties `((upstream-name . "CGHcall"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-cghbase" ,r-cghbase) + ("r-impute" ,r-impute) + ("r-dnacopy" ,r-dnacopy) + ("r-snowfall" ,r-snowfall))) + (home-page "http://bioconductor.org/packages/CGHcall") + (synopsis "Base functions and classes for arrayCGH data analysis") + (description "This package contains functions and classes that are needed by +@code{arrayCGH} packages.") + (license license:gpl2+))) -- cgit v1.2.3 From 0ef8cc9c1c568c03c368bcaee5c3e846b8bcc9d2 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Tue, 24 Apr 2018 14:12:32 +0200 Subject: gnu: Add r-qdnaseq. * gnu/packages/bioconductor.scm (r-qdnaseq): New variable. --- gnu/packages/bioconductor.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 9b1d8667a6..76ff773ef1 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -298,3 +298,34 @@ (define-public r-cghcall (description "This package contains functions and classes that are needed by @code{arrayCGH} packages.") (license license:gpl2+))) + +(define-public r-qdnaseq + (package + (name "r-qdnaseq") + (version "1.14.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "QDNAseq" version)) + (sha256 + (base32 "0lgbv4s0xqgrs7q6ynb3c273sf7pyrp51jnc8ravq1z5g0a2zshy")))) + (properties `((upstream-name . "QDNAseq"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-cghbase" ,r-cghbase) + ("r-cghcall" ,r-cghcall) + ("r-dnacopy" ,r-dnacopy) + ("r-genomicranges" ,r-genomicranges) + ("r-iranges" ,r-iranges) + ("r-matrixstats" ,r-matrixstats) + ("r-r-utils" ,r-r-utils) + ("r-rsamtools" ,r-rsamtools))) + (home-page "http://bioconductor.org/packages/QDNAseq") + (synopsis "Quantitative DNA sequencing for chromosomal aberrations") + (description "The genome is divided into non-overlapping fixed-sized bins, +number of sequence reads in each counted, adjusted with a simultaneous +two-dimensional loess correction for sequence mappability and GC content, and +filtered to remove spurious regions in the genome. Downstream steps of +segmentation and calling are also implemented via packages DNAcopy and CGHcall, +respectively.") + (license license:gpl2+))) -- cgit v1.2.3 From a65d88f2a50e7d4aa72a28706389934e4c48afe1 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 24 Apr 2018 16:27:33 +0200 Subject: gnu: node: Update to 9.11.1. * gnu/packages/node.scm (node): Update to 9.11.1. --- gnu/packages/node.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 618dcaa92c..6a3a510ff2 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -43,14 +43,14 @@ (define-module (gnu packages node) (define-public node (package (name "node") - (version "9.10.0") + (version "9.11.1") (source (origin (method url-fetch) (uri (string-append "http://nodejs.org/dist/v" version "/node-v" version ".tar.gz")) (sha256 (base32 - "0xld7jh3fx85az7s5zbbsbccnfjwp99xxfn5w0gh2zfc5dalwrg5")) + "1vjh9zvw7wkdz6b0l99ya7mqjk0l8lbg9isr1q8rxwp400dhkk32")) (modules '((guix build utils))) (snippet `(begin -- cgit v1.2.3 From 3f0ec617f59bd340d2930ff210e4c3d370c7223e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 23 Apr 2018 13:58:38 -0400 Subject: gnu: go@1.4: Use the "real" pkg-config. * gnu/packages/golang.scm (go-1.4)[native-inputs]: Use pkg-config instead of %pkg-config. --- gnu/packages/golang.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 485aa02c46..42d8b3f3f0 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -195,7 +195,7 @@ (define-public go-1.4 ;; https://github.com/golang/go/issues/24046 ("gcc:lib" ,gcc-6 "lib"))) (native-inputs - `(("pkg-config" ,%pkg-config) + `(("pkg-config" ,pkg-config) ("which" ,which) ("net-base" ,net-base) ("perl" ,perl))) -- cgit v1.2.3 From 3f1574434965e1b8bd519380121325a8f5e47216 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 9 Apr 2018 17:05:41 -0400 Subject: gnu: go@1.9: Update to 1.9.5 [fixes CVE-2018-7187]. * gnu/packages/golang.scm (go-1.9): Update to 1.9.5. [arguments]: Disable the 'TestTwoPkgConfigs' test. --- gnu/packages/golang.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 42d8b3f3f0..d25d2fd465 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -214,7 +214,7 @@ (define-public go-1.9 (package (inherit go-1.4) (name "go") - (version "1.9.4") + (version "1.9.5") (source (origin (method url-fetch) @@ -222,7 +222,7 @@ (define-public go-1.9 name version ".src.tar.gz")) (sha256 (base32 - "01nw8rfvf10naja0wq0kabsm012sbqq76hd4b8c7g28n6ggshwq5")))) + "1g4zqhbh1yw3gnb400szzwrdz0k5s3h0h5nc35xgmn5v69zvphpi")))) (arguments (substitute-keyword-arguments (package-arguments go-1.4) ((#:phases phases) @@ -292,6 +292,7 @@ (define-public go-1.9 ("syscall/syscall_unix_test.go" "(.+)(TestPassFD\\(.+)") ("os/exec/exec_test.go" "(.+)(TestExtraFiles/areturn.+)") ("cmd/go/go_test.go" "(.+)(TestCoverageWithCgo.+)") + ("cmd/go/go_test.go" "(.+)(TestTwoPkgConfigs.+)") ("os/exec/exec_test.go" "(.+)(TestOutputStderrCapture.+)") ("os/exec/exec_test.go" "(.+)(TestExtraFiles.+)") ("os/exec/exec_test.go" "(.+)(TestExtraFilesRace.+)") -- cgit v1.2.3 From f0b85055c73629afc962b86bd13c195abca3dbb0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 9 Apr 2018 17:07:13 -0400 Subject: gnu: go@1.10: Update to 1.10.1 [fixes CVE-2018-7187]. * gnu/packages/golang.scm (go-1.10): Update to 1.10.1. [arguments]: Disable the 'TestTwoPkgConfigs' test. --- gnu/packages/golang.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d25d2fd465..c6fc68468f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -383,7 +383,7 @@ (define-public go-1.10 (package (inherit go-1.9) (name "go") - (version "1.10") + (version "1.10.1") (source (origin (method url-fetch) @@ -391,7 +391,7 @@ (define-public go-1.10 name version ".src.tar.gz")) (sha256 (base32 - "093z1h0gmi458kv7smpx0ph6jm7ss9mzxa432kysbz85jhl4kppk")))) + "1p1xyyxicp752n9wj10sljjl6mjxpfsplkhx74fzzjrwdkzlk52q")))) (arguments (substitute-keyword-arguments (package-arguments go-1.9) ((#:phases phases) @@ -461,6 +461,7 @@ (define-public go-1.10 ("syscall/syscall_unix_test.go" "(.+)(TestPassFD\\(.+)") ("os/exec/exec_test.go" "(.+)(TestExtraFiles/areturn.+)") ("cmd/go/go_test.go" "(.+)(TestCoverageWithCgo.+)") + ("cmd/go/go_test.go" "(.+)(TestTwoPkgConfigs.+)") ("os/exec/exec_test.go" "(.+)(TestOutputStderrCapture.+)") ("os/exec/exec_test.go" "(.+)(TestExtraFiles.+)") ("os/exec/exec_test.go" "(.+)(TestExtraFilesRace.+)") -- cgit v1.2.3 From a0a553dcf12b3d6ad99237b75c3907bcb6ccaeeb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Apr 2018 20:12:07 +0200 Subject: gnu: libraw: Update to 0.18.9. * gnu/packages/photo.scm (libraw): Update to 0.18.9. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 437acd305d..d56cd6ecce 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -69,14 +69,14 @@ (define-module (gnu packages photo) (define-public libraw (package (name "libraw") - (version "0.18.8") + (version "0.18.9") (source (origin (method url-fetch) (uri (string-append "https://www.libraw.org/data/LibRaw-" version ".tar.gz")) (sha256 (base32 - "1qi0fkw2zmd0yplrf79z7lgpz0hxl45dj5rdgpaj7283jzys9b2n")))) + "0kmjfdr409k9q9n17k9ywims5z4kqc16s81ba7y09n7669q1gvyj")))) (build-system gnu-build-system) (home-page "https://www.libraw.org") (synopsis "Raw image decoder") -- cgit v1.2.3 From 460292af30f08567833926f0ee8b49287ba9c9bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Apr 2018 20:19:38 +0200 Subject: gnu: qemu: Update to 2.12.0. * gnu/packages/patches/qemu-CVE-2018-7550.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/virtualization.scm (qemu): Update to 2.12.0. [source](patches): Remove. --- gnu/local.mk | 1 - gnu/packages/patches/qemu-CVE-2018-7550.patch | 66 --------------------------- gnu/packages/virtualization.scm | 5 +- 3 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 gnu/packages/patches/qemu-CVE-2018-7550.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 056a46cb79..639dd943d6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1061,7 +1061,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-waitress-fix-tests.patch \ - %D%/packages/patches/qemu-CVE-2018-7550.patch \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ diff --git a/gnu/packages/patches/qemu-CVE-2018-7550.patch b/gnu/packages/patches/qemu-CVE-2018-7550.patch deleted file mode 100644 index 43f111e206..0000000000 --- a/gnu/packages/patches/qemu-CVE-2018-7550.patch +++ /dev/null @@ -1,66 +0,0 @@ -Fix CVE-2018-7550: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7550 - -Patch copied from upstream source repository: - -https://git.qemu.org/?p=qemu.git;a=patch;h=2a8fcd119eb7c6bb3837fc3669eb1b2dfb31daf8 - -From 2a8fcd119eb7c6bb3837fc3669eb1b2dfb31daf8 Mon Sep 17 00:00:00 2001 -From: Jack Schwartz -Date: Thu, 21 Dec 2017 09:25:15 -0800 -Subject: [PATCH] multiboot: bss_end_addr can be zero - -The multiboot spec (https://www.gnu.org/software/grub/manual/multiboot/), -section 3.1.3, allows for bss_end_addr to be zero. - -A zero bss_end_addr signifies there is no .bss section. - -Suggested-by: Daniel Kiper -Signed-off-by: Jack Schwartz -Reviewed-by: Daniel Kiper -Reviewed-by: Prasad J Pandit -Signed-off-by: Kevin Wolf ---- - hw/i386/multiboot.c | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c -index 46d9c68bf5..bb8d8e4629 100644 ---- a/hw/i386/multiboot.c -+++ b/hw/i386/multiboot.c -@@ -233,12 +233,6 @@ int load_multiboot(FWCfgState *fw_cfg, - mh_entry_addr = ldl_p(header+i+28); - - if (mh_load_end_addr) { -- if (mh_bss_end_addr < mh_load_addr) { -- fprintf(stderr, "invalid mh_bss_end_addr address\n"); -- exit(1); -- } -- mb_kernel_size = mh_bss_end_addr - mh_load_addr; -- - if (mh_load_end_addr < mh_load_addr) { - fprintf(stderr, "invalid mh_load_end_addr address\n"); - exit(1); -@@ -249,8 +243,16 @@ int load_multiboot(FWCfgState *fw_cfg, - fprintf(stderr, "invalid kernel_file_size\n"); - exit(1); - } -- mb_kernel_size = kernel_file_size - mb_kernel_text_offset; -- mb_load_size = mb_kernel_size; -+ mb_load_size = kernel_file_size - mb_kernel_text_offset; -+ } -+ if (mh_bss_end_addr) { -+ if (mh_bss_end_addr < (mh_load_addr + mb_load_size)) { -+ fprintf(stderr, "invalid mh_bss_end_addr address\n"); -+ exit(1); -+ } -+ mb_kernel_size = mh_bss_end_addr - mh_load_addr; -+ } else { -+ mb_kernel_size = mb_load_size; - } - - /* Valid if mh_flags sets MULTIBOOT_HEADER_HAS_VBE. --- -2.17.0 - diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 59b4c63293..86f4d71364 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -87,15 +87,14 @@ (define (qemu-patch commit file-name sha256) (define-public qemu (package (name "qemu") - (version "2.11.1") + (version "2.12.0") (source (origin (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) - (patches (search-patches "qemu-CVE-2018-7550.patch")) (sha256 (base32 - "11l6cs6mib16rgdrnqrhkqs033fjik316gkgfz3asbmxz38lalca")))) + "1z66spkm1prvhbq7h5mfnp0i6mmamsb938fqmdfvyrgzc7rh34z6")))) (build-system gnu-build-system) (arguments '(;; Running tests in parallel can occasionally lead to failures, like: -- cgit v1.2.3 From 005ccea624da372ee81584573b10cc2ebd73d287 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 24 Apr 2018 16:49:35 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.129. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.129. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1d9585e7f1..4982c68121 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -416,8 +416,8 @@ (define-public linux-libre-4.9 #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.128" - "1aqz5skyz534bcpnn6w9madg6kadgyjjypah9dhmqf841rygb6rk" + (make-linux-libre "4.4.129" + "1m4434iabnpn77521lm59wzjprq5brx8vr1952jd5a4gqwilmnnb" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 22789d97b01914ba0fe4861a8cd133573b58fe43 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 24 Apr 2018 16:50:11 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.96. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.96. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4982c68121..5bdde86bc3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -410,8 +410,8 @@ (define-public linux-libre-4.14 #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.95" - "06i756gbglxa2m4lib4p0fff5m2fm4s6f9aqc58i8lihnjqpkldk" + (make-linux-libre "4.9.96" + "0w4j8pfpa1qfyv1ipqvdalfydsw2d1ygqd4aj9ls7f16rxq3clw0" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From feb477869e365b9d80df00b4c1c170a417d07a3f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 24 Apr 2018 16:50:54 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.36. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.36. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5bdde86bc3..06ba61a096 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -400,8 +400,8 @@ (define-public linux-libre %linux-compatible-systems #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.35") -(define %linux-libre-4.14-hash "0dfzc2290zks1a63zld8ac0xarc8gxwwh4wsr71y8mas7gfmyqzj") +(define %linux-libre-4.14-version "4.14.36") +(define %linux-libre-4.14-hash "03iwsaa5bb43v2yq81n0i9ysj63fik0nnhlrvwq8zsk8ni9sl6yb") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From ba39d3280759fb20a4ff0092a5afac721a5fa769 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 24 Apr 2018 16:51:45 -0400 Subject: gnu: linux-libre: Update to 4.16.4. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.16.4. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 06ba61a096..e6a1dae0c4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -391,8 +391,8 @@ (define %linux-compatible-systems '("x86_64-linux" "i686-linux" "armhf-linux")) ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.16.3") -(define %linux-libre-hash "1wmx0ph8nbwidlx1dh8bi4p97b84nif9ymv00mafnn6iykdfdin0") +(define %linux-libre-version "4.16.4") +(define %linux-libre-hash "0lq3yv88yd9zcz52bl4hfllb41vy1i826gcim6qjjc88assqib9i") (define-public linux-libre (make-linux-libre %linux-libre-version -- cgit v1.2.3 From b24b19e3ffb01ae0663e96dbafc01759646c142f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 24 Apr 2018 23:31:54 +0200 Subject: gnu: retroarch: Update to 1.7.2. * gnu/packages/emulators.scm (retroarch): Update to 1.7.2. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 75b191c067..9bf78ce05f 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1043,7 +1043,7 @@ (define-public nestopia-ue (define-public retroarch (package (name "retroarch") - (version "1.7.1") + (version "1.7.2") (source (origin (method url-fetch) @@ -1051,7 +1051,7 @@ (define-public retroarch version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1wykv0w0kdlh7lh0k1ig0lpk5vh4c7r19jlfa9103jmjlryrq679")))) + (base32 "1sk3cp8y4rdiyhk2rgk1asdla5mpmybr778v0zqb5m4iyhrd1m2y")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests -- cgit v1.2.3 From 1a04c893fa1fdf2309462f023e884d9c6cac07e5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 25 Apr 2018 09:57:11 +0200 Subject: gnu: emacs-org, emacs-org-contrib: Update packages. * gnu/packages/emacs.scm (emacs-org): Update to 9.1.11. (emacs-org-contrib): Update to 20180423. --- gnu/packages/emacs.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 3ddca5be4a..802f289c6d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4618,14 +4618,14 @@ (define-public emacs-org (name "emacs-org") ;; emacs-org-contrib inherits from this package. Please update its sha256 ;; checksum as well. - (version "9.1.10") + (version "9.1.11") (source (origin (method url-fetch) (uri (string-append "http://elpa.gnu.org/packages/org-" version ".tar")) (sha256 (base32 - "01vvq6m7r2ifyflvq5ga241qvl4j62smz0zr6jljk56b6nqi20lm")))) + "0i27g5qbkfqbxhgiz917pjwkxg3rwid99d0ickwx43bzq0zi7c1m")))) (build-system emacs-build-system) (home-page "https://orgmode.org/") (synopsis "Outline-based notes management and organizer") @@ -4639,14 +4639,14 @@ (define-public emacs-org-contrib (package (inherit emacs-org) (name "emacs-org-contrib") - (version "20180416") + (version "20180423") (source (origin (method url-fetch) (uri (string-append "https://orgmode.org/elpa/org-plus-contrib-" version ".tar")) (sha256 (base32 - "1f5zdfsa1fcf66hk3w57wh5385069yg0b86h57jgkcbmxkcmj6ij")))) + "1aggvdy74q8p79xyc19zring5gjvlzp6lbsq8ar319zkmcjrapqd")))) (arguments `(#:modules ((guix build emacs-build-system) (guix build utils) -- cgit v1.2.3 From 076fcab12064e3071de6104ea18a0bd3be87ea94 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 25 Apr 2018 11:15:56 +0200 Subject: gnu: vulkan-icd-loader: Update to 1.1.73.0. * gnu/packages/vulkan.scm (vulkan-icd-loader): Update to 1.1.73.0. --- gnu/packages/vulkan.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 12b1f93015..ac9f6f2f25 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -160,7 +160,7 @@ (define-public glslang (define-public vulkan-icd-loader (package (name "vulkan-icd-loader") - (version "1.1.70.0") + (version "1.1.73.0") (source (origin (method url-fetch) @@ -169,7 +169,7 @@ (define-public vulkan-icd-loader "archive/sdk-" version ".tar.gz")) (sha256 (base32 - "15qkh77596v3xivnbb3l0q9zbmmsdglnaza2m1g7f8q7bbigyc5x")))) + "1qb34j2zrc04fgs96m3k76vi4nx3sygbdcyg7pbwasr45cbdhsxb")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". @@ -182,6 +182,7 @@ (define-public vulkan-icd-loader #t))) #:configure-flags (list "-DBUILD_LAYERS=OFF" ; FIXME: Fails to build. + "-DBUILD_TESTS=OFF" ; FIXME: Needs 'googletest' submodule. (string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib")))) (inputs `(("glslang" ,glslang) -- cgit v1.2.3 From 035ee04b8978b8b58ad538aeea9aeb87f802203f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 25 Apr 2018 11:25:35 +0200 Subject: gnu: parallel: Update to 20180422. * gnu/packages/parallel.scm (parallel): Update to 20180422. --- gnu/packages/parallel.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 66d9e933e7..1dfafac4e7 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Ben Woodcroft -;;; Copyright © 2017 Rutger Helling +;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -47,7 +47,7 @@ (define-module (gnu packages parallel) (define-public parallel (package (name "parallel") - (version "20180322") + (version "20180422") (source (origin (method url-fetch) @@ -55,7 +55,7 @@ (define-public parallel version ".tar.bz2")) (sha256 (base32 - "15v46pv4z98xm3fkwy7335faw4r7pilrxp4xis5a4zi4319sv2b3")))) + "0xsfpbxwgd4197gra981iv0nmjfk58c0d88dxx6dh6yrqz523klx")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 113e9bc5a46707bdff4521655720c9694f587016 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 25 Apr 2018 11:30:21 +0200 Subject: gnu: diffoscope: Update to 93. * gnu/packages/package-management.scm (diffoscope): Update to 93. --- gnu/packages/package-management.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index a08bfaf5b7..c4107f79e2 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Julien Lepiller +;;; Copyright © 2018 Rutger Helling ;;; ;;; This file is part of GNU Guix. ;;; @@ -534,13 +535,13 @@ (define-public rpm (define-public diffoscope (package (name "diffoscope") - (version "90") + (version "93") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "0hhg26vi0z2q4gwklwq4k16hibc4kq16jvyzp6zhr4kspi07wl6i")))) + "0g90nf7817jk03hzk36l3hymky4xqs50iynfld3r0in7hffly5nj")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From fe355a1f8df476eabbc7718d8b420e3e524a099a Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 25 Apr 2018 11:41:17 +0200 Subject: gnu: youtube-dl: Update to 2018.04.25. * gnu/packages/video.scm (youtube-dl): Update to 2018.04.25. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dc5a375664..7c2e20527f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1153,7 +1153,7 @@ (define-public libvpx (define-public youtube-dl (package (name "youtube-dl") - (version "2018.04.16") + (version "2018.04.25") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1161,7 +1161,7 @@ (define-public youtube-dl version ".tar.gz")) (sha256 (base32 - "046zg8pww2xg1yibh7c1a8jcg8f1znr4hsz1l1da03djcp6na99d")))) + "17zxgwfcy7c6gdyxdgh02f5zi52gvmy0zpccfj6zjkhw5iqj1vbw")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 5854082a7ad2aa5e7907d3fcde88a867bb0402ed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Apr 2018 06:30:43 +0200 Subject: gnu: ruby-ascii85: Update to 1.0.3. * gnu/packages/ruby.scm (ruby-ascii85): Update to 1.0.3. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 98bb5bd110..fc63709894 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4585,14 +4585,14 @@ (define-public ruby-afm (define-public ruby-ascii85 (package (name "ruby-ascii85") - (version "1.0.2") + (version "1.0.3") (source (origin (method url-fetch) (uri (rubygems-uri "Ascii85" version)) (sha256 (base32 - "0j95sbxd18kc8rhcnvl1w37kflqpax1r12h1x47gh4xxn3mz4m7q")))) + "0658m37jjjn6drzqg1gk4p6c205mgp7g1jh2d00n4ngghgmz5qvs")))) (build-system ruby-build-system) (native-inputs `(("bundler" ,bundler))) -- cgit v1.2.3 From 21acf56184870eee13bb550b18487e42d1b6ba8c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Apr 2018 20:53:50 +0200 Subject: gnu: perl-type-tiny: Update to 1.002002. * gnu/packages/perl.scm (perl-type-tiny): Update to 1.002002. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 9de8c3fdf7..1975ae15ab 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8789,7 +8789,7 @@ (define-public perl-type-tie (define-public perl-type-tiny (package (name "perl-type-tiny") - (version "1.002001") + (version "1.002002") (source (origin (method url-fetch) @@ -8797,7 +8797,7 @@ (define-public perl-type-tiny "Type-Tiny-" version ".tar.gz")) (sha256 (base32 - "1p8krim8kvw123nady96fagi8sk2pj1z8jkr4r8n45ihyamfxjck")))) + "0b48v28rvl20969gyr62yg6gr6a2nj9qik0bixavbjdmk67hqnx8")))) (build-system perl-build-system) (native-inputs `(("perl-test-warnings" ,perl-test-warnings))) -- cgit v1.2.3 From 222999c989f76fb734ac83d6b397e9281c81123f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Apr 2018 20:54:23 +0200 Subject: gnu: ruby-domain-name: Update to 0.5.20180417. * gnu/packages/ruby.scm (ruby-domain-name): Update to 0.5.20180417. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index fc63709894..c15e677438 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4079,14 +4079,14 @@ (define-public ruby-unf (define-public ruby-domain-name (package (name "ruby-domain-name") - (version "0.5.20170404") + (version "0.5.20180417") (source (origin (method url-fetch) (uri (rubygems-uri "domain_name" version)) (sha256 (base32 - "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf")))) + "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit v1.2.3 From ab85cf7185da366da56314c53d8e43276e1cccc4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Apr 2018 21:27:31 +0200 Subject: gnu: perl-business-isbn: Update to 3.004. * gnu/packages/perl.scm (perl-business-isbn): Update to 3.004. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 1975ae15ab..3edb2b6168 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -610,7 +610,7 @@ (define-public perl-business-isbn-data (define-public perl-business-isbn (package (name "perl-business-isbn") - (version "3.003") + (version "3.004") (source (origin (method url-fetch) @@ -618,7 +618,7 @@ (define-public perl-business-isbn "Business-ISBN-" version ".tar.gz")) (sha256 (base32 - "1i2bxzqkki257rqbswa4ryj1grmwa5s47wrxln2ff5mha1ry31gm")))) + "07l3zfv8hagv37i3clvj5a1zc2jarr5phg80c93ks35zaz6llx9i")))) (build-system perl-build-system) (propagated-inputs `(("perl-business-isbn-data" ,perl-business-isbn-data) -- cgit v1.2.3 From 5b862761f2a60af79b4c16851454a5e792ef4f56 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Wed, 25 Apr 2018 14:28:28 +0200 Subject: gnu: guix: Update to ab85cf7. * gnu/packages/package-management.scm (guix): Update to ab85cf7. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c4107f79e2..e834f643c4 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -94,8 +94,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.14.0") - (commit "486de7377f25438b0f44fd93f97e9ef822d558b8") - (revision 10)) + (commit "ab85cf7185da366da56314c53d8e43276e1cccc4") + (revision 11)) (package (name "guix") @@ -111,7 +111,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "12ghbby83w335g7vbg7h52hjaal5l6mc6qmldlx8029340br8h1w")) + "1c00yr2vgsdl3kmlbjppyws47ssahamdx88y0wg26x73px71rd19")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From d000264299864480aa8b80357a3c6ae5ff2a5e74 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Wed, 25 Apr 2018 14:55:26 +0200 Subject: gnu: guile-ssh: Move files from bin to examples directory. * gnu/packages/ssh.scm (guile-ssh): Move files from bin to the examples directory. --- gnu/packages/ssh.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index afd41cd8e7..e4a277c5e6 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -259,8 +259,20 @@ (define-public guile-ssh (substitute* (find-files "." "\\.scm$") (("\"libguile-ssh\"") (string-append "\"" libdir "/libguile-ssh\""))) - #t))))) - + #t)))) + (add-after 'install 'remove-bin-directory + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (examples (string-append + out "/share/guile-ssh/examples"))) + (mkdir-p examples) + (rename-file (string-append bin "/ssshd.scm") + (string-append examples "/ssshd.scm")) + (rename-file (string-append bin "/sssh.scm") + (string-append examples "/sssh.scm")) + (delete-file-recursively bin) + #t)))) ;; Tests are not parallel-safe. #:parallel-tests? #f)) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 8bf8dedc9a3009ec00f4d2a785d85474b07c3f05 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Apr 2018 12:14:13 +0200 Subject: gnu: rocksdb: Update to 5.12.4. * gnu/packages/databases.scm (rocksdb): Update to 5.12.4. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ecbb815246..f54fec6420 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -845,7 +845,7 @@ (define-public recutils (define-public rocksdb (package (name "rocksdb") - (version "5.10.4") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/facebook/rocksdb" @@ -853,7 +853,7 @@ (define-public rocksdb (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0hp7jxr99vyc57n708hiqk4lks9a9zmjgfjc21mx6v1rmabj2944")) + "1jcwgsjhk4hdfr2wf549blkgb89vwcdb5i2ahhqs6zf3mm20i3bf")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 3743e1320eb6ff6da8265d6576d4a6969ec5514e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Apr 2018 12:26:25 +0200 Subject: gnu: ceph: Update to 12.2.5. * gnu/packages/patches/ceph-skip-collect-sys-info-test.patch: Adjust. * gnu/packages/storage.scm (ceph): Update to 12.2.5. --- gnu/packages/patches/ceph-skip-collect-sys-info-test.patch | 11 +++-------- gnu/packages/storage.scm | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch b/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch index f210799254..429087c661 100644 --- a/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch +++ b/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch @@ -1,14 +1,13 @@ This test fails because /etc/os-release is not available. diff --git a/src/test/common/test_util.cc b/src/test/common/test_util.cc -index 288dd37db1..95b6cd4b30 100644 +index 64eace923c..6daf4aa514 100644 --- a/src/test/common/test_util.cc +++ b/src/test/common/test_util.cc -@@ -31,19 +31,3 @@ TEST(util, unit_to_bytesize) - +@@ -32,17 +32,3 @@ TEST(util, unit_to_bytesize) ASSERT_EQ(65536ll, unit_to_bytesize(" 64K", &cerr)); } -- + -#if defined(__linux__) -TEST(util, collect_sys_info) -{ @@ -18,12 +17,8 @@ index 288dd37db1..95b6cd4b30 100644 - collect_sys_info(&sys_info, cct); - - ASSERT_TRUE(sys_info.find("distro") != sys_info.end()); -- ASSERT_TRUE(sys_info.find("distro_version") != sys_info.end()); - ASSERT_TRUE(sys_info.find("distro_description") != sys_info.end()); - - cct->put(); -} -#endif --- -2.11.1 - diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 54d91c1f3c..2ba6b856fb 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -52,14 +52,14 @@ (define-module (gnu packages storage) (define-public ceph (package (name "ceph") - (version "12.2.4") + (version "12.2.5") (source (origin (method url-fetch) (uri (string-append "https://download.ceph.com/tarballs/ceph-" version ".tar.gz")) (sha256 (base32 - "13hv8scaxc1gdvrhzbfnsk4yy3pla6n1i4j4j4zf7schmbf0j8mp")) + "1ydc3mfvc0vpnpfnfmissvsrsj4jyxgzc2pcl1a4vdr3bwkcglp3")) (patches (search-patches "ceph-skip-unittest_blockdev.patch" "ceph-skip-collect-sys-info-test.patch" -- cgit v1.2.3 From 5843dab8fbb8f4583e37c16a9295b7b7917eebd8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Apr 2018 12:29:02 +0200 Subject: gnu: fio: Update to 3.6. * gnu/packages/benchmark.scm (fio): Update to 3.6. --- gnu/packages/benchmark.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 77dcd78331..bf88bd4919 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -34,7 +34,7 @@ (define-module (gnu packages benchmark) (define-public fio (package (name "fio") - (version "3.5") + (version "3.6") (source (origin (method url-fetch) (uri (string-append @@ -42,7 +42,7 @@ (define-public fio "fio-" version ".tar.bz2")) (sha256 (base32 - "1rrzcrn07db4pffvi2q0d0k884bwcapx6r1rfv4yx9066snvx240")))) + "1d2jibp1b2dq97f22wj6pcjl7gbd2kmhfggj2c7q3j8v9axjqsh2")))) (build-system gnu-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From 0afeda65218ed0c82ab18762111c52a9fedd2582 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Apr 2018 12:45:39 +0200 Subject: gnu: multipath-tools: Update to 0.7.6. * gnu/packages/linux.scm (multipath-tools): Update to 0.7.6. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e6a1dae0c4..c7c057b349 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2898,7 +2898,7 @@ (define-public mdadm-static (define-public multipath-tools (package (name "multipath-tools") - (version "0.7.4") + (version "0.7.6") (source (origin (method url-fetch) (uri (string-append "https://git.opensvc.com/?p=multipath-tools/" @@ -2906,7 +2906,7 @@ (define-public multipath-tools (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "02lk453wa2gfxkl8zmdws15nkcibln2yw76zm779pkngkhggl6w8")) + "0zkcayi3mmp43ji2zid1gprgsvqhjjapsw7jjd60sf75prf50h2r")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3