07/12: gnu: rust-itoa-0.4: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit 6c92f52b2ea1998678713505f4c5af70efc3792b
Author: Efraim Flashner
AuthorDate: Thu Jan 16 22:32:53 2020 +0200
gnu: rust-itoa-0.4: Don't hide package.
* gnu/packages/crates-io.scm (rust-itoa-0.4)[arguments]: Skip build.
[properties]: Remove field.
---
gnu/packages/crates-io.scm | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1ab69e9..8879096 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4682,11 +4682,11 @@ and functions.")
(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
primitives to an @code{io::Write}.")
-(properties '((hidden? . #t)))
(license (list license:asl2.0
license:expat
@@ -4702,9 +4702,7 @@ primitives to an @code{io::Write}.")
(file-name (string-append name "-" version ".crate"))
(sha256
(base32
- "18g7p2hrb3dk84z3frfgmszfc9hjb4ps9vp99qlb1kmf9gm8hc5f"
- (arguments '(#:skip-build? #t))
- (properties '(
+ "18g7p2hrb3dk84z3frfgmszfc9hjb4ps9vp99qlb1kmf9gm8hc5f"))
(define-public rust-js-sys-0.3
(package
branch master updated (7b99aa0 -> bd843a2)
efraim pushed a change to branch master in repository guix. from 7b99aa0 gnu: Add ocaml-4.09. new 4711a24 gnu: rust-glob-0.2: Don't hide package. new 5a3217e gnu: rust-glob-0.3: Don't hide package. new af9ca87 gnu: rust-hostname-0.1: Don't hide package. new 7499a9c gnu: rust-iovec-0.1: Don't hide package. new a6e28a9 gnu: rust-iovec-0.1: Update to 0.1.4. new 1403c31 gnu: rust-itoa-0.1: Don't hide package. new 6c92f52 gnu: rust-itoa-0.4: Don't hide package. new 759dfa9 gnu: rust-libc-0.2: Don't hide package. new 290436d gnu: rust-libc-0.2: Update to 0.2.66. new cc0e8ce gnu: rust-libloading-0.5: Don't hide package. new 468e15b gnu: rust-lock-api-0.1: Don't hide package. new bd843a2 gnu: rust-lock-api-0.3: Update to 0.3.3. The 12 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/crates-io.scm | 64 ++ 1 file changed, 42 insertions(+), 22 deletions(-)
02/12: gnu: rust-glob-0.3: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit 5a3217e52cd5364684b8a295357187a53a26e437
Author: Efraim Flashner
AuthorDate: Thu Jan 16 22:24:19 2020 +0200
gnu: rust-glob-0.3: Don't hide package.
* gnu/packages/crates-io.scm (rust-glob-0.3)[arguments]: Skip build. Add
rust-tempdir-0.3 to cargo-development-inputs.
[properties]: Remove field.
---
gnu/packages/crates-io.scm | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ebc2afe..bb07370 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3807,12 +3807,15 @@ reading and writing git repositories.")
(base32
"0x25wfr7vg3mzxc9x05dcphvd3nwlcmbnxrvwcvrrdwplcrrk4cv"
(build-system cargo-build-system)
+(arguments
+ `(#:skip-build? #t
+ #:cargo-development-inputs
+ (("rust-tempdir" ,rust-tempdir-0.3
(home-page "https://github.com/rust-lang-nursery/glob;)
(synopsis "Match file paths against Unix shell style patterns")
(description
"This package provides support for matching file paths against Unix
shell style patterns.")
-(properties '((hidden? . #t)))
(license (list license:asl2.0
license:expat
@@ -3828,12 +3831,7 @@ shell style patterns.")
(file-name (string-append name "-" version ".crate"))
(sha256
(base32
- "1ysvi72slkw784fcsymgj4308c3y03gwjjzqxp80xdjnkbh8vqcb"
-(arguments
- `(#:skip-build? #t
- #:cargo-development-inputs
- (("rust-tempdir" ,rust-tempdir-0.3
-(properties '(
+ "1ysvi72slkw784fcsymgj4308c3y03gwjjzqxp80xdjnkbh8vqcb"))
(define-public rust-globset-0.4
(package
08/12: gnu: rust-libc-0.2: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit 759dfa989e5f5fbc91ac61824112c641cf15
Author: Efraim Flashner
AuthorDate: Thu Jan 16 22:34:48 2020 +0200
gnu: rust-libc-0.2: Don't hide package.
* gnu/packages/crates-io.scm (rust-libc-0.2)[arguments]: Skip build. Add
rust-rustc-std-workspace-core-1.0 to cargo-inputs.
[description]: Appease 'guix lint'.
[properties]: Remove field.
---
gnu/packages/crates-io.scm | 20 +++-
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8879096..8f62e89 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4964,19 +4964,21 @@ requires non-const function calls to be computed.")
(base32
"1s14bjxnz6haw0gr1h3j4sr7s2s407hpgm8dxhwnl7yzgxia0c8s"
(build-system cargo-build-system)
+(arguments
+ `(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1.0
(home-page "https://github.com/rust-lang/libc;)
(synopsis "Raw FFI bindings to platform libraries like libc")
(description
- "libc provides all of the definitions necessary to easily
-interoperate with C code (or \"C-like\" code) on each of the platforms
-that Rust supports. This includes type definitions (e.g., c_int),
-constants (e.g., EINVAL) as well as function headers (e.g., malloc).
+ "The rust libc crate provides all of the definitions necessary to easily
+interoperate with C code (or \"C-like\" code) on each of the platforms that
Rust
+supports. This includes type definitions (e.g., c_int), constants (e.g.,
EINVAL)
+as well as function headers (e.g., malloc).
-This crate exports all underlying platform types, functions, and
-constants under the crate root, so all items are accessible as
-@samp{libc::foo}. The types and values of all the exported APIs match
-the platform that libc is compiled for.")
-(properties '((hidden? . #t)))
+This crate exports all underlying platform types, functions, and constants
under
+the crate root, so all items are accessible as @samp{libc::foo}. The types and
+values of all the exported APIs match the platform that libc is compiled for.")
(license (list license:expat
license:asl2.0
10/12: gnu: rust-libloading-0.5: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit cc0e8ce608d7374c1d80a24876fdfbbb698cca9d
Author: Efraim Flashner
AuthorDate: Thu Jan 16 22:40:03 2020 +0200
gnu: rust-libloading-0.5: Don't hide package.
* gnu/packages/crates-io.scm (rust-libloading-0.5)[arguments]: Skip
build. Add rust-winapi-0.3 to cargo-inputs. Add rust-cc-1.0 to
cargo-development-inputs.
[properties]: Remove field.
---
gnu/packages/crates-io.scm | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9e81019..f01dd53 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5048,6 +5048,12 @@ values of all the exported APIs match the platform that
libc is compiled for.")
(base32
"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
(home-page "https://github.com/nagisa/rust_libloading/;)
(synopsis "Rust library for loading dynamic libraries")
(description
@@ -5056,7 +5062,6 @@ The most important safety guarantee by this library is
prevention of
dangling-Symbols that may occur after a Library is unloaded. Using this
library
allows loading dynamic libraries (also known as shared libraries) as well as
use
functions and static variables these libraries contain.")
-(properties '((hidden? . #t)))
(license license:isc)))
(define-public rust-libssh2-sys-0.2
05/12: gnu: rust-iovec-0.1: Update to 0.1.4.
efraim pushed a commit to branch master
in repository guix.
commit a6e28a92c17a6c25d6b36e2c8b49049d67652345
Author: Efraim Flashner
AuthorDate: Thu Jan 16 22:30:13 2020 +0200
gnu: rust-iovec-0.1: Update to 0.1.4.
* gnu/packages/crates-io.scm (rust-iovec-0.1): Update to 0.1.4.
[arguments] Remove rust-winapi-0.2 from cargo-inputs.
---
gnu/packages/crates-io.scm | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9c07f81..6ddb747 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4589,7 +4589,7 @@ immutable interval tree.")
(define-public rust-iovec-0.1
(package
(name "rust-iovec")
-(version "0.1.2")
+(version "0.1.4")
(source
(origin
(method url-fetch)
@@ -4597,13 +4597,11 @@ immutable interval tree.")
(file-name (string-append name "-" version ".crate"))
(sha256
(base32
- "025vi072m22299z3fg73qid188z2iip7k41ba6v5v5yhwwby9rnv"
+ "0ph73qygwx8i0mblrf110cj59l00gkmsgrpzz1rm85syz5pymcxj"
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
- #:cargo-inputs
- (("rust-libc" ,rust-libc-0.2)
-("rust-winapi" ,rust-winapi-0.2
+ #:cargo-inputs (("rust-libc" ,rust-libc-0.2
(home-page "https://github.com/carllerche/iovec;)
(synopsis "Portable buffer type for scatter/gather I/O operations")
(description
06/12: gnu: rust-itoa-0.1: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit 1403c31e3eaa0ee535489b969f1d59f8da78fd5f
Author: Efraim Flashner
AuthorDate: Thu Jan 16 22:32:02 2020 +0200
gnu: rust-itoa-0.1: Don't hide package.
* gnu/packages/crates-io.scm (rust-itoa-0.1)[arguments]: Skip build.
[properties]: Don't inherit field.
---
gnu/packages/crates-io.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6ddb747..1ab69e9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4702,7 +4702,9 @@ primitives to an @code{io::Write}.")
(file-name (string-append name "-" version ".crate"))
(sha256
(base32
- "18g7p2hrb3dk84z3frfgmszfc9hjb4ps9vp99qlb1kmf9gm8hc5f"))
+ "18g7p2hrb3dk84z3frfgmszfc9hjb4ps9vp99qlb1kmf9gm8hc5f"
+ (arguments '(#:skip-build? #t))
+ (properties '(
(define-public rust-js-sys-0.3
(package
09/12: gnu: rust-libc-0.2: Update to 0.2.66.
efraim pushed a commit to branch master in repository guix. commit 290436d1109ae6f19bd8fbeb49ec7b3a858e98b9 Author: Efraim Flashner AuthorDate: Thu Jan 16 22:37:07 2020 +0200 gnu: rust-libc-0.2: Update to 0.2.66. * gnu/packages/crates-io.scm (rust-libc-0.2): Update to 0.2.66. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8f62e89..9e81019 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4954,7 +4954,7 @@ requires non-const function calls to be computed.") (define-public rust-libc-0.2 (package (name "rust-libc") -(version "0.2.65") +(version "0.2.66") (source (origin (method url-fetch) @@ -4962,7 +4962,7 @@ requires non-const function calls to be computed.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1s14bjxnz6haw0gr1h3j4sr7s2s407hpgm8dxhwnl7yzgxia0c8s" + "0n0mwry21fxfwc063k33mvxk8xj7ia5ar8m42c9ymbam2ksb25fm" (build-system cargo-build-system) (arguments `(#:skip-build? #t
11/12: gnu: rust-lock-api-0.1: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit 468e15b1af5fab3c841bfac16a1bcd61ab014dcd
Author: Efraim Flashner
AuthorDate: Thu Jan 16 22:44:55 2020 +0200
gnu: rust-lock-api-0.1: Don't hide package.
* gnu/packages/crates-io.scm (rust-lock-api-0.1)[arguments]: Skip build.
Add rust-scopeguard-0.3, rust-owning-ref-0.4 to cargo-inputs.
[properties]: Remove field.
---
gnu/packages/crates-io.scm | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f01dd53..a14d302 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5157,7 +5157,11 @@ functions and static variables these libraries contain.")
(sha256
(base32
"0b24q9mh258xa52ap636q1sxz0j5vrnp0hwbbh7ddjka3wwz3sv2"
-(properties '((hidden? . #t)
+(arguments
+ `(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-scopeguard" ,rust-scopeguard-0.3)
+("rust-owning-ref" ,rust-owning-ref-0.4))
(define-public rust-log-0.4
(package
12/12: gnu: rust-lock-api-0.3: Update to 0.3.3.
efraim pushed a commit to branch master in repository guix. commit bd843a2ff6ccf5a4dc28795ad5671a8c7c28ee11 Author: Efraim Flashner AuthorDate: Thu Jan 16 22:45:57 2020 +0200 gnu: rust-lock-api-0.3: Update to 0.3.3. * gnu/packages/crates-io.scm (rust-lock-api-0.3): Update to 0.3.3. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a14d302..780173b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5104,7 +5104,7 @@ functions and static variables these libraries contain.") (define-public rust-lock-api-0.3 (package (name "rust-lock-api") -(version "0.3.1") +(version "0.3.3") (source (origin (method url-fetch) @@ -5113,7 +5113,7 @@ functions and static variables these libraries contain.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1p04271jikw69ja0ap0plrfwm9incf1iny48g0b3ma9k4mw2x4gq" + "0yzlz7f5xl5sm129dq8jqsrcrkyv7jjnqwd4zr4ijsdlxjaxxckr" (build-system cargo-build-system) (arguments `(#:skip-build? #t
04/12: gnu: rust-iovec-0.1: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit 7499a9c78108ebc4e9aaf054cc30d71d89227d01
Author: Efraim Flashner
AuthorDate: Thu Jan 16 22:29:16 2020 +0200
gnu: rust-iovec-0.1: Don't hide package.
* gnu/package/crates-io.scm (rust-iovec-0.1)[arguments]: Skip build. Add
rust-libc-0.2, rust-winapi-0.2 to cargo-inputs.
[properties]: Remove field.
---
gnu/packages/crates-io.scm | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2602d2a..9c07f81 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4599,11 +4599,15 @@ immutable interval tree.")
(base32
"025vi072m22299z3fg73qid188z2iip7k41ba6v5v5yhwwby9rnv"
(build-system cargo-build-system)
+(arguments
+ `(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-libc" ,rust-libc-0.2)
+("rust-winapi" ,rust-winapi-0.2
(home-page "https://github.com/carllerche/iovec;)
(synopsis "Portable buffer type for scatter/gather I/O operations")
(description
"Portable buffer type for scatter/gather I/O operations.")
-(properties '((hidden? . #t)))
(license (list license:asl2.0
license:expat
01/12: gnu: rust-glob-0.2: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit 4711a24074da962c50fa446215060ed50eb52970
Author: Efraim Flashner
AuthorDate: Thu Jan 16 22:23:21 2020 +0200
gnu: rust-glob-0.2: Don't hide package.
* gnu/packages/crates-io.scm (rust-glob-0.2)[arguments]: Skip build. Add
rust-tempdir-0.3 to cargo-development-inputs.
[properties]: Don't inherit field.
---
gnu/packages/crates-io.scm | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 41ed200..ebc2afe 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3828,7 +3828,12 @@ shell style patterns.")
(file-name (string-append name "-" version ".crate"))
(sha256
(base32
- "1ysvi72slkw784fcsymgj4308c3y03gwjjzqxp80xdjnkbh8vqcb"))
+ "1ysvi72slkw784fcsymgj4308c3y03gwjjzqxp80xdjnkbh8vqcb"
+(arguments
+ `(#:skip-build? #t
+ #:cargo-development-inputs
+ (("rust-tempdir" ,rust-tempdir-0.3
+(properties '(
(define-public rust-globset-0.4
(package
03/12: gnu: rust-hostname-0.1: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit af9ca877b0d64d15683a5076f25efc2d2069eae7
Author: Efraim Flashner
AuthorDate: Thu Jan 16 22:26:02 2020 +0200
gnu: rust-hostname-0.1: Don't hide package.
* gnu/packages/crates-io.scm (rust-hostname-0.1)[arguments]: Skip build.
Add rust-libc-0.2, rust-winutil-0.1 to cargo-inputs.
[host-name]: Update to new host-name.
[properties]: Remove field.
---
gnu/packages/crates-io.scm | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bb07370..2602d2a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4407,11 +4407,15 @@ SystemTime}}.")
(base32
"0kprf862qaa7lwdms6aw7f3275h0j2rwhs9nz5784pm8hdmb9ki1"
(build-system cargo-build-system)
-(home-page "https://github.com/fengcen/hostname;)
+(arguments
+ `(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-libc" ,rust-libc-0.2)
+("rust-winutil" ,rust-winutil-0.1
+(home-page "https://github.com/svartalf/hostname;)
(synopsis "Get hostname for Rust")
(description
"Get hostname for Rust.")
-(properties '((hidden? . #t)))
(license license:expat)))
(define-public rust-idna-0.1
branch master updated: gnu: Add ocaml-4.09.
This is an automated email from the git hooks/post-receive script.
roptat pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 7b99aa0 gnu: Add ocaml-4.09.
7b99aa0 is described below
commit 7b99aa043c4e661fd86cfe25e7b51f5081f42e5d
Author: Julien Lepiller
AuthorDate: Fri Jan 17 04:07:11 2020 +0100
gnu: Add ocaml-4.09.
* gnu/packages/ocaml.scm (ocaml-4.09): New variable.
[argument]: Remove the no longer needed configure phase.
---
gnu/packages/ocaml.scm | 50 --
1 file changed, 32 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 3253d02..ce0398b 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -131,10 +131,10 @@
"/lib/ocaml/site-lib"))
#:phases (modify-phases %standard-phases (delete 'configure
-(define-public ocaml-4.07
+(define-public ocaml-4.09
(package
(name "ocaml")
-(version "4.07.1")
+(version "4.09.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -143,7 +143,7 @@
"/ocaml-" version ".tar.xz"))
(sha256
(base32
-"1f07hgj5k45cylj1q3k5mk8yi02cwzx849b1fwnwia8xlcfqpr6z"
+"1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj"
(build-system gnu-build-system)
(native-search-paths
(list (search-path-specification
@@ -162,10 +162,7 @@
("gcc:lib" ,(canonical-package gcc) "lib")
("zlib" ,zlib))) ;also needed for objdump support
(arguments
- `(#:modules ((guix build gnu-build-system)
- (guix build utils)
- (web server))
- #:phases
+ `(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-/bin/sh-references
(lambda* (#:key inputs #:allow-other-keys)
@@ -184,21 +181,11 @@ patch-/bin/sh-references: ~a: changing `\"/bin/sh\"' to
`~a'~%"
quoted-sh
(find-files "." "\\.ml$"))
#t
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
-(mandir (string-append out "/share/man")))
- ;; Custom configure script doesn't recognize
- ;; --prefix= syntax (with equals sign).
- (invoke "./configure"
- "--prefix" out
- "--mandir" mandir
(replace 'build
(lambda _
(invoke "make" "-j" (number->string (parallel-job-count))
"world.opt")))
- (delete 'check)
- (add-after 'install 'check
+ (replace 'check
(lambda _
(with-directory-excursion "testsuite"
(invoke "make" "all")))
@@ -214,6 +201,33 @@ functional, imperative and object-oriented styles of
programming.")
;; distributed under lgpl2.0.
(license (list license:qpl license:lgpl2.0
+(define-public ocaml-4.07
+ (package
+(inherit ocaml-4.09)
+(version "4.07.1")
+(source (origin
+ (method url-fetch)
+ (uri (string-append
+"http://caml.inria.fr/pub/distrib/ocaml-;
+(version-major+minor version)
+"/ocaml-" version ".tar.xz"))
+ (sha256
+ (base32
+"1f07hgj5k45cylj1q3k5mk8yi02cwzx849b1fwnwia8xlcfqpr6z"
+(arguments
+ (substitute-keyword-arguments (package-arguments ocaml-4.09)
+((#:phases phases)
+ `(modify-phases ,phases
+(replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+(let* ((out (assoc-ref outputs "out"))
+ (mandir (string-append out "/share/man")))
+ ;; Custom configure script doesn't recognize
+ ;; --prefix= syntax (with equals sign).
+ (invoke "./configure"
+ "--prefix" out
+ "--mandir" mandir))
+
(define-public ocaml ocaml-4.07)
(define-public ocamlbuild
01/05: gnu: miniupnpc: Update to 2.1.20191224.
nckx pushed a commit to branch master
in repository guix.
commit 09c2fc2a100e7d9373818e60443ca568a1dafc05
Author: Tobias Geerinckx-Rice
AuthorDate: Thu Jan 16 17:28:43 2020 +0100
gnu: miniupnpc: Update to 2.1.20191224.
* gnu/packages/upnp.scm (miniupnpc): Update to 2.1.20191224.
---
gnu/packages/upnp.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm
index 390a338..8f3c887 100644
--- a/gnu/packages/upnp.scm
+++ b/gnu/packages/upnp.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Sree Harsha Totakura
;;; Copyright © 2015 Federico Beffa
-;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice
+;;; Copyright © 2016, 2017, 2018, 2020 Tobias Geerinckx-Rice
;;; Copyright © 2018 Theodoros Foradis
;;; Copyright © 2019 Jens Mølgaard
;;;
@@ -42,14 +42,14 @@
(define-public miniupnpc
(package
(name "miniupnpc")
-(version "2.1.20190824")
+(version "2.1.20191224")
(source
(origin
(method url-fetch)
(uri (string-append "https://miniupnp.tuxfamily.org/files/;
"miniupnpc-" version ".tar.gz"))
(sha256
-(base32 "0rg1i51lnyq8zgflhcg981kq4348vgq03ndmbgiv7knd1vmfzb8z"
+(base32 "1kv6dpj93gckvwvgzxl4vdqpwnicb0c8p0xw53m2gh5naiw44ys4"
(build-system gnu-build-system)
(native-inputs
`(("python" ,python-2)))
02/05: gnu: intel-vaapi-driver: Update to 2.4.0.
nckx pushed a commit to branch master
in repository guix.
commit 02d6e27e15d66ef557b90479a7920aabd15e42bf
Author: Tobias Geerinckx-Rice
AuthorDate: Thu Jan 16 17:06:00 2020 +0100
gnu: intel-vaapi-driver: Update to 2.4.0.
* gnu/packages/video.scm (intel-vaapi-driver): Update to 2.4.0.
---
gnu/packages/video.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 1a17279..5629d58 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2803,7 +2803,7 @@ of modern, widely supported codecs.")
(define-public intel-vaapi-driver
(package
(name "intel-vaapi-driver")
-(version "2.3.0")
+(version "2.4.0")
(source
(origin
(method url-fetch)
@@ -2811,7 +2811,7 @@ of modern, widely supported codecs.")
"releases/download/" version "/intel-vaapi-driver-"
version ".tar.bz2"))
(sha256
-(base32 "1qyzxh3p8cw4fv8bz9zd4kc8hajlaps7xryzh6pad814n3m5sbjw"
+(base32 "12fhydgwpvyh97gxqlgv77wsf9yax321h46vi49j4sxghpcxvqki"
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
04/05: gnu: wavemon: Update to 0.9.1.
nckx pushed a commit to branch master in repository guix. commit 5976d0b07ef1c7476914bbec8a3f7a37df84907d Author: Tobias Geerinckx-Rice AuthorDate: Fri Jan 17 03:24:59 2020 +0100 gnu: wavemon: Update to 0.9.1. * gnu/packages/hardware.scm (wavemon): Update to 0.9.1. --- gnu/packages/hardware.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index dab49c7..4c9c45b 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -238,7 +238,7 @@ be dangerous and may void your CPU or system board's warranty.") (define-public wavemon (package (name "wavemon") -(version "0.9.0") +(version "0.9.1") (source (origin (method git-fetch) @@ -247,7 +247,7 @@ be dangerous and may void your CPU or system board's warranty.") (commit (string-append "v" version (file-name (git-file-name name version)) (sha256 -(base32 "07cid0h3mcyr74nnrzzf8k5n1p9a4y3wij43jbiaqmkpxilcc1i6" +(base32 "109ycwnjjqc2vpnd8b86njfifczlxglnyv4rh2qmbn2i5nw2wryg" (build-system gnu-build-system) (arguments `(#:make-flags
branch master updated (4337140 -> 90b8f4e)
nckx pushed a change to branch master in repository guix. from 4337140 gnu: Update copyright line. new 09c2fc2 gnu: miniupnpc: Update to 2.1.20191224. new 02d6e27 gnu: intel-vaapi-driver: Update to 2.4.0. new df01360 gnu: python-publicsuffix2: Update to 2.20191221. new 5976d0b gnu: wavemon: Update to 0.9.1. new 90b8f4e gnu: stgit: Update to 0.21. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/hardware.scm| 4 ++-- gnu/packages/python-web.scm | 21 +++-- gnu/packages/upnp.scm| 6 +++--- gnu/packages/version-control.scm | 32 gnu/packages/video.scm | 4 ++-- 5 files changed, 46 insertions(+), 21 deletions(-)
05/05: gnu: stgit: Update to 0.21.
nckx pushed a commit to branch master
in repository guix.
commit 90b8f4e292da0d6980be89915607b64879f0d35c
Author: Tobias Geerinckx-Rice
AuthorDate: Fri Jan 17 03:51:29 2020 +0100
gnu: stgit: Update to 0.21.
* gnu/packages/version-control.scm (stgit): Update to 0.21.
[native-inputs]: Add perl.
[arguments]: Build with default Python (3).
Add ‘hard-code-version’ and ‘patch-tests’ phases.
Fix and run all remaining tests in the ‘check’ phase.
---
gnu/packages/version-control.scm | 32
1 file changed, 24 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index e0fe4e2..20db6b4 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1049,7 +1049,7 @@ lot easier.")
(define-public stgit
(package
(name "stgit")
-(version "0.18")
+(version "0.21")
(source
(origin
(method git-fetch)
@@ -1058,20 +1058,36 @@ lot easier.")
(commit (string-append "v" version
(file-name (git-file-name name version))
(sha256
-(base32 "0ydgg744m671nkhg7h4q2z3b9vpbc9914rbc0wcgimqfqsxkxx2y"
+(base32 "00pmz93znl418lsjwy4mr0chp8i2w27h1xjysa05f62smsv91yyc"
(build-system python-build-system)
+(native-inputs
+ `(("perl" ,perl)))
(inputs
`(("git" ,git)))
(arguments
- `(#:python ,python-2
- #:phases
+ `(#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'hard-code-version
+ (lambda _
+ ;; setup.py tries to cleverly extract the version number from the
+ ;; git history, which the source checkout lacks. Hard-code one.
+ (substitute* "setup.py"
+ (("get_ver\\(\\)")
+(format #f "'~a'" ,version)))
+ #t))
+ (add-before 'check 'patch-tests
+ (lambda _
+ (substitute* (list "t/t1900-mail.sh"
+"t/t7504-commit-msg-hook.sh")
+ (("/bin/sh")
+(which "bash")))
+ #t))
(replace 'check
(lambda _
- ;; Two tests will fail -> disable them. TODO: fix the failing
tests
- (delete-file "t/t3300-edit.sh")
- (delete-file "t/t7504-commit-msg-hook.sh")
- (invoke "make" "test"))
+ (invoke "make"
+ "PERL_PATH=perl"
+ (string-append "SHELL_PATH=" (which "bash"))
+ "test"))
(home-page "http://procode.org/stgit/;)
(synopsis "Stacked Git")
(description
03/05: gnu: python-publicsuffix2: Update to 2.20191221.
nckx pushed a commit to branch master
in repository guix.
commit df01360f7897e8eacdc4c1156443018b15f42fdc
Author: Tobias Geerinckx-Rice
AuthorDate: Fri Jan 17 00:08:41 2020 +0100
gnu: python-publicsuffix2: Update to 2.20191221.
* gnu/packages/python-web.scm (python-publicsuffix2): Update to
2.20191221.
[arguments]: Add ‘ignore-maintainer-inputs’ phase.
---
gnu/packages/python-web.scm | 21 +++--
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 179e64e..611c85a 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -14,7 +14,7 @@
;;; Copyright © 2015 Cyril Roelandt
;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari
;;; Copyright © 2016, 2019 Hartmut Goebel
-;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice
+;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice
;;; Copyright © 2015, 2017 Ben Woodcroft
;;; Copyright © 2015, 2016 Christopher Allan Webber
;;; Copyright © 2017 Adriano Peluso
@@ -2748,17 +2748,26 @@ List.")
(define-public python-publicsuffix2
(package
(name "python-publicsuffix2")
-(version "2.20160818")
+(version "2.20191221")
(source
(origin
(method url-fetch)
- (uri (pypi-uri "publicsuffix2" version ".tar.bz2"))
+ (uri (pypi-uri "publicsuffix2" version))
(sha256
-(base32
- "1bb55yka9vkn7i6y1kjzxa516kh6v4gsrxa90w5wdz5p5n968r68"
+(base32 "0yzysvfj1najr1mb4pcqrbmjir3xpb69rlffln95a3cdm8qwry00"
(build-system python-build-system)
(arguments
- '(#:tests? #f)) ; The test suite requires network access.
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'ignore-maintainer-inputs
+ (lambda _
+ ;; Comment out a demand for python-requests, which is used only by
+ ;; the unused ‘update_psl’ helper command.
+ (substitute* "setup.py"
+ (("'requests " match)
+(format "# ~a" match)))
+ #t)))
+ #:tests? #f)) ; the test suite requires network access
(home-page "https://github.com/pombredanne/python-publicsuffix2;)
(synopsis "Get a public suffix for a domain name using the Public Suffix
List")
(description "Get a public suffix for a domain name using the Public Suffix
branch master updated: gnu: Update copyright line.
This is an automated email from the git hooks/post-receive script. ngz pushed a commit to branch master in repository guix. The following commit(s) were added to refs/heads/master by this push: new 4337140 gnu: Update copyright line. 4337140 is described below commit 4337140c93beb50cf28cf51268df86f96239a9ad Author: Nicolas Goaziou AuthorDate: Thu Jan 16 23:39:39 2020 +0100 gnu: Update copyright line. * gnu/packages/game-development.scm: Update copyright line. --- gnu/packages/game-development.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 697ede8..23cf913 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017, 2019 Rutger Helling ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2019 Pierre Neidhardt -;;; Copyright © 2019 Leo Prikler +;;; Copyright © 2019, 2020 Leo Prikler ;;; Copyright © 2019 Jethro Cao ;;; Copyright © 2020 Nicolas Goaziou ;;;
branch master updated: gnu: Refactor renpy build.
This is an automated email from the git hooks/post-receive script.
ngz pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 37c52b5 gnu: Refactor renpy build.
37c52b5 is described below
commit 37c52b5b15c6debed78dba41a74370a051ad7878
Author: Leo Prikler
AuthorDate: Thu Jan 16 18:43:10 2020 +0100
gnu: Refactor renpy build.
* gnu/packages/game-development.scm (python2-renpy)[arguments]: Use
directory
excursions instead of invoking `chdir' directly in phases.
---
gnu/packages/game-development.scm | 54 +--
1 file changed, 23 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/game-development.scm
b/gnu/packages/game-development.scm
index 7aef6b0..697ede8 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1086,39 +1086,31 @@ developed mainly for Ren'py.")
(setenv "RENPY_DEPS_INSTALL" (string-join (map cdr inputs) ":"))
#t))
(replace 'build
- (lambda args
- (apply
- (lambda* (build-root #:key inputs outputs #:allow-other-keys)
-;; The "module" subdirectory contains a python (really cython)
-;; project, which is built using a script, that is thankfully
-;; named "setup.py".
-(chdir "module")
-(apply (assoc-ref %standard-phases 'build) args)
-;; the above causes renpy.__init__ to be compiled but does not
-;; compile anything else, hence we do that here
-(chdir build-root)
-(delete-file "renpy/__init__.pyc")
-(invoke "python" "-m" "compileall" "renpy"))
- (getcwd) args)
+ (lambda* (#:key inputs outputs #:allow-other-keys #:rest args)
+ ;; The "module" subdirectory contains a python (really cython)
+ ;; project, which is built using a script, that is thankfully
+ ;; named "setup.py".
+ (with-directory-excursion "module"
+ (apply (assoc-ref %standard-phases 'build) args))
+ ;; the above causes renpy.__init__ to be compiled but does not
+ ;; compile anything else, hence we do that here
+ (delete-file "renpy/__init__.pyc")
+ (invoke "python" "-m" "compileall" "renpy")
#t))
(replace 'install
- (lambda args
- (apply
- (lambda* (build-root #:key inputs outputs #:allow-other-keys)
-;; Again, we have to wrap the module installation.
-;; Additionally, we want to install the python code
-;; (both source and compiled) in the same directory.
-(let* ((out (assoc-ref outputs "out"))
- (site (string-append "/lib/python"
-,(version-major+minor
- (package-version python-2))
-"/site-packages")))
- (chdir "module")
- (apply (assoc-ref %standard-phases 'install) args)
- (chdir build-root)
- (copy-recursively "renpy"
-(string-append out site "/renpy"
- (getcwd) args)
+ (lambda* (#:key inputs outputs #:allow-other-keys #:rest args)
+ ;; Again, we have to wrap the module installation.
+ ;; Additionally, we want to install the python code
+ ;; (both source and compiled) in the same directory.
+ (let* ((out (assoc-ref outputs "out"))
+(site (string-append "/lib/python"
+ ,(version-major+minor
+ (package-version python-2))
+ "/site-packages")))
+ (with-directory-excursion "module"
+ (apply (assoc-ref %standard-phases 'install) args))
+ (copy-recursively "renpy"
+ (string-append out site "/renpy")))
#t)
(inputs
`(("ffmpeg" ,ffmpeg)
branch master updated: gnu: xmoto: Slight description rewording.
This is an automated email from the git hooks/post-receive script.
ngz pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new af4796d gnu: xmoto: Slight description rewording.
af4796d is described below
commit af4796d5caad9500c1f24a91e7fb7529df7d3fec
Author: Nicolas Goaziou
AuthorDate: Thu Jan 16 23:23:38 2020 +0100
gnu: xmoto: Slight description rewording.
* gnu/packages/games.scm (xmoto)[description]: Slight rewording.
---
gnu/packages/games.scm | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index bb7f451..4244404 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9539,10 +9539,10 @@ This package is part of the KDE games module.")
("zlib" ,zlib)))
(home-page "https://xmoto.tuxfamily.org/;)
(synopsis "2D motocross platform game")
-(description "X-Moto is a challenging 2D motocross platform game,
-where physics play an all important role in the gameplay. You need to
-control your bike to its limit, if you want to have a chance finishing
-the more difficult of the challenges.")
+(description "X-Moto is a challenging 2D motocross platform game, where
+physics play an all important role in the gameplay. You need to control your
+bike to its limit, if you want to have a chance finishing the more difficult
+challenges.")
(license (list license:gpl2+;whole project
license:bsd-4;src/bzip
license:bsd-3;src/md5sum
branch master updated: gnu: Add xmoto.
This is an automated email from the git hooks/post-receive script.
ngz pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 40d2bdd gnu: Add xmoto.
40d2bdd is described below
commit 40d2bddd01dd054e68aadc98f77380a8b9977f3c
Author: Nicolas Goaziou
AuthorDate: Sun Jan 5 02:20:35 2020 +0100
gnu: Add xmoto.
* gnu/packages/games.scm (xmoto): New variable.
* gnu/packages/patches/xmoto-remove-glext.patch: New file.
* gnu/packages/patches/xmoto-reproducible.patch: New file.
* gnu/packages/patches/xmoto-utf8.patch: New file.
* gnu/local.mk (dist_patch_DATA): Reference new files.
---
gnu/local.mk | 3 +
gnu/packages/games.scm| 87 ++-
gnu/packages/patches/xmoto-remove-glext.patch | 23 +++
gnu/packages/patches/xmoto-reproducible.patch | 24
gnu/packages/patches/xmoto-utf8.patch | 16 +
5 files changed, 152 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index e2a837f..f0bfdfb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1483,6 +1483,9 @@ dist_patch_DATA =
\
%D%/packages/patches/xf86-video-voodoo-pcitag.patch \
%D%/packages/patches/xfce4-panel-plugins.patch \
%D%/packages/patches/xfce4-settings-defaults.patch \
+ %D%/packages/patches/xmoto-utf8.patch\
+ %D%/packages/patches/xmoto-remove-glext.patch\
+ %D%/packages/patches/xmoto-reproducible.patch\
%D%/packages/patches/xsane-fix-memory-leak.patch \
%D%/packages/patches/xsane-fix-pdf-floats.patch \
%D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index da6c6fd..bb7f451 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -30,7 +30,7 @@
;;; Copyright © 2017, 2019 Marius Bakke
;;; Copyright © 2017, 2018 Rutger Helling
;;; Copyright © 2017 Roel Janssen
-;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou
+;;; Copyright © 2017, 2018, 2019, 2020 Nicolas Goaziou
;;; Copyright © 2018 okapi
;;; Copyright © 2018 Tim Gesthuizen
;;; Copyright © 2018 Madalin Ionel-Patrascu
@@ -9463,3 +9463,88 @@ control of the board by capturing or adding to one
square.
This package is part of the KDE games module.")
(license (list license:gpl2+ license:fdl1.2+
+
+(define-public xmoto
+ (package
+(name "xmoto")
+(version "0.5.11")
+(source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://download.tuxfamily.org/xmoto/xmoto/; version "/"
+ "xmoto-" version "-src.tar.gz"))
+ (sha256
+(base32 "1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155"))
+ (patches
+(search-patches
+ "xmoto-remove-glext.patch" ;fixes licensing issue
+ "xmoto-reproducible.patch"
+ "xmoto-utf8.patch"))
+ ;; Unbundle ODE.
+ (modules '((guix build utils)))
+ (snippet
+`(begin
+ (delete-file-recursively "src/ode")
+ #t
+(build-system gnu-build-system)
+(arguments
+ ;; XXX: First flag prevents a build error with GCC7+. The second
+ ;; flag works around missing text in game. Both are fixed
+ ;; upstream. Remove once xmoto 0.5.12+ is released.
+ `(#:make-flags '("CXXFLAGS=-fpermissive -D_GLIBCXX_USE_CXX11_ABI=0")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'install-desktop-file
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+(apps (string-append out "/share/applications"))
+(pixmaps (string-append out "/share/pixmaps")))
+ (install-file "extra/xmoto.desktop" apps)
+ (install-file "extra/xmoto.xpm" pixmaps)
+ #t)))
+ (add-after 'install-desktop-file 'install-fonts
+ (lambda* (#:key outputs inputs #:allow-other-keys)
+ (let ((font-dir (string-append (assoc-ref inputs "font-dejavu")
+"/share/fonts/truetype/"))
+ (target-dir (string-append (assoc-ref outputs "out")
+ "/share/xmoto/Textures/Fonts/")))
+ (for-each (lambda (f)
+ (let ((font (string-append font-dir f))
+ (target (string-append target-dir f)))
+ (delete-file target)
+ (symlink font target)))
+ '("DejaVuSans.ttf" "DejaVuSansMono.ttf"))
+ #t)))
+ (add-after 'install-fonts 'install-man-page
+ (lambda* (#:key outputs
04/05: import: elpa: Rewrite test to use an HTTP server instead of mocking.
civodul pushed a commit to branch master
in repository guix.
commit 9d6c6cb20ef240221fc9a8e155f4bfa53e71bce4
Author: Ludovic Courtès
AuthorDate: Thu Jan 16 22:49:41 2020 +0100
import: elpa: Rewrite test to use an HTTP server instead of mocking.
* guix/import/elpa.scm (elpa-url): Add 'gnu/http'.
(elpa->guix-package): Handle it.
* tests/elpa.scm (elpa-package-info-mock, auctex-readme-mock)
(elpa-version->string, package-source-url, ensure-list)
(package-home-page, make-elpa-package): Remove.
: Call '%http-server-port'.
(eval-test-with-elpa): Remove uses of 'mock'. Use 'with-http-server'
and parameterize 'current-http-proxy' instead.
---
guix/import/elpa.scm | 5 ++-
tests/elpa.scm | 101 +--
2 files changed, 37 insertions(+), 69 deletions(-)
diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm
index 83354d3..2d4487d 100644
--- a/guix/import/elpa.scm
+++ b/guix/import/elpa.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Federico Beffa
-;;; Copyright © 2015, 2016, 2017, 2018 Ludovic Courtès
+;;; Copyright © 2015, 2016, 2017, 2018, 2020 Ludovic Courtès
;;; Copyright © 2018 Oleg Pykhalov
;;;
;;; This file is part of GNU Guix.
@@ -72,6 +72,7 @@ NAMES (strings)."
"Retrieve the URL of REPO."
(let ((elpa-archives
'((gnu . "https://elpa.gnu.org/packages;)
+ (gnu/http . "http://elpa.gnu.org/packages;) ;for testing
(melpa-stable . "https://stable.melpa.org/packages;)
(melpa . "https://melpa.org/packages;
(assq-ref elpa-archives repo)))
@@ -251,7 +252,7 @@ type ''."
(package
;; ELPA is known to contain only GPLv3+ code. Other repos may contain
;; code under other license but there's no license metadata.
- (let ((license (and (eq? 'gnu repo) 'license:gpl3+)))
+ (let ((license (and (memq repo '(gnu gnu/http)) 'license:gpl3+)))
(elpa-package->sexp package license)
diff --git a/tests/elpa.scm b/tests/elpa.scm
index 44e3914..b70539b 100644
--- a/tests/elpa.scm
+++ b/tests/elpa.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Federico Beffa
+;;; Copyright © 2020 Ludovic Courtès
;;;
;;; This file is part of GNU Guix.
;;;
@@ -18,10 +19,11 @@
(define-module (test-elpa)
#:use-module (guix import elpa)
- #:use-module (guix tests)
+ #:use-module (guix tests http)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-64)
- #:use-module (ice-9 match))
+ #:use-module (ice-9 match)
+ #:use-module (web client))
(define elpa-mock-archive
'(1
@@ -37,77 +39,42 @@
nil "Integrated environment for *TeX*" tar
((:url . "http://www.gnu.org/software/auctex/;))])))
-(define auctex-readme-mock "This is the AUCTeX description.")
-
-(define* (elpa-package-info-mock name #:optional (repo "gnu"))
- "Simulate retrieval of 'archive-contents' file from REPO and extraction of
-information about package NAME. (Function 'elpa-package-info'.)"
- (let* ((archive elpa-mock-archive)
- (info (filter (lambda (p) (eq? (first p) (string->symbol name)))
- (cdr archive
-(if (pair? info) (first info) #f)))
-
-(define elpa-version->string
- (@@ (guix import elpa) elpa-version->string))
-
-(define package-source-url
- (@@ (guix import elpa) package-source-url))
-
-(define ensure-list
- (@@ (guix import elpa) ensure-list))
-
-(define package-home-page
- (@@ (guix import elpa) package-home-page))
-
-(define make-elpa-package
- (@@ (guix import elpa) make-elpa-package))
+;; Avoid collisions with other tests.
+(%http-server-port 10300)
(test-begin "elpa")
(define (eval-test-with-elpa pkg)
- (mock
- ;; replace the two fetching functions
- ((guix import elpa) fetch-elpa-package
-(lambda* (name #:optional (repo "gnu"))
- (let ((pkg (elpa-package-info-mock name repo)))
-(match pkg
- ((name version reqs synopsis kind . rest)
- (let* ((name (symbol->string name))
- (ver (elpa-version->string version))
- (url (package-source-url kind name ver repo)))
- (make-elpa-package name ver
-(ensure-list reqs) synopsis kind
-(package-home-page (first rest))
-auctex-readme-mock
-url)))
- (_ #f)
- (mock
-((guix build download) url-fetch
- (lambda (url file . _)
- (call-with-output-file file
- (lambda (port)
- (display "fake tarball" port)
-
-(match (elpa->guix-package pkg)
- (('package
- ('name "emacs-auctex")
- ('version "11.88.6")
- ('source
- ('origin
-('method 'url-fetch)
-('uri ('string-append
-
03/05: import: cran: Avoid uses of '@@' in the tests.
civodul pushed a commit to branch master
in repository guix.
commit cfd1ed84013df85f0e473884ef4038b4bd7120d4
Author: Ludovic Courtès
AuthorDate: Thu Jan 16 21:47:36 2020 +0100
import: cran: Avoid uses of '@@' in the tests.
* guix/import/cran.scm (description->alist, description->package): Export.
: Set! 'listify'.
* tests/cran.scm (description-alist, "description->package"): Remove use
of '@@' to access the relevant bindings.
---
guix/import/cran.scm | 9 -
tests/cran.scm | 6 +++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index 13771ec..bcb37ed 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -54,7 +54,10 @@
cran-package?
bioconductor-package?
bioconductor-data-package?
-bioconductor-experiment-package?))
+bioconductor-experiment-package?
+
+description->alist
+description->package))
;;; Commentary:
;;;
@@ -270,6 +273,10 @@ empty list when the FIELD cannot be found."
(string-any char-set:whitespace item)))
(map string-trim-both items))
+;; Trick Guile 3 so that it keeps the 'listify' binding accessible *and*
+;; private even though this module is declarative.
+(set! listify listify)
+
(define default-r-packages
(list "base"
"compiler"
diff --git a/tests/cran.scm b/tests/cran.scm
index d785ec5..70d2277 100644
--- a/tests/cran.scm
+++ b/tests/cran.scm
@@ -53,7 +53,7 @@ Date/Publication: 2015-07-14 14:15:16
")
(define description-alist
- ((@@ (guix import cran) description->alist) description))
+ (description->alist description))
(define simple-alist
'(("Key". "Value")
@@ -72,7 +72,7 @@ Date/Publication: 2015-07-14 14:15:16
"Date/Publication")))
(lset= string=? keys (map car description-alist
-(test-equal "listify: return empty list if key cannot be found"
+(test-equal "listifyx: return empty list if key cannot be found"
'()
((@@ (guix import cran) listify) simple-alist "Letters"))
@@ -105,7 +105,7 @@ Date/Publication: 2015-07-14 14:15:16
("mirror://cran/src/contrib/My-Example_1.2.3.tar.gz"
"source")
(_ (error "Unexpected URL: " url
-(match ((@@ (guix import cran) description->package) 'cran
description-alist)
+(match (description->package 'cran description-alist)
(('package
('name "r-my-example")
('version "1.2.3")
05/05: gnu: guile-fibers: Add "guile3.0-fibers" variant.
civodul pushed a commit to branch master
in repository guix.
commit 9e016129e16962d4f751d934fdc0fbd6c6d64ef8
Author: Ludovic Courtès
AuthorDate: Thu Jan 16 23:13:08 2020 +0100
gnu: guile-fibers: Add "guile3.0-fibers" variant.
* gnu/packages/guile-xyz.scm (guile-fibers)[source]: Add 'modules' and
'snippet'.
(guile3.0-fibers): New variable.
---
gnu/packages/guile-xyz.scm | 34 +-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 9edb718..bb9b259 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -496,7 +496,29 @@ Unix-style DSV format and RFC 4180 format.")
version ".tar.gz"))
(sha256
(base32
-"0vjkg72ghgdgphzbjz9ig8al8271rq8974viknb2r1rg4lz92ld0"
+"0vjkg72ghgdgphzbjz9ig8al8271rq8974viknb2r1rg4lz92ld0"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Allow builds with Guile 3.0.
+ (substitute* "configure"
+(("search=\"2\\.2\"")
+ "search=\"3.0 2.2\""))
+
+ ;; Explicitly include system headers rather than relying on
+ ;; to do it for us.
+ (substitute* "epoll.c"
+(("#include.*libguile\\.h.*$" all)
+ (string-append "#include \n"
+"#include \n"
+all "\n")))
+
+ ;; Import (ice-9 threads) for 'current-processor-count'.
+ (substitute* "tests/channels.scm"
+(("#:use-module \\(fibers\\)")
+ (string-append "#:use-module (fibers)\n"
+"#:use-module (ice-9 threads)\n")))
+ #t
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
@@ -532,6 +554,16 @@ is not available for Guile 2.0.")
(home-page "https://github.com/wingo/fibers;)
(license license:lgpl3+)))
+(define-public guile3.0-fibers
+ (package
+(inherit guile-fibers)
+(name "guile3.0-fibers")
+(arguments
+ ;; The code uses 'scm_t_uint64' et al., which are deprecated in 3.0.
+ `(#:configure-flags '("CFLAGS=-Wno-error=deprecated-declarations")
+ ,@(package-arguments guile-fibers)))
+(inputs `(("guile" ,guile-3.0)
+
(define-public guile-syntax-highlight
(package
(name "guile-syntax-highlight")
01/05: lzlib: Define 'dictionary-size+match-length-limit'.
civodul pushed a commit to branch master
in repository guix.
commit 3597c0396b9bd6440c02462107c743c6aeb29672
Author: Ludovic Courtès
AuthorDate: Thu Jan 16 21:42:27 2020 +0100
lzlib: Define 'dictionary-size+match-length-limit'.
* guix/lzlib.scm (%compression-levels): Splice the rest of each element.
(dictionary-size+match-length-limit): New procedure.
(make-lzip-output-port, make-lzip-input-port/compressed): Use it.
* tests/lzlib.scm ("Bytevector of size relative to Lzip internal buffers (2
* dictionary)"):
Use 'dictionary-size+match-length-limit' instead of 'assoc-ref'.
---
guix/lzlib.scm | 42 ++
tests/lzlib.scm | 3 +--
2 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/guix/lzlib.scm b/guix/lzlib.scm
index 24c7b4b..2fc326b 100644
--- a/guix/lzlib.scm
+++ b/guix/lzlib.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Pierre Neidhardt
-;;; Copyright © 2019 Ludovic Courtès
+;;; Copyright © 2019, 2020 Ludovic Courtès
;;;
;;; This file is part of GNU Guix.
;;;
@@ -32,7 +32,8 @@
call-with-lzip-input-port
call-with-lzip-output-port
%default-member-length-limit
-%default-compression-level))
+%default-compression-level
+dictionary-size+match-length-limit))
;;; Commentary:
;;;
@@ -569,20 +570,27 @@ the number of uncompressed bytes written, a non-negative
integer."
;; Alist of (levels (dictionary-size match-length-limit)). 0 is the fastest.
;; See bbexample.c in lzlib's source.
(define %compression-levels
- `((0 (65535 16))
-(1 (,(bitwise-arithmetic-shift-left 1 20) 5))
-(2 (,(bitwise-arithmetic-shift-left 3 19) 6))
-(3 (,(bitwise-arithmetic-shift-left 1 21) 8))
-(4 (,(bitwise-arithmetic-shift-left 3 20) 12))
-(5 (,(bitwise-arithmetic-shift-left 1 22) 20))
-(6 (,(bitwise-arithmetic-shift-left 1 23) 36))
-(7 (,(bitwise-arithmetic-shift-left 1 24) 68))
-(8 (,(bitwise-arithmetic-shift-left 3 23) 132))
-(9 (,(bitwise-arithmetic-shift-left 1 25) 273
+ `((0 65535 16)
+(1 ,(bitwise-arithmetic-shift-left 1 20) 5)
+(2 ,(bitwise-arithmetic-shift-left 3 19) 6)
+(3 ,(bitwise-arithmetic-shift-left 1 21) 8)
+(4 ,(bitwise-arithmetic-shift-left 3 20) 12)
+(5 ,(bitwise-arithmetic-shift-left 1 22) 20)
+(6 ,(bitwise-arithmetic-shift-left 1 23) 36)
+(7 ,(bitwise-arithmetic-shift-left 1 24) 68)
+(8 ,(bitwise-arithmetic-shift-left 3 23) 132)
+(9 ,(bitwise-arithmetic-shift-left 1 25) 273)))
(define %default-compression-level
6)
+(define (dictionary-size+match-length-limit level)
+ "Return two values: the dictionary size for LEVEL, and its match-length
+limit. LEVEL must be a compression level, an integer between 0 and 9."
+ (match (assv-ref %compression-levels level)
+((dictionary-size match-length-limit)
+ (values dictionary-size match-length-limit
+
(define* (make-lzip-input-port port)
"Return an input port that decompresses data read from PORT, a file port.
PORT is automatically closed when the resulting port is closed."
@@ -602,8 +610,9 @@ PORT is automatically closed when the resulting port is
closed."
"Return an output port that compresses data at the given LEVEL, using PORT,
a file port, as its sink. PORT is automatically closed when the resulting
port is closed."
- (define encoder (apply lz-compress-open
- (car (assoc-ref %compression-levels level
+ (define encoder
+(call-with-values (lambda () (dictionary-size+match-length-limit level))
+ lz-compress-open))
(define (write! bv start count)
(lzwrite encoder bv port start count))
@@ -626,8 +635,9 @@ port is closed."
(level %default-compression-level))
"Return an input port that compresses data read from PORT, with the given
LEVEL.
PORT is automatically closed when the resulting port is closed."
- (define encoder (apply lz-compress-open
- (car (assoc-ref %compression-levels level
+ (define encoder
+(call-with-values (lambda () (dictionary-size+match-length-limit level))
+ lz-compress-open))
(define input-buffer (make-bytevector 8192))
(define input-len 0)
diff --git a/tests/lzlib.scm b/tests/lzlib.scm
index d8d0e6e..63d1e15 100644
--- a/tests/lzlib.scm
+++ b/tests/lzlib.scm
@@ -87,8 +87,7 @@
(test-assert* "Bytevector of size relative to Lzip internal buffers (2 *
dictionary)"
(compress-and-decompress
(random-bytevector
-(* 2 (car (car (assoc-ref (@@ (guix lzlib) %compression-levels)
- (@@ (guix lzlib)
%default-compression-level
+(* 2 (dictionary-size+match-length-limit %default-compression-level)
(test-assert* "Bytevector of size relative to Lzip internal buffers (64KiB)"
(compress-and-decompress (random-bytevector (* 64 1024
02/05: import: crate: Export 'string->license'.
civodul pushed a commit to branch master in repository guix. commit 72c678af55390ce01bec590f760ab95af67663b2 Author: Ludovic Courtès AuthorDate: Thu Jan 16 21:45:36 2020 +0100 import: crate: Export 'string->license'. * guix/import/crate.scm (string->license): Export. * tests/crate.scm (string->license): Remove. --- guix/import/crate.scm | 3 ++- tests/crate.scm | 5 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 405a26a..57823c3 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Craven -;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019, 2020 Ludovic Courtès ;;; Copyright © 2019 Martin Becze ;;; ;;; This file is part of GNU Guix. @@ -40,6 +40,7 @@ #:use-module (srfi srfi-26) #:export (crate->guix-package guix-package->crate-name +string->license crate-recursive-import %crate-updater)) diff --git a/tests/crate.scm b/tests/crate.scm index 61933a8..aa51fae 100644 --- a/tests/crate.scm +++ b/tests/crate.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 David Thompson ;;; Copyright © 2016 David Craven -;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -233,9 +233,6 @@ (define test-source-hash "") -(define string->license - (@@ (guix import crate) string->license)) - (test-begin "crate") (test-equal "guix-package->crate-name"
branch master updated (584e46b -> 9e01612)
civodul pushed a change to branch master in repository guix. from 584e46b gnu: asymptote: Add missing input. new 3597c03 lzlib: Define 'dictionary-size+match-length-limit'. new 72c678a import: crate: Export 'string->license'. new cfd1ed8 import: cran: Avoid uses of '@@' in the tests. new 9d6c6cb import: elpa: Rewrite test to use an HTTP server instead of mocking. new 9e01612 gnu: guile-fibers: Add "guile3.0-fibers" variant. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/guile-xyz.scm | 34 ++- guix/import/cran.scm | 9 +++- guix/import/crate.scm | 3 +- guix/import/elpa.scm | 5 ++- guix/lzlib.scm | 42 --- tests/cran.scm | 6 +-- tests/crate.scm| 5 +-- tests/elpa.scm | 101 +++-- tests/lzlib.scm| 3 +- 9 files changed, 111 insertions(+), 97 deletions(-)
branch master updated: gnu: asymptote: Add missing input.
This is an automated email from the git hooks/post-receive script.
ngz pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 584e46b gnu: asymptote: Add missing input.
584e46b is described below
commit 584e46b1e03c18755ee4527164d751ddb20d8d18
Author: Nicolas Goaziou
AuthorDate: Thu Jan 16 22:39:23 2020 +0100
gnu: asymptote: Add missing input.
* gnu/packages/plotutils.scm (asymptote)[inputs]: Add missing input for GUI.
---
gnu/packages/plotutils.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 7d9b2d8..237baa9 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -217,6 +217,7 @@ colors, styles, options and details.")
("libgc" ,libgc)
("python" ,python)
("python-cson" ,python-cson)
+ ("python-numpy" ,python-numpy)
("python-pyqt" ,python-pyqt)
("readline" ,readline)
("zlib" ,zlib)))
branch master updated: gnu: Add python-git-multimail.
This is an automated email from the git hooks/post-receive script.
cbaines pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new add8d50 gnu: Add python-git-multimail.
add8d50 is described below
commit add8d50911f55464a1ecd003521997d6c7d912f3
Author: Christopher Baines
AuthorDate: Mon Jan 6 20:09:51 2020 +
gnu: Add python-git-multimail.
* gnu/packages/version-control.scm (python-git-multimail): New variable.
---
gnu/packages/version-control.scm | 42
1 file changed, 42 insertions(+)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 27254f3..e0fe4e2 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -73,6 +73,7 @@
#:use-module (gnu packages guile)
#:use-module (gnu packages image)
#:use-module (gnu packages linux)
+ #:use-module (gnu packages mail)
#:use-module (gnu packages maths)
#:use-module (gnu packages nano)
#:use-module (gnu packages ncurses)
@@ -784,6 +785,47 @@ collaboration using typical untrusted file hosts or
services.")
a built-in cache to decrease server I/O pressure.")
(license license:gpl2)))
+(define-public python-git-multimail
+ (package
+(name "python-git-multimail")
+(version "1.5.0.post1")
+(source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "git-multimail" version))
+ (sha256
+(base32
+ "1zkrbsa70anwpw86ysfwalrb7nsr064kygfiyikyq1pl9pcl969y"
+(build-system python-build-system)
+(arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "git-multimail/git_multimail.py"
+ (("GIT_EXECUTABLE = 'git'")
+(string-append "GIT_EXECUTABLE = '"
+ (assoc-ref inputs "git") "/bin/git"
+ "'"))
+ (("/usr/sbin/sendmail")
+(string-append (assoc-ref inputs "sendmail")
+ "/usr/sbin/sendmail")))
+ #t)
+(inputs
+ `(("git" ,git)
+ ("sendmail" ,sendmail)))
+(home-page "https://github.com/git-multimail/git-multimail;)
+(synopsis "Send notification emails for Git pushes")
+(description
+ "This hook sends emails describing changes introduced by pushes to a Git
+repository. For each reference that was changed, it emits one ReferenceChange
+email summarizing how the reference was changed, followed by one Revision
+email for each new commit that was introduced by the reference change.
+
+This script is designed to be used as a post-receive hook in a Git
+repository")
+(license license:gpl2)))
+
(define-public python-ghp-import
(package
(name "python-ghp-import")
branch master updated: gnu: translate-shell: Fix emacs install phase.
This is an automated email from the git hooks/post-receive script. efraim pushed a commit to branch master in repository guix. The following commit(s) were added to refs/heads/master by this push: new 6e02ef7 gnu: translate-shell: Fix emacs install phase. 6e02ef7 is described below commit 6e02ef79f574855db28e23d891db690925119e7b Author: Efraim Flashner AuthorDate: Thu Jan 16 22:00:12 2020 +0200 gnu: translate-shell: Fix emacs install phase. * gnu/packages/dictionaries.scm (translate-shell)[arguments]: Update the 'emacs-install phase to install the .el files into the correct folder. --- gnu/packages/dictionaries.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 1aa54d9..af6cef7 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès -;;; Copyright © 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice @@ -283,8 +283,7 @@ and a Python library.") (add-after 'install 'emacs-install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -(dest (string-append out "/share/emacs/site-lisp/guix.d/" - ,name "-" ,version)) +(dest (string-append out "/share/emacs/site-lisp")) (emacs (string-append (assoc-ref inputs "emacs") "/bin/emacs"))) (install-file "google-translate-mode.el" dest) (emacs-generate-autoloads ,name dest)
02/04: gnu: ecasound: Update to 2.9.3.
nckx pushed a commit to branch master
in repository guix.
commit ec67d06996baa818ac2e8111a293b0f944e7288a
Author: Tobias Geerinckx-Rice
AuthorDate: Thu Jan 16 01:46:21 2020 +0100
gnu: ecasound: Update to 2.9.3.
* gnu/packages/audio.scm (ecasound): Update to 2.9.3.
---
gnu/packages/audio.scm | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 997326d..07407d8 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3988,17 +3988,17 @@ default and preferred audio driver but also supports
native drivers like ALSA.")
(define-public ecasound
(package
(name "ecasound")
-(version "2.9.2")
+(version "2.9.3")
(source (origin
(method url-fetch)
(uri (string-append "https://nosignal.fi/download/ecasound-;
version ".tar.gz"))
(sha256
- (base32
"15rcs28fq2wfvfs66p5na7adq88b55qszbhshpizgdbyqzgr2jf1"
+ (base32
"1m7njfjdb7sqf0lhgc4swihgdr4snkg8v02wcly08wb5ar2fr2s6"
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)))
-;; would be nice to add mikmod to inputs if that gets packaged
-;; eventually
+;; It would be nice to add mikmod to inputs if that gets packaged
+;; eventually.
(inputs `(("alsa-lib" ,alsa-lib)
("jack" ,jack-1)
("mpg123" ,mpg123)
01/04: gnu: ecasound: Use HTTPS home page.
nckx pushed a commit to branch master
in repository guix.
commit 694c29762439de70845f07e845b4281299203e7a
Author: Tobias Geerinckx-Rice
AuthorDate: Thu Jan 16 01:46:11 2020 +0100
gnu: ecasound: Use HTTPS home page.
* gnu/packages/audio.scm (ecasound)[source, home-page]: Use HTTPS.
---
gnu/packages/audio.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 2b0e68f..997326d 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3991,7 +3991,7 @@ default and preferred audio driver but also supports
native drivers like ALSA.")
(version "2.9.2")
(source (origin
(method url-fetch)
- (uri (string-append "http://nosignal.fi/download/ecasound-;
+ (uri (string-append "https://nosignal.fi/download/ecasound-;
version ".tar.gz"))
(sha256
(base32
"15rcs28fq2wfvfs66p5na7adq88b55qszbhshpizgdbyqzgr2jf1"
@@ -4012,7 +4012,7 @@ default and preferred audio driver but also supports
native drivers like ALSA.")
("ncurses" ,ncurses)
("ladspa" ,ladspa)
("lilv" ,lilv)))
-(home-page "http://nosignal.fi/ecasound/index.php;)
+(home-page "https://nosignal.fi/ecasound/index.php;)
(synopsis "Multitrack audio processing")
(description "Ecasound is a software package designed for multitrack audio
processing. It can be used for simple tasks like audio playback, recording and
03/04: gnu: handbrake: Update to 1.3.1.
nckx pushed a commit to branch master in repository guix. commit c301dcef1c4165cf06611ad24b3ca4b5fb1cdac9 Author: Tobias Geerinckx-Rice AuthorDate: Thu Jan 16 01:58:15 2020 +0100 gnu: handbrake: Update to 1.3.1. * gnu/packages/video.scm (handbrake): Update to 1.3.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2b3b9d9..1a17279 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2682,14 +2682,14 @@ supported players in addition to this package.") (define-public handbrake (package (name "handbrake") -(version "1.3.0") +(version "1.3.1") (source (origin (method url-fetch) (uri (string-append "https://download.handbrake.fr/releases/; version "/HandBrake-" version "-source.tar.bz2")) (sha256 (base32 -"15hxncswmaj62hb40fxixsa6d519zb712z9xbdq979q4rasjxa59")) +"09rcrq0kjs1lc1as7w3glbpbfvzldwpx3xv0pfmkn4pl7acxw1f0")) (modules '((guix build utils))) (snippet ;; Remove "contrib" and source not necessary for
04/04: gnu: cgit: Update to 1.2.2.
nckx pushed a commit to branch master
in repository guix.
commit ef201cfee7daca9250ecd416ba255966ecd9194a
Author: Tobias Geerinckx-Rice
AuthorDate: Thu Jan 16 02:08:14 2020 +0100
gnu: cgit: Update to 1.2.2.
* gnu/packages/version-control.scm (cgit): Update to 1.2.2.
[inputs]: Update git-source to 2.25.0.
---
gnu/packages/version-control.scm | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 417bccf..27254f3 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -678,7 +678,8 @@ collaboration using typical untrusted file hosts or
services.")
(define-public cgit
(package
(name "cgit")
-(version "1.2.1")
+;; Update the ‘git-source’ input as well.
+(version "1.2.2")
(source (origin
(method url-fetch)
(uri (string-append
@@ -686,7 +687,7 @@ collaboration using typical untrusted file hosts or
services.")
version ".tar.xz"))
(sha256
(base32
-"1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w"
+"0dmjsisigjz5k4gw7gm55qhm3wazzbm4cg7a5dwf0gqg9nacx5rz"
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; XXX: fail to build the in-source git.
@@ -764,11 +765,11 @@ collaboration using typical untrusted file hosts or
services.")
("git-source"
,(origin
(method url-fetch)
- ;; XXX CGit is currently incompatible with Git > 2.18.
- (uri "mirror://kernel.org/software/scm/git/git-2.18.2.tar.xz")
+ ;; cgit is tightly bound to git. Use GIT_VER from the Makefile,
+ ;; which may not match the current (package-version git).
+ (uri "mirror://kernel.org/software/scm/git/git-2.25.0.tar.xz")
(sha256
-(base32
- "1gmcz5k8sa6phzhhv6zjl8izbyqnxcdb8ns8kd2czyak0g409vrq"
+(base32 "1l58v42aazj0x9276gk8r9mwyl9pgp9w99aakz4xfhzv7wd2jq60"
("openssl" ,openssl)
("groff" ,groff)
("python" ,python)
branch master updated (ad83280 -> ef201cf)
nckx pushed a change to branch master in repository guix. from ad83280 gnu: global: Update to 6.6.4. new 694c297 gnu: ecasound: Use HTTPS home page. new ec67d06 gnu: ecasound: Update to 2.9.3. new c301dce gnu: handbrake: Update to 1.3.1. new ef201cf gnu: cgit: Update to 1.2.2. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/audio.scm | 12 ++-- gnu/packages/version-control.scm | 13 +++-- gnu/packages/video.scm | 4 ++-- 3 files changed, 15 insertions(+), 14 deletions(-)
01/07: gnu: ethtool: Update to 5.4.
nckx pushed a commit to branch master in repository guix. commit 070dc95066ec70c4227ae178d90da9ae69badad1 Author: Tobias Geerinckx-Rice AuthorDate: Wed Jan 15 01:07:23 2020 +0100 gnu: ethtool: Update to 5.4. * gnu/packages/networking.scm (ethtool): Update to 5.4. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 28c683e..5f03c8f 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -427,14 +427,14 @@ receiving NDP messages.") (define-public ethtool (package (name "ethtool") -(version "5.3") +(version "5.4") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/network/" "ethtool/ethtool-" version ".tar.xz")) (sha256 (base32 -"1i14zrg4a84zjpwvqi8an0zx0hm06g614a79zc2syrkhrvdw1npk" +"0srbqp4a3x9ryrbm5q854375y04ni8j0bmsrl89nmsyn4x4ixy12" (build-system gnu-build-system) (home-page "https://www.kernel.org/pub/software/network/ethtool/;) (synopsis "Display or change Ethernet device settings")
05/07: gnu: mcelog: Update to 168.
nckx pushed a commit to branch master
in repository guix.
commit 6cfbb7cb830d778d467b62636adc4323f324252e
Author: Tobias Geerinckx-Rice
AuthorDate: Wed Jan 15 03:28:17 2020 +0100
gnu: mcelog: Update to 168.
* gnu/packages/linux.scm (mcelog): Update to 168.
---
gnu/packages/linux.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index bd45464..62c0249 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4764,14 +4764,14 @@ the default @code{nsswitch} and the experimental
@code{umich_ldap}.")
(define-public mcelog
(package
(name "mcelog")
-(version "154")
+(version "168")
(source (origin
(method url-fetch)
(uri (string-append "https://git.kernel.org/cgit/utils/cpu/mce/;
"mcelog.git/snapshot/v" version ".tar.gz"))
(sha256
(base32
-"07628cr05f50m7lsvw26wxlnb7qcl0x6rymdpp5spqzhz91l58p3"))
+"1c4faayg1gcm3002b2fdrfnv76z92mvfzccvx8w9crjp0d17sp24"))
(file-name (string-append name "-" version ".tar.gz"))
(modules '((guix build utils)))
(snippet
02/07: gnu: noweb: Use HTTPS home page.
nckx pushed a commit to branch master in repository guix. commit 2c31cf87e3f8476c45e32ced1534f5a7bc2d01b5 Author: Tobias Geerinckx-Rice AuthorDate: Wed Jan 15 01:21:15 2020 +0100 gnu: noweb: Use HTTPS home page. * gnu/packages/noweb.scm (noweb)[home-page, license]: Use HTTPS. --- gnu/packages/noweb.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/noweb.scm b/gnu/packages/noweb.scm index 0954e79..0a0010c 100644 --- a/gnu/packages/noweb.scm +++ b/gnu/packages/noweb.scm @@ -82,7 +82,7 @@ (string-append "TEXINPUTS=" out "/share/texmf/tex/latex"))) #:tests? #f)) ; no tests -(home-page "http://www.cs.tufts.edu/~nr/noweb/;) +(home-page "https://www.cs.tufts.edu/~nr/noweb/;) (synopsis "Literate programming tool") (description "Noweb is designed to meet the needs of literate programmers while @@ -92,4 +92,4 @@ with other literate-programming tools. noweb uses 5 control sequences to WEB's 27. The noweb manual is only 4 pages; an additional page explains how to customize its LaTeX output. noweb works “out of the box” with any programming language, and supports TeX, LaTeX, HTML, and troff back ends.") -(license (fsf-free "http://www.cs.tufts.edu/~nr/noweb/#copyright; +(license (fsf-free "https://www.cs.tufts.edu/~nr/noweb/#copyright;
branch master updated (ffe58d1 -> ad83280)
nckx pushed a change to branch master in repository guix. from ffe58d1 gnu: Add python2-objgraph. new 070dc95 gnu: ethtool: Update to 5.4. new 2c31cf8 gnu: noweb: Use HTTPS home page. new bd9f588 gnu: noweb: Embed store references to external binaries. new dc26c8c gnu: noweb: Update to 2.12. new 6cfbb7c gnu: mcelog: Update to 168. new a82b600 gnu: multipath-tools: Update to 0.8.3. new ad83280 gnu: global: Update to 6.6.4. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/code.scm | 4 ++-- gnu/packages/linux.scm | 8 gnu/packages/networking.scm | 4 ++-- gnu/packages/noweb.scm | 49 + 4 files changed, 40 insertions(+), 25 deletions(-)
07/07: gnu: global: Update to 6.6.4.
nckx pushed a commit to branch master
in repository guix.
commit ad83280f500ec6c2fe279ea002fb01c168732445
Author: Tobias Geerinckx-Rice
AuthorDate: Thu Jan 16 01:41:41 2020 +0100
gnu: global: Update to 6.6.4.
* gnu/packages/code.scm (global): Update to 6.6.4.
---
gnu/packages/code.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index 2e6b50d..6af1d41 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -114,14 +114,14 @@ highlighting your own code that seemed comprehensible
when you wrote it.")
(define-public global ; a global variable
(package
(name "global")
-(version "6.6.3")
+(version "6.6.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/global/global-"
version ".tar.gz"))
(sha256
(base32
- "0735pj47dnspf20n0j1px24p59nwjinlmlb2n32ln1hvdkprivnb"
+ "1515642wsjz7x3rsgaqk4sc7n0z2znl7idsk8jz8wgy5aswqqzlq"
(build-system gnu-build-system)
(inputs `(("ncurses" ,ncurses)
("libltdl" ,libltdl)
03/07: gnu: noweb: Embed store references to external binaries.
nckx pushed a commit to branch master
in repository guix.
commit bd9f588b37a86845604fbe8506bdfe162ba578b3
Author: Tobias Geerinckx-Rice
AuthorDate: Wed Jan 15 01:31:20 2020 +0100
gnu: noweb: Embed store references to external binaries.
* gnu/packages/noweb.scm (noweb)[argument]: Add ‘bind-early’ phase.
[inputs]: Add perl.
---
gnu/packages/noweb.scm | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/noweb.scm b/gnu/packages/noweb.scm
index 0a0010c..2fcd24c 100644
--- a/gnu/packages/noweb.scm
+++ b/gnu/packages/noweb.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Ludovic Courtès
+;;; Copyright © 2020 Tobias Geerinckx-Rice
;;;
;;; This file is part of GNU Guix.
;;;
@@ -20,7 +21,8 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
- #:use-module (guix licenses))
+ #:use-module (guix licenses)
+ #:use-module (gnu packages perl))
(define-public noweb
(package
@@ -37,6 +39,18 @@
(arguments
'(#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'bind-early
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+(bin (string-append out "/bin")))
+ (substitute* (list "src/lib/nwmtime"
+ "src/shell/htmltoc")
+ (("exec perl ")
+ (format #f "exec ~a " (which "perl"
+ (substitute* "src/shell/noweb"
+ ((" cpif ")
+ (format #f " ~a/cpif " bin)))
+ #t)))
(add-before 'install 'pre-install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
@@ -82,6 +96,8 @@
(string-append "TEXINPUTS=" out
"/share/texmf/tex/latex")))
#:tests? #f)) ; no tests
+(inputs
+ `(("perl" ,perl)))
(home-page "https://www.cs.tufts.edu/~nr/noweb/;)
(synopsis "Literate programming tool")
(description
06/07: gnu: multipath-tools: Update to 0.8.3.
nckx pushed a commit to branch master in repository guix. commit a82b6003e6ed8393212593a3fd233e22949f1460 Author: Tobias Geerinckx-Rice AuthorDate: Wed Jan 15 03:52:03 2020 +0100 gnu: multipath-tools: Update to 0.8.3. * gnu/packages/linux.scm (multipath-tools): Update to 0.8.3. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 62c0249..377398b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3662,7 +3662,7 @@ arrays when needed.") (define-public multipath-tools (package (name "multipath-tools") -(version "0.8.2") +(version "0.8.3") (source (origin (method url-fetch) (uri (string-append "https://git.opensvc.com/?p=multipath-tools/; @@ -3670,7 +3670,7 @@ arrays when needed.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 -"0kb4mhzwyygdbikikmby6hj39pb3nrzv05v526c75wnycwnpxg31")) +"1c6ay97wlfv1fl0y8hcfpxhkps14hlnw9gzmj7884micsp7pa9yv")) (modules '((guix build utils))) (snippet '(begin
04/07: gnu: noweb: Update to 2.12.
nckx pushed a commit to branch master
in repository guix.
commit dc26c8c533eec6bbcfecbfea00add44cadf2abfb
Author: Tobias Geerinckx-Rice
AuthorDate: Wed Jan 15 01:33:38 2020 +0100
gnu: noweb: Update to 2.12.
* gnu/packages/noweb.scm (noweb): Update to 2.12.
[source]: Switch to git repository.
[arguments]: Remove obsolete substitution.
[license]: Add BSD-2.
---
gnu/packages/noweb.scm | 29 ++---
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/noweb.scm b/gnu/packages/noweb.scm
index 2fcd24c..77e88cc 100644
--- a/gnu/packages/noweb.scm
+++ b/gnu/packages/noweb.scm
@@ -19,7 +19,7 @@
(define-module (gnu packages noweb)
#:use-module (guix packages)
- #:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix licenses)
#:use-module (gnu packages perl))
@@ -27,14 +27,16 @@
(define-public noweb
(package
(name "noweb")
-(version "2.11b")
-(source (origin
- (method url-fetch)
- (uri (string-append "ftp://www.eecs.harvard.edu/pub/nr/noweb-;
- version ".tgz"))
- (sha256
- (base32
- "10hdd6mrk26kyh4bnng4ah5h1pnanhsrhqa7qwqy6dyv3rng44y9"
+(version "2.12")
+(source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nrnrnr/noweb;)
+ (commit (string-append "v" (string-join (string-split version #\.)
+ "_")
+ (sha256
+(base32 "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95"
(build-system gnu-build-system)
(arguments
'(#:phases
@@ -83,11 +85,6 @@
(lambda _
;; Jump in the source.
(chdir "src")
-
- ;; The makefile reads "source: FAQ", but FAQ isn't
- ;; available.
- (substitute* "Makefile"
- (("FAQ") ""))
#t)))
#:make-flags (let ((out (assoc-ref %outputs "out")))
(list (string-append "BIN=" out "/bin")
@@ -108,4 +105,6 @@ with other literate-programming tools. noweb uses 5
control sequences to
WEB's 27. The noweb manual is only 4 pages; an additional page explains how
to customize its LaTeX output. noweb works “out of the box” with any
programming language, and supports TeX, LaTeX, HTML, and troff back ends.")
-(license (fsf-free "https://www.cs.tufts.edu/~nr/noweb/#copyright;
+(license
+ (list bsd-2; dual-licenced under this and…
+ (fsf-free "https://www.cs.tufts.edu/~nr/noweb/#copyright;)
11/11: gnu: Add python2-objgraph.
mbakke pushed a commit to branch master in repository guix. commit ffe58d1d44bb6e9eff3c489b07649426280e326a Author: Marius Bakke AuthorDate: Thu Jan 16 18:44:32 2020 +0100 gnu: Add python2-objgraph. * gnu/packages/python-xyz.scm (python2-objgraph): New public variable. --- gnu/packages/python-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5d20144..76d3880 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10006,6 +10006,9 @@ are synchronized with data exchanges on \"channels\".") graphviz.") (license license:expat))) +(define-public python2-objgraph + (package-with-python2 python-objgraph)) + (define-public python-gevent (package (name "python-gevent")
08/11: gnu: caribou: Build with Python 3.
mbakke pushed a commit to branch master
in repository guix.
commit 9f7f5ba2d26b4e64d808419ee2212a302ec81a59
Author: Marius Bakke
AuthorDate: Thu Jan 16 18:25:41 2020 +0100
gnu: caribou: Build with Python 3.
* gnu/packages/gnome.scm (caribou)[native-inputs]: Change from PYTHON-2 to
PYTHON.
[inputs]: Change from PYTHON2-PYGOBJECT to PYTHON-PYGOBJECT.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9cf3cbb..064ce86 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6376,7 +6376,7 @@ Evolution (hence the name), but is now used by other
packages as well.")
("gobject-introspection" ,gobject-introspection)
("intltool" ,intltool)
("pkg-config" ,pkg-config)
- ("python" ,python-2) ; incompatible with Python 3 (print syntax)
+ ("python" ,python)
("vala" ,vala)
("xsltproc" ,libxslt)))
(propagated-inputs
@@ -6389,7 +6389,7 @@ Evolution (hence the name), but is now used by other
packages as well.")
`(("clutter" ,clutter)
("dconf" ,dconf)
("gtk+-2" ,gtk+-2)
- ("python-pygobject" ,python2-pygobject)))
+ ("python-pygobject" ,python-pygobject)))
(synopsis "Text entry and UI navigation application")
(home-page "https://wiki.gnome.org/Projects/Caribou;)
(description
07/11: gnu: libpeas: Update to 1.24.1.
mbakke pushed a commit to branch master
in repository guix.
commit f2d56e39934d14f2107ede8598e228c461c7b44d
Author: Marius Bakke
AuthorDate: Thu Jan 16 17:43:46 2020 +0100
gnu: libpeas: Update to 1.24.1.
* gnu/packages/gnome.scm (libpeas): Update to 1.24.1.
[build-system]: Change to MESON-BUILD-SYSTEM.
[arguments]: New field.
[native-inputs]: Remove INTLTOOL. ADD GETTEXT-MINIMAL and
XORG-SERVER-FOR-TESTS.
---
gnu/packages/gnome.scm | 22 +-
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a6a8307..9cf3cbb 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -34,7 +34,7 @@
;;; Copyright © 2018 Björn Höfling
;;; Copyright © 2018, 2019 Timothy Sample
;;; Copyright © 2019 Danny Milosavljevic
-;;; Copyright © 2019 Marius Bakke
+;;; Copyright © 2019, 2020 Marius Bakke
;;; Copyright © 2019 Florian Pelz
;;; Copyright © 2019 Giacomo Leidi
;;; Copyright © 2019 Jelle Licht
@@ -1883,7 +1883,7 @@ some form of information without getting in the user's
way.")
(define-public libpeas
(package
(name "libpeas")
-(version "1.22.0")
+(version "1.24.1")
(source
(origin
(method url-fetch)
@@ -1892,8 +1892,19 @@ some form of information without getting in the user's
way.")
name "-" version ".tar.xz"))
(sha256
(base32
-"0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv"
-(build-system gnu-build-system)
+"1162dr7smmfb02czmhshr0f93hqj7w0nw29bys5lzfvwarxcyflw"
+(build-system meson-build-system)
+(arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'start-xserver
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((xorg-server (assoc-ref inputs "xorg-server"))
+ (disp ":1"))
+ (setenv "DISPLAY" disp)
+ ;; Tests require a running X server.
+ (system (format #f "~a/bin/Xvfb ~a &" xorg-server disp))
+ #t))
(inputs
`(("gtk+" ,gtk+)
("glade" ,glade3)
@@ -1901,9 +1912,10 @@ some form of information without getting in the user's
way.")
("python-pygobject" ,python-pygobject)))
(native-inputs
`(("pkg-config" ,pkg-config)
+ ("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
- ("intltool" ,intltool)))
+ ("xorg-server" ,xorg-server-for-tests)))
(propagated-inputs
;; The .pc file "Requires" gobject-introspection.
`(("gobject-introspection" ,gobject-introspection)))
branch master updated (1c70205 -> ffe58d1)
mbakke pushed a change to branch master in repository guix. from 1c70205 gnu: rust-scopeguard-1.0: Don't hide package. new bd8c62d gnu: python-zipp: Remove redundant inputs. new cbd3e73 gnu: poetry: Remove redundant input. new 7699e32 gnu: kentutils: Build with OpenSSL 1.0. new fdd0c36 gnu: python-packaging: Fix test failures on non-x86_64 architectures. new 3dfb3d4 gnu: python-importlib-metata: Delay python2 variant. new 7152a71 gnu: ldb: Downgrade to 1.5.6. new f2d56e3 gnu: libpeas: Update to 1.24.1. new 9f7f5ba gnu: caribou: Build with Python 3. new 34aa914 gnu: python-graphviz: Update to 0.13.2. new eebc03b gnu: python-objgraph: Update to 3.4.1. new ffe58d1 gnu: Add python2-objgraph. The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk | 1 + gnu/packages/bioinformatics.scm| 2 +- gnu/packages/gnome.scm | 26 ++--- gnu/packages/graphviz.scm | 22 +++- .../patches/python-packaging-test-arch.patch | 65 ++ gnu/packages/python-compression.scm| 15 +++-- gnu/packages/python-xyz.scm| 10 +++- gnu/packages/samba.scm | 4 +- 8 files changed, 124 insertions(+), 21 deletions(-) create mode 100644 gnu/packages/patches/python-packaging-test-arch.patch
04/11: gnu: python-packaging: Fix test failures on non-x86_64 architectures.
mbakke pushed a commit to branch master in repository guix. commit fdd0c36963a62577f7a8f99a44f79a7330a0b151 Author: Marius Bakke AuthorDate: Thu Jan 16 17:20:22 2020 +0100 gnu: python-packaging: Fix test failures on non-x86_64 architectures. * gnu/packages/patches/python-packaging-test-arch.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-xyz.scm (python-packaging)[source](patches): New field. --- gnu/local.mk | 1 + .../patches/python-packaging-test-arch.patch | 65 ++ gnu/packages/python-xyz.scm| 1 + 3 files changed, 67 insertions(+) diff --git a/gnu/local.mk b/gnu/local.mk index e77af87..e2a837f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1319,6 +1319,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ + %D%/packages/patches/python-packaging-test-arch.patch\ %D%/packages/patches/python-paste-remove-timing-test.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ diff --git a/gnu/packages/patches/python-packaging-test-arch.patch b/gnu/packages/patches/python-packaging-test-arch.patch new file mode 100644 index 000..df80a62 --- /dev/null +++ b/gnu/packages/patches/python-packaging-test-arch.patch @@ -0,0 +1,65 @@ +Fix tests that are "hard coded" to expect x86_64 output by mocking the platform interface. + +Submitted upstream: +https://github.com/pypa/packaging/pull/176 + +diff --git a/tests/test_tags.py b/tests/test_tags.py +index 1eacf68..0a3f1b4 100644 +--- a/tests/test_tags.py b/tests/test_tags.py +@@ -435,37 +435,43 @@ class TestManylinuxPlatform: + linux_platform = list(tags._linux_platforms(is_32bit=False)) + assert linux_platform == ["linux_x86_64"] + +-def test_linux_platforms_manylinux1(self, monkeypatch): ++def test_linux_platforms_manylinux1(self, is_x86, monkeypatch): + monkeypatch.setattr( + tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux1" + ) +-if platform.system() != "Linux": ++if platform.system() != "Linux" or not is_x86: + monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64") ++monkeypatch.setattr(platform, "machine", lambda: "x86_64") + platforms = list(tags._linux_platforms(is_32bit=False)) +-assert platforms == ["manylinux1_x86_64", "linux_x86_64"] ++arch = platform.machine() ++assert platforms == ["manylinux1_" + arch, "linux_" + arch] + +-def test_linux_platforms_manylinux2010(self, monkeypatch): ++def test_linux_platforms_manylinux2010(self, is_x86, monkeypatch): + monkeypatch.setattr( + tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux2010" + ) +-if platform.system() != "Linux": ++if platform.system() != "Linux" or not is_x86: + monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64") ++monkeypatch.setattr(platform, "machine", lambda: "x86_64") + platforms = list(tags._linux_platforms(is_32bit=False)) +-expected = ["manylinux2010_x86_64", "manylinux1_x86_64", "linux_x86_64"] ++arch = platform.machine() ++expected = ["manylinux2010_" + arch, "manylinux1_" + arch, "linux_" + arch] + assert platforms == expected + +-def test_linux_platforms_manylinux2014(self, monkeypatch): ++def test_linux_platforms_manylinux2014(self, is_x86, monkeypatch): + monkeypatch.setattr( + tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux2014" + ) +-if platform.system() != "Linux": ++if platform.system() != "Linux" or not is_x86: + monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64") ++monkeypatch.setattr(platform, "machine", lambda: "x86_64") + platforms = list(tags._linux_platforms(is_32bit=False)) ++arch = platform.machine() + expected = [ +-"manylinux2014_x86_64", +-"manylinux2010_x86_64", +-"manylinux1_x86_64", +-"linux_x86_64", ++"manylinux2014_" + arch, ++"manylinux2010_" + arch, ++"manylinux1_" + arch, ++"linux_" + arch, + ] + assert platforms == expected + diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 31ea51b..ee2fc11 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13054,6 +13054,7 @@ several utilities, as well as an API for building localization tools.")
09/11: gnu: python-graphviz: Update to 0.13.2.
mbakke pushed a commit to branch master
in repository guix.
commit 34aa9144786658498ff8d4b6b36ac0ae5bf1d454
Author: Marius Bakke
AuthorDate: Thu Jan 16 18:42:27 2020 +0100
gnu: python-graphviz: Update to 0.13.2.
* gnu/packages/graphviz.scm (python-graphviz): Update to 0.13.2.
[native-inputs]: Add GRAPHVIZ, PYTHON-MOCK, PYTHON-PYTEST,
PYTHON-PYTEST-COV,
and PYTHON-PYTEST-MOCK.
[arguments]: Replace 'check' phase.
---
gnu/packages/graphviz.scm | 22 +++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index eb4b211..365fe1a 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice
;;; Copyright © 2017 Gábor Boskovits
;;; Copyright © 2018 Mathieu Lirzin
+;;; Copyright © 2020 Marius Bakke
;;;
;;; This file is part of GNU Guix.
;;;
@@ -166,16 +167,31 @@ interfaces for other technical domains.")
(define-public python-graphviz
(package
(name "python-graphviz")
-(version "0.8.4")
+(version "0.13.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "graphviz" version ".zip"))
(sha256
(base32
-"17v8h7j2yz8hy1jf7q8p0ik8dmf32m58lc6v11x7aqc4pnfa2n29"
+"009alrilzx0v7kl41khbq7k6k8b8pxyvbsi1b1ai933f6kpbxb30"
(build-system python-build-system)
+(arguments
+ '(#:phases (modify-phases %standard-phases
+ (replace 'check
+(lambda* (#:key tests #:allow-other-keys)
+ (if tests
+ (invoke "pytest" "-vv")
+ (format #t "test suite not run~%"))
+ #t)
(native-inputs
- `(("unzip" ,unzip)))
+ `(("unzip" ,unzip)
+
+ ;; For tests.
+ ("graphviz" ,graphviz)
+ ("python-mock" ,python-mock)
+ ("python-pytest" ,python-pytest)
+ ("python-pytest-cov" ,python-pytest-cov)
+ ("python-pytest-mock" ,python-pytest-mock)))
(home-page "https://github.com/xflr6/graphviz;)
(synopsis "Simple Python interface for Graphviz")
(description
05/11: gnu: python-importlib-metata: Delay python2 variant.
mbakke pushed a commit to branch master
in repository guix.
commit 3dfb3d44f316f95401558fb32b3b3e4e464f419c
Author: Marius Bakke
AuthorDate: Thu Jan 16 17:22:28 2020 +0100
gnu: python-importlib-metata: Delay python2 variant.
This is a follow-up to commit 5efa04dd935ecf6f7803501b1b8952810f4330ad.
* gnu/packages/python-xyz.scm (python-importlib-metadata)[properties]: New
field.
---
gnu/packages/python-xyz.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ee2fc11..6bb2a5a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5008,6 +5008,7 @@ its top-level name. This functionality intends to
replace most uses of
@code{pkg_resources} entry point API and metadata API. Along with
@code{importlib.resources} in Python 3.7 and newer, this can eliminate the
need to use the older and less efficient @code{pkg_resources} package.")
+(properties `((python2-variant . ,(delay python2-importlib-metadata
(license license:asl2.0)))
(define-public python2-importlib-metadata
03/11: gnu: kentutils: Build with OpenSSL 1.0.
mbakke pushed a commit to branch master
in repository guix.
commit 7699e3228960457707f103e8e9e0db60de3891c5
Author: Marius Bakke
AuthorDate: Wed Jan 15 22:18:35 2020 +0100
gnu: kentutils: Build with OpenSSL 1.0.
* gnu/packages/bioinformatics.scm (kentutils)[inputs]: Change from OPENSSL
to
OPENSSL-1.0.
---
gnu/packages/bioinformatics.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 32eea9d..381c9df 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -11322,7 +11322,7 @@ models. TADbit is complemented by TADkit for
visualizing 3D models.")
("libpng" ,libpng)
("mariadb" ,mariadb "lib")
("mariadb-dev" ,mariadb "dev")
- ("openssl" ,openssl)))
+ ("openssl" ,openssl-1.0)))
(home-page "http://genome.cse.ucsc.edu/index.html;)
(synopsis "Assorted bioinformatics utilities")
(description "This package provides the kentUtils, a selection of
10/11: gnu: python-objgraph: Update to 3.4.1.
mbakke pushed a commit to branch master
in repository guix.
commit eebc03bbb827ec8def27eee9dd79a5bd70534b51
Author: Marius Bakke
AuthorDate: Thu Jan 16 18:44:09 2020 +0100
gnu: python-objgraph: Update to 3.4.1.
* gnu/packages/python-xyz.scm (python-objgraph): Update to 3.4.1.
---
gnu/packages/python-xyz.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 6bb2a5a..5d20144 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9985,14 +9985,14 @@ are synchronized with data exchanges on \"channels\".")
(define-public python-objgraph
(package
(name "python-objgraph")
-(version "3.4.0")
+(version "3.4.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "objgraph" version))
(sha256
(base32
- "184m09am5gpbqfaiy7l0hwh476mczbrly1dffs0rw2p1d1i2q32a"
+ "19qmqsh984zq1rzzjy4vqnmviaqnymcyl8h7z99pnicbgwnm2adz"
(build-system python-build-system)
(propagated-inputs
`(("python-graphviz" ,python-graphviz)))
06/11: gnu: ldb: Downgrade to 1.5.6.
mbakke pushed a commit to branch master in repository guix. commit 7152a7143186d7540c1f67decb7842c7a103903b Author: Marius Bakke AuthorDate: Thu Jan 16 17:35:41 2020 +0100 gnu: ldb: Downgrade to 1.5.6. 1.5.6 is actually newer and fixes problems with Python 3.8. * gnu/packages/samba.scm (ldb): Downgrade to 1.5.6. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 8a1fad5..6cd875d 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -362,14 +362,14 @@ many event types, including timers, signals, and the classic file descriptor eve (define-public ldb (package (name "ldb") -(version "1.6.3") +(version "1.5.6") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/ldb/ldb-; version ".tar.gz")) (sha256 (base32 -"01livdy3g073bm6xnc8zqnqrxg53sw8q66d1903z62hd6g87whsa")) +"0nwpkqidsna4yz3vhjzzadm4hpviwnyk80yml8ay82gi1d6lg0pz")) (modules '((guix build utils))) (snippet '(begin
02/11: gnu: poetry: Remove redundant input.
mbakke pushed a commit to branch master
in repository guix.
commit cbd3e73f06ed0e47bd228f51ce0d88b5bc4d8d2c
Author: Marius Bakke
AuthorDate: Wed Jan 15 21:49:37 2020 +0100
gnu: poetry: Remove redundant input.
* gnu/packages/python-xyz.scm (poetry)[propagated-inputs]: Remove
PYTHON-PATHLIB2.
---
gnu/packages/python-xyz.scm | 1 -
1 file changed, 1 deletion(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 054974d..31ea51b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10600,7 +10600,6 @@ database, file, dict stores. Cachy supports python
versions 2.7+ and 3.2+.")
("python-html5lib" ,python-html5lib)
("python-jsonschema" ,python-jsonschema)
("python-msgpack" ,python-msgpack)
- ("python-pathlib2" ,python-pathlib2)
("python-pkginfo" ,python-pkginfo)
("python-pyparsing" ,python-pyparsing)
("python-pyrsistent" ,python-pyrsistent)
01/11: gnu: python-zipp: Remove redundant inputs.
mbakke pushed a commit to branch master
in repository guix.
commit bd8c62dbd1ef37c5f1a49d7100ca99b1f6f67749
Author: Marius Bakke
AuthorDate: Wed Jan 15 21:42:15 2020 +0100
gnu: python-zipp: Remove redundant inputs.
The Python 3 variant do not need these.
* gnu/packages/python-compression.scm (python-zipp)[native-inputs]: Remove
PYTHON-CONTEXTLIB2, PYTHON-PATHLIB2, and PYTHON-UNITTEST2.
[properties]: New field.
(python2-zipp)[native-inputs]: Add PYTHON2-CONTEXTLIB2, PYTHON2-PATHLIB2,
and
PYTHON2-UNITTEST2.
---
gnu/packages/python-compression.scm | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/python-compression.scm
b/gnu/packages/python-compression.scm
index 7de5be7..70abc7b 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -223,20 +223,25 @@ install: libbitshuffle.so
(propagated-inputs
`(("python-more-itertools" ,python-more-itertools)))
(native-inputs
- `(("python-contextlib2" ,python-contextlib2)
- ("python-pathlib2" ,python-pathlib2)
- ("python-setuptools-scm" ,python-setuptools-scm)
- ("python-unittest2" ,python-unittest2)))
+ `(("python-setuptools-scm" ,python-setuptools-scm)))
(home-page "https://github.com/jaraco/zipp;)
(synopsis
"Backport of pathlib-compatible object wrapper for zip files")
(description
"This package provides a @code{pathlib}-compatible @code{Zipfile} object
wrapper. It provides a backport of the @code{Path} object.")
+(properties `((python2-variant . ,(delay python2-zipp
(license license:expat)))
(define-public python2-zipp
- (package-with-python2 python-zipp))
+ (let ((base (package-with-python2 (strip-python2-variant python-zipp
+(package/inherit
+ base
+ (native-inputs
+ `(("python-contextlib2" ,python2-contextlib2)
+("python-pathlib2" ,python2-pathlib2)
+("python-unittest2" ,python2-unittest2)
+,@(package-native-inputs base))
(define-public python-zstandard
(package
17/22: gnu: rust-getopts-0.2: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit a630e32ac12d21e93438b6c55c6303f349a7d5ac
Author: Efraim Flashner
AuthorDate: Thu Jan 16 17:45:28 2020 +0200
gnu: rust-getopts-0.2: Don't hide package.
* gnu/packages/crates-io.scm (rust-getopts-0.2)[arguments]: Skip build.
Add rust-log-0.3 to cargo-development-inputs.
[home-page]: Update home-page.
[properties]: Remove field.
---
gnu/packages/crates-io.scm | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 00f3bf1..dd57783 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3673,10 +3673,13 @@ archive to be linked into Rustcode.")
(base32
"018yhq97zgcrcxwhj3pxh31h83704sgaiijdnpl0r1ir366c005r"
(build-system cargo-build-system)
-(home-page "https://github.com/rust-lang-nursery/getopts;)
+(arguments
+ `(#:skip-build? #t
+ #:cargo-development-inputs
+ (("rust-log" ,rust-log-0.3
+(home-page "https://github.com/rust-lang/getopts;)
(synopsis "Rust library for option parsing for CLI utilities")
(description "This library provides getopts-like option parsing.")
-(properties '((hidden? . #t)))
(license (list license:asl2.0
license:expat
22/22: gnu: rust-scopeguard-1.0: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit 1c70205f8277e4dc2f99d0c79a685028d4c64aed
Author: Efraim Flashner
AuthorDate: Thu Jan 16 17:58:33 2020 +0200
gnu: rust-scopeguard-1.0: Don't hide package.
* gnu/packages/crates-io.scm (rust-scopeguard-1.0)[arguments]: Skip
build.
[properties]: Remove field.
---
gnu/packages/crates-io.scm | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 87725e7..41ed200 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8756,6 +8756,7 @@ library's old @code{scoped_thread_local!} macro for
providing scoped access to
(base32
"03aay84r1f6w87ckbpj6cc4rnsxkxcfs13n5ynxjia0qkgjiabml"
(build-system cargo-build-system)
+(arguments '(#:skip-build? #t))
(home-page "https://github.com/bluss/scopeguard;)
(synopsis "Scope guard which will run a closure even out of scope")
(description "This package provides a RAII scope guard that will run a
@@ -8763,7 +8764,6 @@ given closure when it goes out of scope, even if the code
between panics
(assuming unwinding panic). Defines the macros @code{defer!},
@code{defer_on_unwind!}, @code{defer_on_success!} as shorthands for guards
with one of the implemented strategies.")
-(properties '((hidden? . #t)))
(license (list license:asl2.0
license:expat
@@ -8780,9 +8780,7 @@ with one of the implemented strategies.")
(string-append name "-" version ".crate"))
(sha256
(base32
- "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl"
-(arguments '(#:skip-build? #t))
-(properties '(
+ "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl"))
(define-public rust-scroll-0.9
(package
05/22: gnu: rust-filetime-0.2: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit ef8c91be7f92fe0a4c10ad6ff33fe479f297895a
Author: Efraim Flashner
AuthorDate: Thu Jan 16 17:16:32 2020 +0200
gnu: rust-filetime-0.2: Don't hide package.
* gnu/packages/crates-io.scm (rust-filetime-0.2)[arguments]: Skip build.
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(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index aa5ae7f..3a9e013 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2956,6 +2956,15 @@ provides implementations for @code{HashMap} and
@code{HashSet}.")
(base32
"0sflihq2l77xjrza7yjalnxsc7dxzg25rhzcfbd9vmyfah5kimvb"
(build-system cargo-build-system)
+(arguments
+ `(#:skip-build? #t
+ #: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/filetime;)
(synopsis "Platform-agnostic accessors of timestamps in File metadata")
(description
@@ -2964,7 +2973,6 @@ various timestamps of files in Rust. This library takes
into account
cross-platform differences in terms of where the timestamps are located, what
they are called, and how to convert them into a platform-independent
representation.")
-(properties '((hidden? . #t)))
(license (list license:asl2.0
license:expat
20/22: gnu: rust-scoped-tls-1.0: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit 671d08f30d5a12a4865fede3dfa56f604637ad63
Author: Efraim Flashner
AuthorDate: Thu Jan 16 17:53:31 2020 +0200
gnu: rust-scoped-tls-1.0: Don't hide package.
* gnu/packages/crates-io.scm (rust-scoped-tls-1.0)[arguments]: Skip
build.
[properties]: Remove field.
---
gnu/packages/crates-io.scm | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f0f9387..129d5d4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8720,12 +8720,12 @@ non-'static references in parallel.")
(base32
"1hj8lifzvivdb1z02lfnzkshpvk85nkgzxsy2hc0zky9wf894spa"
(build-system cargo-build-system)
+(arguments '(#:skip-build? #t))
(home-page "https://github.com/alexcrichton/scoped-tls;)
(synopsis "Rust library providing the old standard library's
scoped_thread_local")
(description "This crate provides a library implementation of the standard
library's old @code{scoped_thread_local!} macro for providing scoped access to
@dfn{thread local storage} (TLS) so any type can be stored into TLS.")
-(properties '((hidden? . #t)))
(license (list license:asl2.0
license:expat
@@ -8741,9 +8741,7 @@ library's old @code{scoped_thread_local!} macro for
providing scoped access to
(file-name (string-append name "-" version ".crate"))
(sha256
(base32
- "0a2bn9d2mb07c6l16sadijy4p540g498zddfxyiq4rsqpwrglbrk"
-(arguments '(#:skip-build? #t))
-(properties '(
+ "0a2bn9d2mb07c6l16sadijy4p540g498zddfxyiq4rsqpwrglbrk"))
(define-public rust-scopeguard-1.0
(package
09/22: gnu: rust-fnv-1.0: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit 74de42eb660067096dfd8c6dc0ea759b388cf40e
Author: Efraim Flashner
AuthorDate: Thu Jan 16 17:26:56 2020 +0200
gnu: rust-fnv-1.0: Don't hide package.
* gnu/packages/crates-io.scm (rust-fnv-1.0)[arguments]: Skip build.
[synopsis]: Appease 'guix lint'.
[properties]: Remove field.
---
gnu/packages/crates-io.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5dcb2da..8c12079 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3128,11 +3128,11 @@ streams.")
(base32
"1ww56bi1r5b8id3ns9j3qxbi7w5h005rzhiryy0zi9h97raqbb9g"
(build-system cargo-build-system)
+(arguments '(#:skip-build? #t))
(home-page "https://github.com/servo/rust-fnv;)
-(synopsis "implementation of the Fowler-Noll-Vo hash function")
+(synopsis "Implementation of the Fowler-Noll-Vo hash function")
(description "The @code{fnv} hash function is a custom @code{Hasher}
implementation that is more efficient for smaller hash keys.")
-(properties '((hidden? . #t)))
(license (list license:asl2.0
license:expat
11/22: gnu: rust-fuchsia-cprng-0.1: Don't hide package.
efraim pushed a commit to branch master in repository guix. commit 7f27e979bfa7f04cef5e936f2866964e6b26c2db Author: Efraim Flashner AuthorDate: Thu Jan 16 17:33:18 2020 +0200 gnu: rust-fuchsia-cprng-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-fuchsia-cprng-0.1)[arguments]: Skip build. [properties]: Remove field. --- gnu/packages/crates-io.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e2eb14f..0fbe498 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3258,11 +3258,12 @@ process and much more.") (base32 "1fnkqrbz7ixxzsb04bsz9p0zzazanma8znfdqjvh39n14vapfvx0" (build-system cargo-build-system) -(home-page "https://fuchsia.googlesource.com/fuchsia/+/master/garnet/public/rust/fuchsia-cprng;) +(arguments '(#:skip-build? #t)) +(home-page + "https://fuchsia.googlesource.com/fuchsia/+/master/garnet/public/rust/fuchsia-cprng;) (synopsis "Fuchsia cryptographically secure pseudorandom number generator") (description "Rust crate for the Fuchsia cryptographically secure pseudorandom number generator") -(properties '((hidden? . #t))) (license license:bsd-3))) (define-public rust-fuchsia-zircon-0.3
16/22: gnu: Add rust-rustc-std-workspace-std-1.0.
efraim pushed a commit to branch master in repository guix. commit efd853489732ee013eb26f4a111f67b8142a942f Author: Efraim Flashner AuthorDate: Thu Jan 16 17:51:08 2020 +0200 gnu: Add rust-rustc-std-workspace-std-1.0. * gnu/packages/crates-io.scm (rust-rustc-std-workspace-std-1.0): New variable. --- gnu/packages/crates-io.scm | 20 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8c16eef..00f3bf1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8439,6 +8439,26 @@ rust-lang/rust integration.") (license (list license:asl2.0 license:expat +(define-public rust-rustc-std-workspace-std-1.0 + (package +(name "rust-rustc-std-workspace-std") +(version "1.0.1") +(source + (origin +(method url-fetch) +(uri (crate-uri "rustc-std-workspace-std" version)) +(file-name + (string-append name "-" version ".tar.gz")) +(sha256 + (base32 + "1vq4vaclamwhk0alf4f7wq3i9wxa993sxpmhy6qfaimy1ai7d9mb" +(build-system cargo-build-system) +(arguments '(#:skip-build? #t)) +(home-page "https://crates.io/crates/rustc-std-workspace-std;) +(synopsis "Workaround for rustbuild") +(description "This package provides a workaround for rustbuild.") +(license (list license:expat license:asl2.0 + (define-public rust-rustc-test-0.3 (package (name "rust-rustc-test")
03/22: gnu: rust-cmake-0.1: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit a9b5fe4d86d8ab1c1086e9949b42ccd23fc63afc
Author: Efraim Flashner
AuthorDate: Thu Jan 16 17:11:26 2020 +0200
gnu: rust-cmake-0.1: Don't hide package.
* gnu/packages/crates-io.scm (rust-cmake-0.1)[arguments]: Skip build.
Add rust-cc-1.0 to cargo-inputs.
[properties]: Remove field.
---
gnu/packages/crates-io.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fcdc104..a53b801 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1397,13 +1397,15 @@ pitfalls in Rust.")
(base32
"0qkwibkvx5xjazvv9v8gvdlpky2jhjxvcz014nrixgzqfyv2byw1"
(build-system cargo-build-system)
+(arguments
+ `(#:skip-build? #t
+ #:cargo-inputs (("rust-cc" ,rust-cc-1.0
(home-page "https://github.com/alexcrichton/cmake-rs;)
(synopsis "Rust build dependency for running cmake")
(description
"This package provides a build dependency for running @code{cmake} to
build
a native library. The CMake executable is assumed to be @code{cmake} unless
the
CMAKE environmental variable is set.")
-(properties '((hidden? . #t)))
(license (list license:asl2.0
license:expat
04/22: gnu: rust-fallible-iterator-0.2: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit 0441e834a26d4442e27db5aad729d7869b3ee7b8
Author: Efraim Flashner
AuthorDate: Thu Jan 16 17:13:19 2020 +0200
gnu: rust-fallible-iterator-0.2: Don't hide package.
* gnu/packages/crates-io.scm (rust-fallible-iterator-0.2)[arguments]:
Skip build.
[properties]: Remove field.
---
gnu/packages/crates-io.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a53b801..aa5ae7f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2933,13 +2933,13 @@ is configured via an environment variable.")
(base32
"1xq759lsr8gqss7hva42azn3whgrbrs2sd9xpn92c5ickxm1fhs4"
(build-system cargo-build-system)
+(arguments '(#:skip-build? #t))
(home-page "https://github.com/sfackler/rust-fallible-iterator;)
(synopsis "Fallible iterator traits")
(description "If the @code{std} or @code{alloc} features are enabled, this
crate provides implementations for @code{Box}, @code{Vec}, @code{BTreeMap}, and
@code{BTreeSet}. If the @code{std} feature is enabled, this crate additionally
provides implementations for @code{HashMap} and @code{HashSet}.")
-(properties '((hidden? . #t)))
(license (list license:asl2.0
license:expat
19/22: gnu: rust-scoped-tls-0.1: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit fcc4e04d2271d7ae862a9f40775d3c3e3f083fdc
Author: Efraim Flashner
AuthorDate: Thu Jan 16 17:55:15 2020 +0200
gnu: rust-scoped-tls-0.1: Don't hide package.
* gnu/packages/crates-io.scm (rust-scoped-tls-0.1)[arguments]: Skip
build.
[properties]: Don't inherit field.
---
gnu/packages/crates-io.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ce5aef4..f0f9387 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8741,7 +8741,9 @@ library's old @code{scoped_thread_local!} macro for
providing scoped access to
(file-name (string-append name "-" version ".crate"))
(sha256
(base32
- "0a2bn9d2mb07c6l16sadijy4p540g498zddfxyiq4rsqpwrglbrk"))
+ "0a2bn9d2mb07c6l16sadijy4p540g498zddfxyiq4rsqpwrglbrk"
+(arguments '(#:skip-build? #t))
+(properties '(
(define-public rust-scopeguard-1.0
(package
21/22: gnu: rust-scopeguard-0.3: Don't hide package.
efraim pushed a commit to branch master in repository guix. commit ac20ab2b4e7f34f1c695c3e51b54bf29bdcb54ed Author: Efraim Flashner AuthorDate: Thu Jan 16 17:57:30 2020 +0200 gnu: rust-scopeguard-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-scopeguard-0.3)[arguments]: Skip build. [properties]: Don't inherit field. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 129d5d4..87725e7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8780,7 +8780,9 @@ with one of the implemented strategies.") (string-append name "-" version ".crate")) (sha256 (base32 - "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl")) + "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl" +(arguments '(#:skip-build? #t)) +(properties '( (define-public rust-scroll-0.9 (package
18/22: gnu: rust-getopts-0.2: Update to 0.2.21.
efraim pushed a commit to branch master
in repository guix.
commit fe195ef7d30b22ca12ebf770101460b1f0920fdf
Author: Efraim Flashner
AuthorDate: Thu Jan 16 17:48:50 2020 +0200
gnu: rust-getopts-0.2: Update to 0.2.21.
* gnu/packages/crates-io.scm (rust-getopts-0.2): Update to 0.2.21.
[arguments]: Add rust-unicode-width-0.1,
rust-rustc-std-workspace-core-1.0, rust-rustc-std-workspace-std-1.0 to
cargo-inputs.
---
gnu/packages/crates-io.scm | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dd57783..ce5aef4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3663,7 +3663,7 @@ archive to be linked into Rustcode.")
(define-public rust-getopts-0.2
(package
(name "rust-getopts")
-(version "0.2.17")
+(version "0.2.21")
(source
(origin
(method url-fetch)
@@ -3671,10 +3671,14 @@ archive to be linked into Rustcode.")
(file-name (string-append name "-" version ".crate"))
(sha256
(base32
- "018yhq97zgcrcxwhj3pxh31h83704sgaiijdnpl0r1ir366c005r"
+ "1mgb3qvivi26gs6ihqqhh8iyhp3vgxri6vwyrwg28w0xqzavznql"
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-unicode-width" ,rust-unicode-width-0.1)
+("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1.0)
+("rust-rustc-std-workspace-std" ,rust-rustc-std-workspace-std-1.0))
#:cargo-development-inputs
(("rust-log" ,rust-log-0.3
(home-page "https://github.com/rust-lang/getopts;)
07/22: gnu: rust-findshlibs-0.5: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit ced246661782fd2701630776d99e68c09a45712b
Author: Efraim Flashner
AuthorDate: Thu Jan 16 17:22:01 2020 +0200
gnu: rust-findshlibs-0.5: Don't hide package.
* gnu/packages/crates-io.scm (rust-findshlibs-0.5)[arguments]: Skip
build. Add rust-lazy-static-1.3, rust-libc-0.2 to cargo-inputs.
[properties]: Remove field.
---
gnu/packages/crates-io.scm | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2b4f80e..093f43a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2989,12 +2989,16 @@ representation.")
(base32
"1n2vagn0q5yim32hxkwi1cjgp3yn1dm45p7z8nw6lapywihhs9mi"
(build-system cargo-build-system)
+(arguments
+ `(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-lazy-static" ,rust-lazy-static-1.3)
+("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")
(description
"Find the set of shared libraries loaded in the current process with a
cross platform API.")
-(properties '((hidden? . #t)))
(license (list license:asl2.0
license:expat
15/22: gnu: rust-futures-0.1: Update to 0.1.29.
efraim pushed a commit to branch master in repository guix. commit a075606f0ddae6a0857601823a10bd2bac52267d Author: Efraim Flashner AuthorDate: Thu Jan 16 17:41:25 2020 +0200 gnu: rust-futures-0.1: Update to 0.1.29. * gnu/packages/crates-io.scm (rust-futures-0.1): Update to 0.1.29. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3d248bd..8c16eef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3335,7 +3335,7 @@ pseudorandom number generator") (define-public rust-futures-0.1 (package (name "rust-futures") -(version "0.1.28") +(version "0.1.29") (source (origin (method url-fetch) @@ -3343,7 +3343,7 @@ pseudorandom number generator") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0saq8ffjw1pwf1pzhw3kq1z7dfq6wpd8x93dnni6vbkc799kkp25" + "1vq3cw37knnd0afw3rcjzh71i2l01v5m4ysinrrqdvnn2ql0z60v" (build-system cargo-build-system) (arguments '(#:skip-build? #t)) (home-page "https://github.com/rust-lang/futures-rs;)
14/22: gnu: rust-futures-0.1: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit 3f5e2fd956c43ac269db8c492bd628a0285c6e88
Author: Efraim Flashner
AuthorDate: Thu Jan 16 17:39:57 2020 +0200
gnu: rust-futures-0.1: Don't hide package.
* gnu/packages/crates-io.scm (rust-futures-0.1)[arguments]: Skip build.
[home-page]: Update home-page.
[properties]: Remove field.
---
gnu/packages/crates-io.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a4add0d..3d248bd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3345,11 +3345,11 @@ pseudorandom number generator")
(base32
"0saq8ffjw1pwf1pzhw3kq1z7dfq6wpd8x93dnni6vbkc799kkp25"
(build-system cargo-build-system)
-(home-page "https://github.com/rust-lang-nursery/futures-rs;)
+(arguments '(#:skip-build? #t))
+(home-page "https://github.com/rust-lang/futures-rs;)
(synopsis "Implementation of zero-cost futures in Rust")
(description "An implementation of @code{futures} and @code{streams}
featuring zero allocations, composability, and iterator-like interfaces.")
-(properties '((hidden? . #t)))
(license (list license:asl2.0
license:expat
12/22: gnu: rust-fuchsia-zircon-0.3: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit 7b4d3d869828e99523a37ad67525c439827b5d41
Author: Efraim Flashner
AuthorDate: Thu Jan 16 17:36:22 2020 +0200
gnu: rust-fuchsia-zircon-0.3: Don't hide package.
* gnu/packages/crates-io.scm (rust-fuchsia-zircon-0.3)[arguments]: Skip
build. Add rust-bitflags-1, rust-fuchsia-zircon-sys-0.3 to cargo-inputs.
[properties]: Remove field.
---
gnu/packages/crates-io.scm | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0fbe498..59d75db 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3279,10 +3279,14 @@ pseudorandom number generator")
(base32
"10jxc5ks1x06gpd0xg51kcjrxr35nj6qhx2zlc5n7bmskv3675rf"
(build-system cargo-build-system)
+(arguments
+ `(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-bitflags" ,rust-bitflags-1)
+("rust-fuchsia-zircon-sys" ,rust-fuchsia-zircon-sys-0.3
(home-page "https://fuchsia.googlesource.com/garnet/;)
(synopsis "Rust bindings for the Zircon kernel")
(description "Rust bindings for the Zircon kernel.")
-(properties '((hidden? . #t)))
(license license:bsd-3)))
(define-public rust-fuchsia-zircon-sys-0.3
13/22: gnu: rust-fuchsia-zircon-sys-0.3: Don't hide package.
efraim pushed a commit to branch master in repository guix. commit f32036911769a1a23f074d818a5fc9e2b6fae54b Author: Efraim Flashner AuthorDate: Thu Jan 16 17:38:08 2020 +0200 gnu: rust-fuchsia-zircon-sys-0.3: Don't hide package. * gnu/packages/crates-io.scm (rust-fuchsia-zircon-sys-0.3)[arguments]: Skip build. [properties]: Remove field. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 59d75db..a4add0d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3302,10 +3302,10 @@ pseudorandom number generator") (base32 "19zp2085qsyq2bh1gvcxq1lb8w6v6jj9kbdkhpdjrl95fypakjix" (build-system cargo-build-system) +(arguments '(#:skip-build? #t)) (home-page "https://fuchsia.googlesource.com/garnet/;) (synopsis "Low-level Rust bindings for the Zircon kernel") (description "Low-level Rust bindings for the Zircon kernel.") -(properties '((hidden? . #t))) (license license:bsd-3))) (define-public rust-futf-0.1
08/22: gnu: rust-fixedbitset-0.1: Don't hide package.
efraim pushed a commit to branch master in repository guix. commit 0c44bf848c48210166f07d67d49148651d6cbbb2 Author: Efraim Flashner AuthorDate: Thu Jan 16 17:23:48 2020 +0200 gnu: rust-fixedbitset-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-fixedbitset-0.1)[arguments]: Skip build. [properties]: Remove field. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 093f43a..5dcb2da 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3015,10 +3015,10 @@ cross platform API.") (base32 "0czam11mi80dbyhf4rd4lz0ihcf7vkfchrdcrn45wbs0h40dxm46" (build-system cargo-build-system) +(arguments '(#:skip-build? #t)) (home-page "https://github.com/petgraph/fixedbitset;) (synopsis "FixedBitSet is a simple bitset collection") (description "FixedBitSet is a simple bitset collection.") -(properties '((hidden? . #t))) (license (list license:asl2.0 license:expat
02/22: gnu: rust-clicolors-control-1.0: Update to 1.0.1.
efraim pushed a commit to branch master in repository guix. commit dca4e6324caec44a0060a9e053c9ed268d3ed23d Author: Efraim Flashner AuthorDate: Thu Jan 16 17:09:46 2020 +0200 gnu: rust-clicolors-control-1.0: Update to 1.0.1. * gnu/packages/crates-io.scm (rust-clicolors-control-1.0): Update to 1.0.1. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e08ec90..fcdc104 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1311,7 +1311,7 @@ Command Line Argument Parser.") (define-public rust-clicolors-control-1.0 (package (name "rust-clicolors-control") -(version "1.0.0") +(version "1.0.1") (source (origin (method url-fetch) @@ -1319,7 +1319,7 @@ Command Line Argument Parser.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1y80cgarxhrd1bz5yjm81r444v6flvy36aaxrrsac0yhfd6gvavk" + "07klix8nbpwk0cg1k4h0kkiijm1jxvrzndqdkr7dqr6xvkjjw24h" (build-system cargo-build-system) (arguments `(#:skip-build? #t
branch master updated (fb8a77f -> 1c70205)
efraim pushed a change to branch master in repository guix. from fb8a77f gnu: guile-syntax-highlight: Add "guile3.0-syntax-highlight" variant. new 82c2f88 gnu: rust-clicolors-control-1.0: Don't hide package. new dca4e63 gnu: rust-clicolors-control-1.0: Update to 1.0.1. new a9b5fe4 gnu: rust-cmake-0.1: Don't hide package. new 0441e83 gnu: rust-fallible-iterator-0.2: Don't hide package. new ef8c91b gnu: rust-filetime-0.2: Don't hide package. new 1c9d47b gnu: rust-filetime-0.2: Update to 0.2.8. new ced2466 gnu: rust-findshlibs-0.5: Don't hide package. new 0c44bf8 gnu: rust-fixedbitset-0.1: Don't hide package. new 74de42e gnu: rust-fnv-1.0: Don't hide package. new 9eda3bc gnu: rust-fs-extra-1.1: Don't hide package. new 7f27e97 gnu: rust-fuchsia-cprng-0.1: Don't hide package. new 7b4d3d8 gnu: rust-fuchsia-zircon-0.3: Don't hide package. new f320369 gnu: rust-fuchsia-zircon-sys-0.3: Don't hide package. new 3f5e2fd gnu: rust-futures-0.1: Don't hide package. new a075606 gnu: rust-futures-0.1: Update to 0.1.29. new efd8534 gnu: Add rust-rustc-std-workspace-std-1.0. new a630e32 gnu: rust-getopts-0.2: Don't hide package. new fe195ef gnu: rust-getopts-0.2: Update to 0.2.21. new fcc4e04 gnu: rust-scoped-tls-0.1: Don't hide package. new 671d08f gnu: rust-scoped-tls-1.0: Don't hide package. new ac20ab2 gnu: rust-scopeguard-0.3: Don't hide package. new 1c70205 gnu: rust-scopeguard-1.0: Don't hide package. The 22 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/crates-io.scm | 106 + 1 file changed, 79 insertions(+), 27 deletions(-)
01/22: gnu: rust-clicolors-control-1.0: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit 82c2f8840d3f0597e83a6d3cb3eb4a944ff9fb60
Author: Efraim Flashner
AuthorDate: Thu Jan 16 17:07:19 2020 +0200
gnu: rust-clicolors-control-1.0: Don't hide package.
* gnu/packages/crates-io.scm (rust-clicolors-control-1.0)[arguments]:
Skip build. Add rust-atty-0.2, rust-lazy-static-1.3, rust-libc-0.2,
rust-winapi-0.3 to cargo-inputs.
[properties]: Remove field.
---
gnu/packages/crates-io.scm | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 782b595..e08ec90 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1321,12 +1321,18 @@ Command Line Argument Parser.")
(base32
"1y80cgarxhrd1bz5yjm81r444v6flvy36aaxrrsac0yhfd6gvavk"
(build-system cargo-build-system)
+(arguments
+ `(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-atty" ,rust-atty-0.2)
+("rust-lazy-static" ,rust-lazy-static-1.3)
+("rust-libc" ,rust-libc-0.2)
+("rust-winapi" ,rust-winapi-0.3
(home-page "https://github.com/mitsuhiko/clicolors-control;)
(synopsis "Common utility library to control CLI colorization")
(description
"This package provides a common utility library to control CLI
colorization.")
-(properties '((hidden? . #t)))
(license license:expat)))
(define-public rust-clippy-0.0
06/22: gnu: rust-filetime-0.2: Update to 0.2.8.
efraim pushed a commit to branch master
in repository guix.
commit 1c9d47b6424099f379170cd5f13c319b2ee8acd5
Author: Efraim Flashner
AuthorDate: Thu Jan 16 17:19:00 2020 +0200
gnu: rust-filetime-0.2: Update to 0.2.8.
* gnu/packages/crates-io.scm (rust-filetime-0.2): Update to 0.2.8.
[arguments]: Remove rust-tempdir-0.3 from cargo-development-inputs. Add
rust-tempfile-3.0.
---
gnu/packages/crates-io.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3a9e013..2b4f80e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2946,7 +2946,7 @@ provides implementations for @code{HashMap} and
@code{HashSet}.")
(define-public rust-filetime-0.2
(package
(name "rust-filetime")
-(version "0.2.7")
+(version "0.2.8")
(source
(origin
(method url-fetch)
@@ -2954,7 +2954,7 @@ provides implementations for @code{HashMap} and
@code{HashSet}.")
(file-name (string-append name "-" version ".crate"))
(sha256
(base32
- "0sflihq2l77xjrza7yjalnxsc7dxzg25rhzcfbd9vmyfah5kimvb"
+ "0zfc90802dbw11bx6kmm8zw6r88k7glm4q6l8riqw35an3dd9xhz"
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@@ -2964,7 +2964,7 @@ provides implementations for @code{HashMap} and
@code{HashSet}.")
("rust-redox-syscall" ,rust-redox-syscall-0.1)
("rust-winapi" ,rust-winapi-0.3))
#:cargo-development-inputs
- (("rust-tempdir" ,rust-tempdir-0.3
+ (("rust-tempfile" ,rust-tempfile-3.0
(home-page "https://github.com/alexcrichton/filetime;)
(synopsis "Platform-agnostic accessors of timestamps in File metadata")
(description
10/22: gnu: rust-fs-extra-1.1: Don't hide package.
efraim pushed a commit to branch master
in repository guix.
commit 9eda3bcfdd1e81a84eac28c156abdacb2fa47ebb
Author: Efraim Flashner
AuthorDate: Thu Jan 16 17:32:20 2020 +0200
gnu: rust-fs-extra-1.1: Don't hide package.
* gnu/packages/crates-io.scm (rust-fs-extra-1.1)[arguments]: Skip build.
[properties]: Remove field.
---
gnu/packages/crates-io.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8c12079..e2eb14f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3237,12 +3237,12 @@ APIs.")
(base32
"0x6675wdhsx277k1k1235jwcv38naf20d8kwrk948ds26hh4lajz"
(build-system cargo-build-system)
+(arguments '(#:skip-build? #t))
(home-page "https://github.com/webdesus/fs_extra;)
(synopsis "Extra filesystem methods")
(description "Expanding opportunities standard library @code{std::fs} and
@code{std::io}. Recursively copy folders with recept information about
process and much more.")
-(properties '((hidden? . #t)))
(license license:expat)))
(define-public rust-fuchsia-cprng-0.1
04/06: gnu: guile: Add 3.0.0.
civodul pushed a commit to branch master
in repository guix.
commit e7921d5ecb9b9615396e5bbd286f132d97d016cc
Author: Ludovic Courtès
AuthorDate: Thu Jan 16 16:41:59 2020 +0100
gnu: guile: Add 3.0.0.
* gnu/packages/guile.scm (guile-3.0): New variable.
(guile-next): Turn into an alias for GUILE-3.0.
---
gnu/packages/guile.scm | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 8d3f43e..e940d38 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -283,19 +283,19 @@ without requiring the source code to be rewritten.")
(base32
"07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r"))
-(define-public guile-next
- ;; This is the upcoming Guile 3.0, with JIT support.
+(define-public guile-3.0
+ ;; This is the latest Guile stable version.
(package
(inherit guile-2.2)
-(name "guile-next")
-(version "2.9.9")
+(name "guile-next") ;to be renamed to "guile"
+(version "3.0.0")
(source (origin
(inherit (package-source guile-2.2))
- (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-;
+ (uri (string-append "ftp://ftp.gnu.org/gnu/guile/guile-;
version ".tar.xz"))
(sha256
(base32
-"0s99zzdzj29fb42q5fwn7vqg9k7y9ppq9vkv4p39zr93z8694wdz"
+"0x8ca6q1qdmk29lh12gj6ngvgn7kp79w42rxfgwrpxm9jmjqs4y9"
(native-search-paths
(list (search-path-specification
(variable "GUILE_LOAD_PATH")
@@ -303,9 +303,9 @@ without requiring the source code to be rewritten.")
(search-path-specification
(variable "GUILE_LOAD_COMPILED_PATH")
(files '("lib/guile/3.0/site-ccache"
- "share/guile/site/3.0")
-(properties '((ftp-server . "alpha.gnu.org")
- (upstream-name . "guile")
+ "share/guile/site/3.0")))
+
+(define-public guile-next guile-3.0)
(define* (make-guile-readline guile #:optional (name "guile-readline"))
(package
branch master updated (a2548a3 -> fb8a77f)
civodul pushed a change to branch master in repository guix. from a2548a3 gnu: Update copyright header. new 4fe01b0 publish: Export 'signed-string'. new 84c5da0 guix package: Export 'transaction-upgrade-entry'. new 47212fc records: Improve reporting of "invalid field specifier" errors. new e7921d5 gnu: guile: Add 3.0.0. new 4f40868 gnu: guile-picture-language: Add "guile3.0-picture-language" variant. new fb8a77f gnu: guile-syntax-highlight: Add "guile3.0-syntax-highlight" variant. The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/guile-xyz.scm | 22 +- gnu/packages/guile.scm | 18 +- guix/records.scm | 19 ++- guix/scripts/package.scm | 8 +--- guix/scripts/publish.scm | 4 +++- guix/ui.scm| 5 +++-- tests/guix-system.sh | 22 +- tests/packages.scm | 11 +++ tests/publish.scm | 8 +++- tests/records.scm | 34 +++--- 10 files changed, 117 insertions(+), 34 deletions(-)
03/06: records: Improve reporting of "invalid field specifier" errors.
civodul pushed a commit to branch master
in repository guix.
commit 47212fc763788660ff9051ccee1f6fa8a0db7bdd
Author: Ludovic Courtès
AuthorDate: Thu Jan 16 15:00:18 2020 +0100
records: Improve reporting of "invalid field specifier" errors.
Previously users would just see:
error: invalid field specifier
without source location or hints.
* guix/records.scm (expand): Add optional 'parent-form' parameter and
pass it to 'syntax-violation' when it is true.
(make-syntactic-constructor): Pass S as a third argument to
'report-invalid-field-specifier'.
* guix/ui.scm (report-load-error): For 'syntax-error', show SUBFORM or
FORM in the message.
* tests/records.scm ("define-record-type* & wrong field specifier"): Add
a 'subform' parameter and adjust test accordingly.
("define-record-type* & wrong field specifier, identifier"): New test.
* tests/guix-system.sh: Add test.
---
guix/records.scm | 19 ++-
guix/ui.scm | 5 +++--
tests/guix-system.sh | 22 +-
tests/records.scm| 34 +++---
4 files changed, 69 insertions(+), 11 deletions(-)
diff --git a/guix/records.scm b/guix/records.scm
index 99507dc..4bda542 100644
--- a/guix/records.scm
+++ b/guix/records.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic
Courtès
;;; Copyright © 2018 Mark H Weaver
;;;
;;; This file is part of GNU Guix.
@@ -70,14 +70,22 @@ interface\" (ABI) for TYPE is equal to COOKIE."
"~a: record ABI mismatch; recompilation needed"
(list #,type) '()
- (define (report-invalid-field-specifier name bindings)
-"Report the first invalid binding among BINDINGS."
+ (define* (report-invalid-field-specifier name bindings
+ #:optional parent-form)
+"Report the first invalid binding among BINDINGS. PARENT-FORM is used for
+error-reporting purposes."
(let loop ((bindings bindings))
(syntax-case bindings ()
(((field value) rest ...) ;good
(loop #'(rest ...)))
((weird _ ...) ;weird!
- (syntax-violation name "invalid field specifier" #'weird)
+ ;; WEIRD may be an identifier, thus lacking source location info, and
+ ;; BINDINGS is a list, also lacking source location info. Hopefully
+ ;; PARENT-FORM provides source location info.
+ (apply syntax-violation name "invalid field specifier"
+(if parent-form
+(list parent-form #'weird)
+(list #'weird)))
(define (report-duplicate-field-specifier name ctor)
"Report the first duplicate identifier among the bindings in CTOR."
@@ -233,7 +241,8 @@ of TYPE matches the expansion-time ABI."
;; Report precisely which one is faulty, instead of letting the
;; "source expression failed to match any pattern" error.
(report-invalid-field-specifier 'name
-#'(bindings (... ...))
+#'(bindings (... ...))
+s
(define-syntax-rule (define-field-property-predicate predicate property)
"Define PREDICATE as a procedure that takes a syntax object and, when passed
diff --git a/guix/ui.scm b/guix/ui.scm
index b99a9e5..01aeee4 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -372,9 +372,10 @@ ARGS is the list of arguments received by the 'throw'
handler."
(format (current-error-port) (G_ "~amissing closing parenthesis~%")
location))
(apply throw args)))
-(('syntax-error proc message properties form . rest)
+(('syntax-error proc message properties form subform . rest)
(let ((loc (source-properties->location properties)))
- (report-error loc (G_ "~a~%") message)))
+ (report-error loc (G_ "~s: ~a~%")
+ (or subform form) message)))
(('unbound-variable _ ...)
(report-unbound-variable-error args #:frame frame))
(((or 'srfi-34 '%exception) obj)
diff --git a/tests/guix-system.sh b/tests/guix-system.sh
index 1b2c425..271627c 100644
--- a/tests/guix-system.sh
+++ b/tests/guix-system.sh
@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
+# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès
# Copyright © 2017 Tobias Geerinckx-Rice
# Copyright © 2018 Chris Marusich
#
@@ -130,6 +130,26 @@ else
fi
fi
+cat > "$tmpfile" < "$errorfile"
+then false
+else
+# Here '%base-file-systems' appears as if it were a field specified of
01/06: publish: Export 'signed-string'.
civodul pushed a commit to branch master
in repository guix.
commit 4fe01b09ea0b304b963b7fd9f168439ddfb515c1
Author: Ludovic Courtès
AuthorDate: Thu Jan 16 10:43:29 2020 +0100
publish: Export 'signed-string'.
* guix/scripts/publish.scm (signed-string): Export and improve docstring.
* tests/publish.scm ("/*.narinfo")
("/*.narinfo with properly encoded '+' sign"): Adjust accordingly.
---
guix/scripts/publish.scm | 4 +++-
tests/publish.scm| 8 +++-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm
index 71a349d..f5b2f5f 100644
--- a/guix/scripts/publish.scm
+++ b/guix/scripts/publish.scm
@@ -64,6 +64,7 @@
#:use-module ((guix build syscalls) #:select (set-thread-name))
#:export (%public-key
%private-key
+signed-string
guix-publish))
@@ -237,7 +238,8 @@ if ITEM is already compressed."
("Priority" . 100)))
(define (signed-string s)
- "Sign the hash of the string S with the daemon's key."
+ "Sign the hash of the string S with the daemon's key. Return a canonical
+sexp for the signature."
(let* ((public-key (%public-key))
(hash (bytevector->hash-data (sha256 (string->utf8 s))
#:key-type (key-type public-key
diff --git a/tests/publish.scm b/tests/publish.scm
index 204cfb4..e43310e 100644
--- a/tests/publish.scm
+++ b/tests/publish.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 David Thompson
-;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès
+;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès
;;;
;;; This file is part of GNU Guix.
;;;
@@ -153,8 +153,7 @@ References: ~a~%"
(signature (base64-encode
(string->utf8
(canonical-sexp->string
- ((@@ (guix scripts publish) signed-string)
-unsigned-info))
+ (signed-string unsigned-info))
(format #f "~aSignature: 1;~a;~a~%"
unsigned-info (gethostname) signature))
(utf8->string
@@ -184,8 +183,7 @@ References: ~%"
(signature (base64-encode
(string->utf8
(canonical-sexp->string
- ((@@ (guix scripts publish) signed-string)
-unsigned-info))
+ (signed-string unsigned-info))
(format #f "~aSignature: 1;~a;~a~%"
unsigned-info (gethostname) signature))
02/06: guix package: Export 'transaction-upgrade-entry'.
civodul pushed a commit to branch master
in repository guix.
commit 84c5da08dda4fa8fd0e0f1e6a8a115190005f84a
Author: Ludovic Courtès
AuthorDate: Thu Jan 16 10:57:19 2020 +0100
guix package: Export 'transaction-upgrade-entry'.
* guix/scripts/package.scm (transaction-upgrade-entry): Add 'store'
parameter and use it instead of (%store). Export.
* tests/packages.scm ("transaction-upgrade-entry, zero upgrades")
("transaction-upgrade-entry, one upgrade")
("transaction-upgrade-entry, superseded package"): Adjust accordingly.
---
guix/scripts/package.scm | 8 +---
tests/packages.scm | 11 +++
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 0fe25ae..f4d92a6 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -63,6 +63,8 @@
delete-matching-generations
guix-package
+transaction-upgrade-entry ;mostly for testing
+
(%options . %package-options)
(%default-options . %package-default-options)
guix-package*))
@@ -205,7 +207,7 @@ non-zero relevance score."
(package-full-name package2))
(> score1 score2))
-(define (transaction-upgrade-entry entry transaction)
+(define (transaction-upgrade-entry store entry transaction)
"Return a variant of TRANSACTION that accounts for the upgrade of ENTRY, a
."
(define (supersede old new)
@@ -242,7 +244,7 @@ non-zero relevance score."
transaction)
((=)
(let ((candidate-path (derivation->output-path
- (package-derivation (%store) pkg
+ (package-derivation store pkg
;; XXX: When there are propagated inputs, assume we need to
;; upgrade the whole entry.
(if (and (string=? path candidate-path)
@@ -600,7 +602,7 @@ and upgrades."
(define upgraded
(fold (lambda (entry transaction)
(if (upgrade? (manifest-entry-name entry))
-(transaction-upgrade-entry entry transaction)
+(transaction-upgrade-entry (%store) entry transaction)
transaction))
transaction
(manifest-entries manifest)))
diff --git a/tests/packages.scm b/tests/packages.scm
index 423c506..1ff35ec 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic
Courtès
;;; Copyright © Jan (janneke) Nieuwenhuizen
;;;
;;; This file is part of GNU Guix.
@@ -100,7 +100,8 @@
(let* ((old (dummy-package "foo" (version "1")))
(tx (mock ((gnu packages) find-best-packages-by-name
(const '()))
-((@@ (guix scripts package) transaction-upgrade-entry)
+(transaction-upgrade-entry
+ #f ;no store access needed
(manifest-entry
(inherit (package->manifest-entry old))
(item (string-append (%store-prefix) "/"
@@ -113,7 +114,8 @@
(new (dummy-package "foo" (version "2")))
(tx (mock ((gnu packages) find-best-packages-by-name
(const (list new)))
-((@@ (guix scripts package) transaction-upgrade-entry)
+(transaction-upgrade-entry
+ #f ;no store access needed
(manifest-entry
(inherit (package->manifest-entry old))
(item (string-append (%store-prefix) "/"
@@ -130,7 +132,8 @@
(dep (deprecated-package "foo" new))
(tx (mock ((gnu packages) find-best-packages-by-name
(const (list dep)))
-((@@ (guix scripts package) transaction-upgrade-entry)
+(transaction-upgrade-entry
+ #f ;no store access needed
(manifest-entry
(inherit (package->manifest-entry old))
(item (string-append (%store-prefix) "/"
05/06: gnu: guile-picture-language: Add "guile3.0-picture-language" variant.
civodul pushed a commit to branch master
in repository guix.
commit 4f4086848bd6c2eb2c85ede3822778a116d1ce71
Author: Ludovic Courtès
AuthorDate: Thu Jan 16 16:43:35 2020 +0100
gnu: guile-picture-language: Add "guile3.0-picture-language" variant.
* gnu/packages/guile-xyz.scm (guile3.0-picture-language): New variable.
---
gnu/packages/guile-xyz.scm | 6 ++
1 file changed, 6 insertions(+)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index dadbce8..cf63253 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2064,6 +2064,12 @@ format is also supported.")
The picture values can directly be displayed in Geiser.")
(license license:lgpl3+
+(define-public guile3.0-picture-language
+ (package
+(inherit guile-picture-language)
+(name "guile3.0-picture-language")
+(inputs `(("guile" ,guile-3.0)
+
(define-public guile-studio
(package
(name "guile-studio")
06/06: gnu: guile-syntax-highlight: Add "guile3.0-syntax-highlight" variant.
civodul pushed a commit to branch master
in repository guix.
commit fb8a77f456725ed6250bb57f58197f9954f30e57
Author: Ludovic Courtès
AuthorDate: Thu Jan 16 16:48:05 2020 +0100
gnu: guile-syntax-highlight: Add "guile3.0-syntax-highlight" variant.
* gnu/packages/guile-xyz.scm (guile-syntax-highlight)[source]: Add
'snippet' and 'modules'.
(guile3.0-syntax-highlight): New field.
---
gnu/packages/guile-xyz.scm | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index cf63253..9edb718 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -544,7 +544,15 @@ is not available for Guile 2.0.")
version ".tar.gz"))
(sha256
(base32
-"1p771kq15x83483m23bhah1sz6vkalg3drm7x279f4j1cxligkzi"
+"1p771kq15x83483m23bhah1sz6vkalg3drm7x279f4j1cxligkzi"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Allow builds with Guile 3.0.
+ (substitute* "configure"
+(("2\\.2 2\\.0")
+ "3.0 2.2 2.0"))
+ #t
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@@ -558,6 +566,12 @@ HTML (via SXML) or any other format for rendering.")
(home-page "http://dthompson.us/projects/guile-syntax-highlight.html;)
(license license:lgpl3+)))
+(define-public guile3.0-syntax-highlight
+ (package
+(inherit guile-syntax-highlight)
+(name "guile3.0-syntax-highlight")
+(inputs `(("guile" ,guile-3.0)
+
(define-public guile-sjson
(package
(name "guile-sjson")
branch master updated: gnu: Update copyright header.
This is an automated email from the git hooks/post-receive script. ngz pushed a commit to branch master in repository guix. The following commit(s) were added to refs/heads/master by this push: new a2548a3 gnu: Update copyright header. a2548a3 is described below commit a2548a3b5efb1ff17b19bc86e86940875c0a9f40 Author: Nicolas Goaziou AuthorDate: Thu Jan 16 18:06:36 2020 +0100 gnu: Update copyright header. * gnu/packages/python-xyz.scm: Update copyright header. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 41a2df0..054974d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -51,7 +51,7 @@ ;;; Copyright © 2018 Mathieu Lirzin ;;; Copyright © 2018 Adam Massmann ;;; Copyright © 2016, 2018 Tomáš Čech -;;; Copyright © 2018, 2019 Nicolas Goaziou +;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018, 2019 Clément Lassieur ;;; Copyright © 2018, 2019 Maxim Cournoyer
01/02: gnu: lmdb: Update to 0.9.24.
nckx pushed a commit to branch master in repository guix. commit a8fa39cd0877ac5db5cb46dbf7335b44454b94d8 Author: Tobias Geerinckx-Rice AuthorDate: Thu Jan 16 02:08:25 2020 +0100 gnu: lmdb: Update to 0.9.24. * gnu/packages/databases.scm (lmdb): Update to 0.9.24. --- gnu/packages/databases.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 283ba02..be9611a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2017 Adriano Peluso ;;; Copyright © 2017 Arun Isaac -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018 Alex Vong ;;; Copyright © 2017, 2018 Ben Woodcroft ;;; Copyright © 2017 Rutger Helling @@ -2064,7 +2064,7 @@ database.") (define-public lmdb (package (name "lmdb") -(version "0.9.23") +(version "0.9.24") (source (origin (method git-fetch) @@ -2073,7 +2073,7 @@ database.") (commit (string-append "LMDB_" version (file-name (git-file-name name version)) (sha256 -(base32 "0ag7l5180ajvm73y59m7sn3p52xm8m972d08cshxhpwgwa4v35k6" +(base32 "088q6m8fvr12w43s461h7cvpg5hj8csaqj6n9pci150dz7bk5lxm" (build-system gnu-build-system) (arguments `(#:test-target "test"
02/02: gnu: neomutt: Update to 20191207.
nckx pushed a commit to branch master
in repository guix.
commit d7df48fad44fd10d795be4577acddcf106049d0b
Author: Tobias Geerinckx-Rice
AuthorDate: Thu Jan 16 17:25:01 2020 +0100
gnu: neomutt: Update to 20191207.
* gnu/packages/mail.scm (neomutt): Update to 20191207.
---
gnu/packages/mail.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index c49ed76..d32fd3f 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -405,7 +405,7 @@ operating systems.")
(define-public neomutt
(package
(name "neomutt")
-(version "20191102")
+(version "20191207")
(source
(origin
(method git-fetch)
@@ -414,7 +414,7 @@ operating systems.")
(commit version)))
(file-name (git-file-name name version))
(sha256
-(base32 "0x5f9zbvxsxg5y2ir4xq4xw1q2snaxkidhdyhcxw5ljw3qqwhlyq"
+(base32 "147yjpqnsbfy01fhsflxlixk0985r91a6bjmqq3cwmf7gka3sihm"
(build-system gnu-build-system)
(inputs
`(("cyrus-sasl" ,cyrus-sasl)
branch master updated (1b4c5af -> d7df48f)
nckx pushed a change to branch master in repository guix. from 1b4c5af gnu: asymptote: Fix GUI. new a8fa39c gnu: lmdb: Update to 0.9.24. new d7df48f gnu: neomutt: Update to 20191207. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/databases.scm | 6 +++--- gnu/packages/mail.scm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
02/03: gnu: Add python-cson.
ngz pushed a commit to branch master
in repository guix.
commit 07c8177b885f1fca367b9cf8befc3328392d79c2
Author: Nicolas Goaziou
AuthorDate: Thu Jan 16 16:49:43 2020 +0100
gnu: Add python-cson.
* gnu/packages/python-xyz.scm (python-cson): New variable.
---
gnu/packages/python-xyz.scm | 19 +++
1 file changed, 19 insertions(+)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 97da097..41a2df0 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -17094,3 +17094,22 @@ that take parsers as their arguments and return them
as result values.")
(description "This package is a PEG-based parser and interpreter with
memoization.")
(license license:expat)))
+
+(define-public python-cson
+ (package
+(name "python-cson")
+(version "0.8")
+(source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "cson" version))
+ (sha256
+(base32 "00cyvigg4npbph39ghkg77xbxisa6plf75vii24igxfizik0337f"
+(build-system python-build-system)
+(propagated-inputs
+ `(("python-speg" ,python-speg)))
+(home-page "https://github.com/avakar/pycson;)
+(synopsis "Parser for Coffeescript Object Notation (CSON)")
+(description "This package is a parser for Coffeescript Object
+Notation (CSON).")
+(license license:expat)))
03/03: gnu: asymptote: Fix GUI.
ngz pushed a commit to branch master
in repository guix.
commit 1b4c5af29c364969dbeb33681d641640283fbced
Author: Nicolas Goaziou
AuthorDate: Thu Jan 16 17:00:53 2020 +0100
gnu: asymptote: Fix GUI.
Fixes bug#39147.
* gnu/packages/plotutils.scm (asymptote)[inputs]: Add missing inputs.
[arguments]: Wrap GUI executable "xasy".
---
gnu/packages/plotutils.scm | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 8a3afc9..7d9b2d8 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -37,7 +37,9 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-xyz)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages qt)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages tex)
#:use-module (gnu packages compression)
@@ -196,7 +198,7 @@ colors, styles, options and details.")
`(("emacs" ,emacs-minimal)
("gs" ,ghostscript) ;For tests
("perl" ,perl)
- ("texinfo" ,texinfo) ;For generating documentation
+ ("texinfo" ,texinfo) ;For generating documentation
;; For the manual and the tests.
("texlive" ,(texlive-union (list texlive-amsfonts
texlive-epsf
@@ -214,6 +216,8 @@ colors, styles, options and details.")
("gsl" ,gsl)
("libgc" ,libgc)
("python" ,python)
+ ("python-cson" ,python-cson)
+ ("python-pyqt" ,python-pyqt)
("readline" ,readline)
("zlib" ,zlib)))
(arguments
@@ -271,6 +275,14 @@ colors, styles, options and details.")
(for-each (cut install-file <> lisp-dir)
(find-files "." "\\.el$"))
(emacs-generate-autoloads ,name lisp-dir))
+ #t))
+ (add-after 'install-Emacs-data 'wrap-python-script
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Make sure 'xasy' runs with the correct PYTHONPATH.
+ (let* ((out (assoc-ref outputs "out"))
+(path (getenv "PYTHONPATH")))
+ (wrap-program (string-append out "/share/asymptote/GUI/xasy.py")
+ `("PYTHONPATH" ":" prefix (,path
#t)
(home-page "http://asymptote.sourceforge.net;)
(synopsis "Script-based vector graphics language")
branch master updated (d14e474 -> 1b4c5af)
ngz pushed a change to branch master in repository guix. from d14e474 repl: Fix '--help' message. new 602f3b6 gnu: Add python-speg. new 07c8177 gnu: Add python-cson. new 1b4c5af gnu: asymptote: Fix GUI. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/plotutils.scm | 14 +- gnu/packages/python-xyz.scm | 40 2 files changed, 53 insertions(+), 1 deletion(-)
01/03: gnu: Add python-speg.
ngz pushed a commit to branch master
in repository guix.
commit 602f3b679325c30b62201999f1d4f211f08fc0e5
Author: Nicolas Goaziou
AuthorDate: Thu Jan 16 16:49:23 2020 +0100
gnu: Add python-speg.
* gnu/packages/python-xyz.scm (python-speg): New variable.
---
gnu/packages/python-xyz.scm | 21 +
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 479466c..97da097 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -17073,3 +17073,24 @@ scripts to load entry points more quickly.")
functional combinators. Parser combinators are just higher-order functions
that take parsers as their arguments and return them as result values.")
(license license:expat)))
+
+(define-public python-speg
+ (package
+(name "python-speg")
+(version "0.3")
+(source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "speg" version ".zip"))
+ (sha256
+(base32 "0w9y4jf4787dzhy6rvhwi0mpl0r8qkqmqmyv2hpwdpv8w53yzjqh"
+(arguments
+ `(#:tests? #f));FIXME: tests fail, not sure why
+(native-inputs
+ `(("unzip" ,unzip)))
+(build-system python-build-system)
+(home-page "https://github.com/avakar/speg;)
+(synopsis "PEG-based parser interpreter with memoization")
+(description "This package is a PEG-based parser and interpreter with
+memoization.")
+(license license:expat)))
branch master updated (ba07842 -> d14e474)
ambrevar pushed a change to branch master in repository guix. from ba07842 gnu: cuirass: Update to 0.0.1-27.46f73b6. new ee9a735 graph: Add '--load-path' option. new 2d4688c size: Add '--load-path' option. new 21f4fbd refresh: Add '--load-path' option. new 3c8396b edit: Add '--load-path' option. new e872886 repl: Add '--load-path' option. new d14e474 repl: Fix '--help' message. The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: doc/guix.texi| 45 - guix/scripts/edit.scm| 10 +- guix/scripts/graph.scm | 8 guix/scripts/refresh.scm | 18 ++ guix/scripts/repl.scm| 12 +++- guix/scripts/size.scm| 8 tests/guix-graph.sh | 27 +-- 7 files changed, 119 insertions(+), 9 deletions(-)
01/06: graph: Add '--load-path' option.
ambrevar pushed a commit to branch master
in repository guix.
commit ee9a735bc8f544cf8eedc6c6a7e4ed2962663013
Author: Pierre Neidhardt
AuthorDate: Thu Jan 16 15:16:02 2020 +0100
graph: Add '--load-path' option.
* guix/scripts/graph.scm (%option): Add '--load-path' option.
* doc/guix.texi: Document it.
* tests/guix-graph.sh: Test it.
---
doc/guix.texi | 9 +
guix/scripts/graph.scm | 8
tests/guix-graph.sh| 27 +--
3 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index d2038d1..a490a09 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -70,6 +70,7 @@ Copyright @copyright{} 2019 Kyle Andrews@*
Copyright @copyright{} 2019 Alex Griffin@*
Copyright @copyright{} 2019 Guillaume Le Vaillant@*
Copyright @copyright{} 2020 Leo Prikler@*
+Copyright @copyright{} 2019 Simon Tournier@*
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -10038,6 +10039,14 @@ Display the graph for @var{system}---e.g.,
@code{i686-linux}.
The package dependency graph is largely architecture-independent, but there
are some architecture-dependent bits that this option allows you to visualize.
+
+@item --load-path=@var{directory}
+@itemx -L @var{directory}
+Add @var{directory} to the front of the package module search path
+(@pxref{Package Modules}).
+
+This allows users to define their own packages and make them visible to
+the command-line tools.
@end table
On top of that, @command{guix graph} supports all the usual package
diff --git a/guix/scripts/graph.scm b/guix/scripts/graph.scm
index 7558cb1..53f407b 100644
--- a/guix/scripts/graph.scm
+++ b/guix/scripts/graph.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
+;;; Copyright © 2019 Simon Tournier
;;;
;;; This file is part of GNU Guix.
;;;
@@ -35,6 +36,7 @@
#:use-module ((guix scripts build)
#:select (show-transformation-options-help
options->transformation
+ %standard-build-options
%transformation-options))
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
@@ -473,6 +475,9 @@ package modules, while attempting to retain user package
modules."
(lambda (opt name arg result)
(alist-cons 'system arg
(alist-delete 'system result eq?
+ (find (lambda (option)
+(member "load-path" (option-names option)))
+ %standard-build-options)
(option '(#\h "help") #f #f
(lambda args
(show-help)
@@ -501,6 +506,9 @@ Emit a representation of the dependency graph of
PACKAGE...\n"))
(display (G_ "
-s, --system=SYSTEMconsider the graph for SYSTEM--e.g., \"i686-linux\""))
(newline)
+ (display (G_ "
+ -L, --load-path=DIRprepend DIR to the package module search path"))
+ (newline)
(show-transformation-options-help)
(newline)
(display (G_ "
diff --git a/tests/guix-graph.sh b/tests/guix-graph.sh
index 2d4b3fa..4c37b61 100644
--- a/tests/guix-graph.sh
+++ b/tests/guix-graph.sh
@@ -1,5 +1,6 @@
# GNU Guix --- Functional package management for GNU
# Copyright © 2015, 2016, 2019 Ludovic Courtès
+# Copyright © 2019 Simon Tournier
#
# This file is part of GNU Guix.
#
@@ -20,10 +21,29 @@
# Test the 'guix graph' command-line utility.
#
-tmpfile1="t-guix-graph1-$$"
-tmpfile2="t-guix-graph2-$$"
+module_dir="t-guix-graph-$$"
+mkdir "$module_dir"
+trap "rm -rf $module_dir" EXIT
+
+tmpfile1="$module_dir/t-guix-graph1-$$"
+tmpfile2="$module_dir/t-guix-graph2-$$"
trap 'rm -f "$tmpfile1" "$tmpfile2"' EXIT
+
+cat > "$module_dir/foo.scm"<
04/06: edit: Add '--load-path' option.
ambrevar pushed a commit to branch master
in repository guix.
commit 3c8396b578fe1b2efa942785e92a433c5f712b5d
Author: zimoun
AuthorDate: Wed Jan 15 18:00:04 2020 +0100
edit: Add '--load-path' option.
* guix/scripts/edit.scm (%option): Add '--load-path' option.
* doc/guix.texi: Document it.
---
doc/guix.texi | 4
guix/scripts/edit.scm | 10 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index a05ea17..87ad121 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -8706,6 +8706,10 @@ have created your own packages on
@code{GUIX_PACKAGE_PATH}
recipes. In other cases, you will be able to examine the read-only recipes
for packages currently in the store.
+Instead of @code{GUIX_PACKAGE_PATH}, the command-line option
+@code{--load-path=@var{directory}} (or in short @code{-L
+@var{directory}}) allows you to add @var{directory} to the front of the
+package module search path and so make your own packages visible.
@node Invoking guix download
@section Invoking @command{guix download}
diff --git a/guix/scripts/edit.scm b/guix/scripts/edit.scm
index da3d277..a6fd1d2 100644
--- a/guix/scripts/edit.scm
+++ b/guix/scripts/edit.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2019 Ludovic Courtès
;;; Copyright © 2015 Mathieu Lirzin
+;;; Copyright © 2020 Simon Tournier
;;;
;;; This file is part of GNU Guix.
;;;
@@ -20,6 +21,7 @@
(define-module (guix scripts edit)
#:use-module (guix ui)
#:use-module (guix scripts)
+ #:use-module ((guix scripts build) #:select (%standard-build-options))
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (srfi srfi-1)
@@ -28,7 +30,10 @@
guix-edit))
(define %options
- (list (option '(#\h "help") #f #f
+ (list (find (lambda (option)
+(member "load-path" (option-names option)))
+ %standard-build-options)
+(option '(#\h "help") #f #f
(lambda args
(show-help)
(exit 0)))
@@ -41,6 +46,9 @@
Start $VISUAL or $EDITOR to edit the definitions of PACKAGE...\n"))
(newline)
(display (G_ "
+ -L, --load-path=DIRprepend DIR to the package module search path"))
+ (newline)
+ (display (G_ "
-h, --help display this help and exit"))
(display (G_ "
-V, --version display version information and exit"))
02/06: size: Add '--load-path' option.
ambrevar pushed a commit to branch master
in repository guix.
commit 2d4688c1ea64f07866ffe976391d7ec3d371f6b5
Author: zimoun
AuthorDate: Wed Jan 15 18:00:02 2020 +0100
size: Add '--load-path' option.
* guix/scripts/size.scm (%option): Add '--load-path' option.
* doc/guix.texi: Document it.
---
doc/guix.texi | 7 +++
guix/scripts/size.scm | 8
2 files changed, 15 insertions(+)
diff --git a/doc/guix.texi b/doc/guix.texi
index a490a09..cbaca4a 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -9838,6 +9838,13 @@ the case, @command{guix size} fails as it tries to load
it.
@itemx -s @var{system}
Consider packages for @var{system}---e.g., @code{x86_64-linux}.
+@item --load-path=@var{directory}
+@itemx -L @var{directory}
+Add @var{directory} to the front of the package module search path
+(@pxref{Package Modules}).
+
+This allows users to define their own packages and make them visible to
+the command-line tools.
@end table
@node Invoking guix graph
diff --git a/guix/scripts/size.scm b/guix/scripts/size.scm
index f549ce0..2446b84 100644
--- a/guix/scripts/size.scm
+++ b/guix/scripts/size.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
+;;; Copyright © 2019 Simon Tournier
;;;
;;; This file is part of GNU Guix.
;;;
@@ -19,6 +20,7 @@
(define-module (guix scripts size)
#:use-module (guix ui)
#:use-module (guix scripts)
+ #:use-module (guix scripts build)
#:use-module (guix store)
#:use-module (guix monads)
#:use-module (guix combinators)
@@ -242,6 +244,9 @@ Report the size of PACKAGE and its dependencies.\n"))
-m, --map-file=FILEwrite to FILE a graphical map of disk usage"))
(newline)
(display (G_ "
+ -L, --load-path=DIRprepend DIR to the package module search path"))
+ (newline)
+ (display (G_ "
-h, --help display this help and exit"))
(display (G_ "
-V, --version display version information and exit"))
@@ -273,6 +278,9 @@ Report the size of PACKAGE and its dependencies.\n"))
(option '(#\m "map-file") #t #f
(lambda (opt name arg result)
(alist-cons 'map-file arg result)))
+(find (lambda (option)
+(member "load-path" (option-names option)))
+ %standard-build-options)
(option '(#\h "help") #f #f
(lambda args
(show-help)
