diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-17 10:07:35 -0500 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-17 11:47:09 -0500 |
commit | 276f40fdc349d2ad62582b23ea55e061b689cfc0 (patch) | |
tree | 8052d91aee78cf0d4317b41ec52134fde48fa5fb /gnu/packages/crates-graphics.scm | |
parent | b2f6b6f6b9df6bcc24794238e7e97357470af95d (diff) | |
parent | 6ba510d76d6847065be725e958718002f3b13c7a (diff) | |
download | guix-patches-276f40fdc349d2ad62582b23ea55e061b689cfc0.tar guix-patches-276f40fdc349d2ad62582b23ea55e061b689cfc0.tar.gz |
Merge branch 'version-1.4.0'
With resolved conflicts in:
gnu/packages/gnome.scm
gnu/packages/openstack.scm
gnu/packages/python-xyz.scm
Diffstat (limited to 'gnu/packages/crates-graphics.scm')
-rw-r--r-- | gnu/packages/crates-graphics.scm | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index b3319e4ac1..2658f1b20a 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -192,10 +192,10 @@ text or blue underlined text, on ANSI terminals.") "1xif1bh938qpfc3d0f9xgidibpm65xix11w9gszwqnia00q7rb13")))) (arguments `()))) -(define-public rust-aom-sys-0.2 +(define-public rust-aom-sys-0.3 (package (name "rust-aom-sys") - (version "0.2.1") + (version "0.3.0") (source (origin (method url-fetch) @@ -204,7 +204,7 @@ text or blue underlined text, on ANSI terminals.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "03a0xhaafjn0hlpcf9ba73hv557m0jqnmj9wl57wzrcnka96zvgj")))) + "0dhikfl7l5nacspajbllbhhysad3vl845cpfplqgm5mf67nmx9w8")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -219,30 +219,6 @@ text or blue underlined text, on ANSI terminals.") (description "This package provides FFI bindings to aom.") (license license:expat))) -(define-public rust-aom-sys-0.1 - (package - (inherit rust-aom-sys-0.2) - (name "rust-aom-sys") - (version "0.1.4") - (source - (origin - (method url-fetch) - (uri (crate-uri "aom-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1bqcpkycv1d67r6jcl9npfbw6rkl829rdq9w6vlpb0rjqxp0xzsn")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-bindgen" ,rust-bindgen-0.53) - ("rust-metadeps" ,rust-metadeps-1)))) - (native-inputs - (list pkg-config)) - (inputs - (list libaom clang llvm)))) - (define-public rust-ascii-canvas-2 (package (name "rust-ascii-canvas") |