From 5a64785019ed7e81c838b3ce45be63e9076b100d Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 4 Feb 2020 10:31:29 +0100 Subject: gnu: sbcl-bordeaux-threads: Update to 0.8.7. * gnu/packages/lisp-xyz.scm (sbcl-bordeaux-threads): Update to 0.8.7. --- gnu/packages/lisp-xyz.scm | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 66085919b1..9a09ef4ae7 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -166,29 +166,27 @@ (define-public ecl-fiveam (sbcl-package->ecl-package sbcl-fiveam)) (define-public sbcl-bordeaux-threads - (let ((commit "5dce49fbc829f4d136a734f5ef4f5d599660984f") - (revision "1")) - (package - (name "sbcl-bordeaux-threads") - (version (git-version "0.8.6" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/sionescu/bordeaux-threads.git") - (commit commit))) - (sha256 - (base32 "1gkh9rz7zw57n3110ikcf4835950wr4hgp8l79id5ai6nd86x7wv")) - (file-name - (git-file-name "bordeaux-threads" version)))) - (inputs `(("alexandria" ,sbcl-alexandria))) - (native-inputs `(("fiveam" ,sbcl-fiveam))) - (build-system asdf-build-system/sbcl) - (synopsis "Portable shared-state concurrency library for Common Lisp") - (description "BORDEAUX-THREADS is a proposed standard for a minimal + (package + (name "sbcl-bordeaux-threads") + (version "0.8.7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sionescu/bordeaux-threads.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "1whpfmyxp2fsw6viqj45fqgsifgr534c575bfh5vaqw5m84b6alp")) + (file-name + (git-file-name "bordeaux-threads" version)))) + (inputs `(("alexandria" ,sbcl-alexandria))) + (native-inputs `(("fiveam" ,sbcl-fiveam))) + (build-system asdf-build-system/sbcl) + (synopsis "Portable shared-state concurrency library for Common Lisp") + (description "BORDEAUX-THREADS is a proposed standard for a minimal MP/Threading interface. It is similar to the CLIM-SYS threading and lock support.") - (home-page "https://common-lisp.net/project/bordeaux-threads/") - (license license:x11)))) + (home-page "https://common-lisp.net/project/bordeaux-threads/") + (license license:x11))) (define-public cl-bordeaux-threads (sbcl-package->cl-source-package sbcl-bordeaux-threads)) -- cgit v1.2.3 From f0d9eaca69aa3b44fbbdee0e4b0d3ce8ff1f94a2 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 4 Feb 2020 10:37:42 +0100 Subject: gnu: sbcl-cl-fad: Update to 0.7.6. * gnu/packages/lisp-xyz.scm (sbcl-cl-fad): Update to 0.7.6. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9a09ef4ae7..d6921ac92c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1568,7 +1568,7 @@ (define-public ecl-3bmd-ext-code-blocks (define-public sbcl-cl-fad (package (name "sbcl-cl-fad") - (version "0.7.5") + (version "0.7.6") (source (origin (method git-fetch) @@ -1577,7 +1577,7 @@ (define-public sbcl-cl-fad (commit (string-append "v" version)))) (sha256 (base32 - "1l1qmk9z57q84bz5r04sxsksggsnd7dgkxlybzh9imz6ma7sm52m")) + "1gc8i82v6gks7g0lnm54r4prk2mklidv2flm5fvbr0a7rsys0vpa")) (file-name (string-append "cl-fad" version "-checkout")))) (build-system asdf-build-system/sbcl) (inputs -- cgit v1.2.3 From a2b6b9731505c59856354846e229279217cf500c Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 4 Feb 2020 10:46:57 +0100 Subject: gnu: sbcl-drakma: Update to 2.0.7. * gnu/packages/lisp-xyz.scm (sbcl-drakma): Update to 2.0.7. --- gnu/packages/lisp-xyz.scm | 63 ++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 33 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d6921ac92c..26d0c2df32 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3664,41 +3664,38 @@ (define-public cl-chipz (sbcl-package->cl-source-package sbcl-chipz)) (define-public sbcl-drakma - (let ((version "2.0.4") - (commit "7647c0ae842ff2058624e53979c7f297760c97a7") - (revision "1")) - (package - (name "sbcl-drakma") - (version (git-version version revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/edicl/drakma.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1c4i9wakhj5pxfyyykxshdmv3180sbkrx6fcyynikmc0jd0rh84r")))) - (build-system asdf-build-system/sbcl) - (inputs - `(("sbcl-puri" ,sbcl-puri) - ("sbcl-cl-base64" ,sbcl-cl-base64) - ("sbcl-chunga" ,sbcl-chunga) - ("sbcl-flexi-streams" ,sbcl-flexi-streams) - ("sbcl-cl-ppcre" ,sbcl-cl-ppcre) - ("sbcl-chipz" ,sbcl-chipz) - ("sbcl-usocket" ,sbcl-usocket) - ("sbcl-cl+ssl" ,sbcl-cl+ssl))) - (native-inputs - `(("sbcl-fiveam" ,sbcl-fiveam))) - (home-page "https://edicl.github.io/drakma/") - (synopsis "HTTP client written in Common Lisp") - (description - "Drakma is a full-featured HTTP client implemented in Common Lisp. It + (package + (name "sbcl-drakma") + (version "2.0.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/edicl/drakma.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1441idnyif9xzx3ln1p3fg36k2v9h4wasjqrzc8y52j61420qpci")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("sbcl-puri" ,sbcl-puri) + ("sbcl-cl-base64" ,sbcl-cl-base64) + ("sbcl-chunga" ,sbcl-chunga) + ("sbcl-flexi-streams" ,sbcl-flexi-streams) + ("sbcl-cl-ppcre" ,sbcl-cl-ppcre) + ("sbcl-chipz" ,sbcl-chipz) + ("sbcl-usocket" ,sbcl-usocket) + ("sbcl-cl+ssl" ,sbcl-cl+ssl))) + (native-inputs + `(("sbcl-fiveam" ,sbcl-fiveam))) + (home-page "https://edicl.github.io/drakma/") + (synopsis "HTTP client written in Common Lisp") + (description + "Drakma is a full-featured HTTP client implemented in Common Lisp. It knows how to handle HTTP/1.1 chunking, persistent connections, re-usable sockets, SSL, continuable uploads, file uploads, cookies, and more.") - (license license:bsd-2)))) + (license license:bsd-2))) (define-public cl-drakma (sbcl-package->cl-source-package sbcl-drakma)) -- cgit v1.2.3 From 10ac723ba74c726a49c0c8a0129915295b60318a Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 4 Feb 2020 10:53:46 +0100 Subject: gnu: Add ecl-drakma. * gnu/packages/lisp-xyz (ecl-drakma): New variable. --- gnu/packages/lisp-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 26d0c2df32..777c9234ed 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3700,6 +3700,9 @@ (define-public sbcl-drakma (define-public cl-drakma (sbcl-package->cl-source-package sbcl-drakma)) +(define-public ecl-drakma + (sbcl-package->ecl-package sbcl-drakma)) + (define-public sbcl-hunchentoot (package (name "sbcl-hunchentoot") -- cgit v1.2.3 From 6b0604fd43163ae29ba5b38613c892036a240754 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 4 Feb 2020 11:01:59 +0100 Subject: gnu: sbcl-flexi-streams: Update to 1.0.18. * gnu/packages/lisp-xyz.scm (sbcl-flexi-streams): Update to 1.0.18. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 777c9234ed..89b2fc9a27 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -265,7 +265,7 @@ (define-public ecl-fiasco (define-public sbcl-flexi-streams (package (name "sbcl-flexi-streams") - (version "1.0.16") + (version "1.0.18") (source (origin (method git-fetch) @@ -274,7 +274,7 @@ (define-public sbcl-flexi-streams (commit (string-append "v" version)))) (file-name (git-file-name "flexi-streams" version)) (sha256 - (base32 "0gvykjlmja060zqq6nn6aqxlshh6r6ijahmmgf20q0d839rwpgxc")))) + (base32 "0bjv7fd2acknidc5dyi3h85pn10krxv5jyxs1xg8jya2rlfv7f1j")))) (build-system asdf-build-system/sbcl) (arguments `(#:phases -- cgit v1.2.3 From 6c8744254885bedaa4e82f77a7bf3af18a615fc8 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 4 Feb 2020 11:09:13 +0100 Subject: gnu: sbcl-cl-ppcre: Update to 2.1.1. * gnu/packages/lisp-xyz.scp (sbcl-cl-ppcre): Update to 2.1.1. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 89b2fc9a27..4f9b558499 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -302,7 +302,7 @@ (define-public ecl-flexi-streams (define-public sbcl-cl-ppcre (package (name "sbcl-cl-ppcre") - (version "2.0.11") + (version "2.1.1") (source (origin (method git-fetch) @@ -311,7 +311,7 @@ (define-public sbcl-cl-ppcre (commit (string-append "v" version)))) (file-name (git-file-name "cl-ppcre" version)) (sha256 - (base32 "0q3iany07vgqm144lw6pj0af2d3vsikpbkwcxr30fci3kzsq4f49")))) + (base32 "0dwvr29diqzcg5n6jvbk2rnd90i05l7n828hhw99khmqd0kz7xsi")))) (build-system asdf-build-system/sbcl) (native-inputs `(("flexi-streams" ,sbcl-flexi-streams))) (synopsis "Portable regular expression library for Common Lisp") -- cgit v1.2.3 From 6fdfef668ae19e83945ef4e0e42b5a9ceeb5c1ed Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 4 Feb 2020 11:24:29 +0100 Subject: gnu: sbcl-cl-unicode: Update to 0.1.6. * gnu/packages/lisp-xyz.scm (sbcl-cl-unicode-base): Update to 0.1.6. --- gnu/packages/lisp-xyz.scm | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4f9b558499..0c705ab173 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -328,32 +328,30 @@ (define-public ecl-cl-ppcre (sbcl-package->ecl-package sbcl-cl-ppcre)) (define sbcl-cl-unicode-base - (let ((revision "1") - (commit "9fcd06fba1ddc9e66aed2f2d6c32dc9b764f03ea")) - (package - (name "sbcl-cl-unicode-base") - (version (string-append "0.1.5-" revision "." (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/edicl/cl-unicode.git") - (commit commit))) - (file-name (string-append "cl-unicode-" version "-checkout")) - (sha256 - (base32 - "1jicprb5b3bv57dy1kg03572gxkcaqdjhak00426s76g0plmx5ki")))) - (build-system asdf-build-system/sbcl) - (arguments - '(#:asd-file "cl-unicode.asd" - #:asd-system-name "cl-unicode/base")) - (inputs - `(("cl-ppcre" ,sbcl-cl-ppcre))) - (home-page "http://weitz.de/cl-unicode/") - (synopsis "Portable Unicode library for Common Lisp") - (description "CL-UNICODE is a portable Unicode library Common Lisp, which + (package + (name "sbcl-cl-unicode-base") + (version "0.1.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/edicl/cl-unicode.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ykx2s9lqfl74p1px0ik3l2izd1fc9jd1b4ra68s5x34rvjy0hza")))) + (build-system asdf-build-system/sbcl) + (arguments + '(#:asd-file "cl-unicode.asd" + #:asd-system-name "cl-unicode/base")) + (inputs + `(("cl-ppcre" ,sbcl-cl-ppcre))) + (home-page "http://weitz.de/cl-unicode/") + (synopsis "Portable Unicode library for Common Lisp") + (description "CL-UNICODE is a portable Unicode library Common Lisp, which is compatible with perl. It is pretty fast, thread-safe, and compatible with ANSI-compliant Common Lisp implementations.") - (license license:bsd-2)))) + (license license:bsd-2))) (define-public sbcl-cl-unicode (package -- cgit v1.2.3 From 54dc3ba2fb0061f41bc14d4edeee1a2dbe793701 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 4 Feb 2020 11:28:44 +0100 Subject: gnu: Add ecl-cl-ppcre-unicode. * gnu/packages/lisp-xyz.scm (ecl-cl-ppcre-unicode): New variable. --- gnu/packages/lisp-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0c705ab173..e7372988db 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -625,6 +625,9 @@ (define-public sbcl-cl-ppcre-unicode `(("sbcl-cl-ppcre" ,sbcl-cl-ppcre) ("sbcl-cl-unicode" ,sbcl-cl-unicode))))) +(define-public ecl-cl-ppcre-unicode + (sbcl-package->ecl-package sbcl-cl-ppcre-unicode)) + ;; The slynk that users expect to install includes all of slynk's contrib ;; modules. Therefore, we build the base module and all contribs first; then ;; we expose the union of these as `sbcl-slynk'. The following variable -- cgit v1.2.3 From 92da05885c780fb92694f0d84ceda093b1b67db8 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 4 Feb 2020 11:35:53 +0100 Subject: gnu: sbcl-split-sequence: Update to 2.0.0. * gnu/packages/lisp-xyz.scm (sbcl-split-sequence): Update to 2.0.0. [native-inputs]: Add fiveam. [arguments]: Don't ignore tests. --- gnu/packages/lisp-xyz.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e7372988db..ab1ec04bcd 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1416,7 +1416,7 @@ (define-public ecl-esrap (define-public sbcl-split-sequence (package (name "sbcl-split-sequence") - (version "1.4.1") + (version "2.0.0") (source (origin (method git-fetch) @@ -1425,13 +1425,11 @@ (define-public sbcl-split-sequence (commit (string-append "v" version)))) (sha256 (base32 - "0c3zp6b7fmmp93sfhq112ind4zkld49ycw68z409xpnz3gc0wpf0")) + "0jcpnx21hkfwqj5fvp7kc6pn1qcz9hk7g2s5x8h0349x1j2irln0")) (file-name (git-file-name "split-sequence" version)))) (build-system asdf-build-system/sbcl) - (arguments - ;; TODO: Tests seem to be broken. - ;; https://github.com/sharplispers/split-sequence/issues/8 - `(#:tests? #f)) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) (synopsis "Member of the Common Lisp Utilities family of programs") (description "Splits sequence into a list of subsequences delimited by objects -- cgit v1.2.3 From dbf6de5881ced1026b01367e3b23421aa264bdb7 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 4 Feb 2020 11:42:05 +0100 Subject: gnu: sbcl-swap-bytes: Update to 1.2. * gnu/packages/lisp-xyz.scm (sbcl-swap-bytes): Update to 1.2. [arguments]: Don't ignore tests. --- gnu/packages/lisp-xyz.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ab1ec04bcd..cf35d5e20b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5222,7 +5222,7 @@ (define-public sbcl-swap-bytes (package (name "sbcl-swap-bytes") (build-system asdf-build-system/sbcl) - (version "1.1") + (version "1.2") (home-page "https://github.com/sionescu/swap-bytes") (source (origin @@ -5233,14 +5233,11 @@ (define-public sbcl-swap-bytes (file-name (git-file-name name version)) (sha256 (base32 - "1qysbv0jngdfkv53y874qjhcxc4qi8ixaqq6j8bzxh5z0931wv55")))) + "1hw1v1lw26rifyznpnj1csphha9jgzwpiic16ni3pvs6hcsni9rz")))) (inputs `(("trivial-features" ,sbcl-trivial-features))) (native-inputs `(("fiveam" ,sbcl-fiveam))) - (arguments - ;; TODO: Tests fail, why? - `(#:tests? #f)) (synopsis "Efficient endianness conversion for Common Lisp") (description "This Common Lisp library provides optimized byte-swapping primitives. The library can change endianness of unsigned integers of length -- cgit v1.2.3 From ba55cbda750527ec34524d674c95b65d6704f578 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 4 Feb 2020 11:48:29 +0100 Subject: gnu: sbcl-static-vectors: Update to 1.8.4. * gnu/packages/lisp-xyz.scm (sbcl-static-vectors): Update to 1.8.4. --- gnu/packages/lisp-xyz.scm | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index cf35d5e20b..f3c0ddf5f9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4102,32 +4102,30 @@ (define-public cl-fast-http (sbcl-package->cl-source-package sbcl-fast-http)) (define-public sbcl-static-vectors - (let ((commit "0681eac1f49370cde03e64b077251e8abf47d702") - (revision "1")) - (package - (name "sbcl-static-vectors") - (version (git-version "1.8.3" revision commit)) - (source - (origin + (package + (name "sbcl-static-vectors") + (version "1.8.4") + (source + (origin (method git-fetch) (uri (git-reference (url "https://github.com/sionescu/static-vectors.git") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "138nlsq14hv8785ycjm6jw3i6ablhq8vcwys7q09y80arcgrg6r3")))) - (native-inputs - `(("sbcl-fiveam" ,sbcl-fiveam))) - (inputs - `(("sbcl-cffi-grovel" ,sbcl-cffi-grovel) - ("sbcl-cffi" ,sbcl-cffi))) - (build-system asdf-build-system/sbcl) - (home-page "http://common-lisp.net/projects/iolib/") - (synopsis "Allocate SIMPLE-ARRAYs in static memory") - (description - "With @code{static-vectors}, you can create vectors allocated in static + (base32 "0qvf9z6bhwhm8n45fjwkm7j8dcb58szfvndky65cyn4lpdval7m1")))) + (native-inputs + `(("sbcl-fiveam" ,sbcl-fiveam))) + (inputs + `(("sbcl-cffi-grovel" ,sbcl-cffi-grovel) + ("sbcl-cffi" ,sbcl-cffi))) + (build-system asdf-build-system/sbcl) + (home-page "http://common-lisp.net/projects/iolib/") + (synopsis "Allocate SIMPLE-ARRAYs in static memory") + (description + "With @code{static-vectors}, you can create vectors allocated in static memory.") - (license license:expat)))) + (license license:expat))) (define-public cl-static-vectors (sbcl-package->cl-source-package sbcl-static-vectors)) -- cgit v1.2.3 From f6a6f085a43da49f6c12d5f6ecc4f93516ba1a4f Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 4 Feb 2020 11:53:54 +0100 Subject: gnu: Add ecl-static-vectors. * gnu/packages/lisp-xyz.scm (ecl-static-vectors): New variable. --- gnu/packages/lisp-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f3c0ddf5f9..ecacd6611f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4130,6 +4130,9 @@ (define-public sbcl-static-vectors (define-public cl-static-vectors (sbcl-package->cl-source-package sbcl-static-vectors)) +(define-public ecl-static-vectors + (sbcl-package->ecl-package sbcl-static-vectors)) + (define-public sbcl-marshal (let ((commit "eff1b15f2b0af2f26f71ad6a4dd5c4beab9299ec") (revision "1")) -- cgit v1.2.3 From b23e6f5d9aaf2018a2c7fd58a18f83be27cbd9ba Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 4 Feb 2020 12:06:53 +0100 Subject: gnu: sbcl-usocket: Update to 0.8.3. * gnu/packages/lisp-xyz.scm (sbcl-usocket-boot0): Update to 0.8.3 and don't make this variable public. (sbcl-usocket-server)[inputs]: Replace portable-threads by bordeaux-threads. (ecl-socket): Rename variable to ecl-usocket. --- gnu/packages/lisp-xyz.scm | 57 +++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 29 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ecacd6611f..c878542d66 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3177,44 +3177,43 @@ (define-public cl-portable-threads (define-public ecl-portable-threada (sbcl-package->ecl-package sbcl-portable-threads)) -(define-public sbcl-usocket-boot0 +(define sbcl-usocket-boot0 ;; usocket's test rely on usocket-server which depends on usocket itself. ;; We break this cyclic dependency with -boot0 that packages usocket. - (let ((commit "86e7efbfe50101931edf4b67cdcfa7e221ecfde9")) - (package - (name "sbcl-usocket-boot0") - (version (git-version "0.7.1" "1" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/usocket/usocket/") - (commit commit))) - (file-name (git-file-name "usocket" version)) - (sha256 - (base32 - "1lk6ipakrib7kdgzw44hrgmls9akp5pz4h35yynw0k5zwmmq6374")))) - (build-system asdf-build-system/sbcl) - (inputs - `(("split-sequence" ,sbcl-split-sequence))) - (arguments - `(#:tests? #f - #:asd-system-name "usocket")) - (home-page "https://common-lisp.net/project/usocket/") - (synopsis "Universal socket library for Common Lisp (server side)") - (description - "This library strives to provide a portable TCP/IP and UDP/IP socket + (package + (name "sbcl-usocket-boot0") + (version "0.8.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/usocket/usocket/") + (commit (string-append "v" version)))) + (file-name (git-file-name "usocket" version)) + (sha256 + (base32 + "0x746wr2324l6bn7skqzgkzcbj5kd0zp2ck0c8rldrw0rzabg826")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("split-sequence" ,sbcl-split-sequence))) + (arguments + `(#:tests? #f + #:asd-system-name "usocket")) + (home-page "https://common-lisp.net/project/usocket/") + (synopsis "Universal socket library for Common Lisp (server side)") + (description + "This library strives to provide a portable TCP/IP and UDP/IP socket interface for as many Common Lisp implementations as possible, while keeping the abstraction and portability layer as thin as possible.") - (license license:expat)))) + (license license:expat))) (define-public sbcl-usocket-server (package (inherit sbcl-usocket-boot0) (name "sbcl-usocket-server") (inputs - `(("usocket" ,sbcl-usocket-boot0) - ("portable-threads" ,sbcl-portable-threads))) + `(("bordeaux-threads" ,sbcl-bordeaux-threads) + ("usocket" ,sbcl-usocket-boot0))) (arguments '(#:asd-system-name "usocket-server")) (synopsis "Universal socket library for Common Lisp (server side)"))) @@ -3240,7 +3239,7 @@ (define-public sbcl-usocket (define-public cl-usocket (sbcl-package->cl-source-package sbcl-usocket)) -(define-public ecl-socket +(define-public ecl-usocket (sbcl-package->ecl-package sbcl-usocket)) (define-public sbcl-s-xml -- cgit v1.2.3 From 0d4b40593b36616fd8ce518d98e6d587cfd0d265 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Feb 2020 18:08:24 +0100 Subject: gnu: yoshimi: Update to 1.7.0.1. * gnu/packages/music.scm (yoshimi): Update to 1.7.0.1. --- gnu/packages/music.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index e378e9880b..41e8ba6f75 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2019 Eric Bavier -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016, 2017, 2019 Efraim Flashner @@ -2213,7 +2213,7 @@ (define-public zynaddsubfx (define-public yoshimi (package (name "yoshimi") - (version "1.6.1") + (version "1.7.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/yoshimi/" @@ -2221,7 +2221,7 @@ (define-public yoshimi "/yoshimi-" version ".tar.bz2")) (sha256 (base32 - "1shnz429zgl0b4y5bpb61frk1747jwqfahq4hx44c972580zghzh")))) + "1pkqrrr51vlxh96vy0c0rf5ijjvymys4brsw9rv1bdp1bb8izw6c")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are no tests -- cgit v1.2.3 From da355a67a03cd4f2c21ff4a380088cdb5ba359de Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 4 Feb 2020 23:46:42 +0100 Subject: gnu: emacs-yasnippet: Update to 0.14.0. * gnu/packages/emacs-xyz.scm (emacs-yasnippet): Update to 0.14.0. --- gnu/packages/emacs-xyz.scm | 55 +++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 28 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3995ee5976..0411d150aa 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8574,35 +8574,35 @@ (define-public emacs-pretty-mode (define-public emacs-yasnippet (package (name "emacs-yasnippet") - (version "0.13.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/joaotavora/yasnippet.git") - (commit version))) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0fkkplycrw8f8r30hjjxl1wm7p2irq2ipzzc1g7cc52abaal796p")) - (modules '((guix build utils))) - (snippet - '(begin - ;; YASnippet expects a "snippets" subdirectory in the same - ;; directory as yasnippet.el, but we don't install it - ;; because it's a git submodule pointing to an external - ;; repository. Adjust `yas-snippet-dirs' to prevent - ;; warnings about a missing directory. - (substitute* "yasnippet.el" - (("^ +'yas-installed-snippets-dir\\)\\)\n") - "))\n")) - #t)))) + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/joaotavora/yasnippet.git") + (commit version))) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0via9dzw8m5lzymg1h78xkwjssh39zr3g6ccyamlf1rjzjsyxknv")) + (modules '((guix build utils))) + (snippet + '(begin + ;; YASnippet expects a "snippets" subdirectory in the same + ;; directory as yasnippet.el, but we don't install it because it's + ;; a git submodule pointing to an external repository. Adjust + ;; `yas-snippet-dirs' to prevent warnings about a missing + ;; directory. + (substitute* "yasnippet.el" + (("^ +'yas-installed-snippets-dir\\)\\)\n") + "))\n")) + #t)))) (build-system emacs-build-system) (arguments `(#:tests? #t #:test-command '("emacs" "--batch" "-l" "yasnippet-tests.el" "-f" "ert-run-tests-batch-and-exit") - ;; FIXME: one failing test + ;; FIXME: one failing test. #:phases (modify-phases %standard-phases (add-before 'check 'make-tests-writable @@ -8612,11 +8612,10 @@ (define-public emacs-yasnippet (add-before 'check 'delete-rebinding-test (lambda _ (emacs-batch-edit-file "yasnippet-tests.el" - `(progn (progn (goto-char (point-min)) - (re-search-forward - "ert-deftest test-rebindings") - (beginning-of-line) - (kill-sexp)) + `(progn (goto-char (point-min)) + (re-search-forward "ert-deftest test-rebindings") + (beginning-of-line) + (kill-sexp) (basic-save-buffer))) #t))))) (home-page "https://github.com/joaotavora/yasnippet") -- cgit v1.2.3 From f08345225deb74f839392bf9476dbda45a6aca43 Mon Sep 17 00:00:00 2001 From: Evan Straw Date: Wed, 15 Jan 2020 23:06:34 -0800 Subject: gnu: liquid-dsp: Remove unused module imports. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/sdr.scm (liquid-dsp): Remove unused module imports. Signed-off-by: Ludovic Courtès --- gnu/packages/sdr.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sdr.scm b/gnu/packages/sdr.scm index f6c9050503..563a9b3887 100644 --- a/gnu/packages/sdr.scm +++ b/gnu/packages/sdr.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Christopher Howard +;;; Copyright © 2019, 2020 Evan Straw ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,11 +20,9 @@ (define-module (gnu packages sdr) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) - #:use-module (guix utils) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) - #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools)) -- cgit v1.2.3 From c4f967062ab8816efb17594504daab0445f25309 Mon Sep 17 00:00:00 2001 From: Evan Straw Date: Wed, 15 Jan 2020 23:12:53 -0800 Subject: gnu: Add redsea. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ham-radio.scm (redsea): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/ham-radio.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ham-radio.scm b/gnu/packages/ham-radio.scm index 6b3f68cd7d..376191af54 100644 --- a/gnu/packages/ham-radio.scm +++ b/gnu/packages/ham-radio.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018, 2019 Arun Isaac -;;; Copyright © 2019 Evan Straw +;;; Copyright © 2019, 2020 Evan Straw ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +22,8 @@ (define-module (gnu packages ham-radio) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages libusb) @@ -29,6 +31,7 @@ (define-module (gnu packages ham-radio) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sdr) #:use-module (gnu packages xml) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) @@ -127,3 +130,49 @@ (define-public aptdec on a frequency of 137 MHz. They can be received using an inexpensive antenna and a dedicated receiver.") (license license:gpl2+))) + +(define-public redsea + (package + (name "redsea") + (version "0.18") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/windytan/redsea") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1y96g0ra2krjb2kypm8s5gdfia45yci4f36klsvyzg8d53v5cwhn")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; The configure.ac file does not explicitly link against libiconv + ;; except on Mac OS, causing the build to fail. This phase comments + ;; out the original AC_SUBST macro (located inside a conditional) and + ;; adds an explicit use of it underneath, so that libiconv is always + ;; linked against. + (add-after 'unpack 'patch-libiconv + (lambda _ + (substitute* "configure.ac" + (("^ +AC_SUBST") + "# AC_SUBST") + (("esac") + "esac\nAC_SUBST([ICONV], [\"-liconv\"])")) + #t))))) + (inputs + `(("libiconv" ,libiconv) + ("libsndfile" ,libsndfile) + ("liquid-dsp" ,liquid-dsp))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (home-page "https://github.com/windytan/redsea") + (synopsis "Lightweight RDS to JSON decoder") + (description "redsea is a lightweight command-line @dfn{FM Radio Data +System} (FM-RDS) decoder. Redsea can be used with any RTL-SDR USB radio stick +with the rtl_fm tool, or any other @dfn{software-defined radio} (SDR) via +csdr, for example. It can also decode raw ASCII bitstream, the hex format +used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") + (license license:expat))) -- cgit v1.2.3 From 8a4c7be4c80b2bbc20885d9cad5534fdda290368 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Wed, 22 Jan 2020 20:22:41 +0100 Subject: gnu: Add stb-sprintf. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/stb.scm (stb-sprintf): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/stb.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/stb.scm b/gnu/packages/stb.scm index 5444347644..5ee34cda59 100644 --- a/gnu/packages/stb.scm +++ b/gnu/packages/stb.scm @@ -101,3 +101,8 @@ (define-public stb-image-write "stb-image-write" "1.13" "stb-image-write is a small library for writing image files to the C@tie{}@code{stdio} interface.")) + +(define-public stb-sprintf + (make-stb-header-package + "stb-sprintf" "1.06" + "stb-sprintf implements fast @code{sprintf}, @code{snprintf} for C/C++.")) -- cgit v1.2.3 From 6e43e1eee8b6ecf567686885e4707f889643b55b Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Wed, 22 Jan 2020 20:22:42 +0100 Subject: gnu: Add stb-truetype. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/stb.scm (stb-truetype): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/stb.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/stb.scm b/gnu/packages/stb.scm index 5ee34cda59..9cb2ae10b6 100644 --- a/gnu/packages/stb.scm +++ b/gnu/packages/stb.scm @@ -106,3 +106,9 @@ (define-public stb-sprintf (make-stb-header-package "stb-sprintf" "1.06" "stb-sprintf implements fast @code{sprintf}, @code{snprintf} for C/C++.")) + +(define-public stb-truetype + (make-stb-header-package + "stb-truetype" "1.22" + "stb-truetype is a library for parsing, decoding, and rasterizing +characters from TrueType fonts.")) -- cgit v1.2.3 From e3d80f3c1cd66c1290d28f44722a4cd3892cb20b Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Wed, 22 Jan 2020 20:38:30 +0100 Subject: gnu: Add gnome-shell-extension-appindicator. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome-xyz.scm (gnome-shell-extension-appindicator): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 0fc721b7d3..7f375fefc5 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -114,6 +114,40 @@ (define-public delft-icon-theme the Obsidian icon theme.") (license license:gpl3))) +(define-public gnome-shell-extension-appindicator + (package + (name "gnome-shell-extension-appindicator") + (version "30") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/ubuntu/gnome-shell-extension-appindicator.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1fjhx23jqwv3d0smwhnjvc35gqhwk9p5f96ic22pfax653cn5vh8")) + (file-name (git-file-name name version)))) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((source (assoc-ref %build-inputs "source")) + (install-dir (string-append (assoc-ref %outputs "out") + "/share/gnome-shell/extensions" + "/appindicatorsupport@rgcjonas.gmail.com"))) + (mkdir-p install-dir) + (copy-recursively source install-dir) + #t)))) + (synopsis "Adds KStatusNotifierItem support to GNOME Shell") + (description "This extension integrates Ubuntu AppIndicators +and KStatusNotifierItems (KDE's successor of the systray) into +GNOME Shell.") + (home-page "https://github.com/ubuntu/gnome-shell-extension-appindicator/") + (license license:gpl2+))) + (define-public gnome-shell-extension-dash-to-dock (package (name "gnome-shell-extension-dash-to-dock") -- cgit v1.2.3 From 892be267eee99f33920cd5f7307b7798edc1d8b0 Mon Sep 17 00:00:00 2001 From: Ivan Vilata-i-Balaguer Date: Mon, 13 Jan 2020 20:44:05 -0500 Subject: gnu: mutt: Enable Autocrypt support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (mutt)[inputs]: Add libidn2 and sqlite. [arguments]<#:configure-flags>: Add "--enable-autocrypt", "--with-sqlite3" and "--with-idn2". Signed-off-by: Ludovic Courtès --- gnu/packages/mail.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 0538342977..67aa079024 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -397,9 +397,11 @@ (define-public mutt `(("cyrus-sasl" ,cyrus-sasl) ("gdbm" ,gdbm) ("gpgme" ,gpgme) + ("libidn2" ,libidn2) ("ncurses" ,ncurses) ("openssl" ,openssl) - ("perl" ,perl))) + ("perl" ,perl) + ("sqlite" ,sqlite))) (arguments `(#:configure-flags '("--enable-smtp" "--enable-imap" @@ -407,8 +409,11 @@ (define-public mutt "--enable-gpgme" "--enable-hcache" ; for header caching "--enable-sidebar" + "--enable-autocrypt" "--with-ssl" "--with-sasl" + "--with-sqlite3" ; required for Autocrypt + "--with-idn2" ; recommended for Autocrypt ;; so that mutt does not check whether the path ;; exists, which it does not in the chroot "--with-mailpath=/var/mail"))) -- cgit v1.2.3 From 861bd91b9a7860cebc7ff0813f8671cc2fc9f86d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 5 Feb 2020 00:30:50 +0100 Subject: gnu: emacs-yasnippet-snippets: Update to 0.20. * gnu/packages/emacs-xyz.scm (emacs-yasnippet-snippets): Update to 0.20. [arguments]: Remove unnecessary modules. [license]: Change to GPL3+. Note: the new official release is "0.20" whereas previous package used arbitrary "1-1". This may prevent users with this package already installed from updating. --- gnu/packages/emacs-xyz.scm | 72 ++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 41 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0411d150aa..2efb4c220c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8626,50 +8626,40 @@ (define-public emacs-yasnippet (license license:gpl3+))) (define-public emacs-yasnippet-snippets - (let ((commit "885050d34737e2fb36a3e7759d60c09347bd4ce0") - (revision "1")) - (package - (name "emacs-yasnippet-snippets") - (version (string-append "1-" revision "." (string-take commit 8))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/AndreaCrotti/yasnippet-snippets") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1m935zgglw0iakzrixld5rcjz3wnj84f8wy2mvc3pggjri9l0qr9")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((ice-9 ftw) - (ice-9 regex) - (guix build utils)) - #:builder - (begin - (use-modules (ice-9 ftw) - (ice-9 regex) - (guix build utils)) - (with-directory-excursion (assoc-ref %build-inputs "source") - (for-each (lambda (dir) - (copy-recursively - dir - (string-append %output - "/share/emacs/yasnippet-snippets/" - dir))) - (scandir "." (lambda (fname) - (and (string-match "-mode$" fname) - (directory-exists? fname)))))) - #t))) - (home-page "https://github.com/AndreaCrotti/yasnippet-snippets") - (synopsis "Collection of YASnippet snippets for many languages") - (description - "Provides Andrea Crotti's collection of YASnippet snippets. After installation, + (package + (name "emacs-yasnippet-snippets") + (version "0.20") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AndreaCrotti/yasnippet-snippets") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "095w7cdmfwmmr6426mbq15n0a5izgbmv9408m9yh1pqz5x3v3vsx")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((source (assoc-ref %build-inputs "source")) + (out (assoc-ref %outputs "out")) + (snippet-dir + (string-append out "/share/emacs/yasnippet-snippets/"))) + (with-directory-excursion source + (mkdir-p snippet-dir) + (copy-recursively "snippets" snippet-dir))) + #t))) + (home-page "https://github.com/AndreaCrotti/yasnippet-snippets") + (synopsis "Collection of YASnippet snippets for many languages") + (description + "Provides Andrea Crotti's collection of YASnippet snippets. After installation, the snippets will be in \"~/.guix-profile/share/emacs/yasnippet-snippets/\". To make YASnippet aware of these snippets, add the above directory to @code{yas-snippet-dirs}.") - (license license:expat)))) + (license license:gpl3+))) (define-public emacs-helm-c-yasnippet (let ((commit "65ca732b510bfc31636708aebcfe4d2d845b59b0") -- cgit v1.2.3 From b2a6a784003e0bb7f958666186522fbdf2356071 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Tue, 4 Feb 2020 02:41:03 -0500 Subject: gnu: Add pamixer. * gnu/packages/pulseaudio.scm (pamixer): New variable. Signed-off-by: Leo Famulari --- gnu/packages/pulseaudio.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 5651127b38..2bbe6c5bdd 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Langlois ;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2020 Amin Bandali ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,6 +38,7 @@ (define-module (gnu packages pulseaudio) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) + #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages dbm) #:use-module (gnu packages glib) @@ -365,3 +367,38 @@ (define-public pulseaudio-dlna @item vorbis-tools - Vorbis transcoding support @end itemize") (license l:gpl3+)))) + +(define-public pamixer + (package + (name "pamixer") + (version "1.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cdemoulins/pamixer.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1i14550n8paijwwnhksv5izgfqm3s5q2773bdfp6vyqybkll55f7")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; There is no test suite. + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; There's no configure phase. + (add-before 'install 'mkdir-bin + (lambda _ + (mkdir-p (string-append (assoc-ref %outputs "out") "/bin")) + #t))))) + (inputs + `(("boost" ,boost) + ("pulseaudio" ,pulseaudio))) + (home-page "https://github.com/cdemoulins/pamixer") + (synopsis "PulseAudio command line mixer") + (description + "pamixer is like amixer but for PulseAudio, allowing easy control of the +volume levels of the sinks (get, set, decrease, increase, toggle mute, etc).") + (license l:gpl3+))) -- cgit v1.2.3 From c6397e3e4cdedf3dbeedcb1e5de23e8e27053a5a Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Tue, 4 Feb 2020 16:36:47 +0100 Subject: gnu: Add cl-hdf5-cffi. * gnu/packages/lisp-xyz.scm (sbcl-hdf5-cffi, cl-hdf5-cffi, ecl-hdf5-cffi): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 64 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c878542d66..5f7c3ea030 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2019 Jesse Gildersleve ;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; Copyright © 2019 Brett Gilio +;;; Copyright © 2020 Konrad Hinsen ;;; ;;; This file is part of GNU Guix. ;;; @@ -10157,3 +10158,66 @@ (define-public cl-qrencode (define-public ecl-cl-qrencode (sbcl-package->ecl-package sbcl-cl-qrencode)) + +(define-public sbcl-hdf5-cffi + (let ((commit "5b5c88f191e470e4fe96b462334e3ce0806eed5c") + (revision "1")) + (package + (name "sbcl-hdf5-cffi") + (version (git-version "1.8.18" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hdfgroup/hdf5-cffi.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vda3075423xz83qky998lpac5b04dwfv7bwgh9jq8cs5v0zrxjf")))) + (build-system asdf-build-system/sbcl) + (synopsis "Common Lisp bindings for the HDF5 library") + (description + "@code{hdf5-cffi} is a CFFI wrapper for the HDF5 library.") + (home-page "https://github.com/hdfgroup/hdf5-cffi") + (license (license:non-copyleft + (string-append "https://github.com/HDFGroup/hdf5-cffi/raw/" + commit + "/LICENSE"))) + (inputs + `(("cffi" ,sbcl-cffi) + ("cffi-grovel" ,sbcl-cffi-grovel) + ("hdf5" ,hdf5-1.10))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (arguments + `(#:asd-system-name "hdf5-cffi" + #:asd-file "hdf5-cffi.asd" + #:test-asd-file "hdf5-cffi.test.asd" + ;; Tests depend on hdf5-cffi.examples.asd in addition to hdf5-cffi.asd, + ;; I don't know if there is a way to tell asdf-build-system to load + ;; an additional system first, so tests are disabled. + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/library.lisp" + (("libhdf5.so") + (string-append + (assoc-ref inputs "hdf5") + "/lib/libhdf5.so"))))) + (add-after 'unpack 'fix-dependencies + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "hdf5-cffi.asd" + ((":depends-on \\(:cffi\\)") + ":depends-on (:cffi :cffi-grovel)")) + (substitute* "hdf5-cffi.test.asd" + ((":depends-on \\(:cffi :hdf5-cffi") + ":depends-on (:cffi :cffi-grovel :hdf5-cffi")))))))))) + +(define-public cl-hdf5-cffi + (sbcl-package->cl-source-package sbcl-hdf5-cffi)) + +(define-public ecl-hdf5-cffi + (sbcl-package->ecl-package sbcl-hdf5-cffi)) -- cgit v1.2.3 From 00a9a9365b27fbaedf890beb74ff5d006f6c98a1 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 5 Feb 2020 11:34:26 +0100 Subject: gnu: sbcl-chanl: Update to 0.4.1-1-56e90a1. * gnu/packages/lisp-xyz.scm (sbcl-chanl): Update to 0.4.1-1-56e90a1. (ecl-chanl)[arguments]: Remove disable-chanl-actors phase. --- gnu/packages/lisp-xyz.scm | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5f7c3ea030..b97ad806ea 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6872,8 +6872,8 @@ (define-public ecl-lzlib (sbcl-package->ecl-package sbcl-lzlib)) (define-public sbcl-chanl - (let ((commit "2362b57550c2c9238cc882d03553aaa1040b7340") - (revision "0")) + (let ((commit "56e90a126c78b39bb621a01585e8d3b985238e8c") + (revision "1")) (package (name "sbcl-chanl") (version (git-version "0.4.1" revision commit)) @@ -6886,7 +6886,7 @@ (define-public sbcl-chanl (file-name (git-file-name name version)) (sha256 (base32 - "0ag3wz7yrqwp0s5069wwda98z3rrqd25spg8sa8rdqghj084w28w")))) + "0b1cf6c12qx5cy1fw2z42jgh566rp3l8nv5qf0qqc569s7bgmrh4")))) (build-system asdf-build-system/sbcl) (native-inputs `(("fiveam" ,sbcl-fiveam))) @@ -6904,26 +6904,7 @@ (define-public cl-chanl (sbcl-package->cl-source-package sbcl-chanl)) (define-public ecl-chanl - (let ((base (sbcl-package->ecl-package sbcl-chanl))) - (package - (inherit base) - (arguments - (substitute-keyword-arguments (package-arguments base) - ;; The CHANL.ACTORS package uses the :ARGUMENTS option of - ;; DEFINE-METHOD-COMBINATION, which is not implemented in ECL yet - ;; (see https://gitlab.com/embeddable-common-lisp/ecl/issues/305). - ;; So let's disable it for now, as it allows compiling the library - ;; and using the rest of it. - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-after 'unpack 'disable-chanl-actors - (lambda _ - (substitute* "chanl.asd" - (("\\(:file \"actors\"\\)") "")) - #t)))) - ;; Disable the tests for now, as the SEND-SEQUENCE test seems to - ;; never end. - ((#:tests? _ #f) #f)))))) + (sbcl-package->ecl-package sbcl-chanl)) (define-public sbcl-cl-store (let ((commit "c787337a16ea8cf8a06227f35933a4ec774746b3") -- cgit v1.2.3 From 96956ce8e2cc0c9adc12005ee8d4e2a8fc54c24b Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 31 Jan 2020 20:50:58 -0800 Subject: gnu: Add rust-locale-0.2. * gnu/packages/crates-io.scm (rust-locale-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a5f224f99e..8b140eae5a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5745,6 +5745,28 @@ (define-public rust-libssh2-sys-0.2 (license (list license:asl2.0 license:expat)))) +(define-public rust-locale-0.2 + (package + (name "rust-locale") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "locale" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1z87wc7z6889x1pqlrwjw8f1crshzi15q5m102lqs8y0m69f9nsz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/rust-locale/rust-locale") + (synopsis "Library for basic localisation") + (description + "This package provides a library for basic localisation.") + (license license:expat))) + (define-public rust-lock-api-0.3 (package (name "rust-lock-api") -- cgit v1.2.3 From 297bd74002b09a5f1bf6d0d7bf41b626a3aa60af Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 31 Jan 2020 21:43:02 -0800 Subject: gnu: Add rust-no-panic-0.1. * gnu/packages/crates-io.scm (rust-no-panic-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8b140eae5a..b6b96e3845 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6703,6 +6703,34 @@ (define-public rust-nix-0.15 "Rust friendly bindings to *nix APIs.") (license license:expat))) +(define-public rust-no-panic-0.1 + (package + (name "rust-no-panic") + (version "0.1.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "no-panic" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0xan5v9ac1aklinc8aw16raq36pb4idjrl502np8gy32gfs6s751")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.1)))) + (home-page "https://github.com/dtolnay/no-panic") + (synopsis "Prove a function can't ever panic") + (description + "This package provides a rust attribute macro to require that the compiler +prove a function can't ever panic.") + (license (list license:expat license:asl2.0)))) + (define-public rust-nodrop-0.1 (package (name "rust-nodrop") -- cgit v1.2.3 From 57d947046638cd55acb2c1055c25457e32d55705 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 31 Jan 2020 20:53:44 -0800 Subject: gnu: Add rust-pad-0.1. * gnu/packages/crates-io.scm (rust-pad-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b6b96e3845..bce65ed7ed 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7303,6 +7303,29 @@ (define-public rust-packed-simd-0.3 (description "Portable Packed SIMD vectors.") (license (list license:asl2.0 license:expat)))) +(define-public rust-pad-0.1 + (package + (name "rust-pad") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "pad" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1qy0r26r52gp034fv252mmg0s599a55h9nr4xswy04hvky49pbfj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-unicode-width" ,rust-unicode-width-0.1)))) + (home-page "https://github.com/ogham/rust-pad") + (synopsis "Library for padding strings at runtime") + (description + "This package provides a library for padding strings at runtime.") + (license license:expat))) + (define-public rust-parking-lot-0.9 (package (name "rust-parking-lot") -- cgit v1.2.3 From db4dcf73eca681fbff04a0c6ec91ef8934fe1a99 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 31 Jan 2020 20:52:21 -0800 Subject: gnu: Add rust-iso8601-0.1. * gnu/packages/crates-io.scm (rust-iso8601-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bce65ed7ed..3a3a392089 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5167,6 +5167,29 @@ (define-public rust-iovec-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-iso8601-0.1 + (package + (name "rust-iso8601") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "iso8601" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0xy48qyfmirslaj4dy6n4g8b564jap3cjiql35fmj5vgii7ldp0i")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-clippy" ,rust-clippy-0.0) + ("rust-nom" ,rust-nom-1.2)))) + (home-page "https://github.com/badboy/iso8601") + (synopsis "Parsing ISO8601 dates using nom") + (description "Parsing ISO8601 dates using nom.") + (license license:expat))) + (define-public rust-itertools-0.8 (package (name "rust-itertools") -- cgit v1.2.3 From 743ead2b4701d642a64ff67d1f6b21ef9db21600 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 31 Jan 2020 20:55:48 -0800 Subject: gnu: Add rust-nom-1.2. * gnu/packages/crates-io.scm (rust-nom-1.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3a3a392089..78ab26a624 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6833,6 +6833,24 @@ (define-public rust-nom-4.2 combinators library.") (license license:expat))) +(define-public rust-nom-1.2 + (package + (inherit rust-nom-4.2) + (name "rust-nom") + (version "1.2.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "nom" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1kjh42w67z1hh1dw3jrilgqrf54jk2xcvhw4rcdm4wclzmbc5f55")))) + (arguments + ;; This is an ancient version and all inputs are optional. + `(#:skip-build? #t)))) + (define-public rust-num-complex-0.2 (package (name "rust-num-complex") -- cgit v1.2.3 From 7f34c330852b4c88f11a821d005b3eacb3add49f Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 31 Jan 2020 21:43:24 -0800 Subject: gnu: Add rust-libm-0.2. * gnu/packages/crates-io.scm (rust-libm-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 78ab26a624..46e437c18d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5723,6 +5723,30 @@ (define-public rust-libloading-0.5 functions and static variables these libraries contain.") (license license:isc))) +(define-public rust-libm-0.2 + (package + (name "rust-libm") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "libm" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0akh56sh51adhagmk9l84dyrlz60gv8ri05xhr13i1b18czkpmy7")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-no-panic" ,rust-no-panic-0.1) + ("rust-rand" ,rust-rand-0.6)))) + (home-page "https://github.com/rust-lang/libm") + (synopsis "Libm in pure Rust") + (description "Libm in pure Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-libssh2-sys-0.2 (package (name "rust-libssh2-sys") -- cgit v1.2.3 From bbeb6f11a4b69f7ec928d76b5d2467b94bd6f98e Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 31 Jan 2020 21:44:11 -0800 Subject: gnu: rust-num-traits-0.2: Don't hide package. * gnu/packages/crates-io.scm (rust-num-traits-0.2):[arguments] Add rust-autocfg-0.1 to cargo-inputs. [properties] Remove field. (rust-num-traits-0.1):[arguments] Add rust-num-traits-0.2 to cargo-inputs. [properties]: Remove field. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 46e437c18d..2bf5d96c4d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5738,13 +5738,13 @@ (define-public rust-libm-0.2 "0akh56sh51adhagmk9l84dyrlz60gv8ri05xhr13i1b18czkpmy7")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:cargo-inputs + (("rust-rand" ,rust-rand-0.6)) #:cargo-development-inputs - (("rust-no-panic" ,rust-no-panic-0.1) - ("rust-rand" ,rust-rand-0.6)))) + (("rust-no-panic" ,rust-no-panic-0.1)))) (home-page "https://github.com/rust-lang/libm") (synopsis "Libm in pure Rust") - (description "Libm in pure Rust.") + (description "This package provides an implementation of libm in pure Rust.") (license (list license:expat license:asl2.0)))) (define-public rust-libssh2-sys-0.2 @@ -6988,11 +6988,11 @@ (define-public rust-num-traits-0.2 (base32 "0clvrm34rrqc8p6gq5ps5fcgws3kgq5knh7nlqxf2ayarwks9abb")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-autocfg" ,rust-autocfg-0.1)))) (home-page "https://github.com/rust-num/num-traits") (synopsis "Numeric traits for generic mathematics") (description "Numeric traits for generic mathematics.") - (properties '((hidden? . #t))) - ;; Dual licensed. (license (list license:asl2.0 license:expat)))) @@ -7009,7 +7009,9 @@ (define-public rust-num-traits-0.1 (sha256 (base32 "0c9whknf2dm74a3cqirafy6gj83a76gl56g4v3g19k6lkwz13rcj")))) - (build-system cargo-build-system))) + (arguments + `(#:cargo-inputs + (("rust-num-traits" , rust-num-traits-0.2)))))) (define-public rust-numtoa-0.1 (package -- cgit v1.2.3 From 059a79e416aee99ad37fdbca48b2c351e14ef778 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 1 Feb 2020 00:35:12 -0800 Subject: gnu: Add rust-autocfg-1.0. * gnu/packages/crates-io.scm (rust-autocfg-1.0): New variable. (rust-autocfg-0.1): Inherit from rust-autocfg-1.0. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2bf5d96c4d..ad6b778bbc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -444,8 +444,30 @@ (define-public rust-atty-0.2 "This package provides a simple interface for querying atty.") (license license:expat))) +(define-public rust-autocfg-1.0 + (package + (name "rust-autocfg") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "autocfg" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17cv6pwb4q08s0ynpr4n8hv5299hcmhdgvdchzixfpw8y5qcgapq")))) + (build-system cargo-build-system) + (home-page "https://github.com/cuviper/autocfg") + (synopsis + "Automatic cfg for Rust compiler features") + (description + "Automatic cfg for Rust compiler features.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-autocfg-0.1 (package + (inherit rust-autocfg-1.0) (name "rust-autocfg") (version "0.1.7") (source @@ -456,16 +478,7 @@ (define-public rust-autocfg-0.1 (sha256 (base32 "1chwgimpx5z7xbag7krr9d8asxfqbh683qhgl9kn3hxk2l0djj8x")))) - (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) - (home-page "https://github.com/cuviper/autocfg") - (synopsis "Automatic cfg for Rust compiler features") - (description "Rust library for build scripts to automatically configure -code based on compiler support. Code snippets are dynamically tested to see -if the @code{rustc} will accept them, rather than hard-coding specific version -support.") - (license (list license:asl2.0 - license:expat)))) + (arguments '(#:skip-build? #t)))) (define-public rust-backtrace-0.3 (package -- cgit v1.2.3 From d492a69e5862b2eebf7681f0e022238032b2de89 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 1 Feb 2020 01:21:58 -0800 Subject: gnu: Add rust-libm-0.1. * gnu/packages/crates-io.scm (rust-libm-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ad6b778bbc..e307840781 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5760,6 +5760,21 @@ (define-public rust-libm-0.2 (description "This package provides an implementation of libm in pure Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-libm-0.1 + (package + (inherit rust-libm-0.2) + (name "rust-libm") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "libm" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "16pc0gx4gkg0q2s1ssq8268brn14j8344623vwhadmivc4lsmivz")))))) + (define-public rust-libssh2-sys-0.2 (package (name "rust-libssh2-sys") -- cgit v1.2.3 From b059b0be1f1a0f45932e09e974e5976aa761b5a5 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 1 Feb 2020 00:21:18 -0800 Subject: gnu: rust-num-traits-0.2: Upgrade to 0.2.11. * gnu/packages/crates-io.scm (rust-num-traits-0.2): Upgrade to 0.2.11. [arguments]: Remove rust-autocfg-0.1 from cargo-inputs. Add rust-autocfg-1.0, rust-libm-0.2. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e307840781..bc39122c1d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7005,7 +7005,7 @@ (define-public rust-num-iter-0.1 (define-public rust-num-traits-0.2 (package (name "rust-num-traits") - (version "0.2.8") + (version "0.2.11") (source (origin (method url-fetch) @@ -7014,10 +7014,12 @@ (define-public rust-num-traits-0.2 (string-append name "-" version ".crate")) (sha256 (base32 - "0clvrm34rrqc8p6gq5ps5fcgws3kgq5knh7nlqxf2ayarwks9abb")))) + "15khrlm1bra50nd48ijl1vln13m9xg4fxzghf28jp16ic5zf8ay6")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-autocfg" ,rust-autocfg-0.1)))) + `(#:cargo-inputs + (("rust-autocfg" ,rust-autocfg-1.0) + ("rust-libm" ,rust-libm-0.2)))) (home-page "https://github.com/rust-num/num-traits") (synopsis "Numeric traits for generic mathematics") (description "Numeric traits for generic mathematics.") -- cgit v1.2.3 From 91f0c79070abc790ddd4a1c5a6b227ddc31ff7c0 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 1 Feb 2020 01:28:05 -0800 Subject: gnu: librsvg-next-source: Update dependencies. * gnu/packages/gnome.scm (librsvg-next-source): Update dependencies. Signed-off-by: Efraim Flashner --- gnu/packages/gnome.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e19caf67f7..692e88cc42 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2178,6 +2178,10 @@ (define librsvg-next-source #+(canonical-package tar))) (invoke "tar" "xvf" #+upstream-source) (with-directory-excursion (string-append "librsvg-" #$version) + ;; The following crate(s) are needed in addition to the ones replaced: + (begin + (invoke + "tar" "xvf" #+(package-source rust-autocfg-0.1) "-C" "vendor")) (for-each (lambda (crate) (delete-file-recursively (string-append "vendor/" (car crate))) @@ -2187,7 +2191,7 @@ (define librsvg-next-source ("approx" . #+(package-source rust-approx-0.3)) ("arrayvec" . #+(package-source rust-arrayvec-0.4)) ("atty" . #+(package-source rust-atty-0.2)) - ("autocfg" . #+(package-source rust-autocfg-0.1)) + ("autocfg" . #+(package-source rust-autocfg-1.0)) ("bitflags" . #+(package-source rust-bitflags-1)) ;; block 0.1 ("bstr" . #+(package-source rust-bstr-0.2)) @@ -2238,7 +2242,7 @@ (define librsvg-next-source ("language-tags" . #+(package-source rust-language-tags-0.2)) ("lazy_static" . #+(package-source rust-lazy-static-1.3)) ("libc" . #+(package-source rust-libc-0.2)) -;; libm 0.1 + ("libm" . #+(package-source rust-libm-0.1)) ;; locale_config 0.3 ("log" . #+(package-source rust-log-0.4)) ("mac" . #+(package-source rust-mac-0.1)) -- cgit v1.2.3 From fd0dd2b2dc9d52612d0069dbd6205ef6c5ae7e9d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 5 Feb 2020 14:03:47 +0200 Subject: gnu: tor: Update to 0.4.2.6. * gnu/packages/tor.scm (tor): Update to 0.4.2.6. --- gnu/packages/tor.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 19d4d670c6..d0b8dd6af4 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver -;;; Copyright © 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018, 2019 Eric Bavier @@ -50,14 +50,14 @@ (define-module (gnu packages tor) (define-public tor (package (name "tor") - (version "0.4.2.5") + (version "0.4.2.6") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "1hnqg6psf7shcmlvfk44mkpaz7v66mify3cnx7mzl23q5s37anad")))) + "1i766s211nrbjvwvkd2375mjsbbc28yrg46564rbx6w46cj10005")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 8534c9491d86406ade201bacc3b14fdf63a1f39d Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Wed, 5 Feb 2020 14:59:50 +0100 Subject: gnu: Add anki. * gnu/packages/education.scm (anki): New variable. --- gnu/packages/education.scm | 103 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index b0297e9075..05d1856c7a 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou +;;; Copyright © 2020 Robert Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ (define-module (gnu packages education) #:use-module (ice-9 regex) #:use-module (gnu packages) + #:use-module (gnu packages audio) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages compression) @@ -40,14 +42,18 @@ (define-module (gnu packages education) #:use-module (gnu packages javascript) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) ; extra-cmake-modules + #:use-module (gnu packages mp3) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) + #:use-module (gnu packages video) #:use-module (gnu packages xorg) #:use-module (gnu packages xml) #:use-module ((guix licenses) #:prefix license:) @@ -715,6 +721,103 @@ (define-public ktouch adjust the level of difficulty.") (license license:gpl2))) +(define-public anki + (package + (name "anki") + ;; Later versions have dependencies on npm packages not yet in Guix. + (version "2.1.16") + (source + (origin + (method url-fetch) + (uri (string-append "https://apps.ankiweb.net/downloads/archive/anki-" + version "-source.tgz")) + (sha256 + (base32 "1gfr51rnllkyzli73p4r51h5ypzfa3m7lic3m3rzpywmqwrxs07k")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list (string-append "PREFIX=" %output)) + #:tests? #f ;no check target + #:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 match)) + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configure script + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin")) + ;; List of paths to the site-packages directories of Python + ;; library inputs. + (site-packages + (map (lambda (pyinput) + (string-append + (cdr pyinput) + "/lib/python" + ;; Calculate the python version to avoid breaking + ;; with future 3.X releases. + ,(version-major+minor + (package-version python-wrapper)) + "/site-packages")) + (filter (match-lambda + ((label . _) + (string-prefix? "python-" label))) + inputs))) + (qtwebengineprocess + (string-append (assoc-ref inputs "qtwebengine") + "/lib/qt5/libexec/QtWebEngineProcess"))) + ;; The program fails to find the QtWebEngineProcess program, so + ;; we set QTWEBENGINEPROCESS_PATH to help it. PYTHONPATH is + ;; wrapped to avoid declaring Python libraries as propagated + ;; inputs. + (for-each (lambda (program) + (wrap-program program + `("QTWEBENGINEPROCESS_PATH" = + (,qtwebengineprocess)) + `("PYTHONPATH" = ,site-packages))) + (find-files bin "."))) + #t))))) + (native-inputs + `(("xdg-utils" ,xdg-utils))) + (inputs + `(("lame" ,lame) + ("mpv" ,mpv) + ("python" ,python-wrapper) + ("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-decorator" ,python-decorator) + ("python-distro" ,python-distro) + ("python-jsonschema" ,python-jsonschema) + ("python-markdown" ,python-markdown) + ("python-pyaudio" ,python-pyaudio) + ;; `python-pyqtwebengine' must precede `python-pyqt' in PYTHONPATH. + ("python-pyqtwebengine" ,python-pyqtwebengine) + ("python-pyqt" ,python-pyqt) + ("python-requests" ,python-requests) + ("python-send2trash" ,python-send2trash) + ("python-sip" ,python-sip) + ;; `qtwebengine' is included in `pyqtwebengine', included here for easy + ;; wrapping. + ("qtwebengine" ,qtwebengine))) + (home-page "https://apps.ankiweb.net/") + (synopsis "Powerful, intelligent flash cards") + (description "Anki is a program which makes remembering things +easy. Because it's a lot more efficient than traditional study +methods, you can either greatly decrease your time spent studying, or +greatly increase the amount you learn. + +Anyone who needs to remember things in their daily life can benefit +from Anki. Since it is content-agnostic and supports images, audio, +videos and scientific markup (via LaTeX), the possibilities are +endless. For example: +@itemize +@item Learning a language +@item Studying for medical and law exams +@item Memorizing people's names and faces +@item Brushing up on geography +@item Mastering long poems +@item Even practicing guitar chords! +@end itemize") + (license license:agpl3+))) + (define-public t4k-common (package (name "t4k-common") -- cgit v1.2.3 From 895363e4cfa63cba1cc36515d69e7e0ce14886a9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 Feb 2020 14:35:39 +0100 Subject: gnu: cat-avatar-generator: Remove imports for (srfi *). This would import (srfi srfi-1) and (srfi srfi-26) from the host Guile, leading to discrepancies among users, and in particular when the host Guile is 3.0. Reported by Julien Lepiller in . * gnu/packages/web.scm (cat-avatar-generator): Remove (srfi *) from #:modules. --- gnu/packages/web.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3d73bfec2b..f38f8d2bfb 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2013 Aljosha Papsch -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2018 Raoul Jean Pierre Bonnal @@ -6806,14 +6806,13 @@ (define-public cat-avatar-generator "0s7b5whqsmfa57prbgl66ym551kg6ly0z14h5dgrlx4lqm70y2yw")))) (build-system trivial-build-system) (arguments - `(#:modules ((guix build utils) - (srfi srfi-1) - (srfi srfi-26)) + `(#:modules ((guix build utils)) #:builder (begin (use-modules (guix build utils) (srfi srfi-1) (srfi srfi-26)) + (let ((source (assoc-ref %build-inputs "source")) (php-dir (string-append %output "/share/web/" ,name "/"))) ;; The cache directory must not be in the store, but in a writable -- cgit v1.2.3 From 668307c0d4f35743fb9fcad7f2198aa9b31ba6d5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 5 Feb 2020 16:21:30 +0100 Subject: gnu: gcompris-qt: Update to 0.97. * gnu/packages/education.scm (gcompris-qt): Update to 0.97. [arguments]: Skip failing test. [native-inputs]: Add kdoctools. --- gnu/packages/education.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 05d1856c7a..3ae1ec2192 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -132,7 +132,7 @@ (define-public gcompris (define-public gcompris-qt (package (name "gcompris-qt") - (version "0.96") + (version "0.97") (source (origin (method url-fetch) @@ -140,11 +140,16 @@ (define-public gcompris-qt "https://gcompris.net/download/qt/src/gcompris-qt-" version ".tar.xz")) (sha256 - (base32 "06483il59l46ny2w771sg45dgzjwv1ph7vidzzbj0wb8wbk2rg52")))) + (base32 "0hl3a1jjnrpnbqkpx3rl3fl86yfv503lh48djb888hplvr4nf747")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-test + (lambda _ + (substitute* "tests/core/CMakeLists.txt" + (("DownloadManagerTest\\.cpp") "#")) + #t)) (add-before 'check 'start-xorg-server (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server. @@ -173,6 +178,7 @@ (define-public gcompris-qt (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("gettext" ,gettext-minimal) + ("kdoctools" ,kdoctools) ("perl" ,perl) ("qttools" ,qttools) ("xorg-server" ,xorg-server-for-tests))) -- cgit v1.2.3 From 70b6b238486eea20be49652ff78e3a8e6488d1ac Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 5 Feb 2020 14:54:57 -0500 Subject: gnu: hyperrogue: Update to 11.2q. * gnu/packages/games.scm (hyperrogue): Update to 11.2q. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c05503cabb..b502cd0ec4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4033,7 +4033,7 @@ (define-public mrrescue (define-public hyperrogue (package (name "hyperrogue") - (version "11.2d") + (version "11.2q") ;; When updating this package, be sure to update the "hyperrogue-data" ;; origin in native-inputs. (source (origin @@ -4044,7 +4044,7 @@ (define-public hyperrogue "-src.tgz")) (sha256 (base32 - "1b532s94zv1jsni7bvh848m42arxcclsr0x3n7c689iamwqzrxmn")))) + "1w4khi2limxhgiq7xnz0rc9nzbk86bhbyzrcd5hdghnhsviaiggq")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target @@ -4122,7 +4122,7 @@ (define-public hyperrogue "-win.zip")) (sha256 (base32 - "0vq4l1xaqpjj3hmxn1vn2b3bbkn1hrag42ck9f30blinv347bwhf")))) + "1k81zrbq5gmrccjac1i5c6v8j2iilfg2vwrnm8snjmmcnh5z1fgj")))) ("unzip" ,unzip))) (inputs `(("font-dejavu" ,font-dejavu) -- cgit v1.2.3 From dfe5beb27da2fe9b55422ea4f6985d1f6a5bb90b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 5 Feb 2020 13:19:38 +0100 Subject: gnu: ppp: Update to 2.4.8. * gnu/packages/samba.scm (ppp): Update to 2.4.8. [source]: Change to GIT-FETCH. --- gnu/packages/samba.scm | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index d0db693e30..4eef7de5d7 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2017, 2019 Efraim Flashner ;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2017, 2018, 2020 Marius Bakke ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Rutger Helling @@ -423,26 +423,16 @@ (define-public ldb (define-public ppp (package (name "ppp") - (version "2.4.7") + (version "2.4.8") (source (origin - (method url-fetch) - (uri (string-append "https://www.samba.org/ftp/ppp/ppp-" - version ".tar.gz")) - (patches - (list (origin - ;; Use OpenSSL for cryptography instead of the obsolete glibc - ;; crypto functions that were removed in glibc 2.28. - (method url-fetch) - (uri (string-append "https://github.com/paulusmack/ppp/commit/" - "3c7b86229f7bd2600d74db14b1fe5b3896be3875" - ".patch")) - (file-name "ppp-use-openssl-crypto.patch") - (sha256 - (base32 - "0qlbi247lx3injpy8a1gcij9yilik0vfaibkpvdp88k3sa1rs69z"))))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/paulusmack/ppp") + (commit (string-append "ppp-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0c7vrjxl52pdwi4ckrvfjr08b31lfpgwf3pp0cqy76a77vfs7q02")))) + "1i88m79h6g3fzsb4yw3k8bq1grsx3hsyawm7id2vcaab0gfqzjjv")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no check target -- cgit v1.2.3 From d8d25bb8f548e647420dc97d2e72ac9c3ab5eecd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 5 Feb 2020 13:22:52 +0100 Subject: gnu: varnish: Update to 6.3.2. * gnu/packages/web.scm (varnish): Update to 6.3.2. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f38f8d2bfb..b19a638355 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5320,13 +5320,13 @@ (define-public varnish (package (name "varnish") (home-page "https://varnish-cache.org/") - (version "6.3.1") + (version "6.3.2") (source (origin (method url-fetch) (uri (string-append home-page "_downloads/varnish-" version ".tgz")) (sha256 (base32 - "0xa14pd68zpi5hxcax3arl14rcmh5d1cdwa8gv4l5f23mmynr8ni")))) + "1f5ahzdh3am6fij5jhiybv3knwl11rhc5r3ig1ybzw55ai7788q8")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") -- cgit v1.2.3 From 2fa980a50d99070e4e40f5bac503d8b66673f5c2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 5 Feb 2020 13:23:11 +0100 Subject: gnu: libcdr: Update to 0.1.6. * gnu/packages/libreoffice.scm (libcdr): Update to 0.1.6. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 93474dbdbf..7dd3b69ad4 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -362,14 +362,14 @@ (define-public libabw (define-public libcdr (package (name "libcdr") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) (uri (string-append "https://dev-www.libreoffice.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "0j1skr11jwvafn0l6p37v3i4lqc8wcn489g8f7c4mqwbk94mrkka")))) + "0qgqlw6i25zfq1gf7f6r5hrhawlrgh92sg238kjpf2839aq01k81")))) (build-system gnu-build-system) (native-inputs `(("cppunit" ,cppunit) -- cgit v1.2.3 From c7ceac8c3daa97623c92660dcd736cbe1426e35c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 5 Feb 2020 13:23:48 +0100 Subject: gnu: lftp: Update to 4.9.1. * gnu/packages/ftp.scm (lftp): Update to 4.9.1. --- gnu/packages/ftp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index b2ab13d951..58d817853b 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -46,7 +46,7 @@ (define-module (gnu packages ftp) (define-public lftp (package (name "lftp") - (version "4.8.4") + (version "4.9.1") (source (origin (method url-fetch) ;; See https://lftp.tech/get.html for mirrors. @@ -58,7 +58,7 @@ (define-public lftp "ftp/lftp/lftp-" version ".tar.xz"))) (sha256 (base32 - "0qks22357xv9y6ripmf5j2n5svh8j5z0yniphfk89sjwkqg2gg2f")))) + "0jq2g8h1bx06ya9fsja748vwb2qrca4wsfrgi3fmaa8hznpgqsar")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From fa72d1897a3feee9f6258df21e3f505618052f9b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 5 Feb 2020 14:32:08 +0100 Subject: gnu: libmtp: Remove unnecessary propagation. * gnu/packages/libusb.scm (libmtp)[propagated-inputs]: Move LIBGCRYPT ... [inputs]: ... here. New field. --- gnu/packages/libusb.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index abf11400e3..ba9bf92da3 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -466,10 +466,11 @@ (define-public libmtp (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("libgcrypt" ,libgcrypt))) (propagated-inputs ;; libmtp.pc refers to all these. - `(("libgcrypt" ,libgcrypt) - ("libusb" ,libusb))) + `(("libusb" ,libusb))) (arguments `(#:configure-flags (list (string-append "--with-udev=" -- cgit v1.2.3 From 34a3566f406bd867a39483a57f5132e227088a5a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 5 Feb 2020 14:33:06 +0100 Subject: gnu: libmtp: Do not build the static library. * gnu/packages/libusb.scm (libmtp)[arguments]: Add "--disable-static" in #:configure-flags. --- gnu/packages/libusb.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index ba9bf92da3..f1cd625f36 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -473,7 +473,8 @@ (define-public libmtp `(("libusb" ,libusb))) (arguments `(#:configure-flags - (list (string-append "--with-udev=" + (list "--disable-static" + (string-append "--with-udev=" (assoc-ref %outputs "out") "/lib/udev")))) (home-page "http://libmtp.sourceforge.net/") -- cgit v1.2.3 From e71ef4c138a16e6eedd36173607f09e035be2d2e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 5 Feb 2020 13:23:30 +0100 Subject: gnu: libmtp: Update to 1.1.17. * gnu/packages/libusb.scm (libmtp): Update to 1.1.17. --- gnu/packages/libusb.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index f1cd625f36..f41ed6b9bc 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -455,14 +455,14 @@ (define-public usbmuxd (define-public libmtp (package (name "libmtp") - (version "1.1.16") + (version "1.1.17") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libmtp/libmtp/" version "/libmtp-" version ".tar.gz")) (sha256 (base32 - "185vh9bds6dcy00ycggg69g4v7m3api40zv8vrcfb3fk3vfzjs2v")))) + "1p3r38nvdip40ab1h4scj3mzfjkx6kd14szjqyw9r6wz5pslr8zq")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From e5fcff3190efec8a29f0c17b9c69793062f3c927 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sun, 12 Jan 2020 23:54:18 +0100 Subject: gnu: elfutils: Update synopsis and description * gnu/packages/elf.scm (elfutils): Update summaries. [synopsis]: Updated. [description]: Updated. Signed-off-by: Marius Bakke --- gnu/packages/elf.scm | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 75caa54296..5fa66210db 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2020 Mark Wielaard ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,9 +55,10 @@ (define-public elfutils (build-system gnu-build-system) ;; Separate programs because that's usually not what elfutils users want, - ;; and because they duplicate what Binutils provides. + ;; and because they duplicate what Binutils provides (but are named + ;; differently, using the eu- prefix and can be installed in parallel). (outputs '("out" ; libelf.so, elfutils/*.h, etc. - "bin")) ; ld, nm, objdump, etc. + "bin")) ; eu-nm, eu-objdump, etc. (arguments ;; Programs don't have libelf.so in their RUNPATH and libraries don't @@ -84,11 +86,21 @@ (define-public elfutils (native-inputs `(("m4" ,m4))) (inputs `(("zlib" ,zlib))) (home-page "https://sourceware.org/elfutils/") - (synopsis "Linker and ELF manipulation tools") + (synopsis "Collection of utilities and libraries to handle ELF files and +DWARF data") (description - "This package provides command-line tools to manipulate binaries in the -Executable and Linkable Format (@dfn{ELF}). This includes @command{ld}, -@command{ar}, @command{objdump}, @command{addr2line}, and more.") + "Elfutils is a collection of utilities and libraries to read, create and +modify Executable and Linkable Format (@dfn{ELF}) binary files, find and +handle Debugging With Arbitrary Record Formats (@dfn{DWARF}) debug data, +symbols, thread state and stacktraces for processes and core files on +GNU/Linux. Elfutils includes @file{libelf} for manipulating ELF files, +@file{libdw} for inspecting DWARF data and process state and utilities like +@command{eu-stack} (to show backtraces), @command{eu-nm} (for listing symbols +from object files), @command{eu-size} (for listing the section sizes of an +object or archive file), @command{eu-strip} (for discarding symbols), +@command{eu-readelf} (to see the raw ELF file structures), +@command{eu-elflint} (to check for well-formed ELF files), +@command{eu-elfcompress} (to compress or decompress ELF sections), and more.") ;; Libraries are dual-licensed LGPLv3.0+ | GPLv2, and programs are GPLv3+. (license lgpl3+))) -- cgit v1.2.3 From 6a428d455e24769bc274dd80ecc959e954f7ff41 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Thu, 30 Jan 2020 13:37:11 +0000 Subject: gnu: zrythm: Update to 0.7.474. * gnu/packages/music.scm (zrythm): Update to 0.7.474. [arguments](phases): Patch xdg-open. Signed-off-by: Marius Bakke --- gnu/packages/music.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 41e8ba6f75..3ef04d7202 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5142,7 +5142,7 @@ (define-public helm (define-public zrythm (package (name "zrythm") - (version "0.7.345") + (version "0.7.474") (source (origin (method url-fetch) @@ -5150,13 +5150,21 @@ (define-public zrythm version ".tar.xz")) (sha256 (base32 - "1csiwq38a1ckx23lairfpl7qjkz71wsa7a9vsxl3k58f9ybibiil")))) + "0qq9v8y27zhamcb7nq7pl76874ws8x8cxhp5r685b8binvl9p0az")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t #:configure-flags `("-Denable_tests=true" "-Dmanpage=true" - "-Dinstall_dseg_font=false" "-Denable_ffmpeg=true"))) + "-Dinstall_dseg_font=false" "-Denable_ffmpeg=true") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-xdg-open + (lambda _ + (substitute* "src/utils/io.c" + (("OPEN_DIR_CMD") + (string-append "\"" (which "xdg-open") "\""))) + #t))))) (inputs `(("alsa-lib" ,alsa-lib) ("jack" ,jack-1) -- cgit v1.2.3 From 6bd561b8c849e433b7451be2ffd194fc87fec26f Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 4 Feb 2020 20:43:25 +0000 Subject: gnu: gpodder: Update to 3.10.13. * gnu/packages/gpodder.scm (gpodder): Update to 3.10.13. Signed-off-by: Marius Bakke --- gnu/packages/gpodder.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 040793b4f6..8e7c961929 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Pierre Langlois +;;; Copyright © 2019, 2020 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,7 +37,7 @@ (define-module (gnu packages gpodder) (define-public gpodder (package (name "gpodder") - (version "3.10.11") + (version "3.10.13") (source (origin (method git-fetch) @@ -46,7 +46,7 @@ (define-public gpodder (commit version))) (sha256 (base32 - "15f5z3cnch9lpzbz73l4wjykv9n74y8djz5db53la2ql4ihaxfz9")) + "1h542syaxsx1hslfzlk3fx1nbp190zjw35kigw7a1kx1jwvfwapg")) (file-name (git-file-name name version)))) (build-system python-build-system) (native-inputs -- cgit v1.2.3 From 567a14536881d891b73dd8bd9ab99d503f6d8578 Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Wed, 5 Feb 2020 00:59:48 +0000 Subject: gnu: streamlink: Update to 1.3.1. * gnu/packages/video.scm (streamlink): Update to 1.3.1. Signed-off-by: Marius Bakke --- gnu/packages/video.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8c94f0e34a..023dbbdc04 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2019 Arne Babenhauserheide ;;; Copyright © 2019 Riku Viitanen ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 Josh Holland ;;; ;;; This file is part of GNU Guix. ;;; @@ -2182,14 +2183,14 @@ (define-public xvid (define-public streamlink (package (name "streamlink") - (version "1.3.0") + (version "1.3.1") (source (origin (method url-fetch) (uri (pypi-uri "streamlink" version)) (sha256 (base32 - "0593ffjpz82jrljnzxfafkcmcqad3r1ijjan0hm04xjcnxc9cr00")))) + "0cnlg3ra3g6dml4xfy9ysy9b4qwyn458fadd8ac44cfwi3v4gq6y")))) (build-system python-build-system) (home-page "https://github.com/streamlink/streamlink") (native-inputs -- cgit v1.2.3 From 6cd07787ab371240caaf990a2e16cb48290e25d0 Mon Sep 17 00:00:00 2001 From: Fakhri Sajadi Date: Wed, 5 Feb 2020 13:37:23 +0330 Subject: gnu: lxqt-config: Fixing keyboard layout. * gnu/packages/lxqt.scm (lxqt-config)[inputs]: Add xkeyboard-config. [arguments]: Add phase to substitute xkb rule file. Signed-off-by: Marius Bakke --- gnu/packages/lxqt.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 12c92e52d1..a440491633 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018, 2019 Meiyo Peng ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019, 2020 Reza Alizadeh Majd +;;; Copyright © 2020 Fakhri Sajadi ;;; ;;; This file is part of GNU Guix. ;;; @@ -379,6 +380,7 @@ (define-public lxqt-config ("qtx11extras" ,qtx11extras) ("solid" ,solid) ("xf86-input-libinput" ,xf86-input-libinput) + ("xkeyboard-config" ,xkeyboard-config) ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config) @@ -394,6 +396,14 @@ (define-public lxqt-config (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") "DESTINATION \"etc/xdg")) #t)) + (add-after 'unpack 'set-xkeyboard-config-file-name + (lambda* (#:key inputs #:allow-other-keys) + ;; Set the file name to xkeyboard-config. + (let ((xkb (assoc-ref inputs "xkeyboard-config"))) + (substitute* "lxqt-config-input/keyboardlayoutconfig.h" + (("/usr/share/X11/xkb/rules/base.lst") + (string-append xkb "/share/X11/xkb/rules/base.lst"))) + #t))) (add-after 'unpack 'patch-translations-dir (lambda* (#:key outputs #:allow-other-keys) (substitute* '("lxqt-config-file-associations/CMakeLists.txt" -- cgit v1.2.3 From 20c9914eabc4355690a3421768e8331e2ccf2a7a Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Wed, 5 Feb 2020 18:05:53 +0100 Subject: gnu: python-tomlkit: Update to 0.5.8. * gnu/packages/python-xyz.scm (python-tomlkit): Update to 0.5.8. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2fb121dfee..ca80e43289 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10462,14 +10462,14 @@ (define-public python2-cleo (define-public python-tomlkit (package (name "python-tomlkit") - (version "0.5.7") + (version "0.5.8") (source (origin (method url-fetch) (uri (pypi-uri "tomlkit" version)) (sha256 (base32 - "18820ga5z3if1w8dvykxrfm000akracq01ic402xrbljgbn5grn4")))) + "0sf2a4q61kf344hjbw8kb6za1hlccl89j9lzqw0l2zpddp0hrh9j")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit v1.2.3 From 4573b94d9dfabec76e90a5799dd062a055ac769c Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Wed, 5 Feb 2020 18:06:17 +0100 Subject: gnu: python-clikit: Update to 0.4.1. * gnu/packages/python-xyz.scm (python-clikit): Update to 0.4.1. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ca80e43289..74653c542f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10529,14 +10529,14 @@ (define-public python-memcached (define-public python-clikit (package (name "python-clikit") - (version "0.2.4") + (version "0.4.1") (source (origin (method url-fetch) (uri (pypi-uri "clikit" version)) (sha256 (base32 - "0dc8czib5f4j9px1ivcpqnmivnx2zjpc0xb00ldrhsqylks7r06n")))) + "10gab65pq0jdf589n33sj2513pxal2lisl4xwf1ijysdjxmpdr4a")))) (build-system python-build-system) (propagated-inputs `(("python-pastel" ,python-pastel) -- cgit v1.2.3 From 0c101a04f04fc36586763b3d1b50e87cd0582e23 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Wed, 5 Feb 2020 18:06:43 +0100 Subject: gnu: python-cleo: Update to 0.7.6. * gnu/packages/python-xyz.scm (python-cleo): Update to 0.7.6. [propagated-inputs]: Add python-clikit. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 74653c542f..dcc1595446 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10432,13 +10432,13 @@ (define-public python2-pylev (define-public python-cleo (package (name "python-cleo") - (version "0.6.8") + (version "0.7.6") (source (origin (method url-fetch) (uri (pypi-uri "cleo" version)) (sha256 (base32 - "06zp695hq835rkaq6irr1ds1dp2qfzyf32v60vxpd8rcnxv319l5")))) + "02dlc0rn43zgvw0s5v4j80bca9n1jfpwy3r78gn9qjgk0qj39kwr")))) (build-system python-build-system) (native-inputs `( ;; For testing @@ -10447,6 +10447,7 @@ (define-public python-cleo ("python-pytest" ,python-pytest))) (propagated-inputs `(("python-backpack" ,python-backpack) + ("python-clikit" ,python-clikit) ("python-pastel" ,python-pastel) ("python-pylev" ,python-pylev))) (home-page "https://github.com/sdispater/cleo") -- cgit v1.2.3 From 80b9f3efe733915467e8d02f2467032d4a544263 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 5 Feb 2020 20:17:58 -0500 Subject: gnu: linux-libre@4.4: Update to 4.4.213. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.213. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 048aeac512..2c25c56895 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -391,10 +391,10 @@ (define-public linux-libre-4.9-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.212") +(define-public linux-libre-4.4-version "4.4.213") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0mx3qyj6w6h7gw7drsfsgl4iyz1695sjnf9hqh4kczci48kw5rj7"))) + (hash (base32 "1cmwn9zvz14jqjy6qkszglhs2p5h6yh82b2269cbzvibg8y3rxq0"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 7abac36258667b99813bedac8343154da047560b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 5 Feb 2020 20:18:58 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.213. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.213. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2c25c56895..10f109afdb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,10 +383,10 @@ (define-public linux-libre-4.14-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.212") +(define-public linux-libre-4.9-version "4.9.213") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0c5yjilaq86j6i2hzlxbp2ia7jhnf7kv952ffv7jxdf90sk3irxd"))) + (hash (base32 "0r7bqpvbpiiniwsm338b38mv6flfgm1r09avxqsakhkh8rvgz1dg"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 5d0d21dc3a13f491007029c850b831e8b650cad5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 5 Feb 2020 20:19:28 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.170. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.170. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 10f109afdb..b2a4c8d132 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -375,10 +375,10 @@ (define-public linux-libre-4.19-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.169") +(define-public linux-libre-4.14-version "4.14.170") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0jc24zvqz3vsv65xxcivzkj6nv27vsy62l50n2h1ysy5jdwsk3nq"))) + (hash (base32 "1hqp3spi4cqgkqkzx5g2nbp6isz0kdcsj56ilsp6siqiglj662ll"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 55b1eab64ff018617c554ecac8fe26e19508e40e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 5 Feb 2020 20:20:18 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.102. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.102. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b2a4c8d132..1d1ea8ae7c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -367,10 +367,10 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.101") +(define-public linux-libre-4.19-version "4.19.102") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1i4bkwankl5q95kgqmmyzdkwmf3b8ppkb8ild9bw12mkpmm1a9my"))) + (hash (base32 "05g0gkwvlwfx1wlinnwm3ryq7fblmxjzhp12g6vx2jbvvn486bih"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From d94e5dffcbd83cda9e44e294514ea088fa5a91b6 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 5 Feb 2020 20:20:55 -0500 Subject: gnu: linux-libre: Update to 5.4.18. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.18. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1d1ea8ae7c..d7a984f42d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -359,10 +359,10 @@ (define (%upstream-linux-source version hash) "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.17") +(define-public linux-libre-5.4-version "5.4.18") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1fbl5knf6pini9lsx8mqkdmf3qbsydqvaxggh6nd1vk9mzv2npwl"))) + (hash (base32 "12ad4fnxag16ar2afiljv4nnv15i4f493sz6m7i9qgjld7yz3scj"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 9b478eb7342cf3d64e62239fd5681db75887d09a Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 5 Feb 2020 18:29:37 -0800 Subject: gnu: disoderfs: Update to 0.5.8. * gnu/packages/file-systems (disorderfs): Update to 0.5.8. [home-page]: Update. --- gnu/packages/file-systems.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 3e7314bc2b..b5ca37d43e 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -249,7 +249,7 @@ (define-public jfs_fsck/static (define-public disorderfs (package (name "disorderfs") - (version "0.5.6") + (version "0.5.8") (source (origin (method git-fetch) @@ -259,7 +259,7 @@ (define-public disorderfs (file-name (git-file-name name version)) (sha256 (base32 - "1zn2ydap8k9fwjl3ivgrg6l32s5p4ik6ca6j1idp7c77znlv6cpp")))) + "0pk9i0dycjq0wl6dp37r2hbadgpgmzbmjk2xpbjl36x4yrm4jns8")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -274,7 +274,7 @@ (define-public disorderfs #:test-target "test" ;; FIXME: Tests require 'run-parts' which is not in Guix yet. #:tests? #f)) - (home-page "https://github.com/ReproducibleBuilds/disorderfs") + (home-page "https://salsa.debian.org/reproducible-builds/disorderfs") (synopsis "FUSE file system that introduces non-determinism") (description "An overlay FUSE file system that introduces non-determinism -- cgit v1.2.3 From 3137e0e55c7490dc603fcf715176d6643e381494 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 6 Feb 2020 09:04:16 +0100 Subject: gnu: emacs-org: Update to 9.3.3. * gnu/packages/emacs-xyz.scm (emacs-org): Update to 9.3.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2efb4c220c..83e649b29c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8050,13 +8050,13 @@ (define-public emacs-org (name "emacs-org") ;; emacs-org-contrib inherits from this package. Please update it as ;; well. - (version "9.3.2") + (version "9.3.3") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/org-" version ".tar")) (sha256 - (base32 "1275s3hzyka2wwxl6nc2sndnwyl7kbc1nnl0hrznxb3wpy2abfd6")))) + (base32 "0yafckcx5ka2rpmv24x7ns6f3s1h216x2lbgaxsf1dmklbjcfvwv")))) (build-system emacs-build-system) (home-page "https://orgmode.org/") (synopsis "Outline-based notes management and organizer") -- cgit v1.2.3 From 7a1de45298e90ff1d7ab51174616361494e8a821 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 6 Feb 2020 09:04:33 +0100 Subject: gnu: emacs-org-contrib: Update to 20200206. * gnu/packages/emacs-xyz.scm (emacs-org-contrib): Update to 20200206. --- gnu/packages/emacs-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 83e649b29c..ec765dba5b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8070,14 +8070,14 @@ (define-public emacs-org-contrib (package (inherit emacs-org) (name "emacs-org-contrib") - (version "20200126") + (version "20200206") (source (origin (method url-fetch) (uri (string-append "https://orgmode.org/elpa/" "org-plus-contrib-" version ".tar")) (sha256 - (base32 "08yik0i8ya2x5j4vsnwxdcdlcxbiq58lvy30vcbdbf0hqrd40kjv")))) + (base32 "1fdxh8zgjnb500wkcl0bc0fdzbsln6p044b4s4nz85wkfw0jkfs5")))) (arguments `(#:modules ((guix build emacs-build-system) (guix build utils) @@ -8094,11 +8094,11 @@ (define-public emacs-org-contrib (map basename (find-files out))) (org+contrib-files (map basename (find-files org))) - (duplicates (lset-intersection - string=? contrib-files org+contrib-files))) + (duplicates (lset-intersection string=? + contrib-files + org+contrib-files))) (with-directory-excursion - (string-append - out "/share/emacs/site-lisp") + (string-append out "/share/emacs/site-lisp") (for-each delete-file duplicates)) #t)))))) (propagated-inputs -- cgit v1.2.3 From 5d0fff83dc610ee82d1ed51366876cfc86b9f79d Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 31 Jan 2020 20:49:05 -0800 Subject: gnu: Add rust-datetime-0.4. * gnu/packages/crates-io.scm (rust-datetime-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bc39122c1d..45cfd2f5f4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2319,6 +2319,40 @@ (define-public rust-data-encoding-2.1 hexadecimal, base32, and base64.") (license license:expat))) +(define-public rust-datetime-0.4 + (package + (name "rust-datetime") + (version "0.4.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "datetime" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1fd74bq48xg8ki5yw1mr1pa5hd3j5lbk4iqc5r0kh3l62b0vci2w")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-iso8601" ,rust-iso8601-0.1) + ("rust-kernel32-sys" ,rust-kernel32-sys-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-locale" ,rust-locale-0.2) + ("rust-num-traits" ,rust-num-traits-0.1) + ("rust-pad" ,rust-pad-0.1) + ("rust-redox-syscall" ,rust-redox-syscall-0.1) + ("rust-winapi" ,rust-winapi-0.2)) + #:cargo-development-inputs + (;("rust-regex" ,rust-regex-0.1) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)))) + (home-page "https://github.com/rust-datetime/datetime") + (synopsis "Library for date and time formatting and arithmetic") + (description "This package provides a library for date and time formatting +and arithmetic.") + (license license:expat))) + (define-public rust-defmac-0.2 (package (name "rust-defmac") -- cgit v1.2.3 From 53bf4857a422e9e09eb807a636aed2848e255f49 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 31 Jan 2020 21:05:21 -0800 Subject: gnu: Add rust-hermit-abi-0.1. * gnu/packages/crates-io.scm (rust-hermit-abi-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 45cfd2f5f4..0c5cc3b69c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4751,6 +4751,33 @@ (define-public rust-heck-0.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-hermit-abi-0.1 + (package + (name "rust-hermit-abi") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "hermit-abi" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0wippj5nkw9q5yyyaqpdrgdhag3l3nbrwja7149cwn7ii1nnbwpg")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1.0)))) + (home-page "https://github.com/hermitcore/rusty-hermit") + (synopsis "Small interface to call functions from RustyHermit") + (description + "Hermit-abi is small interface to call functions from the unikernel RustyHermit. +It is used to build the target x86_64-unknown-hermit.") + (license (list license:expat license:asl2.0)))) + (define-public rust-hex-0.4 (package (name "rust-hex") -- cgit v1.2.3 From d57000cf43f4650be7e8484f0a53c0f13326100a Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 31 Jan 2020 20:59:29 -0800 Subject: gnu: Add rust-natord-1.0. * gnu/packages/crates-io.scm (rust-natord-1.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0c5cc3b69c..1e2bb8e88d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6641,6 +6641,26 @@ (define-public rust-modifier-0.1 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-natord-1.0 + (package + (name "rust-natord") + (version "1.0.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "natord" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0z75spwag3ch20841pvfwhh3892i2z2sli4pzp1jgizbipdrd39h")))) + (build-system cargo-build-system) + (home-page "https://github.com/lifthrasiir/rust-natord") + (synopsis "Natural ordering for Rust") + (description + "This package provides a crate to perform natural ordering for Rust.") + (license license:expat))) + (define-public rust-net2-0.2 (package (name "rust-net2") -- cgit v1.2.3 From 1b81f2c78cf1475f90b892ca32f30bcb3381571d Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 31 Jan 2020 21:03:53 -0800 Subject: gnu: Add rust-num-cpus-1.11. * gnu/packages/crates-io.scm (rust-num-cpus-1.11): New variable. (rust-num-cpus-1.10)[inherit]: New field. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1e2bb8e88d..d7288afede 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7014,8 +7014,36 @@ (define-public rust-num-complex-0.2 "Complex numbers implementation for Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-num-cpus-1.11 + (package + (name "rust-num-cpus") + (version "1.11.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "num_cpus" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0wlxs00cpg16z09fwchj1gdz1jxnf5dgg1cbidvq0sc75bnwbnkn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-hermit-abi" ,rust-hermit-abi-0.1) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3)))) + (home-page "https://github.com/seanmonstar/num_cpus") + (synopsis "Get the number of CPUs on a machine") + (description + "Get the number of CPUs on a machine.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-num-cpus-1.10 (package + (inherit rust-num-cpus-1.11) (name "rust-num-cpus") (version "1.10.1") (source @@ -7026,19 +7054,12 @@ (define-public rust-num-cpus-1.10 (sha256 (base32 "0wrj3zvj6h3q26sqj9zxpd59frjb54n7jhjwf307clq31ic47vxw")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-libc" ,rust-libc-0.2)) #:cargo-development-inputs - (("rust-doc-comment" ,rust-doc-comment-0.3)))) - (home-page "https://github.com/seanmonstar/num_cpus") - (synopsis "Get the number of CPUs on a machine") - (description - "Get the number of CPUs on a machine.") - (license (list license:asl2.0 - license:expat)))) + (("rust-doc-comment" ,rust-doc-comment-0.3)))))) (define-public rust-num-integer-0.1 (package -- cgit v1.2.3 From 9ce26f2d492e557c969252413b81ec8d76dd0c0c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 5 Feb 2020 16:19:33 +0200 Subject: gnu: rust-num-cpus-1.10: Don't skip build. * gnu/packages/crates-io.scm (rust-num-cpus-1.10)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d7288afede..b10a206fd6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7055,8 +7055,7 @@ (define-public rust-num-cpus-1.10 (base32 "0wrj3zvj6h3q26sqj9zxpd59frjb54n7jhjwf307clq31ic47vxw")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)))))) -- cgit v1.2.3 From a1add81e635116c580589d0f83a20513868e7dcc Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 31 Jan 2020 21:07:37 -0800 Subject: gnu: Add rust-number-prefix-0.3. * gnu/packages/crates-io.scm (rust-number-prefix-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b10a206fd6..c6e4beec62 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7144,6 +7144,27 @@ (define-public rust-num-traits-0.1 `(#:cargo-inputs (("rust-num-traits" , rust-num-traits-0.2)))))) +(define-public rust-number-prefix-0.3 + (package + (name "rust-number-prefix") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "number_prefix" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0slm4mqmpgs6hvz22ycny9lvyvl9ivs80a1lncslp7lszz02zc0p")))) + (build-system cargo-build-system) + (home-page "https://github.com/ogham/rust-number-prefix") + (synopsis "Format numeric prefixes: kilo, giga, kibi") + (description + "This package provides a library for formatting numeric prefixes: kilo, +giga, kibi.") + (license license:expat))) + (define-public rust-numtoa-0.1 (package (name "rust-numtoa") -- cgit v1.2.3 From a3c072c77a7187f797a57e11eed115cfe28389db Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 21 Jan 2020 09:56:55 -0800 Subject: gnu: Add rust-ansi-term-0.12. * gnu/packages/crates-io.scm (rust-ansi-term-0.12): New variable. (rust-ansi-term-0.11)[inherit]: New field, inherit from rust-ansi-term-0.12. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c6e4beec62..9be5600692 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -185,10 +185,10 @@ (define-public rust-aho-corasick-0.6 ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0)))))) -(define-public rust-ansi-term-0.11 +(define-public rust-ansi-term-0.12 (package (name "rust-ansi-term") - (version "0.11.0") + (version "0.12.1") (source (origin (method url-fetch) @@ -196,12 +196,16 @@ (define-public rust-ansi-term-0.11 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "16wpvrghvd0353584i1idnsgm0r3vchg8fyrm0x8ayv1rgvbljgf")))) + "1ljmkbilxgmhavxvxqa7qvm6f3fjggi7q2l3a72q9x0cxjvrnanm")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-winapi" ,rust-winapi-0.3)))) + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1.0) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-regex" ,rust-regex-1.3) + ("rust-serde-json" ,rust-serde-json-1.0)))) (home-page "https://github.com/ogham/rust-ansi-term") (synopsis "Library for ANSI terminal colours and styles") (description @@ -209,6 +213,24 @@ (define-public rust-ansi-term-0.11 text or blue underlined text, on ANSI terminals.") (license license:expat))) +(define-public rust-ansi-term-0.11 + (package + (inherit rust-ansi-term-0.12) + (name "rust-ansi-term") + (version "0.11.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ansi_term" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "16wpvrghvd0353584i1idnsgm0r3vchg8fyrm0x8ayv1rgvbljgf")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-antidote-1.0 (package (name "rust-antidote") -- cgit v1.2.3 From b8597582a4622f53f70da94bea53f57b03422540 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 31 Jan 2020 21:09:06 -0800 Subject: gnu: Add rust-term-grid-0.1. * gnu/packages/crates-io.scm (rust-term-grid-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9be5600692..4fe5752248 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11747,6 +11747,29 @@ (define-public rust-term-0.4 (("rust-kernel32-sys" ,rust-kernel32-sys-0.2) ("rust-winapi" ,rust-winapi-0.2)))))) +(define-public rust-term-grid-0.1 + (package + (name "rust-term-grid") + (version "0.1.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "term_grid" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1kq2sy3b8329jrsrpcvijvyz4gbqjyvyy6c3n0wmmvda9y03w393")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-unicode-width" ,rust-unicode-width-0.1)))) + (home-page "https://github.com/ogham/rust-term-grid") + (synopsis "Library for formatting strings into a grid layout") + (description "This package provides a library for formatting strings into a +grid layout.") + (license license:expat))) + (define-public rust-term-size-1.0 (package (name "rust-term-size") -- cgit v1.2.3 From 329d5aad0ea564245d6f6896156cdc3ca1fe2569 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 31 Jan 2020 21:50:46 -0800 Subject: gnu: rust-libgit2-sys-0.8: Inherit arguments. * gnu/packages/crates-io.scm (rust-libgit2-sys-0.8):[arguments] Remove field. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4fe5752248..d57aa1fd56 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5771,7 +5771,6 @@ (define-public rust-libgit2-sys-0.8 (sha256 (base32 "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc")))) - (arguments '()) (properties '((hidden? . #t))))) (define-public rust-libgit2-sys-0.7 -- cgit v1.2.3 From dbc0c7950f4d0a09a2a3684b2793dd2d033b3825 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 5 Feb 2020 20:35:31 +0200 Subject: gnu: libgit2-sys-0.8: Unbundle vendored code. * gnu/packages/crates-io.scm (rust-libgit2-sys-0.8)[source]: Add snippet to remove bundled code. --- gnu/packages/crates-io.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d57aa1fd56..844fc4dc61 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5767,10 +5767,13 @@ (define-public rust-libgit2-sys-0.8 (origin (method url-fetch) (uri (crate-uri "libgit2-sys" version)) - (file-name (string-append name "-" version ".crate")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc")))) + "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "libgit2") #t)))) (properties '((hidden? . #t))))) (define-public rust-libgit2-sys-0.7 -- cgit v1.2.3 From d28ddc2b8784b827ebcce925ac205ee98907ec9e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 5 Feb 2020 20:36:46 +0200 Subject: gnu: rust-libgit2-sys-0.8: Don't hide package. * gnu/packages/crates-io.scm (rust-libgit2-sys-0.8)[properties]: Remove field. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 844fc4dc61..eccaa2491e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5773,8 +5773,7 @@ (define-public rust-libgit2-sys-0.8 "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc")) (modules '((guix build utils))) (snippet - '(begin (delete-file-recursively "libgit2") #t)))) - (properties '((hidden? . #t))))) + '(begin (delete-file-recursively "libgit2") #t)))))) (define-public rust-libgit2-sys-0.7 (package -- cgit v1.2.3 From 5ccd167c016fd529336e16bb3cb8585acef6e1af Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 31 Jan 2020 21:27:07 -0800 Subject: gnu: Add rust-users-0.9. * gnu/packages/crates-io.scm (rust-users-0.9): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index eccaa2491e..5215b2bfc8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13349,6 +13349,28 @@ (define-public rust-url-1.7 ("rust-rustc-test" ,rust-rustc-test-0.3) ("rust-serde-json" ,rust-serde-json-1.0)))))) +(define-public rust-users-0.9 + (package + (name "rust-users") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "users" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1kxl3y2hcrqqip7jpqn5mz7xlpbwmmpfmaza0xnyrhx0mrkl4by7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/ogham/rust-users") + (synopsis "Library for getting information on Unix users and groups") + (description "This package provides a library for getting information on +Unix users and groups.") + (license license:expat))) + (define-public rust-utf-8-0.7 (package (name "rust-utf-8") -- cgit v1.2.3 From 494fc97cd4a919ddce8c8d2c2ff1c0c1b1b7fd25 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 31 Jan 2020 21:28:29 -0800 Subject: gnu: Add rust-zoneinfo-compiled-0.4. * gnu/packages/crates-io.scm (rust-zoneinfo-compiled-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5215b2bfc8..b9836cade4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14210,3 +14210,27 @@ (define-public rust-yaml-rust-0.4 (description "The missing YAML 1.2 parser for rust.") (license (list license:asl2.0 license:expat)))) + +(define-public rust-zoneinfo-compiled-0.4 + (package + (name "rust-zoneinfo-compiled") + (version "0.4.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "zoneinfo_compiled" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bnm19w791q6kp79s0zl1cj9w51bw5xrifrxfy3g1p05i676y4vf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-datetime" ,rust-datetime-0.4)))) + (home-page "https://github.com/rust-datetime/zoneinfo-compiled/") + (synopsis "Library for parsing compiled zoneinfo files") + (description + "This package provides a library for parsing compiled zoneinfo files.") + (license license:expat))) -- cgit v1.2.3 From 6030b76570e950b1d2c3cd13431a1a320622bac8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 5 Feb 2020 20:59:54 +0200 Subject: gnu: rust-openssl-sys-0.9: Don't skip build. * gnu/packages/crates-io.scm (rust-openssl-sys-0.9)[source]: Add patch. [arguments]: Don't skip build. * gnu/packages/patches/rust-openssl-sys-no-vendor.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/crates-io.scm | 10 +++++----- .../patches/rust-openssl-sys-no-vendor.patch | 23 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/rust-openssl-sys-no-vendor.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 0096010f14..f105f11913 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1378,6 +1378,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-bootstrap-stage0-test.patch \ %D%/packages/patches/rust-coresimd-doctest.patch \ %D%/packages/patches/rust-reproducible-builds.patch \ + %D%/packages/patches/rust-openssl-sys-no-vendor.patch \ %D%/packages/patches/rxvt-unicode-escape-sequences.patch \ %D%/packages/patches/sbcl-graph-asdf-definitions.patch \ %D%/packages/patches/scalapack-blacs-mpi-deprecations.patch \ diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b9836cade4..ebd6ea58b1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -26,6 +26,7 @@ (define-module (gnu packages crates-io) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages jemalloc) #:use-module (gnu packages pcre) @@ -7403,19 +7404,18 @@ (define-public rust-openssl-sys-0.9 (origin (method url-fetch) (uri (crate-uri "openssl-sys" version)) - (file-name (string-append name "-" version ".crate")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0vvk8vzrc73y8n5rf4yj3x8ygyxjaz7wxrbxiwqi7qy0gyp1cpa6")))) + (base32 "0vvk8vzrc73y8n5rf4yj3x8ygyxjaz7wxrbxiwqi7qy0gyp1cpa6")) + (patches (search-patches "rust-openssl-sys-no-vendor.patch")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t ; it wants rust-openssl-src - #:cargo-inputs + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) ;; Build dependencies: ("rust-autocfg" ,rust-autocfg-0.1) ("rust-cc" ,rust-cc-1.0) ("rust-pkg-config" ,rust-pkg-config-0.3) - ;("rust-openssl-src" ,rust-openssl-src-111) ("rust-vcpkg" ,rust-vcpkg-0.2)) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/patches/rust-openssl-sys-no-vendor.patch b/gnu/packages/patches/rust-openssl-sys-no-vendor.patch new file mode 100644 index 0000000000..78a6b5e3f7 --- /dev/null +++ b/gnu/packages/patches/rust-openssl-sys-no-vendor.patch @@ -0,0 +1,23 @@ +https://sources.debian.org/data/main/r/rust-openssl-sys/0.9.53-1/debian/patches/disable-vendor.patch +"MIT" licensed according to debian/copyright file +slightly modified to only change the vendored openssl-src dependency + +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -31,14 +31,11 @@ + [build-dependencies.cc] + version = "1.0" + +-[build-dependencies.openssl-src] +-version = "111.0.1" +-optional = true +- + [build-dependencies.pkg-config] + version = "0.3.9" + + [features] + vendored = ["openssl-src"] ++openssl-src = [] + [target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] + version = "0.2" + -- cgit v1.2.3 From 3cc77ace226d78cf0d554866fe6725c32b97d3ad Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 5 Feb 2020 21:00:56 +0200 Subject: gnu: Remove rust-openssl-src-111. * gnu/packages/crates-io.scm (rust-openssl-src-111): Remove variable. --- gnu/packages/crates-io.scm | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ebd6ea58b1..afebd4d73e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7375,27 +7375,6 @@ (define-public rust-openssl-probe-0.1 (license (list license:asl2.0 license:expat)))) -(define-public rust-openssl-src-111 - (package - (name "rust-openssl-src") - (version "111.6.0+1.1.1d") - (source - (origin - (method url-fetch) - (uri (crate-uri "openssl-src" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "172xh95hp7aygahah1940kg1dnx60c5m80cwj5hgi8x7x0fxmhmr")))) - (build-system cargo-build-system) - (home-page "https://github.com/alexcrichton/openssl-src-rs") - (synopsis "Source of OpenSSL for rust crates") - (description - "This package contains the source of OpenSSL and logic to build it.") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - (define-public rust-openssl-sys-0.9 (package (name "rust-openssl-sys") -- cgit v1.2.3 From b392230109d6702e0765cc01a25ed9a201af25a7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 5 Feb 2020 21:03:11 +0200 Subject: gnu: rust-libssh2-sys-0.2: Don't skip build. * gnu/packages/crates-io.scm (rust-libssh2-sys-0.2)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index afebd4d73e..2b6c8be325 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5877,8 +5877,7 @@ (define-public rust-libssh2-sys-0.2 '(begin (delete-file-recursively "libssh2") #t)))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t ; it wants rust-openssl-src - #:cargo-inputs + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-libz-sys" ,rust-libz-sys-1.0) ("rust-openssl-sys" ,rust-openssl-sys-0.9) -- cgit v1.2.3 From 832bd82b135aedfd869ee57a62a04c0ea1797c71 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 5 Feb 2020 21:09:04 +0200 Subject: gnu: rust-tempdir-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-tempdir-0.3)[arguments]: Add rust-rand-0.4, rust-remove-dir-all-0.5 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2b6c8be325..8cbd5762fe 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11588,12 +11588,15 @@ (define-public rust-tempdir-0.3 (base32 "1n5n86zxpgd85y0mswrp5cfdisizq2rv3la906g6ipyc03xvbwhm")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rand" ,rust-rand-0.4) + ("rust-remove-dir-all" ,rust-remove-dir-all-0.5)))) (home-page "https://github.com/rust-lang-deprecated/tempdir") (synopsis "Temporary directory management for Rust") (description "This package provides a library for managing a temporary directory and deleting all contents when it's dropped.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 69c577bc07042defe5d0d2ddf6a9dec2bc4a3c40 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 5 Feb 2020 22:28:57 +0200 Subject: gnu: rust-libgit2-0.9: Don't skip build. * gnu/packages/crates-io.scm (rust-libgit2-0.9)[arguments]: Don't skip build. [native-inputs]: Add libgit2, libssh2, openssl, pkg-config, zlib. --- gnu/packages/crates-io.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8cbd5762fe..9d414dba63 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4252,8 +4252,7 @@ (define-public rust-git2-0.9 (base32 "0cayf5w7wkvclvs8brbi7lyfxbdklwls9s49mpf2brl655yjwjwj")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-libc" ,rust-libc-0.2) ("rust-libgit2-sys" ,rust-libgit2-sys-0.8) @@ -4267,7 +4266,13 @@ (define-public rust-git2-0.9 ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-tempdir" ,rust-tempdir-0.3) ("rust-thread-id" ,rust-thread-id-3.3) - ("rust-time" ,rust-time-0.1)))))) + ("rust-time" ,rust-time-0.1)))) + (native-inputs + `(("libgit2" ,libgit2) + ("libssh2" ,libssh2) + ("openssl" ,openssl) + ("pkg-config" ,pkg-config) + ("zlib" ,zlib))))) (define-public rust-glob-0.3 (package -- cgit v1.2.3 From d42cbbba3769e79d393835d35c14a25bbd9cf925 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 31 Jan 2020 20:51:17 -0800 Subject: gnu: Add exa. * gnu/packages/rust-apps.scm (exa): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/rust-apps.scm | 81 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 90bd146442..108d2fb573 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -28,6 +28,87 @@ (define-module (gnu packages rust-apps) #:use-module (gnu packages tls) #:use-module (gnu packages version-control)) +(define-public exa + (package + (name "exa") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "exa" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1s902xgplz1167k0r7x235p914lprpsqy2if0kpa1mlb0fswqqq4")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-datetime" ,rust-datetime-0.4) + ("rust-env-logger" ,rust-env-logger-0.6) + ("rust-git2" ,rust-git2-0.9) + ("rust-glob" ,rust-glob-0.3) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-locale" ,rust-locale-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-natord" ,rust-natord-1.0) + ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-number-prefix" ,rust-number-prefix-0.3) + ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1) + ("rust-term-grid" ,rust-term-grid-0.1) + ("rust-term-size" ,rust-term-size-0.3) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-users" ,rust-users-0.9) + ("rust-zoneinfo-compiled" ,rust-zoneinfo-compiled-0.4)) + #:cargo-development-inputs + (("rust-datetime" ,rust-datetime-0.4)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'dont-vendor-sources + (lambda* (#:key inputs #:allow-other-keys) + (let ((openssl (assoc-ref inputs "openssl"))) + (setenv "OPENSSL_DIR" openssl)) + #t)) + ;; Ignoring failing tests. + ;; Reported in https://github.com/ogham/exa/issues/318 + (add-before 'check 'disable-failing-tests + (lambda _ + (substitute* "src/options/mod.rs" + (("^.*fn oneline_across.*" oneline-across) + (string-append "#[ignore]\n" oneline-across))) + + (substitute* "src/options/view.rs" + (("test!\\(across:.*") "") + (("test!\\(empty:.*") "") + (("test!\\(gracross:.*") "") + (("test!\\(grid:.*") "") + (("test!\\(icons:.*") "") + (("test!\\(just_binary:.*") "") + (("test!\\(just_blocks:.*") "") + (("test!\\(just_bytes:.*") "") + (("test!\\(just_git:.*") "") + (("test!\\(just_group:.*") "") + (("test!\\(just_header:.*") "") + (("test!\\(just_inode:.*") "") + (("test!\\(just_links:.*") "") + (("test!\\(leg:.*") "") + (("test!\\(lid:.*") "") + (("test!\\(original_g:.*") "")) + #t))))) + (inputs + `(("libgit2" ,libgit2) + ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://the.exa.website/") + (synopsis "Modern replacement for ls") + (description "@code{exa} is a modern replacement for the command-line +program @code{ls}. It uses colours to distinguish file types and metadata. It +also knows about symlinks, extended attributes, and Git.") + (license license:expat))) + (define-public ripgrep (package (name "ripgrep") -- cgit v1.2.3 From b76473ecfd1274d37514c76764f5f107c7af6268 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 5 Feb 2020 23:27:38 +0200 Subject: gnu: exa: Install extras. * gnu/packages/rust-apps.scm (exa)[arguments]: Add phase to install man page and shell completions. --- gnu/packages/rust-apps.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 108d2fb573..118f914d92 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -96,7 +96,23 @@ (define-public exa (("test!\\(leg:.*") "") (("test!\\(lid:.*") "") (("test!\\(original_g:.*") "")) - #t))))) + #t)) + (add-after 'install 'install-extras + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share")) + (man1 (string-append share "/man/man1"))) + (install-file "contrib/man/exa.1" man1) + (mkdir-p (string-append out "/etc/bash_completion.d")) + (mkdir-p (string-append share "/fish/vendor_completions.d")) + (mkdir-p (string-append share "/zsh/site-functions")) + (copy-file "contrib/completions.bash" + (string-append out "/etc/bash_completion.d/exa")) + (copy-file "contrib/completions.fish" + (string-append share "/fish/vendor_completions.d/exa.fish")) + (copy-file "contrib/completions.zsh" + (string-append share "/zsh/site-functions/_exa")) + #t)))))) (inputs `(("libgit2" ,libgit2) ("zlib" ,zlib))) -- cgit v1.2.3 From 28d72f868454a689f9fde89fc4c21e263a145af5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 5 Feb 2020 23:46:15 +0200 Subject: gnu: rust-libgit2-0.11: Don't skip build. * gnu/packages/crates-io.scm (rust-libgit2-0.11)[arguments]: Don't skip build. [native-inputs]: Add libgit2, libssh2, openssl, pkg-config, zlib. --- gnu/packages/crates-io.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9d414dba63..727e7c9510 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4213,8 +4213,7 @@ (define-public rust-git2-0.11 "1i0fgsr91r97hsjbgqnymkcyiyg0057m7m04116k3vmyqpvrwlbp")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-libc" ,rust-libc-0.2) ("rust-libgit2-sys" ,rust-libgit2-sys-0.10) @@ -4229,6 +4228,12 @@ (define-public rust-git2-0.11 ("rust-tempfile" ,rust-tempfile-3.1) ("rust-thread-id" ,rust-thread-id-3.3) ("rust-time" ,rust-time-0.1)))) + (native-inputs + `(("libgit2" ,libgit2) + ("libssh2" ,libssh2) + ("openssl" ,openssl) + ("pkg-config" ,pkg-config) + ("zlib" ,zlib))) (home-page "https://github.com/rust-lang/git2-rs") (synopsis "Rust bindings to libgit2") (description @@ -4266,13 +4271,7 @@ (define-public rust-git2-0.9 ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-tempdir" ,rust-tempdir-0.3) ("rust-thread-id" ,rust-thread-id-3.3) - ("rust-time" ,rust-time-0.1)))) - (native-inputs - `(("libgit2" ,libgit2) - ("libssh2" ,libssh2) - ("openssl" ,openssl) - ("pkg-config" ,pkg-config) - ("zlib" ,zlib))))) + ("rust-time" ,rust-time-0.1)))))) (define-public rust-glob-0.3 (package -- cgit v1.2.3 From 45088584aca4ffc0e07215aa8c112a930374f57d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 6 Feb 2020 09:34:30 +0200 Subject: gnu: screen: Update to 4.8.0. * gnu/packages/screen.scm (screen): Update to 4.8.0. --- gnu/packages/screen.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm index b9a0f6a864..51168903a9 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2015, 2017 Eric Bavier -;;; Copyright © 2016, 2017, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice @@ -38,13 +38,13 @@ (define-module (gnu packages screen) (define-public screen (package (name "screen") - (version "4.7.0") + (version "4.8.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/screen/screen-" version ".tar.gz")) (sha256 - (base32 "1h90bpy2wk304xw367y1zwz0kilrpm6h28nphykx4fvqz8l56xys")))) + (base32 "18ascpjzsy70h6hk7wpg8zmzjwgdyrdr7c6z4pg5z4l9hhyv24bf")))) (build-system gnu-build-system) (native-inputs `(("makeinfo" ,texinfo))) -- cgit v1.2.3 From c153010bf9e457b8259db0da52d21c61a1bb9f6e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 6 Feb 2020 09:57:50 +0200 Subject: gnu: rust-cbindgen: Update to 0.13.0. * gnu/packages/crates-io.scm (rust-cbindgen): Update to 0.13.0. --- gnu/packages/rust-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 118f914d92..5b61cdc542 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -167,7 +167,7 @@ (define-public ripgrep (define-public rust-cbindgen (package (name "rust-cbindgen") - (version "0.12.2") + (version "0.13.0") (source (origin (method url-fetch) @@ -175,7 +175,7 @@ (define-public rust-cbindgen (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "13jzbmjz1bmmfr0i80hw6ar484mgabx3hbpb2ynhk0ddqi0yr58m")))) + "1kywaz62cglg8fv0p7mp1m946gwmrf62s8ffndd5zpf1mz21j472")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 8d9317e1f0114fc94587b1bc3cc6721544094b15 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 6 Feb 2020 11:38:28 +0100 Subject: gnu: emacs-geiser: Update to 0.11. * gnu/packages/emacs-xyz.scm (emacs-geiser): Update to 0.11. --- gnu/packages/emacs-xyz.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ec765dba5b..aa4c37efea 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -163,14 +163,15 @@ (define-module (gnu packages emacs-xyz) (define-public emacs-geiser (package (name "emacs-geiser") - (version "0.10") + (version "0.11") (source (origin - (method url-fetch) - (uri (string-append "mirror://savannah/geiser/" version - "/geiser-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/jaor/geiser/") + (commit version))) (sha256 (base32 - "0pj3l7p8d60c9b4vfprnv6g5l61d74pls4b5dvd84cn4ky9mzwjv")))) + "0fb2h984hn7bnyiziplp7kgk29zdzc9yainsv0k1li436irlp9dd")))) (build-system gnu-build-system) (arguments '(#:phases @@ -183,7 +184,11 @@ (define-public emacs-geiser "geiser-autoloads.el")) #t))))) (inputs `(("guile" ,guile-2.2))) - (native-inputs `(("emacs" ,emacs-minimal))) + (native-inputs + `(("emacs" ,emacs-minimal) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("texinfo" ,texinfo))) (home-page "https://nongnu.org/geiser/") (synopsis "Collection of Emacs modes for Guile and Racket hacking") (description -- cgit v1.2.3 From 57f06234c7cb64a1d9c6d3fd1a9837b43b20a7eb Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Thu, 6 Feb 2020 13:10:28 -0500 Subject: gnu: Add emacs-gnus-harvest. * gnu/packages/emacs-xyz.scm (emacs-gnus-harvest): New variable. --- gnu/packages/emacs-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index aa4c37efea..664d02c6c8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21371,3 +21371,42 @@ (define-public emacs-message-x sense in the @samp{To} and @samp{Cc} headers). When in the message body, this executes a different function (default: @code{indent-relative}).") (license license:gpl2+)))) + +(define-public emacs-gnus-harvest + (let ((commit "feda071a87b799bd5d23cacde3ee71f0b166e75d") + (revision "0")) + (package + (name "emacs-gnus-harvest") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jwiegley/gnus-harvest.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08zb7vc3v3wdxkzgi902vlc5ybfvm8fxrvm5drnwfsjj9873pbcb")))) + (build-system emacs-build-system) + (inputs + `(("sqlite" ,sqlite))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'patch-exec-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((sqlite (assoc-ref inputs "sqlite")) + (file "gnus-harvest.el")) + (make-file-writable file) + (emacs-substitute-variables file + ("gnus-harvest-sqlite-program" + (string-append sqlite "/bin/sqlite3")))) + #t))))) + (home-page "https://github.com/jwiegley/gnus-harvest") + (synopsis + "Harvest email addresses from read/written Gnus articles") + (description "@code{gnus-harvest} notices email address in every message +or post you read or write, and collects them in a SQLite database, which can +be easily and quickly queried to determine the completion list. It optionally +uses BBDB and Message-X.") + (license license:gpl3+)))) -- cgit v1.2.3 From b1daba942eebf6cea1f9aab4a82027b20e29d11c Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 6 Feb 2020 12:53:57 -0800 Subject: gnu: Add python-rstr. * gnu/packages/python-xyz (python-rstr): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dcc1595446..61accf8d0d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2922,6 +2922,27 @@ (define-public python-robotframework-sshlibrary @end itemize") (license license:asl2.0))) +(define-public python-rstr + (package + (name "python-rstr") + (version "2.2.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "rstr" version)) + (sha256 + (base32 + "197dw8mbq0pjjz1l6h1ksi62vgn7x55d373ch74y06744qiq5sjx")))) + (build-system python-build-system) + (home-page + "http://bitbucket.org/leapfrogdevelopment/rstr/overview") + (synopsis "Generate random strings in Python") + (description "This package provides a python module for generating +random strings of various types. It could be useful for fuzz testing, +generating dummy data, or other applications. It has no dependencies +outside the standard library.") + (license license:bsd-3))) + (define-public python-scp (package (name "python-scp") -- cgit v1.2.3 From e68321a641d8bafd18386792f2b2ce9a57e54ce3 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 6 Feb 2020 12:55:15 -0800 Subject: gnu: Add python-nose-random. * gnu/packages/check (python-nose-random): New variable. --- gnu/packages/check.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index f9eb350ff4..fa6575173f 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2116,6 +2116,32 @@ (define-public python-rednose (define-public python2-rednose (package-with-python2 python-rednose)) +(define-public python-nose-random + (package + (name "python-nose-random") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fzumstein/nose-random") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1dvip61r2frjv35mv6mmfjc07402z73pjbndfp3mhxyjn2zhksw2")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://github.com/fzumstein/nose-random") + (synopsis "Nose plugin to facilitate randomized unit testing with +Python") + (description "Python nose-random is designed to facilitate +Monte-Carlo style unit testing. The idea is to improve testing by +running your code against a large number of randomly generated input +scenarios.") + (license license:expat))) + (define-public python-nose-randomly (package (name "python-nose-randomly") -- cgit v1.2.3 From d47c989baf5ea6ee9bb1e72718f5a103bc373c06 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 6 Feb 2020 22:04:46 +0200 Subject: gnu: Add rust-serde-0.8. * gnu/packages/crates-io.scm (rust-serde-0.8): New variable. --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 727e7c9510..45b17fa690 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10452,6 +10452,24 @@ (define-public rust-serde-1.0 "This package provides a generic serialization/deserialization framework.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-0.8 + (package + (inherit rust-serde-1.0) + (name "rust-serde") + (version "0.8.23") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1j4ajipn0sf4ya0crgcb94s848qp7mfc35n6d0q2rf8rk5skzbcx")))) + (arguments + `(#:cargo-development-inputs + (("rust-clippy" ,rust-clippy-0.0)) + #:tests? #f)))) + ;; Circular dev dependency on bincode. ;; Probably not going away: https://github.com/rust-lang/cargo/issues/4242 (define-public rust-serde-bytes-0.11 -- cgit v1.2.3 From b45bcc709b4559b689d58d821a993c7bf3754da1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 6 Feb 2020 22:05:30 +0200 Subject: gnu: Add rust-serde-test-0.8. * gnu/packages/crates-io.scm (rust-serde-test-0.8): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 45b17fa690..db631e1aab 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10614,6 +10614,29 @@ (define-public rust-serde-test-1.0 "Token De/Serializer for testing De/Serialize implementations.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-test-0.8 + (package + (inherit rust-serde-test-1.0) + (name "rust-serde-test") + (version "0.8.23") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-test" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1m939j7cgs7i58r6vxf0ffp3nbr8advr8p9dqa9w8zk0z2yks2qi")))) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-0.8)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-Cargo-toml + (lambda _ + (substitute* "Cargo.toml" + ((", path = \"../serde\"") "")) + #t))))))) + (define-public rust-serde-yaml-0.8 (package (name "rust-serde-yaml") -- cgit v1.2.3 From af4deee6cea57eacf502dd0adb2c8890fdbaf937 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 6 Feb 2020 22:06:06 +0200 Subject: gnu: Add rust-yaml-rust-0.3. * gnu/packages/crates-io.scm (rust-yaml-rust-0.3): New variable. --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index db631e1aab..87a624a825 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14237,6 +14237,24 @@ (define-public rust-yaml-rust-0.4 "The missing YAML 1.2 parser for rust.") (license (list license:asl2.0 license:expat)))) +(define-public rust-yaml-rust-0.3 + (package + (inherit rust-yaml-rust-0.4) + (name "rust-yaml-rust") + (version "0.3.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "yaml-rust" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "14m9dzwb8fb05f4jjb4nqp49rxd9c5vcmwpv3a04d2y5iphncqz6")))) + (arguments + `(#:cargo-inputs + (("rust-clippy" ,rust-clippy-0.0) + ("rust-linked-hash-map" ,rust-linked-hash-map-0.3)))))) + (define-public rust-zoneinfo-compiled-0.4 (package (name "rust-zoneinfo-compiled") -- cgit v1.2.3 From 80f45ee5ae13186f3de6cf8a8043c09317ee3673 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 6 Feb 2020 22:09:07 +0200 Subject: gnu: Add rust-linked-hash-map-0.3. * gnu/packages/crates-io.scm (rust-linked-hash-map-0.3): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 87a624a825..aee92767ff 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6827,6 +6827,25 @@ (define-public rust-linked-hash-map-0.5 (license (list license:asl2.0 license:expat)))) +(define-public rust-linked-hash-map-0.3 + (package + (inherit rust-linked-hash-map-0.5) + (name "rust-linked-hash-map") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "linked-hash-map" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1kaf95grvfqchxn8pl0854g8ab0fzl56217hndhhhz5qqm2j09kd")))) + (arguments + `(#:cargo-inputs + (("rust-clippy" ,rust-clippy-0.0) + ("rust-serde" ,rust-serde-0.8) + ("rust-serde-test" ,rust-serde-test-0.8)))))) + (define-public rust-new-debug-unreachable-1.0 (package (name "rust-new-debug-unreachable") -- cgit v1.2.3 From 9eda3ea2ee888ea954fdf63aeb4a11ba2e5bdd0c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 6 Feb 2020 22:23:37 +0200 Subject: gnu: rust-walkdir-2.2: Don't hide package. * gnu/packages/crates-io.scm (rust-walkdir-2.2)[arguments]: Add rust-same-file-1.0, rust-winapi-0.3, rust-winapi-util-0.1 to cargo-inputs. Add rust-doc-comment-0.3 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aee92767ff..0928896386 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13671,10 +13671,16 @@ (define-public rust-walkdir-2.2 (base32 "07ppalpvxkf8cnqr64np422792y4z5bs9m8b4nrflh5rm17wjn4n")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-same-file" ,rust-same-file-1.0) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-winapi-util" ,rust-winapi-util-0.1)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3)))) (home-page "https://github.com/BurntSushi/walkdir") (synopsis "Recursively walk a directory") (description "Recursively walk a directory.") - (properties '((hidden? . #t))) (license (list license:unlicense license:expat)))) -- cgit v1.2.3 From 2d03c6a4f93ab050af96283317b45fa8e947cd1a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 6 Feb 2020 22:28:42 +0200 Subject: gnu: rust-crossbeam-deque-0.6: Don't skip build. * gnu/packages/crates-io.scm (rust-crossbeam-deque-0.6)[arguments]: Don't skip build. Replace rust-crossbeam-epoch-0.8 with 0.7. Replace rust-crossbeam-utils-0.7 with 0.6. --- gnu/packages/crates-io.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0928896386..2b11879f2f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2068,7 +2068,13 @@ (define-public rust-crossbeam-deque-0.6 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "04rcpgjs6ns57vag8a3dzx26190dhbvy2l0p9n22b9p1yf64pr05")))))) + "04rcpgjs6ns57vag8a3dzx26190dhbvy2l0p9n22b9p1yf64pr05")))) + (arguments + `(#:cargo-inputs + (("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.7) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.6)))))) (define-public rust-crossbeam-epoch-0.8 (package -- cgit v1.2.3 From 5ca35cc07fd5ec8d022fbb45ac423394384a7905 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 6 Feb 2020 22:37:12 +0200 Subject: gnu: rust-syn-0.15: Don't skip build. * gnu/packages/crates-io.scm (rust-syn-0.15)[arguments]: Don't skip build. Add cargo-test-flags. In cargo-inputs replace rust-quote-1.0 with 0.6, rust-unicode-xid-0.2 with 0.1. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2b11879f2f..c2347bb4b0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11529,11 +11529,11 @@ (define-public rust-syn-0.15 (base32 "1id5g6x6zihv3j7hwrw3m1jp636bg8dpi671r7zy3jvpkavb794w")))) (arguments - `(#:skip-build? #t + `(#:cargo-test-flags '("--release" "--all-features") #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-1.0) - ("rust-unicode-xid" ,rust-unicode-xid-0.2)) + ("rust-quote" ,rust-quote-0.6) + ("rust-unicode-xid" ,rust-unicode-xid-0.1)) #:cargo-development-inputs (("rust-insta" ,rust-insta-0.8) ("rust-rayon" ,rust-rayon-1.1) -- cgit v1.2.3 From 1203fbcf0a5a76b96d41733cfe4464e4e470cde3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 6 Feb 2020 22:45:01 +0200 Subject: gnu: rust-unicase-2.4: Don't hide package. * gnu/packages/crates-io.scm (rust-unicase-2.4)[arguments]: Add rust-version-check-0.1 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c2347bb4b0..d8c2159800 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13110,11 +13110,12 @@ (define-public rust-unicase-2.4 (base32 "1xmpmkakhhblq7dzab1kwyv925kv7fqjkjsxjspg6ix9n88makm8")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-version-check" ,rust-version-check-0.1)))) (home-page "https://github.com/seanmonstar/unicase") (synopsis "Case-insensitive wrapper around strings") (description "A case-insensitive wrapper around strings.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 0773d779bba28fd4498a67c77ce038804dede8e3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 6 Feb 2020 22:51:26 +0200 Subject: gnu: rust-clap-2: Don't skip build. * gnu/packages/crates-io.scm (rust-clap-2)[arguments]: Don't skip build. Add rust-term-size-0.3 to cargo-inputs. Replace rust-yaml-rust-0.4 with 0.3. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d8c2159800..f157d9abed 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1486,17 +1486,17 @@ (define-public rust-clap-2 "1nf6ld3bims1n5vfzhkvcb55pdzh04bbhzf8nil5vvw05nxzarsh")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.11) ("rust-atty" ,rust-atty-0.2) ("rust-bitflags" ,rust-bitflags-1) ("rust-clippy" ,rust-clippy-0.0) ("rust-strsim" ,rust-strsim-0.8) + ("rust-term-size" ,rust-term-size-0.3) ("rust-textwrap" ,rust-textwrap-0.11) ("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-vec-map" ,rust-vec-map-0.8) - ("rust-yaml-rust" ,rust-yaml-rust-0.4)) + ("rust-yaml-rust" ,rust-yaml-rust-0.3)) #:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1.3) ("rust-regex" ,rust-regex-1.1) -- cgit v1.2.3 From 06d41d8d498dec2cedcb778cde50d13a5d95dc0e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 6 Feb 2020 12:54:48 -0800 Subject: gnu: Add python-jsondiff. Thanks to bavier for help with the description! * gnu/packages/python-xyz (python-jsondiff): New varaible. --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 61accf8d0d..c32b3a1a95 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1990,6 +1990,28 @@ (define-public python-jdcal (define-public python2-jdcal (package-with-python2 python-jdcal)) +(define-public python-jsondiff + (package + (name "python-jsondiff") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jsondiff" version)) + (sha256 + (base32 + "00v3689175aqzdscrxpffm712ylp8jvcpqdg51ca22ni6721p51l")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose) + ("python-nose-random" ,python-nose-random))) + (home-page + "https://github.com/fzumstein/jsondiff") + (synopsis "Compare JSON and JSON-like structures in Python") + (description "@code{jsondiff} is a Python library which lets you +compare, diff, and patch JSON and JSON-like structures in Python.") + (license license:expat))) + (define-public python-jsonschema (package (name "python-jsonschema") -- cgit v1.2.3 From f83d07f7778b699d46741a5667113342f5f0a737 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 6 Feb 2020 13:45:28 -0800 Subject: gnu: diffoscope: Update description. * gnu/packages/diffoscope (diffoscope)[description]: Mention optional dependencies. --- gnu/packages/diffoscope.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 998a71aeab..534d859812 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -217,7 +217,11 @@ (define-public diffoscope "Diffoscope tries to get to the bottom of what makes files or directories different. It recursively unpacks archives of many kinds and transforms various binary formats into more human readable forms to compare them. It can -compare two tarballs, ISO images, or PDFs just as easily.") +compare two tarballs, ISO images, or PDFs just as easily. + +Diffoscope has many optional dependencies; @code{diffoscope +--list-missing-tools guix} will display optional packages to +install.") (license license:gpl3+)))) (define-public trydiffoscope -- cgit v1.2.3 From a526320076ed906ffa0284002b296159b3fa9330 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 7 Feb 2020 11:58:30 +0100 Subject: gnu: Add sbcl-fare-quasiquote-extras. * gnu/packages/lisp-xyz.scm (sbcl-fare-quasiquote-extras): New variable. --- gnu/packages/lisp-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b97ad806ea..adabaf5bd0 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5965,6 +5965,42 @@ (define-public cl-fare-quasiquote-readtable (sbcl-package->cl-source-package sbcl-fare-quasiquote-readtable)) ;; TODO: Add support for component-less system in asdf-build-system/sbcl. +(define-public sbcl-fare-quasiquote-extras + (package + (inherit sbcl-fare-quasiquote) + (name "sbcl-fare-quasiquote-extras") + (build-system asdf-build-system/sbcl) + (inputs + `(("fare-quasiquote-optima" ,sbcl-fare-quasiquote-optima) + ("fare-quasiquote-readtable" ,sbcl-fare-quasiquote-readtable))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/" (%lisp-type)))) + (mkdir-p lib) + (install-file "fare-quasiquote-extras.asd" lib) + #t))) + (add-after 'create-asd-file 'fix-asd-file + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/" (%lisp-type))) + (asd (string-append lib "/fare-quasiquote-extras.asd"))) + (substitute* asd + ((":class") + "") + (("asdf/bundle:prebuilt-system") + "") + ((":components") + "") + (("\\(\\(:compiled-file \"fare-quasiquote-extras--system\"\\)\\)") + ""))) + #t))))) + (description "This library combines @code{fare-quasiquote-readtable} and +@code{fare-quasiquote-optima}."))) + (define-public cl-fare-quasiquote-extras (package (inherit cl-fare-quasiquote) -- cgit v1.2.3 From 8137983adfe3c3f61e583aae140a62046e859435 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 7 Feb 2020 12:00:40 +0100 Subject: gnu: sbcl-serapeum: Fix loading the library. * gnu/packages/lisp-xyz.scm (sbcl-serapeum)[inputs]: Use sbcl-fare-quasiquote-extras instead of cl-fare-quasiquote-extras. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index adabaf5bd0..af366f3985 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7193,7 +7193,7 @@ (define-public sbcl-serapeum ("trivial-garbage" ,sbcl-trivial-garbage) ("bordeaux-threads" ,sbcl-bordeaux-threads) ("named-readtables" ,sbcl-named-readtables) - ("fare-quasiquote-extras" ,cl-fare-quasiquote-extras) + ("fare-quasiquote-extras" ,sbcl-fare-quasiquote-extras) ("parse-declarations-1.0" ,sbcl-parse-declarations) ("global-vars" ,sbcl-global-vars) ("trivial-file-size" ,sbcl-trivial-file-size) -- cgit v1.2.3 From 78cb6c3420039622d3928926e4e03ee71947f26a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 7 Feb 2020 15:00:32 +0100 Subject: gnu: next: Remove fare-quasiquote-extras from inputs. * gnu/packages/web-browsers.scm (next): Remove fare-quasiquote-extras from inputs now that our serapeum package has been fixed. --- gnu/packages/web-browsers.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 1610561aec..3a54f5a50e 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -511,8 +511,7 @@ (define sbcl-next-hooks #:asd-system-name "next/hooks")) (inputs `(("alexandria" ,sbcl-alexandria) - ("serapeum" ,sbcl-serapeum) - ("fare-quasiquote-extras" ,cl-fare-quasiquote-extras))) + ("serapeum" ,sbcl-serapeum))) (native-inputs `(("trivial-features" ,sbcl-trivial-features) ("prove-asdf" ,sbcl-prove-asdf))) @@ -592,7 +591,6 @@ (define expected-fasl (string-append ("closer-mop" ,sbcl-closer-mop) ("dbus" ,cl-dbus) ("dexador" ,sbcl-dexador) - ("fare-quasiquote-extras" ,cl-fare-quasiquote-extras) ; For serapeum. Guix bug? ("ironclad" ,sbcl-ironclad) ("local-time" ,sbcl-local-time) ("log4cl" ,sbcl-log4cl) -- cgit v1.2.3 From 72b94ebf1ce71de4e31b74ce8cfab65700e226d6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 7 Feb 2020 16:03:58 +0200 Subject: gnu: rust-proc-macro2-0.4: Don't skip build. * gnu/packages/crates-io.scm (rust-proc-macro2-0.4)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f157d9abed..dd4079c822 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8467,8 +8467,7 @@ (define-public rust-proc-macro2-0.4 (base32 "0nd71fl24sys066jrha6j7i34nfkjv44yzw8yww9742wmc8j0gfg")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-unicode-xid" ,rust-unicode-xid-0.1)) #:cargo-development-inputs (("rust-quote" ,rust-quote-0.6)))))) -- cgit v1.2.3 From 6e32296e8ad22414020552a7a0a012270ccfcdd0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 7 Feb 2020 16:07:36 +0200 Subject: gnu: rust-quote-0.6: Update to 0.6.13. * gnu/packages/crates-io.scm (rust-quote-0.6): Update to 0.6.13. [arguments]: Add rust-proc-macro2-0.4 to cargo-inputs. --- gnu/packages/crates-io.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dd4079c822..894b5a85b3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8682,7 +8682,7 @@ (define-public rust-quote-0.6 (package (inherit rust-quote-1.0) (name "rust-quote") - (version "0.6.12") + (version "0.6.13") (source (origin (method url-fetch) @@ -8690,7 +8690,9 @@ (define-public rust-quote-0.6 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1nw0klza45hf127kfyrpxsxd5jw2l6h21qxalil3hkr7bnf7kx7s")))))) + "1qgqq48jymp5h4y082aanf25hrw6bpb678xh3zw993qfhxmkpqkc")))) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4)))))) (define-public rust-rand-0.7 (package -- cgit v1.2.3 From 232f344f9b9dc775fe8f9c7db2e45ba20431b071 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 7 Feb 2020 16:08:12 +0200 Subject: gnu: rust-quote-0.6: Don't hide package. * gnu/packages/crates-io.scm (rust-quote-0.6)[properties]: Don't inherit. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 894b5a85b3..d51b63675a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8692,7 +8692,8 @@ (define-public rust-quote-0.6 (base32 "1qgqq48jymp5h4y082aanf25hrw6bpb678xh3zw993qfhxmkpqkc")))) (arguments - `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4)))))) + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4)))) + (properties '()))) (define-public rust-rand-0.7 (package -- cgit v1.2.3 From 1c58aa6f0ddc0e1811633ecbabc1a02b01edc04b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 7 Feb 2020 01:34:11 +0100 Subject: gnu: lua-lgi: Use current lua package. * gnu/packages/lua.scm (make-lua-lgi): New function. (lua-lgi): (lua5.1-lgi): (lua5.2-lgi): New variables. * gnu/packages/wm.scm (awesome)[arguments]: Update LUA_PATH and LUA_CPATH. --- gnu/packages/lua.scm | 69 ++++++++++++++++++++++++++++++---------------------- gnu/packages/wm.scm | 8 +++--- 2 files changed, 44 insertions(+), 33 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index a69291ec8a..bd0d58a559 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2016 José Miguel Sánchez García ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Fis Trivial +;;; Copyright © 2020 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -338,40 +339,41 @@ (define-public lua5.1-sec (define-public lua5.2-sec (make-lua-sec "lua5.2-sec" lua-5.2)) -(define-public lua-lgi +(define (make-lua-lgi name lua) (package - (name "lua-lgi") + (name name) (version "0.9.2") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pavouk/lgi") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pavouk/lgi") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj")))) (build-system gnu-build-system) (arguments - '(#:make-flags (list "CC=gcc" - (string-append "PREFIX=" (assoc-ref %outputs "out"))) + `(#:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (delete 'configure) ; no configure script + (delete 'configure) ; no configure script (add-before 'build 'set-env (lambda* (#:key inputs #:allow-other-keys) - ;; we need to load cairo dynamically - (let* ((cairo (string-append - (assoc-ref inputs "cairo") "/lib" ))) + ;; We need to load cairo dynamically. + (let* ((cairo (string-append (assoc-ref inputs "cairo") "/lib"))) (setenv "LD_LIBRARY_PATH" cairo) #t))) (add-before 'build 'set-lua-version (lambda _ - ;; lua version and therefore install directories are hardcoded - ;; FIXME: This breaks when we update lua to >=5.3 + ;; Lua version and therefore install directories are hardcoded. (substitute* "./lgi/Makefile" - (("LUA_VERSION=5.1") "LUA_VERSION=5.2")) + (("LUA_VERSION=5.1") + (format #f + "LUA_VERSION=~a" + ,(version-major+minor (package-version lua))))) #t)) (add-before 'check 'skip-test-gtk (lambda _ @@ -392,26 +394,35 @@ (define-public lua-lgi (assoc-ref inputs "xorg-server"))) (setenv "DISPLAY" ":1") #t))))) + (native-inputs + `(("dbus" ,dbus) ;tests use 'dbus-run-session' + ("pkg-config" ,pkg-config))) (inputs - `(("gobject-introspection" ,gobject-introspection) + `(("cairo" ,cairo) ("glib" ,glib) - ("pango" ,pango) + ("gobject-introspection" ,gobject-introspection) ("gtk" ,gtk+-2) - ("lua" ,lua) - ("cairo" ,cairo) ("libffi" ,libffi) + ("lua" ,lua) + ("pango" ,pango) ("xorg-server" ,xorg-server))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("dbus" ,dbus))) ;tests use 'dbus-run-session' (home-page "https://github.com/pavouk/lgi/") (synopsis "Lua bridge to GObject based libraries") (description - "LGI is gobject-introspection based dynamic Lua binding to GObject -based libraries. It allows using GObject-based libraries directly from Lua. + "LGI is gobject-introspection based dynamic Lua binding to GObject based +libraries. It allows using GObject-based libraries directly from Lua. Notable examples are GTK+, GStreamer and Webkit.") (license license:expat))) +(define-public lua-lgi + (make-lua-lgi "lua-lgi" lua)) + +(define-public lua5.1-lgi + (make-lua-lgi "lua5.1-lgi" lua-5.1)) + +(define-public lua5.2-lgi + (make-lua-lgi "lua5.2-lgi" lua-5.2)) + (define (make-lua-lpeg name lua) (package (name name) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 52d7042806..23e2e97215 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -948,9 +948,9 @@ (define-public awesome (lua-lgi (assoc-ref inputs "lua-lgi") )) (setenv "LD_LIBRARY_PATH" cairo ) (setenv "LUA_PATH" (string-append lua-lgi - "/share/lua/5.2/?.lua")) + "/share/lua/5.3/?.lua")) (setenv "LUA_CPATH" (string-append lua-lgi - "/lib/lua/5.2/?.so")) + "/lib/lua/5.3/?.so")) #t))) (replace 'check (lambda _ @@ -974,9 +974,9 @@ (define-public awesome `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))) `("LD_LIBRARY_PATH" suffix (, cairo)) `("LUA_PATH" suffix (,(string-append lua-lgi - "/share/lua/5.2/?.lua"))) + "/share/lua/5.3/?.lua"))) `("LUA_CPATH" suffix (,(string-append - lua-lgi "/lib/lua/5.2/?.so")))))))))) + lua-lgi "/lib/lua/5.3/?.so")))))))))) (synopsis "Highly configurable window manager") (description "Awesome has been designed as a framework window manager. It is fast, small, -- cgit v1.2.3 From 1fd4b99ea888fe6118c8451b51ae46596612f90a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 7 Feb 2020 23:55:41 +0100 Subject: gnu: Add lua-penlight. * gnu/packages/lua.scm (lua-penlight): New variable. --- gnu/packages/lua.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index bd0d58a559..ee7480a852 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -35,6 +35,7 @@ (define-module (gnu packages lua) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages readline) #:use-module (gnu packages tls) @@ -339,6 +340,46 @@ (define-public lua5.1-sec (define-public lua5.2-sec (make-lua-sec "lua5.2-sec" lua-5.2)) +(define-public lua-penlight + (package + (name "lua-penlight") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Tieske/Penlight.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qc2d1riyr4b5a0gnsmdw2lz5pw65s4ac60hc34w3mmk9l6yg6nl")))) + (build-system trivial-build-system) + (inputs + `(("lua" ,lua))) + (propagated-inputs + `(("lua-filesystem" ,lua-filesystem))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((source (assoc-ref %build-inputs "source")) + (lua-version ,(version-major+minor (package-version lua))) + (destination (string-append (assoc-ref %outputs "out") + "/share/lua/" lua-version))) + (mkdir-p destination) + (with-directory-excursion source + (copy-recursively "lua/" destination))) + #t))) + (home-page "http://tieske.github.io/Penlight/") + (synopsis "Collection of general purpose libraries for the Lua language") + (description "Penlight is a set of pure Lua libraries focusing on +input data handling (such as reading configuration files), functional +programming (such as map, reduce, placeholder expressions,etc), and OS +path management. Much of the functionality is inspired by the Python +standard libraries.") + (license license:expat))) + (define (make-lua-lgi name lua) (package (name name) -- cgit v1.2.3 From 4898e06abcdfc17146b6a0640a50fdefcf4f8431 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 7 Feb 2020 23:56:36 +0100 Subject: gnu: Add lua-ldoc. * gnu/packages/lua.scm (lua-ldoc): New variable. --- gnu/packages/lua.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index ee7480a852..45e08e066a 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -380,6 +380,55 @@ (define-public lua-penlight standard libraries.") (license license:expat))) +(define-public lua-ldoc + (package + (name "lua-ldoc") + (version "1.4.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stevedonovan/LDoc.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1h0cf7bp4am54r0j8lhjs2l1c7q5vz74ba0jvw9qdbaqimls46g8")))) + (build-system gnu-build-system) + (inputs + `(("lua" ,lua))) + (propagated-inputs + `(("lua-penlight" ,lua-penlight))) + (arguments + `(#:tests? #f ;tests must run after installation. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-installation-directory + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (lua-version ,(version-major+minor (package-version lua)))) + (substitute* "makefile" + (("LUA=.*") "#\n") + (("(LUA_PREFIX=).*" _ prefix) + (string-append prefix out "\n")) + (("(LUA_BINDIR=).*" _ prefix) + (string-append prefix out "/bin\n")) + (("(LUA_SHAREDIR=).*" _ prefix) + (string-append prefix out "/share/lua/" lua-version "\n")))) + #t)) + (delete 'configure) + (add-before 'install 'create-bin-directory + (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p (string-append (assoc-ref outputs "out") "/bin")) + #t))))) + (home-page "http://stevedonovan.github.io/ldoc/") + (synopsis "Lua documentation generator") + (description + "LDoc is a LuaDoc-compatible documentation generation system for +Lua source code. It parses the declaration and documentation comments +in a set of Lua source files and produces a set of XHTML pages +describing the commented declarations and functions.") + (license license:expat))) + (define (make-lua-lgi name lua) (package (name name) -- cgit v1.2.3 From c0c1811f71e6b8629843ff430c4e7bcb793ba446 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 7 Feb 2020 23:57:00 +0100 Subject: gnu: awesome: Update to 4.3. * gnu/packages/wm.scm (awesome): Update to 4.3. [native-inputs]: Add "lua-ldoc". Re-indent code. [arguments]: Remove now unnecessary phase. --- gnu/packages/wm.scm | 193 +++++++++++++++++++++++++++++----------------------- 1 file changed, 107 insertions(+), 86 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 23e2e97215..21378d9273 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2019 Noodles! ;;; Copyright © 2019 Alexandru-Sergiu Marton +;;; Copyright © 2020 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -868,89 +869,108 @@ (define-public fluxbox (define-public awesome (package (name "awesome") - (version "4.2") + (version "4.3") (source - (origin (method url-fetch) - (uri (string-append - "https://github.com/awesomeWM/awesome-releases/raw/" - "master/awesome-" version ".tar.xz")) - (sha256 - (base32 - "0kwpbls9h1alxcmvxh5g9qb995fds5b2ngcr44w0ibazkyls2pdc")) - (modules '((guix build utils) - (srfi srfi-19))) - (snippet '(begin - ;; Remove non-reproducible timestamp and use the date - ;; of the source file instead. - (substitute* "common/version.c" - (("__DATE__ \" \" __TIME__") - (date->string - (time-utc->date - (make-time time-utc 0 - (stat:mtime (stat "awesome.c")))) - "\"~c\""))) - #t)) - (patches (search-patches "awesome-reproducible-png.patch")))) + (origin + (method url-fetch) + (uri (string-append + "https://github.com/awesomeWM/awesome-releases/raw/master/" + "awesome-" version ".tar.xz")) + (sha256 + (base32 "0lqpw401mkkmp9wgbvrmm45bqq2j9357l4irwdqv6l1305pls9kq")) + (modules '((guix build utils) + (srfi srfi-19))) + (snippet + '(begin + ;; Remove non-reproducible timestamp and use the date of + ;; the source file instead. + (substitute* "common/version.c" + (("__DATE__ \" \" __TIME__") + (date->string + (time-utc->date + (make-time time-utc 0 (stat:mtime (stat "awesome.c")))) + "\"~c\""))) + #t)) + (patches + (search-patches "awesome-reproducible-png.patch")))) (build-system cmake-build-system) - (native-inputs `(("asciidoc" ,asciidoc) - ("docbook-xsl" ,docbook-xsl) - ("doxygen" ,doxygen) - ("gperf" ,gperf) - ("imagemagick" ,imagemagick) - ("libxml2" ,libxml2) ;for XML_CATALOG_FILES - ("pkg-config" ,pkg-config) - ("xmlto" ,xmlto))) - (inputs `(("cairo" ,cairo) - ("dbus" ,dbus) - ("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) - ("gobject-introspection" ,gobject-introspection) - ("imlib2" ,imlib2) - ("libev" ,libev) - ("libxcb" ,libxcb) - ("libxcursor" ,libxcursor) - ("libxdg-basedir" ,libxdg-basedir) - ("libxkbcommon" ,libxkbcommon) - ("lua" ,lua) - ("lua-lgi" ,lua-lgi) - ("pango" ,pango) - ("startup-notification" ,startup-notification) - ("xcb-util" ,xcb-util) - ("xcb-util-cursor" ,xcb-util-cursor) - ("xcb-util-image" ,xcb-util-image) - ("xcb-util-keysyms" ,xcb-util-keysyms) - ("xcb-util-renderutil" ,xcb-util-renderutil) - ("xcb-util-xrm" ,xcb-util-xrm) - ("xcb-util-wm" ,xcb-util-wm))) + (native-inputs + `(("asciidoc" ,asciidoc) + ("docbook-xsl" ,docbook-xsl) + ("doxygen" ,doxygen) + ("gperf" ,gperf) + ("imagemagick" ,imagemagick) + ("libxml2" ,libxml2) ;for XML_CATALOG_FILES + ("lua-ldoc" ,lua-ldoc) + ("pkg-config" ,pkg-config) + ("xmlto" ,xmlto))) + (inputs + `(("cairo" ,cairo) + ("dbus" ,dbus) + ("gdk-pixbuf" ,gdk-pixbuf) + ("glib" ,glib) + ("gobject-introspection" ,gobject-introspection) + ("imlib2" ,imlib2) + ("libev" ,libev) + ("libxcb" ,libxcb) + ("libxcursor" ,libxcursor) + ("libxdg-basedir" ,libxdg-basedir) + ("libxkbcommon" ,libxkbcommon) + ("lua" ,lua) + ("lua-lgi" ,lua-lgi) + ("pango" ,pango) + ("startup-notification" ,startup-notification) + ("xcb-util" ,xcb-util) + ("xcb-util-cursor" ,xcb-util-cursor) + ("xcb-util-image" ,xcb-util-image) + ("xcb-util-keysyms" ,xcb-util-keysyms) + ("xcb-util-renderutil" ,xcb-util-renderutil) + ("xcb-util-xrm" ,xcb-util-xrm) + ("xcb-util-wm" ,xcb-util-wm))) (arguments - `(;; Let compression happen in our 'compress-documentation' phase so that - ;; '--no-name' is used, which removes timestamps from gzip output. - #:configure-flags '("-DCOMPRESS_MANPAGES=off") - - ;; Building awesome in its source dir is no longer supported. + `(#:modules ((guix build cmake-build-system) + (guix build utils) + (ice-9 match)) + ;; Let compression happen in our 'compress-documentation' phase + ;; so that '--no-name' is used, which removes timestamps from + ;; gzip output. + #:configure-flags + '("-DCOMPRESS_MANPAGES=off") + ;; Building awesome in its source directory is no longer + ;; supported. #:out-of-source? #t - #:phases (modify-phases %standard-phases - (add-before 'build 'xmlto-skip-validation - (lambda _ - ;; We can't download the necessary schema, so so skip - ;; validation and assume they're valid. - (substitute* "../build/CMakeFiles/man.dir/build.make" - (("/xmlto") - (string-append "/xmlto --skip-validation"))) - #t)) - (add-before 'configure 'set-lua-paths + (add-before 'configure 'set-paths (lambda* (#:key inputs #:allow-other-keys) - ;; The build process needs to load cairo dynamically. - (let* ((cairo (string-append - (assoc-ref inputs "cairo") "/lib" )) - (lua-lgi (assoc-ref inputs "lua-lgi") )) - (setenv "LD_LIBRARY_PATH" cairo ) - (setenv "LUA_PATH" (string-append lua-lgi - "/share/lua/5.3/?.lua")) - (setenv "LUA_CPATH" (string-append lua-lgi - "/lib/lua/5.3/?.so")) + ;; The build process needs to load Cairo dynamically. + (let* ((cairo (string-append (assoc-ref inputs "cairo") "/lib")) + (lua-version ,(version-major+minor (package-version lua))) + (lua-dependencies + (filter (match-lambda + ((label . _) (string-prefix? "lua-" label))) + inputs)) + (lua-path + (string-join + (map (match-lambda + ((_ . dir) + (string-append + dir "/share/lua/" lua-version "/?.lua;" + dir "/share/lua/" lua-version "/?/?.lua"))) + lua-dependencies) + ";")) + (lua-cpath + (string-join + (map (match-lambda + ((_ . dir) + (string-append + dir "/lib/lua/" lua-version "/?.so;" + dir "/lib/lua/" lua-version "/?/?.so"))) + lua-dependencies) + ";"))) + (setenv "LD_LIBRARY_PATH" cairo) + (setenv "LUA_PATH" (string-append "?.lua;" lua-path)) + (setenv "LUA_CPATH" lua-cpath) #t))) (replace 'check (lambda _ @@ -967,22 +987,23 @@ (define-public awesome (add-after 'install 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((awesome (assoc-ref outputs "out")) - (cairo (string-append - (assoc-ref inputs "cairo") "/lib" )) - (lua-lgi (assoc-ref inputs "lua-lgi") )) + (cairo (string-append (assoc-ref inputs "cairo") "/lib")) + (lua-version ,(version-major+minor (package-version lua))) + (lua-lgi (assoc-ref inputs "lua-lgi"))) (wrap-program (string-append awesome "/bin/awesome") + `("LUA_PATH" suffix + (,(format #f "~a/share/lua/~a/?.lua" lua-lgi lua-version))) + `("LUA_CPATH" suffix + (,(format #f "~a/lib/lua/~a/?.so" lua-lgi lua-version))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))) - `("LD_LIBRARY_PATH" suffix (, cairo)) - `("LUA_PATH" suffix (,(string-append lua-lgi - "/share/lua/5.3/?.lua"))) - `("LUA_CPATH" suffix (,(string-append - lua-lgi "/lib/lua/5.3/?.so")))))))))) + `("LD_LIBRARY_PATH" suffix (,cairo))) + #t)))))) + (home-page "https://awesomewm.org/") (synopsis "Highly configurable window manager") (description "Awesome has been designed as a framework window manager. It is fast, small, dynamic and extensible using the Lua programming language.") - (license license:gpl2+) - (home-page "https://awesomewm.org/"))) + (license license:gpl2+))) (define-public menumaker (package -- cgit v1.2.3 From d9e2f7b284f124b48b9fee150a3c06b5e0170049 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Tue, 4 Feb 2020 20:31:49 -0500 Subject: gnu: Add pasystray. * gnu/packages/pulseaudio.scm (pasystray): New variable. Signed-off-by: Leo Famulari --- gnu/packages/pulseaudio.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 2bbe6c5bdd..0c09b51744 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -42,6 +42,7 @@ (define-module (gnu packages pulseaudio) #:use-module (gnu packages check) #:use-module (gnu packages dbm) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages libcanberra) #:use-module (gnu packages web) @@ -402,3 +403,42 @@ (define-public pamixer "pamixer is like amixer but for PulseAudio, allowing easy control of the volume levels of the sinks (get, set, decrease, increase, toggle mute, etc).") (license l:gpl3+))) + +(define-public pasystray + (package + (name "pasystray") + (version "0.7.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/christophgysin/pasystray.git") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xx1bm9kimgq11a359ikabdndqg5q54pn1d1dyyjnrj0s41168fk")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'bootstrap 'remove-bootstrap.sh + (lambda _ + ;; Interferes with the bootstrap phase. + (delete-file "bootstrap.sh") + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("avahi" ,avahi) + ("gtk+" ,gtk+) + ("libnotify" ,libnotify) + ("libx11" ,libx11) + ("pulseaudio" ,pulseaudio))) + (home-page "https://github.com/christophgysin/pasystray") + (synopsis "PulseAudio controller for the system tray") + (description "@command{pasystray} enables control of various +PulseAudio server settings from the X11 system tray. See the project +README.md for a detailed list of features.") + (license l:lgpl2.1+))) -- cgit v1.2.3 From c526ddf482618edd22d0ad852e13f63c0477bb77 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 7 Feb 2020 16:06:17 -0800 Subject: gnu: Add reprotest. Added to diffoscope, to avoid triggering #37346. * gnu/packages/diffoscope (reprotest): New variable. * gnu/packages/patches/reprotest-support-guix.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. --- gnu/local.mk | 1 + gnu/packages/diffoscope.scm | 68 +++++++++++++++++++ gnu/packages/patches/reprotest-support-guix.patch | 79 +++++++++++++++++++++++ 3 files changed, 148 insertions(+) create mode 100644 gnu/packages/patches/reprotest-support-guix.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index f105f11913..64ad653542 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1363,6 +1363,7 @@ dist_patch_DATA = \ %D%/packages/patches/readline-link-ncurses.patch \ %D%/packages/patches/readline-6.2-CVE-2014-2524.patch \ %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \ + %D%/packages/patches/reprotest-support-guix.patch \ %D%/packages/patches/ri-li-modernize_cpp.patch \ %D%/packages/patches/ripperx-missing-file.patch \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 534d859812..3b3540b5b0 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -44,6 +44,7 @@ (define-module (gnu packages diffoscope) #:use-module (gnu packages java) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) + #:use-module (gnu packages man) #:use-module (gnu packages mono) #:use-module (gnu packages ocaml) #:use-module (gnu packages package-management) @@ -224,6 +225,73 @@ (define-public diffoscope install.") (license license:gpl3+)))) +(define-public reprotest + (package + (name "reprotest") + (version "0.7.13") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/reproducible-builds/reprotest.git") + (commit version))) + (file-name (git-file-name name version)) + (patches (search-patches "reprotest-support-guix.patch")) + (sha256 + (base32 + "0jj9sqxbdpypnc0y8md352wwzh1by6nyhmx5fwqnvrbznrng332f")))) + (inputs + `(("python-debian" ,python-debian) + ("python-distro" ,python-distro) + ("python-libarchive-c", python-libarchive-c) + ("python-rstr" ,python-rstr))) + (native-inputs + `(("diffoscope" ,diffoscope) + ("help2man" ,help2man) + ("libfaketime" ,libfaketime) + ("python-coverage" ,python-coverage) + ("python-docutils" ,python-docutils) + ("python-pytest " ,python-pytest) + ("python-tlsh" ,python-tlsh) + ("python-tox" ,python-tox) + ("unzip" ,unzip) + ("xxd" ,xxd))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Neither glibc-locales nor glibc-utf8-locales have the C.UTF-8 + ;; locale or several other locales used in reprotest. + (add-after 'unpack 'adjust-locales + (lambda _ + (substitute* "reprotest/build.py" + (("'C.UTF-8'") "'en_US.UTF-8'") + (("'ru_RU.CP1251'") "'ru_RU.KOI8-R'") + (("'kk_KZ.RK1048'") "'kk_KZ'")) + (substitute* "reprotest/lib/adt_testbed.py" + (("export LANG=C.UTF-8") "export LANG=en_US.UTF-8")) + #t)) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((mandir1 (string-append + (assoc-ref outputs "out") "/share/man/man1")) + (docdir (string-append + (assoc-ref outputs "out") "/share/doc/" ,name "-" ,version))) + (invoke "make" "-C" "doc") + (mkdir-p mandir1) + (install-file "doc/reprotest.1" mandir1) + (mkdir-p docdir) + (install-file "./README.rst" docdir) + (install-file "./README-dev.rst" docdir)) + #t))))) + (home-page "https://salsa.debian.org/reproducible-builds/reprotest") + (synopsis "Build software and check it for reproducibility") + (description "Reprotest builds the same source code twice in different +environments, and then checks the binaries produced by each build for +differences. If any are found, then diffoscope or diff is used to display +them in detail for later analysis.") + (license (list license:gpl3+ license:gpl2+)))) + (define-public trydiffoscope (package (name "trydiffoscope") diff --git a/gnu/packages/patches/reprotest-support-guix.patch b/gnu/packages/patches/reprotest-support-guix.patch new file mode 100644 index 0000000000..621c4e3359 --- /dev/null +++ b/gnu/packages/patches/reprotest-support-guix.patch @@ -0,0 +1,79 @@ +From 31bd4fe777cbff3ebca74115e5735a8b8f584fa7 Mon Sep 17 00:00:00 2001 +From: Vagrant Cascadian +Date: Thu, 6 Feb 2020 23:17:58 -0800 +Subject: [PATCH] Add support for GNU Guix. + +--- + reprotest/lib/adt_testbed.py | 2 ++ + reprotest/lib/system_interface/guix.py | 39 ++++++++++++++++++++++++++ + 2 files changed, 41 insertions(+) + create mode 100644 reprotest/lib/system_interface/guix.py + +diff --git a/reprotest/lib/adt_testbed.py b/reprotest/lib/adt_testbed.py +index ef704d6..60bf763 100644 +--- a/reprotest/lib/adt_testbed.py ++++ b/reprotest/lib/adt_testbed.py +@@ -40,6 +40,7 @@ import urllib.parse + from reprotest.lib.system_interface.debian import DebianInterface + from reprotest.lib.system_interface.arch import ArchInterface + from reprotest.lib.system_interface.fedora import FedoraInterface ++from reprotest.lib.system_interface.guix import GuixInterface + from reprotest.lib import adtlog + from reprotest.lib import VirtSubproc + +@@ -47,6 +48,7 @@ SYSTEM_INTERFACES = { + 'debian': DebianInterface, + 'arch': ArchInterface, + 'fedora': FedoraInterface, ++ 'guix': GuixInterface, + } + + timeouts = { +diff --git a/reprotest/lib/system_interface/guix.py b/reprotest/lib/system_interface/guix.py +new file mode 100644 +index 0000000..2b06104 +--- /dev/null ++++ b/reprotest/lib/system_interface/guix.py +@@ -0,0 +1,39 @@ ++# adt_testbed.py is part of autopkgtest ++# autopkgtest is a tool for testing Debian binary packages. The ++# system_interface module is an addition for reprotest to make ++# this module distro-agnostic ++# ++# autopkgtest is Copyright (C) 2006-2015 Canonical Ltd. ++# the system_interface module is Copyright (C) 2017 Santiago Torres-Arias ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++# ++# See the file CREDITS for a full list of credits information (often ++# installed as /usr/share/doc/autopkgtest/CREDITS). ++import subprocess ++ ++from . import SystemInterface ++ ++class GuixInterface(SystemInterface): ++ """ ++ SystemInterface implementation for GNU Guix hosts. Contains commands that ++ are specific to the GNU Guix toolchain. ++ """ ++ ++ def get_arch(self): ++ return ['uname', '-m'] ++ ++ def can_query_packages(self): ++ return False +-- +2.20.1 + -- cgit v1.2.3 From f6a2a5cc9c614afda4e3c19fcd17f571e384137b Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 7 Feb 2020 23:00:33 -0600 Subject: gnu: git-flow: Update to 1.12.3. * gnu/packages/version-control.scm (git-flow): Update to 1.12.3. [source]: Use maintained fork. --- gnu/packages/version-control.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 20db6b4b08..57cc18114c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1007,16 +1007,16 @@ (define-public git-flow (name "git-flow") ;; This version has not be officially released yet, so we build it ;; directly from the git repository. - (version "0.4.2-pre") + (version "1.12.3") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nvie/gitflow/") - (commit "15aab26490facf285acef56cb5d61025eacb3a69"))) + (url "https://github.com/petervanderdoes/gitflow-avh/") + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "01fs97q76fdfnvmrh2cyjhywcs3pykf1dg58sy0frflnsdzs6prx")))) + "13q4mnrxr03wz2dkhzy73j384g299m4d545cnhxcaznvdwfany4h")))) (build-system gnu-build-system) (inputs `(("shflags" ,shflags))) (arguments -- cgit v1.2.3 From da09cd16a288b9afe92416a18edd6d7c3d251737 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 7 Feb 2020 23:48:37 -0600 Subject: gnu: parallel: Update to 20200122. * gnu/packages/parallel.scm (parallel): Update to 20200122. --- gnu/packages/parallel.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 5bed372432..f1060bb66b 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014 Eric Bavier +;;; Copyright © 2013, 2014, 2020 Eric Bavier ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Pjotr Prins @@ -54,14 +54,14 @@ (define-module (gnu packages parallel) (define-public parallel (package (name "parallel") - (version "20191222") + (version "20200122") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "0xvw578440s9cc382n7z2l8npj30nwr6wwmkyxn2pj1pcszfjagy")))) + (base32 "070cv3b1ja8lmn2a5h1ry6b5y35jpm4z5r9yv9nb5kd5im11wvqi")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From ba7cbae3086fad28c33a5ee8094b453d0742eb33 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 8 Feb 2020 15:00:23 +0100 Subject: gnu: Add ghc-doclayout. * gnu/packages/haskell-xyz.scm (ghc-doclayout): New variable. --- gnu/packages/haskell-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index af940f02fc..93b778be21 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 JoJo +;;; Copyright © 2020 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -8165,6 +8166,33 @@ (define-public ghc-optparse-applicative command line options in Haskell.") (license license:bsd-3))) +(define-public ghc-doclayout + (package + (name "ghc-doclayout") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/doclayout/" + "doclayout-" version ".tar.gz")) + (sha256 + (base32 "1wmnwq28jcyd6c80srivsnd5znmyl9sgmwwnlk2crwiiwqadbal7")))) + (build-system haskell-build-system) + (inputs + `(("ghc-safe" ,ghc-safe))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-golden" ,ghc-tasty-golden) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page "https://github.com/jgm/doclayout") + (synopsis "Pretty-printing library for laying out text documents") + (description + "doclayout is a pretty-printing library for laying out text documents, +with several features not present in pretty-printing libraries designed for +code. It was designed for use in @code{Pandoc}.") + (license license:bsd-3))) + (define-public ghc-pandoc (package (name "ghc-pandoc") -- cgit v1.2.3 From 206907719d43518009e8ff880e58491727047edf Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 8 Feb 2020 15:02:54 +0100 Subject: gnu: Add ghc-emojis. * gnu/packages/haskell-xyz.scm (ghc-emojis): New variable. --- gnu/packages/haskell-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 93b778be21..ca44ebb1aa 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8166,6 +8166,39 @@ (define-public ghc-optparse-applicative command line options in Haskell.") (license license:bsd-3))) +(define-public ghc-emojis + (package + (name "ghc-emojis") + (version "0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/emojis/" + "emojis-" version ".tar.gz")) + (sha256 + (base32 "1c6zkj9gmk1y90gbdrn50hyp7mw1mggzhnr2khqd728ryipw60ss")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-hunit" ,ghc-hunit))) + (home-page "https://github.com/jgm/emojis#readme") + (synopsis "Conversion between emoji characters and their names.") + (description + "This package provides functions for converting emoji names to emoji +characters and vice versa. + +How does it differ from the @code{emoji} package? +@itemize +@item It supports a fuller range of emojis, including all those supported by +GitHub +@item It supports lookup of emoji aliases from emoji +@item It uses Text rather than String +@item It has a lighter dependency footprint: in particular, it does not +require aeson +@item It does not require TemplateHaskell +@end itemize") + (license license:bsd-3))) + (define-public ghc-doclayout (package (name "ghc-doclayout") -- cgit v1.2.3 From d56c8120277ed9ad0b6cf6eb1183f918590c8259 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 8 Feb 2020 15:05:29 +0100 Subject: gnu: Add ghc-jira-wiki-markup. * gnu/packages/haskell-xyz.scm (ghc-jira-wiki-markup): New variable. --- gnu/packages/haskell-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index ca44ebb1aa..1a70ef4587 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8166,6 +8166,29 @@ (define-public ghc-optparse-applicative command line options in Haskell.") (license license:bsd-3))) +(define-public ghc-jira-wiki-markup + (package + (name "ghc-jira-wiki-markup") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/jira-wiki-markup/" + "jira-wiki-markup-" version ".tar.gz")) + (sha256 + (base32 "1sl2jjcsqg61si33mxjwpf8zdn56kbbgcwqqqzbgifx2qbv4wmf8")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page "https://github.com/tarleb/jira-wiki-markup") + (synopsis "Handle Jira wiki markup") + (description + "Parse jira wiki text into an abstract syntax tree for easy transformation +to other formats.") + (license license:expat))) + (define-public ghc-emojis (package (name "ghc-emojis") -- cgit v1.2.3 From e90a06fcc55b6bef68e8fed88eebed403058f55c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 8 Feb 2020 15:07:22 +0100 Subject: gnu: Add ghc-text-conversions. * gnu/packages/haskell-xyz.scm (ghc-text-conversions): New variable. --- gnu/packages/haskell-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 1a70ef4587..ea9efe70fd 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8222,6 +8222,31 @@ (define-public ghc-emojis @end itemize") (license license:bsd-3))) +(define-public ghc-text-conversions + (package + (name "ghc-text-conversions") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/text-conversions/" + "text-conversions-" version ".tar.gz")) + (sha256 + (base32 "089c56vdj9xysqfr1hnvbnrghlg83q6w10xk02gflpsidcpvwmhp")))) + (build-system haskell-build-system) + (inputs + `(("ghc-base16-bytestring" ,ghc-base16-bytestring) + ("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-errors" ,ghc-errors))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-hspec-discover" ,ghc-hspec-discover))) + (home-page "https://github.com/cjdev/text-conversions#readme") + (synopsis "Safe conversions between textual types") + (description "Safe conversions between textual types") + (license license:isc))) + (define-public ghc-doclayout (package (name "ghc-doclayout") -- cgit v1.2.3 From a60448edcc85faa8b3cd4bd3ae8a336c842aad4d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 8 Feb 2020 15:17:15 +0100 Subject: gnu: Add ghc-hspec-discover. * gnu/packages/haskell-check.scm (ghc-hspec-discover): New variable. --- gnu/packages/haskell-check.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index c6e89460ea..0dae620119 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Tonton ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2019 Timothy Sample +;;; Copyright © 2020 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -772,6 +773,29 @@ (define-public ghc-hspec-contrib "This package provides contributed Hspec extensions.") (license license:expat))) +(define-public ghc-hspec-discover + (package + (name "ghc-hspec-discover") + (version "2.7.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/hspec-discover/" + "hspec-discover-" version ".tar.gz")) + (sha256 + (base32 "0r47fm94wa6qrhp8cc1zzkjrxc32rnagfn9m9ga4dm6p6ydw4c8b")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hspec-meta" ,ghc-hspec-meta))) + (home-page "http://hspec.github.io/") + (synopsis "Automatically discover and run Hspec tests") + (description + "Automatically discover and run Hspec tests. See +@url{http://hspec.github.io/hspec-discover.html}.") + (license license:expat))) + (define-public ghc-hspec-expectations (package (name "ghc-hspec-expectations") -- cgit v1.2.3 From 6b40dbff7de4b51c558340670e8ee62fa0c919ec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 8 Feb 2020 17:56:43 +0100 Subject: gnu: sbcl-static-vectors: Change dubious home page. * gnu/packages/lisp-xyz.scm (sbcl-static-vectors)[home-page]: Disbelieve copy-pasted GitHub blurb, which never even worked due to a typo. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index af366f3985..d361c7d5ab 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4120,7 +4120,7 @@ (define-public sbcl-static-vectors `(("sbcl-cffi-grovel" ,sbcl-cffi-grovel) ("sbcl-cffi" ,sbcl-cffi))) (build-system asdf-build-system/sbcl) - (home-page "http://common-lisp.net/projects/iolib/") + (home-page "https://github.com/sionescu/static-vectors") (synopsis "Allocate SIMPLE-ARRAYs in static memory") (description "With @code{static-vectors}, you can create vectors allocated in static -- cgit v1.2.3 From 56bae7f380cf37d3a1747f23cbf236e19298456b Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Sat, 8 Feb 2020 14:16:21 +0100 Subject: gnu: kitty: Update ot 0.16.0. * gnu/packages/terminals.scm (kitty): Update to 0.16.0. --- gnu/packages/terminals.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index dae14aee8f..8773f1969f 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -935,7 +935,7 @@ (define-public tmate (define-public kitty (package (name "kitty") - (version "0.14.6") + (version "0.16.0") (home-page "https://sw.kovidgoyal.net/kitty/") (source (origin @@ -945,7 +945,7 @@ (define-public kitty (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1rb5ys9xsdhd2qa3kz5gqzz111c6b14za98va6hlglk69wqlmb51")) + (base32 "1bszyddar0g1gdz67h8rd3gbrdhi6ahjg7j14cjiqxm1938z9ajf")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 5b37b6d9d0e0818b65bf64303709aa5d1ecad70a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 8 Feb 2020 21:06:27 +0200 Subject: gnu: rust-error-chain-0.12: Fix dependencies. * gnu/packages/crates-io.scm (rust-error-chain-0.12)[arguments]: Remove rust-version-check-0.9 from cargo-development-inputs. Add rust-version-check-0.1 to cargo-inputs. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d51b63675a..314effa492 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3286,9 +3286,8 @@ (define-public rust-error-chain-0.12 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-backtrace" ,rust-backtrace-0.3)) - #:cargo-development-inputs - (("rust-version-check" ,rust-version-check-0.9)))) + (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-version-check" ,rust-version-check-0.1)))) (home-page "https://github.com/rust-lang-nursery/error-chain") (synopsis "Yet another error boilerplate library") (description -- cgit v1.2.3 From 751d6a8b8a0a24148477127e7492c02ac474bce5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 8 Feb 2020 20:55:34 +0200 Subject: gnu: Add rust-sysctl-0.1. * gnu/packages/crates-io.scm (rust-sysctl-0.1): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 314effa492..2e04ef1517 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11621,6 +11621,27 @@ (define-public rust-sysctl-0.4 "Simplified interface to libc::sysctl.") (license license:expat))) +(define-public rust-sysctl-0.1 + (package + (inherit rust-sysctl-0.4) + (name "rust-sysctl") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "sysctl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "10wxlk4nkzlxp4fg435jmdmfwl4hy0y4w2rcsgs634lvbp8pgksb")))) + (arguments + `(#:skip-build? #t ; Unsupported on Linux. + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-errno" ,rust-errno-0.2) + ("rust-libc" ,rust-libc-0.2)))))) + (define-public rust-tar-0.4 (package (name "rust-tar") -- cgit v1.2.3 From 4f105bbcd10c222a8fd4a67e33026126d55b0814 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 21 Jan 2020 10:10:29 -0800 Subject: gnu: Add rust-nix-0.14. * gnu/packages/crates-io.scm (rust-nix-0.14): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2e04ef1517..3e651e808d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6938,6 +6938,36 @@ (define-public rust-no-panic-0.1 prove a function can't ever panic.") (license (list license:expat license:asl2.0)))) +(define-public rust-nix-0.14 + (package + (inherit rust-nix-0.15) + (name "rust-nix") + (version "0.14.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "nix" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1kmxdlmvnmq8cfpmr3g6wk37rwi2ybdvp1z6z3831m1p23p2nwkc")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cc" ,rust-cc-1.0) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-void" ,rust-void-1.0)) + #:cargo-development-inputs + (("rust-bytes" ,rust-bytes-0.4) + ("rust-caps" ,rust-caps-0.3) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-rand" ,rust-rand-0.6) + ("rust-sysctl" ,rust-sysctl-0.1) + ("rust-tempfile" ,rust-tempfile-3.0)))))) + (define-public rust-nodrop-0.1 (package (name "rust-nodrop") -- cgit v1.2.3 From 167d786812ea5cd6684d80f0b5347537985944a7 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 21 Jan 2020 09:26:05 -0800 Subject: gnu: Add rust-ctrlc-3.1. * gnu/packages/crates-io.scm (rust-ctrlc-3.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3e651e808d..e052a3797c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2292,6 +2292,32 @@ (define-public rust-csv-core-0.1 "Bare bones CSV parsing with no_std support.") (license (list license:unlicense license:expat)))) +(define-public rust-ctrlc-3.1 + (package + (name "rust-ctrlc") + (version "3.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "ctrlc" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0zz8ad4bk28s111af5vy1c5kii4zw0cgh87ivzgj28f8nkcd5py7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nix" ,rust-nix-0.14) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/Detegr/rust-ctrlc") + (synopsis "Easy Ctrl-C handler for Rust projects") + (description + "This package provides an easy Ctrl-C handler for Rust projects.") + (license (list license:expat license:asl2.0)))) + (define-public rust-curl-sys-0.4 (package (name "rust-curl-sys") -- cgit v1.2.3 From 2484eea58cde9c8d836a5f4dbc6118aade2de882 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 21 Jan 2020 09:28:49 -0800 Subject: gnu: Add rust-lscolors-0.6. * gnu/packages/crates-io.scm (rust-lscolors-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e052a3797c..a43f0975f4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6877,6 +6877,31 @@ (define-public rust-linked-hash-map-0.3 ("rust-serde" ,rust-serde-0.8) ("rust-serde-test" ,rust-serde-test-0.8)))))) +(define-public rust-lscolors-0.6 + (package + (name "rust-lscolors") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "lscolors" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0jxsgkn378kxkiqdshdjdclw5wwp2xaz45cqd3yw85fhn8a38fza")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-ansi-term" ,rust-ansi-term-0.12)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.1)))) + (home-page "https://github.com/sharkdp/lscolors") + (synopsis "Colorize paths using the LS_COLORS environment variable") + (description + "Colorize paths using the LS_COLORS environment variable.") + (license (list license:expat license:asl2.0)))) + (define-public rust-new-debug-unreachable-1.0 (package (name "rust-new-debug-unreachable") -- cgit v1.2.3 From af51fb8e4d4765ce332841bdd679dad1981d3902 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 21 Jan 2020 09:55:21 -0800 Subject: gnu: rust-regex-1.1: Update to 1.1.9. * gnu/packages/crates-io.scm (rust-regex-1.1): Update it. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a43f0975f4..a4fde80d4a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9679,7 +9679,7 @@ (define-public rust-regex-1.1 (package (inherit rust-regex-1.3) (name "rust-regex") - (version "1.1.7") + (version "1.1.9") (source (origin (method url-fetch) @@ -9688,7 +9688,7 @@ (define-public rust-regex-1.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1pabajpp0wzb7dm2x32gy8w7k0mwykr6zsvzn0fgpr6pww40hbqb")))) + "1ba47ivq8l1yikiwikjnq5barag6iqfgcpxlz2263fqbq9y2kn6r")))) (arguments `(#:skip-build? #t #:cargo-inputs @@ -9701,7 +9701,7 @@ (define-public rust-regex-1.1 (("rust-doc-comment" ,rust-doc-comment-0.3) ("rust-lazy-static" ,rust-lazy-static-1.3) ("rust-quickcheck" ,rust-quickcheck-0.8) - ("rust-rand" ,rust-rand-0.4)))))) + ("rust-rand" ,rust-rand-0.6)))))) (define-public rust-regex-0.2 (package -- cgit v1.2.3 From e45242abe23c9e26d47bd780114b0c41f3070c3f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 8 Feb 2020 20:34:33 +0200 Subject: gnu: rust-regex-1.1: Don't skip build. * gnu/packages/crates-io.scm (rust-regex-1.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a4fde80d4a..fa2960c3aa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9690,8 +9690,7 @@ (define-public rust-regex-1.1 (base32 "1ba47ivq8l1yikiwikjnq5barag6iqfgcpxlz2263fqbq9y2kn6r")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-aho-corasick" ,rust-aho-corasick-0.7) ("rust-memchr" ,rust-memchr-2.2) ("rust-regex-syntax" ,rust-regex-syntax-0.6) -- cgit v1.2.3 From 0f7720d1b0dac63a12a67c37aed394151996e23e Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 21 Jan 2020 09:33:33 -0800 Subject: gnu: Add fd. * gnu/packages/crates-io.scm (fd): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/rust-apps.scm | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 5b61cdc542..e7e28901d0 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -24,6 +24,7 @@ (define-module (gnu packages rust-apps) #:use-module (guix packages) #:use-module (gnu packages compression) #:use-module (gnu packages crates-io) + #:use-module (gnu packages jemalloc) #:use-module (gnu packages pkg-config) #:use-module (gnu packages tls) #:use-module (gnu packages version-control)) @@ -125,6 +126,76 @@ (define-public exa also knows about symlinks, extended attributes, and Git.") (license license:expat))) +(define-public fd + (package + (name "fd") + (version "7.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "fd-find" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "147m872zff0srwq9vaxkkbab06g3fkklbk1g2lx90vdhgs37f5xj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-atty" ,rust-atty-0.2) + ("rust-clap" ,rust-clap-2) + ("rust-ctrlc" ,rust-ctrlc-3.1) + ("rust-globset" ,rust-globset-0.4) + ("rust-humantime" ,rust-humantime-1.3) + ("rust-ignore" ,rust-ignore-0.4) + ("rust-jemallocator" ,rust-jemallocator-0.3) + ("rust-lazy-static" ,rust-lazy-static-1.4) + ("rust-libc" ,rust-libc-0.2) + ("rust-lscolors" ,rust-lscolors-0.6) + ("rust-num-cpus" ,rust-num-cpus-1.10) + ("rust-regex" ,rust-regex-1.3) + ("rust-regex-syntax" ,rust-regex-syntax-0.6) + ("rust-version-check" ,rust-version-check-0.9)) + #:cargo-development-inputs + (("rust-diff" ,rust-diff-0.1) + ("rust-filetime" ,rust-filetime-0.2) + ("rust-tempdir" ,rust-tempdir-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'override-jemalloc + (lambda* (#:key inputs #:allow-other-keys) + (let ((jemalloc (assoc-ref inputs "jemalloc"))) + (setenv "JEMALLOC_OVERRIDE" + (string-append jemalloc "/lib/libjemalloc.so"))) + #t)) + (add-after 'install 'install-extra + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (install-completion + (lambda (completion out-dir) + (for-each + (lambda (f) + (install-file f (string-append out out-dir))) + (find-files "target/release/build/" completion))))) + ;; Manpages + (install-file "doc/fd.1" (string-append out "/share/man/man1")) + ;; Completions + (install-completion "^fd.bash$" "/etc/bash-completion.d") + (install-completion "^fd.fish$" "/share/fish/vendor_completions.d") + (install-completion "^_fd$" "/share/zsh/site-functions") + (rename-file (string-append out "/etc/bash-completion.d/fd.bash") + (string-append out "/etc/bash-completion.d/fd")) + #t)))))) + (inputs `(("jemalloc" ,jemalloc))) + (home-page "https://github.com/sharkdp/fd") + (synopsis "Simple, fast and user-friendly alternative to find") + (description + "@code{fd} is a simple, fast and user-friendly alternative to @code{find}. +While it does not seek to mirror all of find's powerful functionality, it +provides defaults for 80% of the use cases.") + (license (list license:expat license:asl2.0)))) + (define-public ripgrep (package (name "ripgrep") -- cgit v1.2.3 From c5ee55d347e6b4698d6bd1c219dc527e64086c04 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 8 Feb 2020 21:16:45 +0200 Subject: gnu: rust-itoa-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-itoa-0.1)[arguments]: Don't inherit. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fa2960c3aa..59116a287b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5415,7 +5415,8 @@ (define-public rust-itoa-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "18g7p2hrb3dk84z3frfgmszfc9hjb4ps9vp99qlb1kmf9gm8hc5f")))))) + "18g7p2hrb3dk84z3frfgmszfc9hjb4ps9vp99qlb1kmf9gm8hc5f")))) + (arguments '()))) (define-public rust-jobserver-0.1 (package -- cgit v1.2.3 From 8b0e09d260104a04d565e5784b34c8ac0afa866e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 8 Feb 2020 21:17:38 +0200 Subject: gnu: rust-itoa-0.4: Don't skip build. * gnu/packages/crates-io.scm (rust-itoa-0.4)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 59116a287b..a67412665c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5395,7 +5395,6 @@ (define-public rust-itoa-0.4 (base32 "0zvg2d9qv3avhf3d8ggglh6fdyw8kkwqg3r4622ly5yhxnvnc4jh")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) (home-page "https://github.com/dtolnay/itoa") (synopsis "Fast functions for printing integer primitives") (description "This crate provides fast functions for printing integer @@ -5415,8 +5414,7 @@ (define-public rust-itoa-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "18g7p2hrb3dk84z3frfgmszfc9hjb4ps9vp99qlb1kmf9gm8hc5f")))) - (arguments '()))) + "18g7p2hrb3dk84z3frfgmszfc9hjb4ps9vp99qlb1kmf9gm8hc5f")))))) (define-public rust-jobserver-0.1 (package -- cgit v1.2.3 From 08a29ff201c2444f19a75c31789f3791f310671d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 8 Feb 2020 21:22:33 +0200 Subject: gnu: rust-jobserver-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-jobserver-0.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a67412665c..781769c514 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5431,8 +5431,7 @@ (define-public rust-jobserver-0.1 "1q2w80v8p2pbfm8ayhjs6zi11a1hp4535z4ck8kg872z8ldnrc37")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)) #:cargo-development-inputs (("rust-futures" ,rust-futures-0.1) -- cgit v1.2.3 From 7e25e54cb233b633c0b3498053a2dc95eb62af87 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 8 Feb 2020 21:32:47 +0200 Subject: gnu: rust-lazy-static-1.3: Don't skip build. * gnu/packages/crates-io.scm (rust-lazy-static-1.3)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 781769c514..c65c0a5e07 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5656,8 +5656,7 @@ (define-public rust-lazy-static-1.3 (base32 "052ac27w189hrf1j3hz7sga46rp84zl2hqnzyihxv78mgzr2jmxw")))) (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-spin" ,rust-spin-0.5)))))) + `(#:cargo-inputs (("rust-spin" ,rust-spin-0.5)))))) (define-public rust-lazycell-1.2 (package -- cgit v1.2.3 From 728aa0f546353a676b0bbc8838bfcf744cd03170 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 8 Feb 2020 21:33:20 +0200 Subject: gnu: rust-lazy-static-1.4: Don't skip build. * gnu/packages/crates-io.scm (rust-lazy-static-1.4)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c65c0a5e07..b64f5a9a6f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5627,8 +5627,7 @@ (define-public rust-lazy-static-1.4 "0in6ikhw8mgl33wjv6q6xfrb5b9jr16q8ygjy803fay4zcisvaz2")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-spin" ,rust-spin-0.5)) + `(#:cargo-inputs (("rust-spin" ,rust-spin-0.5)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)))) (home-page "https://github.com/rust-lang-nursery/lazy-static.rs") -- cgit v1.2.3 From 2f841254c5ef2aa3e5655df879a1249065fa1e14 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 7 Feb 2020 22:23:16 +0100 Subject: gnu: rust-regex-syntax: Update to 0.6.14. * gnu/packages/crates-io.scm (rust-regex-syntax-0.6): Update to 0.6.14. [arguments]: Don't skip build. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b64f5a9a6f..117d211de5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020 John Soo +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -9763,7 +9764,7 @@ (define-public rust-regex-automata-0.1 (define-public rust-regex-syntax-0.6 (package (name "rust-regex-syntax") - (version "0.6.13") + (version "0.6.14") (source (origin (method url-fetch) @@ -9771,9 +9772,8 @@ (define-public rust-regex-syntax-0.6 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "141xi6yiji0bc04c4skamd4ny9vnd1jrwc7qzfga425lyn8yhd77")))) + "01myl8xqpbnird23xnsb92sjmz1cmp69r6m7y3dwbpmsx4zzx3dj")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) (home-page "https://github.com/rust-lang/regex") (synopsis "Regular expression parser") (description -- cgit v1.2.3 From e5b8c522f20ec2d2fddc71ce6f4ffd2e93be803b Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 7 Feb 2020 22:23:17 +0100 Subject: gnu: rust-regex: Update to 1.3.4. * gnu/packages/crates-io.scm (rust-regex-1.3): Update to 1.3.4. [arguments]: Don't skip build. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 117d211de5..030ce12907 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9642,7 +9642,7 @@ (define-public rust-ref-cast-impl-0.2 (define-public rust-regex-1.3 (package (name "rust-regex") - (version "1.3.3") + (version "1.3.4") (source (origin (method url-fetch) @@ -9651,11 +9651,10 @@ (define-public rust-regex-1.3 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "11syqmfvbsah805z6ih8vxf8p6jssdsz1gjsjqcwprz484cqql5m")))) + "1a1mh9mgr8jipnxdaykla6xlw4a6kjn2bzkq3cifx8xy4ivzjb1j")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-aho-corasick" ,rust-aho-corasick-0.7) ("rust-memchr" ,rust-memchr-2.2) ("rust-regex-syntax" ,rust-regex-syntax-0.6) -- cgit v1.2.3 From fa832a434e0dc08e4e023f9d58014eef5cb77071 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 7 Feb 2020 22:23:18 +0100 Subject: gnu: rust-aho-corasick: Update to 0.7.8. * gnu/packages/crates-io.scm (rust-aho-corasick-0.7): Update to 0.7.8. [arguments]: Don't skip build. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 030ce12907..971181265a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -138,7 +138,7 @@ (define-public rust-afl-0.4 (define-public rust-aho-corasick-0.7 (package (name "rust-aho-corasick") - (version "0.7.6") + (version "0.7.8") (source (origin (method url-fetch) @@ -147,11 +147,10 @@ (define-public rust-aho-corasick-0.7 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0b8dh20fhdc59dhhnfi89n2bi80a8zbagzd5c122hf1vv2amxysq")))) + "048q5vr1qac4lf90z80lw8kcya6qmlxw857xhwxsssk832jdafkl")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-memchr" ,rust-memchr-2.2)) + `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2.2)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)))) (home-page "https://github.com/BurntSushi/aho-corasick") -- cgit v1.2.3 From 2e1d4c873b87ccdd0655acfd52db5170484c1548 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 7 Feb 2020 22:23:19 +0100 Subject: gnu: rust-grep-matcher: Update to 0.1.3. * gnu/packages/crates-io.scm (rust-grep-matcher-0.1): Update to 0.1.3. [arguments]: Don't skip build. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 971181265a..1d2e04e0db 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4473,7 +4473,7 @@ (define-public rust-grep-cli-0.1 (define-public rust-grep-matcher-0.1 (package (name "rust-grep-matcher") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) @@ -4482,11 +4482,10 @@ (define-public rust-grep-matcher-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "03j26zygfgwyam66bl5g922gimrvp4yyzl8qvaykyklnf247bl3r")))) + "113lafx3abrr96ahpz6yn905ian1w3qsr5hijbb909p2j0xgmhkm")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2.2)) #:cargo-development-inputs (("rust-regex" ,rust-regex-1.1)))) -- cgit v1.2.3 From 4574847ccad7e82db0459f89b294431e433b1a44 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 7 Feb 2020 22:23:20 +0100 Subject: gnu: rust-grep-regex: Update to 0.1.4. * gnu/packages/crates-io.scm (rust-grep-regex-0.1): Update to 0.1.4. [arguments]: Don't skip build. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1d2e04e0db..2e11eb8231 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4561,7 +4561,7 @@ (define-public rust-grep-printer-0.1 (define-public rust-grep-regex-0.1 (package (name "rust-grep-regex") - (version "0.1.3") + (version "0.1.4") (source (origin (method url-fetch) @@ -4570,11 +4570,10 @@ (define-public rust-grep-regex-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1lbb8837gzy25n706mnidaps4jl63ym679zraj8nfy5g02zbz549")))) + "090k1sbn4jq680dmgp1jyqs7f9dzn198k0806kc8f40jcjazd88n")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-aho-corasick" ,rust-aho-corasick-0.7) ("rust-grep-matcher" ,rust-grep-matcher-0.1) ("rust-log" ,rust-log-0.4) -- cgit v1.2.3 From 566997236494d83a48182d69311897789b5c9cd4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 8 Feb 2020 22:37:51 +0200 Subject: gnu: rust-ignore-0.4: Update to 0.4.11. * gnu/packages/crates-io.scm (rust-ignore-0.4): Update to 0.4.11. [arguments]: Don't skip build. In cargo-inputs replace rust-crossbeam-channel-0.3 with 0.4, rust-thread-local-0.3 with 1.0. Remove rust-winapi-util-0.1. Remove rust-tempfile-3.0 from cargo-development-inputs. --- gnu/packages/crates-io.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2e11eb8231..abb7400df8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5138,7 +5138,7 @@ (define-public rust-idna-0.1 (define-public rust-ignore-0.4 (package (name "rust-ignore") - (version "0.4.7") + (version "0.4.11") (source (origin (method url-fetch) @@ -5147,23 +5147,19 @@ (define-public rust-ignore-0.4 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "00mhksl41dnlsjqmka8c5a0m4spwm70ilm1qd9rngwq552hpzicd")))) + "07js5k91v870b2i5rl5shg37214yzwl0p6fjqy06y0v97gyawbaj")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.3) + `(#:cargo-inputs + (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.4) ("rust-globset" ,rust-globset-0.4) ("rust-lazy-static" ,rust-lazy-static-1.3) ("rust-log" ,rust-log-0.4) ("rust-memchr" ,rust-memchr-2.2) ("rust-regex" ,rust-regex-1.1) ("rust-same-file" ,rust-same-file-1.0) - ("rust-thread-local" ,rust-thread-local-0.3) - ("rust-walkdir" ,rust-walkdir-2.2) - ("rust-winapi-util" ,rust-winapi-util-0.1)) - #:cargo-development-inputs - (("rust-tempfile" ,rust-tempfile-3.0)))) + ("rust-thread-local" ,rust-thread-local-1.0) + ("rust-walkdir" ,rust-walkdir-2.2)))) (home-page "https://github.com/BurntSushi/ripgrep/tree/master/ignore") (synopsis "Efficiently match ignore files such as .gitignore") (description -- cgit v1.2.3 From 16ffc3b6042bf78f2584ef944ae8a1bc5e281749 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 7 Feb 2020 22:23:22 +0100 Subject: gnu: ripgrep: Update to 11.0.2. * gnu/packages/rust-apps.scm (ripgrep): Update to 11.0.2. [arguments]: Use rust-bstr-0.2 instead of rust-bstr-0.1. Add rust-jemallocator-0.3 to inputs. Remove unnecessary development-inputs. Signed-off-by: Efraim Flashner --- gnu/packages/rust-apps.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index e7e28901d0..007d57a698 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 John Soo ;;; Copyright © 2019, 2020 Efraim Flashner +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -199,7 +200,7 @@ (define-public fd (define-public ripgrep (package (name "ripgrep") - (version "11.0.1") + (version "11.0.2") (source (origin (method url-fetch) @@ -208,14 +209,15 @@ (define-public ripgrep (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0bn40lz9n08llq615p4qqqbi24zbkf0appfx3zgxg34a86ga9zds")))) + "0vqjr96s2rs45715hzf0g0wjahig4zjyiqfijmzzg4jyh9ni80yr")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-bstr" ,rust-bstr-0.1) + (("rust-bstr" ,rust-bstr-0.2) ("rust-clap" ,rust-clap-2) ("rust-grep" ,rust-grep-0.2) ("rust-ignore" ,rust-ignore-0.4) + ("rust-jemallocator" ,rust-jemallocator-0.3) ("rust-lazy-static" ,rust-lazy-static-1.3) ("rust-log" ,rust-log-0.4) ("rust-num-cpus" ,rust-num-cpus-1.10) @@ -223,9 +225,7 @@ (define-public ripgrep ("rust-serde-json" ,rust-serde-json-1.0) ("rust-termcolor" ,rust-termcolor-1.0)) #:cargo-development-inputs - (("rust-clap" ,rust-clap-2) - ("rust-lazy-static" ,rust-lazy-static-1.3) - ("rust-serde" ,rust-serde-1.0) + (("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0)))) (home-page "https://github.com/BurntSushi/ripgrep") (synopsis "Line-oriented search tool") -- cgit v1.2.3 From 0f43866e9e62b067754b8db0fa7c0f1f85453366 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 8 Feb 2020 22:55:55 +0200 Subject: gnu: nano: Update to 4.8. * gnu/packages/nano.scm (nano): Update to 4.8. --- gnu/packages/nano.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index 0aceef83ea..ff7abfad73 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Rene Saavedra ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; @@ -30,13 +30,13 @@ (define-module (gnu packages nano) (define-public nano (package (name "nano") - (version "4.7") + (version "4.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) (sha256 - (base32 "1x9nqy2kgaz6087p63i71gdjsqbdc9jjpx1ymlyclfakvsby3h2q")))) + (base32 "0qwf4ld0fl2bpnjh23z2pq7wcs6d14m2364360xmf7dbd0fgcj63")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 21c8ec75dea9cfffc4f050a25dced4d89af68b3b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 8 Feb 2020 23:12:19 +0200 Subject: gnu: rust-lazy-static-1: Set as reference to rust-lazy-static-1.4. * gnu/packages/crates-io.scm (rust-lazy-static-1): New variable. (rust-arc-swap-0.3, rust-bindgen-0.50, rust-bstr-0.2, rust-c2-chacha-0.2, rust-clap-2, rust-clicolors-control-1.0, rust-console-0.7, rust-criterion-0.2, rust-crossbeam-epoch-0.8, rust-crossbeam-epoch-0.7, rust-crossbeam-utils-0.7, rust-crossbeam-utils-0.6, rust-docopt-1.1, rust-encode-unicode-0.3, rust-findshlibs-0.5, rust-flame-0.2, rust-getrandom-0.1, rust-grep-cli-0.1, rust-hashbrown-0.5, rust-ignore-0.4, rust-indexmap-1.0, rust-insta-0.8, rust-nix-0.15, rust-nix-0.14, rust-nom-4.2, rust-odds-0.3, rust-once-cell-1.2, rust-openssl-0.10, rust-ordermap-0.3, rust-parking-lot-0.9, rust-parking-lot-0.8, rust-parking-lot-0.7, rust-proptest-0.9, rust-pulldown-cmark-0.4, rust-rayon-1.3, rust-rayon-1.1, rust-rayon-core-1.7, rust-rayon-core-1.5, rust-regex-1.3, rust-regex-1.1, rust-regex-0.2, rust-regex-automata-0.1, rust-schannel-0.1, rust-scoped-threadpool-0.1, rust-string-cache-0.7, rust-thread-local-1.0, rust-thread-local-0.3, rust-tokio-process-0.2, rust-tokio-reactor-0.1, rust-tokio-trace-core-0.2, rust-try-build-1.0, rust-ucd-parse-0.1, rust-wasm-bindegen-backend-0.2, rust-wasm-bindgen-futures-0.3): Use rust-lazy-static-1. * gnu/packages/rust-apps.scm (exa, fd, ripgrep, tokei): Same. * gnu/packages/gnome.scm (librsvg-next-source): Same. --- gnu/packages/crates-io.scm | 110 +++++++++++++++++++++++---------------------- gnu/packages/gnome.scm | 2 +- gnu/packages/rust-apps.scm | 8 ++-- 3 files changed, 61 insertions(+), 59 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index abb7400df8..06bdf4ce88 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -300,7 +300,7 @@ (define-public rust-arc-swap-0.3 (("rust-crossbeam" ,rust-crossbeam-0.7) ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) ("rust-itertools" ,rust-itertools-0.8) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-model" ,rust-model-0.1) ("rust-num-cpus" ,rust-num-cpus-1.10) ("rust-parking-lot" ,rust-parking-lot-0.8) @@ -727,7 +727,7 @@ (define-public rust-bindgen-0.50 ("rust-clap" ,rust-clap-2) ("rust-env-logger" ,rust-env-logger-0.6) ("rust-fxhash" ,rust-fxhash-0.2) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-peeking-take-while" ,rust-peeking-take-while-0.1) ("rust-proc-macro2" ,rust-proc-macro2-0.4) @@ -1020,7 +1020,7 @@ (define-public rust-bstr-0.2 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-memchr" ,rust-memchr-2.2) ("rust-regex-automata" ,rust-regex-automata-0.1) ("rust-serde" ,rust-serde-1.0)) @@ -1177,7 +1177,7 @@ (define-public rust-c2-chacha-0.2 `(#:skip-build? #t #:cargo-inputs (("rust-byteorder" ,rust-byteorder-1.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-ppv-lite86" ,rust-ppv-lite86-0.2) ("rust-stream-cipher" ,rust-stream-cipher-0.3)) #:cargo-development-inputs @@ -1498,7 +1498,7 @@ (define-public rust-clap-2 ("rust-vec-map" ,rust-vec-map-0.8) ("rust-yaml-rust" ,rust-yaml-rust-0.3)) #:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1.1) ("rust-version-sync" ,rust-version-sync-0.8)))) (home-page "https://clap.rs/") @@ -1525,7 +1525,7 @@ (define-public rust-clicolors-control-1.0 `(#:skip-build? #t #:cargo-inputs (("rust-atty" ,rust-atty-0.2) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/mitsuhiko/clicolors-control") @@ -1697,7 +1697,7 @@ (define-public rust-console-0.7 (("rust-atty" ,rust-atty-0.2) ("rust-clicolors-control" ,rust-clicolors-control-1.0) ("rust-encode-unicode" ,rust-encode-unicode-0.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-parking-lot" ,rust-parking-lot-0.8) ("rust-regex" ,rust-regex-1.1) @@ -1890,7 +1890,7 @@ (define-public rust-criterion-0.2 ("rust-criterion-plot" ,rust-criterion-plot-0.3) ("rust-csv" ,rust-csv-1.1) ("rust-itertools" ,rust-itertools-0.8) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rand-core" ,rust-rand-core-0.5) @@ -2096,7 +2096,7 @@ (define-public rust-crossbeam-epoch-0.8 (("rust-autocfg" ,rust-autocfg-0.1) ("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-memoffset" ,rust-memoffset-0.5) ("rust-scopeguard" ,rust-scopeguard-1.0)) #:cargo-development-inputs @@ -2127,7 +2127,7 @@ (define-public rust-crossbeam-epoch-0.7 (("rust-arrayvec" ,rust-arrayvec-0.4) ("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-memoffset" ,rust-memoffset-0.2) ("rust-scopeguard" ,rust-scopeguard-0.3)) #:cargo-development-inputs @@ -2203,7 +2203,7 @@ (define-public rust-crossbeam-utils-0.7 #:cargo-inputs (("rust-autocfg" ,rust-autocfg-0.1) ("rust-cfg-if" ,rust-cfg-if-0.1) - ("rust-lazy-static" ,rust-lazy-static-1.3)) + ("rust-lazy-static" ,rust-lazy-static-1)) #:cargo-development-inputs (("rust-rand" ,rust-rand-0.6)))) (home-page @@ -2231,7 +2231,7 @@ (define-public rust-crossbeam-utils-0.6 `(#:skip-build? #t #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) - ("rust-lazy-static" ,rust-lazy-static-1.3)) + ("rust-lazy-static" ,rust-lazy-static-1)) #:cargo-development-inputs (("rust-rand" ,rust-rand-0.4)))))) @@ -2733,7 +2733,7 @@ (define-public rust-docopt-1.1 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1.1) ("rust-serde" ,rust-serde-1.0) ("rust-strsim" ,rust-strsim-0.9)))) @@ -2853,7 +2853,7 @@ (define-public rust-encode-unicode-0.3 (("rust-ascii" ,rust-ascii-0.9) ("rust-clippy" ,rust-clippy-0.0)) #:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3)))) + (("rust-lazy-static" ,rust-lazy-static-1)))) (home-page "https://github.com/tormol/encode_unicode") (synopsis "UTF-8 and UTF-16 support for char, u8 and u16") @@ -3466,7 +3466,7 @@ (define-public rust-findshlibs-0.5 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2)))) (home-page "https://github.com/gimli-rs/findshlibs") (synopsis "Find the set of shared libraries loaded in the current process") @@ -3513,7 +3513,7 @@ (define-public rust-flame-0.2 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0) @@ -4178,7 +4178,7 @@ (define-public rust-getrandom-0.1 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) ("rust-stdweb" ,rust-stdweb-0.4) @@ -4456,7 +4456,7 @@ (define-public rust-grep-cli-0.1 (("rust-atty" ,rust-atty-0.2) ("rust-bstr" ,rust-bstr-0.2) ("rust-globset" ,rust-globset-0.4) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-regex" ,rust-regex-1.1) ("rust-same-file" ,rust-same-file-1.0) @@ -4705,7 +4705,7 @@ (define-public rust-hashbrown-0.5 ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1.0) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.5) ("rust-rayon" ,rust-rayon-1.1) ("rust-rustc-hash" ,rust-rustc-hash-1.0) @@ -5153,7 +5153,7 @@ (define-public rust-ignore-0.4 `(#:cargo-inputs (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.4) ("rust-globset" ,rust-globset-0.4) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-memchr" ,rust-memchr-2.2) ("rust-regex" ,rust-regex-1.1) @@ -5188,7 +5188,7 @@ (define-public rust-indexmap-1.0 #:cargo-development-inputs (("rust-fnv" ,rust-fnv-1.0) ("rust-itertools" ,rust-itertools-0.8) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-quickcheck" ,rust-quickcheck-0.8) ("rust-rand" ,rust-rand-0.4) ("rust-serde-test" ,rust-serde-test-1.0)))) @@ -5231,7 +5231,7 @@ (define-public rust-insta-0.8 ("rust-console" ,rust-console-0.7) ("rust-difference" ,rust-difference-2.0) ("rust-failure" ,rust-failure-0.1) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-pest" ,rust-pest-2.1) ("rust-pest-derive" ,rust-pest-derive-2.1) ("rust-ron" ,rust-ron-0.4) @@ -5635,6 +5635,8 @@ (define-public rust-lazy-static-1.4 (license (list license:asl2.0 license:expat)))) +(define-public rust-lazy-static-1 rust-lazy-static-1.4) + (define-public rust-lazy-static-1.3 (package (inherit rust-lazy-static-1.4) @@ -6941,7 +6943,7 @@ (define-public rust-nix-0.15 (("rust-bytes" ,rust-bytes-0.4) ("rust-caps" ,rust-caps-0.3) ("rust-cc" ,rust-cc-1.0) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.4) ("rust-sysctl" ,rust-sysctl-0.4) ("rust-tempfile" ,rust-tempfile-3.0)))) @@ -7004,7 +7006,7 @@ (define-public rust-nix-0.14 #:cargo-development-inputs (("rust-bytes" ,rust-bytes-0.4) ("rust-caps" ,rust-caps-0.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.6) ("rust-sysctl" ,rust-sysctl-0.1) ("rust-tempfile" ,rust-tempfile-3.0)))))) @@ -7071,7 +7073,7 @@ (define-public rust-nom-4.2 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-lexical-core" ,rust-lexical-core-0.4) ("rust-memchr" ,rust-memchr-2.2) ("rust-regex" ,rust-regex-1.1)) @@ -7360,7 +7362,7 @@ (define-public rust-odds-0.3 ("rust-unchecked-index" ,rust-unchecked-index-0.2)) #:cargo-development-inputs (("rust-itertools" ,rust-itertools-0.8) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-memchr" ,rust-memchr-2.2) ("rust-quickcheck" ,rust-quickcheck-0.8)))) (home-page "https://github.com/bluss/odds") @@ -7391,7 +7393,7 @@ (define-public rust-once-cell-1.2 (("rust-parking-lot" ,rust-parking-lot-0.9)) #:cargo-development-inputs (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1.1)))) (home-page "https://github.com/matklad/once_cell") (synopsis "Single assignment cells and lazy values") @@ -7440,7 +7442,7 @@ (define-public rust-openssl-0.10 (("rust-bitflags" ,rust-bitflags-1) ("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-foreign-types" ,rust-foreign-types-0.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-openssl-sys" ,rust-openssl-sys-0.9)) #:cargo-development-inputs @@ -7531,7 +7533,7 @@ (define-public rust-ordermap-0.3 #:cargo-development-inputs (("rust-fnv" ,rust-fnv-1.0) ("rust-itertools" ,rust-itertools-0.8) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-quickcheck" ,rust-quickcheck-0.8) ("rust-rand" ,rust-rand-0.4) ("rust-serde-test" ,rust-serde-test-1.0)))) @@ -7666,7 +7668,7 @@ (define-public rust-parking-lot-0.9 ("rust-parking-lot-core" ,rust-parking-lot-core-0.6)) #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1.1) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.4) ("rust-rustc-version" ,rust-rustc-version-0.2)))) (home-page "https://github.com/Amanieu/parking_lot") @@ -7697,7 +7699,7 @@ (define-public rust-parking-lot-0.8 ("rust-parking-lot-core" ,rust-parking-lot-core-0.5)) #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1.1) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.4) ("rust-rustc-version" ,rust-rustc-version-0.2)))))) @@ -7722,7 +7724,7 @@ (define-public rust-parking-lot-0.7 ("rust-parking-lot-core" ,rust-parking-lot-core-0.4)) #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1.1) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.4) ("rust-rustc-version" ,rust-rustc-version-0.2)))))) @@ -8562,7 +8564,7 @@ (define-public rust-proptest-0.9 (("rust-bit-set" ,rust-bit-set-0.5) ("rust-bitflags" ,rust-bitflags-1) ("rust-byteorder" ,rust-byteorder-1.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-quick-error" ,rust-quick-error-1.2) ("rust-rand" ,rust-rand-0.4) @@ -8605,7 +8607,7 @@ (define-public rust-pulldown-cmark-0.4 #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.2) ("rust-html5ever" ,rust-html5ever-0.23) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1.1) ("rust-tendril" ,rust-tendril-0.4)))) (home-page "https://github.com/raphlinus/pulldown-cmark") @@ -9386,7 +9388,7 @@ (define-public rust-rayon-1.3 #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3) ("rust-docopt" ,rust-docopt-1.1) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.7) ("rust-rand-xorshift" ,rust-rand-xorshift-0.2) ("rust-serde" ,rust-serde-1.0)))) @@ -9419,7 +9421,7 @@ (define-public rust-rayon-1.1 #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3) ("rust-docopt" ,rust-docopt-1.1) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.4) ("rust-rand-xorshift" ,rust-rand-xorshift-0.2) ("rust-serde" ,rust-serde-1.0) @@ -9445,7 +9447,7 @@ (define-public rust-rayon-core-1.7 (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7) ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.2) ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-num-cpus" ,rust-num-cpus-1.10)) #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2) @@ -9477,7 +9479,7 @@ (define-public rust-rayon-core-1.5 (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7) ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.1) ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-num-cpus" ,rust-num-cpus-1.10)) #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2) @@ -9654,7 +9656,7 @@ (define-public rust-regex-1.3 ("rust-thread-local" ,rust-thread-local-1.0)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-quickcheck" ,rust-quickcheck-0.8) ("rust-rand" ,rust-rand-0.6)))) (home-page "https://github.com/rust-lang/regex") @@ -9687,7 +9689,7 @@ (define-public rust-regex-1.1 ("rust-utf8-ranges" ,rust-utf8-ranges-1.0)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-quickcheck" ,rust-quickcheck-0.8) ("rust-rand" ,rust-rand-0.6)))))) @@ -9715,7 +9717,7 @@ (define-public rust-regex-0.2 ("rust-thread-local" ,rust-thread-local-0.3) ("rust-utf8-ranges" ,rust-utf8-ranges-1.0)) #:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-quickcheck" ,rust-quickcheck-0.6) ("rust-rand" ,rust-rand-0.4)))))) @@ -9740,7 +9742,7 @@ (define-public rust-regex-automata-0.1 ("rust-regex-syntax" ,rust-regex-syntax-0.6) ("rust-utf8-ranges" ,rust-utf8-ranges-1.0)) #:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1.1) ("rust-serde" ,rust-serde-1.0) ("rust-serde-bytes" ,rust-serde-bytes-0.11) @@ -10240,7 +10242,7 @@ (define-public rust-schannel-0.1 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/steffengy/schannel-rs") (synopsis "Rust bindings to the Windows SChannel APIs") @@ -10265,7 +10267,7 @@ (define-public rust-scoped-threadpool-0.1 (arguments `(#:skip-build? #t #:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3)))) + (("rust-lazy-static" ,rust-lazy-static-1)))) (home-page "https://github.com/Kimundi/scoped-threadpool-rs") (synopsis "Library for scoped and cached threadpools") (description @@ -11461,7 +11463,7 @@ (define-public rust-string-cache-0.7 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-new-debug-unreachable" ,rust-new-debug-unreachable-1.0) ("rust-phf-shared" ,rust-phf-shared-0.7) @@ -12142,7 +12144,7 @@ (define-public rust-thread-local-1.0 (build-system cargo-build-system) (arguments `(#:skip-build? #t - #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1.4)))) + #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1)))) (home-page "https://github.com/Amanieu/thread_local-rs") (synopsis "Per-object thread-local storage") (description "Per-object thread-local storage.") @@ -12164,7 +12166,7 @@ (define-public rust-thread-local-0.3 "06rzik99p8c5js8238yhc8rk6np543ylb1dy9nrw5v80j0r3xdf6")))) (arguments `(#:skip-build? #t - #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1.4)))))) + #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1)))))) (define-public rust-threadpool-1.7 (package @@ -12561,7 +12563,7 @@ (define-public rust-tokio-process-0.2 #:cargo-inputs (("rust-crossbeam-queue" ,rust-crossbeam-queue-0.1) ("rust-futures" ,rust-futures-0.1) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-13) ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) ("rust-mio" ,rust-mio-0.6) @@ -12601,7 +12603,7 @@ (define-public rust-tokio-reactor-0.1 #:cargo-inputs (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) ("rust-futures" ,rust-futures-0.1) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-mio" ,rust-mio-0.6) ("rust-num-cpus" ,rust-num-cpus-1.10) @@ -12802,7 +12804,7 @@ (define-public rust-tokio-trace-core-0.2 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3)))) + (("rust-lazy-static" ,rust-lazy-static-1)))) (home-page "https://tokio.rs") (synopsis "Core primitives for tokio-trace") (description "Core primitives for tokio-trace.") @@ -13004,7 +13006,7 @@ (define-public rust-trybuild-1.0 `(#:skip-build? #t #:cargo-inputs (("rust-glob" ,rust-glob-0.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-serde" ,rust-serde-1.0) ("rust-serde-json" ,rust-serde-json-1.0) ("rust-termcolor" ,rust-termcolor-1.0) @@ -13115,7 +13117,7 @@ (define-public rust-ucd-parse-0.1 (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1.1)))) (home-page "https://github.com/BurntSushi/ucd-generate") (synopsis "Parse data files in the Unicode character database") @@ -13847,7 +13849,7 @@ (define-public rust-wasm-bindgen-backend-0.2 `(#:skip-build? #t #:cargo-inputs (("rust-bumpalo" ,rust-bumpalo-2.5) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-proc-macro2" ,rust-proc-macro2-0.4) ("rust-quote" ,rust-quote-1.0) @@ -13881,7 +13883,7 @@ (define-public rust-wasm-bindgen-futures-0.3 ,rust-futures-channel-preview-0.3) ("rust-futures-util-preview" ,rust-futures-util-preview-0.3) ("rust-js-sys" ,rust-js-sys-0.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) #:cargo-development-inputs (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 692e88cc42..4413ce0d11 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2240,7 +2240,7 @@ (define librsvg-next-source ("itertools" . #+(package-source rust-itertools-0.8)) ("itoa" . #+(package-source rust-itoa-0.4)) ("language-tags" . #+(package-source rust-language-tags-0.2)) - ("lazy_static" . #+(package-source rust-lazy-static-1.3)) + ("lazy_static" . #+(package-source rust-lazy-static-1)) ("libc" . #+(package-source rust-libc-0.2)) ("libm" . #+(package-source rust-libm-0.1)) ;; locale_config 0.3 diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 007d57a698..d1d7d225a7 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -51,7 +51,7 @@ (define-public exa ("rust-env-logger" ,rust-env-logger-0.6) ("rust-git2" ,rust-git2-0.9) ("rust-glob" ,rust-glob-0.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-locale" ,rust-locale-0.2) ("rust-log" ,rust-log-0.4) @@ -151,7 +151,7 @@ (define-public fd ("rust-humantime" ,rust-humantime-1.3) ("rust-ignore" ,rust-ignore-0.4) ("rust-jemallocator" ,rust-jemallocator-0.3) - ("rust-lazy-static" ,rust-lazy-static-1.4) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-lscolors" ,rust-lscolors-0.6) ("rust-num-cpus" ,rust-num-cpus-1.10) @@ -218,7 +218,7 @@ (define-public ripgrep ("rust-grep" ,rust-grep-0.2) ("rust-ignore" ,rust-ignore-0.4) ("rust-jemallocator" ,rust-jemallocator-0.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-num-cpus" ,rust-num-cpus-1.10) ("rust-regex" ,rust-regex-1.1) @@ -302,7 +302,7 @@ (define-public tokei (("rust-git2" ,rust-git2-0.11) ("rust-handlebars" ,rust-handlebars-2.0) ("rust-ignore" ,rust-ignore-0.4) - ("rust-lazy-static" ,rust-lazy-static-1.4) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1.3) ("rust-serde-json" ,rust-serde-json-1.0) ("rust-tempfile" ,rust-tempfile-3.0)) -- cgit v1.2.3 From bf36e8c174318154d30d532f9ded20551a7a4530 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 8 Feb 2020 23:29:59 +0200 Subject: gnu: rust-tokio-process-0.2: Fix typo. This is a follow-up to 21c8ec75dea9cfffc4f050a25dced4d89af68b3b. * gnu/packages/crates-io.scm (rust-tokio-process-0.2)[arguments]: Replace rust-lazy-static-13 with rust-lazy-static-1. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 06bdf4ce88..0ff2f9828a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12563,7 +12563,7 @@ (define-public rust-tokio-process-0.2 #:cargo-inputs (("rust-crossbeam-queue" ,rust-crossbeam-queue-0.1) ("rust-futures" ,rust-futures-0.1) - ("rust-lazy-static" ,rust-lazy-static-13) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) ("rust-mio" ,rust-mio-0.6) -- cgit v1.2.3 From 5467e3441846c7555ebf67ecc7036a1447ff5db8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 9 Feb 2020 00:02:04 +0100 Subject: gnu: Add emacs-djvu. * gnu/packages/emacs-xyz.scm (emacs-djvu): New variable. --- gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 664d02c6c8..faf2d7a1f1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1987,6 +1987,27 @@ (define-public emacs-tablist @code{tablist-mode} or @code{tablist-minor-mode} commands.") (license license:gpl3+))) +(define-public emacs-djvu + (package + (name "emacs-djvu") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "djvu-" version ".el")) + (sha256 + (base32 "0njgyx09q225hliacsnjk8wallg5i6xkz6bj501pb05nwqfbvfk7")))) + (build-system emacs-build-system) + (home-page "http://elpa.gnu.org/packages/djvu.html") + (synopsis "Edit and view Djvu files via djvused") + (description + "This package is a front end for the command-line program djvused from +DjVuLibre, see @url{http://djvu.sourceforge.net/}. It assumes you have the +programs @command{djvused}, @command{djview}, @command{ddjvu}, and +@command{djvm} installed.") + (license license:gpl3+))) + (define-public emacs-pdf-tools (package (name "emacs-pdf-tools") -- cgit v1.2.3 From 6dd06d9656d4bd1c7e5076baf20a4dce0a97da6c Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:04:28 +0300 Subject: gnu: Add rust-compiler-error-0.1. * gnu/packages/crates-io.scm (rust-compiler-error-0.1): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0ff2f9828a..52a4630c8b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1639,6 +1639,26 @@ (define-public rust-compiler-builtins-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-compiler-error-0.1 + (package + (name "rust-compiler-error") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "compiler_error" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0irh7c0gznk2k6mj3cmqw7x4pg59lppmy1y8d6k5xc926rnmz5zg")))) + (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) + (home-page "https://github.com/lu-zero/compiler_error") + (synopsis "Triggerable compiler error") + (description "This package provides a triggerable compiler error for Rust.") + (license license:expat))) + (define-public rust-compiletest-rs-0.3 (package (name "rust-compiletest-rs") -- cgit v1.2.3 From 97fb5b53fde63bcc22180ecb274a329684b6d528 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:11:02 +0300 Subject: gnu: Add rust-xml-rs-0.8. * gnu/packages/crates-io.scm (rust-xml-rs-0.8): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 52a4630c8b..f63438118e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14355,6 +14355,26 @@ (define-public rust-xdg-2.2 (license (list license:asl2.0 license:expat)))) +(define-public rust-xml-rs-0.8 + (package + (name "rust-xml-rs") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "xml-rs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1db4v716rbpgjiasaim2s17rmvsfcq1qzwg6nji6mdf5k34i46sl")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/netvl/xml-rs") + (synopsis "XML library in pure Rust") + (description "An XML library in pure Rust.") + (license license:expat))) + (define-public rust-yaml-rust-0.4 (package (name "rust-yaml-rust") -- cgit v1.2.3 From 5ea15d03e5e0d6f252349b0f06ca53090bfac5a7 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:14:52 +0300 Subject: gnu: Add rust-utf8parse-0.1. * gnu/packages/crates-io.scm (rust-utf8parse-0.1): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f63438118e..63384ded0d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13583,6 +13583,25 @@ (define-public rust-utf8-ranges-1.0 "Convert ranges of Unicode codepoints to UTF-8 byte ranges.") (license (list license:expat license:unlicense)))) +(define-public rust-utf8parse-0.1 + (package + (name "rust-utf8parse") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "utf8parse" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0zamsj2986shm4x9zncjf2m5qy9scaw7qnxw4f89b2afpg6a8wl7")))) + (build-system cargo-build-system) + (home-page "https://github.com/jwilm/vte") + (synopsis "Table-driven UTF-8 parser") + (description "This package provides a table-driven UTF-8 parser.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-uuid-0.7 (package (name "rust-uuid") -- cgit v1.2.3 From 57f6e23c4caa538c0e7f5300ea937c1fe9072fa9 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:16:01 +0300 Subject: gnu: Add rust-android-glue-0.2. * gnu/packages/crates-io.scm (rust-android-glue-0.2): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 63384ded0d..8606d083bb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -186,6 +186,25 @@ (define-public rust-aho-corasick-0.6 ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0)))))) +(define-public rust-android-glue-0.2 + (package + (name "rust-android-glue") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "android-glue" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01y495x4i9vqkwmklwn2xk7sqg666az2axjcpkr4iwngdwi48100")))) + (build-system cargo-build-system) + (home-page "https://github.com/tomaka/android-rs-glue") + (synopsis "Glue for the Android JNI") + (description "This package provides the glue for the Android JNI.") + (license license:expat))) + (define-public rust-ansi-term-0.12 (package (name "rust-ansi-term") -- cgit v1.2.3 From c9c5b87559d93dc963c63d36ea303cbae9d13454 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:18:12 +0300 Subject: gnu: Add rust-quote-0.3. * gnu/packages/crates-io.scm (rust-quote-0.3): New variable. --- gnu/packages/crates-io.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8606d083bb..fd78a88c56 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8806,6 +8806,22 @@ (define-public rust-quote-0.6 `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4)))) (properties '()))) +(define-public rust-quote-0.3 + (package + (inherit rust-quote-0.6) + (name "rust-quote") + (version "0.3.15") + (source + (origin + (method url-fetch) + (uri (crate-uri "quote" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0yhnnix4dzsv8y4wwz4csbnqjfh73al33j35msr10py6cl5r4vks")))) + (arguments '()))) + (define-public rust-rand-0.7 (package (name "rust-rand") -- cgit v1.2.3 From 835c854b5dcbded8e5893cdf1bd7d126f77a833c Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:23:44 +0300 Subject: gnu: Add rust-approx-0.1. * gnu/packages/crates-io.scm (rust-approx-0.1): New variable. --- gnu/packages/crates-io.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fd78a88c56..3ad193190f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -299,6 +299,22 @@ (define-public rust-approx-0.3 "Approximate floating point equality comparisons and assertions.") (license license:asl2.0))) +(define-public rust-approx-0.1 + (package + (inherit rust-approx-0.3) + (name "rust-approx") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "approx" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "153awzwywmb61xg857b80l63b1x6hifx2pha7lxf6fck9qxwraq8")))) + (arguments '()))) + (define-public rust-arc-swap-0.3 (package (name "rust-arc-swap") -- cgit v1.2.3 From ccdc86338d4ab95895581989093803deb36f8a50 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:24:17 +0300 Subject: gnu: Add rust-assert-matches-1.3. * gnu/packages/crates-io.scm (rust-assert-matches-1.3): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3ad193190f..c1844b9811 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -478,6 +478,26 @@ (define-public rust-ascii-0.9 "ASCII-only equivalents to @code{char}, @code{str} and @code{String}.") (license (list license:expat license:asl2.0)))) +(define-public rust-assert-matches-1.3 + (package + (name "rust-assert-matches") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "assert_matches" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rar61v00gz2aniid0mylxcr4q98s6l77c3hvbszmg57kj10msvx")))) + (build-system cargo-build-system) + (home-page "https://github.com/murarth/assert_matches") + (synopsis "Asserts that a value matches a pattern") + (description + "This package asserts that a value matches a pattern in Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-atty-0.2 (package (name "rust-atty") -- cgit v1.2.3 From 7dc8a3a55348d452e9064f80d110072f7ad83460 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:24:40 +0300 Subject: gnu: Add rust-bresenham-0.1. * gnu/packages/crates-io.scm (rust-bresenham-0.1): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c1844b9811..bb17849f8a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -730,6 +730,28 @@ (define-public rust-bincode-1.1 that uses Serde for transforming structs into bytes and vice versa!") (license license:expat))) +(define-public rust-bresenham-0.1 + (package + (name "rust-bresenham") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "bresenham" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1mvg3zcyll0m3z79jwbg183ha4kb7bw06rd286ijwvgn4mi13hdz")))) + (build-system cargo-build-system) + (home-page "https://github.com/mbr/bresenham-rs") + (synopsis + "Iterator-based integer-only implementation of Bresenham's line algorithm") + (description + "This package provides a fast, iterator-based integer-only implementation of +Bresenham's line algorithm.") + (license license:expat))) + (define-public rust-generator-0.6 (package (name "rust-generator") -- cgit v1.2.3 From 043cf489f73fb5ed4ab1dfe82355021e12a7f18d Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:26:55 +0300 Subject: gnu: Add rust-itoa-0.3. * gnu/packages/crates-io.scm (rust-itoa-0.3): New variable. --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bb17849f8a..eda55bb882 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5493,6 +5493,21 @@ (define-public rust-itoa-0.4 (license (list license:asl2.0 license:expat)))) +(define-public rust-itoa-0.3 + (package + (inherit rust-itoa-0.4) + (name "rust-itoa") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "itoa" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "136vwi6l2k1vrlvfx49lhficj813pk88xrcx1q3axqh1mwms6943")))))) + (define-public rust-itoa-0.1 (package (inherit rust-itoa-0.4) -- cgit v1.2.3 From 8e1337fd3d4b645d925a8c4c49d704271c8015d3 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:27:53 +0300 Subject: gnu: Add rust-make-cmd-0.1. * gnu/packages/crates-io.scm (rust-make-cmd-0.1): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index eda55bb882..db708c1ce3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6249,6 +6249,26 @@ (define-public rust-mac-0.1 "This package provides a collection of great and ubiqutitous macros.") (license (list license:asl2.0 license:expat)))) +(define-public rust-make-cmd-0.1 + (package + (name "rust-make-cmd") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "make-cmd" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ly0lc5p1a0qdiqnh19ly3snb9q83sjbbb1njvh8a5xgx3xqmjm8")))) + (build-system cargo-build-system) + (home-page "https://github.com/mneumann/make-cmd-rs") + (synopsis "Enable build.rs scripts to invoke gnu_make") + (description "This package enables build.rs scripts to invoke gnu_make +platform-independently.") + (license license:expat))) + (define-public rust-maplit-1.0 (package (name "rust-maplit") -- cgit v1.2.3 From fef9de551d797dd13c211719e63e0cf64f07fe00 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:28:39 +0300 Subject: gnu: Add rust-mint-0.5. * gnu/packages/crates-io.scm (rust-mint-0.5): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index db708c1ce3..96d8d3ec62 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6631,6 +6631,26 @@ (define-public rust-miniz-sys-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-mint-0.5 + (package + (name "rust-mint") + (version "0.5.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "mint" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0c4190gr348fkfijij7vm19iagwl36mssj1irc9f6m448hbhgn68")))) + (build-system cargo-build-system) + (home-page "https://github.com/kvark/mint") + (synopsis "Math interoperability standard types") + (description + "This package provides math interoperability standard types.") + (license license:expat))) + (define-public rust-mio-0.6 (package (name "rust-mio") -- cgit v1.2.3 From c6b806228af270a830bf41fc2cedf0a2b2191ea9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Feb 2020 11:29:41 +0200 Subject: gnu: Add rust-itertools-0.7. * gnu/packages/crates-io.scm (rust-itertools-0.7): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 96d8d3ec62..b36d663305 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5443,6 +5443,26 @@ (define-public rust-itertools-0.8 "Extra iterator adaptors, iterator methods, free functions, and macros.") (license (list license:expat license:asl2.0)))) +(define-public rust-itertools-0.7 + (package + (inherit rust-itertools-0.8) + (name "rust-itertools") + (version "0.7.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "itertools" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03cpsj26xmyamcalclqzr1i700vwx8hnbgxbpjvs354f8mnr8iqd")))) + (arguments + `(#:cargo-inputs + (("rust-either" ,rust-either-1.5)) + #:cargo-development-inputs + (("rust-permutohedron" ,rust-permutohedron-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.5)))))) + (define-public rust-itertools-num-0.1 (package (name "rust-itertools-num") -- cgit v1.2.3 From 243603c8889a9a1318cd7118177f7fae3aa4c348 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Feb 2020 11:33:00 +0200 Subject: gnu: Add rust-structopt-derive-0.2. * gnu/packages/crates-io.scm (rust-structopt-derive-0.2): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b36d663305..b891369112 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11754,6 +11754,32 @@ (define-public rust-strsim-0.8 (base32 "0sjsm7hrvjdifz661pjxq5w4hf190hx53fra8dfvamacvff139cf")))))) +(define-public rust-structopt-derive-0.2 + (package + (name "rust-structopt-derive") + (version "0.2.18") + (source + (origin + (method url-fetch) + (uri (crate-uri "structopt-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01sis9z5kqmyhvzbnmlzpdxcry99a0b9blypksgnhdsbm1hh40ak")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-heck" ,rust-heck-0.3) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-0.6) + ("rust-syn" ,rust-syn-0.15)))) + (home-page "https://github.com/TeXitoi/structopt") + (synopsis + "Parse command line argument by defining a struct, derive crate") + (description + "Parse command line argument by defining a struct, derive crate.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-syn-1.0 (package (name "rust-syn") -- cgit v1.2.3 From d8886fcc4882589c189ecb8369ec199e5d244e3f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Feb 2020 11:39:20 +0200 Subject: gnu: Add rust-structopt-0.2. * gnu/packages/crates-io.scm (rust-structopt-0.2): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b891369112..924359415f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11754,6 +11754,30 @@ (define-public rust-strsim-0.8 (base32 "0sjsm7hrvjdifz661pjxq5w4hf190hx53fra8dfvamacvff139cf")))))) +(define-public rust-structopt-0.2 + (package + (name "rust-structopt") + (version "0.2.18") + (source + (origin + (method url-fetch) + (uri (crate-uri "structopt" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1mvfv1l8vp3y402fkl2wcl34hi7gmr4bqha13dfz2xf3kjzwvhhn")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-inputs + (("rust-clap" ,rust-clap-2) + ("rust-structopt-derive" ,rust-structopt-derive-0.2)))) + (home-page "https://github.com/TeXitoi/structopt") + (synopsis "Parse command line arguments by defining a struct") + (description + "Parse command line arguments by defining a struct.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-structopt-derive-0.2 (package (name "rust-structopt-derive") -- cgit v1.2.3 From f010cd54a576a454c98ab634d84e9a8d227fc93d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Feb 2020 11:53:21 +0200 Subject: gnu: rust-nodrop-0.1: Update to 0.1.14. * gnu/packages/crates-io.scm (rust-nodrop-0.1): Update to 0.1.14. [arguments]: Add rust-nodrop-union-0.1 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 924359415f..472af20fe1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7186,7 +7186,7 @@ (define-public rust-nix-0.14 (define-public rust-nodrop-0.1 (package (name "rust-nodrop") - (version "0.1.13") + (version "0.1.14") (source (origin (method url-fetch) @@ -7194,13 +7194,15 @@ (define-public rust-nodrop-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0if9ifn6rvar5jirx4b3qh4sl5kjkmcifycvzhxa9j3crkfng5ig")))) + "1fz1v9r8ijacf0hlq0pdv5l9mz8vgqg1snmhvpjmi9aci1b4mvvj")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nodrop-union" ,rust-nodrop-union-0.1)))) (home-page "https://github.com/bluss/arrayvec") (synopsis "Wrapper type to inhibit drop (destructor)") (description "This package provides a wrapper type to inhibit drop (destructor). Use @code{std::mem::ManuallyDrop} instead!") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 6901f6cdc8866031d021799450272e930fa6ac49 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Feb 2020 11:57:19 +0200 Subject: gnu: rust-num-integer-0.1: Update to 0.1.42. * gnu/packages/crates-io.scm (rust-num-integer-0.1): Update to 0.1.42. [arguments]: Add rust-num-traits-0.2, rust-autocfg-1.0 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 472af20fe1..d6957d1800 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7361,7 +7361,7 @@ (define-public rust-num-cpus-1.10 (define-public rust-num-integer-0.1 (package (name "rust-num-integer") - (version "0.1.41") + (version "0.1.42") (source (origin (method url-fetch) @@ -7370,12 +7370,15 @@ (define-public rust-num-integer-0.1 (string-append name "-" version ".crate")) (sha256 (base32 - "02dwjjpfbi16c71fq689s4sw3ih52cvfzr5z5gs6qpr5z0g58pmq")))) + "1fpw8yr9xwsf3qrh91rm7mzqaiwlc2dmnalsxv9pr9w1klpacviz")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-traits" ,rust-num-traits-0.2) + ("rust-autocfg" ,rust-autocfg-1.0)))) (home-page "https://github.com/rust-num/num-integer") (synopsis "Integer traits and functions") (description "Integer traits and functions.") - (properties '((hidden? . #t))) ;; Dual licensed. (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From f882e8efe921cf07b62294cbc6b2e89c2c80b8e6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Feb 2020 12:04:14 +0200 Subject: gnu: Add rust-unicode-segmentation-1.6. * gnu/packages/crates-io.scm (rust-unicode-segmentation-1.6): New variable. (rust-unicode-segmentation-1.3)[inherit]: Inherit from rust-unicode-segmentation-1.6. --- gnu/packages/crates-io.scm | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d6957d1800..e3e12b2eb5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13510,10 +13510,10 @@ (define-public rust-unicode-normalization-0.1 described in Unicode Standard Annex #15.") (license (list license:expat license:asl2.0)))) -(define-public rust-unicode-segmentation-1.3 +(define-public rust-unicode-segmentation-1.6 (package (name "rust-unicode-segmentation") - (version "1.3.0") + (version "1.6.0") (source (origin (method url-fetch) @@ -13522,11 +13522,10 @@ (define-public rust-unicode-segmentation-1.3 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1a9jqg7rb1yq6w2xc9jgxcs111yk5vxm9afjfvykfnrmzk6z8rqr")))) + "1h7d48mzpi8hwf5cvnq07warkv86pvapzzzf32hvbjsk20yiagp8")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-development-inputs + `(#:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.7)))) (home-page "https://github.com/unicode-rs/unicode-segmentation") (synopsis "Grapheme Cluster, Word and Sentence boundaries") @@ -13535,6 +13534,21 @@ (define-public rust-unicode-segmentation-1.3 boundaries according to Unicode Standard Annex #29 rules.") (license (list license:expat license:asl2.0)))) +(define-public rust-unicode-segmentation-1.3 + (package + (inherit rust-unicode-segmentation-1.6) + (name "rust-unicode-segmentation") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "unicode-segmentation" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1a9jqg7rb1yq6w2xc9jgxcs111yk5vxm9afjfvykfnrmzk6z8rqr")))))) + (define-public rust-unicode-width-0.1 (package (name "rust-unicode-width") -- cgit v1.2.3 From 5998ac14f376194d3878f918cb9e04a6ff599d77 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Feb 2020 12:10:26 +0200 Subject: gnu: rust-modifier-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-modifier-0.1)[properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e3e12b2eb5..1cfbd8f956 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6860,7 +6860,6 @@ (define-public rust-modifier-0.1 "Chaining APIs for both self -> Self and &mut self methods.") (description "Chaining APIs for both self -> Self and &mut self methods.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-natord-1.0 -- cgit v1.2.3 From a961e7ff0c2800daec2ff7d854d76f3601ca668f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 9 Feb 2020 11:18:03 +0000 Subject: gnu: patchwork: Update to 2.1.5. * gnu/packages/patchutils.scm (patchwork): Update to 2.1.5. --- gnu/packages/patchutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 80c454a5c4..e32e6c7b12 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -322,7 +322,7 @@ (define-public meld (define-public patchwork (package (name "patchwork") - (version "2.1.4") + (version "2.1.5") (source (origin (method git-fetch) (uri (git-reference @@ -331,7 +331,7 @@ (define-public patchwork (file-name (git-file-name name version)) (sha256 (base32 - "0zi1hcqb0pi2diyznbv0c1631qk4rx02zl8ghyrr59g3ljlyr18y")))) + "1n4hfwlgmw6mj5kp261zfx47mgb0l7g2yzl1rf0rnm8x69lr3as6")))) (build-system python-build-system) (arguments `(;; TODO: Tests require a running database -- cgit v1.2.3 From 794ebb6b74e692e33d17552fe14b30bb9b7b771d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 9 Feb 2020 13:29:30 +0100 Subject: gnu: Add djview. * gnu/packages/djvu.scm (djview): New variable. --- gnu/packages/djvu.scm | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm index 10cdbf31a8..534d2db58b 100644 --- a/gnu/packages/djvu.scm +++ b/gnu/packages/djvu.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Paul van der Walt +;;; Copyright © 2020 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,9 +19,15 @@ (define-module (gnu packages djvu) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (gnu packages glib) + #:use-module (gnu packages image) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages qt) + #:use-module (gnu packages xorg)) (define-public djvulibre (package @@ -48,3 +55,39 @@ (define-public djvulibre including viewers, browser plugins, decoders, simple encoders, and utilities.") (license license:gpl2+))) + +(define-public djview + (package + (name "djview") + (version "4.10.6") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/djvu/DjView/" + (version-major+minor version) "/" + "djview-" version ".tar.gz")) + (sha256 + (base32 "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools))) + (inputs + `(("glib" ,glib) + ("libxt" ,libxt) + ("libtiff" ,libtiff) + ("qtbase" ,qtbase) + ("djvulibre" ,djvulibre))) + (home-page "http://djvu.sourceforge.net/") + (synopsis "Viewer for the DjVu image format") + (description "DjView is a standalone viewer for DjVu files. + +Its features include navigating documents, zooming and panning page images, +producing and displaying thumbnails, displaying document outlines, searching +documents for particular words in the hidden text layer, copying hidden text +to the clipboard, saving pages and documents as bundled or indirect multi-page +files, and printing page and documents. + +The viewer can simultaneously display several pages using a side-by-side or +a continuous layout.") + (license license:gpl2+))) -- cgit v1.2.3 From f8c2d32461d469f7133c7d79fe1b4eed5146aaf7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 9 Feb 2020 14:55:25 +0100 Subject: gnu: djview: Fix executable's name in desktop file. * gnu/packages/djvu.scm (djview)[inputs]: Re-order inputs alphabetically. [arguments]: Add a phase to fix executable's name in desktop file. --- gnu/packages/djvu.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm index 534d2db58b..7dd08fcbe6 100644 --- a/gnu/packages/djvu.scm +++ b/gnu/packages/djvu.scm @@ -73,11 +73,20 @@ (define-public djview `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs - `(("glib" ,glib) + `(("djvulibre" ,djvulibre) + ("glib" ,glib) ("libxt" ,libxt) ("libtiff" ,libtiff) - ("qtbase" ,qtbase) - ("djvulibre" ,djvulibre))) + ("qtbase" ,qtbase))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-desktop-file + ;; Executable is "djview", not "djview4". + (lambda _ + (substitute* "desktopfiles/djvulibre-djview4.desktop" + (("Exec=djview4 %f") "Exec=djview %f")) + #t))))) (home-page "http://djvu.sourceforge.net/") (synopsis "Viewer for the DjVu image format") (description "DjView is a standalone viewer for DjVu files. -- cgit v1.2.3 From 3fece9a75bc3be25a49667e0d94614d5b847dc56 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Feb 2020 14:40:20 +0200 Subject: gnu: Add rust-quickcheck-0.2. * gnu/packages/crates-io.scm (rust-quickcheck-0.2): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1cfbd8f956..e077589917 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8907,6 +8907,26 @@ (define-public rust-quickcheck-0.5 ("rust-log" ,rust-log-0.3) ("rust-rand" ,rust-rand-0.3)))))) +(define-public rust-quickcheck-0.2 + (package + (inherit rust-quickcheck-0.8) + (name "rust-quickcheck") + (version "0.2.27") + (source + (origin + (method url-fetch) + (uri (crate-uri "quickcheck" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vb4acppaavlnchzc1jmn5wlkgir9x9gmhgp97bavyxxqxgsg1nh")))) + (arguments + `(#:cargo-inputs + (("rust-env-logger" ,rust-env-logger-0.3) + ("rust-log" ,rust-log-0.3) + ("rust-rand" ,rust-rand-0.3)) + #:skip-build? #t)))) ; Package needs 'unicode' crate. + (define-public rust-quote-1.0 (package (name "rust-quote") -- cgit v1.2.3 From 20104fdda65f103f7648fe5d42551e1fd1dd29c1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Feb 2020 14:41:24 +0200 Subject: gnu: Add rust-env-logger-0.3. * gnu/packages/crates-io.scm (rust-env-logger-0.3): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e077589917..e22e9ff92f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3289,6 +3289,25 @@ (define-public rust-env-logger-0.4 (("rust-log" ,rust-log-0.3) ("rust-regex" ,rust-regex-0.2)))))) +(define-public rust-env-logger-0.3 + (package + (inherit rust-env-logger-0.7) + (name "rust-env-logger") + (version "0.3.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "env_logger" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bvcjgkw4s3k1rd7glpflgc8s9a393zjd6jfdgvs8gjvwj0dgaqm")))) + (arguments + `(#:skip-build? #t ; Cannot find dependent crates. + #:cargo-inputs + (;("rust-regex" ,rust-regex-0.1) + ("rust-log" ,rust-log-0.3)))))) + (define-public rust-envmnt-0.6 (package (name "rust-envmnt") -- cgit v1.2.3 From 7cbbea145662b475785fdc5c4ea7ef1684b6277b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Feb 2020 14:46:59 +0200 Subject: gnu: Add rust-regex-syntax-0.3. * gnu/packages/crates-io.scm (rust-regex-syntax-0.3): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e22e9ff92f..25e0fe7a5d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10025,6 +10025,25 @@ (define-public rust-regex-syntax-0.5 #:cargo-inputs (("rust-ucd-util" ,rust-ucd-util-0.1)))))) +(define-public rust-regex-syntax-0.3 + (package + (inherit rust-regex-syntax-0.6) + (name "rust-regex-syntax") + (version "0.3.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "regex-syntax" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ms9hgdhhsxw9w920i7gipydvagf100bb56jbs192rz86ln01v7r")))) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.2) + ("rust-rand" ,rust-rand-0.3)))))) + (define-public rust-remove-dir-all-0.5 (package (name "rust-remove-dir-all") -- cgit v1.2.3 From c83dcf24babdffa7c5933a4fdd60de4440d3e578 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Feb 2020 14:34:58 +0200 Subject: gnu: Add rust-quantiles-0.7. * gnu/packages/crates-io.scm (rust-quantiles-0.7): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 25e0fe7a5d..515d84017a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8811,6 +8811,32 @@ (define-public rust-pulldown-cmark-0.4 "This package provides a pull parser for CommonMark.") (license license:expat))) +(define-public rust-quantiles-0.7 + (package + (name "rust-quantiles") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "quantiles" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wjp16a3d4bmldq9w2wds0q4gjz4mnsqac3g38r6ryr6zc9sh3y1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)) + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.5)))) + (home-page "https://github.com/postmates/quantiles") + (synopsis "Collection of approximate quantile algorithms") + (description + "This package provides a collection of approximate quantile algorithms.") + (license license:expat))) + (define-public rust-quick-error-1.2 (package (name "rust-quick-error") -- cgit v1.2.3 From 3230371e06c76be4234be9275cfa8d942fa4e6fd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Feb 2020 14:33:55 +0200 Subject: gnu: Add rust-serde-big-array-0.1. * gnu/packages/crates-io.scm (rust-serde-big-array-0.1): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 515d84017a..71fe65627e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10842,8 +10842,31 @@ (define-public rust-serde-0.8 (("rust-clippy" ,rust-clippy-0.0)) #:tests? #f)))) -;; Circular dev dependency on bincode. -;; Probably not going away: https://github.com/rust-lang/cargo/issues/4242 +(define-public rust-serde-big-array-0.1 + (package + (name "rust-serde-big-array") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-big-array" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0gkyqxk760mp1lfcg6lhjk95ajc89nr0qdd0vl4ic0g8pyxcy9mr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)) + #:cargo-development-inputs + (("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://github.com/est31/serde-big-array") + (synopsis "Big array helper for serde") + (description "This package provides a big array helper for serde.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-serde-bytes-0.11 (package (name "rust-serde-bytes") -- cgit v1.2.3 From e0d529bacc620a3447998e54141fcc5546b282c9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Feb 2020 14:32:41 +0200 Subject: gnu: Add rust-float-ord-0.2. * gnu/packages/crates-io.scm (rust-float-ord-0.2): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 71fe65627e..33bff568e6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3705,6 +3705,29 @@ (define-public rust-flate2-1.0 streams.") (license (list license:expat license:asl2.0)))) +(define-public rust-float-ord-0.2 + (package + (name "rust-float-ord") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "float-ord" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kin50365sr3spnbscq43lksymybi99ai9rkqdw90m6vixhlibbv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-rand" ,rust-rand-0.3)))) + (home-page "https://github.com/notriddle/rust-float-ord") + (synopsis "Total ordering for floating-point numbers") + (description + "This package provides a total ordering for floating-point numbers.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-fnv-1.0 (package (name "rust-fnv") -- cgit v1.2.3 From 03455f9c0e09e442df9952cff0732f4eb2520213 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Feb 2020 14:31:20 +0200 Subject: gnu: Add rust-custom-derive-0.1. * gnu/packages/crates-io.scm (rust-custom-derive-0.1): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 33bff568e6..1b4756f415 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2450,6 +2450,31 @@ (define-public rust-curl-sys-0.4 (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-custom-derive-0.1 + (package + (name "rust-custom-derive") + (version "0.1.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "custom_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1f81bavw1wnykwh21hh4yyzigs6zl6f6pkk9p3car8kq95yfb2pg")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-rustc-serialize" ,rust-rustc-serialize-0.3)))) + (home-page + "https://github.com/DanielKeep/rust-custom-derive/tree/custom_derive-master") + (synopsis "Custom derivation macro for Rust") + (description + "This crate provides a macro that enables the use of custom @code{derive} +attributes.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-data-encoding-2.1 (package (name "rust-data-encoding") -- cgit v1.2.3 From 40f41b56e1bbaba9518ff380e41869b70ee226b3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Feb 2020 14:30:14 +0200 Subject: gnu: Add rust-conv-0.3. * gnu/packages/crates-io.scm (rust-conv-0.3): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1b4756f415..04399627d1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1855,6 +1855,34 @@ (define-public rust-constant-time-eq-0.1 It is inspired by the Linux kernel's @code{crypto_memneq}.") (license license:cc0))) +(define-public rust-conv-0.3 + (package + (name "rust-conv") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "conv" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "168j1npqrif1yqxbgbk0pdrx9shzhs5ylc5a4xw49b6hbxi11zvq")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; Package needs 'unicode' crate. + #:cargo-inputs + (("rust-custom-derive" ,rust-custom-derive-0.1)) + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.2) + ("rust-winapi" ,rust-winapi-0.2)))) + (home-page "https://github.com/DanielKeep/rust-conv") + (synopsis "Conversion traits with more specific semantics") + (description + "This crate provides a number of conversion traits with more specific +semantics than those provided by @code{as} or @code{From}/@code{Into}.") + (license license:expat))) + (define-public rust-core-arch-0.1 (package (name "rust-core-arch") -- cgit v1.2.3 From 11aec1687b35fc116535d249fdf891079f4c659a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Feb 2020 14:28:23 +0200 Subject: gnu: Add rust-average-0.9. * gnu/packages/crates-io.scm (rust-average-0.9): New variable. --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 04399627d1..62a11c790e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -558,6 +558,40 @@ (define-public rust-autocfg-0.1 "1chwgimpx5z7xbag7krr9d8asxfqbh683qhgl9kn3hxk2l0djj8x")))) (arguments '(#:skip-build? #t)))) +(define-public rust-average-0.9 + (package + (name "rust-average") + (version "0.9.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "average" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1f8ya00bv6qki9m7b4lb3bn845rj473mx02qpm7wgy5qc1yp75xs")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-conv" ,rust-conv-0.3) + ("rust-float-ord" ,rust-float-ord-0.2) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-big-array" ,rust-serde-big-array-0.1) + ("rust-serde-derive" ,rust-serde-derive-1.0)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1) + ("rust-quantiles" ,rust-quantiles-0.7) + ("rust-rand" ,rust-rand-0.6) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-streaming-stats" ,rust-streaming-stats-0.2)))) + (home-page "https://github.com/vks/average") + (synopsis "Calculate statistics iteratively") + (description "This crate provides for calculating statistics iteratively +in Rust.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-backtrace-0.3 (package (name "rust-backtrace") -- cgit v1.2.3 From c4fed726e9b75ca108c825311c4b6b98242b6de3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Feb 2020 15:39:54 +0200 Subject: gnu: rust-rand-0.6: Don't skip build. * gnu/packages/crates-io.scm (rust-rand-0.6)[arguments]: Don't skip build. Add rust-average-0.9 to cargo-development-inputs. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 62a11c790e..a13b2081aa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9183,8 +9183,7 @@ (define-public rust-rand-0.6 (base32 "1jl4449jcl4wgmzld6ffwqj5gwxrp8zvx8w573g1z368qg6xlwbd")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) ("rust-packed-simd" ,rust-packed-simd-0.3) @@ -9199,7 +9198,8 @@ (define-public rust-rand-0.6 ("rust-winapi" ,rust-winapi-0.3) ("rust-autocfg" ,rust-autocfg-0.1)) ; build-dependency #:cargo-development-inputs - (("rust-rand-xoshiro" ,rust-rand-xoshiro-0.1)))))) + (("rust-average" ,rust-average-0.9) + ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.1)))))) (define-public rust-rand-0.5 (package -- cgit v1.2.3 From 6ffe72bbd210bec066683a2c562fc1c3e1dc1cb2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Feb 2020 16:06:08 +0200 Subject: gnu: rust-stdweb-0.4: Fix inputs. * gnu/packages/crates-io.scm (rust-stdweb-0.4)[arguments]: Move rust-rustc-version-0.2 from cargo-development-inputs to cargo-inputs. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a13b2081aa..77ca168369 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11695,10 +11695,10 @@ (define-public rust-stdweb-0.4 ("rust-stdweb-derive" ,rust-stdweb-derive-0.5) ("rust-stdweb-internal-macros" ,rust-stdweb-internal-macros-0.2) ("rust-stdweb-internal-runtime" ,rust-stdweb-internal-runtime-0.1) - ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-rustc-version" ,rust-rustc-version-0.2)) #:cargo-development-inputs - (("rust-rustc-version" ,rust-rustc-version-0.2) - ("rust-serde-derive" ,rust-serde-derive-1.0) + (("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0) ("rust-stdweb-internal-test-macro" ,rust-stdweb-internal-test-macro-0.1) ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))) -- cgit v1.2.3 From 371ca8ca8665a470260416e7b9f954e0bf96e7fa Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sun, 9 Feb 2020 15:31:24 +0100 Subject: gnu: Add eboard. * gnu/packages/games.scm (eboard): New variable. --- gnu/packages/games.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b502cd0ec4..78e0042aac 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9666,3 +9666,47 @@ (define-public xmoto license:bsd-3 ;src/md5sum license:lgpl2.1+ ;src/iqsort.h license:expat)))) + +(define-public eboard + (package + (name "eboard") + (version "1.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fbergo/eboard.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1z4pwpqyvxhlda99h6arh2rjk90fbms9q29fqizjblrdn01dlxn1")))) + (build-system gnu-build-system) + (native-inputs + `(("perl" ,perl) + ("pkg-config" ,pkg-config))) + (inputs + `(("gtk+" ,gtk+-2) + ("libpng" ,libpng) + ("gstreamer" ,gstreamer))) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (make-file-writable "eboard-config") + (setenv "CC" "gcc") + (invoke "./configure" + (string-append "--prefix=" (assoc-ref outputs "out"))) + #t)) + (add-before 'install 'make-required-directories + (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p (string-append (assoc-ref outputs "out") + "/share/eboard")) + #t))))) + (synopsis "Graphical user interface to play chess") + (description + "Eboard is a chess board interface for ICS (Internet Chess Servers) +and chess engines.") + (home-page "https://www.bergo.eng.br/eboard/") + (license license:gpl2+))) -- cgit v1.2.3 From 0d79e82acc28afdfc0881d0375ea168882a05312 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 9 Feb 2020 17:22:26 +0100 Subject: gnu: djview: Fix home-page. * gnu/packages/djvu.scm (djview)[home-page]: Point specifically to the project home-page. --- gnu/packages/djvu.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm index 7dd08fcbe6..1fb5b5267e 100644 --- a/gnu/packages/djvu.scm +++ b/gnu/packages/djvu.scm @@ -87,7 +87,7 @@ (define-public djview (substitute* "desktopfiles/djvulibre-djview4.desktop" (("Exec=djview4 %f") "Exec=djview %f")) #t))))) - (home-page "http://djvu.sourceforge.net/") + (home-page "http://djvu.sourceforge.net/djview4.html") (synopsis "Viewer for the DjVu image format") (description "DjView is a standalone viewer for DjVu files. -- cgit v1.2.3 From 5cd9a4103e74fb1eb73114d84786d9c08379f22b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 9 Feb 2020 17:28:51 +0100 Subject: Revert "gnu: Add ghc-hspec-discover." This reverts commit a60448edcc85faa8b3cd4bd3ae8a336c842aad4d. The package already exists, as "hspec-discover". --- gnu/packages/haskell-check.scm | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 0dae620119..c6e89460ea 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -11,7 +11,6 @@ ;;; Copyright © 2018 Tonton ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2019 Timothy Sample -;;; Copyright © 2020 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -773,29 +772,6 @@ (define-public ghc-hspec-contrib "This package provides contributed Hspec extensions.") (license license:expat))) -(define-public ghc-hspec-discover - (package - (name "ghc-hspec-discover") - (version "2.7.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hspec-discover/" - "hspec-discover-" version ".tar.gz")) - (sha256 - (base32 "0r47fm94wa6qrhp8cc1zzkjrxc32rnagfn9m9ga4dm6p6ydw4c8b")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-hspec-meta" ,ghc-hspec-meta))) - (home-page "http://hspec.github.io/") - (synopsis "Automatically discover and run Hspec tests") - (description - "Automatically discover and run Hspec tests. See -@url{http://hspec.github.io/hspec-discover.html}.") - (license license:expat))) - (define-public ghc-hspec-expectations (package (name "ghc-hspec-expectations") -- cgit v1.2.3 From ebbd30ff399e1194dafbf7f1c58dd07272f18624 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 27 Dec 2019 22:43:25 +0100 Subject: gnu: Add xournalpp. * gnu/packages/pdf.scm (xournalpp): New variable. --- gnu/packages/pdf.scm | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 368b2ce69e..13cc384204 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Ben Sturmfels ;;; Copyright © 2019 Hartmut Goebel +;;; Copyright © 2020 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,6 +46,7 @@ (define-module (gnu packages pdf) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) @@ -55,6 +57,7 @@ (define-module (gnu packages pdf) #:use-module (gnu packages djvu) #:use-module (gnu packages fontutils) #:use-module (gnu packages game-development) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) @@ -74,6 +77,7 @@ (define-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-check) #:use-module (gnu packages python-web) @@ -82,8 +86,10 @@ (define-module (gnu packages pdf) #:use-module (gnu packages sdl) #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) + #:use-module (gnu packages tex) #:use-module (gnu packages tls) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (srfi srfi-1)) @@ -752,6 +758,94 @@ (define-public xournal using a stylus.") (license license:gpl2+))) +(define-public xournalpp + (package + (name "xournalpp") + (version "1.0.17") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xournalpp/xournalpp.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xw2mcgnm4sa9hrhfgp669lfypw97drxjmz5w8i5whaprpvmkxzw")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list "-DENABLE_CPPUNIT=ON") ;enable tests + #:imported-modules ((guix build glib-or-gtk-build-system) + ,@%cmake-build-system-modules) + #:modules (((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build cmake-build-system) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-permissions-on-po-files + (lambda _ + ;; Always generate translations. A recent upstream patch + ;; disabled it. + (substitute* "po/CMakeLists.txt" + (("gettext_create_translations \\(\"\\$\\{potfile\\}\"\\)") + "gettext_create_translations (\"${potfile}\" ALL)")) + ;; Make sure 'msgmerge' can modify the PO files. + (for-each (lambda (po) (chmod po #o666)) + (find-files "." "\\.po$")) + #t)) + (add-after 'install 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (native-inputs + `(("cppunit" ,cppunit) + ("gcc" ,gcc-8) ;requires gcc 8+ + ("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("libsndfile" ,libsndfile) + ("libxml2" ,libxml2) + ("libzip" ,libzip) + ("lua" ,lua) ;FIXME: It cannot find the Lua library. + ("poppler" ,poppler) + ("portaudio" ,portaudio) + ("texlive-bin" ,texlive-bin))) + (home-page "https://github.com/xournalpp/xournalpp") + (synopsis "Handwriting notetaking software with PDF annotation support") + (description "Xournal++ is a hand note taking software written in +C++ with the target of flexibility, functionality and speed. Stroke +recognizer and other parts are based on Xournal code. + +Xournal++ features: + +@itemize +@item Support for Pen pressure, e.g., Wacom Tablet +@item Support for annotating PDFs +@item Fill shape functionality +@item PDF Export (with and without paper style) +@item PNG Export (with and without transparent background) +@item Allow to map different tools / colors etc. to stylus buttons / +mouse buttons +@item Sidebar with Page Previews with advanced page sorting, PDF +Bookmarks and Layers (can be individually hidden, editing layer can be +selected) +@item enhanced support for image insertion +@item Eraser with multiple configurations +@item LaTeX support +@item bug reporting, autosave, and auto backup tools +@item Customizeable toolbar, with multiple configurations, e.g., to +optimize toolbar for portrait / landscape +@item Page Template definitions +@item Shape drawing (line, arrow, circle, rectangle) +@item Shape resizing and rotation +@item Rotation snapping every 45 degrees +@item Rect snapping to grid +@item Audio recording and playback alongside with handwritten notes +@item Multi Language Support, Like English, German, Italian... +@item Plugins using LUA Scripting +@end itemize") + (license license:gpl2+))) + (define-public python-reportlab (package (name "python-reportlab") -- cgit v1.2.3 From 27b09f3ab11a30821a5ce0b071aac1bc6156497d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Feb 2020 18:36:27 +0100 Subject: gnu: ghc-text-conversions: Fix typo. This follows up on commit 5cd9a4103e74fb1eb73114d84786d9c08379f22b. * gnu/packages/haskell-xyz.scm (ghc-text-conversions)[native-inputs]: Use hspec-discover instead of ghc-hspec-discover. --- gnu/packages/haskell-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index ea9efe70fd..7825963523 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8241,7 +8241,7 @@ (define-public ghc-text-conversions ("ghc-errors" ,ghc-errors))) (native-inputs `(("ghc-hspec" ,ghc-hspec) - ("ghc-hspec-discover" ,ghc-hspec-discover))) + ("hspec-discover" ,hspec-discover))) (home-page "https://github.com/cjdev/text-conversions#readme") (synopsis "Safe conversions between textual types") (description "Safe conversions between textual types") -- cgit v1.2.3 From 13c6f9c9885092fe693ad29b0fe1e807de11a548 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sat, 8 Feb 2020 18:08:08 +0100 Subject: gnu: musl: Update home page. * gnu/packages/musl.scm (musl)[home-page]: Update. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/musl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/musl.scm b/gnu/packages/musl.scm index 6a6344efb5..7e4e27d00d 100644 --- a/gnu/packages/musl.scm +++ b/gnu/packages/musl.scm @@ -44,7 +44,7 @@ (define-public musl (synopsis "Small C standard library") (description "musl is a simple and lightweight C standard library. It strives to be correct in the sense of standards-conformance and safety.") - (home-page "https://www.musl-libc.org") + (home-page "https://musl.libc.org") ;; Musl as a whole is released under the Expat license. Parts of it are ;; derived from various third-party projects that are released under ;; non-copyleft licenses. See the COPYRIGHT file for details. -- cgit v1.2.3 From 2846aec2f7d53b9244ad55c1436437843287426a Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Sun, 9 Feb 2020 16:10:28 +0100 Subject: gnu: chicken: Move to a separate module. * gnu/packages/scheme.scm (chicken): Move to chicken.scm. * gnu/packages/chicken.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Julien Lepiller --- gnu/local.mk | 1 + gnu/packages/chicken.scm | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ gnu/packages/scheme.scm | 41 ------------------------------ 3 files changed, 67 insertions(+), 41 deletions(-) create mode 100644 gnu/packages/chicken.scm (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 64ad653542..d86b39cacb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -109,6 +109,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/check.scm \ %D%/packages/chemistry.scm \ %D%/packages/chez.scm \ + %D%/packages/chicken.scm \ %D%/packages/chromium.scm \ %D%/packages/ci.scm \ %D%/packages/cinnamon.scm \ diff --git a/gnu/packages/chicken.scm b/gnu/packages/chicken.scm new file mode 100644 index 0000000000..53631f9bd6 --- /dev/null +++ b/gnu/packages/chicken.scm @@ -0,0 +1,66 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ekaitz Zarraga +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages chicken) + #:use-module (gnu packages) + #:use-module (guix packages) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module ((guix licenses) + #:select (bsd-3))) + +(define-public chicken + (package + (name "chicken") + (version "5.0.0") + (source (origin + (method url-fetch) + (uri (string-append "https://code.call-cc.org/releases/" + version "/chicken-" version ".tar.gz")) + (sha256 + (base32 + "15b5yrzfa8aimzba79x7v6y282f898rxqxfxrr446sjx9jwlpfd8")))) + (build-system gnu-build-system) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) + + ;; No `configure' script; run "make check" after "make install" as + ;; prescribed by README. + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases 'check))) + + #:make-flags (let ((out (assoc-ref %outputs "out"))) + (list "PLATFORM=linux" + (string-append "PREFIX=" out) + (string-append "VARDIR=" out "/var/lib"))) + + ;; Parallel builds are not supported, as noted in README. + #:parallel-build? #f)) + (home-page "http://www.call-cc.org/") + (synopsis "R5RS Scheme implementation that compiles native code via C") + (description + "CHICKEN is a compiler for the Scheme programming language. CHICKEN +produces portable and efficient C, supports almost all of the R5RS Scheme +language standard, and includes many enhancements and extensions.") + (license bsd-3))) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 1009896a70..c891a77a18 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -368,47 +368,6 @@ (define-public hop mashups, office (web agendas, mail clients, ...), etc.") (license gpl2+))) -(define-public chicken - (package - (name "chicken") - (version "5.0.0") - (source (origin - (method url-fetch) - (uri (string-append "https://code.call-cc.org/releases/" - version "/chicken-" version ".tar.gz")) - (sha256 - (base32 - "15b5yrzfa8aimzba79x7v6y282f898rxqxfxrr446sjx9jwlpfd8")))) - (build-system gnu-build-system) - (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-1)) - - ;; No `configure' script; run "make check" after "make install" as - ;; prescribed by README. - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'check) - (add-after 'install 'check - (assoc-ref %standard-phases 'check))) - - #:make-flags (let ((out (assoc-ref %outputs "out"))) - (list "PLATFORM=linux" - (string-append "PREFIX=" out) - (string-append "VARDIR=" out "/var/lib"))) - - ;; Parallel builds are not supported, as noted in README. - #:parallel-build? #f)) - (home-page "http://www.call-cc.org/") - (synopsis "R5RS Scheme implementation that compiles native code via C") - (description - "CHICKEN is a compiler for the Scheme programming language. CHICKEN -produces portable and efficient C, supports almost all of the R5RS Scheme -language standard, and includes many enhancements and extensions.") - (license bsd-3))) - (define-public scheme48 (package (name "scheme48") -- cgit v1.2.3 From 7f6cb6bbac181a11859283922037e374a82035db Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Sun, 9 Feb 2020 16:51:44 +0100 Subject: gnu: chicken: Update to 5.1.0. * gnu/packages/chicken.scm (chicken): Update to 5.1.0. [propagated-inputs]: Add gcc-toolchain. Signed-off-by: Julien Lepiller --- gnu/packages/chicken.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chicken.scm b/gnu/packages/chicken.scm index 53631f9bd6..2034ca942a 100644 --- a/gnu/packages/chicken.scm +++ b/gnu/packages/chicken.scm @@ -21,20 +21,21 @@ (define-module (gnu packages chicken) #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module (guix download) + #:use-module (gnu packages commencement) #:use-module ((guix licenses) #:select (bsd-3))) (define-public chicken (package (name "chicken") - (version "5.0.0") + (version "5.1.0") (source (origin (method url-fetch) (uri (string-append "https://code.call-cc.org/releases/" version "/chicken-" version ".tar.gz")) (sha256 (base32 - "15b5yrzfa8aimzba79x7v6y282f898rxqxfxrr446sjx9jwlpfd8")))) + "0jsbp3kp0134f318j3wpd1n85gf8qzh034fn198gvazsv2l024aw")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -57,6 +58,7 @@ (define-public chicken ;; Parallel builds are not supported, as noted in README. #:parallel-build? #f)) + (propagated-inputs `(("gcc-toolchain", gcc-toolchain))) (home-page "http://www.call-cc.org/") (synopsis "R5RS Scheme implementation that compiles native code via C") (description -- cgit v1.2.3 From e81344428726f3dae5d2a2e7bb296f46fcde6cc5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Feb 2020 23:12:16 +0100 Subject: Update e-mail address for Jakob L. Kreuze. As requested here: . * .mailmap: Add an entry for Jakob. * gnu/machine.scm, gnu/machine/digital-ocean.scm, gnu/machine/ssh.scm, gnu/packages/admin.scm, gnu/packages/i2p.scm, gnu/packages/music.scm, gnu/packages/web.scm, gnu/tests/reconfigure.scm, guix/scripts/deploy.scm, guix/scripts/system/reconfigure.scm: Update their e-mail address. --- .mailmap | 1 + gnu/machine.scm | 2 +- gnu/machine/digital-ocean.scm | 2 +- gnu/machine/ssh.scm | 2 +- gnu/packages/admin.scm | 2 +- gnu/packages/i2p.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/web.scm | 2 +- gnu/tests/reconfigure.scm | 2 +- guix/scripts/deploy.scm | 2 +- guix/scripts/system/reconfigure.scm | 2 +- 11 files changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/.mailmap b/.mailmap index 23b5b6a1c4..a1cbf02030 100644 --- a/.mailmap +++ b/.mailmap @@ -30,6 +30,7 @@ Eric Dvorsak George Clemmer ison Ivan Vilata i Balaguer +Jakob L. Kreuze Jeff Mickey John Darrington John J. Foerch diff --git a/gnu/machine.scm b/gnu/machine.scm index bdd92d9592..434d78ab41 100644 --- a/gnu/machine.scm +++ b/gnu/machine.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 David Thompson -;;; Copyright © 2019 Jakob L. Kreuze +;;; Copyright © 2019 Jakob L. Kreuze ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/machine/digital-ocean.scm b/gnu/machine/digital-ocean.scm index 6f7cf8fb30..1a91a3a49b 100644 --- a/gnu/machine/digital-ocean.scm +++ b/gnu/machine/digital-ocean.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Jakob L. Kreuze +;;; Copyright © 2019 Jakob L. Kreuze ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index d6ce1253a4..6374373e22 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Jakob L. Kreuze +;;; Copyright © 2019 Jakob L. Kreuze ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 26e2693431..ead8303f25 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -25,7 +25,7 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2019 Björn Höfling -;;; Copyright © 2019 Jakob L. Kreuze +;;; Copyright © 2019 Jakob L. Kreuze ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Guillaume Le Vaillant diff --git a/gnu/packages/i2p.scm b/gnu/packages/i2p.scm index f8c3f3bb5c..a317cd590c 100644 --- a/gnu/packages/i2p.scm +++ b/gnu/packages/i2p.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Jakob L. Kreuze +;;; Copyright © 2019 Jakob L. Kreuze ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3ef04d7202..ea3bbe1cca 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2018 Björn Höfling ;;; Copyright © 2019 Gabriel Hondet ;;; Copyright © 2019 Timotej Lazar -;;; Copyright © 2019 Jakob L. Kreuze +;;; Copyright © 2019 Jakob L. Kreuze ;;; Copyright © 2019 raingloom ;;; Copyright © 2019 David Wilson ;;; Copyright © 2019, 2020 Alexandros Theodotou diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b19a638355..f7ebcaf037 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2019 Brendan Tildesley ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Hartmut Goebel -;;; Copyright © 2019 Jakob L. Kreuze +;;; Copyright © 2019 Jakob L. Kreuze ;;; Copyright © 2019 Florian Pelz ;;; Copyright © 2020 Timotej Lazar ;;; diff --git a/gnu/tests/reconfigure.scm b/gnu/tests/reconfigure.scm index fb11e6164e..8b85920979 100644 --- a/gnu/tests/reconfigure.scm +++ b/gnu/tests/reconfigure.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Jakob L. Kreuze +;;; Copyright © 2019 Jakob L. Kreuze ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index bc0ceabd3f..ad05c333dc 100644 --- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 David Thompson -;;; Copyright © 2019 Jakob L. Kreuze +;;; Copyright © 2019 Jakob L. Kreuze ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm index 2f9dbb2508..77a72307b4 100644 --- a/guix/scripts/system/reconfigure.scm +++ b/guix/scripts/system/reconfigure.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Christopher Baines -;;; Copyright © 2019 Jakob L. Kreuze +;;; Copyright © 2019 Jakob L. Kreuze ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From 1c8b70c875843b98cd0ddac366f6a9272d335a46 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 9 Feb 2020 23:01:58 +0100 Subject: gnu: Add perl-config-grammar. * gnu/packages/perl.scm (perl-config-grammar): New variable. --- gnu/packages/perl.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 9fc3493a5d..f513a78f76 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Stephen J. Scheck +;;; Copyright © 2020 Vincent Legoll ;;; ;;; This file is part of GNU Guix. ;;; @@ -1380,6 +1381,26 @@ (define-public perl-conf-libconfig languages.") (license bsd-3))) +(define-public perl-config-grammar + (package + (name "perl-config-grammar") + (version "1.13") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/D/DS/DSCHWEI/" + "Config-Grammar-" version ".tar.gz")) + (sha256 + (base32 "1qynf5bk6mnk90nggm3z8rdz2535kmqg46s0vj93pi68r6ia7cx8")))) + (build-system perl-build-system) + (home-page "https://metacpan.org/release/Config-Grammar") + (synopsis "Grammar-based config parser") + (description + "Config::Grammar is a module to parse configuration files. The +configuration may consist of multiple-level sections with assignments and +tabular data.") + (license (package-license perl)))) + (define-public perl-config-any (package (name "perl-config-any") -- cgit v1.2.3 From 200514cd8fe1797d7653386a7b1ed1106c61164e Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 9 Feb 2020 20:56:58 +0100 Subject: gnu: Add font-jetbrains-mono. * gnu/packages/fonts.scm (font-jetbrains-mono): New variable. --- gnu/packages/fonts.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 358c72f07a..2ec1689d6f 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1563,3 +1563,24 @@ (define-public font-dseg displays (7SEG, 14SEG). DSEG includes the roman alphabet and symbol glyphs. This package provides the TrueType fonts.") (license license:silofl1.1))) + +(define-public font-jetbrains-mono + (package + (name "font-jetbrains-mono") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri + (string-append "https://download.jetbrains.com/fonts/" + "JetBrainsMono-" version ".zip")) + (sha256 + (base32 "0qlp4902i1v6ni04b6gdip8rxw6wpkdk9w7dir1yn9an5mvbkyar")))) + (build-system font-build-system) + (home-page "https://www.jetbrains.com/lp/mono/") + (synopsis "Mono typeface for developers") + (description + "JetBrains Mono is a font family dedicated to developers. JetBrains +Mono’s typeface forms are simple and free from unnecessary details. Rendered +in small sizes, the text looks crisper.") + (license license:asl2.0))) -- cgit v1.2.3 From 5d94702efeb26d5c1651d9a8898d23b53d850c63 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 10 Feb 2020 00:16:44 +0100 Subject: gnu: Add copyright line. Add missing copyright line for commit 200514cd8fe1797d7653386a7b1ed1106c61164e. --- gnu/packages/fonts.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 2ec1689d6f..7297c277f1 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2019 Baptiste Strazzulla ;;; Copyright © 2019 Alva ;;; Copyright © 2019 Alexandros Theodotou +;;; Copyright © 2020 Damien Cassou ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From 47560aa29f20b83b20f5cef9e943dff871ffa5d1 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 9 Feb 2020 10:08:01 +0100 Subject: gnu: polybar: Install man page. * gnu/packages/wm.scm (polybar)[native-inputs]: Add python-sphinx. --- gnu/packages/wm.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 21378d9273..d737926c65 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2019 Noodles! ;;; Copyright © 2019 Alexandru-Sergiu Marton ;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -96,6 +97,7 @@ (define-module (gnu packages wm) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages serialization) + #:use-module (gnu packages sphinx) #:use-module (gnu packages suckless) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) @@ -1293,6 +1295,7 @@ (define-public polybar ("xcb-util-xrm" ,xcb-util-xrm))) (native-inputs `(("pkg-config" ,pkg-config) + ("python-sphinx" ,python-sphinx) ; for the manual ("python-2" ,python-2) ; lib/xpp depends on python 2 ("python" ,python))) ; xcb-proto depends on python 3 (home-page "https://polybar.github.io/") -- cgit v1.2.3 From e2684594f62ecfc676ede5f3f7b560327565a814 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 10 Feb 2020 00:33:06 +0100 Subject: gnu: polybar: Add comment about build specificity. * gnu/packages/wm.scm (polybar): Add comment about order of native inputs. --- gnu/packages/wm.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index d737926c65..3c0d14efa8 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1296,6 +1296,8 @@ (define-public polybar (native-inputs `(("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx) ; for the manual + ;; XXX: "python" input must be located after "python-2", or the package + ;; fails to build with "missing required python module: xcbgen". ("python-2" ,python-2) ; lib/xpp depends on python 2 ("python" ,python))) ; xcb-proto depends on python 3 (home-page "https://polybar.github.io/") -- cgit v1.2.3 From cde4cb4dd29203eb2f15716e3735cbaa36853f6c Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 9 Feb 2020 10:10:48 +0100 Subject: gnu: autorandr: Update to 1.9. * gnu/packages/xdisorg.scm (autorandr): Update to 1.9. [native-inputs]: Remove man-db. [arguments]: Install XDG autostart config. --- gnu/packages/xdisorg.scm | 90 +++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 47 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 45f431c7bb..75e53480f9 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2020 Guillaume Le Vaillant ;;; Copyright © 2020 David Wilson ;;; Copyright © 2020 Ivan Vilata i Balaguer +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -153,58 +154,53 @@ (define-public arandr (license license:gpl3+))) (define-public autorandr - ;; Use latest commit since 1.7 lacks many new features such as the - ;; autorandr_launcher. - (let ((commit "b484c0ea9c9a4838278bbd661a7cc384333c1df8")) - (package - (name "autorandr") - (version (git-version "1.7" "1" commit)) - (home-page "https://github.com/phillipberndt/autorandr") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0da17kzsisjv3s993j5idkk1n2d2cvjdn7pngs2b0ic1r2h5z02h")))) - (build-system python-build-system) - (native-inputs - `(("man-db" ,man-db))) - (inputs - `(("xrandr" ,xrandr) - ("libxcb" ,libxcb))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'configure - (lambda* (#:key inputs #:allow-other-keys) + (package + (name "autorandr") + (version "1.9") + (home-page "https://github.com/phillipberndt/autorandr") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bb0l7fcm5lcx9y02zdxv7pfdqf4v4gsc5br3v1x9gzjvqj64l7n")))) + (build-system python-build-system) + (inputs + `(("xrandr" ,xrandr) + ("libxcb" ,libxcb))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((xrandr (string-append (assoc-ref inputs "xrandr") + "/bin/xrandr"))) + (substitute* "contrib/etc/xdg/autostart/autorandr.desktop" + (("/usr") (assoc-ref outputs "out"))) (substitute* "autorandr.py" - (("popen\\(\"xrandr") (string-append "popen(\"" - (assoc-ref inputs "xrandr") - "/bin/xrandr")) - (("\\[\"xrandr") (string-append "[\"" - (assoc-ref inputs "xrandr") - "/bin/xrandr"))) - #t)) - (add-after 'install 'install-contrib - (lambda* (#:key outputs #:allow-other-keys) - (invoke "make" - (string-append "DESTDIR=" (assoc-ref outputs "out")) - "PREFIX=" - "BASH_COMPLETIONS_DIR=etc/bash_completiond.d" - "install_manpage" - "install_bash_completion" - "install_launcher")))))) - (synopsis "Auto-detect connected displays and load appropriate setup") - (description "Autorandr wraps around xrandr to help with X11 + (("popen\\(\"xrandr") (string-append "popen(\"" xrandr)) + (("\\[\"xrandr") (string-append "[\"" xrandr)))) + #t)) + (add-after 'install 'install-contrib + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" + (string-append "DESTDIR=" (assoc-ref outputs "out")) + "PREFIX=" + "BASH_COMPLETIONS_DIR=etc/bash_completiond.d" + "install_manpage" + "install_bash_completion" + "install_launcher" + "install_autostart_config")))))) + (synopsis "Auto-detect connected displays and load appropriate setup") + (description "Autorandr wraps around xrandr to help with X11 multi-screen configuration management. It allows the user to create profiles for various multi-screen setups. Autorandr automatically detects the profiles that can be activated based on the connected hardware. Hook scripts can be used to further tweak the behaviour of the different profiles.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public bemenu (package -- cgit v1.2.3 From 718a6458df3f77de2c9fd8e6634ad41e48e83333 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 9 Feb 2020 10:13:04 +0100 Subject: gnu: zsh: Update to 5.7.1. * gnu/packages/shells.scm (zsh): Update to 5.7.1. --- gnu/packages/shells.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index a679810e97..f4dff77e94 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2019 Timothy Sample ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -395,7 +396,7 @@ (define-public tcsh (define-public zsh (package (name "zsh") - (version "5.6.2") + (version "5.7.1") (source (origin (method url-fetch) (uri (list (string-append @@ -406,7 +407,7 @@ (define-public zsh ".tar.xz"))) (sha256 (base32 - "17iffliqcj4hv91g0bd2sxsyfcz51mfyh97sp2iyrs2p0mndc2x5")))) + "1s3yww0mzgvpc48kp0x868mm3gbna42sbgzya0nknj0x5hn2jq3j")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre") #:phases -- cgit v1.2.3 From 81bc9118389eff6175975d535e56e47bdd99ee66 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 9 Feb 2020 10:14:59 +0100 Subject: gnu: zsh: Enable maildir. * gnu/packages/shells.scm (zsh)[arguments]: Add configure flag for maildir. --- gnu/packages/shells.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index f4dff77e94..ec7e658972 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -409,7 +409,8 @@ (define-public zsh (base32 "1s3yww0mzgvpc48kp0x868mm3gbna42sbgzya0nknj0x5hn2jq3j")))) (build-system gnu-build-system) - (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre") + (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre" + "--enable-maildir-support") #:phases (modify-phases %standard-phases (add-before 'configure 'fix-sh -- cgit v1.2.3 From 57f90b2a245786b6c6683b0cb95aa79c07273ff4 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 9 Feb 2020 10:13:30 +0100 Subject: gnu: git-crypt: Update to 0.6.0. * gnu/packages/version-control.scm (git-crypt): Update to 0.6.0. --- gnu/packages/version-control.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 57cc18114c..24985d0c20 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2020 Roel Janssen +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -594,7 +595,7 @@ (define-public libgit2 (define-public git-crypt (package (name "git-crypt") - (version "0.5.0") + (version "0.6.0") (source (origin (method git-fetch) @@ -603,7 +604,7 @@ (define-public git-crypt (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1x9209n3k49k998saadr2d0lmvs01smjinx7gzzyjdwj9l904sii")))) + (base32 "1ba5s0fvmd9hhnfhfsjrm40v0qpxfnwc8vmm55m0k4dryzkzx66q")))) (build-system gnu-build-system) (inputs `(("git" ,git) -- cgit v1.2.3 From ddc5e7468484b0527e6ee423bc42186283dd9998 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 9 Feb 2020 10:15:28 +0100 Subject: gnu: git-crypt: Install man page. * gnu/packages/version-control.scm (git-crypt)[native-inputs]: Add dockbook-xsl, libxslt. [arguments]: Add phase patch-makefile. --- gnu/packages/version-control.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 24985d0c20..2ca64e4cdc 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -609,20 +609,33 @@ (define-public git-crypt (inputs `(("git" ,git) ("openssl" ,openssl))) + (native-inputs + `(("docbook-xsl" ,docbook-xsl) + ("libxslt" ,libxslt))) (arguments `(#:tests? #f ; No tests. #:phases (modify-phases %standard-phases (delete 'configure) + (add-after 'unpack 'patch-makefile + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Makefile" + (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/manpages/docbook.xsl"))) + #t)) (replace 'build (lambda _ - (invoke "make"))) + (invoke "make" "ENABLE_MAN=yes"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (invoke "make" "install" + "ENABLE_MAN=yes" (string-append "PREFIX=" out)))))))) - (home-page "https://www.agwa.name/projects/git-crypt") + (home-page "https://www.agwa.name/projects/git-crypt/") (synopsis "Transparent encryption of files in a git repository") (description "git-crypt enables transparent encryption and decryption of files in a git repository. Files which you choose to protect are encrypted when -- cgit v1.2.3 From b51863d24023b0026dbaebe8e512c4b81b44fb32 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 9 Feb 2020 16:34:23 +0100 Subject: gnu: Add tunctl. * gnu/packages/networking.scm (tunctl): New variable. --- gnu/packages/networking.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ed339524c0..acfb3a9f96 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2019 Jan Wielkiewicz ;;; Copyright © 2019 Daniel Schaefer ;;; Copyright © 2019 Diego N. Barbato +;;; Copyright © 2020 Vincent Legoll ;;; ;;; This file is part of GNU Guix. ;;; @@ -2824,6 +2825,43 @@ (define-public ipcalc (home-page "http://jodies.de/ipcalc") (license license:gpl2+))) +(define-public tunctl + (package + (name "tunctl") + (version "1.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/tunctl/" + "tunctl-" version ".tar.gz")) + (sha256 + (base32 "1zsgn7w6l2zh2q0j6qaw8wsx981qcr536qlz1lgb3b5zqr66qama")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'bootstrap) ;there is no configure.ac file + (delete 'configure) ;there is no configure script + (delete 'check) ;there are no tests + (replace 'build + (lambda _ + (setenv "CC" "gcc") + (invoke "make" "tunctl"))) + ;; TODO: Requires docbook2x to generate man page from SGML. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "tunctl" bin)) + #t))))) + (home-page "http://tunctl.sourceforge.net") + (synopsis "Utility to set up and maintain TUN/TAP network interfaces") + (description "Tunctl is used to set up and maintain persistent TUN/TAP +network interfaces, enabling user applications to simulate network traffic. +Such interfaces are useful for VPN software, virtualization, emulation, +simulation, and a number of other applications.") + (license license:gpl2))) + (define-public vde2 (package (name "vde2") -- cgit v1.2.3 From 24d9354c8002f2e7aa02ab85b5bd151c7ea27d2a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 10 Feb 2020 01:00:42 +0100 Subject: gnu: tunctl: Fix source URI. * gnu/packages/networking.scm (tunctl)[source]: Fix URI. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index acfb3a9f96..e8ad57e8ae 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2832,7 +2832,7 @@ (define-public tunctl (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/tunctl/" + (uri (string-append "mirror://sourceforge/tunctl/tunctl/" version "/" "tunctl-" version ".tar.gz")) (sha256 (base32 "1zsgn7w6l2zh2q0j6qaw8wsx981qcr536qlz1lgb3b5zqr66qama")))) -- cgit v1.2.3 From df931ac39c40ac8a702e37cb434d9a1016606ed7 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 9 Feb 2020 10:11:25 +0100 Subject: gnu: password-store: Install fish and zsh completions. * gnu/packages/password-utils.scm (password-store)[arguments]: Remove phase install-shell-completions. Adjust make-flags. --- gnu/packages/password-utils.scm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 8d74490d23..1e93e5d9ad 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2019 Jens Mølgaard ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2020 Guillaume Le Vaillant +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -497,17 +498,11 @@ (define-public password-store "sed" "tree" "which" "xclip")))) (wrap-program (string-append out "/bin/pass") `("PATH" ":" prefix (,(string-join path ":")))) - #t))) - (add-after 'wrap-path 'install-shell-completions - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bashcomp (string-append out "/etc/bash_completion.d"))) - ;; TODO: install fish and zsh completions. - (mkdir-p bashcomp) - (copy-file "src/completion/pass.bash-completion" - (string-append bashcomp "/pass")) #t)))) - #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) + #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output) + "WITH_ALLCOMP=yes" + (string-append "BASHCOMPDIR=" + %output "/etc/bash_completion.d")) ;; Parallel tests may cause a race condition leading to a ;; timeout in some circumstances. #:parallel-tests? #f -- cgit v1.2.3 From e7db97db6353d631e9319360a17d9b26fc8d0bc0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 30 Dec 2019 02:43:59 +0100 Subject: gnu: Add lure. * gnu/packages/games.scm (make-lure-package): New variable. (lure, lure-de, lure-es, lure-fr, lure-it): New variables. --- gnu/packages/games.scm | 108 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 78e0042aac..5aa4ab7b01 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7730,6 +7730,114 @@ (define-public drascula ;; Drascula uses a BSD-like license. (license (license:non-copyleft "file:///readme.txt")))) +(define (make-lure-package name language hash) + (package + (name name) + (version "1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/scummvm/extras/" + "Lure%20of%20the%20Temptress/" + name "-" version ".zip")) + (sha256 + (base32 hash)))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (share (string-append out "/share")) + (data (string-append share "/lure/" ,language)) + (apps (string-append share "/applications")) + (bin (string-append out "/bin")) + (executable (string-append bin "/" ,name)) + (scummvm (assoc-ref %build-inputs "scummvm"))) + (let ((unzip (string-append (assoc-ref %build-inputs "unzip") + "/bin/unzip"))) + (invoke unzip "-j" (assoc-ref %build-inputs "source"))) + (let ((doc (string-append share "/doc/lure-" ,version))) + (for-each (lambda (f) (install-file f doc)) + (find-files "." "\\.(txt|PDF|pdf)$"))) + (for-each (lambda (f) (install-file f data)) + (find-files "." "\\.(vga|VGA)$")) + ;; Build the executable. + (mkdir-p bin) + (let ((bash (assoc-ref %build-inputs "bash"))) + (with-output-to-file executable + (lambda () + (format #t "#!~a/bin/bash~%" bash) + (format #t "exec ~a/bin/scummvm -q ~a -p ~a lure~%" + scummvm ,language data)))) + (chmod executable #o755) + ;; Create desktop file. There is no dedicated + ;; icon for the game, so we borrow SCUMMVM's. + (mkdir-p apps) + (with-output-to-file (string-append apps "/" ,name ".desktop") + (lambda _ + (format #t + "[Desktop Entry]~@ + Name=Lure of the Temptress~@ + GenericName=Lure~@ + Exec=~a~@ + Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@ + Categories=AdventureGame;Game;RolePlaying;~@ + Keywords=game;adventure;roleplaying;2D,fantasy;~@ + Comment=Classic 2D point and click adventure game~@ + Comment[de]=klassisches 2D-Abenteuerspiel in Zeigen-und-Klicken-Manier~@ + Comment[fr]=Jeu classique d'aventure pointer-et-cliquer en 2D~@ + Comment[it]=Gioco classico di avventura punta e clicca 2D~@ + Type=Application~%" + executable scummvm))) + #t)))) + (native-inputs + `(("bash" ,bash) + ("unzip" ,unzip))) + (inputs + `(("scummvm" ,scummvm))) + (home-page "https://www.scummvm.org") + (synopsis "2D point and click fantasy adventure game") + (description + "Lure of the Temptress is a classic 2D point and click adventure game. + +You are Diermot, an unwilling hero who'd prefer a quiet life, and are, to all +intents and purposes, a good man. After decades of unrest the King has united +the warring factions in his kingdom and all his lands are at peace, except +a remote region around a town called Turnvale. A revolt has recently taken +place in Turnvale, a revolt orchestrated by an apprentice sorceress called +Selena, the titular temptress. The king calls together his finest horsemen +and heads off (with you in tow) to Turnvale just to witness how hellish +mercenary monsters called Skorl are invading the town. + +The king's men are defeated, the king is killed and you fall of your horse and +bang your head heavily on the ground. You have been *unconscious for a while +when you realize that you are in a dingy cell guarded by a not so friendly +Skorl. Maybe it would be an idea to try and escape...") + (license (license:non-copyleft "file:///README")))) + +(define-public lure + (make-lure-package + "lure" "en" "0201i70qcs1m797kvxjx3ygkhg6kcl5yf49sihba2ga8l52q45zk")) + +(define-public lure-de + (make-lure-package + "lure-de" "de" "0sqq7h5llml6rv85x0bfv4bgzwhs4c82p4w4zmfcaab6cjlad0sy")) + +(define-public lure-es + (make-lure-package + "lure-es" "es" "1dvv5znvlsakw6w5r16calv9jkgw27aymgybsf4q22lcmpxbj1lk")) + +(define-public lure-fr + (make-lure-package + "lure-fr" "fr" "1y51jjb7f8023832g44vd1jsb6ni85586pi2n5hjg9qjk6gi90r9")) + +(define-public lure-it + (make-lure-package + "lure-it" "it" "1ks6n39r1cllisrrh6pcr39swsdv7ng3gx5c47vaw71zzfr70hjj")) + (define-public gnurobots (package (name "gnurobots") -- cgit v1.2.3 From eca528cca987ada1942721403794dff32121bfa6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 10 Feb 2020 14:03:15 +0100 Subject: gnu: make-lure-package: Fix data and documentation location. * gnu/packages/games.scm (make-lure-package)[arguments]: Make data and documentation location dependent on localization. [native-inputs]: Move bash... [inputs]: here. --- gnu/packages/games.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5aa4ab7b01..e82c3c44b6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7751,7 +7751,7 @@ (define (make-lure-package name language hash) (use-modules (guix build utils)) (let* ((out (assoc-ref %outputs "out")) (share (string-append out "/share")) - (data (string-append share "/lure/" ,language)) + (data (string-append share "/" ,name "/" ,language)) (apps (string-append share "/applications")) (bin (string-append out "/bin")) (executable (string-append bin "/" ,name)) @@ -7759,7 +7759,7 @@ (define (make-lure-package name language hash) (let ((unzip (string-append (assoc-ref %build-inputs "unzip") "/bin/unzip"))) (invoke unzip "-j" (assoc-ref %build-inputs "source"))) - (let ((doc (string-append share "/doc/lure-" ,version))) + (let ((doc (string-append share "/doc/" ,name "-" ,version))) (for-each (lambda (f) (install-file f doc)) (find-files "." "\\.(txt|PDF|pdf)$"))) (for-each (lambda (f) (install-file f data)) @@ -7794,10 +7794,10 @@ (define (make-lure-package name language hash) executable scummvm))) #t)))) (native-inputs - `(("bash" ,bash) - ("unzip" ,unzip))) + `(("unzip" ,unzip))) (inputs - `(("scummvm" ,scummvm))) + `(("bash" ,bash) + ("scummvm" ,scummvm))) (home-page "https://www.scummvm.org") (synopsis "2D point and click fantasy adventure game") (description -- cgit v1.2.3 From cb2555e28f1ce4d7d70b2b60bed7ad93649772e4 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 3 Jan 2020 02:34:30 +0100 Subject: gnu: Add go-golang.org-x-sync-errgroup. * gnu/packages/golang.scm (go-golang.org-x-sync-errgroup): New variable. --- gnu/packages/golang.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9102469749..e0bcee9d7c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3077,3 +3077,30 @@ (define-public go-github-com-google-go-cmp-cmp are semantically equal in Go (for writing tests).") (home-page "https://godoc.org/github.com/google/go-cmp/cmp") (license license:asl2.0))) + +(define-public go-golang.org-x-sync-errgroup + (let ((commit "cd5d95a43a6e21273425c7ae415d3df9ea832eeb") + (revision "0")) + (package + (name "go-golang.org-x-sync-errgroup") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/sync") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds")))) + (build-system go-build-system) + (arguments + '(#:import-path "golang.org/x/sync/errgroup" + #:unpack-path "golang.org/x/sync")) + (synopsis "Synchronization, error propagation, and Context cancelation +for groups of goroutines working on subtasks of a common task.") + (description "This package provides synchronization, error propagation, +and Context cancelation for groups of goroutines working on subtasks of a +common task.") + (home-page "https://godoc.org/golang.org/x/sync/errgroup") + (license license:bsd-3)))) -- cgit v1.2.3 From 9d64d1509c67b44f24a24786343754c2c8491741 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 10 Feb 2020 14:58:26 +0100 Subject: gnu: Add go-gotest-tools-assert. * gnu/packages/golang.scm (go-gotest-tools-assert): New variable. --- gnu/packages/golang.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e0bcee9d7c..97acb2a9e9 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3104,3 +3104,42 @@ (define-public go-golang.org-x-sync-errgroup common task.") (home-page "https://godoc.org/golang.org/x/sync/errgroup") (license license:bsd-3)))) + +(define-public go-gotest-tools-assert + (package + (name "go-gotest-tools-assert") + (version "3.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gotestyourself/gotest.tools.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18sg8ih4b4h7g065zsfn9s00wplifmjvn77sqnp0lsmz91h91r5c")))) + (build-system go-build-system) + (arguments + `(#:import-path "gotest.tools/assert" + #:unpack-path "gotest.tools" + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-more + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (source (string-append (getenv "GOPATH") + "/src/gotest.tools/assert")) + (dest (string-append out "/src/gotest.tools/v3/assert"))) + (write source) + (newline) + (copy-recursively source dest #:keep-mtime? #t) + #t)))))) + (native-inputs + `(("go-github-com-pkg-errors" ,go-github-com-pkg-errors) + ("go-github-com-google-go-cmp-cmp" + ,go-github-com-google-go-cmp-cmp))) + (synopsis "Compare values and fail a test when a comparison fails") + (description "This package provides a way to compare values and fail a +test when a comparison fails.") + (home-page "https://github.com/gotestyourself/gotest.tools") + (license license:asl2.0))) -- cgit v1.2.3 From 639371c6d28465449216cb81b85d7b4b204f96b2 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 3 Jan 2020 02:34:32 +0100 Subject: gnu: Add gotestsum. * gnu/packages/golang.scm (gotestsum): New variable. --- gnu/packages/golang.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 97acb2a9e9..dbe716d584 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3143,3 +3143,39 @@ (define-public go-gotest-tools-assert test when a comparison fails.") (home-page "https://github.com/gotestyourself/gotest.tools") (license license:asl2.0))) + +(define-public gotestsum + (package + (name "gotestsum") + (version "0.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gotestyourself/gotestsum.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0y71qr3ss3hgc8c7nmvpwk946xy1jc5d8whsv6y77wb24ncla7n0")))) + (build-system go-build-system) + (arguments + '(#:import-path "gotest.tools/gotestsum")) + (native-inputs + `(("go-github-com-fatih-color" ,go-github-com-fatih-color) + ("go-golang.org-x-sync-errgroup" ,go-golang.org-x-sync-errgroup) + ("go-github-com-pkg-errors" ,go-github-com-pkg-errors) + ("go-github-com-sirupsen-logrus" + ,go-github-com-sirupsen-logrus) + ("go-github-com-spf13-pflag" ,go-github-com-spf13-pflag) + ("go-github-com-jonboulle-clockwork" + ,go-github-com-jonboulle-clockwork) + ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) + ("go-gotest-tools-assert" ,go-gotest-tools-assert) + ("go-github-com-google-go-cmp-cmp" + ,go-github-com-google-go-cmp-cmp))) + (synopsis "Go test runner with output optimized for humans") + (description "This package provides a @code{go test} runner with output +optimized for humans, JUnit XML for CI integration, and a summary of the +test results.") + (home-page "https://github.com/gotestyourself/gotestsum") + (license license:asl2.0))) -- cgit v1.2.3 From 2035134bff2f03948b2d17ce454cc7c7787b3c79 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 10 Feb 2020 11:19:03 +0100 Subject: gnu: txr: Update to 232. * gnu/packages/lisp.scm (txr): Update to 232. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index f82288a5ac..369d4fc4ec 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -797,7 +797,7 @@ (define-public confusion-mdl (define-public txr (package (name "txr") - (version "230") + (version "232") (source (origin (method git-fetch) @@ -808,7 +808,7 @@ (define-public txr (patches (search-patches "txr-shell.patch")) (sha256 (base32 - "1ma6nbqsnl4f8ndh47zzc8n5vzcny66v0z3ndddgm3g0bqaxzjzm")))) + "1vcnask4a1rxrljp4rcbkfihrndkv25l256l125vv39gjhf315xp")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("cc=gcc") -- cgit v1.2.3 From d8cae6cf82c8c61138f5d835d0f3f81f54d70d9c Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 10 Feb 2020 14:06:31 +0100 Subject: gnu: Add chessx. * gnu/packages/games.scm (chessx): New variable. --- gnu/packages/games.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index e82c3c44b6..1539a9cbcd 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9818,3 +9818,55 @@ (define-public eboard and chess engines.") (home-page "https://www.bergo.eng.br/eboard/") (license license:gpl2+))) + +(define-public chessx + (package + (name "chessx") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/chessx/chessx/" + version "/chessx-" version ".tgz")) + (sha256 + (base32 "09rqyra28w3z9ldw8sx07k5ap3sjlli848p737maj7c240rasc6i")))) + (build-system qt-build-system) + (native-inputs + `(("qttools" ,qttools))) + (inputs + `(("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia) + ("qtsvg" ,qtsvg) + ("zlib" ,zlib))) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "chessx.pro" + (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") + (string-append (assoc-ref inputs "qttools") "/bin/lrelease"))) + #t)) + (add-after 'fix-paths 'make-qt-deterministic + (lambda _ + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") + #t)) + (replace 'configure + (lambda _ + (invoke "qmake") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "release/chessx" (string-append out "/bin")) + (install-file "unix/chessx.desktop" + (string-append out "/share/applications"))) + #t))))) + (synopsis "Chess game database") + (description + "ChessX is a chess database. With ChessX you can operate on your +collection of chess games in many ways: browse, edit, add, organize, analyze, +etc. You can also play games on FICS or against an engine.") + (home-page "http://chessx.sourceforge.net/") + (license license:gpl2+))) -- cgit v1.2.3 From 814091efe2e36d83f10b874afe3f6da56ff34e4b Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 10 Feb 2020 14:59:58 +0100 Subject: gnu: Add stockfish. * gnu/packages/games.scm (stockfish): New variable. --- gnu/packages/games.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1539a9cbcd..c23f624251 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9870,3 +9870,41 @@ (define-public chessx etc. You can also play games on FICS or against an engine.") (home-page "http://chessx.sourceforge.net/") (license license:gpl2+))) + +(define-public stockfish + (package + (name "stockfish") + (version "11") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/official-stockfish/Stockfish.git") + (commit (string-append "sf_" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12mppipinymj8s1ipq9a7is453vncly49c32ym9wvyklsgyxfzlk")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:make-flags (list "-C" "src" + "build" + (string-append "PREFIX=" + (assoc-ref %outputs "out")) + (string-append "ARCH=" + ,(match (%current-system) + ("x86_64-linux" "x86-64") + ("i686-linux" "x86-32") + ("aarch64-linux" "general-64") + ("armhf-linux" "armv7") + ("mips64el-linux" "general-64") + (_ "general-32")))) + #:phases (modify-phases %standard-phases + (delete 'configure)))) + (synopsis "Strong chess engine") + (description + "Stockfish is a very strong chess engines. It is much stronger than the +best human chess grandmasters. It can be used with UCI-compatible GUIs like +ChessX.") + (home-page "https://stockfishchess.org/") + (license license:gpl3+))) -- cgit v1.2.3 From 90bce15998b0faf5afd60b1a3ee59e93547089e2 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 10 Feb 2020 16:46:10 +0100 Subject: gnu: go-gotest-tools: Factor out go-gotest-tools-source. * gnu/packages/golang.scm (go-gotest-tools-source): New procedure. (go-gotest-tools-assert)[source]: Use it. --- gnu/packages/golang.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index dbe716d584..5d0c2480b6 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3105,19 +3105,23 @@ (define-public go-golang.org-x-sync-errgroup (home-page "https://godoc.org/golang.org/x/sync/errgroup") (license license:bsd-3)))) +(define (go-gotest-tools-source version sha256-base32-hash) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gotestyourself/gotest.tools.git") + (commit (string-append "v" version)))) + (file-name (git-file-name "go-gotest-tools" version)) + (sha256 + (base32 sha256-base32-hash)))) + (define-public go-gotest-tools-assert (package (name "go-gotest-tools-assert") (version "3.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gotestyourself/gotest.tools.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "18sg8ih4b4h7g065zsfn9s00wplifmjvn77sqnp0lsmz91h91r5c")))) + (source + (go-gotest-tools-source version + "0071rjxp4xzcr3vprkaj1hdk35a3v45bx8v0ipk16wwc5hx84i2i")) (build-system go-build-system) (arguments `(#:import-path "gotest.tools/assert" -- cgit v1.2.3 From 944f370b55bdd483bf29e4bd1ac5a293633a1789 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 10 Feb 2020 16:50:49 +0100 Subject: gnu: go-gotest-tools: Factor out go-gotest-tools-package. * gnu/packages/golang.scm (go-gotest-tools-package): New procedure. (go-gotest-tools-assert): Use it. [arguments]<#:phases>[install-more]: Delete phase. --- gnu/packages/golang.scm | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 5d0c2480b6..f93b2c1ab7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3115,29 +3115,32 @@ (define (go-gotest-tools-source version sha256-base32-hash) (sha256 (base32 sha256-base32-hash)))) -(define-public go-gotest-tools-assert +(define (go-gotest-tools-package suffix) (package - (name "go-gotest-tools-assert") - (version "3.0.0") + (name (string-append "go-gotest-tools-" + (string-replace-substring suffix "/" "-"))) + (version "2.3.0") (source (go-gotest-tools-source version - "0071rjxp4xzcr3vprkaj1hdk35a3v45bx8v0ipk16wwc5hx84i2i")) + "0071rjxp4xzcr3vprkaj1hdk35a3v45bx8v0ipk16wwc5hx84i2i")) (build-system go-build-system) (arguments - `(#:import-path "gotest.tools/assert" - #:unpack-path "gotest.tools" - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-more - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (source (string-append (getenv "GOPATH") - "/src/gotest.tools/assert")) - (dest (string-append out "/src/gotest.tools/v3/assert"))) - (write source) - (newline) - (copy-recursively source dest #:keep-mtime? #t) - #t)))))) + `(#:import-path ,(string-append "gotest.tools/" suffix) + #:unpack-path "gotest.tools")) + (synopsis "@code{gotest-tools} part") + (description "This package provides a part of @code{gotest-tools}.") + (home-page "https://github.com/gotestyourself/gotest.tools") + (license license:asl2.0))) + +(define-public go-gotest-tools-assert + (package (inherit (go-gotest-tools-package "assert")) + (name "go-gotest-tools-assert") + (arguments + `(#:tests? #f ; Test failure concerning message formatting (FIXME) + #:import-path "gotest.tools/assert" + #:unpack-path "gotest.tools")) + ;(propagated-inputs + ; `(("go-gotest-tools-internal-format" ,go-gotest-tools-internal-format))) (native-inputs `(("go-github-com-pkg-errors" ,go-github-com-pkg-errors) ("go-github-com-google-go-cmp-cmp" -- cgit v1.2.3 From d19e096ac8f26cc6a5c7b409643cfc2ad1cf864a Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 10 Feb 2020 16:53:48 +0100 Subject: gnu: Add go-gotest-tools-internal-format. * gnu/packages/golang.scm (go-gotest-tools-internal-format): New variable. --- gnu/packages/golang.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f93b2c1ab7..8925be2494 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3132,6 +3132,16 @@ (define (go-gotest-tools-package suffix) (home-page "https://github.com/gotestyourself/gotest.tools") (license license:asl2.0))) +(define-public go-gotest-tools-internal-format + (package (inherit (go-gotest-tools-package "internal/format")) + (native-inputs + `(("go-github-com-pkg-errors" ,go-github-com-pkg-errors) + ("go-github-com-google-go-cmp-cmp" + ,go-github-com-google-go-cmp-cmp))) + (synopsis "Formats messages for use with gotest-tools") + (description "This package provides a way to format messages for use +with gotest-tools."))) + (define-public go-gotest-tools-assert (package (inherit (go-gotest-tools-package "assert")) (name "go-gotest-tools-assert") -- cgit v1.2.3 From 67d84852d961f20b4c81b6a05142dc70dbef8138 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 10 Feb 2020 16:54:19 +0100 Subject: gnu: Add go-gotest-tools-internal-difflib. * gnu/packages/golang.scm (go-gotest-tools-internal-difflib): New variable. --- gnu/packages/golang.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8925be2494..f1e14f74f7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3142,6 +3142,12 @@ (define-public go-gotest-tools-internal-format (description "This package provides a way to format messages for use with gotest-tools."))) +(define-public go-gotest-tools-internal-difflib + (package (inherit (go-gotest-tools-package "internal/difflib")) + (synopsis "Differences for use with gotest-tools") + (description "This package computes differences for use +with gotest-tools."))) + (define-public go-gotest-tools-assert (package (inherit (go-gotest-tools-package "assert")) (name "go-gotest-tools-assert") -- cgit v1.2.3 From 1e18d0733cf900cadd73eaaa99026500c5f525de Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 10 Feb 2020 16:54:54 +0100 Subject: gnu: Add go-gotest-tools-internal-source. * gnu/packages/golang.scm (go-gotest-tools-internal-source): New variable. --- gnu/packages/golang.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f1e14f74f7..d0041749d0 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3148,6 +3148,15 @@ (define-public go-gotest-tools-internal-difflib (description "This package computes differences for use with gotest-tools."))) +(define-public go-gotest-tools-internal-source + (package (inherit (go-gotest-tools-package "internal/source")) + (native-inputs + `(("go-github-com-pkg-errors" ,go-github-com-pkg-errors) + ("go-github-com-google-go-cmp-cmp" ,go-github-com-google-go-cmp-cmp))) + (synopsis "Source code AST formatters for gotest-tools") + (description "This package provides source code AST formatters for +gotest-tools."))) + (define-public go-gotest-tools-assert (package (inherit (go-gotest-tools-package "assert")) (name "go-gotest-tools-assert") -- cgit v1.2.3 From d78178fa489c73713d555d2a70dd2bd5e3e5553d Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 10 Feb 2020 16:57:44 +0100 Subject: gnu: gotestsum: Fix test failure. * gnu/packages/golang.scm (gotestsum)[native-inputs]: Add go-github-com-google-go-cmp-cmp, go-gotest-tools-internal-format, go-gotest-tools-internal-difflib, go-gotest-tools-internal-source. --- gnu/packages/golang.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d0041749d0..b1e97eaf45 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3203,6 +3203,17 @@ (define-public gotestsum ,go-github-com-jonboulle-clockwork) ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) ("go-gotest-tools-assert" ,go-gotest-tools-assert) + ("go-github-com-google-go-cmp-cmp" + ,go-github-com-google-go-cmp-cmp) + ;; TODO: This would be better as a propagated-input of + ;; go-gotest-tools-assert, but that does not work for + ;; some reason. + ("go-gotest-tools-internal-format" + ,go-gotest-tools-internal-format) + ("go-gotest-tools-internal-difflib" + ,go-gotest-tools-internal-difflib) + ("go-gotest-tools-internal-source" + ,go-gotest-tools-internal-source) ("go-github-com-google-go-cmp-cmp" ,go-github-com-google-go-cmp-cmp))) (synopsis "Go test runner with output optimized for humans") -- cgit v1.2.3 From 8c7eb58453870f380a077c7cfd8dafa97bb8e13f Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 3 Jan 2020 02:34:33 +0100 Subject: gnu: docker: Update to 19.03.5. * gnu/packages/docker.scm (docker-cli): Update to 19.03.5. (docker)[source]: Remove patches. [arguments]<#:phases>[patch-paths]: Modify. [native-inputs]: Add gotestsum. * gnu/packages/patches/docker-adjust-tests-for-changes-in-go.patch: Delete file. * gnu/packages/patches/docker-engine-test-noinstall.patch: Delete file. * gnu/packages/patches/docker-use-fewer-modprobes.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 3 - gnu/packages/docker.scm | 13 +- .../docker-adjust-tests-for-changes-in-go.patch | 67 ---------- .../patches/docker-engine-test-noinstall.patch | 23 ---- .../patches/docker-use-fewer-modprobes.patch | 137 --------------------- 5 files changed, 6 insertions(+), 237 deletions(-) delete mode 100644 gnu/packages/patches/docker-adjust-tests-for-changes-in-go.patch delete mode 100644 gnu/packages/patches/docker-engine-test-noinstall.patch delete mode 100644 gnu/packages/patches/docker-use-fewer-modprobes.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index d86b39cacb..f2cdcee592 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -808,10 +808,7 @@ dist_patch_DATA = \ %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ - %D%/packages/patches/docker-adjust-tests-for-changes-in-go.patch \ - %D%/packages/patches/docker-engine-test-noinstall.patch \ %D%/packages/patches/docker-fix-tests.patch \ - %D%/packages/patches/docker-use-fewer-modprobes.patch \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ %D%/packages/patches/doxygen-test.patch \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 948cc30cf6..a15c5d6004 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -46,7 +46,7 @@ (define-module (gnu packages docker) #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization)) -(define %docker-version "18.09.5") +(define %docker-version "19.03.5") (define-public python-docker-py (package @@ -313,12 +313,9 @@ (define-public docker (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0cirpd9l2qazp2jyanwzvrkx2m98nksjdvn43ff38p89w6133ipb")) + (base32 "1dlknwn0fh82nbzdzxdk6pfhqwph9vcw3vs3111wfr19y5hwncq9")) (patches - (search-patches "docker-engine-test-noinstall.patch" - "docker-fix-tests.patch" - "docker-use-fewer-modprobes.patch" - "docker-adjust-tests-for-changes-in-go.patch")))) + (search-patches "docker-fix-tests.patch")))) (build-system gnu-build-system) (arguments `(#:modules @@ -419,6 +416,7 @@ (define-public docker "/" relative-path "\"")) ...))))) (substitute-LookPath* + ("containerd" "containerd" "bin/containerd") ("ps" "procps" "bin/ps") ("mkfs.xfs" "xfsprogs" "bin/mkfs.xfs") ("lvmdiskscan" "lvm2" "sbin/lvmdiskscan") @@ -558,6 +556,7 @@ (define-public docker (native-inputs `(("eudev" ,eudev) ; TODO: Should be propagated by lvm2 (.pc -> .pc) ("go" ,go) + ("gotestsum" ,gotestsum) ("pkg-config" ,pkg-config))) (synopsis "Docker container component library, and daemon") (description "This package provides a framework to assemble specialized @@ -579,7 +578,7 @@ (define-public docker-cli (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0mxxjzkwdny8p2dmyjich7x1gn7hdlfppzjy2skk2k5bwv7nxpmi")))) + (base32 "07ldz46y74b3la4ah65v5bzbfx09yy6kncvxrr0zfx0s1214ar3m")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" diff --git a/gnu/packages/patches/docker-adjust-tests-for-changes-in-go.patch b/gnu/packages/patches/docker-adjust-tests-for-changes-in-go.patch deleted file mode 100644 index 82d92cd4de..0000000000 --- a/gnu/packages/patches/docker-adjust-tests-for-changes-in-go.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 4983ef7c1693ad6dfbe4e3809b12541241d7ff56 Mon Sep 17 00:00:00 2001 -From: Sebastiaan van Stijn -Date: Wed, 14 Aug 2019 02:51:08 +0200 -Subject: [PATCH] Adjust tests for changes in Go 1.12.8 / 1.11.13 - -``` -00:38:11 === Failed -00:38:11 === FAIL: opts TestParseDockerDaemonHost (0.00s) -00:38:11 hosts_test.go:87: tcp tcp:a.b.c.d address expected error "Invalid bind address format: tcp:a.b.c.d" return, got "parse tcp://tcp:a.b.c.d: invalid port \":a.b.c.d\" after host" and addr -00:38:11 hosts_test.go:87: tcp tcp:a.b.c.d/path address expected error "Invalid bind address format: tcp:a.b.c.d/path" return, got "parse tcp://tcp:a.b.c.d/path: invalid port \":a.b.c.d\" after host" and addr -00:38:11 -00:38:11 === FAIL: opts TestParseTCP (0.00s) -00:38:11 hosts_test.go:129: tcp tcp:a.b.c.d address expected error Invalid bind address format: tcp:a.b.c.d return, got parse tcp://tcp:a.b.c.d: invalid port ":a.b.c.d" after host and addr -00:38:11 hosts_test.go:129: tcp tcp:a.b.c.d/path address expected error Invalid bind address format: tcp:a.b.c.d/path return, got parse tcp://tcp:a.b.c.d/path: invalid port ":a.b.c.d" after host and addr -``` - -Signed-off-by: Sebastiaan van Stijn -Upstream-commit: 683766613a8c1dca8f95b19ddb7e083bb3aef266 -Component: engine ---- - opts/hosts_test.go | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/opts/hosts_test.go b/opts/hosts_test.go -index 8c54ec0f4b..7a0a943adf 100644 ---- a/opts/hosts_test.go -+++ b/opts/hosts_test.go -@@ -53,8 +53,8 @@ func TestParseHost(t *testing.T) { - func TestParseDockerDaemonHost(t *testing.T) { - invalids := map[string]string{ - -- "tcp:a.b.c.d": "Invalid bind address format: tcp:a.b.c.d", -- "tcp:a.b.c.d/path": "Invalid bind address format: tcp:a.b.c.d/path", -+ "tcp:a.b.c.d": "", -+ "tcp:a.b.c.d/path": "", - "udp://127.0.0.1": "Invalid bind address format: udp://127.0.0.1", - "udp://127.0.0.1:2375": "Invalid bind address format: udp://127.0.0.1:2375", - "tcp://unix:///run/docker.sock": "Invalid proto, expected tcp: unix:///run/docker.sock", -@@ -83,7 +83,7 @@ func TestParseDockerDaemonHost(t *testing.T) { - "localhost:5555/path": "tcp://localhost:5555/path", - } - for invalidAddr, expectedError := range invalids { -- if addr, err := parseDaemonHost(invalidAddr); err == nil || err.Error() != expectedError { -+ if addr, err := parseDaemonHost(invalidAddr); err == nil || expectedError != "" && err.Error() != expectedError { - t.Errorf("tcp %v address expected error %q return, got %q and addr %v", invalidAddr, expectedError, err, addr) - } - } -@@ -99,8 +99,8 @@ func TestParseTCP(t *testing.T) { - defaultHTTPHost = "tcp://127.0.0.1:2376" - ) - invalids := map[string]string{ -- "tcp:a.b.c.d": "Invalid bind address format: tcp:a.b.c.d", -- "tcp:a.b.c.d/path": "Invalid bind address format: tcp:a.b.c.d/path", -+ "tcp:a.b.c.d": "", -+ "tcp:a.b.c.d/path": "", - "udp://127.0.0.1": "Invalid proto, expected tcp: udp://127.0.0.1", - "udp://127.0.0.1:2375": "Invalid proto, expected tcp: udp://127.0.0.1:2375", - } -@@ -125,7 +125,7 @@ func TestParseTCP(t *testing.T) { - "localhost:5555/path": "tcp://localhost:5555/path", - } - for invalidAddr, expectedError := range invalids { -- if addr, err := ParseTCPAddr(invalidAddr, defaultHTTPHost); err == nil || err.Error() != expectedError { -+ if addr, err := ParseTCPAddr(invalidAddr, defaultHTTPHost); err == nil || expectedError != "" && err.Error() != expectedError { - t.Errorf("tcp %v address expected error %v return, got %s and addr %v", invalidAddr, expectedError, err, addr) - } - } diff --git a/gnu/packages/patches/docker-engine-test-noinstall.patch b/gnu/packages/patches/docker-engine-test-noinstall.patch deleted file mode 100644 index 85d56a3465..0000000000 --- a/gnu/packages/patches/docker-engine-test-noinstall.patch +++ /dev/null @@ -1,23 +0,0 @@ -Last-Update: 2018-06-18 -Forwarded: not-needed -Author: Dmitry Smirnov -Description: prevents test-time installation that causes FTBFS. -~~~~ - go test net: open /usr/lib/go-1.10/pkg/linux_amd64/net.a: permission denied -~~~~ - ---- a/hack/test/unit -+++ b/hack/test/unit -@@ -18,12 +18,8 @@ - - exclude_paths="/vendor/|/integration" - pkg_list=$(go list $TESTDIRS | grep -vE "($exclude_paths)") - --# install test dependencies once before running tests for each package. This --# significantly reduces the runtime. --go test -i "${BUILDFLAGS[@]}" $pkg_list -- - for pkg in $pkg_list; do - go test "${BUILDFLAGS[@]}" \ - -cover \ - -coverprofile=profile.out \ diff --git a/gnu/packages/patches/docker-use-fewer-modprobes.patch b/gnu/packages/patches/docker-use-fewer-modprobes.patch deleted file mode 100644 index 4e4a45b6ce..0000000000 --- a/gnu/packages/patches/docker-use-fewer-modprobes.patch +++ /dev/null @@ -1,137 +0,0 @@ -This patch makes docker find out whether a filesystem type is supported -by trying to mount a filesystem of that type rather than invoking "modprobe". - -See . - ---- docker-18.09.0-checkout/daemon/graphdriver/overlay/overlay.go.orig 1970-01-01 01:00:00.000000000 +0100 -+++ docker-18.09.0-checkout/daemon/graphdriver/overlay/overlay.go 2019-03-19 09:16:03.487087490 +0100 -@@ -8,7 +8,6 @@ - "io" - "io/ioutil" - "os" -- "os/exec" - "path" - "path/filepath" - "strconv" -@@ -201,9 +200,16 @@ - } - - func supportsOverlay() error { -- // We can try to modprobe overlay first before looking at -- // proc/filesystems for when overlay is supported -- exec.Command("modprobe", "overlay").Run() -+ // Access overlay filesystem so that Linux loads it (if possible). -+ mountTarget, err := ioutil.TempDir("", "supportsOverlay") -+ if err != nil { -+ logrus.WithField("storage-driver", "overlay2").Error("Could not create temporary directory, so assuming that 'overlay' is not supported.") -+ return graphdriver.ErrNotSupported -+ } else { -+ /* The mounting will fail--after the module has been loaded.*/ -+ defer os.RemoveAll(mountTarget) -+ unix.Mount("overlay", mountTarget, "overlay", 0, "") -+ } - - f, err := os.Open("/proc/filesystems") - if err != nil { ---- docker-18.09.0-checkout/daemon/graphdriver/overlay2/overlay.go.orig 2019-03-18 23:42:23.728525231 +0100 -+++ docker-18.09.0-checkout/daemon/graphdriver/overlay2/overlay.go 2019-03-19 08:54:31.411906113 +0100 -@@ -10,7 +10,6 @@ - "io" - "io/ioutil" - "os" -- "os/exec" - "path" - "path/filepath" - "strconv" -@@ -261,9 +260,16 @@ - } - - func supportsOverlay() error { -- // We can try to modprobe overlay first before looking at -- // proc/filesystems for when overlay is supported -- exec.Command("modprobe", "overlay").Run() -+ // Access overlay filesystem so that Linux loads it (if possible). -+ mountTarget, err := ioutil.TempDir("", "supportsOverlay2") -+ if err != nil { -+ logrus.WithField("storage-driver", "overlay2").Error("Could not create temporary directory, so assuming that 'overlay' is not supported.") -+ return graphdriver.ErrNotSupported -+ } else { -+ /* The mounting will fail--after the module has been loaded.*/ -+ defer os.RemoveAll(mountTarget) -+ unix.Mount("overlay", mountTarget, "overlay", 0, "") -+ } - - f, err := os.Open("/proc/filesystems") - if err != nil { ---- docker-18.09.0-checkout/daemon/graphdriver/devmapper/deviceset.go.orig 2019-03-19 09:19:16.592844887 +0100 -+++ docker-18.09.0-checkout/daemon/graphdriver/devmapper/deviceset.go 2019-03-19 09:21:18.019361761 +0100 -@@ -540,8 +539,14 @@ - return err // error text is descriptive enough - } - -- // Check if kernel supports xfs filesystem or not. -- exec.Command("modprobe", "xfs").Run() -+ mountTarget, err := ioutil.TempDir("", "supportsXFS") -+ if err != nil { -+ return errors.Wrapf(err, "error checking for xfs support") -+ } else { -+ /* The mounting will fail--after the module has been loaded.*/ -+ defer os.RemoveAll(mountTarget) -+ unix.Mount("none", mountTarget, "xfs", 0, "") -+ } - - f, err := os.Open("/proc/filesystems") - if err != nil { ---- docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/iptables/iptables.go.orig 2019-03-19 09:47:19.430111170 +0100 -+++ docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/iptables/iptables.go 2019-03-19 10:38:01.445136177 +0100 -@@ -72,11 +71,12 @@ - } - - func probe() { -- if out, err := exec.Command("modprobe", "-va", "nf_nat").CombinedOutput(); err != nil { -- logrus.Warnf("Running modprobe nf_nat failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err) -+ path, err := exec.LookPath("iptables") -+ if err != nil { -+ return - } -- if out, err := exec.Command("modprobe", "-va", "xt_conntrack").CombinedOutput(); err != nil { -- logrus.Warnf("Running modprobe xt_conntrack failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err) -+ if out, err := exec.Command(path, "--wait", "-t", "nat", "-L", "-n").CombinedOutput(); err != nil { -+ logrus.Warnf("Running iptables --wait -t nat -L -n failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err) - } - } - ---- docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/ns/init_linux.go.orig 2019-03-19 11:23:20.738316699 +0100 -+++ docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/ns/init_linux.go 2019-03-19 11:27:57.149753073 +0100 -@@ -76,12 +76,8 @@ func NlHandle() *netlink.Handle { - func getSupportedNlFamilies() []int { - fams := []int{syscall.NETLINK_ROUTE} - // NETLINK_XFRM test -- if err := loadXfrmModules(); err != nil { -- if checkXfrmSocket() != nil { -- logrus.Warnf("Could not load necessary modules for IPSEC rules: %v", err) -- } else { -- fams = append(fams, syscall.NETLINK_XFRM) -- } -+ if err := checkXfrmSocket(); err != nil { -+ logrus.Warnf("Could not load necessary modules for IPSEC rules: %v", err) - } else { - fams = append(fams, syscall.NETLINK_XFRM) - } -@@ -99,16 +95,6 @@ func getSupportedNlFamilies() []int { - return fams - } - --func loadXfrmModules() error { -- if out, err := exec.Command("modprobe", "-va", "xfrm_user").CombinedOutput(); err != nil { -- return fmt.Errorf("Running modprobe xfrm_user failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err) -- } -- if out, err := exec.Command("modprobe", "-va", "xfrm_algo").CombinedOutput(); err != nil { -- return fmt.Errorf("Running modprobe xfrm_algo failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err) -- } -- return nil --} -- - // API check on required xfrm modules (xfrm_user, xfrm_algo) - func checkXfrmSocket() error { - fd, err := syscall.Socket(syscall.AF_NETLINK, syscall.SOCK_RAW, syscall.NETLINK_XFRM) -- cgit v1.2.3 From 2d1232e071e97c1b4f4369315a71f9bac5d2656c Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 10 Feb 2020 17:02:37 +0100 Subject: gnu: go-gotest-tools-package: Add comment. * gnu/packages/golang.scm (go-gotest-tools-package): Add comment. --- gnu/packages/golang.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b1e97eaf45..c27fd6bdb4 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3115,6 +3115,8 @@ (define (go-gotest-tools-source version sha256-base32-hash) (sha256 (base32 sha256-base32-hash)))) +;; Note that version 3.0.0 is incompatible to 2.3.0. +;; See also . (define (go-gotest-tools-package suffix) (package (name (string-append "go-gotest-tools-" -- cgit v1.2.3 From 5b050bc259443987bfc205bb68dd5748c2270fa0 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 10 Feb 2020 17:25:35 +0100 Subject: gnu: docker: Remove failing test. * gnu/packages/docker.scm (docker)[arguments]<#:phases>[delete-failing-tests]: Modify. --- gnu/packages/docker.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index a15c5d6004..1053d88569 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -490,6 +490,7 @@ (define-public docker (delete-file "daemon/graphdriver/btrfs/btrfs_test.go") (delete-file "daemon/graphdriver/overlay/overlay_test.go") (delete-file "daemon/graphdriver/overlay2/overlay_test.go") + (delete-file "pkg/chrootarchive/archive_unix_test.go") #t)) (replace 'configure (lambda _ -- cgit v1.2.3 From eef2027928accdc63884b60b116b5f677f212b8a Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 10 Feb 2020 18:59:49 +0100 Subject: gnu: docker: Remove failing tests. * gnu/packages/docker.scm (docker)[arguments]<#:phases>[delete-failing-tests]: Modify. --- gnu/packages/docker.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 1053d88569..1f832a25e5 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -491,6 +491,13 @@ (define-public docker (delete-file "daemon/graphdriver/overlay/overlay_test.go") (delete-file "daemon/graphdriver/overlay2/overlay_test.go") (delete-file "pkg/chrootarchive/archive_unix_test.go") + (delete-file "daemon/container_unix_test.go") + ;; This file uses cgroups and /proc. + (delete-file "pkg/sysinfo/sysinfo_linux_test.go") + ;; This file uses cgroups. + (delete-file "runconfig/config_test.go") + ;; This file uses /var. + (delete-file "daemon/oci_linux_test.go") #t)) (replace 'configure (lambda _ -- cgit v1.2.3 From 4730878b81a84e54408917c17f4b80e354423d61 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Mon, 10 Feb 2020 13:10:07 -0500 Subject: * gnu/packages/finance.scm (bitcoin-core): Update to 0.19.0.1. Co-authored-by: fanquake --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 190e5cbbdc..990298ce3f 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -97,7 +97,7 @@ (define-module (gnu packages finance) (define-public bitcoin-core (package (name "bitcoin-core") - (version "0.18.1") + (version "0.19.0.1") (source (origin (method url-fetch) (uri @@ -105,7 +105,7 @@ (define-public bitcoin-core version "/bitcoin-" version ".tar.gz")) (sha256 (base32 - "15mz0gmm058gmq2gdpffbw25jpv7mksyhyfws6i7mqvrapqr6zaw")))) + "1172dl4b8h2a80ilk9sfgbl8yi55k6hs4b1m07nic2ls4irgkjbs")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 4cac55791176f0db521dce0b7918fd3daae8a0bb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 5 Feb 2020 11:32:19 +0100 Subject: gnu: chromium.scm: Remove use of CADR. ...as per the style guidelines. * gnu/packages/chromium.scm (%debian-origin)[file-name]: Use MATCH instead of IF and CADR to compute the name. --- gnu/packages/chromium.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index ecded29abd..49ad8de84c 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -69,7 +69,8 @@ (define-module (gnu packages chromium) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages xorg) + #:use-module (ice-9 match)) (define %preserved-third-party-files '("base/third_party/cityhash" ;Expat @@ -278,9 +279,9 @@ (define %debian-origin (url "https://salsa.debian.org/chromium-team/chromium.git") (commit %debian-revision))) (file-name (git-file-name "debian-chromium-packaging" - (if (string-prefix? "debian/" %debian-revision) - (cadr (string-split %debian-revision #\/)) - (string-take %debian-revision 7)))) + (match (string-split %debian-revision #\/) + ((_ revision) revision) + (_ (string-take %debian-revision 7))))) (sha256 (base32 "1rbzxcwfp7v0c6rkvn9jl9by7p363cnbdyqazwiak1z03kmw3nkz")))) -- cgit v1.2.3 From 3e295e8d5e6f0ab9e51ff098a8dd0e57606af030 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Feb 2020 19:52:03 +0100 Subject: gnu: swaybg: Remove unused input. * gnu/packages/wm.scm (swaybg)[native-inputs]: Remove GIT. --- gnu/packages/wm.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 3c0d14efa8..1152433dae 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1477,8 +1477,7 @@ (define-public swaybg (inputs `(("cairo" ,cairo) ("gdk-pixbuf" ,gdk-pixbuf) ("wayland" ,wayland))) - (native-inputs `(("git" ,git) - ("pkg-config" ,pkg-config) + (native-inputs `(("pkg-config" ,pkg-config) ("scdoc" ,scdoc) ("wayland-protocols" ,wayland-protocols))) (home-page "https://github.com/swaywm/sway") -- cgit v1.2.3 From bc552a0c9cef0980b64312adf7c72f0044d1a568 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Feb 2020 19:52:28 +0100 Subject: gnu: swaylock: Remove unused input. * gnu/packages/wm.scm (swaylock)[native-inputs]: Remove GIT. --- gnu/packages/wm.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 1152433dae..4e34470d23 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1450,8 +1450,7 @@ (define-public swaylock ("libxkbcommon" ,libxkbcommon) ;("linux-pam" ,linux-pam) ; FIXME: Doesn't work. ("wayland" ,wayland))) - (native-inputs `(("git" ,git) - ("pango" ,pango) + (native-inputs `(("pango" ,pango) ("pkg-config" ,pkg-config) ("scdoc" ,scdoc) ("wayland-protocols" ,wayland-protocols))) -- cgit v1.2.3 From 03f40ce6d3e17c03563c70408e6f9954afa9a1d2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Feb 2020 19:52:52 +0100 Subject: gnu: sway: Remove unused input. * gnu/packages/wm.scm (sway)[native-inputs]: Remove GIT. --- gnu/packages/wm.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 4e34470d23..d79af78db2 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -101,7 +101,6 @@ (define-module (gnu packages wm) #:use-module (gnu packages suckless) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) - #:use-module (gnu packages version-control) #:use-module (gnu packages video) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) @@ -1393,8 +1392,7 @@ (define-public sway ("swaybg" ,swaybg) ("wayland" ,wayland) ("wlroots" ,wlroots))) - (native-inputs `(("git" ,git) - ("libcap" ,libcap) + (native-inputs `(("libcap" ,libcap) ("linux-pam" ,linux-pam) ("mesa" ,mesa) ("pkg-config" ,pkg-config) -- cgit v1.2.3 From 2296e63019cb0042872edab2c583b42cd2b08752 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Feb 2020 15:45:39 +0100 Subject: gnu: signify: Update to 28. * gnu/packages/crypto.scm (signify): Update to 28. [arguments]: Remove #:tests?. --- gnu/packages/crypto.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index f09ec710b2..4ce1cc4fc4 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -132,7 +132,7 @@ (define-public libmd (define-public signify (package (name "signify") - (version "27") + (version "28") (home-page "https://github.com/aperezdc/signify") (source (origin (method url-fetch) @@ -140,13 +140,12 @@ (define-public signify "/download/v" version "/signify-" version ".tar.xz")) (sha256 (base32 - "0ngjsqz95yb0knlw9zs02fnclif40s63r1mydgiv17ii3mds82df")))) + "05v970glhpaxv0m4cnidfxsdnsjp12nf2crzrdq4ml7g5a3g6hdq")))) (build-system gnu-build-system) ;; TODO Build with libwaive (described in README.md), to implement something ;; like OpenBSD's pledge(). (arguments - `(#:tests? #f ; no test suite - #:make-flags + `(#:make-flags (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases -- cgit v1.2.3 From 922fc9cb755abdd795b4d6e778aed7800f5c18cd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Feb 2020 15:46:04 +0100 Subject: gnu: strace: Update to 5.5. * gnu/packages/linux.scm (strace): Update to 5.5. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 61cf8db9ea..42f6da749c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1504,7 +1504,7 @@ (define-public zerofree (define-public strace (package (name "strace") - (version "5.4") + (version "5.5") (home-page "https://strace.io") (source (origin (method url-fetch) @@ -1512,7 +1512,7 @@ (define-public strace "/strace-" version ".tar.xz")) (sha256 (base32 - "0hd7sb7l99y9rcj8jjc1b6m3ryds17krsymdg3dvd40jsla0bl7p")))) + "1zrhpzjlgfwfl8dd53llswmmharm5rbi0zch7lln5sjris69an4z")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From d8bdda1e9af223e8b5f2a3aa02ae6906f1e11a73 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Feb 2020 15:46:23 +0100 Subject: gnu: http-parser: Update to 2.9.3. * gnu/packages/web.scm (http-parser): Update to 2.9.3. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f60b6bd7a0..0f20cf205c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5664,7 +5664,7 @@ (define-public python2-pytest-httpbin (define-public http-parser (package (name "http-parser") - (version "2.9.2") + (version "2.9.3") (home-page "https://github.com/nodejs/http-parser") (source (origin (method git-fetch) @@ -5673,7 +5673,7 @@ (define-public http-parser (file-name (git-file-name name version)) (sha256 (base32 - "1qs6x3n2nrcj1wiik5pg5i16inykf7rcfdfdy7rwyzf40pvdl3c2")))) + "189zi61vczqgmqjd2myjcjbbi5icrk7ccs0kn6nj8hxqiv5j3811")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 710a729605ffa79af2a537d74d3186eb3e5fd82a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Feb 2020 15:49:21 +0100 Subject: gnu: rocksdb: Update to 6.6.4. * gnu/packages/databases.scm (rocksdb): Update to 6.6.4. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 5137e31b05..587d993918 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1133,7 +1133,7 @@ (define-public emacs-recutils (define-public rocksdb (package (name "rocksdb") - (version "6.5.2") + (version "6.6.4") (source (origin (method git-fetch) (uri (git-reference @@ -1142,7 +1142,7 @@ (define-public rocksdb (file-name (git-file-name name version)) (sha256 (base32 - "01f5lcrcr809jhkkvxhv743hwpcxszj4r30hy9qy1i0mvjky02vf")) + "1h7y31b05w4vv4v509l368j9qlbv5assmdq9hp2788zipqbpywc0")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 34e4fb4f11b660fe3c178f5ea9a9093d9c0d4ab9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Feb 2020 15:49:40 +0100 Subject: gnu: ceph: Update to 14.2.7. * gnu/packages/storage.scm (ceph): Update to 14.2.7. --- gnu/packages/storage.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 73d88f76ee..1691939d7f 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -53,14 +53,14 @@ (define-module (gnu packages storage) (define-public ceph (package (name "ceph") - (version "14.2.5") + (version "14.2.7") (source (origin (method url-fetch) (uri (string-append "https://download.ceph.com/tarballs/ceph-" version ".tar.gz")) (sha256 (base32 - "0wbkdplxs8higmlj57a7rydmx9rq08h0arjrmxmp0s80bn0v5x2c")) + "0qiqhm6hvz299q54k3i4crnb5dhpq6xnn2yqih9pxn9van0dq1ln")) (patches (search-patches "ceph-boost-compat.patch" "ceph-volume-respect-PATH.patch" -- cgit v1.2.3 From 1d5261dacc31103836eab6d607a028fda0f6bc1d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Feb 2020 15:49:57 +0100 Subject: gnu: protobuf: Update to 3.11.3. * gnu/packages/protobuf.scm (protobuf): Update to 3.11.3. --- gnu/packages/protobuf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 9ef9587975..165995f885 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -75,7 +75,7 @@ (define-public fstrm (define-public protobuf (package (name "protobuf") - (version "3.10.1") + (version "3.11.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/google/protobuf/releases/" @@ -83,7 +83,7 @@ (define-public protobuf version ".tar.gz")) (sha256 (base32 - "16xrclp3xw4hzni1h53px9s99657hs5790726lchm3hrvsyyabp8")))) + "0l8a1sgzhwwx5j5hv9n9zx8vkdwwn5gvd9dcpkkz4h0j17k1zywz")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib))) (outputs (list "out" -- cgit v1.2.3 From 307feca4e62aad13b7c5c019d9568790f96ba0b9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Feb 2020 16:18:38 +0100 Subject: gnu: python-protobuf: Update to 3.11.3. * gnu/packages/protobuf.scm (python-protobuf): Update to 3.11.3. --- gnu/packages/protobuf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 165995f885..4ea36a2fba 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -203,14 +203,14 @@ (define-public protozero (define-public python-protobuf (package (name "python-protobuf") - (version "3.10.0") + (version "3.11.3") (source (origin (method url-fetch) (uri (pypi-uri "protobuf" version)) (sha256 (base32 - "1zjq3qi0wgqi0fwxgqlgwvj9ri1m4kmnz3jnpd803lqc5k0vb0yv")))) + "07qby3yc2a8a1vsxnc79j687q4r68k1d3npni7bldwmd3m6rfz67")))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six))) -- cgit v1.2.3 From 51583265394fdab4fecf2710dcf142cd3793c692 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Feb 2020 19:48:13 +0100 Subject: gnu: node: Disable flaky test. * gnu/packages/node.scm (node)[arguments]: Delete test that fails sporadically. --- gnu/packages/node.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 83427d935f..1494e2ecfe 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -117,6 +117,10 @@ (define-public node ;; This requires a DNS resolver. (delete-file "test/parallel/test-dns.js") + ;; FIXME: This test fails randomly: + ;; https://github.com/nodejs/node/issues/31213 + (delete-file "test/parallel/test-net-listen-after-destroying-stdin.js") + ;; These tests have an expiry date: they depend on the validity of ;; TLS certificates that are bundled with the source. We want this ;; package to be reproducible forever, so remove those. -- cgit v1.2.3 From e7ce4ef997c3db4d47d943c3e435f395b278bc50 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Feb 2020 20:17:38 +0100 Subject: gnu: unbound: Remove redundant input. * gnu/packages/dns.scm (unbound)[inputs]: Remove PYTHON-3. --- gnu/packages/dns.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 7c52722cb6..3a42a98bc4 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -407,7 +407,6 @@ (define-public unbound `(("expat" ,expat) ("libevent" ,libevent) ("protobuf" ,protobuf) - ("python" ,python-3) ("python-wrapper" ,python-wrapper) ("openssl" ,openssl))) (arguments -- cgit v1.2.3 From 8a0dd289c5b201ebfdd5465d412230bb81110e4c Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 10 Feb 2020 14:38:53 -0500 Subject: gnu: octave, octave-cli: Update to 5.2.0. * gnu/packages/maths.scm (octave, octave-cli): Update to 5.2.0. [inputs]: Add bdb. --- gnu/packages/maths.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5ac3bd1403..10071c10d5 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -74,6 +74,7 @@ (define-module (gnu packages maths) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages dbm) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) #:use-module (gnu packages flex) @@ -1492,7 +1493,7 @@ (define-public ceres (define-public octave-cli (package (name "octave-cli") - (version "5.1.0") + (version "5.2.0") (source (origin (method url-fetch) @@ -1500,11 +1501,12 @@ (define-public octave-cli version ".tar.lz")) (sha256 (base32 - "11wwxpy2q1bhxs2v41bqn05i2sb0905cj1xil6mg8l4k2kka4cq6")))) + "1848dq6nxzal8gwjrcp6xhi5gq96w89nss9d9rz75q408gb3mbl6")))) (build-system gnu-build-system) (inputs `(("alsa-lib" ,alsa-lib) ("arpack" ,arpack-ng) + ("bdb" ,bdb) ("curl" ,curl) ("fftw" ,fftw) ("fftwf" ,fftwf) -- cgit v1.2.3 From 65eada58a07562809ba2daf6310244bf43133871 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 10 Feb 2020 17:47:07 +0100 Subject: gnu: pybind11: Change 'license' field to BSD-3. * gnu/packages/python-xyz.scm (pybind11)[license]: Change to BSD-3. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c32b3a1a95..efa74a79f3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15419,7 +15419,7 @@ (define-public pybind11 Boost.Python library by David Abrahams: to minimize boilerplate code in traditional extension modules by inferring type information using compile-time introspection.") - (license license:expat))) + (license license:bsd-3))) (define-public python-fasteners (package -- cgit v1.2.3 From 0690f3244ef207b64b85ee31f748e9a9106eb3da Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 10 Feb 2020 17:53:58 +0100 Subject: gnu: pybind11: Update to 2.4.3. * gnu/packages/python-xyz.scm (pybind11): Update to 2.4.3. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index efa74a79f3..bfd04c004c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15395,7 +15395,7 @@ (define-public python2-gdrivefs (define-public pybind11 (package (name "pybind11") - (version "2.3.0") + (version "2.4.3") (source (origin (method git-fetch) (uri (git-reference @@ -15403,7 +15403,7 @@ (define-public pybind11 (commit (string-append "v" version)))) (sha256 (base32 - "11b6dniri8m05spfd2a19irz82shf4sdca73566bniggrf3zclnf")) + "0k89w4bsfbpzw963ykg1cyszi3h3nk393qd31m6y46pcfxkqh4rd")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (native-inputs -- cgit v1.2.3 From ae8db9ce327337b4e8a20a5082829b9ed1ef432c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 10 Feb 2020 18:25:43 +0100 Subject: gnu: pybind11: Add dependency on Catch and Eigen. * gnu/packages/python-xyz.scm (pybind11)[inputs]: Add CATCH-FRAMEWORK2-1 and EIGEN. [arguments]: Add #:configure-flags. --- gnu/packages/python-xyz.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bfd04c004c..e88ef25e90 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013, 2014, 2015, 2016, 2019 Andreas Enge ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2014, 2017 Eric Bavier @@ -15408,9 +15408,18 @@ (define-public pybind11 (build-system cmake-build-system) (native-inputs `(("python" ,python) - ("python-pytest" ,python-pytest))) + + ;; The following dependencies are used for tests. + ("python-pytest" ,python-pytest) + ("catch" ,catch-framework2-1) + ("eigen" ,eigen))) (arguments - `(#:test-target "check")) + `(#:configure-flags + (list (string-append "-DCATCH_INCLUDE_DIR=" + (assoc-ref %build-inputs "catch") + "/include/catch")) + + #:test-target "check")) (home-page "https://github.com/pybind/pybind11/") (synopsis "Seamless operability between C++11 and Python") (description "pybind11 is a lightweight header-only library that exposes -- cgit v1.2.3 From ab17297a4ddeaf897794abffabc8600334795e7e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 10 Feb 2020 21:44:29 +0100 Subject: gnu: pybind11: Tweak description. * gnu/packages/python-xyz.scm (pybind11)[description]: Tweak. --- gnu/packages/python-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e88ef25e90..0f16ac0ead 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15422,12 +15422,12 @@ (define-public pybind11 #:test-target "check")) (home-page "https://github.com/pybind/pybind11/") (synopsis "Seamless operability between C++11 and Python") - (description "pybind11 is a lightweight header-only library that exposes -C++ types in Python and vice versa, mainly to create Python bindings of -existing C++ code. Its goals and syntax are similar to the excellent -Boost.Python library by David Abrahams: to minimize boilerplate code in -traditional extension modules by inferring type information using compile-time -introspection.") + (description + "@code{pybind11} is a lightweight header-only library that exposes C++ +types in Python and vice versa, mainly to create Python bindings of existing +C++ code. Its goals and syntax are similar to the @code{Boost.Python} +library: to minimize boilerplate code in traditional extension modules by +inferring type information using compile-time introspection.") (license license:bsd-3))) (define-public python-fasteners -- cgit v1.2.3 From 3cf579e9c24a98c3bac456d064270e8dc8b2086a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 10 Feb 2020 22:40:36 +0100 Subject: gnu: pybind11: Install .py files. * gnu/packages/python-xyz.scm (pybind11)[native-inputs]: Change PYTHON to PYTHON-WRAPPER. [arguments]: Add 'install-python' phase. --- gnu/packages/python-xyz.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0f16ac0ead..b47e395595 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15407,7 +15407,7 @@ (define-public pybind11 (file-name (git-file-name name version)))) (build-system cmake-build-system) (native-inputs - `(("python" ,python) + `(("python" ,python-wrapper) ;; The following dependencies are used for tests. ("python-pytest" ,python-pytest) @@ -15419,6 +15419,17 @@ (define-public pybind11 (assoc-ref %build-inputs "catch") "/include/catch")) + #:phases (modify-phases %standard-phases + (add-after 'install 'install-python + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion "../source" + (setenv "PYBIND11_USE_CMAKE" "yes") + (invoke "python" "setup.py" "install" + "--single-version-externally-managed" + "--root=/" + (string-append "--prefix=" out))))))) + #:test-target "check")) (home-page "https://github.com/pybind/pybind11/") (synopsis "Seamless operability between C++11 and Python") -- cgit v1.2.3 From 3f1a0f1684538466d4a157d7a39fca205a3be196 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 10 Feb 2020 22:49:31 +0100 Subject: gnu: Add python-pytools. * gnu/packages/opencl.scm (python-pytools): New variable. --- gnu/packages/opencl.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index 50c99118c1..dc90d9166a 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -20,6 +20,7 @@ (define-module (gnu packages opencl) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -35,6 +36,7 @@ (define-module (gnu packages opencl) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages ruby) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) @@ -342,3 +344,43 @@ (define-public pocl an LLVM backend, it should be able to get OpenCL support easily by using pocl.") (license license:expat))) + +(define-public python-pytools + (package + (name "python-pytools") + (version "2020.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytools" version)) + (sha256 + (base32 + "19h47pqfrq7ax7601i5g8icpb6b42h8zzwq0dqfdcjjqamwd2cn1")))) + (build-system python-build-system) + (propagated-inputs + `(("python-appdirs" ,python-appdirs) + ("python-decorator" ,python-decorator) + ("python-numpy" ,python-numpy) + ("python-six" ,python-six) + ("python-mpi4py" ,python-mpi4py))) + (home-page "https://pypi.org/project/pytools/") + (synopsis "Assorted tools for Python") + (description + "Pytools is a bag of things that are ``missing'' from the Python standard +library: + +@itemize +@item +small helper functions such as @code{len_iterable}, @code{argmin}, +tuple generation, permutation generation, ASCII table pretty printing, +GvR's @code{monkeypatch_xxx} hack, the elusive @code{flatten}, and much more. +@item +Michele Simionato's decorator module +@item +A time-series logging module, @code{pytools.log}. +@item +Batch job submission, @code{pytools.batchjob}. +@item +A lexer, @code{pytools.lex}. +@end itemize\n") + (license license:expat))) -- cgit v1.2.3 From 01dce79fa400e7e41024567c9fc7614b0cf8eddf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 10 Feb 2020 22:56:23 +0100 Subject: gnu: Add python-pyopencl. * gnu/packages/opencl.scm (python-pyopencl): New variable. --- gnu/packages/opencl.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index dc90d9166a..04b3cb0524 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -384,3 +384,52 @@ (define-public python-pytools A lexer, @code{pytools.lex}. @end itemize\n") (license license:expat))) + +(define-public python-pyopencl + (package + (name "python-pyopencl") + (version "2019.1.1") + (source + (origin + ;; The tarball on PyPI lacks test programs such as + ;; 'pygpu_language_opencl.cpp' so fetch it from Git. + ;; XXX: The server at git.tiker.net is unreliable. + (method git-fetch) + (uri (git-reference + (url "http://git.tiker.net/trees/pyopencl.git") + (commit (string-append "v" version)) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12q0rs8yla571vcfpsh0mfrjbdiayv0hi8r1rq0f178m3i3qjz80")))) + (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-before 'build 'set-home + (lambda _ + ;; Some of the Python build scripts expect 'HOME' to be + ;; set. + (setenv "HOME" (getcwd)) + #t))) + + ;; Tests in 'compyte/ndarray/setup_opencl.py' appear to rely on + ;; 'nvcc', which is not an option. + #:tests? #f)) + (inputs + `(("opencl-headers" ,opencl-headers-1.2) ;POCL only supports OpenCL 1.2 + ("pybind11" ,pybind11) + ("ocl-icd" ,ocl-icd))) ;libOpenCL + (propagated-inputs + `(("python-appdirs" ,python-appdirs) + ("python-decorator" ,python-decorator) + ("python-numpy" ,python-numpy) + ("python-pytools" ,python-pytools) + ("python-six" ,python-six) + ("python-mako" ,python-mako))) + (home-page "http://mathema.tician.de/software/pyopencl") + (synopsis "Python wrapper for OpenCL") + (description + "PyOpenCL lets you access parallel computing devices such as GPUs from +Python @i{via} OpenCL.") + (license license:expat))) -- cgit v1.2.3 From 50e96d25b74ba37193fb102920b446eff03b97ed Mon Sep 17 00:00:00 2001 From: Martin Becze Date: Fri, 24 Jan 2020 07:41:35 -0500 Subject: gnu: geoclue: Update to 2.5.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (geoclue): Update to 2.5.5 Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 56761a0bd7..7fa3ea48d5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -40,7 +40,7 @@ ;;; Copyright © 2019 Jelle Licht ;;; Copyright © 2019 Jonathan Frederickson ;;; Copyright © 2019, 2020 Maxim Cournoyer -;;; Copyright © 2019 Martin Becze +;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2019 David Wilson ;;; Copyright © 2019, 2020 Raghav Gururajan ;;; Copyright © 2019 Jonathan Brielmaier @@ -4078,43 +4078,34 @@ (define-public colord (define-public geoclue (package (name "geoclue") - (version "2.4.8") + (version "2.5.5") (source (origin (method url-fetch) - (uri (string-append "https://www.freedesktop.org/software/" name - "/releases/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + (uri + (string-append "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/" + version "/geoclue-" version ".tar.bz2")) (sha256 (base32 - "08yg1r7m0n9hwyvcy769qkmkf8lslqwv69cjfffwnc3zm5km25qj")) + "1b7jqrsn4x7mxjxj8hvb2dl2cmhrpb9vibs4rvkkanky5nsx3sai")) (patches (search-patches "geoclue-config.patch")))) - (build-system glib-or-gtk-build-system) + (build-system meson-build-system) (arguments - '(;; The tests want to run the system bus. - #:tests? #f - #:configure-flags (list ;; Disable bits requiring ModemManager. - "--disable-3g-source" - "--disable-cdma-source" - "--disable-modem-gps-source" - "--with-dbus-service-user=geoclue") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-/bin/true - (lambda _ - (substitute* "configure" - (("/bin/true") (which "true"))) - #t))))) + '(#:configure-flags (list "-Dbus-srv-user=geoclue"))) (native-inputs `(("pkg-config" ,pkg-config) ("gobject-introspection" ,gobject-introspection) + ("modem-manager" ,modem-manager) + ("libnotify" ,libnotify) + ("gtk-doc", gtk-doc) ("intltool" ,intltool))) (inputs `(("avahi" ,avahi) - ("glib" ,glib) + ("glib:bin" ,glib "bin") + ("glib-networking" ,glib-networking) ("json-glib" ,json-glib) ("libsoup" ,libsoup))) - (home-page "https://www.freedesktop.org/wiki/Software/GeoClue/") + (home-page "https://gitlab.freedesktop.org/geoclue/geoclue/-/wikis/home") (synopsis "Geolocation service") (description "Geoclue is a D-Bus service that provides location information. The primary goal of the Geoclue project is to make creating -- cgit v1.2.3 From c44ba52534c8c18a7a0346160727688b159679f2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Feb 2020 22:21:16 +0100 Subject: gnu: libextractor: Build with the latest ffmpeg. * gnu/packages/gnunet.scm (libextractor)[inputs]: Change from FFMPEG-3.4 to FFMPEG. --- gnu/packages/gnunet.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 392b140503..d626d2cc65 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -93,7 +93,7 @@ (define-public libextractor `(("exiv2" ,exiv2) ("bzip2" ,bzip2) ("flac" ,flac) - ("ffmpeg" ,ffmpeg-3.4) + ("ffmpeg" ,ffmpeg) ("file" ,file) ;libmagic, for the MIME plug-in ("glib" ,glib) ("gstreamer" ,gstreamer) -- cgit v1.2.3 From 1c78a291a038ba540b978e33bcaa707e92d3cfe4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Jan 2020 15:17:04 +0100 Subject: gnu: shadow: Update to 4.8.1. * gnu/packages/admin.scm (shadow): Update to 4.8.1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ead8303f25..9b0cba769c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -451,7 +451,7 @@ (define-public inetutils (define-public shadow (package (name "shadow") - (version "4.8") + (version "4.8.1") (source (origin (method url-fetch) (uri (string-append @@ -459,7 +459,7 @@ (define-public shadow "download/" version "/shadow-" version ".tar.xz")) (sha256 (base32 - "0r5c1p8mfwhw11gb6mjsx1k7d4c32dxai7yss8n5pwy1p61ndd34")))) + "0qmfq50sdhz6xilgxvinblll8j2iqfl7hwk45bq744y4plq4dbd3")))) (build-system gnu-build-system) (arguments `(;; Assume System V `setpgrp (void)', which is the default on GNU -- cgit v1.2.3 From c0d1f923ca778a3d0d609c20738916022f636b95 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Feb 2020 11:39:43 +0100 Subject: gnu: elogind: Update to 243.4. * gnu/packages/freedesktop.scm (elogind): Update to 243.4. [arguments]: Add "-Dman=true" and "-Dnologin-path" to #:configure-flags. Add phase to fix D-Bus socket location. [inputs]: Add SHADOW. --- gnu/packages/freedesktop.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 63d7d6031f..0c0fcff02c 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -266,7 +266,7 @@ (define-public libxdg-basedir (define-public elogind (package (name "elogind") - (version "241.4") + (version "243.4") (source (origin (method git-fetch) (uri (git-reference @@ -275,7 +275,7 @@ (define-public elogind (file-name (git-file-name name version)) (sha256 (base32 - "13nd0chackqclgvw43910k4pkw2q773dh6wq9s5f3d97ibnik48k")))) + "141frvgyk4fafcxsix94qc0d9ffrwksld8lqq4hq6xsgjlvv0mrs")))) (build-system meson-build-system) (arguments `(#:configure-flags @@ -283,9 +283,11 @@ (define-public elogind (sysconf (string-append out "/etc")) (libexec (string-append out "/libexec/elogind")) (dbuspolicy (string-append out "/etc/dbus-1/system.d")) + (shadow (assoc-ref %build-inputs "shadow")) (shepherd (assoc-ref %build-inputs "shepherd")) (halt-path (string-append shepherd "/sbin/halt")) (kexec-path "") ;not available in Guix yet + (nologin-path (string-append shadow "/sbin/nologin")) (poweroff-path (string-append shepherd "/sbin/shutdown")) (reboot-path (string-append shepherd "/sbin/reboot"))) (list @@ -299,7 +301,9 @@ (define-public elogind (string-append "-Dkexec-path=" kexec-path) (string-append "-Dpoweroff-path=" poweroff-path) (string-append "-Dreboot-path=" reboot-path) + (string-append "-Dnologin-path=" nologin-path) "-Dcgroup-controller=elogind" + "-Dman=true" ;; Disable some tests. "-Dtests=false" "-Dslow-tests=false")) @@ -311,6 +315,14 @@ (define-public elogind (("join_paths\\(bindir, 'pkttyagent'\\)") "'\"/run/current-system/profile/bin/pkttyagent\"'")) #t)) + (add-after 'unpack 'adjust-dbus-socket-address + (lambda _ + ;; Look for the D-Bus socket in /var/run instead of /run. Remove + ;; this for versions > 243.4. + (substitute* "src/libelogind/sd-bus/bus-internal.h" + (("=/run/dbus/system_bus_socket") + "=/var/run/dbus/system_bus_socket")) + #t)) (add-after 'unpack 'change-pid-file-path (lambda _ (substitute* "src/login/elogind.c" @@ -330,6 +342,7 @@ (define-public elogind (inputs `(("linux-pam" ,linux-pam) ("libcap" ,libcap) + ("shadow" ,shadow) ;for 'nologin' ("shepherd" ,shepherd) ;for 'halt' and 'reboot', invoked ;when pressing the power button ("dbus" ,dbus) -- cgit v1.2.3 From 57bd483f6730ce0daa9479d9b7be3b8b4a152097 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 Feb 2019 00:24:38 +0100 Subject: gnu: lvm2: Update to 2.03.07. * gnu/packages/linux.scm (lvm2): Update to 2.03.07. [source](snippet): Adjust confdir regex. [inputs]: Add LIBAIO. [arguments]: Add phase 'patch-configure. (lvm2-static)[arguments]: Don't build dmeventd. Add phase 'adjust-Makefile'. --- gnu/packages/linux.scm | 44 +++++++++++++++++++---------- gnu/packages/patches/lvm2-static-link.patch | 29 +++++++++++++------ 2 files changed, 49 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 42f6da749c..9b42735a31 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2780,14 +2780,16 @@ (define-public eudev-with-hwdb (define-public lvm2 (package (name "lvm2") - (version "2.02.177") + (version "2.03.07") (source (origin (method url-fetch) - (uri (string-append "ftp://sources.redhat.com/pub/lvm2/releases/LVM2." - version ".tgz")) + (uri (list (string-append "ftp://sourceware.org/pub/lvm2/LVM2." + version ".tgz") + (string-append "ftp://sources.redhat.com/pub/lvm2/releases/LVM2." + version ".tgz"))) (sha256 (base32 - "1wl0isn0yz5wvglwylnlqkppafwmvhliq5bd92vjqp5ir4za49a0")) + "1s818ghgl0cxqak3r4cc99anh2xnm46kl03cyk089a1cr2ai0by7")) (modules '((guix build utils))) (snippet '(begin @@ -2795,7 +2797,7 @@ (define-public lvm2 ;; Honor sysconfdir. (substitute* "make.tmpl.in" - (("confdir = .*$") + (("^confdir = .*$") "confdir = @sysconfdir@\n") (("DEFAULT_SYS_DIR = @DEFAULT_SYS_DIR@") "DEFAULT_SYS_DIR = @sysconfdir@")) @@ -2806,7 +2808,8 @@ (define-public lvm2 `(("pkg-config" ,pkg-config) ("procps" ,procps))) ;tests use 'pgrep' (inputs - `(("udev" ,eudev))) + `(("libaio" ,libaio) + ("udev" ,eudev))) (arguments '(#:phases (modify-phases %standard-phases @@ -2832,14 +2835,6 @@ (define-public lvm2 ;; Make sure programs such as 'dmsetup' can ;; find libdevmapper.so. (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") - "/lib,-rpath=" - (assoc-ref %outputs "out") - "/lib/device-mapper") - ;; TODO: Patch make.tmpl.in to take LDFLAGS - ;; into account so that we don't need to also - ;; set CLDFLAGS. - (string-append "CLDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib,-rpath=" (assoc-ref %outputs "out") @@ -2871,7 +2866,26 @@ (define-public lvm2-static (substitute-keyword-arguments (package-arguments lvm2) ((#:configure-flags flags '()) ;; LVM2 doesn't use Libtool, hence the custom option. - `(cons "--enable-static_link" ,flags)))) + `(append '("--enable-static_link") + ;; Building dmeventd statically is complicated due to a + ;; requirement on libdevmapper.a, which is being phased out + ;; in favor of libdevice-mapper.a, which in turn is is not + ;; easily made available at dmeventd build time. Just ignore + ;; it until the situation improves. + (delete "--enable-dmeventd" ,flags))) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'adjust-Makefile + (lambda _ + ;; These fixes are related to the upstream libdm->device_mapper + ;; migration and will hopefully be fixed upstream in due time. + (substitute* "tools/Makefile.in" + ;; This variable is empty in a static configuration and causes + ;; an erroneous GCC command line. + (("-L\\$\\(interfacebuilddir\\)") "") + ;; Remove obsolete reference to libdevmapper.a. + (("-ldevmapper") "")) + #t)))))) (synopsis "Logical volume management for Linux (statically linked)"))) (define-public wireless-tools diff --git a/gnu/packages/patches/lvm2-static-link.patch b/gnu/packages/patches/lvm2-static-link.patch index eb7849a679..2ade0a1aaa 100644 --- a/gnu/packages/patches/lvm2-static-link.patch +++ b/gnu/packages/patches/lvm2-static-link.patch @@ -3,23 +3,34 @@ and libm via libdevmapper.a. --- LVM2.2.02.166/tools/Makefile.in 2016-11-22 21:31:15.521045149 +0100 +++ LVM2.2.02.166/tools/Makefile.in 2016-11-22 21:31:24.085082767 +0100 -@@ -148,7 +148,7 @@ endif - - lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a - $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \ -- $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) -+ $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) $(PTHREAD_LIBS) $(M_LIBS) +@@ -137,7 +137,7 @@ + lvm.static: $(OBJECTS) lvm-static.o $(LVMINTERNAL_LIBS) + @echo " [CC] $@" + $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ $+ \ +- $(DMEVENT_LIBS) $(STATIC_LIBS) $(LVMLIBS) ++ $(DMEVENT_LIBS) $(STATIC_LIBS) $(LVMLIBS) $(PTHREAD_LIBS) liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o - cat $(top_builddir)/lib/liblvm-internal.a > $@ + @echo " [AR] $@" --- a/make.tmpl.in 2018-07-31 22:00:39.969983104 +0200 +++ b/make.tmpl.in 2018-07-31 22:00:58.467613682 +0200 -@@ -53,7 +53,7 @@ +@@ -63,7 +63,7 @@ - LIBS = @LIBS@ + LIBS += @LIBS@ $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) $(M_LIBS) # Extra libraries always linked with static binaries -STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) +STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(M_LIBS) DEFS += @DEFS@ # FIXME set this only where it's needed, not globally? CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ +--- a/libdm/make.tmpl.in 2018-12-18 15:22:34.000000000 +0100 ++++ b/libdm/make.tmpl.in 2019-01-29 21:45:33.637345799 +0100 +@@ -57,7 +57,7 @@ + LIBS = @LIBS@ + LIBS += $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) -lm + # Extra libraries always linked with static binaries +-STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) ++STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(PTHREAD_LIBS) $(M_LIBS) + DEFS += @DEFS@ + # FIXME set this only where it's needed, not globally? + CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ -- cgit v1.2.3 From 35cb2ac56cce1496c622958b53e82ba5d0c0ec48 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 11 Feb 2020 00:11:09 +0100 Subject: gnu: Add queen. * gnu/packages/games.scm (make-queen-package): New variable. (queen, queen-de, queen-fr, queen-it): New variables. --- gnu/packages/games.scm | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c23f624251..997cec352c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7838,6 +7838,105 @@ (define-public lure-it (make-lure-package "lure-it" "it" "1ks6n39r1cllisrrh6pcr39swsdv7ng3gx5c47vaw71zzfr70hjj")) +(define (make-queen-package name file-prefix release language hash) + (package + (name name) + (version release) + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/scummvm/extras/" + "Flight%20of%20the%20Amazon%20Queen/" + file-prefix release ".zip")) + (sha256 + (base32 hash)))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (share (string-append out "/share")) + (data (string-append share "/" ,name)) + (apps (string-append share "/applications")) + (bin (string-append out "/bin")) + (executable (string-append bin "/" ,name)) + (scummvm (assoc-ref %build-inputs "scummvm"))) + (let ((unzip (string-append (assoc-ref %build-inputs "unzip") + "/bin/unzip"))) + (invoke unzip "-j" (assoc-ref %build-inputs "source"))) + (let ((doc (string-append share "/doc/" ,name "-" ,version))) + (install-file "readme.txt" doc)) + (install-file "queen.1c" data) + (mkdir-p bin) + (let ((bash (assoc-ref %build-inputs "bash"))) + (with-output-to-file executable + (lambda () + (format #t "#!~a/bin/bash~%" bash) + (format #t "exec ~a/bin/scummvm -q fr -p ~a queen~%" + scummvm data)))) + (chmod executable #o755) + ;; Create desktop file. There is no dedicated + ;; icon for the game, so we borrow SCUMMVM's. + (mkdir-p apps) + (with-output-to-file (string-append apps "/" ,name ".desktop") + (lambda _ + (format #t + "[Desktop Entry]~@ + Name=Flight of the Amazon Queen~@ + GenericName=Queen~@ + Comment=Embark on a quest to rescue a kidnapped princess and in the process, discover the true sinister intentions of a suspiciously located Lederhosen company~@ + Comment[de]=Begib dich auf ein Abenteuer, um eine entführte Prinzessin zu retten und entdecke die wahren, finsteren Absichten eines verdächtig erscheinenden Lederhosen-Unternehmens~@ + Type=Application~@ + Exec=~a~@ + Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@ + Categories=AdventureGame;Game;RolePlaying;~@ + Keywords=adventure;game;roleplaying;fantasy;~%" + executable scummvm)))) + #t))) + (native-inputs + `(("unzip" ,unzip))) + (inputs + `(("bash" ,bash) + ("scummvm" ,scummvm))) + (home-page "https://www.scummvm.org/") + (synopsis "Classic 2D point and click adventure game") + (description "Flight of the Amazon Queen is a 2D point-and-click +adventure game set in the 1940s. + +You assume the role of Joe King, a pilot for hire who is given the job +of flying Faye Russell (a famous movie star) into the Amazon jungle +for a photo shoot. Of course, things never go according to plans. +After an unfortunate turn of events they find themselves stranded in +the heart of the Amazon jungle, where Joe will embark on a quest to +rescue a kidnapped princess and in the process, discover the true +sinister intentions of a suspiciously located Lederhosen company. In +a rich 2D environment, Joe will cross paths with a variety of unlikely +jungle inhabitants including, but not limited to, a tribe of Amazon +women and 6-foot-tall pygmies.") + (license (license:non-copyleft "file:///readme.txt")))) + +(define-public queen + (make-queen-package + "queen" "FOTAQ_Talkie-" "1.1" "en" + "1a6q71q1dl9vvw2qqsxk5h1sv0gaqy6236zr5905w2is01gdsp52")) + +(define-public queen-de + (make-queen-package + "queen-de" "FOTAQ_Ger_talkie-" "1.0" "de" + "13vn43x7214vyprlpqabvv71k890nff3d6fjscflr1ll7acjca3f")) + +(define-public queen-fr + (make-queen-package + "queen-fr" "FOTAQ_Fr_Talkie_" "1.0" "fr" + "0hq5g4qrkcwm2kn5i4kv4hijs9hi7bw9xl1vrwd1l69qqn30crwy")) + +(define-public queen-it + (make-queen-package + "queen-it" "FOTAQ_It_Talkie_" "1.0" "it" + "1h76y70lrpzfjkm53n4nr364nhyka54vbz9r7sadzyzl7c7ilv4d")) + (define-public gnurobots (package (name "gnurobots") -- cgit v1.2.3 From 0e77a62dc2aad41c67feeb86c964571051107f7b Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Mon, 10 Feb 2020 23:08:54 -0600 Subject: gnu: check: Use check@0.12. Tests fail to compile with check@0.13. * gnu/packages/check.scm (clamav)[native-inputs]: 'check' -> 'check-0.12'. --- gnu/packages/antivirus.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/antivirus.scm b/gnu/packages/antivirus.scm index 397b94301d..9f34a1e327 100644 --- a/gnu/packages/antivirus.scm +++ b/gnu/packages/antivirus.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018, 2019 Eric Bavier +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Eric Bavier ;;; Copyright © 2018 Christopher Baines ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; @@ -67,7 +67,7 @@ (define-public clamav (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("check" ,check) ; for tests + ("check" ,check-0.12) ; for tests ("libtool" ,libtool) ("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From a89ea0b34de0ca76cf1d1e15161b5246151ce60e Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Mon, 10 Feb 2020 23:36:28 -0600 Subject: gnu: clamav: Update to 0.102.2. * gnu/packages/antivirus.scm (clamav): Update to 0.102.2. [native-inputs]: Use latest check package. --- gnu/packages/antivirus.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/antivirus.scm b/gnu/packages/antivirus.scm index 9f34a1e327..dc4cc111e1 100644 --- a/gnu/packages/antivirus.scm +++ b/gnu/packages/antivirus.scm @@ -44,14 +44,14 @@ (define-module (gnu packages antivirus) (define-public clamav (package (name "clamav") - (version "0.102.1") + (version "0.102.2") (source (origin (method url-fetch) (uri (string-append "https://www.clamav.net/downloads/production/" "clamav-" version ".tar.gz")) (sha256 (base32 - "1mpdgn3isz26hd1j6p8lcb76v8hjs54k1wb655rnil4hv78aig8d")) + "1lq7r6r2yl8pp3fkn32b0bsmbbl9pg90kpvhsa2clad3xg0drz49")) (modules '((guix build utils))) (snippet '(begin @@ -67,7 +67,7 @@ (define-public clamav (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("check" ,check-0.12) ; for tests + ("check" ,check) ; for tests ("libtool" ,libtool) ("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 8f33b76e0a26d337b240cf1a76849424ff6e71f7 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 11 Feb 2020 00:09:35 -0600 Subject: gnu: pioneer: Update to 20200203. * gnu/packages/games.scm (pioneer): Update to 20200203. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 997cec352c..482bbf6f68 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013 John Darrington ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2016 David Thompson -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Eric Bavier +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Eric Bavier ;;; Copyright © 2014 Cyrill Schenkel ;;; Copyright © 2014 Sylvain Beucler ;;; Copyright © 2014, 2015, 2018, 2019 Ludovic Courtès @@ -5562,7 +5562,7 @@ (define-public the-butterfly-effect (define-public pioneer (package (name "pioneer") - (version "20190203") + (version "20200203") (source (origin (method git-fetch) (uri (git-reference @@ -5571,7 +5571,7 @@ (define-public pioneer (file-name (git-file-name name version)) (sha256 (base32 - "1g34wvgyvz793dhm1k64kl82ib0cavkbg0f2p3fp05b457ycljff")))) + "1011xsi94jhw98mhm8kryq8ajig0qfbrdx5xdasi92bd4nk7lcp8")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From b74429788edfaa3137454db9f1bb6f10933dc24c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:21:49 +0100 Subject: gnu: r-seriation: Use HTTPS home page. * gnu/packages/cran.scm (r-seriation)[home-page]: Use HTTPS. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 58ceed06d0..09191bfa38 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3994,7 +3994,7 @@ (define-public r-seriation ("r-registry" ,r-registry) ("r-tsp" ,r-tsp))) (native-inputs `(("gfortran" ,gfortran))) - (home-page "http://s2.smu.edu/IDA/seriation/") + (home-page "https://s2.smu.edu/IDA/seriation/") (synopsis "Infrastructure for ordering objects using seriation") (description "This package provides infrastructure for seriation with an -- cgit v1.2.3 From c8fa172e44b96e23e9720ae2394da9050ae9c745 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:22:38 +0100 Subject: gnu: r-squarem: Update home page and use HTTPS. * gnu/packages/cran.scm (r-squarem)[home-page]: Follow redirection using HTTPS. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 09191bfa38..de12e47ae1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2645,7 +2645,7 @@ (define-public r-squarem "0v4ax1v8diw2w7fdhfzz1z0bwixkmcrc39ax3y116f399rc06qbs")))) (properties `((upstream-name . "SQUAREM"))) (build-system r-build-system) - (home-page "http://www.jhsph.edu/agingandhealth/People/Faculty_personal_pages/Varadhan.html") + (home-page "https://coah.jhu.edu/people/Faculty_personal_Pages/Varadhan.html") (synopsis "Squared Extrapolation Methods for Accelerating EM-Like Monotone Algorithms") (description "This package provides algorithms for accelerating the convergence of -- cgit v1.2.3 From 798ca8d08ee3fc7c07b678bad72be521f4ae36df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:28:02 +0100 Subject: gnu: r-multiassayexperiment: Use HTTPS home page. * gnu/packages/bioconductor.scm (r-multiassayexperiment)[home-page]: Use HTTPS. --- gnu/packages/bioconductor.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index c1da8ac106..afdf55c202 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7224,7 +7224,7 @@ (define-public r-multiassayexperiment ("r-s4vectors" ,r-s4vectors) ("r-summarizedexperiment" ,r-summarizedexperiment) ("r-tidyr" ,r-tidyr))) - (home-page "http://waldronlab.io/MultiAssayExperiment/") + (home-page "https://waldronlab.io/MultiAssayExperiment/") (synopsis "Integration of multi-omics experiments in Bioconductor") (description "MultiAssayExperiment harmonizes data management of multiple assays -- cgit v1.2.3 From 08eefe29e69667e2ba551f1b231aa112dab09eb5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:30:50 +0100 Subject: gnu: r-png: Use HTTPS home page. * gnu/packages/cran.scm (r-png)[home-page]: Use HTTPS. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index de12e47ae1..598793342d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14559,7 +14559,7 @@ (define-public r-png (inputs `(("libpng" ,libpng) ("zlib" ,zlib))) - (home-page "http://www.rforge.net/png/") + (home-page "https://www.rforge.net/png/") (synopsis "Read and write PNG images") (description "This package provides an easy and simple way to read, write and display -- cgit v1.2.3 From b3cac5339342f67fbf14a775d9cc0378cb8169a7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:34:16 +0100 Subject: gnu: r-cairo: Use HTTPS home page. * gnu/packages/statistics.scm (r-cairo)[home-page]: Use HTTPS. --- gnu/packages/statistics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 172779035e..c3e6fb2629 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5441,7 +5441,7 @@ (define-public r-cairo ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.rforge.net/Cairo/") + (home-page "https://www.rforge.net/Cairo/") (synopsis "R graphics device using Cairo graphics library") (description "This package provides a Cairo graphics device that can be use to -- cgit v1.2.3 From 5b9cebb2f11cf2024a7d2c4f40cffd8a5205d7a3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:36:32 +0100 Subject: gnu: r-glasso: Update home page and use HTTPS. * gnu/packages/cran.scm (r-glasso)[home-page]: Follow redirection using HTTPS. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 598793342d..4d79ad2257 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15443,7 +15443,7 @@ (define-public r-glasso (base32 "02p3612rpydk195n2qr77lp1j2w8zsw1ckkk98c8angm4r5q8dsc")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) - (home-page "http://www-stat.stanford.edu/~tibs/glasso") + (home-page "https://statweb.stanford.edu/~tibs/glasso/") (synopsis "Graphical Lasso: estimation of Gaussian graphical models") (description "This is a package for estimation of a sparse inverse covariance matrix -- cgit v1.2.3 From f6b4425aab2b69869a058d90ebd45987dba09908 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:37:32 +0100 Subject: gnu: r-glmnet: Update home page and use HTTPS. * gnu/packages/statistics.scm (r-glmnet)[home-page]: Follow redirection using HTTPS. --- gnu/packages/statistics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c3e6fb2629..d2cd3f6d5c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3221,7 +3221,7 @@ (define-public r-glmnet `(("r-foreach" ,r-foreach) ("r-matrix" ,r-matrix) ("r-shape" ,r-shape))) - (home-page "http://www.jstatsoft.org/v33/i01") + (home-page "https://www.jstatsoft.org/article/view/v033i01") (synopsis "Lasso and elastic-net regularized generalized linear models") (description "The glmnet package provides efficient procedures for fitting the entire -- cgit v1.2.3 From 5e1f2362c1d1d32ca245c3d0416c3e4672d7edec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:37:22 +0100 Subject: gnu: r-codedepends: Use HTTPS home page. * gnu/packages/bioconductor.scm (r-codedepends)[home-page]: Use HTTPS. --- gnu/packages/bioconductor.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index afdf55c202..1fdf9dfda2 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1543,7 +1543,7 @@ (define-public r-codedepends `(("r-codetools" ,r-codetools) ("r-graph" ,r-graph) ("r-xml" ,r-xml))) - (home-page "http://cran.r-project.org/web/packages/CodeDepends") + (home-page "https://cran.r-project.org/web/packages/CodeDepends") (synopsis "Analysis of R code for reproducible research and code comprehension") (description "This package provides tools for analyzing R expressions or blocks of -- cgit v1.2.3 From c756328e66cb34a13527e9a9cca7229cb4f9229b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:02:44 +0100 Subject: gnu: r-lpsymphony: Use HTTPS home page. * gnu/packages/bioconductor.scm (r-lpsymphony)[home-page]: Use HTTPS. --- gnu/packages/bioconductor.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1fdf9dfda2..a6e0c5a1e6 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2455,7 +2455,7 @@ (define-public r-lpsymphony ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://r-forge.r-project.org/projects/rsymphony") + (home-page "https://r-forge.r-project.org/projects/rsymphony") (synopsis "Symphony integer linear programming solver in R") (description "This package was derived from Rsymphony. The package provides an R -- cgit v1.2.3 From f762d327c32b31b5132dc8b46f49c935e0ac381e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:20:18 +0100 Subject: gnu: r-jsonlite: Use HTTPS home page. * gnu/packages/cran.scm (r-jsonlite)[home-page]: Use HTTPS. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4d79ad2257..d59b61c42a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -537,7 +537,7 @@ (define-public r-jsonlite (base32 "0lyvhnr6n57h3a89bvipii7x17nvfaycm9j5j50bfrlr48jv9ic8")))) (build-system r-build-system) - (home-page "http://arxiv.org/abs/1403.2805") + (home-page "https://arxiv.org/abs/1403.2805") (synopsis "Robust, high performance JSON parser and generator for R") (description "The jsonlite package provides a fast JSON parser and generator optimized -- cgit v1.2.3 From 7219193ad97f7227706f512a914d4e095e74276d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:23:12 +0100 Subject: gnu: r-formatr: Use HTTPS home page. * gnu/packages/statistics.scm (r-formatr)[home-page]: Use HTTPS. --- gnu/packages/statistics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index d2cd3f6d5c..2b9a357d20 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1306,7 +1306,7 @@ (define-public r-formatr (base32 "1nsxbrx31k3y6yql30qkrvdfyznlia2qfvwv95mfiy7m7wdn4rm3")))) (build-system r-build-system) - (home-page "http://yihui.name/formatR") + (home-page "https://yihui.org/formatr/") (synopsis "Format R code automatically") (description "This package provides a function to format R source code. Spaces and -- cgit v1.2.3 From 40a0734ca8e2d12220caf9f458fd64b6fac22475 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:41:31 +0100 Subject: gnu: r-smoother: Use HTTPS home page. * gnu/packages/cran.scm (r-smoother)[home-page]: Use HTTPS. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d59b61c42a..1ba56aafae 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5240,7 +5240,7 @@ (define-public r-smoother (build-system r-build-system) (propagated-inputs `(("r-ttr" ,r-ttr))) - (home-page "http://cran.r-project.org/web/packages/smoother") + (home-page "https://cran.r-project.org/web/packages/smoother") (synopsis "Functions relating to the smoothing of numerical data") (description "This package provides a collection of methods for smoothing numerical -- cgit v1.2.3 From 6a8715ce687fa645cf3e6566d009a18cf74ea7c5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:37:22 +0100 Subject: gnu: r-rglpk: Use HTTPS home page. * gnu/packages/cran.scm (r-rglpk)[home-page]: Use HTTPS. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1ba56aafae..fb84ea1cbf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16363,7 +16363,7 @@ (define-public r-rglpk `(("r-slam" ,r-slam))) (inputs `(("glpk" ,glpk))) - (home-page "http://R-Forge.R-project.org/projects/rglp/") + (home-page "https://r-forge.r-project.org/projects/rglp/") (synopsis "R interface to the GNU Linear Programming Kit") (description "This package provides an R interface to the GNU Linear Programming Kit, -- cgit v1.2.3 From 7be261546a18b6e3a6c34a671600d71224e773dc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:34:14 +0100 Subject: gnu: r-abn: Fix home page. * gnu/packages/cran.scm (r-abn)[home-page]: Update and use HTTPS. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fb84ea1cbf..e61030b09f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6248,7 +6248,7 @@ (define-public r-abn ("r-rcpp" ,r-rcpp) ("r-rcpparmadillo" ,r-rcpparmadillo) ("r-rjags" ,r-rjags))) - (home-page "http://www.r-bayesian-networks.org") + (home-page "https://r-bayesian-networks.org/") (synopsis "Modelling multivariate data with additive bayesian networks") (description "Bayesian network analysis is a form of probabilistic graphical models -- cgit v1.2.3 From 762b2af6c60751c2aaf37467ecd964a61b2099d6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Feb 2020 15:13:36 +0100 Subject: gnu: acpica: Update to 20200110. * gnu/packages/admin.scm (acpica): Update to 20200110. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9b0cba769c..b58a917f62 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1584,7 +1584,7 @@ (define-public dmidecode (define-public acpica (package (name "acpica") - (version "20191213") + (version "20200110") (source (origin (method url-fetch) (uri (string-append @@ -1592,7 +1592,7 @@ (define-public acpica version ".tar.gz")) (sha256 (base32 - "1106d5b7q8jlgc2z0gz83jdah1yml4fz5z0jjcs7a52pv00c9am8")))) + "1hb4g6r7w8s4bhlkk36fmb4qxghnrwvad7f18cpn6zz0b4sjs7za")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) -- cgit v1.2.3 From 4bcc39081a1e3ca4f3fe1a9157288ff322311c2c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Feb 2020 16:28:41 +0100 Subject: gnu: isc-bind: Update to 4.4.2. * gnu/packages/admin.scm (isc-bind): Update to 4.4.2. [arguments]: Remove patch application. [native-inputs]: Remove patch and patch file. * gnu/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/admin.scm | 27 ++---- .../isc-dhcp-4.4.1-fixes-for-newer-bind.patch | 100 --------------------- 3 files changed, 5 insertions(+), 123 deletions(-) delete mode 100644 gnu/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index c13b6357c9..3f8fa2ed7b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1025,7 +1025,6 @@ dist_patch_DATA = \ %D%/packages/patches/inkscape-poppler-0.76.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ - %D%/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/jacal-fix-texinfo.patch \ %D%/packages/patches/jamvm-arm.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index b58a917f62..23619cbfc2 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -767,14 +767,14 @@ (define-public isc-dhcp bind-release-version))) (package (name "isc-dhcp") - (version "4.4.1") + (version "4.4.2") (source (origin (method url-fetch) (uri (string-append "https://ftp.isc.org/isc/dhcp/" version "/dhcp-" version ".tar.gz")) (sha256 (base32 - "025nfqx4zwdgv4b3rkw26ihcj312vir08jk6yi57ndmb4a4m08ia")))) + "08a5003zdxgl41b29zjkxa92h2i40zyjgxg0npvnhpkfl5jcsz0s")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f @@ -783,17 +783,6 @@ (define-public isc-dhcp (modify-phases %standard-phases (add-after 'unpack 'replace-bundled-bind (lambda* (#:key inputs native-inputs #:allow-other-keys) - ;; XXX TODO: Remove the following invocation of 'patch' when - ;; isc-dhcp is updated. It should be needed only for 4.4.1. - (let ((patch (string-append (assoc-ref (or native-inputs inputs) - "patch") - "/bin/patch")) - (the-patch (assoc-ref (or native-inputs inputs) - "fixes-for-newer-bind.patch"))) - (format #t "applying '~a'...~%" the-patch) - (invoke patch "--force" "--no-backup-if-mismatch" - "-p1" "--input" the-patch)) - (delete-file "bind/bind.tar.gz") (copy-file (assoc-ref inputs "bind-source-tarball") "bind/bind.tar.gz") @@ -881,20 +870,14 @@ (define-public isc-dhcp (native-inputs `(("perl" ,perl) - ("file" ,file) - - ;; XXX TODO: Remove the following patch, and also the 'patch' - ;; program, when isc-dhcp is updated. - ("fixes-for-newer-bind.patch" - ,(search-patch "isc-dhcp-4.4.1-fixes-for-newer-bind.patch")) - ("patch" ,patch))) + ("file" ,file))) (inputs `(("inetutils" ,inetutils) ("net-tools" ,net-tools) ("iproute" ,iproute) - ;; XXX isc-dhcp bundles a copy of bind that has security - ;; flaws, so we use a newer version. + ;; isc-dhcp bundles a copy of BIND, which has proved vulnerable + ;; in the past. Use a BIND-VERSION of our choosing instead. ("bind-source-tarball" ,(origin (method url-fetch) diff --git a/gnu/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch b/gnu/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch deleted file mode 100644 index 53e681ea31..0000000000 --- a/gnu/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch +++ /dev/null @@ -1,100 +0,0 @@ -These fixes are needed to adapt isc-dhcp-4.4.1 to build -successfully after its bundled copy of bind has been updated. - -It is derived from the following upstream commits: - -commit 8194daabfd590f17825f0c61e9534bee5c99cc86 -Author: Thomas Markwalder -Date: Fri Sep 14 13:41:14 2018 -0400 - - [master] Added includes of new BIND9 compatibility headers, updated util/bind.sh - - Merges in rt48072. - -commit cc35f84943df44dac2499f3e16e8aaba7d54191d -Author: Thomas Markwalder -Date: Tue Mar 19 08:36:23 2019 -0400 - - [master] Avoid Bind9 python dependency - - merges [#3,!1] Avoid Bind9 python dependency - ---- a/bind/Makefile.in -+++ b/bind/Makefile.in -@@ -23,7 +23,7 @@ exec_prefix = @exec_prefix@ - - bindconfig = --without-openssl --without-libxml2 --without-libjson \ - --without-gssapi --disable-threads --without-lmdb \ -- --includedir=@includedir@ --libdir=@libdir@ \ -+ --includedir=@includedir@ --libdir=@libdir@ --without-python\ - @BINDLT@ @BINDIOMUX@ @BINDCONFIG@ --enable-full-report - - @BIND_ATF_FALSE@cleandirs = ./lib ./include -diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h -index 75a87ff6..538b927f 100644 ---- a/includes/omapip/isclib.h -+++ b/includes/omapip/isclib.h -@@ -48,6 +48,9 @@ - #include - #include - -+#include -+#include -+ - #include - #include - #include -diff --git a/includes/omapip/result.h b/includes/omapip/result.h -index 91243e1b..860298f6 100644 ---- a/includes/omapip/result.h -+++ b/includes/omapip/result.h -@@ -26,6 +26,7 @@ - #ifndef DHCP_RESULT_H - #define DHCP_RESULT_H 1 - -+#include - #include - #include - #include -diff --git a/server/dhcpv6.c b/server/dhcpv6.c -index a7110f98..cde4f617 100644 ---- a/server/dhcpv6.c -+++ b/server/dhcpv6.c -@@ -1034,7 +1034,8 @@ void check_pool6_threshold(struct reply_state *reply, - shared_name, - inet_ntop(AF_INET6, &lease->addr, - tmp_addr, sizeof(tmp_addr)), -- used, count); -+ (long long unsigned)(used), -+ (long long unsigned)(count)); - } - return; - } -@@ -1066,7 +1067,8 @@ void check_pool6_threshold(struct reply_state *reply, - "address: %s; high threshold %d%% %llu/%llu.", - shared_name, - inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)), -- poolhigh, used, count); -+ poolhigh, (long long unsigned)(used), -+ (long long unsigned)(count)); - - /* handle the low threshold now, if we don't - * have one we default to 0. */ -@@ -1436,12 +1438,15 @@ pick_v6_address(struct reply_state *reply) - log_debug("Unable to pick client address: " - "no addresses available - shared network %s: " - " 2^64-1 < total, %llu active, %llu abandoned", -- shared_name, active - abandoned, abandoned); -+ shared_name, (long long unsigned)(active - abandoned), -+ (long long unsigned)(abandoned)); - } else { - log_debug("Unable to pick client address: " - "no addresses available - shared network %s: " - "%llu total, %llu active, %llu abandoned", -- shared_name, total, active - abandoned, abandoned); -+ shared_name, (long long unsigned)(total), -+ (long long unsigned)(active - abandoned), -+ (long long unsigned)(abandoned)); - } - - return ISC_R_NORESOURCES; -- cgit v1.2.3 From 2dbfd8eec43b602d23cee3fdd2842cc333e36c24 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Feb 2020 06:32:33 +0100 Subject: gnu: opensmtpd: Update to 6.6.3p1 [security mitigations]. * gnu/packages/mail.scm (opensmtpd): Update to 6.6.3p1. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 67aa079024..1a9f9e5e5c 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2306,14 +2306,14 @@ (define-public sendmail (define-public opensmtpd (package (name "opensmtpd") - (version "6.6.2p1") + (version "6.6.3p1") (source (origin (method url-fetch) (uri (string-append "https://www.opensmtpd.org/archives/" "opensmtpd-" version ".tar.gz")) (sha256 - (base32 "16nz2n4s3djlasd6m6dqfwggf6igyfxzq5igny5i0qb8lnn13f33")))) + (base32 "1dqysjlyl0x3qzdzc9sjrla0063vpmlyq735lzf88p7wgzmw1xwy")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb) -- cgit v1.2.3 From c6e6254a05872a29ee36062e161e502bb9c071a1 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Mon, 10 Feb 2020 17:27:00 +0100 Subject: gnu: Add cl-randist. * gnu/packages/lisp-xyz.scm (sbcl-cl-randist, cl-randist, ecl-cl-randist): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d361c7d5ab..5c97f37d48 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10238,3 +10238,35 @@ (define-public cl-hdf5-cffi (define-public ecl-hdf5-cffi (sbcl-package->ecl-package sbcl-hdf5-cffi)) + +(define-public sbcl-cl-randist + (package + (name "sbcl-cl-randist") + (version "0.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lvaruzza/cl-randist.git") + (commit "f088a54b540a7adefab7c04094a6103f9edda3d0"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0l8hyd6nbxb7f50vyxz3rbbm7kgr1fnadc40jywy4xj5vi5kpj5g")))) + (build-system asdf-build-system/sbcl) + (synopsis "Random distributions for Common Lisp") + (description + "Manual translation from C to Common Lisp of some random number +generation functions from the GSL library.") + (home-page "https://github.com/lvaruzza/cl-randist") + (license license:bsd-2) + (arguments + `(#:asd-system-name "cl-randist" + #:asd-file "cl-randist.asd" + #:tests? #f)))) + +(define-public cl-randist + (sbcl-package->cl-source-package sbcl-cl-randist)) + +(define-public ecl-cl-randist + (sbcl-package->ecl-package sbcl-cl-randist)) -- cgit v1.2.3 From 281537f47b22de288370a0f843301c399b6378f7 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 11 Feb 2020 09:13:41 +0100 Subject: gnu: Add ecl-documentation-utils. * gnu/packages/lisp-xyz.scm (ecl-documentation-utils): New variable. --- gnu/packages/lisp-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5c97f37d48..0bff3110cc 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7555,6 +7555,9 @@ (define-public sbcl-documentation-utils (define-public cl-documentation-utils (sbcl-package->cl-source-package sbcl-documentation-utils)) +(define-public ecl-documentation-utils + (sbcl-package->ecl-package sbcl-documentation-utils)) + (define-public sbcl-form-fiddle (let ((commit "e0c23599dbb8cff3e83e012f3d86d0764188ad18") (revision "0")) -- cgit v1.2.3 From 41884bfa5b13b6ab2ea1e2922b0ee44a8d0f8d90 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Mon, 10 Feb 2020 17:30:07 +0100 Subject: gnu: Add cl-float-features. * gnu/packages/lisp-xyz.scm (sbcl-float-features, cl-float-features, ecl-float-features): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0bff3110cc..15e181d5f2 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10273,3 +10273,37 @@ (define-public cl-randist (define-public ecl-cl-randist (sbcl-package->ecl-package sbcl-cl-randist)) + +(define-public sbcl-float-features + (package + (name "sbcl-float-features") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/float-features.git") + (commit "d3ef60181635b0849aa28cfc238053b7ca4644b0"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0yj419k7n59x6rh3grwr6frgwwyria2il6f7wxpfazm8cskv4lzr")))) + (build-system asdf-build-system/sbcl) + (synopsis "Common Lisp IEEE float portability library") + (description + "Portability library for IEEE float features that are not +covered by the Common Lisp standard.") + (home-page "https://github.com/Shinmera/float-features") + (license license:zlib) + (inputs + `(("documentation-utils" ,sbcl-documentation-utils))) + (arguments + `(#:asd-system-name "float-features" + #:asd-file "float-features.asd" + #:tests? #f)))) + +(define-public cl-float-features + (sbcl-package->cl-source-package sbcl-float-features)) + +(define-public ecl-float-features + (sbcl-package->ecl-package sbcl-float-features)) -- cgit v1.2.3 From 59796dfd63f25f91238e4c1cb68a0b41cad5b848 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 6 Feb 2020 08:36:12 +0000 Subject: gnu: subversion: Support running the tests in parallel. This drops the time to build the package on my machine from ~14 minutes to ~5 minutes. * gnu/packages/version-control.scm (subversion)[arguments]: Add set-PARALLEL phase to set the PARALLEL environment variable. --- gnu/packages/version-control.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 2ca64e4cdc..69358695ce 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1448,6 +1448,10 @@ (define-public subversion (substitute* "subversion/tests/libsvn_repos/repos-test.c" (("#!/bin/sh") (string-append "#!" (which "sh")))) #t)) + (add-before 'check 'set-PARALLEL + (lambda _ + (setenv "PARALLEL" (number->string (parallel-job-count))) + #t)) (add-after 'install 'install-perl-bindings (lambda* (#:key outputs #:allow-other-keys) ;; Follow the instructions from 'subversion/bindings/swig/INSTALL'. -- cgit v1.2.3 From 06327c3035517d5c50b30fce411149e758de047e Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Tue, 11 Feb 2020 08:53:14 +0100 Subject: gnu: Add cl-function-cache. * gnu/packages/lisp-xyz.scm (sbcl-function-cache, cl-function-cache, ecl-function-cache): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 15e181d5f2..6d9ee6bea1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10307,3 +10307,43 @@ (define-public cl-float-features (define-public ecl-float-features (sbcl-package->ecl-package sbcl-float-features)) + +(define-public sbcl-function-cache + (package + (name "sbcl-function-cache") + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AccelerationNet/function-cache.git") + (commit "6a5ada401e57da2c8abf046f582029926e61fce8"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "000vmd3f5rx5hs9nvphfric0gkzaadns31c6mxaslpv0k7pkrmc6")))) + (build-system asdf-build-system/sbcl) + (synopsis "Function caching / memoization library for Common Lisp") + (description + "A common lisp library that provides extensible function result +caching based on arguments (an expanded form of memoization).") + (home-page "https://github.com/AccelerationNet/function-cache") + (license + (license:non-copyleft + "https://github.com/AccelerationNet/function-cache/blob/master/README.md")) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-interpol" ,sbcl-cl-interpol) + ("iterate" ,sbcl-iterate) + ("symbol-munger" ,sbcl-symbol-munger) + ("closer-mop" ,sbcl-closer-mop))) + (arguments + `(#:asd-system-name "function-cache" + #:asd-file "function-cache.asd" + #:tests? #f)))) + +(define-public cl-function-cache + (sbcl-package->cl-source-package sbcl-function-cache)) + +(define-public ecl-function-cache + (sbcl-package->ecl-package sbcl-function-cache)) -- cgit v1.2.3 From e4f7ef8721fe64cd732ddc021127c0e67fc9606b Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Tue, 11 Feb 2020 09:56:42 +0100 Subject: gnu: Add cl-type-r. * gnu/packages/lisp-xyz.scm (sbcl-type-r, cl-type-r): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6d9ee6bea1..63121a16ba 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10347,3 +10347,40 @@ (define-public cl-function-cache (define-public ecl-function-cache (sbcl-package->ecl-package sbcl-function-cache)) + +(define-public sbcl-type-r + (let ((commit "83c89e38f2f7a7b16f1012777ecaf878cfa6a267") + (revision "1")) + (package + (name "sbcl-type-r") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/guicho271828/type-r.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1arsxc2539rg8vbrdirz4xxj1b06mc6g6rqndz7a02g127qvk2sm")))) + (build-system asdf-build-system/sbcl) + (synopsis "Parser interface for Common Lisp built-in compound types") + (description + "Collections of accessor functions and patterns to access +the elements in compound type specifier, e.g. @code{dimensions} in +@code{(array element-type dimensions)}") + (home-page "https://github.com/guicho271828/type-r") + (license license:lgpl3+) + (inputs + `(("trivia" ,sbcl-trivia) + ("alexandria" ,sbcl-alexandria))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (arguments + `(#:asd-system-name "type-r" + #:asd-file "type-r.asd" + #:test-asd-file "type-r.test.asd"))))) + +(define-public cl-type-r + (sbcl-package->cl-source-package sbcl-type-r)) -- cgit v1.2.3 From 463fb58fa1a05d58b811bb570ef6d6534be94591 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Tue, 11 Feb 2020 10:03:39 +0100 Subject: gnu: cl-trivia: Update to 0.0.0-1.574901a. * gnu/packages/lisp-xyz.scm (sbcl-trivia, cl-trivia): Update to commit 574901ac. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 63121a16ba..2a17bfb0f2 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6014,7 +6014,7 @@ (define-public cl-fare-quasiquote-extras @code{fare-quasiquote-optima}."))) (define-public sbcl-trivia.level0 - (let ((commit "902e0c65602bbfe96ae82e679330b3771ddc7603") + (let ((commit "574901ac376ae54c9d37169fd5efab9b3b8fcc63") (revision "1")) (package (name "sbcl-trivia.level0") @@ -6030,7 +6030,7 @@ (define-public sbcl-trivia.level0 (file-name (git-file-name name version)) (sha256 (base32 - "11qbab30qqnfy9mx3x9fvgcw1jbvh1qn2cqv3p8xdn2m8981jvhr")))) + "0hf53n71xzr9sjwrxis5fivx3drclf4s39h5ck8vh21ndqj9zvdk")))) (inputs `(("alexandria" ,sbcl-alexandria))) (synopsis "Pattern matching in Common Lisp") -- cgit v1.2.3 From d0f31aeeb75371716168b492539623afacd8cf7b Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Mon, 10 Feb 2020 19:07:38 +0100 Subject: gnu: vim: Update to 8.2.0236. * gnu/packages/vim.scm (vim): Update to 8.2.0236. (vim-full)[arguments]: Add a -lexpat linker argument through #:make-flags. Add a new phase to skip a test (see comment). Signed-off-by: Efraim Flashner --- gnu/packages/vim.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index f130ae4392..1d4a7a3f94 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 HiPhish ;;; Copyright © 2019 Julien Lepiller -;;; Copyright © 2019 Jakub Kądziołka +;;; Copyright © 2019, 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -68,7 +68,7 @@ (define-module (gnu packages vim) (define-public vim (package (name "vim") - (version "8.2.0069") + (version "8.2.0236") (source (origin (method git-fetch) (uri (git-reference @@ -77,7 +77,7 @@ (define-public vim (file-name (git-file-name name version)) (sha256 (base32 - "0kxzfcpv96s1lbx97g6451p1i7yanws5bvzl05jh1ywaqv5f4y7g")))) + "0ixwr7kkxc1cj837v1bbgghkd68gbynfn7pc4rb87ah9sm6bgaz3")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -189,9 +189,20 @@ (define-public vim-full "--enable-xim" "--disable-selinux" "--enable-gui") + ;; This flag fixes the following error: + ;; .../libpython3.7m.a(pyexpat.o): undefined reference to symbol 'XML_FreeContentModel' + ;; .../libexpat.so.1: error adding symbols: DSO missing from command line + #:make-flags '("LDFLAGS=-lexpat") ,@(substitute-keyword-arguments (package-arguments vim) ((#:phases phases) `(modify-phases ,phases + (add-before 'check 'skip-previewpopup + ;; This test fails when the path to the source is long. See: + ;; https://github.com/vim/vim/issues/5615 + (lambda _ + (substitute* "src/testdir/test_popupwin.vim" + ((".*Test_previewpopup.*" line) + (string-append line "return\n"))))) (add-before 'check 'skip-test87 ;; This test fails for unknown reasons after switching ;; to a git checkout. -- cgit v1.2.3 From 89d3869b94c7ffc809964690ba77880193fe4491 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 11 Feb 2020 08:47:45 -0600 Subject: gnu: ghostwriter: Update to 1.8.0. * gnu/packages/text-editors.scm (ghostwriter): Update to 1.8.0. [inputs]: Add qtdeclarative, qtquickcontrols, and qtwebchannel. [propagated-inputs]: New field. --- gnu/packages/text-editors.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 5d49d5d83d..9a35e7edce 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 José Miguel Sánchez García ;;; Copyright © 2016 Carlo Zancanaro -;;; Copyright © 2017, 2018 Eric Bavier +;;; Copyright © 2017, 2018, 2020 Eric Bavier ;;; Copyright © 2017 Feng Shu ;;; Copyright © 2017 ng0 ;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer @@ -416,7 +416,7 @@ (define-public qemacs (define-public ghostwriter (package (name "ghostwriter") - (version "1.7.4") + (version "1.8.0") (source (origin (method git-fetch) (uri (git-reference @@ -425,7 +425,7 @@ (define-public ghostwriter (file-name (git-file-name name version)) (sha256 (base32 - "1pqlr08z5syqcq5p282asxwzrrm7c1w94baxyb467swh8yp3fj5m")))) + "13yn82m1l2pq93wbl569a2lzpc3sn8a8g30hsgdch1l9xlmhwran")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -433,9 +433,13 @@ (define-public ghostwriter (inputs `(("hunspell" ,hunspell) ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) ("qtmultimedia" ,qtmultimedia) + ("qtquickcontrols" ,qtquickcontrols) ("qtsvg" ,qtsvg) - ("qtwebkit" ,qtwebkit))) + ("qtwebchannel" ,qtwebchannel))) + (propagated-inputs ; To get native-search-path + `(("qtwebengine" ,qtwebengine))) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 4835f862925e8aa06b7e23d5dd5d08ceb25a02dc Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 11 Feb 2020 16:46:36 +0100 Subject: gnu: Add emacs-auto-dictionary-mode. * gnu/packages/emacs-xyz.scm (emacs-auto-dictionary-mode): New variable. --- gnu/packages/emacs-xyz.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index faf2d7a1f1..1b864d86f8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2016, 2017, 2018 Alex Vong ;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac ;;; Copyright © 2017 Christopher Baines -;;; Copyright © 2017, 2018, 2019 Mathieu Othacehe +;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe ;;; Copyright © 2017, 2018, 2019 Clément Lassieur ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017, 2018 Kyle Meyer @@ -21431,3 +21431,25 @@ (define-public emacs-gnus-harvest be easily and quickly queried to determine the completion list. It optionally uses BBDB and Message-X.") (license license:gpl3+)))) + +(define-public emacs-auto-dictionary-mode + (package + (name "emacs-auto-dictionary-mode") + (version "1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nschum/auto-dictionary-mode") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "191294k92qp8gmfypf0q8j8qrym96aqikzvyb9p03wqvbr3r1dsk")))) + (build-system emacs-build-system) + (home-page "http://nschum.de/src/emacs/auto-dictionary/") + (synopsis "Automatic dictionary switcher for Emacs spell checking") + (description "@code{auto-dictionary} is a minor mode that hooks into +Flyspell's on-the-fly spell checking and extends these checks to also detect +language. Auto-dictionary then sets @code{ispell-dictionary} to use the +detected language.") + (license license:gpl2+))) -- cgit v1.2.3 From ab42204fbc075af65d17205a756168b440c32c63 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 11 Feb 2020 17:21:22 +0100 Subject: gnu: gdb: Update to 9.1. * gnu/packages/gdb.scm (gdb/next): Update to 9.1. --- gnu/packages/gdb.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index 1aa8d49036..310bb6c320 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -131,6 +131,16 @@ (define-public gdb-8.2 (define-public gdb/next (package/inherit gdb-8.3 + (version "9.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gdb/gdb-" version ".tar.xz")) + (sha256 + (base32 + "0dqp1p7w836iwijg1zb4a784n0j4pyjiw5v6h8fg5lpx6b40x7k9")))) + (arguments + `(#:out-of-source? #t + ,@(package-arguments gdb-8.3))) (inputs `(("source-highlight" ,source-highlight) ,@(package-inputs gdb-8.3))) -- cgit v1.2.3 From 56973172c9a8744637d6506bdff485cd27ff9791 Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Tue, 11 Feb 2020 11:33:13 -0500 Subject: gnu: Add mscgen. * gnu/packages/graph.scm (mscgen): New variable. Signed-off-by: Leo Famulari --- gnu/packages/graph.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 982def62c6..7b51a4fd90 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Andreas Enge +;;; Copyright © 2020 Alexander Krotov ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,6 +39,7 @@ (define-module (gnu packages graph) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages cran) + #:use-module (gnu packages gd) #:use-module (gnu packages graphviz) #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) @@ -501,3 +503,30 @@ (define-public rw (description "rw computes rank-width and rank-decompositions of graphs.") (license license:gpl2+))) + +(define-public mscgen + (package + (name "mscgen") + (version "0.20") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.mcternan.me.uk/mscgen/software/mscgen-src-" + version ".tar.gz")) + (sha256 + (base32 + "08yw3maxhn5fl1lff81gmcrpa4j9aas4mmby1g9w5qcr0np82d1w")))) + (build-system gnu-build-system) + (inputs + `(("gd" ,gd))) + (home-page "http://www.mcternan.me.uk/mscgen/") + (synopsis "Message Sequence Chart Generator") + (description "Mscgen is a small program that parses Message Sequence Chart +descriptions and produces PNG, SVG, EPS or server side image maps (ismaps) as +the output. Message Sequence Charts (MSCs) are a way of representing entities +and interactions over some time period and are often used in combination with +SDL. MSCs are popular in Telecoms to specify how protocols operate although +MSCs need not be complicated to create or use. Mscgen aims to provide a simple +text language that is clear to create, edit and understand, which can also be +transformed into common image formats for display or printing.") + (license license:gpl2+))) -- cgit v1.2.3 From 81565d23df3080b4d43d2ce0bfa49251827a34e9 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 10 Feb 2020 09:51:48 +0100 Subject: gnu: dunst: Build dunstify. * gnu/packages/dunst.scm (dunst)[arguments]: Add phase install-dunstify. [inputs]: Add libnotify. --- gnu/packages/dunst.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dunst.scm b/gnu/packages/dunst.scm index 75f2b80e5f..5b20d6d013 100644 --- a/gnu/packages/dunst.scm +++ b/gnu/packages/dunst.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015, 2017, 2018 Alex Kost ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ (define-module (gnu packages dunst) #:use-module (gnu packages base) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -52,9 +54,16 @@ (define-public dunst ;; Otherwise it tries to install service file ;; to "dbus" store directory. (string-append "SERVICEDIR_DBUS=" %output - "/share/dbus-1/services")) + "/share/dbus-1/services") + "dunstify") #:phases (modify-phases %standard-phases - (delete 'configure)))) + (delete 'configure) + (add-after 'install 'install-dunstify + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "dunstify" + (string-append out "/bin"))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("perl" ,perl) ; for pod2man @@ -65,6 +74,7 @@ (define-public dunst ("glib" ,glib) ("cairo" ,cairo) ("pango" ,pango) + ("libnotify" ,libnotify) ; for dunstify ("libx11" ,libx11) ("libxscrnsaver" ,libxscrnsaver) ("libxinerama" ,libxinerama) -- cgit v1.2.3 From a7b3ed28049109fc76187939674baea3d7546d0f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 16:29:58 +0200 Subject: gnu: rust-libloading-0.5: Don't skip build. * gnu/packages/crates-io.scm (rust-libloading-0.5)[arguments]: Don't skip build. Move rust-cc-1.0 from cargo-development-inputs to cargo-inputs. --- gnu/packages/crates-io.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 77ca168369..6d52b6b1d2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6094,11 +6094,9 @@ (define-public rust-libloading-0.5 "0lyply8rcqc8agajzxs7bq6ivba9dnn1i68kgb9z2flnfjh13cgj")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-winapi" ,rust-winapi-0.3)) - #:cargo-development-inputs - (("rust-cc" ,rust-cc-1.0)))) + `(#:cargo-inputs + (("rust-winapi" ,rust-winapi-0.3) + ("rust-cc" ,rust-cc-1.0)))) (home-page "https://github.com/nagisa/rust_libloading/") (synopsis "Rust library for loading dynamic libraries") (description -- cgit v1.2.3 From 15630854fa704069e9768610a663a0b4215c4167 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 16:35:41 +0200 Subject: gnu: rust-clang-0.26: Don't hide package. * gnu/packages/crates-io.scm (rust-clang-0.26)[arguments]: Add rust-glob-0.2, rust-libc-0.2, rust-libloading-0.5 to cargo-inputs. Add custom phase to find libclang. [native-inputs]: Add clang. [properties]: Don't inherit. --- gnu/packages/crates-io.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6d52b6b1d2..13616bd4fe 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -30,6 +30,7 @@ (define-module (gnu packages crates-io) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages jemalloc) + #:use-module (gnu packages llvm) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages ssh) @@ -1581,7 +1582,23 @@ (define-public rust-clang-sys-0.26 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1r50dwy5hj5gq07dn0qf8222d07qv0970ymx0j8n9779yayc3w3f")))))) + "1r50dwy5hj5gq07dn0qf8222d07qv0970ymx0j8n9779yayc3w3f")))) + (arguments + `(#:cargo-inputs + (("rust-glob" ,rust-glob-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-libloading" ,rust-libloading-0.5)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-environmental-variable + (lambda* (#:key inputs #:allow-other-keys) + (let ((clang (assoc-ref inputs "libclang"))) + (setenv "LIBCLANG_PATH" + (string-append clang "/lib"))) + #t))))) + (inputs + `(("libclang" ,clang))) + (properties '()))) (define-public rust-clap-2 (package -- cgit v1.2.3 From 47fdc51adbea326b05142630ca9a9c748300c6a6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 16:36:49 +0200 Subject: gnu: rust-clang-sys-0.28: Don't hide package. * gnu/packages/crates-io.scm (rust-clang-sys-0.28)[arguments]: Add rust-glob-0.3, rust-libc-0.2, rust-libloading-0.5 to cargo-inputs. Add custom phase to find libclang. [native-inputs]: Add clang. [properties]: Remove field. --- gnu/packages/crates-io.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 13616bd4fe..01b1c55a65 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1547,27 +1547,30 @@ (define-public rust-clang-sys-0.28 (origin (method url-fetch) (uri (crate-uri "clang-sys" version)) - (file-name (string-append name "-" version ".crate")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0ls8zcqi5bmmrvrk3b6r1ym4wlivinbv590d2dvg2xn9f44mbpl1")))) (build-system cargo-build-system) - ;(arguments - ; `(#:phases - ; (modify-phases %standard-phases - ; (add-after 'unpack 'set-environmental-variable - ; (lambda* (#:key inputs #:allow-other-keys) - ; (let ((clang (assoc-ref inputs "libclang"))) - ; (setenv "LIBCLANG_PATH" - ; (string-append clang "/lib"))) - ; #t))))) - ;(inputs - ; `(("libclang" ,clang))) + (arguments + `(#:cargo-inputs + (("rust-glob" ,rust-glob-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-libloading" ,rust-libloading-0.5)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-environmental-variable + (lambda* (#:key inputs #:allow-other-keys) + (let ((clang (assoc-ref inputs "libclang"))) + (setenv "LIBCLANG_PATH" + (string-append clang "/lib"))) + #t))))) + (inputs + `(("libclang" ,clang))) (home-page "https://github.com/KyleMayes/clang-sys") (synopsis "Rust bindings for libclang") (description "This package provides Rust bindings for @code{libclang}.") - (properties '((hidden? . #t))) (license license:asl2.0))) (define-public rust-clang-sys-0.26 @@ -1595,10 +1598,7 @@ (define-public rust-clang-sys-0.26 (let ((clang (assoc-ref inputs "libclang"))) (setenv "LIBCLANG_PATH" (string-append clang "/lib"))) - #t))))) - (inputs - `(("libclang" ,clang))) - (properties '()))) + #t))))))) (define-public rust-clap-2 (package -- cgit v1.2.3 From 464a85f3bdf8ec1264e1f9882758decf949134e2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 16:45:17 +0200 Subject: gnu: rust-futures-cpupool-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-futures-cpupool-0.1)[arguments]: Add rust-futures-0.1, rust-num-cpus-1.11 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 01b1c55a65..79fc6881f2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4129,12 +4129,15 @@ (define-public rust-futures-cpupool-0.1 (base32 "1r32456gpblzfvnkf60545v8acqk7gh5zhyhi1jn669k9gicv45b")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-futures" ,rust-futures-0.1) + ("rust-num-cpus" ,rust-num-cpus-1.11)))) (home-page "https://github.com/rust-lang-nursery/futures-rs") (synopsis "Implementation of thread pools which hand out futures") (description "An implementation of thread pools which hand out futures to the results of the computation on the threads themselves.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From a177e6d0b57ac9238dc59d2439e93dd884b8daa8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 16:56:23 +0200 Subject: gnu: rust-num-iter-0.1: Upgrade to 0.1.40. * gnu/packages/crates-io.scm (rust-num-iter-0.1): Update to 0.1.40. [arguments]: Add rust-num-integer-0.1, rust-num-traits-0.2, rust-autocfg-1.0 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 79fc6881f2..42dd7aa72b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7532,7 +7532,7 @@ (define-public rust-num-integer-0.1 (define-public rust-num-iter-0.1 (package (name "rust-num-iter") - (version "0.1.39") + (version "0.1.40") (source (origin (method url-fetch) @@ -7540,13 +7540,17 @@ (define-public rust-num-iter-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0bhk2qbr3261r6zvfc58lz4spfqjhvdripxgz5mks5rd85r55gbn")))) + "005wif3bk23b5jdg7l0cprzqzyc4jg0xjyzyykciv2ci08581c6z")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-autocfg" ,rust-autocfg-1.0)))) (home-page "https://github.com/rust-num/num-iter") (synopsis "External iterators for generic mathematics") (description "This crate provides external iterators for generic mathematics.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 449f25a2580916d2a824894e30bf7eec4f9f08bb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 16:57:38 +0200 Subject: gnu: rust-numtoa-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-numtoa-0.1)[arguments]: Skip tests. [properties]: Remove field. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 42dd7aa72b..4d31581389 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7629,11 +7629,11 @@ (define-public rust-numtoa-0.1 (base32 "1vs9rhggqbql1p26x8nkha1j06wawwgb2jp5fs88b5gi7prvvy5q")))) (build-system cargo-build-system) + (arguments '(#:tests? #f)) (home-page "https://gitlab.com/mmstick/numtoa") (synopsis "Convert numbers into stack-allocated byte arrays") (description "This package can convert numbers into stack-allocated byte arrays.") - (properties '((hidden? . #t))) (license (list license:expat license:asl2.0)))) (define-public rust-object-0.12 -- cgit v1.2.3 From d24cfb24c50c50b03645fac98e39c8cab47d04b9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:02:06 +0200 Subject: gnu: rust-openssl-probe-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-openssl-probe-0.1)[properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4d31581389..589cc61a2b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7798,7 +7798,6 @@ (define-public rust-openssl-probe-0.1 (description "This package provides a tool to find SSL certificate locations on the system for OpenSSL.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 8ab47363c93864f61aa1be92837ece1df9e80627 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:06:13 +0200 Subject: gnu: rust-parity-wasm-0.40: Update to 0.40.3. * gnu/packages/crates-io.scm (rust-parity-wasm-0.40): Update to 0.40.3. [arguments]: Skip tests. Add rust-time-0.1 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 589cc61a2b..768746dfac 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8123,7 +8123,7 @@ (define-public rust-parking-lot-core-0.4 (define-public rust-parity-wasm-0.40 (package (name "rust-parity-wasm") - (version "0.40.1") + (version "0.40.3") (source (origin (method url-fetch) @@ -8131,14 +8131,17 @@ (define-public rust-parity-wasm-0.40 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1p84f0k36q05j18jy66n122lyali794cj78hbxgy9wj6si84plqd")))) + "03qycy21avz4970zc7aj8rj5h4wvi4qsrc90a6hpws1a56mglf8y")))) (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-development-inputs + (("rust-time" ,rust-time-0.1)))) (home-page "https://github.com/paritytech/parity-wasm") (synopsis "Low-level WebAssembly format library") (description "This package provides a WebAssembly binary format serialization, deserialization, and interpreter in Rust.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From ea077a8f10c4bc4bd962286997fdc0abf6ab9dca Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:13:16 +0200 Subject: gnu: rust-peeking-take-while-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-peeking-take-while-0.1)[properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 768746dfac..96702e8c1e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8277,7 +8277,6 @@ (define-public rust-peeking-take-while-0.1 value. This allows you to use @code{Iterator::by_ref} and @code{Iterator::take_while} together, and still get the first value for which the @code{take_while} predicate returned false after dropping the @code{by_ref}.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 0cbe153bf4ff0c323ee47a0764fcd7d7d8437eeb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:14:59 +0200 Subject: gnu: rust-percent-encoding-2.1: Don't hide package. * gnu/packages/crates-io.scm (rust-percent-encoding-2.1)[properties]: Remove field. (rust-percent-encoding-1.0)[properties]: Same. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 96702e8c1e..6052e26d7f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8296,7 +8296,6 @@ (define-public rust-percent-encoding-2.1 (home-page "https://github.com/servo/rust-url/") (synopsis "Percent encoding and decoding") (description "This crate provides percent encoding and decoding.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 7584246471276d12ddc90e4875c503fecd365b13 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:16:35 +0200 Subject: gnu: rust-pin-utils-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-pin-utils-0.1)[properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6052e26d7f..f85ad36f26 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8639,7 +8639,6 @@ (define-public rust-pin-utils-0.1 (home-page "https://github.com/rust-lang-nursery/pin-utils") (synopsis "Utilities for pinning") (description "This crate provides utilities for pinning values on the stack.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From e7db83efe9d93722392b48eb447f708d9be50b3a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:21:30 +0200 Subject: gnu: rust-pkg-config-0.3: Update to 0.3.17. * gnu/packages/crates-io.scm (rust-pkg-config-0.3): Update to 0.3.17. [arguments]: Add rust-lazy-static-1 to cargo-development-inputs. [native-inputs]: Add pkg-config. [properties]: Remove field. --- gnu/packages/crates-io.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f85ad36f26..932c564a28 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8645,7 +8645,7 @@ (define-public rust-pin-utils-0.1 (define-public rust-pkg-config-0.3 (package (name "rust-pkg-config") - (version "0.3.14") + (version "0.3.17") (source (origin (method url-fetch) @@ -8653,16 +8653,18 @@ (define-public rust-pkg-config-0.3 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "135ia995lqzr0gxpk85h0bjxf82kj6hbxdx924sh9jdln6r8wvk7")))) + "0xynnaxdv0gzadlw4h79j855k0q7rj4zb9xb1vk00nc6ss559nh5")))) (build-system cargo-build-system) - ;(inputs - ; `(("pkg-config" ,pkg-config))) + (arguments + `(#:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static-1)))) + (native-inputs + `(("pkg-config" ,pkg-config))) (home-page "https://github.com/rust-lang/pkg-config-rs") (synopsis "Library to run the pkg-config system tool") (description "A library to run the pkg-config system tool at build time in order to be used in Cargo build scripts.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From c19e1b1fc8096fa04628359b1ae0e3c74e76edad Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:22:25 +0200 Subject: gnu: rust-plain-0.2: Don't hide package. * gnu/packages/crates-io.scm (rust-plain-0.2)[properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 932c564a28..9cbcde5bb8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8685,7 +8685,6 @@ (define-public rust-plain-0.2 (synopsis "Rust library that allows reinterpreting data safely") (description "This package provides a small Rust library that allows users to reinterpret data of certain types safely.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 233e27c1ffad889dd68c0ba8f3ef7c1cb65f8c43 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:28:12 +0200 Subject: gnu: rust-traitobject-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-traitobject-0.1)[properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9cbcde5bb8..dfc166a5f7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13425,7 +13425,6 @@ (define-public rust-traitobject-0.1 (home-page "https://github.com/reem/rust-traitobject") (synopsis "Unsafe helpers for dealing with raw trait objects") (description "Unsafe helpers for dealing with raw trait objects.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From a07110ee489f18a44aaa07c0eb3e06d5373b0d89 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:29:10 +0200 Subject: gnu: rust-unsafe-any-0.4: Don't hide package. * gnu/packages/crates-io.scm (rust-unsafe-any-0.4)[arguments]: Add rust-traitobject-0.1 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dfc166a5f7..4bff190d9b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13898,11 +13898,13 @@ (define-public rust-unsafe-any-0.4 (base32 "0zwwphsqkw5qaiqmjwngnfpv9ym85qcsyj7adip9qplzjzbn00zk")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-traitobject" ,rust-traitobject-0.1)))) (home-page "https://tokio.rs") (synopsis "Traits and implementations for unchecked downcasting") (description "Traits and implementations for unchecked downcasting.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-untrusted-0.7 -- cgit v1.2.3 From ff5a070244ab14192918eb35dfaa8b8cf7d07528 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:30:15 +0200 Subject: gnu: rust-typemap-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-typemap-0.3)[arguments]: Add rust-unsafe-any-0.4 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4bff190d9b..6fffc53f1f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13550,11 +13550,13 @@ (define-public rust-typemap-0.3 (base32 "1xm1gbvz9qisj1l6d36hrl9pw8imr8ngs6qyanjnsad3h0yfcfv5")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-unsafe-any" ,rust-unsafe-any-0.4)))) (home-page "https://github.com/reem/rust-typemap") (synopsis "Typesafe store for many value types") (description "A typesafe store for many value types.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-typenum-1.10 -- cgit v1.2.3 From 375bff1940daee1d7533aeb64f5fedd7f51d2a8a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:31:17 +0200 Subject: gnu: rust-plugin-0.2: Don't hide package. * gnu/packages/crates-io.scm (rust-plugin-0.2)[arguments]: Add rust-typemap-0.3 to cargo-inputs. Add rust-void-1.0 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6fffc53f1f..b608284371 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8701,11 +8701,15 @@ (define-public rust-plugin-0.2 (base32 "1q7nghkpvxxr168y2jnzh3w7qc9vfrby9n7ygy3xpj0bj71hsshs")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-typemap" ,rust-typemap-0.3)) + #:cargo-development-inputs + (("rust-void" ,rust-void-1.0)))) (home-page "https://github.com/reem/rust-plugin") (synopsis "Lazily evaluated, order-independent plugins for extensible types") (description "Lazily evaluated, order-independent plugins for extensible types.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-pocket-resources-0.3 -- cgit v1.2.3 From b49c6541dabb29c5723b7f028382a3b1d6d44982 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:32:57 +0200 Subject: gnu: rust-pocket-resources-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-pocket-resources-0.3)[properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b608284371..1213389f71 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8729,7 +8729,6 @@ (define-public rust-pocket-resources-0.3 (synopsis "Include resources in your applications") (description "This crate allows you to include resources in your applications.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-ppv-lite86-0.2 -- cgit v1.2.3 From 2707841ff35e9528dca49fa6d21c70c599d7ec79 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:34:34 +0200 Subject: gnu: rust-ppv-lite86-0.2: Upgrade to 0.2.6. * gnu/packages/crates-io.scm (rust-ppv-lite86-0.2): Update to 0.2.6. [properties]: Remove field. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1213389f71..31a6f81a36 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8734,7 +8734,7 @@ (define-public rust-pocket-resources-0.3 (define-public rust-ppv-lite86-0.2 (package (name "rust-ppv-lite86") - (version "0.2.5") + (version "0.2.6") (source (origin (method url-fetch) @@ -8742,13 +8742,12 @@ (define-public rust-ppv-lite86-0.2 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "06snnv338w341nicfqba2jgln5dsla72ndkgrw7h1dfdb3vgkjz3")))) + "06zs492wbms7j5qhy58cs3976c7kyc47rx0d6fn63rgvp580njbl")))) (build-system cargo-build-system) (home-page "https://github.com/cryptocorrosion/cryptocorrosion") (synopsis "Implementation of the crypto-simd API for x86") (description "This crate provides an implementation of the crypto-simd API for x86.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From f273a4ff53156a6aea6267012645d74dd09fcea2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:38:43 +0200 Subject: gnu: Add rust-rustversion-0.1. * gnu/packages/crates-io.scm (rust-rustversion-0.1): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 31a6f81a36..af80a6ae69 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10539,6 +10539,31 @@ (define-public rust-rustfix-0.4 "Automatically apply the suggestions made by rustc.") (license (list license:expat license:asl2.0)))) +(define-public rust-rustversion-0.1 + (package + (name "rust-rustversion") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustversion" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1s3ib2paa5gq17x4qsmjmnsw68z7b5d5av1wsiqcrihmqb7kk0dl")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0)))) + (home-page "https://github.com/dtolnay/rustversion") + (synopsis "Conditional compilation according to rustc compiler version") + (description "This package provides conditional compilation according to +rustc compiler version.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rusty-fork-0.2 (package (name "rust-rusty-fork") -- cgit v1.2.3 From 62c240ef08cf3e855bbe7d7925a94b07f487b89c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:40:04 +0200 Subject: gnu: rust-quote-1.0: Don't hide package. * gnu/packages/crates-io.scm (rust-quote-1.0)[arguments]: Add rust-proc-macro2-1.0 to cargo-inputs. Add rust-rustversion-0.1, rust-trybuild-1.0 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index af80a6ae69..d36c976fe4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9119,10 +9119,15 @@ (define-public rust-quote-1.0 (base32 "1zkc46ryacf2jdkc6krsy2z615xbk1x8kp1830rcxz3irj5qqfh5")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0)) + #:cargo-development-inputs + (("rust-rustversion" ,rust-rustversion-0.1) + ("rust-trybuild" ,rust-trybuild-1.0)))) (home-page "https://github.com/dtolnay/quote") (synopsis "Quasi-quoting macro quote!(...)") (description "Quasi-quoting macro quote!(...)") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) (define-public rust-quote-0.6 @@ -9139,8 +9144,7 @@ (define-public rust-quote-0.6 (base32 "1qgqq48jymp5h4y082aanf25hrw6bpb678xh3zw993qfhxmkpqkc")))) (arguments - `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4)))) - (properties '()))) + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4)))))) (define-public rust-quote-0.3 (package -- cgit v1.2.3 From 3f15d290dd85b75d689cad9a7bc89654eb868ba5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:47:24 +0200 Subject: gnu: rust-rand-isaac-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-rand-isaac-0.1)[arguments]: Add rust-rand-core-0.3, rust-serde-1.0, rust-serde-derive-1.0 to cargo-inputs. Add rust-bincode-1.1 to cargo-development-inputs. [description]: Fill out. [properties]: Remove field. --- gnu/packages/crates-io.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d36c976fe4..4a0aee1b62 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9479,10 +9479,18 @@ (define-public rust-rand-isaac-0.1 (base32 "027flpjr4znx2csxk7gxb7vrf9c7y5mydmvg5az2afgisp4rgnfy")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rand-core" ,rust-rand-core-0.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1)))) (home-page "https://crates.io/crates/rand_isaac") (synopsis "ISAAC random number generator") - (description "ISAAC random number generator") - (properties '((hidden? . #t))) + (description "This package implements the @code{ISAAC} and @code{ISAAC-64} +random number generators. ISAAC stands for \"Indirection, Shift, Accumulate, +Add, and Count\" which are the principal bitwise operations employed.") (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 82d3b69e92b66e250a9fd317a5b6a3af3803472e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:50:34 +0200 Subject: gnu: rust-rand-jitter-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-rand-jitter-0.1)[arguments]: Add rust-libc-0.2, rust-rand-core-0.4, rust-winapi-0.3, rust-log-0.4 to cargo-inputs. [description]: Fill out. [properties]: Remove field. --- gnu/packages/crates-io.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4a0aee1b62..07cb13b90d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9507,12 +9507,16 @@ (define-public rust-rand-jitter-0.1 (base32 "16z387y46bfz3csc42zxbjq89vcr1axqacncvv8qhyy93p4xarhi")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-rand-core" ,rust-rand-core-0.4) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-log" ,rust-log-0.4)))) (home-page "https://github.com/rust-random/rand") - (synopsis - "Random number generator based on timing jitter") - (description - "Random number generator based on timing jitter") - (properties '((hidden? . #t))) + (synopsis "Random number generator based on timing jitter") + (description "This package provides a non-physical true random number +generator based on timing jitter.") (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 71b0ce649208c96b8b4d7a981eeb5b9cb2818ea0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:53:00 +0200 Subject: gnu: rust-rand-xorshift-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-rand-xorshift-0.1)[arguments]: Add rust-rand-core-0.3, rust-serde-1.0, rust-serde-derive-1.0 to cargo-inputs. Add rust-bincode-1.1 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 07cb13b90d..22c987a9ff 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9662,11 +9662,17 @@ (define-public rust-rand-xorshift-0.1 (base32 "0p2x8nr00hricpi2m6ca5vysiha7ybnghz79yqhhx6sl4gkfkxyb")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rand-core" ,rust-rand-core-0.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1.1)))) (home-page "https://crates.io/crates/rand-xorshift") (synopsis "Xorshift random number generator") (description "Xorshift random number generator") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From cd422b4f6a9cb400b66ac94a58f3c4ca44c01ba9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:56:44 +0200 Subject: gnu: rust-ryu-1.0: Don't hide package. * gnu/packages/crates-io.scm (rust-ryu-1.0)[arguments]: Add rust-no-panic-0.1 to cargo-inputs. Add rust-num-cpus-1.11, rust-rand-0.5 to cargo-development-inputs. [description]: Fill out. [properties]: Remove field. --- gnu/packages/crates-io.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 22c987a9ff..3670e29225 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10627,12 +10627,17 @@ (define-public rust-ryu-1.0 (base32 "1j0h74f1xqf9hjkhanp8i20mqc1aw35kr1iq9i79q7713mn51a5z")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-no-panic" ,rust-no-panic-0.1)) + #:cargo-development-inputs + (("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-rand" ,rust-rand-0.5)))) (home-page "https://github.com/dtolnay/ryu") - (synopsis - "Fast floating point to string conversion") + (synopsis "Fast floating point to string conversion") (description - "Fast floating point to string conversion") - (properties '((hidden? . #t))) + "This package provides a pure Rust implementation of Ryū, an algorithm to +quickly convert floating point numbers to decimal strings.") (license (list license:asl2.0 license:boost1.0)))) (define-public rust-safemem-0.3 -- cgit v1.2.3 From a3b61d2192a2a0bb486ba984dc6aae0e521872b7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:58:30 +0200 Subject: gnu: rust-semver-parser-0.9: Don't hide package. * gnu/packages/crates-io.scm (rust-semver-parser-0.9)[properties]: Remove field. (rust-semver-parser-0.7)[properties]: Same. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3670e29225..28048d7d04 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10967,7 +10967,6 @@ (define-public rust-semver-parser-0.9 (home-page "https://github.com/steveklabnik/semver-parser") (synopsis "Parsing of the semver spec") (description "This package provides for parsing of the semver spec.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 675f65ee7b5e879a7881431c95e53e65c3e52bbe Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 17:59:36 +0200 Subject: gnu: rust-shlex-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-shlex-0.1)[properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 28048d7d04..bea1eb477c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11371,7 +11371,6 @@ (define-public rust-shlex-0.1 (synopsis "Split a string into shell words, like Python's shlex") (description "This crate provides a method to split a string into shell words, like Python's shlex.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 1ceb84e57faf9f3577ae2a67c95ecd5d8774ddc8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 18:00:18 +0200 Subject: gnu: rust-slab-0.4: Don't hide package. * gnu/packages/crates-io.scm (rust-slab-0.4)[properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bea1eb477c..414cf71d3c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11470,7 +11470,6 @@ (define-public rust-slab-0.4 (synopsis "Pre-allocated storage for a uniform data type") (description "This create provides a pre-allocated storage for a uniform data type.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-sleef-sys-0.1 -- cgit v1.2.3 From ec88cbbf521596af34c63a58fd2cf8b6d0b5abe0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 18:08:04 +0200 Subject: gnu: rust-socket2-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-socket2-0.3)[arguments]: Skip tests. Add rust-cfg-if-0.1, rust-libc-0.2, rust-redox-syscall-0.1, rust-winapi-0.3 to cargo-inputs. Add rust-tempdir-0.3 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 414cf71d3c..f144e47ce9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11568,12 +11568,20 @@ (define-public rust-socket2-0.3 (base32 "11bdcz04i106g4q7swkll0qxrb4287srqd2k3aq2q6i22zjlvdz8")))) (build-system cargo-build-system) + (arguments + `(#:tests? #f ; tests require network access + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-redox-syscall" ,rust-redox-syscall-0.1) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3)))) (home-page "https://github.com/alexcrichton/socket2-rs") (synopsis "Networking sockets in Rust") (description "This package provides utilities for handling networking sockets with a maximal amount of configuration possible intended.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 240de431865e61c92f3be93cb055d7b502fde25b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 18:11:09 +0200 Subject: gnu: rust-sourcefile-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-sourcefile-0.1)[arguments]: Add rust-tempfile-3.1 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f144e47ce9..e5b87dff99 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11598,12 +11598,14 @@ (define-public rust-sourcefile-0.1 (base32 "1lwa6973zs4bgj29my7agfjgk4nw9hp6j7dfnr13nid85fw7rxsb")))) (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.1)))) (home-page "https://github.com/derekdreery/sourcefile-rs") (synopsis "Concatenate source from multiple files") (description "A library for concatenating source from multiple files, whilst keeping track of where each new file and line starts.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 26e69756fe7c8d4790951d9acfc510cf3cd634ea Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 18:12:48 +0200 Subject: gnu: rust-spin-0.5: Update to 0.5.2. * gnu/packages/crates-io.scm (rust-spin-0.5): Update to 0.5.2. [properties]: Remove field. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e5b87dff99..98f3dcb075 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11639,7 +11639,7 @@ (define-public rust-speculate-0.1 (define-public rust-spin-0.5 (package (name "rust-spin") - (version "0.5.0") + (version "0.5.2") (source (origin (method url-fetch) @@ -11647,14 +11647,13 @@ (define-public rust-spin-0.5 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0m9clchsj0rf13bggsgvbv9haiy0f6rhvnvkpvkk8720a5pkydj4")))) + "0b84m6dbzrwf2kxylnw82d3dr8w06av7rfkr8s85fb5f43rwyqvf")))) (build-system cargo-build-system) (home-page "https://github.com/mvdnes/spin-rs") (synopsis "Synchronization primitives based on spinning") (description "This crate provides synchronization primitives based on spinning. They may contain data, are usable without @code{std},and static initializers are available.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-stable-deref-trait-1.1 -- cgit v1.2.3 From 5c34a8e46480e178287570a48233a8cd6cf612e2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 18:13:44 +0200 Subject: gnu: rust-stable-deref-trait-1.1: Don't hide package. * gnu/packages/crates-io.scm (rust-stable-deref-trait-1.1)[properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 98f3dcb075..6607edbd14 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11677,7 +11677,6 @@ (define-public rust-stable-deref-trait-1.1 type is moved. For example, Box, Vec, Rc, Arc and String implement this trait. Additionally, it defines CloneStableDeref for types like Rc where clones deref to the same address.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From ff1baf1c86f927becfbf2d26eec0635109c37d1c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 18:17:38 +0200 Subject: gnu: Add rust-psm-0.1. * gnu/packages/crates-io.scm (rust-psm-0.1): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6607edbd14..7acf24170c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8912,6 +8912,29 @@ (define-public rust-proptest-0.9 "Hypothesis-like property-based testing and shrinking.") (license (list license:asl2.0 license:expat)))) +(define-public rust-psm-0.1 + (package + (name "rust-psm") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "psm" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1q1hdbnp2j3zz1vhzp1xhds6ynan3mg5bhjlhfy5m1sg8n5wckxi")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-cc" ,rust-cc-1.0)))) + (home-page "https://github.com/rust-lang/stacker/") + (synopsis "Stack manipulation and introspection routines") + (description "This crate provides very portable functions to control the +stack pointer and inspect the properties of the stack.") + (license (list license:isc license:asl2.0)))) + (define-public rust-pulldown-cmark-0.4 (package (name "rust-pulldown-cmark") -- cgit v1.2.3 From f33cb1af088ed4fb44e29317efeb4aae42d4827f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 18:18:34 +0200 Subject: gnu: rust-stacker-0.1: Update to 0.1.6. * gnu/packages/crates-io.scm (rust-stacker-0.1): Update to 0.1.6. [arguments]: Add rust-cfg-if-0.1, rust-libc-0.2, rust-psm-0.1, rust-winapi-0.3 to cargo-inputs. Add rust-cc-1.0 to cargo-development-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7acf24170c..e18649260a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11706,7 +11706,7 @@ (define-public rust-stable-deref-trait-1.1 (define-public rust-stacker-0.1 (package (name "rust-stacker") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) @@ -11714,14 +11714,21 @@ (define-public rust-stacker-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0js0axz5nla1mkr2dm2vrv9rj964ng1lrv4l43sqlnfgawplhygv")))) + "12igajfgqz96c7vcwi91xdfsphawik6g36ndlglqih0a7bqw8vyr")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-psm" ,rust-psm-0.1) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-cc" ,rust-cc-1.0)))) (home-page "https://github.com/rust-lang/stacker") (synopsis "Manual segmented stacks for Rust") (description "This package provides a stack growth library useful when implementing deeply recursive algorithms that may accidentally blow the stack.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 480f265e09e28117e863810241a49b72c840e207 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 18:19:42 +0200 Subject: gnu: rust-static-assertions-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-static-assertions-0.3)[properties]: Remove field. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e18649260a..730d4cb73d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11776,7 +11776,6 @@ (define-public rust-static-assertions-0.3 (description "This package provides compile-time assertions to ensure that invariants are met.") - (properties '((hidden? . #t))) (license (list license:expat license:asl2.0)))) (define-public rust-stdweb-0.4 -- cgit v1.2.3 From 59e84ce34b4a20405e9b1adfe6a92c620fad4013 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 18:23:05 +0200 Subject: gnu: rust-stdweb-internal-runtime-0.1: Update to 0.1.5. * gnu/packages/crates-io.scm (rust-stdweb-internal-runtime-0.1): Update to 0.1.5. [properties]: Remove field. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 730d4cb73d..cc9cfcb865 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11881,7 +11881,7 @@ (define-public rust-stdweb-internal-macros-0.2 (define-public rust-stdweb-internal-runtime-0.1 (package (name "rust-stdweb-internal-runtime") - (version "0.1.4") + (version "0.1.5") (source (origin (method url-fetch) @@ -11889,13 +11889,12 @@ (define-public rust-stdweb-internal-runtime-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1nhpyra7glbwcpakhpj5a3d7h7kx1ynif473nzshmk226m91f8ym")))) + "1h0nkppb4r8dbrbms2hw9n5xdcs392m0r5hj3b6lsx3h6fx02dr1")))) (build-system cargo-build-system) (home-page "https://github.com/koute/stdweb") (synopsis "Internal runtime for the @code{stdweb} crate") (description "This crate provides internal runtime for the @code{stdweb} crate.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 7f9e0380eb8bc8bfbb7b54a8db9e5de151e9c2a1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 18:26:04 +0200 Subject: gnu: rust-stdweb-internal-test-macro-0.1: Update to 0.1.1. * gnu/packages/crates-io.scm (rust-stdweb-internal-test-macro): Update to 0.1.1. [arguments]: Add rust-proc-macro2-1.0, rust-quote-1.0 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cc9cfcb865..a8fbebd0bf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11901,7 +11901,7 @@ (define-public rust-stdweb-internal-runtime-0.1 (define-public rust-stdweb-internal-test-macro-0.1 (package (name "rust-stdweb-internal-test-macro") - (version "0.1.0") + (version "0.1.1") (source (origin (method url-fetch) @@ -11909,13 +11909,16 @@ (define-public rust-stdweb-internal-test-macro-0.1 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "12rrm7p77xnm3xacgn3rgniiyyjb4gq7902wpbljsvbx045z69l2")))) + "0wx3jlm98qrg1pdw149fprzs9x3x3igqkm5ll23jv2v62yddfrjf")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0)))) (home-page "https://github.com/koute/stdweb") (synopsis "Internal crate of the `stdweb` crate") (description "Internal crate of the @code{stdweb} crate.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 41f7daa7e2f588e6621d68b8c6dbc913036c4c0e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 18:28:47 +0200 Subject: gnu: rust-streaming-stats-0.2: Update to 0.2.3. * gnu/packages/crates-io.scm (rust-streaming-stats-0.2): Update to 0.2.3. [arguments]: Add rust-num-traits-0.2 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a8fbebd0bf..d4cd563887 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11949,7 +11949,7 @@ (define-public rust-stream-cipher-0.3 (define-public rust-streaming-stats-0.2 (package (name "rust-streaming-stats") - (version "0.2.2") + (version "0.2.3") (source (origin (method url-fetch) @@ -11957,13 +11957,15 @@ (define-public rust-streaming-stats-0.2 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0l7xz4g6709s80zqpvlhrg0qhgz64r94cwhmfsg8xhabgznbp2px")))) + "0iz5dlq51w5hxjrv6a4hpf8rrj91kgvy0s9mhj0j12il9v771mmh")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://github.com/BurntSushi/rust-stats") (synopsis "Compute basic statistics on streams") (description "Experimental crate for computing basic statistics on streams.") - (properties '((hidden? . #t))) (license (list license:unlicense license:expat)))) -- cgit v1.2.3 From 113afb4990bd6588f1587828dbd97c52496f568d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 18:30:46 +0200 Subject: gnu: rust-strsim-0.9: Upgrade to 0.9.3. * gnu/packages/crates-io.scm (rust-strsim-0.9): Update to 0.9.3. [properties]: Remove field. (rust-strsim-0.8)[properties]: Same. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d4cd563887..3ed6e575d6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12057,7 +12057,7 @@ (define-public rust-string-cache-shared-0.3 (define-public rust-strsim-0.9 (package (name "rust-strsim") - (version "0.9.2") + (version "0.9.3") (source (origin (method url-fetch) @@ -12065,14 +12065,13 @@ (define-public rust-strsim-0.9 (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1xphwhf86yxxmcpvm4mikj8ls41f6nf7gqyjm98b74mfk81h6b03")))) + "0k497pv882qn3q977ckznm13vxx927g8s1swvcv68j3c1pccwik4")))) (build-system cargo-build-system) (home-page "https://github.com/dguo/strsim-rs") (synopsis "Rust implementations of string similarity metrics") (description "This crate includes implementations of string similarity metrics. It includes Hamming, Levenshtein, OSA, Damerau-Levenshtein, Jaro, and Jaro-Winkler.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-strsim-0.8 -- cgit v1.2.3 From 6e18b41eb71ea755bd10f1f7536426260d0fa3d9 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 9 Feb 2020 22:51:09 +0100 Subject: gnu: ripgrep: Install the manpage. * gnu/packages/rust-apps.scm (ripgrep)[native-inputs]: Add asciidoc. [arguments]: Add 'install-manpage phase. Import (ice-9 match). Signed-off-by: Efraim Flashner --- gnu/packages/rust-apps.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index d1d7d225a7..ddc9f6ed37 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -25,6 +25,7 @@ (define-module (gnu packages rust-apps) #:use-module (guix packages) #:use-module (gnu packages compression) #:use-module (gnu packages crates-io) + #:use-module (gnu packages documentation) #:use-module (gnu packages jemalloc) #:use-module (gnu packages pkg-config) #:use-module (gnu packages tls) @@ -226,7 +227,24 @@ (define-public ripgrep ("rust-termcolor" ,rust-termcolor-1.0)) #:cargo-development-inputs (("rust-serde" ,rust-serde-1.0) - ("rust-serde-derive" ,rust-serde-derive-1.0)))) + ("rust-serde-derive" ,rust-serde-derive-1.0)) + #:modules ((ice-9 match) + (guix build cargo-build-system) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'build 'install-manpage + ;; NOTE: This is done before 'check so that there's only one output + ;; directory with the man page. + (lambda* (#:key outputs #:allow-other-keys) + (match (find-files "target" "^rg\\.1$") + ((manpage) + (install-file manpage (string-append + (assoc-ref outputs "out") + "/share/man/man1")))) + #t))))) + (native-inputs + `(("asciidoc" ,asciidoc))) (home-page "https://github.com/BurntSushi/ripgrep") (synopsis "Line-oriented search tool") (description -- cgit v1.2.3 From d883e791b79e919796c03a88688c91b4b17550ea Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 9 Feb 2020 22:51:10 +0100 Subject: gnu: ripgrep: Enable the 'pcre2' feature. * gnu/packages/rust-apps.scm (ripgrep)[arguments]: Add '#:cargo-build-flags' to specify the feature. Replace 'install phase. [native-inputs]: Add pcre2, pkg-config. Signed-off-by: Efraim Flashner --- gnu/packages/rust-apps.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index ddc9f6ed37..ac50f9591a 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -27,6 +27,7 @@ (define-module (gnu packages rust-apps) #:use-module (gnu packages crates-io) #:use-module (gnu packages documentation) #:use-module (gnu packages jemalloc) + #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages tls) #:use-module (gnu packages version-control)) @@ -242,9 +243,22 @@ (define-public ripgrep (install-file manpage (string-append (assoc-ref outputs "out") "/share/man/man1")))) - #t))))) + #t)) + (replace 'install + ;; Adapted from (guix build cargo-build-system). The flags need to + ;; be passed to `cargo install' too, as otherwise it will build + ;; another binary, without the features. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p out) + (setenv "CARGO_TARGET_DIR" "./target") + (invoke "cargo" "install" "--path" "." "--root" out + "--features" "pcre2"))))) + #:cargo-build-flags '("--release" "--features" "pcre2"))) (native-inputs - `(("asciidoc" ,asciidoc))) + `(("asciidoc" ,asciidoc) + ("pcre2" ,pcre2) + ("pkg-config" ,pkg-config))) (home-page "https://github.com/BurntSushi/ripgrep") (synopsis "Line-oriented search tool") (description -- cgit v1.2.3 From b5965c896939d977cd17099789a14464b9a1ce05 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:29:13 +0300 Subject: gnu: Add rust-podio-0.1. * gnu/packages/crates-io.scm (rust-podio-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3ed6e575d6..f2618019e5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8731,6 +8731,27 @@ (define-public rust-pocket-resources-0.3 applications.") (license license:expat))) +(define-public rust-podio-0.1 + (package + (name "rust-podio") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "podio" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ga5arhwakj5rwrqzf9410zrbwnf24jd59af8kr9rgwbd6vb83vq")))) + (build-system cargo-build-system) + ;(arguments '(#:skip-build? #t)) + (home-page "https://github.com/mvdnes/podio.git") + (synopsis "Additional trait to read and write Plain Old Data") + (description + "Additional trait for Read and Write to read and write Plain Old Data.") + (license (list license:expat license:asl2.0)))) + (define-public rust-ppv-lite86-0.2 (package (name "rust-ppv-lite86") -- cgit v1.2.3 From 5ead32ddf10e9af50174b4ee2c7684adcbd86b8e Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:30:08 +0300 Subject: gnu: Add rust-proc-macro-hack-impl-0.4. * gnu/packages/crates-io.scm (rust-proc-macro-hack-impl-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f2618019e5..0f00f0a3df 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8827,6 +8827,26 @@ (define-public rust-proc-macro-hack-0.5 "Procedural macros in expression position.") (license (list license:expat license:asl2.0)))) +(define-public rust-proc-macro-hack-impl-0.4 + (package + (name "rust-proc-macro-hack-impl") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "proc-macro-hack-impl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0hk8g6s0zsi1ps0w48la2s8q5iqq42g8jfrgq3l2v04l2p5pvi1q")))) + (build-system cargo-build-system) + (home-page "https://github.com/dtolnay/proc-macro-hack") + (synopsis "Procedural functionlike!() macros using only Macros 1.1") + (description + "Procedural functionlike!() macros using only Macros 1.1.") + (license (list license:expat license:asl2.0)))) + (define-public rust-proc-macro-nested-0.1 (package (name "rust-proc-macro-nested") -- cgit v1.2.3 From e351bfa882db6c28660af0c85ae9b95666791d90 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:30:54 +0300 Subject: gnu: Add rust-rustc-tools-util-0.2. * gnu/packages/crates-io.scm (rust-rustc-tools-util-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0f00f0a3df..3687d9e94f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10566,6 +10566,29 @@ (define-public rust-rustc-test-0.3 require unstable language features.") (license (list license:asl2.0 license:expat)))) +(define-public rust-rustc-tools-util-0.2 + (package + (name "rust-rustc-tools-util") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc_tools_util" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vj4ymv29igs7n52m12k138zbsn5k5d7ya4sys6lig7sx7ddl9dp")))) + (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) + (home-page + "https://github.com/rust-lang/rust-clippy") + (synopsis + "small helper to generate version information for git packages") + (description + "small helper to generate version information for git packages") + (license (list license:expat license:asl2.0)))) + (define-public rust-rustc-version-0.2 (package (name "rust-rustc-version") -- cgit v1.2.3 From 8940cfa211f36e6e2e645ff34ded2dbb7af718f5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 21:31:22 +0200 Subject: gnu: rust-quickcheck-0.8: Don't skip build. * gnu/packages/crates-io.scm (rust-quichcheck-0.8)[arguments]: Don't skip build. Replace rust-rand-0.4 with 0.6, rust-rand-core-0.5 with 0.4 in cargo-inputs. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3687d9e94f..7bc69465d2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9073,12 +9073,11 @@ (define-public rust-quickcheck-0.8 "0mkl4wnvvjk4m32aq3an4ayfyvnmbxnzcybfm7n3fbsndb1xjdcw")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-env-logger" ,rust-env-logger-0.6) ("rust-log" ,rust-log-0.4) - ("rust-rand" ,rust-rand-0.4) - ("rust-rand-core" ,rust-rand-core-0.5)))) + ("rust-rand" ,rust-rand-0.6) + ("rust-rand-core" ,rust-rand-core-0.4)))) (home-page "https://github.com/BurntSushi/quickcheck") (synopsis -- cgit v1.2.3 From 953297c271c53ed43d17310d54efbebc1e456e38 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:32:29 +0300 Subject: gnu: Add rust-futures-io-0.3. * gnu/packages/crates-io.scm (rust-futures-io-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7bc69465d2..2a530f9461 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4171,6 +4171,28 @@ (define-public rust-futures-executor-preview-0.3 library.") (license (list license:expat license:asl2.0)))) +(define-public rust-futures-io-0.3 + (package + (name "rust-futures-io") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures-io" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1zxm41fmkrb0r39ajk3rr9invcd5bdwlafazn8m9aw4y49ymfxp6")))) + (build-system cargo-build-system) + (home-page "https://rust-lang-nursery.github.io/futures-rs") + (synopsis + "`AsyncRead` and `AsyncWrite` traits for the futures-rs library") + (description + "This package provides the @code{AsyncRead} and @code{AsyncWrite} traits +for the futures-rs library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-futures-io-preview-0.3 (package (name "rust-futures-io-preview") -- cgit v1.2.3 From e6cb6c35f0073154b4c6fc3c9860bb0d021505e9 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:33:05 +0300 Subject: gnu: Add rust-futures-sink-0.3. * gnu/packages/crates-io.scm (rust-futures-sink-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2a530f9461..44466e1fad 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4243,6 +4243,26 @@ (define-public rust-futures-select-macro-preview-0.3 @code{Future}s at once and handling the first one to complete.") (license (list license:expat license:asl2.0)))) +(define-public rust-futures-sink-0.3 + (package + (name "rust-futures-sink") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures-sink" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "05iwskzxq3yqvxv9l1kqnd7kkmp0dwc39fnvwrcjsg76z8zf66qp")))) + (build-system cargo-build-system) + (home-page "https://rust-lang-nursery.github.io/futures-rs") + (synopsis "Asynchronous `Sink` trait for the futures-rs library") + (description "This package provides the asynchronous @code{Sink} trait for +the futures-rs library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-futures-sink-preview-0.3 (package (name "rust-futures-sink-preview") -- cgit v1.2.3 From 0ab109a2b5a3fab006018d8d1498605390e726fc Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:33:28 +0300 Subject: gnu: Add rust-futures-task-0.3. * gnu/packages/crates-io.scm (rust-futures-task-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 44466e1fad..8f53dd6956 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4285,6 +4285,26 @@ (define-public rust-futures-sink-preview-0.3 (license (list license:asl2.0 license:expat)))) +(define-public rust-futures-task-0.3 + (package + (name "rust-futures-task") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures-task" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yg5d7b3z58mhqbrax5a0qdsfvzfclwyqvw5k3i41x4wnbb55bhb")))) + (build-system cargo-build-system) + (arguments '(#:tests? #f)) + (home-page "https://rust-lang-nursery.github.io/futures-rs") + (synopsis "Tools for working with tasks") + (description "Tools for working with tasks.") + (license (list license:expat license:asl2.0)))) + (define-public rust-futures-util-preview-0.3 (package (name "rust-futures-util-preview") -- cgit v1.2.3 From 21aefa9a586fce121df3dbd04583566c8e2686d3 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:34:30 +0300 Subject: gnu: Add rust-strsim-0.6. * gnu/packages/crates-io.scm (rust-strsim-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8f53dd6956..d0649acfdd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12213,6 +12213,21 @@ (define-public rust-strsim-0.8 (base32 "0sjsm7hrvjdifz661pjxq5w4hf190hx53fra8dfvamacvff139cf")))))) +(define-public rust-strsim-0.6 + (package + (inherit rust-strsim-0.9) + (name "rust-strsim") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "strsim" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "151ngha649cyybr3j50qg331b206zrinxqz7fzw1ra8r0n0mrldl")))))) + (define-public rust-structopt-0.2 (package (name "rust-structopt") -- cgit v1.2.3 From a3e4d7f4a8bc1e8b304bc3278050ad0af778166a Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:35:13 +0300 Subject: gnu: Add rust-strsim-0.5. * gnu/packages/crates-io.scm (rust-strsim-0.5): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d0649acfdd..a75222cd78 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12228,6 +12228,21 @@ (define-public rust-strsim-0.6 (base32 "151ngha649cyybr3j50qg331b206zrinxqz7fzw1ra8r0n0mrldl")))))) +(define-public rust-strsim-0.5 + (package + (inherit rust-strsim-0.9) + (name "rust-strsim") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "strsim" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0z3zzvmilfldp4xw42qbkjf901dcnbk58igrzsvivydjzd24ry37")))))) + (define-public rust-structopt-0.2 (package (name "rust-structopt") -- cgit v1.2.3 From fcbb77490c50aa98e8be56f866b82bdb6d804e47 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:35:43 +0300 Subject: gnu: Add rust-subtle-1.0. * gnu/packages/crates-io.scm (rust-subtle-1.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a75222cd78..bb97a447aa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12293,6 +12293,28 @@ (define-public rust-structopt-derive-0.2 "Parse command line argument by defining a struct, derive crate.") (license (list license:asl2.0 license:expat)))) +(define-public rust-subtle-1.0 + (package + (name "rust-subtle") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "subtle" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vm80mxbwfj334izwm8x8l65v1xl9hr0kwrg36r1rq565fkaarrd")))) + (build-system cargo-build-system) + (home-page "https://dalek.rs/") + (synopsis + "Pure-Rust traits and utilities for cryptographic implementations") + (description + "This package provides Pure-Rust traits and utilities for constant-time +cryptographic implementations.") + (license license:bsd-3))) + (define-public rust-syn-1.0 (package (name "rust-syn") -- cgit v1.2.3 From 0e074cc22d75fea963f8a7ba7231a5cbf99e0c07 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:40:42 +0300 Subject: gnu: Add rust-spin-0.4. * gnu/packages/crates-io.scm (rust-spin-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bb97a447aa..9e6d0bc4b3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11804,6 +11804,22 @@ (define-public rust-spin-0.5 initializers are available.") (license license:expat))) +(define-public rust-spin-0.4 + (package + (inherit rust-spin-0.5) + (name "rust-spin") + (version "0.4.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "spin" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "07ywqn1vrpi3c43fmvsx7pawk9h3rb77yyqbnhap2micl454kb6f")))) + (arguments '(#:skip-build? #t)))) + (define-public rust-stable-deref-trait-1.1 (package (name "rust-stable-deref-trait") -- cgit v1.2.3 From dcd721d08d0de2630e52b24b012258b5cf89ab34 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:44:26 +0300 Subject: gnu: Add rust-takeable-option-0.4. * gnu/packages/crates-io.scm (rust-takeable-option-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9e6d0bc4b3..529c5a3532 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12502,6 +12502,26 @@ (define-public rust-tar-0.4 (license (list license:asl2.0 license:expat)))) +(define-public rust-takeable-option-0.4 + (package + (name "rust-takeable-option") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "takeable-option" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0hvd6vk4ksgg2y99498jw52ric4lxm0i6ygpzqm95gdrhvsxyynp")))) + (build-system cargo-build-system) + (home-page "https://docs.rs/takeable-option/") + (synopsis "A small wrapper around option.") + (description + "This package provides a small wrapper around option.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-tempdir-0.3 (package (name "rust-tempdir") -- cgit v1.2.3 From 200dd52bf757a1b5faf345fbc54fb795f3e71236 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:46:01 +0300 Subject: gnu: Add rust-unicode-xid-0.0. * gnu/packages/crates-io.scm (rust-unicode-xid-0.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 529c5a3532..37747b216e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14150,6 +14150,21 @@ (define-public rust-unicode-xid-0.1 (base32 "1z57lqh4s18rr4x0j4fw4fmp9hf9346h0kmdgqsqx0fhjr3k0wpw")))))) +(define-public rust-unicode-xid-0.0 + (package + (inherit rust-unicode-xid-0.2) + (name "rust-unicode-xid") + (version "0.0.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "unicode-xid" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1p5l9h3n3i53cp95fb65p8q3vbwib79ryd9z5z5h5kr9gl6qc7wc")))))) + (define-public rust-unindent-0.1 (package (name "rust-unindent") -- cgit v1.2.3 From ded7d58646acede8833d1457d11fad0961e4f7d3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 21:51:16 +0200 Subject: gnu: rust-unicode-xid-0.2: Don't hide package. * gnu/packages/crates-io.scm (rust-unicode-xid-0.2)[properties]: Remove field. (rust-unicode-xid-0.1, rust-unicode-xid-0.0): Same. --- gnu/packages/crates-io.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 37747b216e..85fc0b66ed 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14127,13 +14127,10 @@ (define-public rust-unicode-xid-0.2 (base32 "0z09fn515xm7zyr0mmdyxa9mx2f7azcpv74pqmg611iralwpcvl2")))) (build-system cargo-build-system) - (home-page - "https://github.com/unicode-rs/unicode-xid") + (home-page "https://github.com/unicode-rs/unicode-xid") (synopsis "Determine Unicode XID related properties") (description "Determine whether characters have the XID_Start or XID_Continue properties according to Unicode Standard Annex #31.") - (properties '((hidden? . #t))) - ;; Dual licensed. (license (list license:asl2.0 license:expat)))) (define-public rust-unicode-xid-0.1 -- cgit v1.2.3 From ff0c3862d0e348e3c87eb896e28428fb3721cc52 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:55:21 +0300 Subject: gnu: Add rust-futures-core-0.3. * gnu/packages/crates-io.scm (rust-futures-core-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 85fc0b66ed..d4bc1c43e1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4095,6 +4095,27 @@ (define-public rust-futures-channel-preview-0.3 "Channels for asynchronous communication using futures-rs.") (license (list license:expat license:asl2.0)))) +(define-public rust-futures-core-0.3 + (package + (name "rust-futures-core") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures-core" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rh8q6pg08dizk5hwksvjgvkw26s3sr3b199nggv3ypyg914qmkr")))) + (build-system cargo-build-system) + (arguments '(#:tests? #f)) + (home-page "https://rust-lang-nursery.github.io/futures-rs") + (synopsis "Core traits and types in for the `futures` library") + (description "This package provides the core traits and types in for the +@code{futures} library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-futures-core-preview-0.3 (package (name "rust-futures-core-preview") -- cgit v1.2.3 From e30c38c227bbce188fa81be61a8aca8bda85f0df Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:56:09 +0300 Subject: gnu: Add rust-futures-channel-0.3. * gnu/packages/crates-io.scm (rust-futures-channel-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d4bc1c43e1..e6c660f9fb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4070,6 +4070,31 @@ (define-public rust-futures-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-futures-channel-0.3 + (package + (name "rust-futures-channel") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures-channel" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11lvk749n61654ad40xn751gmxzwb697nwh36s5gs0ni2z59ibpw")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-inputs + (("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-sink" ,rust-futures-sink-0.3)))) + (home-page "https://rust-lang-nursery.github.io/futures-rs") + (synopsis "Channels for asynchronous communication using futures-rs") + (description + "Channels for asynchronous communication using futures-rs.") + (license (list license:expat license:asl2.0)))) + (define-public rust-futures-channel-preview-0.3 (package (name "rust-futures-channel-preview") -- cgit v1.2.3 From d506aabcb871b98247e4535eb6140b0f56955249 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 03:58:11 +0300 Subject: gnu: Add rust-x11-2. * gnu/packages/crates-io.scm (rust-x11-2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e6c660f9fb..0d160f5f3d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15165,6 +15165,29 @@ (define-public rust-ws2-32-sys-0.2 "Contains function definitions for the Windows API library ws2_32.") (license license:expat))) +(define-public rust-x11-2 + (package + (name "rust-x11") + (version "2.18.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "x11" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0dg2d0yrqmwg6prpxkw3vpmwzwxnaki2cn0v64ylh5gp4cqpws9r")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (home-page "https://github.com/erlepereira/x11-rs.git") + (synopsis "X11 library bindings for Rust") + (description "X11 library bindings for Rust.") + (license license:cc0))) + (define-public rust-xattr-0.2 (package (name "rust-xattr") -- cgit v1.2.3 From 24783bd6222d554925638b01163fa11d8e2088d8 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 04:00:08 +0300 Subject: gnu: Add rust-xcb-0.9. * gnu/packages/crates-io.scm (rust-xcb-0.9): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0d160f5f3d..abbb3446ca 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15215,6 +15215,34 @@ (define-public rust-xattr-0.2 (license (list license:asl2.0 license:expat)))) +(define-public rust-xcb-0.9 + (package + (name "rust-xcb") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "xcb" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "19i2pm8alpn2f0m4jg8bsw6ckw8irj1wjh55h9pi2fcb2diny1b2")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-x11" ,rust-x11-2)) + #:cargo-development-inputs + (("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/rtbo/rust-xcb") + (synopsis "Rust bindings and wrappers for XCB") + (description + "Rust bindings and wrappers for XCB") + (license license:expat))) + (define-public rust-xdg-2.2 (package (name "rust-xdg") -- cgit v1.2.3 From 3886150cd873771c7eba22b08d6f17ad32c68251 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Feb 2020 22:27:46 +0200 Subject: gnu: rust-xcb-0.9: Don't skip build. * gnu/packages/crates-io.scm (rust-xbc-0.9)[arguments]: Don't skip build. Skip test phase. Use cargo-build-flags to build debug features. [inputs]: Add libx11, libxcb, xcb-proto. [native-inputs]: Add pkg-config, python. --- gnu/packages/crates-io.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index abbb3446ca..788840ac6f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33,9 +33,11 @@ (define-module (gnu packages crates-io) #:use-module (gnu packages llvm) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) - #:use-module (gnu packages version-control)) + #:use-module (gnu packages version-control) + #:use-module (gnu packages xorg)) ;;; ;;; Please: Try to add new module packages in alphabetic order. @@ -15230,17 +15232,23 @@ (define-public rust-xcb-0.9 "19i2pm8alpn2f0m4jg8bsw6ckw8irj1wjh55h9pi2fcb2diny1b2")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f ; Building all the features tests the code. + #:cargo-build-flags '("--features" "debug_all") #:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) - ("rust-x11" ,rust-x11-2)) - #:cargo-development-inputs - (("rust-libc" ,rust-libc-0.2)))) + ("rust-x11" ,rust-x11-2)))) + (inputs + `(("libx11" ,libx11) + ("libxcb" ,libxcb) + ("xcb-proto" ,xcb-proto))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python))) (home-page "https://github.com/rtbo/rust-xcb") (synopsis "Rust bindings and wrappers for XCB") (description - "Rust bindings and wrappers for XCB") + "This package provides Rust bindings and wrappers for XCB.") (license license:expat))) (define-public rust-xdg-2.2 -- cgit v1.2.3 From f92440ebd58a032ed0652e4c7dc617d606eedbce Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 11 Feb 2020 17:12:34 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.103. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.103. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9b42735a31..9b76d78b93 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -367,10 +367,10 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.102") +(define-public linux-libre-4.19-version "4.19.103") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "05g0gkwvlwfx1wlinnwm3ryq7fblmxjzhp12g6vx2jbvvn486bih"))) + (hash (base32 "0hxvqkjy63370sr9j4j0a1kzqwxxdn3i8i6wwc5c2gbzpmqlay5l"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 77189a3864af548e3615704da5a919995170f1d6 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 11 Feb 2020 17:13:34 -0500 Subject: gnu: linux-libre: Update to 5.4.19. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.19. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9b76d78b93..53029db709 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -359,10 +359,10 @@ (define (%upstream-linux-source version hash) "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.18") +(define-public linux-libre-5.4-version "5.4.19") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "12ad4fnxag16ar2afiljv4nnv15i4f493sz6m7i9qgjld7yz3scj"))) + (hash (base32 "1f3pzg8vai5qz19gy9gf3rxs2z4dsw78zjkkfnha8iiy2mqvk14m"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 48f57932a7e89c3aa13e550221813df1050a17dc Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Tue, 11 Feb 2020 16:36:49 -0600 Subject: gnu: go: Update to 1.13.7. * gnu/packages/golang.scm (go-1.12): Rename to go-1.13. (go-1.13)[version, source]: Update to 1.13.7. (go-1.13)[arguments]: Don't delete ../pkg/bootstrap, as the file is no longer generated during build. (go): Update to go-1.13. Signed-off-by: Alex Griffin --- gnu/packages/golang.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c27fd6bdb4..d45343c487 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -16,6 +16,7 @@ ;;; Copyright @ 2019 Giovanni Biscuolo ;;; Copyright @ 2019 Alex Griffin ;;; Copyright © 2019 Arun Isaac +;;; Copyright © 2020 Jack Hill ;;; ;;; This file is part of GNU Guix. ;;; @@ -216,11 +217,11 @@ (define-public go-1.4 (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux")) (license license:bsd-3))) -(define-public go-1.12 +(define-public go-1.13 (package (inherit go-1.4) (name "go") - (version "1.12.16") + (version "1.13.7") (source (origin (method url-fetch) @@ -228,7 +229,7 @@ (define-public go-1.12 name version ".src.tar.gz")) (sha256 (base32 - "1y0x10fsvgpc1x24b9q9y6kv9b0kwf7879am3p0gym2abgc5wvnf")))) + "1x21kfpzfkvmqd42pan6nl862m7jjl4niqxxpcgm46awbz645bg4")))) (arguments (substitute-keyword-arguments (package-arguments go-1.4) ((#:phases phases) @@ -367,7 +368,6 @@ (define-public go-1.12 (docs (string-append doc_out "/share/doc/" ,name "-" ,version)) (src (string-append (assoc-ref outputs "tests") "/share/" ,name "-" ,version))) - (delete-file-recursively "../pkg/bootstrap") ;; Prevent installation of the build cache, which contains ;; store references to most of the tools used to build Go and ;; would unnecessarily increase the size of Go's closure if it @@ -405,7 +405,7 @@ (define-public go-1.12 ,@(package-native-inputs go-1.4))) (supported-systems %supported-systems))) -(define-public go go-1.12) +(define-public go go-1.13) (define-public go-github-com-alsm-ioprogress (let ((commit "063c3725f436e7fba0c8f588547bee21ffec7ac5") -- cgit v1.2.3 From ce02727bc823c33d70ef7269e31d692b409958de Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 11 Feb 2020 17:28:55 -0500 Subject: gnu: icecat: Update to 68.5.0-guix0-preview1. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update gnuzilla commit, base version, and hashes. * gnu/packages/patches/icecat-makeicecat.patch: Adapt to new version. --- gnu/packages/gnuzilla.scm | 12 ++++++------ gnu/packages/patches/icecat-makeicecat.patch | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ae0c58eedb..863edb3b4e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -552,8 +552,8 @@ (define* (computed-origin-method gexp-promise hash-algo hash #:system system #:guile-for-build guile))) -(define %icecat-version "68.4.1-guix0-preview1") -(define %icecat-build-id "20200108000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "68.5.0-guix0-preview1") +(define %icecat-build-id "20200211000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -575,11 +575,11 @@ (define icecat-source "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0q7kv70w1d33m12hkzyay6nkgvz9qczrl6hqx0n1c6grs097f2m0")))) + "1ld6jinnln0si6p8qy93v5nzd21ckhl266vz425lwqipibwq9rsj")))) - (upstream-icecat-base-version "68.4.1") ; maybe older than base-version + (upstream-icecat-base-version "68.5.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "2d1b1bc45fdae5a99c4e8ea25593ebb9c8d7bfdf") + (gnuzilla-commit "2dc3c0bed6f8a41a8426ae66db92729af5c27c70") (gnuzilla-source (origin (method git-fetch) @@ -591,7 +591,7 @@ (define icecat-source (string-take gnuzilla-commit 8))) (sha256 (base32 - "0hc9sx3yb71xvr9s1p0z5fx8jfqpssb8wz0h2nzhy2nyp9bb2jzl")))) + "1xwr1xjs4j2i6skm8hknh37gzsd6r396n0lchbwlahig7w6z506y")))) (makeicecat-patch (local-file (search-patch "icecat-makeicecat.patch")))) diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index 172b1dcadd..beaddf9437 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -25,7 +25,7 @@ index 8be2362..48716f2 100755 -wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc -gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 -gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc --echo -n a00a7712d0f919162ce8181a9a3fc3e9ef37adf1caff0945a863b4c0c1d9f360 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +-echo -n 52e784f98a37624e8b207f1b23289c2c88f66dd923798cae891a586a6d94a6d1 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - - -echo Extracting Firefox tarball -tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -37,7 +37,7 @@ index 8be2362..48716f2 100755 +# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc +# gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 +# gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc -+# echo -n a00a7712d0f919162ce8181a9a3fc3e9ef37adf1caff0945a863b4c0c1d9f360 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - ++# echo -n 52e784f98a37624e8b207f1b23289c2c88f66dd923798cae891a586a6d94a6d1 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +# +# echo Extracting Firefox tarball +# tar -xf firefox-${FFVERSION}esr.source.tar.xz -- cgit v1.2.3 From 28ee711152f04dc1fa049f15adafe7b10d1b7628 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:11:48 +0100 Subject: gnu: spacefm: Use HTTPS home page. * gnu/packages/lxde.scm (spacefm)[home-page]: Use HTTPS. --- gnu/packages/lxde.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 5c5e70ff56..dac2ef6d24 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -281,7 +281,7 @@ (define-public spacefm (string-append "--sysconfdir=" (assoc-ref %outputs "out") "/etc")))) - (home-page "http://ignorantguru.github.io/spacefm/") + (home-page "https://ignorantguru.github.io/spacefm/") (synopsis "Multi-panel tabbed file manager") (description "SpaceFM is a graphical, multi-panel, tabbed file manager based on PCManFM with built-in virtual file system, udev-based device manager, -- cgit v1.2.3 From 44ff40c288e734c52d3155b41cb489811363ca71 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:34:07 +0100 Subject: gnu: ttfautohint: Use HTTPS home page. * gnu/packages/fontutils.scm (ttfautohint)[home-page]: Use HTTPS. --- gnu/packages/fontutils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index aba6f07537..42d12fb143 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -120,7 +120,7 @@ (define-public ttfautohint finely hand-hinting the last 1%. It is ideal for web fonts and supports many scripts.") (license (list license:gpl2+ license:freetype)) ;choose one or the other - (home-page "http://www.freetype.org/ttfautohint/"))) + (home-page "https://www.freetype.org/ttfautohint/"))) (define-public woff-tools (package -- cgit v1.2.3 From b3ee0c642a1a8bd72f6873fd536dc0c19cb63281 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:36:35 +0100 Subject: gnu: milkytracker: Use HTTPS home page. * gnu/packages/music.scm (milkytracker)[home-page]: Use HTTPS. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ea3bbe1cca..43ad19acfb 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2999,7 +2999,7 @@ (define-public milkytracker module files. It attempts to recreate the module replay and user experience of the popular DOS program Fasttracker II, with special playback modes available for improved Amiga ProTracker 2/3 compatibility.") - (home-page "http://milkytracker.titandemo.org/") + (home-page "https://milkytracker.titandemo.org/") ;; 'src/milkyplay' is under Modified BSD, the rest is under GPL3 or later. (license (list license:bsd-3 license:gpl3+)))) -- cgit v1.2.3 From eb38239df228413677f798fc30665493589fe93c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:37:07 +0100 Subject: gnu: cereal: Use HTTPS home page. * gnu/packages/serialization.scm (cereal)[home-page]: Use HTTPS. --- gnu/packages/serialization.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 72cc70e3c4..861d11a9ed 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -94,7 +94,7 @@ (define-public cereal #t))))) (native-inputs `(("doxygen" ,doxygen))) - (home-page "http://uscilab.github.io/cereal/") + (home-page "https://uscilab.github.io/cereal/") (synopsis "C++11 library for serialization") (description "Cereal is a header-only C++11 serialization library. Cereal takes -- cgit v1.2.3 From 84877c8aa00784286485cfbb4f8189e6a7d3f57f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:38:18 +0100 Subject: gnu: gimp-fourier: Update home page. * gnu/packages/gimp.scm (gimp-fourier)[home-page]: Use new (HTTPS) URI. --- gnu/packages/gimp.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 0f2eba373d..0cbe290f49 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -255,7 +255,7 @@ (define-public gimp-fourier ("gtk+" ,gtk+-2))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://registry.gimp.org/node/19596") + (home-page "https://www.lprp.fr/gimp_plugin_en/#fourier") (synopsis "GIMP plug-in to edit image in fourier space") (description "This package provides a simple plug-in to apply the fourier transform on -- cgit v1.2.3 From 330e2796bea9f3c711f7ce0eb805105cea9ece6e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Feb 2020 23:35:03 +0100 Subject: gnu: man-pages: Update to 5.05. * gnu/packages/man.scm (man-pages): Update to 5.05. --- gnu/packages/man.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 98c58eb0e7..e105969666 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2016 Ricardo Wurmus ;;; Copyright © 2015 Alex Kost ;;; Copyright © 2015, 2016 Efraim Flashner -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2018, 2019 Marius Bakke ;;; @@ -162,7 +162,7 @@ (define-public man-db (define-public man-pages (package (name "man-pages") - (version "5.04") + (version "5.05") (source (origin (method url-fetch) @@ -172,7 +172,7 @@ (define-public man-pages (string-append "mirror://kernel.org/linux/docs/man-pages/Archive/" "man-pages-" version ".tar.xz"))) (sha256 - (base32 "1bx4ws24bjq6iyfyilg7aih5f0qrhy9l97ksrwcd4yxvjh8gn13x")))) + (base32 "0izb6shcczvg37cyd3kzxsfsrffqj1qw9nqhhq9mi4kd36qkbcfm")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From c57c648bfd948dd5478d76e37cf0d74be81a0020 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 12 Feb 2020 01:29:12 +0100 Subject: gnu: rsnapshot: Update to 1.4.3. * gnu/packages/backup.scm (rsnapshot): Update to 1.4.3. [arguments]: Disable broken test. --- gnu/packages/backup.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 0549e94d70..00a7bcc70f 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -423,7 +423,7 @@ (define-public rdiff-backup (define-public rsnapshot (package (name "rsnapshot") - (version "1.4.2") + (version "1.4.3") (source (origin (method url-fetch) @@ -431,8 +431,7 @@ (define-public rsnapshot "https://github.com/rsnapshot/rsnapshot/releases/download/" version "/rsnapshot-" version ".tar.gz")) (sha256 - (base32 - "05jfy99a0xs6lvsjfp3wz21z0myqhmwl2grn3jr9clijbg282ah4")))) + (base32 "1lavqmmsf53pim0nvming7fkng6p0nk2a51k2c2jdq0l7snpl31b")))) (build-system gnu-build-system) (arguments `(#:phases @@ -444,6 +443,10 @@ (define-public rsnapshot "t/backup_exec/conf/backup_exec.conf") (("/bin/true") (which "true")) (("/bin/false") (which "false"))) + + ;; Disable a test that tries to connect to localhost on port 22. + (delete-file "t/ssh_args/ssh_args.t.in") + (invoke "make" "test")))))) (inputs `(("perl" ,perl) -- cgit v1.2.3 From e60969d54c5aa0c4c368860d632f3bf83bee500d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 12 Feb 2020 02:55:00 +0100 Subject: gnu: Fix copyright header typo. * gnu/packages/gimp.scm: Fix typo. --- gnu/packages/gimp.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 0cbe290f49..ef256ee525 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2015 Ludovic Courtès ;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018 Efraim Flashner -;;; Copyright © 2018, 2019, 202 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Thorsten Wilms ;;; -- cgit v1.2.3 From a3228917803a791214b8552812f798a09ec9f1bd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:33:10 +0100 Subject: gnu: gource: Use HTTPS home page. * gnu/packages/version-control.scm (gource)[home-page]: Use HTTPS. --- gnu/packages/version-control.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 69358695ce..cd3e868670 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2164,7 +2164,7 @@ (define-public gource ("mesa" ,mesa) ("pcre" ,pcre) ("sdl-union" ,(sdl-union (list sdl2 sdl2-image))))) - (home-page "http://gource.io/") + (home-page "https://gource.io/") (synopsis "3D visualisation tool for source control repositories") (description "@code{gource} provides a software version control visualization. The repository is displayed as a tree where the root of the -- cgit v1.2.3 From 8dc94375997280416d532095abaf266c4192466b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 12 Feb 2020 04:34:38 +0100 Subject: gnu: gource: Update to 0.51. * gnu/packages/version-control.scm (gource): Update to 0.51. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index cd3e868670..65ac48188c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2137,7 +2137,7 @@ (define-public stagit (define-public gource (package (name "gource") - (version "0.49") + (version "0.51") (source (origin (method url-fetch) (uri (string-append @@ -2145,7 +2145,7 @@ (define-public gource "/gource-" version "/gource-" version ".tar.gz")) (sha256 (base32 - "12hf5ipcsp9dxsqn84n4kr63xaiskrnf5a084wr29qk171lj7pd9")))) + "16p7b1x4r0915w883lp374jcdqqja37fnb7m8vnsfnl2n64gi8qr")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From ec8194a06727d49a943453d35995edc1c8ecde3f Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 12 Feb 2020 00:18:35 -0600 Subject: gnu: youtube-viewer: Update to 3.7.4. Contains compatibility fix for recent mpv. * gnu/packages/video.scm (youtube-viewer): Update to 3.7.4. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 843b4e37a2..4bf004e990 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1729,7 +1729,7 @@ (define-public you-get (define-public youtube-viewer (package (name "youtube-viewer") - (version "3.7.0") + (version "3.7.4") (source (origin (method git-fetch) (uri (git-reference @@ -1738,7 +1738,7 @@ (define-public youtube-viewer (file-name (git-file-name name version)) (sha256 (base32 - "1h0m8rn7najdrzvg5md9albiax287273b40ncrihh9amsvvb47c9")))) + "1plsm1sc04lwlg5h2gapxpykc3cpd4frjll14lamql89dm4a50vi")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) -- cgit v1.2.3 From 6e6ee5c1deb5ef29f964e15c6ece4c9746522ab7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 12 Feb 2020 09:28:39 +0200 Subject: gnu: emacs-geiser: Declare a source file-name. * gnu/packages/emacs-xyz.scm (emacs-geiser)[source]: Use file-name. --- gnu/packages/emacs-xyz.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1b864d86f8..0a7c870416 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -169,6 +169,7 @@ (define-public emacs-geiser (uri (git-reference (url "https://gitlab.com/jaor/geiser/") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "0fb2h984hn7bnyiziplp7kgk29zdzc9yainsv0k1li436irlp9dd")))) -- cgit v1.2.3 From 8926866ef7c2b0204a9fe7072e927186b87e8d66 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Tue, 11 Feb 2020 11:25:03 +0100 Subject: gnu: Add cl-trivialib-type-unify. * gnu/packages/lisp-xyz.scm (sbcl-trivialib-type-unify, cl-trivialib-type-unify): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2a17bfb0f2..392544529f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10384,3 +10384,42 @@ (define-public sbcl-type-r (define-public cl-type-r (sbcl-package->cl-source-package sbcl-type-r)) + +(define-public sbcl-trivialib-type-unify + (let ((commit "62492ebf04db567dcf435ae84c50b7b8202ecf99") + (revision "1")) + (package + (name "sbcl-trivialib-type-unify") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/guicho271828/trivialib.type-unify.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bkyfzbwv75p50zp8n1n9rh2r29pw3vgz91gmn2gzzkyq3khj1vh")))) + (build-system asdf-build-system/sbcl) + (synopsis "Common Lisp type unification") + (description + "Unifies a parametrized type specifier against an actual type specifier. +Importantly, it handles complicated array-subtypes and number-related types +correctly.") + (home-page "https://github.com/guicho271828/trivialib.type-unify") + (license license:lgpl3+) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("trivia" ,sbcl-trivia) + ("introspect-environment" ,sbcl-introspect-environment) + ("type-r" ,sbcl-type-r))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (arguments + `(#:asd-system-name "trivialib.type-unify" + #:asd-file "trivialib.type-unify.asd" + #:test-asd-file "trivialib.type-unify.test.asd"))))) + +(define-public cl-trivialib-type-unify + (sbcl-package->cl-source-package sbcl-trivialib-type-unify)) -- cgit v1.2.3 From ca6c5c7fdf67100b5a0f0a0ae20ec3bce6b96043 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Tue, 11 Feb 2020 11:33:20 +0100 Subject: gnu: Add cl-specialized-function. * gnu/packages/lisp-xyz.scm (sbcl-specialized-function, cl-specialized-function): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 392544529f..c6859c333e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10423,3 +10423,45 @@ (define-public sbcl-trivialib-type-unify (define-public cl-trivialib-type-unify (sbcl-package->cl-source-package sbcl-trivialib-type-unify)) + +(define-public sbcl-specialized-function + (let ((commit "b96b6afaf8358bf91cc0703e62a5a4ee20d2b7bc") + (revision "1")) + (package + (name "sbcl-specialized-function") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/numcl/specialized-function.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12j45ff0n26578vmfbhb9mfbdchw4wy023k0m2ppgl9s0z4bhjaj")))) + (build-system asdf-build-system/sbcl) + (synopsis "Julia-like dispatch for Common Lisp") + (description + "This library is part of NUMCL. It provides a macro +@code{SPECIALIZED} that performs a Julia-like dispatch on the arguments, +lazily compiling a type-specific version of the function from the same +code. The main target of this macro is speed.") + (home-page "https://github.com/numcl/specialized-function") + (license license:lgpl3+) + (inputs + `(("trivia" ,sbcl-trivia) + ("alexandria" ,sbcl-alexandria) + ("iterate" ,sbcl-iterate) + ("lisp-namespace" ,sbcl-lisp-namespace) + ("type-r" ,sbcl-type-r) + ("trivial-cltl2" ,sbcl-trivial-cltl2))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (arguments + `(#:asd-system-name "specialized-function" + #:asd-file "specialized-function.asd" + #:test-asd-file "specialized-function.test.asd"))))) + +(define-public cl-specialized-function + (sbcl-package->cl-source-package sbcl-specialized-function)) -- cgit v1.2.3 From 6e0f2b959af9e79bda017e949c9882bee06502af Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Tue, 11 Feb 2020 11:37:10 +0100 Subject: gnu: Add cl-constantfold. * gnu/packages/lisp-xyz.scm (sbcl-constantfold, cl-constantfold): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c6859c333e..4206c027a1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10465,3 +10465,41 @@ (define-public sbcl-specialized-function (define-public cl-specialized-function (sbcl-package->cl-source-package sbcl-specialized-function)) + +(define-public sbcl-constantfold + (let ((commit "0ff1d97a3fbcb89264f6a2af6ce62b73e7b421f4") + (revision "1")) + (package + (name "sbcl-constantfold") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/numcl/constantfold.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "153h0569z6bff1qbad0bdssplwwny75l7ilqwcfqfdvzsxf9jh06")))) + (build-system asdf-build-system/sbcl) + (synopsis "Support library for numcl") + (description + "Support library for numcl. Registers a function as an +additional form that is considered as a candidate for a constant.") + (home-page "https://github.com/numcl/constantfold") + (license license:lgpl3+) + (inputs + `(("trivia" ,sbcl-trivia) + ("alexandria" ,sbcl-alexandria) + ("iterate" ,sbcl-iterate) + ("lisp-namespace" ,sbcl-lisp-namespace))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (arguments + `(#:asd-system-name "constantfold" + #:asd-file "constantfold.asd" + #:test-asd-file "constantfold.test.asd"))))) + +(define-public cl-constantfold + (sbcl-package->cl-source-package sbcl-constantfold)) -- cgit v1.2.3 From 5ce7d1861a18a93f10cfb97669ce6917f9f63c29 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Tue, 11 Feb 2020 11:39:44 +0100 Subject: gnu: Add cl-gtype. * gnu/packages/lisp-xyz.scm (sbcl-gtype, cl-gtype): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4206c027a1..ddf823d414 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10503,3 +10503,43 @@ (define-public sbcl-constantfold (define-public cl-constantfold (sbcl-package->cl-source-package sbcl-constantfold)) + +(define-public sbcl-gtype + (let ((commit "42275e3606242ae91e9c8dfa30c18ced50a35b66") + (revision "1")) + (package + (name "sbcl-gtype") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/numcl/gtype.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1f56dba998v945jcxhha391557n6md1ql25b7icfwwfivhmlaa9b")))) + (build-system asdf-build-system/sbcl) + (synopsis "C++/Julia-like parametric types in Common Lisp") + (description + "Support library for numcl that provides Julia-like runtime parametric +type correctness in Common Lisp. It is based on CLtL2 extensions.") + (home-page "https://github.com/numcl/gtype") + (license license:lgpl3+) + (inputs + `(("trivialib.type-unify" ,sbcl-trivialib-type-unify) + ("trivial-cltl2" ,sbcl-trivial-cltl2) + ("trivia" ,sbcl-trivia) + ("alexandria" ,sbcl-alexandria) + ("iterate" ,sbcl-iterate) + ("type-r" ,sbcl-type-r))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (arguments + `(#:asd-system-name "gtype" + #:asd-file "gtype.asd" + #:test-asd-file "gtype.test.asd"))))) + +(define-public cl-gtype + (sbcl-package->cl-source-package sbcl-gtype)) -- cgit v1.2.3 From 7ad122007dc4fc9ab6bab9a17cdef6cbab68d20b Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Tue, 11 Feb 2020 11:45:07 +0100 Subject: gnu: Add cl-numcl. * gnu/packages/lisp-xyz.scm (sbcl-numcl, cl-numcl): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ddf823d414..2682c731b9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10543,3 +10543,50 @@ (define-public sbcl-gtype (define-public cl-gtype (sbcl-package->cl-source-package sbcl-gtype)) + +(define-public sbcl-numcl + (let ((commit "1cf7dfa59f763a24a501092870e9c5ee745d0c17") + (revision "1")) + (package + (name "sbcl-numcl") + (version (git-version "0.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/numcl/numcl.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0i3jby9hf4ii7blivgyza80g0vmjfhk8537i5i7kqqk0i5sdnym2")))) + (build-system asdf-build-system/sbcl) + (synopsis "Numpy clone in Common Lisp") + (description + "This is a Numpy clone in Common Lisp. At the moment the +library is written in pure Common Lisp, focusing more on correctness +and usefulness, not speed. Track the progress at +@url{https://github.com/numcl/numcl/projects/1}.") + (home-page "https://github.com/numcl/numcl") + (license license:lgpl3+) + (inputs + `(("trivia" ,sbcl-trivia) + ("alexandria" ,sbcl-alexandria) + ("iterate" ,sbcl-iterate) + ("lisp-namespace" ,sbcl-lisp-namespace) + ("type-r" ,sbcl-type-r) + ("constantfold" ,sbcl-constantfold) + ("cl-randist" ,sbcl-cl-randist) + ("float-features" ,sbcl-float-features) + ("function-cache" ,sbcl-function-cache) + ("specialized-function" ,sbcl-specialized-function) + ("gtype" ,sbcl-gtype))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (arguments + `(#:asd-system-name "numcl" + #:asd-file "numcl.asd" + #:test-asd-file "numcl.test.asd"))))) + +(define-public cl-numcl + (sbcl-package->cl-source-package sbcl-numcl)) -- cgit v1.2.3 From cd820bf78843aeaebf5e3cf6a4d3a43f5531d267 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 12 Feb 2020 09:30:18 +0000 Subject: gnu: subversion: Disable parallel tests. These seem to work fine on x86_64-linux, but on i686-linux some tests fail when running in parallel. FAIL: fs-fs-pack-test 4: commit to a packed FSFS filesystem FAIL: fs-test: Unknown test failure; see tests.log. FAIL: io-test: Unknown test failure; see tests.log. FAIL: op-depth-test: Unknown test failure; see tests.log. FAIL: wc-test: Unknown test failure; see tests.log. Summary of test results: 2243 tests PASSED 96 tests SKIPPED 43 tests XFAILED 5 tests FAILED SUMMARY: Some tests failed. * gnu/packages/version-control.scm (subversion)[arguments]: Add #:parallel-tests? #f and use this in the 'set-PARALLEL phase. --- gnu/packages/version-control.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 65ac48188c..e2a06dee59 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1430,7 +1430,9 @@ (define-public subversion "19zc215mhpnm92mlyl5jbv57r5zqp6cavr3s2g9yglp6j4kfgj0q")))) (build-system gnu-build-system) (arguments - '(#:phases + '(#:parallel-tests? #f ; TODO Seems to cause test failures on + ; i686-linux + #:phases (modify-phases %standard-phases (add-after 'configure 'patch-libtool-wrapper-ls (lambda* (#:key inputs #:allow-other-keys) @@ -1449,8 +1451,10 @@ (define-public subversion (("#!/bin/sh") (string-append "#!" (which "sh")))) #t)) (add-before 'check 'set-PARALLEL - (lambda _ - (setenv "PARALLEL" (number->string (parallel-job-count))) + (lambda* (#:key parallel-tests? #:allow-other-keys) + (if parallel-tests? + (setenv "PARALLEL" (number->string (parallel-job-count))) + (simple-format #t "parallel-tests? are disabled\n")) #t)) (add-after 'install 'install-perl-bindings (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 971cc1b533e20b289f78b4a76f8c019ed853eaf0 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 12 Feb 2020 14:03:01 +0000 Subject: gnu: emacs-helm-bibtex: Update to 2.0.0-2.d447123. * gnu/packages/emacs-xyz.scm (emacs-helm-bibtex): Update to 2.0.0-2.d447123. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0a7c870416..4f42176451 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12623,8 +12623,8 @@ (define-public emacs-biblio (license license:gpl3+))) (define-public emacs-helm-bibtex - (let ((commit "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463") - (revision "1")) + (let ((commit "d4471232be26793fbf56c0ac3690b5f537c378b9") + (revision "2")) (package (name "emacs-helm-bibtex") (version (string-append "2.0.0" "-" revision "." @@ -12638,7 +12638,7 @@ (define-public emacs-helm-bibtex (file-name (git-file-name name version)) (sha256 (base32 - "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz")))) + "1bkzhic6qckb267025il1r3xcpz99kisphxiafni1pxvf9jafr0j")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm) -- cgit v1.2.3 From 39604beba8c70c7e37bb2f254ad803bc8cd3271e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 12 Feb 2020 15:30:06 +0100 Subject: gnu: cataclysm-dda: Fix home-page. * gnu/packages/games.scm (cataclysm-dda): Fix home-page. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 482bbf6f68..f380b52490 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -446,7 +446,7 @@ (define-public cataclysm-dda ("sdl2-image" ,sdl2-image) ("sdl2-ttf" ,sdl2-ttf) ("sdl2-mixer" ,sdl2-mixer))) - (home-page "http://en.cataclysmdda.com/") + (home-page "https://cataclysmdda.org/") (synopsis "Survival horror roguelike video game") (description "Cataclysm: Dark Days Ahead (or \"DDA\" for short) is a roguelike set -- cgit v1.2.3 From 403d9fae791bd22b4e2da5e90ad273755de26dc5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 12 Feb 2020 15:34:13 +0100 Subject: gnu: Add sky. * gnu/packages/games.scm (sky): New variable. --- gnu/packages/games.scm | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f380b52490..587f25906d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7937,6 +7937,94 @@ (define-public queen-it "queen-it" "FOTAQ_It_Talkie_" "1.0" "it" "1h76y70lrpzfjkm53n4nr364nhyka54vbz9r7sadzyzl7c7ilv4d")) +(define-public sky + (package + (name "sky") + (version "1.2") ;1.3 is floppy version + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/scummvm/extras/" + "Beneath%20a%20Steel%20Sky/" + "bass-cd-" version ".zip")) + (sha256 + (base32 "14s5jz67kavm8l15gfm5xb7pbpn8azrv460mlxzzvdpa02a9n82k")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (share (string-append out "/share")) + (data (string-append share "/" ,name)) + (apps (string-append share "/applications")) + (bin (string-append out "/bin")) + (executable (string-append bin "/" ,name)) + (scummvm (assoc-ref %build-inputs "scummvm"))) + (let ((unzip (string-append (assoc-ref %build-inputs "unzip") + "/bin/unzip"))) + (invoke unzip "-j" (assoc-ref %build-inputs "source"))) + (let ((doc (string-append share "/doc/bass-" ,version))) + (install-file "readme.txt" doc)) + (for-each (lambda (f) (install-file f data)) + (find-files "." "^sky\\.")) + ;; Build the executable. + (mkdir-p bin) + (let ((bash (assoc-ref %build-inputs "bash"))) + (with-output-to-file executable + (lambda () + (format #t "#!~a/bin/bash~%" bash) + (format #t "exec ~a/bin/scummvm -p ~a sky~%" scummvm data)))) + (chmod executable #o755) + ;; Create desktop file. There is no dedicated + ;; icon for the game, so we borrow SCUMMVM's. + (mkdir-p apps) + (with-output-to-file (string-append apps "/" ,name ".desktop") + (lambda _ + (format #t + "[Desktop Entry]~@ + Name=Beneath a Steel Sky~@ + GenericName=Bass~@ + Exec=~a~@ + Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@ + Categories=AdventureGame;Game;RolePlaying;~@ + Keywords=adventure;game;roleplaying;cyberpunk;~@ + Comment=A science-fiction adventure game set in a bleak post-apocalyptic vision of the future~@ + Comment[de]=Ein Science-Fiction-Abenteuerspiel \ +angesiedelt in einer düsteren, postapokalyptischen Vision der Zukunft~@ + Type=Application~%" + executable scummvm))) + #t)))) + (native-inputs + `(("unzip" ,unzip))) + (inputs + `(("bash" ,bash) + ("scummvm" ,scummvm))) + (home-page "https://www.scummvm.org/") + (synopsis "Classic 2D point an click science-fiction adventure game") + (description + "Beneath a Steel Sky is a science-fiction thriller set in a bleak +post-apocalyptic vision of the future. It revolves around Union City, +where selfishness, rivalry, and corruption by its citizens seems to be +all too common, those who can afford it live underground, away from +the pollution and social problems which are plaguing the city. + +You take on the role of Robert Foster, an outcast of sorts from the +city since a boy who was raised in a remote environment outside of +Union City simply termed ``the gap''. Robert's mother took him away +from Union City as a child on their way to ``Hobart'' but the +helicopter crashed on its way. Unfortunately, Robert's mother died, +but he survived and was left to be raised by a local tribe from the +gap. + +Years later, Union City security drops by and abducts Robert, killing +his tribe in the process; upon reaching the city the helicopter taking +him there crashes with him escaping, high upon a tower block in the +middle of the city. He sets out to discover the truth about his past, +and to seek vengeance for the killing of his tribe.") + (license (license:non-copyleft "file:///readme.txt")))) + (define-public gnurobots (package (name "gnurobots") -- cgit v1.2.3 From 045cb382dea7d6879747408675d8b817a9a359e0 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 04:00:58 +0300 Subject: gnu: Add rust-x11-clipboard-0.4. * gnu/packages/crates-io.scm (rust-x11-clipboard-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 788840ac6f..6e003860be 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15190,6 +15190,30 @@ (define-public rust-x11-2 (description "X11 library bindings for Rust.") (license license:cc0))) +(define-public rust-x11-clipboard-0.4 + (package + (name "rust-x11-clipboard") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "x11-clipboard" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0nqdnswiyj28b1izjp5rzbc67cxpb5c8p4vh1xyndkirzs84vqqk")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Tests require display server. + #:cargo-inputs (("rust-xcb" ,rust-xcb-0.9)))) + (native-inputs + `(("python" ,python))) + (home-page "https://github.com/quininer/x11-clipboard") + (synopsis "x11 clipboard support for Rust") + (description "This package provides x11 clipboard support for Rust.") + (license license:expat))) + (define-public rust-xattr-0.2 (package (name "rust-xattr") -- cgit v1.2.3 From 84273bbde46b94c20c5d240654d2e88cc7f0214c Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 04:02:18 +0300 Subject: gnu: Add rust-maybe-uninit-2.0. * gnu/packages/crates-io.scm (rust-maybe-uninit-2.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6e003860be..afa87e2728 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6648,6 +6648,26 @@ (define-public rust-matrixmultiply-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-maybe-uninit-2.0 + (package + (name "rust-maybe-uninit") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "maybe-uninit" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "004y0nzmpfdrhz251278341z6ql34iv1k6dp1h6af7d6nd6jwc30")))) + (build-system cargo-build-system) + (home-page "https://github.com/est31/maybe-uninit") + (synopsis "MaybeUninit for friends of backwards compatibility") + (description + "This package provides MaybeUninit for friends of backwards compatibility.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-md5-0.6 (package (name "rust-md5") -- cgit v1.2.3 From 3d02da9fb2b96ed502737ad7862f9e4621aaf516 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 04:03:03 +0300 Subject: gnu: Add rust-x11-dl-2. * gnu/packages/crates-io.scm (rust-x11-dl-2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index afa87e2728..be3d5e316e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15234,6 +15234,31 @@ (define-public rust-x11-clipboard-0.4 (description "This package provides x11 clipboard support for Rust.") (license license:expat))) +(define-public rust-x11-dl-2 + (package + (name "rust-x11-dl") + (version "2.18.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "x11-dl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0n1w837xagxqgwx2880d7c9ks6l3g1kk00yd75afdaiv58sf2rdy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-maybe-uninit" ,rust-maybe-uninit-2.0) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (home-page "https://github.com/erlepereira/x11-rs.git") + (synopsis "X11 library bindings for Rust") + (description "This package provides X11 library bindings for Rust.") + (license license:cc0))) + (define-public rust-xattr-0.2 (package (name "rust-xattr") -- cgit v1.2.3 From 2eac2078be1d2cdf3327bab2043a35e9356982fd Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 04:04:11 +0300 Subject: gnu: Add rust-bitflags-0.8. * gnu/packages/crates-io.scm (rust-bitflags-0.8): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index be3d5e316e..1f3ab3f83e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -935,6 +935,21 @@ (define-public rust-bitflags-1 (license (list license:asl2.0 license:expat)))) +(define-public rust-bitflags-0.8 + (package + (inherit rust-bitflags-1) + (name "rust-bitflags") + (version "0.8.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "bitflags" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1x5z8hmirpnapkx6sww8gkc6x0q8ppni0lbsigm3mrba5byfjw0k")))))) + (define-public rust-blake2-rfc-0.2 (package (name "rust-blake2-rfc") -- cgit v1.2.3 From f193fdea530eb7be484798252160225378ffc81a Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 04:04:31 +0300 Subject: gnu: Add rust-bitflags-0.7. * gnu/packages/crates-io.scm (rust-bitflags-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1f3ab3f83e..0486f14fa0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -950,6 +950,21 @@ (define-public rust-bitflags-0.8 (base32 "1x5z8hmirpnapkx6sww8gkc6x0q8ppni0lbsigm3mrba5byfjw0k")))))) +(define-public rust-bitflags-0.7 + (package + (inherit rust-bitflags-1) + (name "rust-bitflags") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "bitflags" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0v8hh6wdkpk9my8z8442g4hqrqf05h0qj53dsay6mv18lqvqklda")))))) + (define-public rust-blake2-rfc-0.2 (package (name "rust-blake2-rfc") -- cgit v1.2.3 From a09dad21f354f15b83c189175b68c38cb7287fd0 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 04:09:21 +0300 Subject: gnu: Add rust-dispatch-0.1. * gnu/packages/crates-io.scm (rust-dispatch-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0486f14fa0..1db1b61126 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2929,6 +2929,27 @@ (define-public rust-discard-1.0 for intentionally leaking memory") (license license:expat))) +(define-public rust-dispatch-0.1 + (package + (name "rust-dispatch") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "dispatch" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "019nzy993hxaiazcdnayx3csv2iki34i535asw11ki96hakkrs84")))) + (build-system cargo-build-system) + (arguments '(#:tests? #f)) ; Tests only run on Mac. + (home-page "http://github.com/SSheldon/rust-dispatch") + (synopsis "Rust wrapper for Apple's Grand Central Dispatch") + (description "This package provides a Rust wrapper for Apple's Grand +Central Dispatch.") + (license license:expat))) + (define-public rust-doc-comment-0.3 (package (name "rust-doc-comment") -- cgit v1.2.3 From 959b93a66032c4f647d0e1209b855e7762dbd10b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 04:10:19 +0300 Subject: gnu: Add rust-downcast-rs-1.1. * gnu/packages/crates-io.scm (rust-downcast-rs-1.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1db1b61126..3391533d96 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2996,6 +2996,27 @@ (define-public rust-docopt-1.1 (description "Command line argument parsing.") (license (list license:expat license:unlicense)))) +(define-public rust-downcast-rs-1.1 + (package + (name "rust-downcast-rs") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "downcast-rs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xhs2qj02k9m4mm5fgh19y88850y9jsnwwlblf2ffc91gjs6xfjj")))) + (build-system cargo-build-system) + (home-page "https://github.com/marcianx/downcast-rs") + (synopsis "Trait object downcasting support using only safe Rust") + (description + "Trait object downcasting support using only safe Rust. It supports type +parameters, associated types, and type constraints.") + (license (list license:expat license:asl2.0)))) + (define-public rust-dtoa-0.4 (package (name "rust-dtoa") -- cgit v1.2.3 From e9c291a619076251fb5551a26ff313be54a93ab2 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 04:11:16 +0300 Subject: gnu: Add rust-glutin-emscripten-sys-0.1. * gnu/packages/crates-io.scm (rust-glutin-emscripten-sys-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3391533d96..35a69c84e2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4805,6 +4805,25 @@ (define-public rust-globset-0.4 path simultaneously, and returning all of the globs that matched.") (license (list license:expat license:unlicense)))) +(define-public rust-glutin-emscripten-sys-0.1 + (package + (name "rust-glutin-emscripten-sys") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "glutin_emscripten_sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ix0jmm8p5if4qarzdfl5mz9rbq4hhgqarakb3bzwvyz13dkynr4")))) + (build-system cargo-build-system) + (home-page "https://github.com/tomaka/glutin") + (synopsis "Emscripten bindings for glutin") + (description "The emscripten bindings for glutin.") + (license license:asl2.0))) + (define-public rust-goblin-0.0 (package (name "rust-goblin") -- cgit v1.2.3 From c736983ab7dc07f6fae82230e6ab24ddd06581f9 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 04:12:13 +0300 Subject: gnu: Add rust-khronos-api-3. * gnu/packages/crates-io.scm (rust-khronos-api-3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 35a69c84e2..29d74196bd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6061,6 +6061,26 @@ (define-public rust-kernel32-sys-0.2 kernel32.") (license license:expat))) +(define-public rust-khronos-api-3 + (package + (name "rust-khronos-api") + (version "3.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "khronos-api" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1p0xj5mlbagqyvvnv8wmv3cr7l9y1m153888pxqwg3vk3mg5inz2")))) + (build-system cargo-build-system) + (home-page "https://github.com/brendanzab/gl-rs/") + (synopsis "Khronos XML API Registry") + (description + "The Khronos XML API Registry, exposed as byte string constants.") + (license license:asl2.0))) + (define-public rust-language-tags-0.2 (package (name "rust-language-tags") -- cgit v1.2.3 From 72ca512c94d55db525205cc30aeaa17a662eddc8 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 04:12:53 +0300 Subject: gnu: Add rust-lzw-0.10. * gnu/packages/crates-io.scm (rust-lzw-0.10): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 29d74196bd..7919773c80 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6616,6 +6616,26 @@ (define-public rust-lzma-sys-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-lzw-0.10 + (package + (name "rust-lzw") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "lzw" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1170dfskhzlh8h2bm333811hykjvpypgnvxyhhm1rllyi2xpr53x")))) + (build-system cargo-build-system) + (home-page "https://github.com/nwin/lzw.git") + (synopsis "LZW compression and decompression") + (description + "This package provides LZW compression and decompression.") + (license (list license:expat license:asl2.0)))) + (define-public rust-mac-0.1 (package (name "rust-mac") -- cgit v1.2.3 From f4adb13aed24544edcb14440edb68fd4040bfc04 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 04:13:29 +0300 Subject: gnu: Add rust-md5-0.3. * gnu/packages/crates-io.scm (rust-md5-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7919773c80..68c5d5580d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6819,6 +6819,22 @@ (define-public rust-md5-0.6 (license (list license:asl2.0 license:expat)))) +(define-public rust-md5-0.3 + (package + (inherit rust-md5-0.6) + (name "rust-md5") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "md5" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0j2s8aqdkhwhy7awga2bmv5n8qq8bgy8672iha9f3y871dm6vibr")))) + (arguments '()))) + (define-public rust-memchr-2.2 (package (name "rust-memchr") -- cgit v1.2.3 From 68b1a5eadaedddaa74635ae6bf11d43ea13f1844 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 12 Feb 2020 21:12:46 +0200 Subject: gnu: rust-md5-0.6: Don't skip build. * gnu/packages/crates-io.scm (rust-md5-0.6)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 68c5d5580d..40c36447e3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6812,7 +6812,6 @@ (define-public rust-md5-0.6 (base32 "17b2xm4h4cvxsdjsf3kdrzqv2za60kak961xzi5kmw6g6djcssvy")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) (home-page "https://github.com/stainless-steel/md5") (synopsis "MD5 hash function in Rust") (description "The package provides the MD5 hash function.") @@ -6832,8 +6831,7 @@ (define-public rust-md5-0.3 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0j2s8aqdkhwhy7awga2bmv5n8qq8bgy8672iha9f3y871dm6vibr")))) - (arguments '()))) + "0j2s8aqdkhwhy7awga2bmv5n8qq8bgy8672iha9f3y871dm6vibr")))))) (define-public rust-memchr-2.2 (package -- cgit v1.2.3 From 583b1648e4591e4bbb5742ba6552a79a51bac62b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 04:17:53 +0300 Subject: gnu: Add rust-clipboard-win-2.1. * gnu/packages/crates-io.scm (rust-clipboard-win-2.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 40c36447e3..ce444d1c5f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1695,6 +1695,29 @@ (define-public rust-clicolors-control-1.0 colorization.") (license license:expat))) +(define-public rust-clipboard-win-2.1 + (package + (name "rust-clipboard-win") + (version "2.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "clipboard-win" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0431sg4jhabrqf2dliiwhbx9hinb9z4qfcm6914lm5mb17ya5798")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Tests are for Windows. + #:cargo-inputs (("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/DoumanAsh/clipboard-win") + (synopsis "Interact with Windows clipboard") + (description + "This package provides simple way to interact with Windows clipboard.") + (license license:expat))) + (define-public rust-clippy-0.0 (package (name "rust-clippy") -- cgit v1.2.3 From 77c4aa0fd8c76015414efc6f665c292640eeef02 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Wed, 15 Jan 2020 04:20:22 +0300 Subject: gnu: Add rust-dwrote-0.9. * gnu/packages/crates-io.scm (rust-dwrote-0.9): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ce444d1c5f..166fc13592 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3106,6 +3106,35 @@ (define-public rust-duct-0.13 "A library for running child processes.") (license license:expat))) +(define-public rust-dwrote-0.9 + (package + (name "rust-dwrote") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "dwrote" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03gzl5pd90nlkmwqmbmjmyz47h7wlblbqrwv5a29npnv0ag3dl8b")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ;("rust-wio" ,rust-wio-0.2) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/servo/dwrote-rs") + (synopsis "Lightweight binding to DirectWrite") + (description + "This package provides lightweight binding to DirectWrite.") + (license license:mpl2.0))) + (define-public rust-either-1.5 (package (name "rust-either") -- cgit v1.2.3 From d4a6fb3b42118381edeed5dee699623db6197918 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Thu, 16 Jan 2020 17:29:52 +0300 Subject: gnu: Add rust-objc-test-utils-0.0. * gnu/packages/crates-io.scm (rust-objc-test-utils-0.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 166fc13592..f7667eed9a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7963,6 +7963,30 @@ (define-public rust-numtoa-0.1 "This package can convert numbers into stack-allocated byte arrays.") (license (list license:expat license:asl2.0)))) +(define-public rust-objc-test-utils-0.0 + (package + (name "rust-objc-test-utils") + (version "0.0.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "objc_test_utils" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09rckmp5h9bbns08xzicdlk7y5lxj2ygbg3yqk1cszfnzd5n8kzx")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-gcc" ,rust-gcc-0.3)))) + (home-page "http://github.com/SSheldon/rust-objc") + (synopsis "Utilities for testing Objective-C interop") + (description + "This package provides utilities for testing Objective-C interop.") + (license license:expat))) + (define-public rust-object-0.12 (package (name "rust-object") -- cgit v1.2.3 From 06d197ea9d8f0e580a0678c12186fbbde8bd0766 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Thu, 16 Jan 2020 17:18:33 +0300 Subject: gnu: Add rust-compiletest-rs-0.2. * gnu/packages/crates-io.scm (rust-compiletest-rs-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f7667eed9a..2e8a37584f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1880,6 +1880,27 @@ (define-public rust-compiletest-rs-0.3 harness.") (license (list license:asl2.0 license:expat)))) +(define-public rust-compiletest-rs-0.2 + (package + (inherit rust-compiletest-rs-0.3) + (name "rust-compiletest-rs") + (version "0.2.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "compiletest_rs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0njz4shbhl1pvb6ngpi1wpz2gr5lf2dcha22lpdk995pzrwd6h97")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-log" ,rust-log-0.3) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-tempdir" ,rust-tempdir-0.3)))))) + (define-public rust-console-0.7 (package (name "rust-console") -- cgit v1.2.3 From 897a409af205ff41099fa3b60ba5624ecf4d5336 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Thu, 16 Jan 2020 17:31:15 +0300 Subject: gnu: Add rust-objc-exception-0.1. * gnu/packages/crates-io.scm (rust-objc-exception-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2e8a37584f..a5c9aa4917 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7984,6 +7984,31 @@ (define-public rust-numtoa-0.1 "This package can convert numbers into stack-allocated byte arrays.") (license (list license:expat license:asl2.0)))) +(define-public rust-objc-exception-0.1 + (package + (name "rust-objc-exception") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "objc-exception" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "191cmdmlypp6piw67y4m8y5swlxf5w0ss8n1lk5xd2l1ans0z5xd")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cc" ,rust-cc-1.0)))) + (home-page "http://github.com/SSheldon/rust-objc-exception") + (synopsis "Rust interface for Objective-C's throw and try/catch statements") + (description + "This package provides a Rust interface for Objective-C's throw and +try/catch statements.") + (license license:expat))) + (define-public rust-objc-test-utils-0.0 (package (name "rust-objc-test-utils") -- cgit v1.2.3 From cf20f8a58257ed5a99a366427da2f5e12beef6aa Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Thu, 16 Jan 2020 17:32:03 +0300 Subject: gnu: Add rust-malloc-buf-0. * gnu/packages/crates-io.scm (rust-malloc-buf-0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a5c9aa4917..d9cc522af6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6750,6 +6750,28 @@ (define-public rust-make-cmd-0.1 platform-independently.") (license license:expat))) +(define-public rust-malloc-buf-0.0 + (package + (name "rust-malloc-buf") + (version "0.0.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "malloc-buf" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1jqr77j89pwszv51fmnknzvd53i1nkmcr8rjrvcxhm4dx1zr1fv2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/SSheldon/malloc_buf") + (synopsis "Structs for handling malloc'd memory passed to Rust") + (description + "This package provides structs for handling malloc'd memory passed to Rust.") + (license license:expat))) + (define-public rust-maplit-1.0 (package (name "rust-maplit") -- cgit v1.2.3 From 55086c2e3709b625fc67876e2c1492470ccd4aa0 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Thu, 16 Jan 2020 17:36:29 +0300 Subject: gnu: Add rust-objc-0.2. * gnu/packages/crates-io.scm (rust-objc-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d9cc522af6..393ef51114 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8006,6 +8006,31 @@ (define-public rust-numtoa-0.1 "This package can convert numbers into stack-allocated byte arrays.") (license (list license:expat license:asl2.0)))) +(define-public rust-objc-0.2 + (package + (name "rust-objc") + (version "0.2.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "objc" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1cbpf6kz8a244nn1qzl3xyhmp05gsg4n313c9m3567625d3innwi")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Tests require gcc-objc. + #:cargo-inputs + (("rust-malloc-buf" ,rust-malloc-buf-0.0) + ("rust-objc-exception" ,rust-objc-exception-0.1)))) + (home-page "http://github.com/SSheldon/rust-objc") + (synopsis "Objective-C Runtime bindings and wrapper for Rust") + (description "This package provides an Objective-C Runtime bindings and +wrapper for Rust.") + (license license:expat))) + (define-public rust-objc-exception-0.1 (package (name "rust-objc-exception") -- cgit v1.2.3 From 9b97d73ced0f673b6efe12c3343d33d0e1ebb757 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Thu, 16 Jan 2020 17:37:56 +0300 Subject: gnu: Add rust-objc-id-0.1. * gnu/packages/crates-io.scm (rust-objc-id-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 393ef51114..f874a63f49 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8056,6 +8056,29 @@ (define-public rust-objc-exception-0.1 try/catch statements.") (license license:expat))) +(define-public rust-objc-id-0.1 + (package + (name "rust-objc-id") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "objc_id" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fq71hnp2sdblaighjc82yrac3adfmqzhpr11irhvdfp9gdlsbf9")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Tests require gcc-objc. + #:cargo-inputs (("rust-objc" ,rust-objc-0.2)))) + (home-page "http://github.com/SSheldon/rust-objc-id") + (synopsis "Rust smart pointers for Objective-C reference counting") + (description + "This package provides Rust smart pointers for Objective-C reference counting.") + (license license:expat))) + (define-public rust-objc-test-utils-0.0 (package (name "rust-objc-test-utils") -- cgit v1.2.3 From eeb372b56278b3f44e83c02c3f7a8b44925730b7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 12 Feb 2020 22:53:56 +0100 Subject: gnu: grammalecte: Update to 1.7.0. * gnu/packages/dictionaries.scm (grammalecte): Update to 1.7.0. --- gnu/packages/dictionaries.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index af6cef71d3..cd0a5db93c 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -219,15 +219,14 @@ (define-public ding (define-public grammalecte (package (name "grammalecte") - (version "1.6.0") + (version "1.7.0") (source (origin (method url-fetch/zipbomb) (uri (string-append "https://grammalecte.net/grammalecte/zip/" "Grammalecte-fr-v" version ".zip")) (sha256 - (base32 - "0kz13gx2hd23xd6bfr4z73lh18slj3vbvs2xcb7qvhramxjqzqcn")))) + (base32 "0wb126mqnq9ns6gzmhzljc6iqywdkpzvr8xny5s3khd10ki4lxl3")))) (build-system python-build-system) (home-page "https://grammalecte.net") (synopsis "French spelling and grammar checker") -- cgit v1.2.3 From 0d4e780e778e804ee014741fde74738e66f16ce2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 12 Feb 2020 23:03:05 +0100 Subject: gnu: tlp: Update to 1.3.1. * gnu/packages/linux.scm (tlp): Update to 1.3.1. --- gnu/packages/linux.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 53029db709..d8eaa45fe5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5185,15 +5185,16 @@ (define-public brightnessctl (define-public tlp (package (name "tlp") - (version "1.3.0") + (version "1.3.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/linrunner/TLP/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/linrunner/TLP.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "169k3xypq5rq0xiggrlpr73yr2r2x7b2d9vcr9ac96qrgph7sk7r")))) + (base32 "14fcnaz9pw534v4d8dddqq4wcvpf1kghr8zlrk62r5lrl46sp1p5")))) (native-inputs `(("shellcheck" ,shellcheck))) (inputs -- cgit v1.2.3 From 436dd1de55d9ca998c43ae469040aa3918442377 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 12 Feb 2020 23:36:32 +0100 Subject: gnu: musescore: Update to 3.4.2. * gnu/packages/music.scm (musescore): Update to 3.4.2. [inputs]: Add qtquickcontrols2. --- gnu/packages/music.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 43ad19acfb..50e5d11f8d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3878,7 +3878,7 @@ (define-public lmms (define-public musescore (package (name "musescore") - (version "3.4.1") + (version "3.4.2") (source (origin (method git-fetch) @@ -3887,7 +3887,7 @@ (define-public musescore (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "16rx4x0czhwjg8vppcc7iw0cvii9q2l730cqhmhvip9r8wwamsvj")) + (base32 "14a9sg87nx7xca1qfbkplnpbx9pyg9k9vy87dq0g401ag6g6bi66")) (modules '((guix build utils))) (snippet ;; Un-bundle OpenSSL and remove unused libraries. @@ -3927,6 +3927,7 @@ (define-public musescore ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) + ("qtquickcontrols2" ,qtquickcontrols2) ("qtscript" ,qtscript) ("qtsvg" ,qtsvg) ("qtxmlpatterns" ,qtxmlpatterns))) -- cgit v1.2.3 From 8b660be1c1496433bba312fe837bd662784633a2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 12 Feb 2020 23:38:15 +0100 Subject: gnu: quaternion: Fix typo in description. * gnu/packages/messaging.scm (quaternion)[description]: Fix typo. --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index b1276e267b..120daacdc6 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1816,7 +1816,7 @@ (define-public quaternion (synopsis "Graphical client for the Matrix instant messaging protocol") (description "Quaternion is a Qt5 desktop client for the Matrix instant messaging protocol. It uses libqmatrixclient and is its reference client -implementation. Quaternion and libqmatriclient together form the +implementation. Quaternion and libqmatrixclient together form the QMatrixClient project.") (license (list license:gpl3+ ; all source code license:lgpl3+)))) ; icons/breeze -- cgit v1.2.3 From 98e61365fb30da5d925e839798f8a3ecddcbf661 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:20:24 +0100 Subject: gnu: r-bayesplot: Use HTTPS home page. * gnu/packages/cran.scm (r-bayesplot)[home-page]: Use HTTPS. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e61030b09f..fd1cc7f358 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8360,7 +8360,7 @@ (define-public r-bayesplot ("r-rlang" ,r-rlang) ("r-tibble" ,r-tibble) ("r-tidyselect" ,r-tidyselect))) - (home-page "http://mc-stan.org/bayesplot") + (home-page "https://mc-stan.org/bayesplot") (synopsis "Plotting for Bayesian models") (description "This package provides plotting functions for posterior analysis, model -- cgit v1.2.3 From 2e9ec5fb9e2c8998826f64e0c1bb2dc67d2c91f3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 12 Feb 2020 18:44:07 +0100 Subject: gnu: foo2zjs: Update to 20200207. * gnu/packages/cups.scm (foo2zjs): Update to 20200207. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 8fbb2ee4f6..232e61c86d 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -673,14 +673,14 @@ (define-public foomatic-filters (define-public foo2zjs (package (name "foo2zjs") - (version "20190909") + (version "20200207") (source (origin (method url-fetch) ;; XXX: This is an unversioned URL! (uri "http://foo2zjs.rkkda.com/foo2zjs.tar.gz") (sha256 (base32 - "1nn84c045mbv6yzpjfggc6152bvgrmcxiyvgz9v2w3sws7ihshrm")))) + "0pf1sm29gnrhhpyvq95jskvr874h5r4kls9w10gc24z23fjmr5zx")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From eb642f3d247ee0c74122017354c57bdce028eb57 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 12 Feb 2020 12:51:37 +0000 Subject: gnu: Add libcyaml. * gnu/packages/web.scm (libcyaml): New variable. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/web.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0f20cf205c..638624effc 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2019 Jakob L. Kreuze ;;; Copyright © 2019 Florian Pelz ;;; Copyright © 2020 Timotej Lazar +;;; Copyright © 2020 Alexandros Theodotou ;;; ;;; This file is part of GNU Guix. ;;; @@ -4829,6 +4830,46 @@ (define-public libcss written in C. It is developed as part of the NetSurf project.") (license license:expat))) +(define-public libcyaml + (package + (name "libcyaml") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tlsa/libcyaml.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0h5ydyqdl8kzh526np3jsi0pm7ks16nh1hjkdsjcd6pacw7y6i6z")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "CC=gcc")) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'check + (lambda _ + (setenv "CC" "gcc") + (invoke "make" "test")))))) + (inputs + `(("libyaml" ,libyaml))) + (native-inputs + `(("git", git) + ("pkg-config", pkg-config))) + (synopsis "C library for reading and writing YAML") + (description + "LibCYAML is a C library written in ISO C11 for reading and writing +structured YAML documents. The fundamental idea behind CYAML is to allow +applications to construct schemas which describe both the permissible +structure of the YAML documents to read/write, and the C data structure(s) +in which the loaded data is arranged in memory.") + (home-page "https://github.com/tlsa/libcyaml") + (license license:isc))) + (define-public libdom (package (name "libdom") -- cgit v1.2.3 From c3843b4611d2d960573c16cc89b325f23e4e50c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 13 Feb 2020 00:03:40 +0100 Subject: gnu: choqok: Fix typo in description. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes ‘guix show choqok’ and friends. * gnu/packages/kde-internet.scm (choqok)[description]: Escape ‘@’. --- gnu/packages/kde-internet.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 4b0504ca5c..0d5b9788b8 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -100,7 +100,7 @@ (define-public choqok Other notable features include: @itemize @item Support for user + friends time-lines. -@item Support for @Reply time-lines. +@item Support for @@Reply time-lines. @item Support for sending and receiving direct messages. @item Twitpic.com integration. @item The ability to use multiple accounts simultaneously. -- cgit v1.2.3 From 96d580a6472f85f48adb89b4d7bc04fb99526822 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 13 Feb 2020 00:08:06 +0100 Subject: gnu: s-tui: Update to 1.0.0. * gnu/packages/admin.scm (s-tui): Update to 1.0.0. --- gnu/packages/admin.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 23619cbfc2..4780fe124e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1601,14 +1601,13 @@ (define-public acpica (define-public s-tui (package (name "s-tui") - (version "0.8.3") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "s-tui" version)) (sha256 - (base32 - "00lsh2v4i8rwfyjyxx5lijd6rnk9smcfffhzg5sv94ijpcnh216m")))) + (base32 "0r5yhlsi5xiy7ii1w4kqkaxz9069v5bbfwi3x3xnxhk51yjfgr8n")))) (build-system python-build-system) (inputs `(("python-psutil" ,python-psutil) -- cgit v1.2.3 From 68e30b8de6a0775647fbe2316d217eb35f2105f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:38:56 +0100 Subject: gnu: brdf-explorer: Use HTTPS home page. * gnu/packages/graphics.scm (brdf-explorer)[home-page]: Use HTTPS. --- gnu/packages/graphics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 217ccb4ece..4b6e57986c 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -854,7 +854,7 @@ (define-public brdf-explorer ("glew" ,glew) ("freeglut" ,freeglut) ("zlib" ,zlib))) - (home-page "http://www.disneyanimation.com/technology/brdf.html") + (home-page "https://www.disneyanimation.com/technology/brdf.html") (synopsis "Analyze bidirectional reflectance distribution functions (BRDFs)") (description -- cgit v1.2.3 From d81fb2ae9443994ae5dd1cb5837276fad63f842c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 19:18:18 +0100 Subject: gnu: python-tox: Update home page. * gnu/packages/python-xyz.scm (python-tox)[home-page]: Use new (HTTPS) URI. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b47e395595..77c960a2b2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8840,7 +8840,7 @@ (define-public python-tox `(; FIXME: Missing: ("python-pytest-timeout" ,python-pytest-timeout) ("python-pytest" ,python-pytest) ; >= 2.3.5 ("python-setuptools-scm" ,python-setuptools-scm))) - (home-page "http://tox.testrun.org/") + (home-page "https://tox.readthedocs.io") (synopsis "Virtualenv-based automation of test activities") (description "Tox is a generic virtualenv management and test command line tool. It can be used to check that a package installs correctly with -- cgit v1.2.3 From 8ae17933e2bdffe21351cfa664ac9773125c674b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 13 Feb 2020 16:41:35 +0100 Subject: gnu: opensubdiv: Build with a newer version of Mesa. * gnu/packages/gl.scm (mesa-19.3.3): New public variable. * gnu/packages/graphics.scm (opensubdiv)[inputs]: Add it. --- gnu/packages/gl.scm | 19 +++++++++++++++++++ gnu/packages/graphics.scm | 7 +++++-- 2 files changed, 24 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index d0718d5d45..e610fe1dd7 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pierre Neidhardt +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -422,6 +423,24 @@ (define-public mesa from software emulation to complete hardware acceleration for modern GPUs.") (license license:x11))) +;; Mesa 19.3.2 causes a test failure in some packages, so add this newer +;; version separately until the next rebuild cycle. +(define-public mesa-19.3.3 + (package/inherit + mesa + (version "19.3.3") + (source (origin + (inherit (package-source mesa)) + (uri (list (string-append "https://mesa.freedesktop.org/archive/" + "mesa-" version ".tar.xz") + (string-append "ftp://ftp.freedesktop.org/pub/mesa/" + "mesa-" version ".tar.xz") + (string-append "ftp://ftp.freedesktop.org/pub/mesa/" + version "/mesa-" version ".tar.xz"))) + (sha256 + (base32 + "02czqdqf64i3az5p1allnxycyjad3x35cj0hz0017mi5pc84ikl1")))))) + (define-public mesa-opencl (package (inherit mesa) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 4b6e57986c..bcdc372d86 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2019 Steve Sprang ;;; Copyright © 2019 John Soo ;;; Copyright © 2019 Pierre Neidhardt -;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2019 Tanguy Le Carrour ;;; ;;; This file is part of GNU Guix. @@ -1061,7 +1061,10 @@ (define-public opensubdiv (native-inputs `(("xorg-server" ,xorg-server-for-tests))) (inputs - `(("glew" ,glew) + `(;; The test suite fails when using Mesa 19.3.2, so we provide this newer + ;; version. Remove this input when the 'mesa' package is updated. + ("mesa" ,mesa-19.3.3) + ("glew" ,glew) ("libxrandr" ,libxrandr) ("libxcursor" ,libxcursor) ("libxinerama" ,libxinerama) -- cgit v1.2.3 From 2537ce68b02e50ed374ec2828aecfd7e14b6a62f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 17:47:10 +0100 Subject: gnu: python-markdown: Update to 3.2. * gnu/packages/python-xyz.scm (python-markdown): Update to 3.2. [properties]: New field. (python2-markdown): Stay on 3.1.1. --- gnu/packages/python-xyz.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 77c960a2b2..fd222aa1f2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6731,14 +6731,14 @@ (define-public python2-mistune (define-public python-markdown (package (name "python-markdown") - (version "3.1.1") + (version "3.2") (source (origin (method url-fetch) (uri (pypi-uri "Markdown" version)) (sha256 (base32 - "0yhylk4ffqqs7x086fav4pnfsl1021v7lghznzkififprmmqfl1f")))) + "1gwqrhrp0n9xllgmjc8n1p260968kr0dd2jncjkj4r617q61imss")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose) @@ -6750,10 +6750,21 @@ (define-public python-markdown Markdown. The library features international input, various Markdown extensions, and several HTML output formats. A command line wrapper markdown_py is also provided to convert Markdown files to HTML.") + (properties `((python2-variant . ,(delay python2-markdown)))) (license license:bsd-3))) +;; Markdown 3.2 dropped support for Python 2. (define-public python2-markdown - (package-with-python2 python-markdown)) + (let ((base (package-with-python2 (strip-python2-variant python-markdown)))) + (package/inherit + base + (version "3.1.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "Markdown" version)) + (sha256 + (base32 + "0yhylk4ffqqs7x086fav4pnfsl1021v7lghznzkififprmmqfl1f"))))))) (define-public python-ptyprocess (package -- cgit v1.2.3 From bf71edd3df1aed8037678631c296c03b437d8a8a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 21:16:09 +0100 Subject: gnu: python2-pbcore: Remove python2-sphinx dependency. * gnu/packages/bioinformatics.scm (python2-pbcore)[arguments]: Add #:phases. [native-inputs]: Remove PYTHON2-SPHINX. --- gnu/packages/bioinformatics.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b7b80cec02..065555b37b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner -;;; Copyright © 2016 Marius Bakke +;;; Copyright © 2016, 2020 Marius Bakke ;;; Copyright © 2016, 2018 Raoul Bonnal ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Arun Isaac @@ -4733,7 +4733,17 @@ (define-public python2-pbcore (base32 "1kjmv891d6qbpp4shhhvkl02ff4q5xlpnls2513sm2cjcrs52f1i")))) (build-system python-build-system) - (arguments `(#:python ,python-2)) ; pbcore requires Python 2.7 + (arguments + `(#:python ,python-2 ;pbcore < 2.0 requires Python 2.7 + #:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-sphinx-dependency + (lambda _ + ;; Sphinx is only required for documentation tests, which + ;; we do not run; furthermore it depends on python2-sphinx + ;; which is no longer maintained. + (substitute* "requirements-dev.txt" + (("^sphinx") "")) + #t))))) (propagated-inputs `(("python-cython" ,python2-cython) ("python-numpy" ,python2-numpy) @@ -4741,7 +4751,6 @@ (define-public python2-pbcore ("python-h5py" ,python2-h5py))) (native-inputs `(("python-nose" ,python2-nose) - ("python-sphinx" ,python2-sphinx) ("python-pyxb" ,python2-pyxb))) (home-page "https://pacificbiosciences.github.io/pbcore/") (synopsis "Library for reading and writing PacBio data files") -- cgit v1.2.3 From a866dd184d2e91df37e3ba5bd9707a152fc04a67 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 21:40:20 +0100 Subject: gnu: libsecret: Update to 0.20.1. * gnu/packages/gnome.scm (libsecret): Update to 0.20.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7fa3ea48d5..014b68f54f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3770,7 +3770,7 @@ (define-public libsoup (define-public libsecret (package (name "libsecret") - (version "0.19.1") + (version "0.20.1") (source (origin (method url-fetch) (uri (string-append @@ -3779,7 +3779,7 @@ (define-public libsecret "libsecret-" version ".tar.xz")) (sha256 (base32 - "0fhflcsr70b1pps2pcvqcbdhip2ny5am9nbm634f4sj5g40y30w5")))) + "0ir4ynpf8b64xss1azvsi5x6697lik7hkf3z0xxa2qv2xja3xxsp")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From f6abff7bd4f6ab3c8257e97154aa5814babab562 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 22:08:49 +0100 Subject: gnu: wpebackend-fdo: Update to 1.4.1. * gnu/packages/webkit.scm (wpebackend-fdo): Update to 1.4.1. --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 8ceee90018..463bf41e23 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -93,14 +93,14 @@ (define-public libwpe (define-public wpebackend-fdo (package (name "wpebackend-fdo") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (string-append "https://wpewebkit.org/releases/" "wpebackend-fdo-" version ".tar.xz")) (sha256 (base32 - "1bwbs47v4nlzhsqrw9fpyny5m3n9ry0kfzsvk90zjif4bd5cl6d9")))) + "1799vf6wc78z15l39sfh39l5rrvlqpi29ynjm0324rpsrfvs0jb2")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no tests -- cgit v1.2.3 From 40bea7f9b26644f45c2832026b69ceaee033923f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 22:21:21 +0100 Subject: gnu: IlmBase, OpenEXR: Update to 2.4.1. * gnu/packages/graphics.scm (ilmbase): Update to 2.4.1. --- gnu/packages/graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index bcdc372d86..a7ea6192fb 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -330,7 +330,7 @@ (define-public cgal (define-public ilmbase (package (name "ilmbase") - (version "2.4.0") + (version "2.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -339,7 +339,7 @@ (define-public ilmbase (file-name (git-file-name "ilmbase" version)) (sha256 (base32 - "0g3rz11cvb7gnphp2np9z7bfl7v4dprq4w5hnsvx7yrasgsdyn8s")) + "020gyl8zv83ag6gbcchmqiyx9rh2jca7j8n52zx1gk4rck7kwc01")) (patches (search-patches "ilmbase-fix-tests.patch" "ilmbase-openexr-pkg-config.patch")))) (build-system cmake-build-system) -- cgit v1.2.3 From ee8d86ff47e96348b3f50200a784de0373fa00f5 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 13 Feb 2020 22:09:53 +0100 Subject: gnu: Add gash-utils. * gnu/packages/shells.scm (gash-utils): New variable. --- gnu/packages/shells.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index ec7e658972..2aac6323a0 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2019 Timothy Sample -;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. @@ -820,3 +820,30 @@ (define-public gash library for parsing shell scripts. Gash is designed to bootstrap Bash as part of the Guix bootstrap process.") (license gpl3+))) + +(define-public gash-utils + (package + (name "gash-utils") + (version "0.1.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://savannah/gash/gash-utils-" + version ".tar.gz")) + (sha256 + (base32 + "0ib2p52qmbac5n0s5bys4fiwim461ps546976l1n7pwbs0avh7fk")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-2.2) + ("gash" ,gash))) + (home-page "https://savannah.nongnu.org/projects/gash/") + (synopsis "Core POSIX utilities written in Guile Scheme") + (description "Gash-Utils provides Scheme implementations of many +common POSIX utilities (there are about 40 of them, ranging in +complexity from @command{false} to @command{awk}). The utilities are +designed to be capable of bootstrapping their standard GNU counterparts. +Underpinning these utilities are many Scheme interfaces for manipulating +files and text.") + (license gpl3+))) -- cgit v1.2.3 From 0a193d321b603b6b95b00594c124b37de230261e Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Thu, 6 Feb 2020 09:13:45 +0100 Subject: gnu: python-pip: Update to 20.0.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-pip): Update to 20.0.2. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index fd222aa1f2..ca559ca00a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7443,14 +7443,14 @@ (define-public python2-pretend (define-public python-pip (package (name "python-pip") - (version "19.2.1") + (version "20.0.2") (source (origin (method url-fetch) (uri (pypi-uri "pip" version)) (sha256 (base32 - "100sd12ss4mbdj5lf3wawad29cm573b27765mq098x6xhcj71395")))) + "0zwnlsjn6mb742cr995zfbk9v56ygxp8w3k49601r9by9kmcic3x")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; there are no tests in the pypi archive. -- cgit v1.2.3 From 5f6ce90a90011147a555cd400d7aaec8ef532a7f Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Thu, 6 Feb 2020 23:39:55 +0100 Subject: gnu: sane-backends: Disable genesys_unit_tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/packages/scanner.scm (sane-backends)[arguments]<#:phases>: Add disable-failing-backend-tests. Signed-off-by: Ludovic Courtès --- gnu/packages/scanner.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index 6adaba18cd..1e4231b7e7 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -131,6 +131,13 @@ (define-public sane-backends ((#:phases phases) `(modify-phases ,phases (delete 'disable-backends) + (add-after 'disable-failing-tests 'disable-failing-backend-tests + (lambda _ + ;; Disable test that fails on i686: + ;; + (substitute* "testsuite/backend/genesys/Makefile.in" + ((" genesys_unit_tests\\$\\(EXEEXT\\)") "")) + #t)) (add-after 'unpack 'add-backends (lambda _ (substitute* "backend/dll.conf.in" -- cgit v1.2.3 From cdf409e817ae5e622277860dac8664fa87ec0bef Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 16:51:06 -0500 Subject: gnu: go-golang-org-x-crypto: Update to 0.0.0-4.9756ffd. * gnu/packages/golang.scm (go-golang-org-x-crypto): Update to 0.0.0-4.9756ffd. --- gnu/packages/golang.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d45343c487..399615df3b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -623,8 +623,8 @@ (define-public go-golang-org-x-tools (license license:bsd-3)))) (define-public go-golang-org-x-crypto - (let ((commit "b7391e95e576cacdcdd422573063bc057239113d") - (revision "3")) + (let ((commit "9756ffdc24725223350eb3266ffb92590d28f278") + (revision "4")) (package (name "go-golang-org-x-crypto") (version (git-version "0.0.0" revision commit)) @@ -637,7 +637,7 @@ (define-public go-golang-org-x-crypto version "-checkout")) (sha256 (base32 - "1jqfh81mhgwcc6b9l0bs6rb0707s01qpvn7896i5bsmig46lc7zm")))) + "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8")))) (build-system go-build-system) (arguments '(#:import-path "golang.org/x/crypto" -- cgit v1.2.3 From c32e70a8bab331364657a51c4137a03142ba01f7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 8 Oct 2019 18:31:42 -0400 Subject: gnu: go-github-com-gobwas-glob: Update to 0.2.3. * gnu/packages/syncthing.scm (go-github-com-gobwas-glob): Update to 0.2.3. --- gnu/packages/syncthing.scm | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 8b41a6317f..8eb2b6ca5d 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -306,27 +306,25 @@ (define-public go-github-com-d4l3k-messagediff (license expat))) (define-public go-github-com-gobwas-glob - (let ((commit "51eb1ee00b6d931c66d229ceeb7c31b985563420") - (revision "0")) - (package - (name "go-github-com-gobwas-glob") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gobwas/glob") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "090wzpwsjana1qas8ipwh1pj959gvc4b7vwybzi01f3bmd79jwlp")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/gobwas/glob")) - (synopsis "Go globbing library") - (description "This package provides a Go implementation of globs.") - (home-page "https://github.com/gobwas/glob") - (license expat)))) + (package + (name "go-github-com-gobwas-glob") + (version "0.2.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gobwas/glob") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/gobwas/glob")) + (synopsis "Go globbing library") + (description "This package provides a Go implementation of globs.") + (home-page "https://github.com/gobwas/glob") + (license expat))) (define-public go-github-com-golang-groupcache-lru -- cgit v1.2.3 From a9546f8bb1fde766dc8ccd435b03aac1f720bd0f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 8 Oct 2019 18:33:53 -0400 Subject: gnu: go-github-com-certifi-gocertifi: Update to 2018.01.18-1.a5e0173 * gnu/packages/tls.scm (go-github-com-certifi-gocertifi): Update to 2018.01.18-1.a5e0173. --- gnu/packages/tls.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 2a6f121219..bc3c8be87f 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -978,8 +978,8 @@ (define-public dehydrated (license license:expat))) (define-public go-github-com-certifi-gocertifi - (let ((commit "d2eda712971317d7dd278bc2a52acda7e945f97e") - (revision "0")) + (let ((commit "a5e0173ced670013bfb649c7e806bc9529c986ec") + (revision "1")) (package (name "go-github-com-certifi-gocertifi") (version (git-version "2018.01.18" revision commit)) @@ -991,7 +991,7 @@ (define-public go-github-com-certifi-gocertifi (file-name (git-file-name name version)) (sha256 (base32 - "0f3v26xps7gadw4qfmh1kxbpgp0cgqdd61a257xnnvnd7ll6k8dh")))) + "1n9drccl3q1rr8wg3nf60slkf1lgsmz5ahifrglbdrc6har3rryj")))) (build-system go-build-system) (arguments '(#:import-path "github.com/certifi/gocertifi")) -- cgit v1.2.3 From 87abee4e537e6e2cfea6dbcedce4380c2b58049c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 8 Oct 2019 18:36:11 -0400 Subject: gnu: go-github-com-golang-groupcache-lru: Update to 0.0.0-2.869f871 * gnu/packages/syncthing.scm (go-github-com-golang-groupcache-lru): Update to 0.0.0-2.869f871. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 8eb2b6ca5d..f904a68485 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -328,8 +328,8 @@ (define-public go-github-com-gobwas-glob (define-public go-github-com-golang-groupcache-lru - (let ((commit "84a468cf14b4376def5d68c722b139b881c450a4") - (revision "1")) + (let ((commit "869f871628b6baa9cfbc11732cdf6546b17c1298") + (revision "2")) (package (name "go-github-com-golang-groupcache-lru") (version (git-version "0.0.0" revision commit)) @@ -341,7 +341,7 @@ (define-public go-github-com-golang-groupcache-lru (file-name (git-file-name name version)) (sha256 (base32 - "1ky1r9qh54yi9zp2769qrjngzndgd8fn7mja2qfac285n06chmcn")))) + "0r4nk8129bvx50qb4xzjaay39b2h6k7cbdqqzdlanmc82ygczsbw")))) (build-system go-build-system) (arguments `(#:import-path "github.com/golang/groupcache/lru" -- cgit v1.2.3 From a427d7353f70113fc2671797fd4ed20d189d2ce9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 8 Oct 2019 18:39:27 -0400 Subject: gnu: go-github-com-jackpal-gateway: Update to 1.0.5. * gnu/packages/syncthing.scm (go-github-com-jackpal-gateway): Update to 1.0.5. --- gnu/packages/syncthing.scm | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index f904a68485..8282994663 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -379,28 +379,26 @@ (define-public go-github-com-golang-snappy (license bsd-3)))) (define-public go-github-com-jackpal-gateway - (let ((commit "5795ac81146e01d3fab7bcf21c043c3d6a32b006") - (revision "0")) - (package - (name "go-github-com-jackpal-gateway") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jackpal/gateway") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0fkwkwmhfadwk3cha8616bhqxfkr9gjjnynhhxyldlphixgs3f25")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/jackpal/gateway")) - (synopsis "Discover the address of a LAN gateway") - (description "@code{gateway} is a Go library for discovering the IP + (package + (name "go-github-com-jackpal-gateway") + (version "1.0.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jackpal/gateway") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ird5xmizj632l3dq24s2xgb8w1dn6v8xznlqz252gvngyr2gjl1")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/jackpal/gateway")) + (synopsis "Discover the address of a LAN gateway") + (description "@code{gateway} is a Go library for discovering the IP address of the default LAN gateway.") - (home-page "https://github.com/jackpal/gateway") - (license bsd-3)))) + (home-page "https://github.com/jackpal/gateway") + (license bsd-3))) (define-public go-github-com-lib-pq (package -- cgit v1.2.3 From e268d0bbd69c94e28a38fe325645bae3690ed049 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 8 Oct 2019 18:41:35 -0400 Subject: gnu: go-github-com-kballard-go-shellquote: Update to 0.0.0-1.95032a8 * gnu/packages/syncthing.scm (go-github-com-kballard-go-shellquote): Update to 0.0.0-1.95032a8. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 8282994663..8f1578802b 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -689,8 +689,8 @@ (define-public go-github-com-petermattis-goid (license asl2.0)))) (define-public go-github-com-kballard-go-shellquote - (let ((commit "cd60e84ee657ff3dc51de0b4f55dd299a3e136f2") - (revision "0")) + (let ((commit "95032a82bc518f77982ea72343cc1ade730072f0") + (revision "1")) (package (name "go-github-com-kballard-go-shellquote") (version (git-version "0.0.0" revision commit)) @@ -702,7 +702,7 @@ (define-public go-github-com-kballard-go-shellquote (file-name (git-file-name name version)) (sha256 (base32 - "1xjpin4jq1zl84dcn96xhjmn9bsfyszf6g9aqyj2dc0xfi6c88y0")))) + "1rspvmnsikdq95jmx3dykxd4k1rmgl98ryjrysvl0cf18hl1vq80")))) (build-system go-build-system) (arguments '(#:import-path "github.com/kballard/go-shellquote")) -- cgit v1.2.3 From 8e7e2dbc432374e20320fbdefaa3d36b3f7692dd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 16:53:17 -0500 Subject: gnu: go-github-com-oschwald-maxminddb-golang: Update to 1.4.0. * gnu/packages/syncthing.scm (go-github-com-oschwald-maxminddb-golang): Update to 1.4.0. --- gnu/packages/syncthing.scm | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 8f1578802b..810eb0c2b6 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -453,32 +453,30 @@ (define-public go-github-com-oschwald-geoip2-golang (license isc))) (define-public go-github-com-oschwald-maxminddb-golang - (let ((commit "26fe5ace1c706491c2936119e1dc69c1a9c04d7f") - (revision "0")) - (package - (name "go-github-com-oschwald-maxminddb-golang") - (version (git-version "1.2.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/oschwald/maxminddb-golang") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1i6d935f3cv9djpjvc2ibh8aps8jqvg454b9pkwg2h98al759ggk")))) - (build-system go-build-system) - (propagated-inputs - `(("go-golang-org-x-sys" ,go-golang-org-x-sys))) - (arguments - `(#:import-path "github.com/oschwald/maxminddb-golang" - #:tests? #f)) ; Requires some unpackaged software and test data - (synopsis "MaxMind DB Reader for Go") - (description "This is a Go reader for the MaxMind DB format. Although + (package + (name "go-github-com-oschwald-maxminddb-golang") + (version "1.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oschwald/maxminddb-golang") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "100wd5qv00pkcm6cb8c4x5gavc9jnn7drh6xrqh85hzci4rils66")))) + (build-system go-build-system) + (propagated-inputs + `(("go-golang-org-x-sys" ,go-golang-org-x-sys))) + (arguments + `(#:import-path "github.com/oschwald/maxminddb-golang" + #:tests? #f)) ; Requires some unpackaged software and test data + (synopsis "MaxMind DB Reader for Go") + (description "This is a Go reader for the MaxMind DB format. Although this can be used to read GeoLite2 and GeoIP2 databases, @code{geoip2} provides a higher-level API for doing so.") - (home-page "https://github.com/oschwald/maxminddb-golang") - (license isc)))) + (home-page "https://github.com/oschwald/maxminddb-golang") + (license isc))) (define-public go-github-com-stathat-go (let ((commit "74669b9f388d9d788c97399a0824adbfee78400e") -- cgit v1.2.3 From adc6ae9a85b9b4c6bf5a1e50cfaee8dbdf0f1fc0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 8 Oct 2019 18:50:19 -0400 Subject: gnu: go-github-com-petermattis-goid: Update to 0.0.0-1.b0b1615 * gnu/packages/syncthing.scm (go-github-com-petermattis-goid): Update to 0.0.0-1.b0b1615. --- gnu/packages/syncthing.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 810eb0c2b6..f988cbe022 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -662,8 +662,8 @@ (define-public go-github-com-chmduquesne-rollinghash (license expat)))) (define-public go-github-com-petermattis-goid - (let ((commit "3db12ebb2a599ba4a96bea1c17b61c2f78a40e02") - (revision "0")) + (let ((commit "b0b1615b78e5ee59739545bb38426383b2cda4c9") + (revision "1")) (package (name "go-github-com-petermattis-goid") (version (git-version "0.0.0" revision commit)) @@ -674,9 +674,8 @@ (define-public go-github-com-petermattis-goid (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 - "0z18a3mr72c52g7g94n08gxw0ksnaafbfwdl5p5jav2sffirb0kd")))) + "0ghfxn045r0bbn2vszw897lxzmhnm4k59aypjvpxl0pbzsw9ab2c")))) (build-system go-build-system) (arguments '(#:import-path "github.com/petermattis/goid")) -- cgit v1.2.3 From 0d793a59cf701cc1ea4afb6266583c9ce473bdf7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 16:54:52 -0500 Subject: gnu: go-github-com-prometheus-client-model: Update to 0.0.2-2.14fe0d1. * gnu/packages/syncthing.scm (go-github-com-prometheus-client-model): Update to 0.0.2-2.14fe0d1. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index f988cbe022..22c62387a8 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -787,8 +787,8 @@ (define-public go-github-com-golang-protobuf-proto (license bsd-3))) (define-public go-github-com-prometheus-client-model - (let ((commit "fd36f4220a901265f90734c3183c5f0c91daa0b8") - (revision "1")) + (let ((commit "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016") + (revision "2")) (package (name "go-github-com-prometheus-client-model") (version (git-version "0.0.2" revision commit)) @@ -800,7 +800,7 @@ (define-public go-github-com-prometheus-client-model (file-name (git-file-name name version)) (sha256 (base32 - "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5")))) + "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550")))) (build-system go-build-system) (arguments '(#:import-path "github.com/prometheus/client_model" -- cgit v1.2.3 From 75f36ad6d2f941b45f9d53f9899b1514be5235fa Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 16 Oct 2019 15:16:25 -0400 Subject: gnu: go-github-com-prometheus-procfs: Update to 0.0.4. * gnu/packages/syncthing.scm (go-github-com-prometheus-procfs): Update to 0.0.4. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 22c62387a8..aaf57878f8 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -894,7 +894,7 @@ (define-public go-github-com-prometheus-common (define-public go-github-com-prometheus-procfs (package (name "go-github-com-prometheus-procfs") - (version "0.0.3") + (version "0.0.4") (source (origin (method git-fetch) (uri (git-reference @@ -903,7 +903,7 @@ (define-public go-github-com-prometheus-procfs (file-name (git-file-name name version)) (sha256 (base32 - "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y")))) + "1z5jq5rjala0a0di4nwk1rai0z9f73qwqj6mgcbpjbg2qknlb544")))) (build-system go-build-system) (arguments '(#:import-path "github.com/prometheus/procfs" -- cgit v1.2.3 From 7cb90f229f290213aa7a860bbac70b0b62328f29 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 16:55:55 -0500 Subject: gnu: go-golang-org-x-net: Update to 0.0.0-4.ba9fcec. * gnu/packages/golang.scm (go-golang-org-x-net): Update to 0.0.0-4.ba9fcec. --- gnu/packages/golang.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 399615df3b..2a4a40521d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -665,8 +665,8 @@ (define-public go-golang-org-x-crypto (license license:bsd-3)))) (define-public go-golang-org-x-net - (let ((commit "d28f0bde5980168871434b95cfc858db9f2a7a99") - (revision "3")) + (let ((commit "ba9fcec4b297b415637633c5a6e8fa592e4a16c3") + (revision "4")) (package (name "go-golang-org-x-net") (version (git-version "0.0.0" revision commit)) @@ -678,7 +678,7 @@ (define-public go-golang-org-x-net (file-name (git-file-name name version)) (sha256 (base32 - "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf")))) + "1hbqvy6r0s5h0dpdqw8fynl3cq0acin3iyqki9xvl5r8h33yb9bx")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/net" -- cgit v1.2.3 From 9ef07337fd0d7279714354eb3ffd70de2730dac1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 16:56:49 -0500 Subject: gnu: go-golang-org-x-sys: Update to 0.0.0-5.749cb33. * gnu/packages/golang.scm (go-golang-org-x-sys): Update to 0.0.0-5.749cb33. --- gnu/packages/golang.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 2a4a40521d..d31385b324 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -693,8 +693,8 @@ (define-public go-golang-org-x-net (license license:bsd-3)))) (define-public go-golang-org-x-sys - (let ((commit "04f50cda93cbb67f2afa353c52f342100e80e625") - (revision "4")) + (let ((commit "749cb33beabd9aa6d3178e3de05bcc914f70b2bf") + (revision "5")) (package (name "go-golang-org-x-sys") (version (git-version "0.0.0" revision commit)) @@ -706,7 +706,7 @@ (define-public go-golang-org-x-sys (file-name (git-file-name name version)) (sha256 (base32 - "0hmfsz9y1ingwsn482hlzzmzs7kr3cklm0ana0mbdk70isw2bxnw")))) + "0dm3257q3rv2kyn5lmqqim2fqg634v6rhrqq4glvbk4wx4l3v337")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/sys" -- cgit v1.2.3 From 720420e38ec6fcde4f374a47abdbd27b58ebf225 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 16:57:40 -0500 Subject: gnu: go-golang-org-x-time: Update to 0.0.0-2.9d24e82. * gnu/packages/golang.scm (go-golang-org-x-time): Update to 0.0.0-2.9d24e82. --- gnu/packages/golang.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d31385b324..b3bcb06456 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -750,8 +750,8 @@ (define-public go-golang-org-x-text (license license:bsd-3))) (define-public go-golang-org-x-time - (let ((commit "6dc17368e09b0e8634d71cac8168d853e869a0c7") - (revision "1")) + (let ((commit "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef") + (revision "2")) (package (name "go-golang-org-x-time") (version (git-version "0.0.0" revision commit)) @@ -763,7 +763,7 @@ (define-public go-golang-org-x-time (file-name (git-file-name name version)) (sha256 (base32 - "1fx4cf5fpdz00g3c7vxzy92hdcg0vh4yqw00qp5s52j72qixynbk")))) + "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/time" -- cgit v1.2.3 From 17436233f6d81dd9743fdb8c2f0adafa7821a0d7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 16 Oct 2019 15:30:22 -0400 Subject: gnu: go-gopkg.in-asn1-ber.v1: Update to 1.3. * gnu/packages/syncthing.scm (go-gopkg.in-asn1-ber.v1): Update to 1.3. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index aaf57878f8..dac7a206e5 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -956,7 +956,7 @@ (define-public go-github-com-prometheus-client-golang (define-public go-gopkg.in-asn1-ber.v1 (package (name "go-gopkg.in-asn1-ber.v1") - (version "1.2") + (version "1.3") (source (origin (method git-fetch) (uri (git-reference @@ -965,7 +965,7 @@ (define-public go-gopkg.in-asn1-ber.v1 (file-name (git-file-name name version)) (sha256 (base32 - "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx")))) + "00ixms8x3lrhywbvq5v2sagcqsxa1pcnlk17dp5lnwckv3xg4psb")))) (build-system go-build-system) (arguments '(#:import-path "gopkg.in/asn1-ber.v1" -- cgit v1.2.3 From be47a83abb2cd6b326fa2f2fa3a7751659bb666b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 16 Oct 2019 15:49:02 -0400 Subject: gnu: go-github-com-minio-sha256-simd: Update to 0.1.0. * gnu/packages/golang.scm (go-github-com-minio-sha256-simd): Update to 0.1.0. --- gnu/packages/golang.scm | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b3bcb06456..1461324c8f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1957,27 +1957,25 @@ (define-public go-github-com-btcsuite-btcd-btcec (license license:isc)))) (define-public go-github-com-minio-sha256-simd - (let ((commit "cc1980cb03383b1d46f518232672584432d7532d") - (revision "3")) - (package - (name "go-github-com-minio-sha256-simd") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minio/sha256-simd.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "04fp98nal0wsb26zwhw82spn5camxslc68g3xp8g4af9w6k9g31j")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/minio/sha256-simd")) - (home-page "https://github.com/minio/sha256-simd") - (synopsis "Accelerate SHA256 computations in pure Go") - (description "Accelerate SHA256 computations in pure Go using AVX512 and + (package + (name "go-github-com-minio-sha256-simd") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minio/sha256-simd.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ym7vkjc3ps9fm8p6qk8rq7c3dj6a3nwihfryzig9g07rqnxr49k")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/minio/sha256-simd")) + (home-page "https://github.com/minio/sha256-simd") + (synopsis "Accelerate SHA256 computations in pure Go") + (description "Accelerate SHA256 computations in pure Go using AVX512 and AVX2 for Intel and ARM64 for ARM. On AVX512 it provides an up to 8x improvement (over 3 GB/s per core) in comparison to AVX2. @@ -1990,7 +1988,7 @@ (define-public go-github-com-minio-sha256-simd \"multi-buffer crypto library for IPSec\" whereas the other Intel implementations are described in \"Fast SHA-256 Implementations on Intel Architecture Processors\" by J. Guilford et al.") - (license license:asl2.0)))) + (license license:asl2.0))) (define-public go-github-com-libp2p-go-libp2p-crypto (let ((commit "7240b40a3ddc47c4d17c15baabcbe45e5219171b") -- cgit v1.2.3 From 191e4df083f2abfb90d4f3d5052873666760b3d5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 16:58:56 -0500 Subject: gnu: go-github-com-prometheus-client-golang: Update 1.1.0. * gnu/packages/syncthing.scm (go-github-com-prometheus-client-golang): Update to 1.1.0. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index dac7a206e5..0e7d3fa4d5 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -919,7 +919,7 @@ (define-public go-github-com-prometheus-procfs (define-public go-github-com-prometheus-client-golang (package (name "go-github-com-prometheus-client-golang") - (version "0.9.4") + (version "1.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -928,7 +928,7 @@ (define-public go-github-com-prometheus-client-golang (file-name (git-file-name name version)) (sha256 (base32 - "0s134fj4i7k6pxdmxwkdi7amb1882yq33spv15hg3pkpbd3h311p")))) + "1r0irxkmfnj6ininb06w6ybknini5lz02idawrbkk2i5lq1qcvvf")))) (build-system go-build-system) (arguments '(#:tests? #f -- cgit v1.2.3 From 3170d7546626d9342f58416ea6a31f0fa3f00268 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 16 Oct 2019 15:58:59 -0400 Subject: gnu: go-github-com-rcrowley-go-metrics: Update to 0.0.0-2.cac0b30. * gnu/packages/syncthing.scm (go-github-com-rcrowley-go-metrics): Update to 0.0.0-2.cac0b30. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 0e7d3fa4d5..099ad3e826 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -502,8 +502,8 @@ (define-public go-github-com-stathat-go (license expat)))) (define-public go-github-com-rcrowley-go-metrics - (let ((commit "e181e095bae94582363434144c61a9653aff6e50") - (revision "1")) + (let ((commit "cac0b30c2563378d434b5af411844adff8e32960") + (revision "2")) (package (name "go-github-com-rcrowley-go-metrics") (version (git-version "0.0.0" revision commit)) @@ -515,7 +515,7 @@ (define-public go-github-com-rcrowley-go-metrics (file-name (git-file-name name version)) (sha256 (base32 - "1pwkyw801hy7n94skzk6h177zqcil6ayrmb5gs3jdpsfayh8ia5w")))) + "1hfxffnpaw49pr3wrkbzq3pnv3nyzsvk5dxndv0yz70xlrbg8a04")))) (build-system go-build-system) (arguments `(#:import-path "github.com/rcrowley/go-metrics")) -- cgit v1.2.3 From a726d91d0cdbf3d0422c8ca21b70403ce458dadc Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 17:04:27 -0500 Subject: gnu: Move go-github-com-golang-protobuf-proto to the Golang module. * gnu/packages/syncthing.scm (go-github-com-golang-protobuf-proto): Move variable ... gnu/packages/golang.scm (go-github-com-golang-protobuf-proto): ... to here. --- gnu/packages/golang.scm | 27 ++++++++++++++++++++++++++- gnu/packages/syncthing.scm | 25 ------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1461324c8f..9150d66f99 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Andy Wingo ;;; Copyright © 2016, 2019 Ludovic Courtès ;;; Copyright © 2016, 2017 Petter -;;; Copyright © 2016, 2017, 2019 Leo Famulari +;;; Copyright © 2016, 2017, 2018, 2019 Leo Famulari ;;; Copyright © 2017 Sergei Trofimovich ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -3222,3 +3222,28 @@ (define-public gotestsum test results.") (home-page "https://github.com/gotestyourself/gotestsum") (license license:asl2.0))) + +(define-public go-github-com-golang-protobuf-proto + (package + (name "go-github-com-golang-protobuf-proto") + (version "1.3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/golang/protobuf.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/golang/protobuf/proto" + #:unpack-path "github.com/golang/protobuf" + ;; Requires unpackaged golang.org/x/sync/errgroup + #:tests? #f)) + (synopsis "Go support for Protocol Buffers") + (description "This package provides Go support for the Protocol Buffers +data serialization format.") + (home-page "https://github.com/golang/protobuf") + (license license:bsd-3))) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 099ad3e826..9bda6dd765 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -761,31 +761,6 @@ (define-public go-github-com-beorn7-perks-quantile (home-page "https://github.com/beorn7/perks") (license expat)))) -(define-public go-github-com-golang-protobuf-proto - (package - (name "go-github-com-golang-protobuf-proto") - (version "1.3.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/golang/protobuf.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/golang/protobuf/proto" - #:unpack-path "github.com/golang/protobuf" - #:tests? #f ; requires unpackaged golang.org/x/sync/errgroup - )) - (synopsis "Go support for Protocol Buffers") - (description "This package provides Go support for the Protocol Buffers -data serialization format.") - (home-page "https://github.com/golang/protobuf") - (license bsd-3))) - (define-public go-github-com-prometheus-client-model (let ((commit "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016") (revision "2")) -- cgit v1.2.3 From a2c885b31c96950345980d1f23b1c67227d6e7db Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 21:16:57 -0500 Subject: gnu: go-github-com-gogo-protobuf: Update to 1.3.1. * gnu/packages/golang.scm (go-github-com-gogo-protobuf): Update to 1.3.1. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9150d66f99..c17c605229 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1792,7 +1792,7 @@ (define-public go-github-com-wtolson-go-taglib (define-public go-github-com-gogo-protobuf (package (name "go-github-com-gogo-protobuf") - (version "1.2.1") + (version "1.3.1") (source (origin (method git-fetch) (uri (git-reference @@ -1801,7 +1801,7 @@ (define-public go-github-com-gogo-protobuf (file-name (git-file-name name version)) (sha256 (base32 - "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m")))) + "0x77x64sxjgfhmbijqfzmj8h4ar25l2w97h01q3cqs1wk7zfnkhp")))) (build-system go-build-system) (arguments `(#:import-path "github.com/gogo/protobuf" -- cgit v1.2.3 From 195960737c73e69d027c3d73a321d2b5adbb96ff Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 21:19:21 -0500 Subject: gnu: go-github-com-oschwald-geoip2-golang: Update to 1.4.0. * gnu/packages/syncthing.scm (go-github-com-oschwald-geoip2-golang): Update to 1.4.0. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 9bda6dd765..6f5025184c 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -428,7 +428,7 @@ (define-public go-github-com-lib-pq (define-public go-github-com-oschwald-geoip2-golang (package (name "go-github-com-oschwald-geoip2-golang") - (version "1.3.0") + (version "1.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -437,7 +437,7 @@ (define-public go-github-com-oschwald-geoip2-golang (file-name (git-file-name name version)) (sha256 (base32 - "0jivzl15jb8n16rm1b2w97kf7vna5dd3kcz865wfi233qay075j2")))) + "1jj4rbdpy87rbl79czg5hs5dyn6xlbnk0bnvyzi71dsxan57nixw")))) (build-system go-build-system) (propagated-inputs `(("go-github-com-oschwald-maxminddb-golang" -- cgit v1.2.3 From 726727e163a0fc9401c886e27c1c4ca892b6efa2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 21:32:07 -0500 Subject: gnu: go-github-com-pkg-errors: Update to 0.9.0. * gnu/packages/golang.scm (go-github-com-pkg-errors): Update to 0.9.0. --- gnu/packages/golang.scm | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c17c605229..fd676f0991 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2936,28 +2936,26 @@ (define-public go-github-com-lucas-clemente-quic-go (license license:expat))) (define-public go-github-com-pkg-errors - (let ((commit "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7") - (revision "0")) - (package - (name "go-github-com-pkg-errors") - (version (git-version "0.8.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pkg/errors.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/pkg/errors")) - (synopsis "Go error handling primitives") - (description "This package provides @code{error}, which offers simple + (package + (name "go-github-com-pkg-errors") + (version "0.9.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pkg/errors.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hlivqlcnm9wrj0v7h43gamw7mvg6svz9sm31fx28zn4ll25ablh")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/pkg/errors")) + (synopsis "Go error handling primitives") + (description "This package provides @code{error}, which offers simple error handling primitives in Go.") - (home-page "https://github.com/pkg/errors") - (license license:bsd-2)))) + (home-page "https://github.com/pkg/errors") + (license license:bsd-2))) (define-public go-github-com-maruel-panicparse (package -- cgit v1.2.3 From 6ac3b835d10cb649b216ced86c14595d94354c77 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 21:37:27 -0500 Subject: gnu: Change upstream for the go-nat-pmp Go NAT-PMP client. * gnu/packages/syncthing.scm (go-github-com-audriusbutkevicius-go-nat-pmp): Replace with ... (go-github-com-jackpal-go-nat-pmp): ... new package. (syncthing)[inputs]: Adjust accordingly. --- gnu/packages/syncthing.scm | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 6f5025184c..d9e7f522b5 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -52,8 +52,8 @@ (define-public syncthing ;; When updating Syncthing, check 'go.mod' in the source distribution to ;; ensure we are using the correct versions of these dependencies. (inputs - `(("go-github-com-audriusbutkevicius-go-nat-pmp" - ,go-github-com-audriusbutkevicius-go-nat-pmp) + `(("go-github-com-jackpal-go-nat-pmp" + ,go-github-com-jackpal-go-nat-pmp) ("go-github-com-bkaradzic-go-lz4" ,go-github-com-bkaradzic-go-lz4) ("go-github-com-calmh-xdr" ,go-github-com-calmh-xdr) ("go-github-com-chmduquesne-rollinghash" @@ -163,29 +163,28 @@ (define-public syncthing (home-page "https://github.com/syncthing/syncthing") (license mpl2.0))) -(define-public go-github-com-audriusbutkevicius-go-nat-pmp - (let ((commit "452c97607362b2ab5a7839b8d1704f0396b640ca") - (revision "0")) - (package - (name "go-github-com-audriusbutkevicius-go-nat-pmp") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/AudriusButkevicius/go-nat-pmp") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1accmpl1llk16a19nlyy991fqrgfay6l53gb64hgmdfmqljdvbk7")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/AudriusButkevicius/go-nat-pmp")) - (synopsis "Port mapping and discovery of external IP address") - (description "This package provides a Go client for the NAT-PMP internet +(define-public go-github-com-jackpal-go-nat-pmp + (package + (name "go-github-com-jackpal-go-nat-pmp") + (version "1.0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jackpal/go-nat-pmp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1p2yrzfbkazc9nisr2iqjwzhb6q16zj6finyxxn2ikk7iiighl1g")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/jackpal/go-nat-pmp")) + (synopsis "Port mapping and discovery of external IP address") + (description "This package provides a Go client for the NAT-PMP internet protocol for port mapping and discovering the external IP address of a firewall.") - (home-page "https://github.com/AudriusButkevicius/go-nat-pmp") - (license asl2.0)))) + (home-page "https://github.com/jackpal/go-nat-pmp") + (license asl2.0))) (define-public go-github-com-audriusbutkevicius-recli (package -- cgit v1.2.3 From df14a8b67d9ca0810e3a6f1cb28db030ae44afd4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 21:47:40 -0500 Subject: gnu: go-github-com-mattn-go-isatty: Update to 0.0.11. * gnu/packages/golang.scm (go-github-com-mattn-go-isatty): Update to 0.0.11. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index fd676f0991..7af663da04 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1423,7 +1423,7 @@ (define-public go-gopkg-in-yaml-v2 (define-public go-github-com-mattn-go-isatty (package (name "go-github-com-mattn-go-isatty") - (version "0.0.7") + (version "0.0.11") (source (origin (method git-fetch) @@ -1433,7 +1433,7 @@ (define-public go-github-com-mattn-go-isatty (file-name (git-file-name name version)) (sha256 (base32 - "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd")))) + "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali")))) (build-system go-build-system) (propagated-inputs `(("go-golang-org-x-sys" ,go-golang-org-x-sys))) -- cgit v1.2.3 From 3c06b06034ccd407a7ab696ab087f033b5a8286e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 13 Feb 2020 16:54:04 -0500 Subject: gnu: Add go-github-com-pmezard-go-difflib. * gnu/packages/golang.scm (go-github-com-pmezard-go-difflib): New variable. --- gnu/packages/golang.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 7af663da04..56dcd0a1d0 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2490,6 +2490,28 @@ (define-public go-github-com-urfave-cli fast and distributable command line applications in an expressive way.") (license license:expat))) +(define-public go-github-com-pmezard-go-difflib + (package + (name "go-github-com-pmezard-go-difflib") + (version "1.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pmezard/go-difflib") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/pmezard/go-difflib/difflib" + #:unpack-path "github.com/pmezard/go-difflib/")) + (home-page "https://github.com/pmezard/go-difflib") + (synopsis "Go diff implementation") + (description "This package provides unified and context-aware diffs in Go.") + (license license:bsd-3))) + (define-public go-github-com-whyrusleeping-json-filter (let ((commit "ff25329a9528f01c5175414f16cc0a6a162a5b8b") (revision "0")) -- cgit v1.2.3 From 47a4a6da5e45f5fb98bcc7502de71b5abe848027 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 13 Feb 2020 16:55:40 -0500 Subject: gnu: Add go-github-com-shurcool-sanitized-anchor-name. * gnu/packages/golang.scm (go-github-com-shurcool-sanitized-anchor-name): New variable. --- gnu/packages/golang.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 56dcd0a1d0..33ef90394d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2490,6 +2490,29 @@ (define-public go-github-com-urfave-cli fast and distributable command line applications in an expressive way.") (license license:expat))) +(define-public go-github-com-shurcool-sanitized-anchor-name + (package + (name "go-github-com-shurcool-sanitized-anchor-name") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/shurcooL/sanitized_anchor_name") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/shurcooL/sanitized_anchor_name")) + (home-page "https://github.com/shurcooL/sanitized_anchor_name") + (synopsis "Create sanitized anchor names") + (description "This package provides a Go program for creating sanitized +anchor names.") + (license license:expat))) + (define-public go-github-com-pmezard-go-difflib (package (name "go-github-com-pmezard-go-difflib") -- cgit v1.2.3 From 0ca8bc01a1fb692b227a1718a701cb74254cd313 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 13 Feb 2020 16:56:07 -0500 Subject: gnu: Add go-github-com-russross-blackfriday. * gnu/packages/golang.scm (go-github-com-russross-blackfriday): New variable. --- gnu/packages/golang.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 33ef90394d..0adfea1afb 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2490,6 +2490,33 @@ (define-public go-github-com-urfave-cli fast and distributable command line applications in an expressive way.") (license license:expat))) +(define-public go-github-com-russross-blackfriday + (package + (name "go-github-com-russross-blackfriday") + (version "2.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/russross/blackfriday") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/russross/blackfriday")) + (propagated-inputs + `(("go-github-com-shurcool-sanitized-anchor-name" + ,go-github-com-shurcool-sanitized-anchor-name))) + (native-inputs + `(("go-github-com-pmezard-go-difflib" ,go-github-com-pmezard-go-difflib))) + (home-page "https://github.com/russross/blackfriday") + (synopsis "Markdown processor in Go") + (description "Blackfriday is a Markdown processor in Go.") + (license license:bsd-2))) + (define-public go-github-com-shurcool-sanitized-anchor-name (package (name "go-github-com-shurcool-sanitized-anchor-name") -- cgit v1.2.3 From 2c0bc073f2a2595489bfe191544466bf8b86d062 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 22:06:45 -0500 Subject: gnu: Add go-github-com-go-md2man. * gnu/packages/golang.scm (go-github-com-go-md2man): New variable. --- gnu/packages/golang.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0adfea1afb..b1bd58fea5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Andy Wingo ;;; Copyright © 2016, 2019 Ludovic Courtès ;;; Copyright © 2016, 2017 Petter -;;; Copyright © 2016, 2017, 2018, 2019 Leo Famulari +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Leo Famulari ;;; Copyright © 2017 Sergei Trofimovich ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -2490,6 +2490,35 @@ (define-public go-github-com-urfave-cli fast and distributable command line applications in an expressive way.") (license license:expat))) +(define-public go-github-com-go-md2man + (package + (name "go-github-com-go-md2man") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cpuguy83/go-md2man") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv")) + (modules '((guix build utils))) + (snippet '(begin + (delete-file-recursively "vendor") + #t)))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/cpuguy83/go-md2man")) + (propagated-inputs + `(("go-github-com-russross-blackfriday" ,go-github-com-russross-blackfriday))) + (home-page "https://github.com/cpuguy83/go-md2man") + (synopsis "Convert markdown into roff") + (description "Go-md2man is a Go program that converts markdown to roff for +the purpose of building man pages.") + (license license:expat))) + (define-public go-github-com-russross-blackfriday (package (name "go-github-com-russross-blackfriday") -- cgit v1.2.3 From 5d9515d8809ccd1e6d353a218ddf4998b4d3a64b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 22:07:05 -0500 Subject: gnu: go-github-com-urfave-cli: Update to 1.22.2. * gnu/packages/golang.scm (go-github-com-urfave-cli): Update to 1.22.2. [propagated-inputs]: Add go-github-com-go-md2man. --- gnu/packages/golang.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b1bd58fea5..071bda4f1a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2469,7 +2469,7 @@ (define-public go-github-com-sabhiram-go-gitignore (define-public go-github-com-urfave-cli (package (name "go-github-com-urfave-cli") - (version "1.21.0") + (version "1.22.2") (source (origin (method git-fetch) @@ -2479,10 +2479,12 @@ (define-public go-github-com-urfave-cli (file-name (git-file-name name version)) (sha256 (base32 - "104jldhxn6d97l5vsbsl0q8hgy1bxrahbr6dbfqrlppva51jmydd")))) + "10mcnvi5qmn00vpyk6si8gjka7p654wr9hac4zc9w5h3ickhvbdc")))) (build-system go-build-system) (arguments '(#:import-path "github.com/urfave/cli")) + (propagated-inputs + `(("go-github-com-go-md2man" ,go-github-com-go-md2man))) (home-page "https://github.com/urfave/cli") (synopsis "Simple, fast, and fun package for building command line apps in Go") (description "@command{cli} is a simple, fast, and fun package for -- cgit v1.2.3 From d8b681fb5c00bda669c9c38275b15df5c724ccbb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 22:09:05 -0500 Subject: gnu: go-github-com-prometheus-client-golang: Update to 1.2.1. * gnu/packages/syncthing.scm (go-github-com-prometheus-client-golang): Update to 1.2.1. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index d9e7f522b5..48adc67eee 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -893,7 +893,7 @@ (define-public go-github-com-prometheus-procfs (define-public go-github-com-prometheus-client-golang (package (name "go-github-com-prometheus-client-golang") - (version "1.1.0") + (version "1.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -902,7 +902,7 @@ (define-public go-github-com-prometheus-client-golang (file-name (git-file-name name version)) (sha256 (base32 - "1r0irxkmfnj6ininb06w6ybknini5lz02idawrbkk2i5lq1qcvvf")))) + "0zs49psk23n9z8wrl02d5vib5wclpym8kaxcy6n5pk696i419065")))) (build-system go-build-system) (arguments '(#:tests? #f -- cgit v1.2.3 From fe7e7ac1204550b5ad334487a4d52cc1c410ae69 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 22:26:22 -0500 Subject: gnu: go-github-com-syndtr-goleveldb: Update to 1.0.1-4.7581283. * gnu/packages/syncthing.scm (go-github-com-syndtr-goleveldb): Update to 1.0.1-4.7581283. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 48adc67eee..6e6110438a 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -551,8 +551,8 @@ (define-public go-github-com-sasha-s-go-deadlock (license asl2.0))) (define-public go-github-com-syndtr-goleveldb - (let ((commit "c3a204f8e96543bb0cc090385c001078f184fc46") - (revision "3")) + (let ((commit "758128399b1df3a87e92df6c26c1d2063da8fabe") + (revision "4")) (package (name "go-github-com-syndtr-goleveldb") (version (git-version "1.0.1" revision commit)) @@ -564,7 +564,7 @@ (define-public go-github-com-syndtr-goleveldb (file-name (git-file-name name version)) (sha256 (base32 - "18cac90dim2z5g28vazzibxa058q2ynihsmf0vbscwzba6l5s5ms")))) + "0mnkzrz4di13g6ggd54my7bkb9nwk8f5k672dyasn467wsg7bf8f")))) (build-system go-build-system) (propagated-inputs `(("go-github-com-golang-snappy" ,go-github-com-golang-snappy))) -- cgit v1.2.3 From e4d8efe98f437a1f7e21f50b742e95f39b967e1e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 22:29:15 -0500 Subject: gnu: go-github-com-minio-sha256-simd: Update to 0.1.1. * gnu/packages/golang.scm (go-github-com-minio-sha256-simd): Update to 0.1.1. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 071bda4f1a..b92441a5d8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1959,7 +1959,7 @@ (define-public go-github-com-btcsuite-btcd-btcec (define-public go-github-com-minio-sha256-simd (package (name "go-github-com-minio-sha256-simd") - (version "0.1.0") + (version "0.1.1") (source (origin (method git-fetch) @@ -1969,7 +1969,7 @@ (define-public go-github-com-minio-sha256-simd (file-name (git-file-name name version)) (sha256 (base32 - "1ym7vkjc3ps9fm8p6qk8rq7c3dj6a3nwihfryzig9g07rqnxr49k")))) + "1j0iqsckm97g4l79vd4mc7apbmkdar23jpzqpnpdhwpfd834j8lp")))) (build-system go-build-system) (arguments '(#:import-path "github.com/minio/sha256-simd")) -- cgit v1.2.3 From 199f1be3a3848159c3cb373d6cb62f48ea8a170e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 22:40:10 -0500 Subject: gnu: go-github-com-marten-seemann-qtls: Update to 0.3.2. * gnu/packages/golang.scm (go-github-com-marten-seemann-qtls): Update to 0.3.2. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b92441a5d8..5aeab1fe8c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2963,7 +2963,7 @@ (define-public go-github-com-burntsushi-locker (define-public go-github-com-marten-seemann-qtls (package (name "go-github-com-marten-seemann-qtls") - (version "0.2.3") + (version "0.3.2") (source (origin (method git-fetch) (uri (git-reference @@ -2972,7 +2972,7 @@ (define-public go-github-com-marten-seemann-qtls (file-name (git-file-name name version)) (sha256 (base32 - "0b9p7bwkm9hfg1mb565q4nw5k7xyks0z2xagz5fp95azy2psbnfg")))) + "1mdymj66qrqy80pfkwy9s9z9ifkg251whngw5lim09zm90wv2q7a")))) (build-system go-build-system) (arguments '(#:import-path "github.com/marten-seemann/qtls" -- cgit v1.2.3 From 05b8096dd2d02d251c68b37e6d730c1f9c88c00b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 22:40:35 -0500 Subject: gnu: go-github-com-lucas-clemente-quic-go: Update to 0.12.1. * gnu/packages/golang.scm (go-github-com-lucas-clemente-quic-go): Update to 0.12.1. [propagated-inputs]: Add go-github-com-golang-protobuf-proto. --- gnu/packages/golang.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 5aeab1fe8c..d165ccf065 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3013,7 +3013,7 @@ (define-public go-github-com-cheekybits-genny (define-public go-github-com-lucas-clemente-quic-go (package (name "go-github-com-lucas-clemente-quic-go") - (version "0.11.2") + (version "0.12.1") (source (origin (method git-fetch) (uri (git-reference @@ -3022,7 +3022,7 @@ (define-public go-github-com-lucas-clemente-quic-go (file-name (git-file-name name version)) (sha256 (base32 - "0gqm5mc8alg84ra7yxach34il1jvcij8f76qdqcahnd3d2nhjbia")))) + "156nhq4dvw7mr08j952248v81q7702phbn4mp228319sahnbv65h")))) (build-system go-build-system) (arguments '(#:import-path "github.com/lucas-clemente/quic-go" @@ -3031,7 +3031,8 @@ (define-public go-github-com-lucas-clemente-quic-go (propagated-inputs `(("go-golang-org-x-crypto" ,go-golang-org-x-crypto) ("go-github-com-cheekybits-genny" ,go-github-com-cheekybits-genny) - ("go-github-com-marten-seemann-qtls" ,go-github-com-marten-seemann-qtls))) + ("go-github-com-marten-seemann-qtls" ,go-github-com-marten-seemann-qtls) + ("go-github-com-golang-protobuf-proto" ,go-github-com-golang-protobuf-proto))) (synopsis "QUIC in Go") (description "This package provides a Go language implementation of the QUIC network protocol.") -- cgit v1.2.3 From 9c2eb9622d1ae3d684a58a7f0ecd38952b0da502 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 23:56:35 -0500 Subject: gnu: Add go-github-com-cespare-xxhash. * gnu/packages/syncthing.scm (go-github-com-cespare-xxhash): New variable. --- gnu/packages/syncthing.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 6e6110438a..10f5e59ebc 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Petter -;;; Copyright © 2016, 2017, 2018, 2019 Leo Famulari +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -1056,3 +1056,25 @@ (define-public go-github-com-ccding-go-stun and RFC 5389).") (home-page "https://github.com/ccding/go-stun") (license asl2.0)))) + +(define-public go-github-com-cespare-xxhash + (package + (name "go-github-com-cespare-xxhash") + (version "2.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cespare/xxhash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12ad3z7ki9j07c4kx3ywkl6188i2afsjg7sl60wd21p6zkkpfjxq")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/cespare/xxhash")) + (synopsis "Go implementation of xxHash") + (description "This package provides of Go implementation of the 64-bit +xxHash algorithm (XXH64).") + (home-page "https://github.com/cespare/xxhash/") + (license expat))) -- cgit v1.2.3 From 3dbab6824de2a733420929d269deb2e746064e09 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Feb 2020 17:04:41 -0500 Subject: gnu: Syncthing: Update to 1.3.4. * gnu/packages/syncthing.scm (syncthing): Update to 1.3.4. [arguments]: Adjust to changes in the upstream build tooling in the 'build' and 'install' phases. [inputs]: Add go-github-com-cespare-xxhash. --- gnu/packages/syncthing.scm | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 10f5e59ebc..2357b08f87 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -30,7 +30,7 @@ (define-module (gnu packages syncthing) (define-public syncthing (package (name "syncthing") - (version "1.2.2") + (version "1.3.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -38,7 +38,7 @@ (define-public syncthing "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "1wdjh8xw09s1nfkpc95v04619gqa4dpbygp2y5l35ww4g916lv3s")) + "025fhfqzcl5qd38zak8485pd67iqkzsf6frm02cl25s3ggv2f0p4")) (modules '((guix build utils))) ;; Delete bundled ("vendored") free software source code. (snippet '(begin @@ -100,7 +100,10 @@ (define-public syncthing ("go-github-com-d4l3k-messagediff" ,go-github-com-d4l3k-messagediff))) (arguments - `(#:import-path "github.com/syncthing/syncthing" + `(#:modules ((srfi srfi-26) ; for cut + (guix build utils) + (guix build go-build-system)) + #:import-path "github.com/syncthing/syncthing" ;; We don't need to install the source code for end-user applications. #:install-source? #f #:phases @@ -114,7 +117,13 @@ (define-public syncthing (replace 'build (lambda _ (with-directory-excursion "src/github.com/syncthing/syncthing" - (invoke "go" "run" "build.go" "-no-upgrade")))) + ;; XXX The only way to build Syncthing without its automatic + ;; updater and to build the utilities is to "build all" and then + ;; "build syncthing" again with -no-upgrade. + ;; https://github.com/syncthing/syncthing/issues/6118 + (invoke "go" "run" "build.go" "build" "all") + (delete-file "syncthing") + (invoke "go" "run" "build.go" "-no-upgrade" "build" "syncthing")))) (replace 'check (lambda _ @@ -124,14 +133,16 @@ (define-public syncthing (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (utils (assoc-ref outputs "utils")) - (src "src/github.com/syncthing/syncthing/bin/")) - (install-file (string-append src "/syncthing") - (string-append out "/bin")) - (delete-file (string-append src "/syncthing")) - (copy-recursively "src/github.com/syncthing/syncthing/bin/" - (string-append utils "/bin")) - #t))) + (utils (assoc-ref outputs "utils"))) + (with-directory-excursion "src/github.com/syncthing/syncthing" + (install-file "syncthing" (string-append out "/bin")) + (for-each (cut install-file <> utils) + '("stcli" "stcompdirs" "stcrashreceiver" + "stdisco" "stdiscosrv" "stevents" "stfileinfo" + "stfinddevice" "stfindignored" "stgenfiles" + "stindex" "strelaypoolsrv" "strelaysrv" "stsigtool" + "stvanity" "stwatchfile" "uraggregate" "ursrv")) + #t)))) (add-after 'install 'install-docs (lambda* (#:key outputs #:allow-other-keys) @@ -920,7 +931,8 @@ (define-public go-github-com-prometheus-client-golang ,go-github-com-prometheus-client-model) ("go-github-com-prometheus-common" ,go-github-com-prometheus-common) - ("go-github-com-prometheus-procfs" ,go-github-com-prometheus-procfs))) + ("go-github-com-prometheus-procfs" ,go-github-com-prometheus-procfs) + ("go-github-com-cespare-xxhash" ,go-github-com-cespare-xxhash))) (synopsis "HTTP server and client tools for Prometheus") (description "This package @code{promhttp} provides HTTP client and server tools for Prometheus metrics.") -- cgit v1.2.3 From d41e25c05825d062a8237c9e1186194d6bab3484 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 30 Jan 2020 14:52:29 -0500 Subject: gnu: Add qrcodegen-cpp. * gnu/packages/aidc.scm (qrcodegen-cpp): New variable. * gnu/packages/patches/qrcodegen-cpp-make-install.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/aidc.scm | 39 ++ .../patches/qrcodegen-cpp-make-install.patch | 448 +++++++++++++++++++++ 3 files changed, 488 insertions(+) create mode 100644 gnu/packages/patches/qrcodegen-cpp-make-install.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 3f8fa2ed7b..2bbb41da92 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1351,6 +1351,7 @@ dist_patch_DATA = \ %D%/packages/patches/qemu-CVE-2020-7039.patch \ %D%/packages/patches/qemu-CVE-2020-7211.patch \ %D%/packages/patches/qemu-fix-documentation-build-failure.patch \ + %D%/packages/patches/qrcodegen-cpp-make-install.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/aidc.scm b/gnu/packages/aidc.scm index 77db0ac9fc..b68f2137be 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017 Hartmut Goebel ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Guillaume Le Vaillant +;;; Copyright © 2020 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -154,3 +155,41 @@ (define-public zbar Python as well as GUI widgets for GTK and Qt.") (home-page "https://github.com/mchehab/zbar") (license license:lgpl2.1+))) + +(define-public qrcodegen-cpp + ;; Currently this project's installation mechanism only exists as a GitHub + ;; pull request, so we build from a recent commit that the proposed patch + ;; applies to. + (let ((commit "6ea933f1596d818bd21e9a6b8d2e851fb8b4bcf1") + (revision "0")) + (package + (name "qrcodegen-cpp") + (version (git-version "1.5.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nayuki/QR-Code-generator.git") + (commit commit))) + (file-name (git-file-name name version)) + (patches (search-patches "qrcodegen-cpp-make-install.patch")) + (sha256 + (base32 + "19fcwqmfk2n9p2n01dv2j4x2y2mqip0j1wbmfbxjp34rqkjwcwxm")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no test suite + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; No ./configure script + ;; Only build the C++ variant. + (add-after 'unpack 'chdir + (lambda _ + (chdir "cpp") + #t))))) + (synopsis "QR Code generator library") + (description "qrcodegen-cpp is a QR code generator library in C++. The +project also offers Java, Javascript, Python, C, and Rust implementations.") + (home-page "https://www.nayuki.io/page/qr-code-generator-library") + (license license:expat)))) diff --git a/gnu/packages/patches/qrcodegen-cpp-make-install.patch b/gnu/packages/patches/qrcodegen-cpp-make-install.patch new file mode 100644 index 0000000000..4da619d3c8 --- /dev/null +++ b/gnu/packages/patches/qrcodegen-cpp-make-install.patch @@ -0,0 +1,448 @@ +Make the library installable. Patch copied from pull request: + +https://github.com/nayuki/QR-Code-generator/pull/72 + +From 1625fc1665e1f83eb73c0f5670dcfda96dc0b3e4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +Date: Tue, 3 Dec 2019 11:57:24 +0100 +Subject: [PATCH 1/7] Do not append to C/XX/FLAGS but just set them if not + defined already + +--- + c/Makefile | 2 +- + cpp/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/c/Makefile b/c/Makefile +index fd0c367..b27449c 100644 +--- a/c/Makefile ++++ b/c/Makefile +@@ -29,7 +29,7 @@ + # - CFLAGS: Any extra user-specified compiler flags (can be blank). + + # Recommended compiler flags: +-CFLAGS += -std=c99 -O ++CFLAGS ?= -std=c99 -O + + # Extra flags for diagnostics: + # CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address +diff --git a/cpp/Makefile b/cpp/Makefile +index f83c512..666f976 100644 +--- a/cpp/Makefile ++++ b/cpp/Makefile +@@ -29,7 +29,7 @@ + # - CXXFLAGS: Any extra user-specified compiler flags (can be blank). + + # Recommended compiler flags: +-CXXFLAGS += -std=c++11 -O ++CXXFLAGS ?= -std=c++11 -O + + # Extra flags for diagnostics: + # CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address + +From 2e496a0f59d5c6782c1e3e2a3ca36d0272b384f3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +Date: Tue, 3 Dec 2019 11:59:59 +0100 +Subject: [PATCH 2/7] Make use of -fPIC parameter when building' + +--- + c/Makefile | 2 +- + cpp/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/c/Makefile b/c/Makefile +index b27449c..bf79462 100644 +--- a/c/Makefile ++++ b/c/Makefile +@@ -77,7 +77,7 @@ $(LIBFILE): $(LIBOBJ) + + # Object files + %.o: %.c .deps/timestamp +- $(CC) $(CFLAGS) -c -o $@ -MMD -MF .deps/$*.d $< ++ $(CC) $(CFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $< + + # Have a place to store header dependencies automatically generated by compiler + .deps/timestamp: +diff --git a/cpp/Makefile b/cpp/Makefile +index 666f976..f37cf66 100644 +--- a/cpp/Makefile ++++ b/cpp/Makefile +@@ -73,7 +73,7 @@ $(LIBFILE): $(LIBOBJ) + + # Object files + %.o: %.cpp .deps/timestamp +- $(CXX) $(CXXFLAGS) -c -o $@ -MMD -MF .deps/$*.d $< ++ $(CXX) $(CXXFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $< + + # Have a place to store header dependencies automatically generated by compiler + .deps/timestamp: + +From 29489faaa5a3b014c5c2d95ca34033df470de73c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +Date: Tue, 3 Dec 2019 12:07:19 +0100 +Subject: [PATCH 3/7] Generate both shared and static libraries + +--- + c/Makefile | 14 ++++++++++---- + cpp/Makefile | 14 ++++++++++---- + 2 files changed, 20 insertions(+), 8 deletions(-) + +diff --git a/c/Makefile b/c/Makefile +index bf79462..38eda2d 100644 +--- a/c/Makefile ++++ b/c/Makefile +@@ -51,16 +51,19 @@ CFLAGS ?= -std=c99 -O + # ---- Targets to build ---- + + LIB = qrcodegen +-LIBFILE = lib$(LIB).a ++ARFILE = lib$(LIB).a ++LIBFILE = lib$(LIB).so ++# Bump the soname number when the ABI changes and gets incompatible ++SO_NAME = $(LIBFILE).1 + LIBOBJ = qrcodegen.o + MAINS = qrcodegen-demo qrcodegen-test qrcodegen-worker + + # Build all binaries +-all: $(LIBFILE) $(MAINS) ++all: $(LIBFILE) $(ARFILE) $(MAINS) + + # Delete build output + clean: +- rm -f -- $(LIBOBJ) $(LIBFILE) $(MAINS:=.o) $(MAINS) ++ rm -f -- $(LIBOBJ) $(LIBFILE) $(ARFILE) $(MAINS:=.o) $(MAINS) + rm -rf .deps + + # Executable files +@@ -72,9 +75,12 @@ qrcodegen-test: qrcodegen-test.c $(LIBOBJ:%.o=%.c) + $(CC) $(CFLAGS) -DQRCODEGEN_TEST -o $@ $^ + + # The library +-$(LIBFILE): $(LIBOBJ) ++$(ARFILE): $(LIBOBJ) + $(AR) -crs $@ -- $^ + ++$(LIBFILE): $(LIBOBJ) ++ $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^ ++ + # Object files + %.o: %.c .deps/timestamp + $(CC) $(CFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $< +diff --git a/cpp/Makefile b/cpp/Makefile +index f37cf66..606cdad 100644 +--- a/cpp/Makefile ++++ b/cpp/Makefile +@@ -51,16 +51,19 @@ CXXFLAGS ?= -std=c++11 -O + # ---- Targets to build ---- + + LIB = qrcodegen +-LIBFILE = lib$(LIB).a ++ARFILE = lib$(LIB).a ++LIBFILE = lib$(LIB).so ++# Bump the soname number when the ABI changes and gets incompatible ++SO_NAME = $(LIBFILE).1 + LIBOBJ = QrCode.o + MAINS = QrCodeGeneratorDemo QrCodeGeneratorWorker + + # Build all binaries +-all: $(LIBFILE) $(MAINS) ++all: $(LIBFILE) $(ARFILE) $(MAINS) + + # Delete build output + clean: +- rm -f -- $(LIBOBJ) $(LIBFILE) $(MAINS:=.o) $(MAINS) ++ rm -f -- $(LIBOBJ) $(LIBFILE) $(ARFILE) $(MAINS:=.o) $(MAINS) + rm -rf .deps + + # Executable files +@@ -68,9 +71,12 @@ clean: + $(CXX) $(CXXFLAGS) -o $@ $< -L . -l $(LIB) + + # The library +-$(LIBFILE): $(LIBOBJ) ++$(ARFILE): $(LIBOBJ) + $(AR) -crs $@ -- $^ + ++$(LIBFILE): $(LIBOBJ) ++ $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^ ++ + # Object files + %.o: %.cpp .deps/timestamp + $(CXX) $(CXXFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $< + +From 064f38d6a8dc0a457728a47ee4ca1e927e46d5ec Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +Date: Tue, 3 Dec 2019 12:45:34 +0100 +Subject: [PATCH 4/7] Create install targets for C and CPP + +--- + c/Makefile | 26 ++++++++++++++++++++++++++ + cpp/Makefile | 27 +++++++++++++++++++++++++++ + 2 files changed, 53 insertions(+) + +diff --git a/c/Makefile b/c/Makefile +index 38eda2d..7521944 100644 +--- a/c/Makefile ++++ b/c/Makefile +@@ -34,6 +34,8 @@ CFLAGS ?= -std=c99 -O + # Extra flags for diagnostics: + # CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address + ++# Version information ++VERSION = 1.5.0 + + # ---- Controlling make ---- + +@@ -55,9 +57,15 @@ ARFILE = lib$(LIB).a + LIBFILE = lib$(LIB).so + # Bump the soname number when the ABI changes and gets incompatible + SO_NAME = $(LIBFILE).1 ++REAL_NAME = $(LIBFILE).$(VERSION) ++HEADERS = qrcodegen.h + LIBOBJ = qrcodegen.o + MAINS = qrcodegen-demo qrcodegen-test qrcodegen-worker + ++# define paths to install ++INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen ++LIBDIR ?= $(DESTDIR)/usr/lib ++ + # Build all binaries + all: $(LIBFILE) $(ARFILE) $(MAINS) + +@@ -66,6 +74,24 @@ clean: + rm -f -- $(LIBOBJ) $(LIBFILE) $(ARFILE) $(MAINS:=.o) $(MAINS) + rm -rf .deps + ++install-shared: $(LIBFILE) ++ install -d $(LIBDIR) || true ++ install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME) ++ rm -f $(LIBDIR)/$(SO_NAME) ++ ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME) ++ rm -f $(LIBDIR)/$(LIBFILE) ++ ln -s $(SO_NAME) $(LIBDIR)/$(LIBFILE) ++ ++install-static: $(ARFILE) ++ install -d $(LIBDIR) || true ++ install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE) ++ ++install-header: $(HEADERS) ++ install -d $(INCLUDEDIR) || true ++ install -m 0644 $(HEADERS) $(INCLUDEDIR)/ ++ ++install: install-shared install-static install-header ++ + # Executable files + %: %.o $(LIBFILE) + $(CC) $(CFLAGS) -o $@ $< -L . -l $(LIB) +diff --git a/cpp/Makefile b/cpp/Makefile +index 606cdad..3271bd8 100644 +--- a/cpp/Makefile ++++ b/cpp/Makefile +@@ -34,6 +34,8 @@ CXXFLAGS ?= -std=c++11 -O + # Extra flags for diagnostics: + # CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address + ++# Version information ++VERSION = 1.5.0 + + # ---- Controlling make ---- + +@@ -55,9 +57,16 @@ ARFILE = lib$(LIB).a + LIBFILE = lib$(LIB).so + # Bump the soname number when the ABI changes and gets incompatible + SO_NAME = $(LIBFILE).1 ++REAL_NAME = $(LIBFILE).$(VERSION) ++HEADERS = QrCode.hpp + LIBOBJ = QrCode.o + MAINS = QrCodeGeneratorDemo QrCodeGeneratorWorker + ++# define paths to install ++INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen ++LIBDIR ?= $(DESTDIR)/usr/lib ++ ++ + # Build all binaries + all: $(LIBFILE) $(ARFILE) $(MAINS) + +@@ -66,6 +75,24 @@ clean: + rm -f -- $(LIBOBJ) $(LIBFILE) $(ARFILE) $(MAINS:=.o) $(MAINS) + rm -rf .deps + ++install-shared: $(LIBFILE) ++ install -d $(LIBDIR) || true ++ install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME) ++ rm -f $(LIBDIR)/$(SO_NAME) ++ ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME) ++ rm -f $(LIBDIR)/$(LIBFILE) ++ ln -s $(SO_NAME) $(LIBDIR)/$(LIBFILE) ++ ++install-static: $(ARFILE) ++ install -d $(LIBDIR) || true ++ install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE) ++ ++install-header: $(HEADERS) ++ install -d $(INCLUDEDIR) || true ++ install -m 0644 $(HEADERS) $(INCLUDEDIR)/ ++ ++install: install-shared install-static install-header ++ + # Executable files + %: %.o $(LIBFILE) + $(CXX) $(CXXFLAGS) -o $@ $< -L . -l $(LIB) + +From a635ff4654f94ab26b458c46a8841543e5bc8c67 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +Date: Tue, 3 Dec 2019 12:50:39 +0100 +Subject: [PATCH 5/7] Rename cpp library to qrcodegencpp to avoid conflict + +--- + cpp/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cpp/Makefile b/cpp/Makefile +index 3271bd8..42fa4ff 100644 +--- a/cpp/Makefile ++++ b/cpp/Makefile +@@ -52,7 +52,7 @@ VERSION = 1.5.0 + + # ---- Targets to build ---- + +-LIB = qrcodegen ++LIB = qrcodegencpp + ARFILE = lib$(LIB).a + LIBFILE = lib$(LIB).so + # Bump the soname number when the ABI changes and gets incompatible + +From c073e7dfad6454dfd725a69c347f8272d29ea41c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +Date: Tue, 7 Jan 2020 09:18:59 +0100 +Subject: [PATCH 6/7] Add PREFIX variable and few minor fixes from code review + +--- + c/Makefile | 9 +++++---- + cpp/Makefile | 9 +++++---- + 2 files changed, 10 insertions(+), 8 deletions(-) + +diff --git a/c/Makefile b/c/Makefile +index 7521944..874933e 100644 +--- a/c/Makefile ++++ b/c/Makefile +@@ -29,7 +29,7 @@ + # - CFLAGS: Any extra user-specified compiler flags (can be blank). + + # Recommended compiler flags: +-CFLAGS ?= -std=c99 -O ++CFLAGS += -std=c99 + + # Extra flags for diagnostics: + # CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address +@@ -63,8 +63,9 @@ LIBOBJ = qrcodegen.o + MAINS = qrcodegen-demo qrcodegen-test qrcodegen-worker + + # define paths to install +-INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen +-LIBDIR ?= $(DESTDIR)/usr/lib ++PREFIX ?= /usr/local ++INCLUDEDIR ?= $(DESTDIR)$(PREFIX)/include/qrcodegen ++LIBDIR ?= $(DESTDIR)$(PREFIX)/lib + + # Build all binaries + all: $(LIBFILE) $(ARFILE) $(MAINS) +@@ -105,7 +106,7 @@ $(ARFILE): $(LIBOBJ) + $(AR) -crs $@ -- $^ + + $(LIBFILE): $(LIBOBJ) +- $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^ + + # Object files + %.o: %.c .deps/timestamp +diff --git a/cpp/Makefile b/cpp/Makefile +index 42fa4ff..f8d9b7f 100644 +--- a/cpp/Makefile ++++ b/cpp/Makefile +@@ -29,7 +29,7 @@ + # - CXXFLAGS: Any extra user-specified compiler flags (can be blank). + + # Recommended compiler flags: +-CXXFLAGS ?= -std=c++11 -O ++CXXFLAGS += -std=c++11 + + # Extra flags for diagnostics: + # CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address +@@ -63,8 +63,9 @@ LIBOBJ = QrCode.o + MAINS = QrCodeGeneratorDemo QrCodeGeneratorWorker + + # define paths to install +-INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen +-LIBDIR ?= $(DESTDIR)/usr/lib ++PREFIX ?= /usr/local ++INCLUDEDIR ?= $(DESTDIR)$(PREFIX)/include/qrcodegen ++LIBDIR ?= $(DESTDIR)$(PREFIX)/lib + + + # Build all binaries +@@ -102,7 +103,7 @@ $(ARFILE): $(LIBOBJ) + $(AR) -crs $@ -- $^ + + $(LIBFILE): $(LIBOBJ) +- $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^ ++ $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^ + + # Object files + %.o: %.cpp .deps/timestamp + +From b43c1de5cc874535a7f549cef437f6849528e455 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +Date: Tue, 7 Jan 2020 13:12:32 +0100 +Subject: [PATCH 7/7] Install static and shared library as an executable + +--- + c/Makefile | 4 ++-- + cpp/Makefile | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/c/Makefile b/c/Makefile +index 874933e..631cc71 100644 +--- a/c/Makefile ++++ b/c/Makefile +@@ -77,7 +77,7 @@ clean: + + install-shared: $(LIBFILE) + install -d $(LIBDIR) || true +- install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME) ++ install -m 0755 $(LIBFILE) $(LIBDIR)/$(REAL_NAME) + rm -f $(LIBDIR)/$(SO_NAME) + ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME) + rm -f $(LIBDIR)/$(LIBFILE) +@@ -85,7 +85,7 @@ install-shared: $(LIBFILE) + + install-static: $(ARFILE) + install -d $(LIBDIR) || true +- install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE) ++ install -m 0755 $(ARFILE) $(LIBDIR)/$(ARFILE) + + install-header: $(HEADERS) + install -d $(INCLUDEDIR) || true +diff --git a/cpp/Makefile b/cpp/Makefile +index f8d9b7f..bbd861e 100644 +--- a/cpp/Makefile ++++ b/cpp/Makefile +@@ -78,7 +78,7 @@ clean: + + install-shared: $(LIBFILE) + install -d $(LIBDIR) || true +- install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME) ++ install -m 0755 $(LIBFILE) $(LIBDIR)/$(REAL_NAME) + rm -f $(LIBDIR)/$(SO_NAME) + ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME) + rm -f $(LIBDIR)/$(LIBFILE) +@@ -86,7 +86,7 @@ install-shared: $(LIBFILE) + + install-static: $(ARFILE) + install -d $(LIBDIR) || true +- install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE) ++ install -m 0755 $(ARFILE) $(LIBDIR)/$(ARFILE) + + install-header: $(HEADERS) + install -d $(INCLUDEDIR) || true -- cgit v1.2.3 From ec2fdbf6c179c5901e4a096a142195f582455709 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 30 Jan 2020 01:11:54 -0500 Subject: gnu: mdds: Update to 1.5.0. * gnu/packages/boost.scm (mdds): Update to 1.5.0. --- gnu/packages/boost.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 0a2a5c5c01..11fb8e1201 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -283,14 +283,14 @@ (define-public boost-signals2 (define-public mdds (package (name "mdds") - (version "1.4.3") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append "http://kohei.us/files/mdds/src/mdds-" version ".tar.bz2")) (sha256 (base32 - "10cw6irdm6d15nxnys2v5akp8yz52qijpcjvw0frwq7nz5d3vki5")))) + "03b8i43pw4m767mm0cnbi77x7qhpkzpi9b1f6dpp4cmyszmnsk8l")))) (build-system gnu-build-system) (propagated-inputs `(("boost" ,boost))) ; inclusion of header files -- cgit v1.2.3 From dbbe24485165496c3773616d3762206d35fa954d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 30 Jan 2020 14:53:22 -0500 Subject: gnu: ixion: Update to 0.15.0. * gnu/packages/libreoffice.scm (ixion): Update to 0.15.0. [inputs]: Add spdlog. --- gnu/packages/libreoffice.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 7dd3b69ad4..34480a44df 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -67,6 +67,7 @@ (define-module (gnu packages libreoffice) #:use-module (gnu packages image) #:use-module (gnu packages java) #:use-module (gnu packages linux) + #:use-module (gnu packages logging) #:use-module (gnu packages maths) #:use-module (gnu packages nss) #:use-module (gnu packages openldap) @@ -85,7 +86,7 @@ (define-module (gnu packages libreoffice) (define-public ixion (package (name "ixion") - (version "0.14.1") + (version "0.15.0") (source (origin (method url-fetch) @@ -93,13 +94,14 @@ (define-public ixion version ".tar.xz")) (sha256 (base32 - "14gdd6div4l22vnz3jn2qjxgjly98ck6p8c1v7386c41rx7kilba")))) + "1rmrl2zjzi4z0abf2cd54acypkccdhx2065dlyzy6xg83gv0mxmi")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("mdds" ,mdds) - ("python" ,python))) + ("python" ,python) + ("spdlog" ,spdlog))) (home-page "https://gitlab.com/ixion/ixion") (synopsis "General purpose formula parser and interpreter") (description "Ixion is a library for calculating the results of formula -- cgit v1.2.3 From 80f29b83dbae6d9135d32ad63d036b96c659c330 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 30 Jan 2020 15:04:34 -0500 Subject: gnu: orcus: Update to 0.15.3. * gnu/packages/libreoffice.scm (orcus): Update to 0.15.3. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 34480a44df..d6d97345f8 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -113,7 +113,7 @@ (define-public ixion (define-public orcus (package (name "orcus") - (version "0.14.1") + (version "0.15.3") (source (origin (method url-fetch) @@ -121,7 +121,7 @@ (define-public orcus name "-" version ".tar.xz")) (sha256 (base32 - "1ays13a1x15j81dsrq0d3697v1bbqd3bfz3ajn6kb9d61y2drlgj")))) + "14gbnqsv5n2fm4sxa17014f440clrzls6p2w2ixk9wipg4950v9s")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From b96aca92554f65096221f8d5bb4ba89c74f4c4b2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 30 Jan 2020 15:04:50 -0500 Subject: gnu: libetonyek: Update MDDS requirement. * gnu/packages/libreoffice.scm (libetonyek): Put '--with-mdds-1.5' in #:configure-flags. --- gnu/packages/libreoffice.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index d6d97345f8..581f098524 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -403,7 +403,7 @@ (define-public libetonyek "0jhsbdimiyijdqriy0zzkjjgc4wi6fjimhdg4mdybrlwg7l7f5p6")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--with-mdds=1.4"))) + `(#:configure-flags '("--with-mdds=1.5"))) (native-inputs `(("cppunit" ,cppunit) ("doxygen" ,doxygen) -- cgit v1.2.3 From 1ce2467fd6d5f8da259be1c7609702814c716702 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 30 Jan 2020 14:54:28 -0500 Subject: gnu: LibreOffice: Update to 6.4.0.3. * gnu/packages/libreoffice.scm (libreoffice): Update to 6.4.0.3. [inputs]: Add qrcodegen-cpp. [source]: Remove obsolete patches and substitutions. * gnu/packages/patches/libreoffice-glm.patch, gnu/packages/patches/libreoffice-icu.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 2 - gnu/packages/libreoffice.scm | 16 +--- gnu/packages/patches/libreoffice-glm.patch | 58 ------------- gnu/packages/patches/libreoffice-icu.patch | 126 ----------------------------- 4 files changed, 4 insertions(+), 198 deletions(-) delete mode 100644 gnu/packages/patches/libreoffice-glm.patch delete mode 100644 gnu/packages/patches/libreoffice-icu.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 2bbb41da92..9a316f6edb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1113,8 +1113,6 @@ dist_patch_DATA = \ %D%/packages/patches/libmpeg2-global-symbol-test.patch \ %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \ %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ - %D%/packages/patches/libreoffice-icu.patch \ - %D%/packages/patches/libreoffice-glm.patch \ %D%/packages/patches/libseccomp-open-aarch64.patch \ %D%/packages/patches/libsndfile-armhf-type-checks.patch \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 581f098524..539ada46e5 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -41,6 +41,7 @@ (define-module (gnu packages libreoffice) #:use-module (guix utils) #:use-module (ice-9 match) #:use-module (gnu packages) + #:use-module (gnu packages aidc) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bison) @@ -930,7 +931,7 @@ (define-public libqxp (define-public libreoffice (package (name "libreoffice") - (version "6.3.4.2") + (version "6.4.0.3") (source (origin (method url-fetch) @@ -940,17 +941,7 @@ (define-public libreoffice (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 (base32 - "1774vmf3lr5x24ikpn1z5vqcdwrhiwfkjy7sx09jqkvpm6d5awnb")) - (patches (search-patches "libreoffice-icu.patch" - "libreoffice-glm.patch")) - (modules '((guix build utils))) - (snippet - '(begin - (for-each (lambda (file) - ;; Adjust to renamed function in Poppler 0.72. - (substitute* file (("getCString") "c_str"))) - (find-files "sdext/source/pdfimport/xpdfwrapper")) - #t)))) + "09ra8a3ylb08xhy8wy233fs0f87klkpsbi9n3zss0c688afxjcf5")))) (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) @@ -1023,6 +1014,7 @@ (define-public libreoffice ("postgresql" ,postgresql) ("python" ,python) ("python-lxml" ,python-lxml) + ("qrcodegen-cpp" ,qrcodegen-cpp) ("redland" ,redland) ("sane-backends" ,sane-backends) ("unixodbc" ,unixodbc) diff --git a/gnu/packages/patches/libreoffice-glm.patch b/gnu/packages/patches/libreoffice-glm.patch deleted file mode 100644 index 9e76cf1389..0000000000 --- a/gnu/packages/patches/libreoffice-glm.patch +++ /dev/null @@ -1,58 +0,0 @@ -Fix build with GLM 0.9.9. - -This patch is an amalgamation of these upstream commits: - -https://github.com/LibreOffice/core/commit/953c4add8fd76d88f49a81ae4c21a1fdcc007e57 -https://github.com/LibreOffice/core/commit/5f1bf6598b5725ad1e50ae9f7ec7524cc8a834fa - -diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk -index 28bc87b89057..69d4c0552636 100644 ---- a/chart2/Library_chartcore.mk -+++ b/chart2/Library_chartcore.mk -@@ -23,6 +23,12 @@ $(eval $(call gb_Library_add_defs,chartcore,\ - -DOOO_DLLIMPLEMENTATION_CHARTVIEW \ - )) - -+ifeq ($(SYSTEM_GLM),TRUE) -+$(eval $(call gb_Library_add_defs,chartcore,\ -+ -DGLM_ENABLE_EXPERIMENTAL \ -+)) -+endif -+ - $(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/pch/precompiled_chartcore)) - - $(eval $(call gb_Library_use_externals,chartcore,\ -diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk -index c1f3cc5324e7..0b684c6185a9 100644 ---- a/vcl/Library_vcl.mk -+++ b/vcl/Library_vcl.mk -@@ -49,6 +49,12 @@ $(eval $(call gb_Library_add_defs,vcl,\ - -DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \ - )) - -+ifeq ($(SYSTEM_GLM),TRUE) -+$(eval $(call gb_Library_add_defs,vcl,\ -+ -DGLM_ENABLE_EXPERIMENTAL \ -+)) -+endif -+ - $(eval $(call gb_Library_use_sdk_api,vcl)) - - $(eval $(call gb_Library_use_custom_headers,vcl,\ -diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk -index ce163303f8a4..8c917b71cd0e 100644 ---- a/vcl/Executable_icontest.mk -+++ b/vcl/Executable_icontest.mk -@@ -19,6 +19,12 @@ $(eval $(call gb_Executable_use_externals,icontest,\ - )) - endif - -+ifeq ($(SYSTEM_GLM),TRUE) -+$(eval $(call gb_Executable_add_defs,icontest,\ -+ -DGLM_ENABLE_EXPERIMENTAL \ -+)) -+endif -+ - $(eval $(call gb_Executable_use_api,icontest,\ - offapi \ - udkapi \ diff --git a/gnu/packages/patches/libreoffice-icu.patch b/gnu/packages/patches/libreoffice-icu.patch deleted file mode 100644 index 2985d564aa..0000000000 --- a/gnu/packages/patches/libreoffice-icu.patch +++ /dev/null @@ -1,126 +0,0 @@ -This patch fixes the build of Libreoffice 6.0.5 with icu 61.1. -It was downloaded from https://bugs.gentoo.org/651702. - ---- a/forms/source/xforms/datatypes.hxx -+++ a/forms/source/xforms/datatypes.hxx -@@ -36,6 +36,8 @@ - - #include - -+using icu::RegexMatcher; -+ - - namespace xforms - { ---- a/i18npool/inc/collator_unicode.hxx -+++ a/i18npool/inc/collator_unicode.hxx -@@ -26,6 +26,8 @@ - - #include - -+using icu::RuleBasedCollator; -+ - // ---------------------------------------------------- - // class Collator_Unicode - // ---------------------------------------------------- ---- a/i18npool/source/breakiterator/breakiterator_unicode.cxx -+++ a/i18npool/source/breakiterator/breakiterator_unicode.cxx -@@ -30,6 +30,9 @@ - #include - #include - -+using icu::BreakIterator; -+using icu::RuleBasedBreakIterator; -+ - U_CDECL_BEGIN - extern const char OpenOffice_dat[]; - U_CDECL_END ---- a/i18npool/source/collator/collator_unicode.cxx -+++ a/i18npool/source/collator/collator_unicode.cxx -@@ -29,6 +29,8 @@ - #include - #include - -+using icu::Collator; -+ - using namespace ::com::sun::star; - using namespace ::com::sun::star::i18n; - using namespace ::com::sun::star::lang; ---- a/i18npool/source/collator/gencoll_rule.cxx -+++ a/i18npool/source/collator/gencoll_rule.cxx -@@ -31,6 +31,8 @@ - - #include - -+using icu::RuleBasedCollator; -+ - /* Main Procedure */ - - void data_write(char* file, char* name, sal_uInt8 *data, sal_Int32 len) ---- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx -+++ a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx -@@ -29,6 +29,8 @@ - #include - #include - -+using icu::NumberFormat; -+ - using namespace ::com::sun::star::i18n; - using namespace ::com::sun::star::uno; - using namespace ::com::sun::star; ---- a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx -+++ a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx -@@ -12,6 +12,8 @@ - #include - #include - -+using icu::UnicodeString; -+ - namespace i18npool { - - ignoreDiacritics_CTL::ignoreDiacritics_CTL() ---- a/i18nutil/source/utility/unicode.cxx -+++ a/i18nutil/source/utility/unicode.cxx -@@ -34,6 +34,9 @@ - // which (obviously) breaks UnicodeType::CURRENCY_SYMBOL - #undef CURRENCY_SYMBOL - -+using icu::NumberFormat; -+using icu::UnicodeString; -+ - using namespace ::com::sun::star::i18n; - - template ---- a/lotuswordpro/source/filter/localtime.cxx -+++ a/lotuswordpro/source/filter/localtime.cxx -@@ -57,6 +57,8 @@ - #include - #include - -+using icu::TimeZone; -+ - const long DAY_SEC =24 * 60 * 60; - const long YEAR_SEC = 365 * DAY_SEC; - const long FOURYEAR_SEC = 4 * YEAR_SEC + DAY_SEC; ---- a/opencl/source/openclconfig.cxx -+++ a/opencl/source/openclconfig.cxx -@@ -17,6 +17,8 @@ - #include - #include - -+using icu::RegexMatcher; -+ - OpenCLConfig::OpenCLConfig() : - mbUseOpenCL(true) - { ---- a/vcl/inc/scrptrun.h -+++ a/vcl/inc/scrptrun.h -@@ -45,6 +45,8 @@ - #include - #include - -+using icu::UObject; -+ - namespace vcl { - - struct ParenStackEntry -- cgit v1.2.3 From 341976e561b47126650aa1aa28f1be74b70006e9 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 13 Feb 2020 22:08:33 -0600 Subject: gnu: netsurf: Fix .desktop exec reference. * gnu/packages/web.scm (netsurf)[arguments]: Update name of binary referenced in .desktop file to "netsurf-gtk3". --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 638624effc..5f432c0a51 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5195,7 +5195,7 @@ (define-public netsurf (copy-file "frontends/gtk/res/netsurf-gtk.desktop" desktop) (substitute* desktop - (("netsurf-gtk") (string-append out "/bin/netsurf-gtk")) + (("netsurf-gtk") (string-append out "/bin/netsurf-gtk3")) (("netsurf.png") (string-append out "/share/netsurf/" "netsurf.xpm"))) (install-file "docs/netsurf-gtk.1" -- cgit v1.2.3 From e659fa7112f44648ffc4208507f1f60152a6e75e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 14 Feb 2020 09:42:05 +0100 Subject: gnu: emacs-sly-asdf: Update to 20200214. * gnu/packages/emacs-xyz.scm (emacs-sly-asdf): Update to 20200214. --- gnu/packages/emacs-xyz.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4f42176451..9087a8d98c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7380,8 +7380,8 @@ (define-public emacs-sly-quicklisp (license license:gpl3+)))) (define-public emacs-sly-asdf - (let ((commit "4e323bc28da2f07fd799b6a31b94fd93848b5f3c") - (revision "2")) + (let ((commit "ad248056ded3099b0528b6111ba335e835d9e5a7") + (revision "3")) (package (name "emacs-sly-asdf") (version (git-version "0.1.0" revision commit)) @@ -7395,10 +7395,11 @@ (define-public emacs-sly-asdf (file-name (git-file-name name version)) (sha256 (base32 - "16sc33jhc6ik4ilsyqc3cjpi6v0wdmwjlwrzjwd6yym11bscsmad")))) + "0lip0spmglny3y612pxn3rfnpdaj12c9f7ya7bprryg2gvcdippa")))) (build-system emacs-build-system) (propagated-inputs - `(("emacs-sly" ,emacs-sly))) + `(("emacs-sly" ,emacs-sly) + ("emacs-popup" ,emacs-popup))) (arguments '(#:include (cons* "\\.lisp$" "\\.asd$" %default-include))) (synopsis "ASDF contrib for SLY") -- cgit v1.2.3 From 98e3953e96d1f172e2e44d1f2d2f2e6b107f2daa Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 14 Feb 2020 10:07:54 +0100 Subject: gnu: dxvk: Update to 1.5.4. * gnu/packages/wine.scm (dxvk): Update to 1.5.4. --- gnu/packages/wine.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index ca5c969fff..35defc326b 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -554,7 +554,7 @@ (define dxvk32 ;; This package provides 32-bit dxvk libraries on 64-bit systems. (package (name "dxvk32") - (version "1.5") + (version "1.5.4") (home-page "https://github.com/doitsujin/dxvk/") (source (origin (method git-fetch) @@ -564,7 +564,7 @@ (define dxvk32 (file-name (git-file-name name version)) (sha256 (base32 - "009p99jkskrmy186gsqrf0p3v9z3lskw51r4vdp35af057q26a6x")))) + "0yhxd5rnn5mcvcb2n062z9wqqwxjq5c0rzfbjz1z9ppznj8gn37i")))) (build-system meson-build-system) (arguments `(#:system "i686-linux" @@ -633,6 +633,5 @@ (define-public dxvk ,@(match (%current-system) ("x86_64-linux" `(("dxvk32" ,dxvk32))) - (_ '())) - )) + (_ '())))) (supported-systems '("i686-linux" "x86_64-linux")))) -- cgit v1.2.3 From 96945cabe038cd02c2d76e8821d264626fcc999a Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Thu, 13 Feb 2020 13:49:09 +0100 Subject: gnu: Add haproxy. * gnu/packages/networking.scm (haproxy): New variable. --- gnu/packages/networking.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index e8ad57e8ae..dbc40028ad 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2019 Daniel Schaefer ;;; Copyright © 2019 Diego N. Barbato ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -65,6 +66,7 @@ (define-module (gnu packages networking) #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (guix build-system trivial) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages adns) @@ -2891,3 +2893,46 @@ (define-public vde2 (license:non-copyleft ; slirpvde "file://COPYING.slirpvde" "See COPYING.slirpvde in the distribution."))))) + +(define-public haproxy + (package + (name "haproxy") + (version "2.1.3") + (source (origin + (method url-fetch) + (uri (string-append "https://www.haproxy.org/download/" + (version-major+minor version) + "/src/haproxy-" version ".tar.gz")) + (sha256 + (base32 + "0n8bw3d6gikr8c56ycrvksp1sl0b4yfzp19867cxkl3l0daqwrxv")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (let* ((out (assoc-ref %outputs "out"))) + (list (string-append "PREFIX=" out) + (string-append "DOCDIR=" out "/share/" ,name) + "TARGET=linux-glibc" + "USE_LUA=1" + "USE_OPENSSL=1" + "USE_ZLIB=1" + "USE_PCRE_2=1")) + #:tests? #f ; there are only regression tests, using varnishtest + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (inputs + `(("lua" ,lua) + ("openssl" ,openssl) + ("pcre2" ,pcre2) + ("zlib" ,zlib))) + (home-page "https://www.haproxy.org/") + (synopsis "Reliable, high performance TCP/HTTP load balancer") + (description "HAProxy is a free, very fast and reliable solution offering +high availability, load balancing, and proxying for TCP and HTTP-based +applications. It is particularly suited for web sites crawling under very +high loads while needing persistence or Layer7 processing. Supporting tens of +thousands of connections is clearly realistic with today's hardware.") + (license (list license:gpl2+ + license:lgpl2.1 + license:lgpl2.1+)))) -- cgit v1.2.3 From 53e7e3d7caa920cf61826568c60a48ba80714806 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Fri, 7 Feb 2020 15:01:38 +0100 Subject: gnu: emacs-ess: Do not install files in "guix.d". * gnu/packages/statistics.scm (emacs-ess)[arguments]: Move the etc and lisp directories out of "guix.d". --- gnu/packages/statistics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 2b9a357d20..9e31f42ad1 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5823,7 +5823,7 @@ (define-public emacs-ess #t)))) (build-system gnu-build-system) (arguments - (let ((base-directory "/share/emacs/site-lisp/guix.d/ess")) + (let ((base-directory "/share/emacs/site-lisp")) `(#:make-flags (list (string-append "PREFIX=" %output) (string-append "ETCDIR=" %output "/" ,base-directory "/etc") -- cgit v1.2.3 From a74e23188f78c7e5b25c625e52ab194a2b33d952 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 14 Feb 2020 17:45:21 +0100 Subject: gnu: Add librocket. * gnu/packages/web.scm (librocket): New variable. --- gnu/packages/web.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5f432c0a51..2b9836ecc4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2019 Florian Pelz ;;; Copyright © 2020 Timotej Lazar ;;; Copyright © 2020 Alexandros Theodotou +;;; Copyright © 2020 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -90,6 +91,7 @@ (define-module (gnu packages web) #:use-module (gnu packages databases) #:use-module (gnu packages bison) #:use-module (gnu packages flex) + #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages kerberos) #:use-module (gnu packages gcc) @@ -7217,3 +7219,44 @@ (define-public htmlcxx (license (list license:lgpl2.0 license:gpl2 license:asl2.0)))) + +(define-public librocket + (package + (name "librocket") + (version "1.3.0.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/libRocket/libRocket") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1n6gq007vqijyfasfnfg6c8d2rc9qarl4bhzbgkz062m4h5izlfs")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No tests. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "Build")))))) + (inputs + `(("freetype" ,freetype))) + (home-page "https://github.com/libRocket/libRocket") ; http://librocket.com/ is down. + (synopsis "HTML/CSS user interface library") + (description "libRocket is a C++ user interface package based on the HTML +and CSS standards. libRocket uses the open standards XHTML1.0 and +CSS2.0 (while borrowing features from HTML5 and CSS3), and extends them with +features suited towards real-time applications. It is designed as a complete +solution for any project's interface needs: + +@itemize +@item Dynamic layout system. +@item Efficient application-wide styling, with a custom-built templating engine. +@item Fully featured control set: buttons, sliders, drop-downs, etc. +@item Runtime visual debugging suite. +@item Easily integrated and extensible with Python or Lua scripting. +@end itemize\n") + (license license:expat))) -- cgit v1.2.3 From e20e069b9932cd2b87ecf2b7a9a338c9ba2afd12 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 15:47:46 +0100 Subject: gnu: LVM2: Update to 2.03.08. * gnu/packages/linux.scm (lvm2): Update to 2.03.08. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d8eaa45fe5..d1ce205194 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2780,7 +2780,7 @@ (define-public eudev-with-hwdb (define-public lvm2 (package (name "lvm2") - (version "2.03.07") + (version "2.03.08") (source (origin (method url-fetch) (uri (list (string-append "ftp://sourceware.org/pub/lvm2/LVM2." @@ -2789,7 +2789,7 @@ (define-public lvm2 version ".tgz"))) (sha256 (base32 - "1s818ghgl0cxqak3r4cc99anh2xnm46kl03cyk089a1cr2ai0by7")) + "1j0yis658564rk1ddabkl8vbavp0fdd10gd6qhgyzc3akzf620kf")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From acadc0c5843ed78d684651ec735696a55de5f92d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Feb 2020 16:13:54 +0100 Subject: gnu: WebKitGTK: Update to 2.26.4 [security fixes]. This fixes CVE-2020-3862, CVE-2020-3864, CVE-2020-3865, CVE-2020-3867, and CVE-2020-3868. * gnu/packages/webkit.scm (webkitgtk): Update to 2.26.4. --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 463bf41e23..f9ef1cb44b 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -121,14 +121,14 @@ (define-public wpebackend-fdo (define-public webkitgtk (package (name "webkitgtk") - (version "2.26.3") + (version "2.26.4") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" "webkitgtk-" version ".tar.xz")) (sha256 (base32 - "04g6y0sv04d20bw401myq3k828ikysjhx383ly81vh9wji9i3mdd")))) + "0gqi9f9njrdn8vad1zvr59b25arwc8r0n8bp25sgkbfz2c3r11j3")))) (build-system cmake-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 7af0f2156c1576773a693f9d61d2fab308b390d3 Mon Sep 17 00:00:00 2001 From: Andrius Štikonas via Guix-patches via Date: Fri, 14 Feb 2020 00:53:45 +0000 Subject: gnu: mrustc: Fix typo in description. * gnu/packages/rust.scm (mrustc) [synopsis]: Fix a typo Signed-off-by: Marius Bakke --- gnu/packages/rust.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 8bed56ff72..d0a64b134f 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -182,7 +182,7 @@ (define-public mrustc (copy-file "run_rustc/Makefile" (string-append run_rustc "/Makefile")) #t)))))) - (synopsis "Compiler for the Rust progamming language") + (synopsis "Compiler for the Rust programming language") (description "Rust is a systems programming language that provides memory safety and thread safety guarantees.") (home-page "https://github.com/thepowersgang/mrustc") -- cgit v1.2.3 From 64fc4f3705423c83c680a95d8dea81a39fce9a70 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sun, 12 Jan 2020 18:42:24 +0100 Subject: gnu: Add gst-editing-services. * gnu/packages/gstreamer.scm (gst-editing-services): New variable. Signed-off-by: Marius Bakke --- gnu/packages/gstreamer.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 1e26a3ce3e..0709d8568b 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020 Marius Bakke +;;; Copyright © 2020 Leo Prikler ;;; ;;; This file is part of GNU Guix. ;;; @@ -476,6 +477,39 @@ (define-public gst-libav compression formats through the use of the libav library.") (license license:gpl2+))) +(define-public gst-editing-services + (package + (name "gst-editing-services") + (version "1.16.2") + (source (origin + (method url-fetch) + (uri (string-append + "https://gstreamer.freedesktop.org/src/" name "/" + "gstreamer-editing-services-" version ".tar.xz")) + (sha256 + (base32 + "05hcf3prna8ajjnqd53221gj9syarrrjbgvjcbhicv0c38csc1hf")))) + (build-system meson-build-system) + (arguments + ;; FIXME: 16/22 failing tests. + `(#:tests? #f)) + (inputs + `(("gst-plugins-base" ,gst-plugins-base) + ("libxml2" ,libxml2))) + (native-inputs + `(("flex" ,flex) + ("gst-plugins-bad" ,gst-plugins-bad) + ("gst-plugins-good" ,gst-plugins-good) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python))) + (home-page "https://gstreamer.freedesktop.org/") + (synopsis "GStreamer library for non-linear editors") + (description + "This is a high-level library for facilitating the creation of audio/video +non-linear editors.") + (license license:gpl2+))) + (define-public python-gst (package (name "python-gst") -- cgit v1.2.3