From a400a6422755897aa18e0768f0b47a577ad729f1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 17 Dec 2021 16:03:19 -0500 Subject: gnu: rust-bitflags-1: Absorb rust-bitflags-1.3. * gnu/packages/crates-io.scm (rust-bitflags-1.3): Delete variable, absorbed into... (rust-bitflags-1): ... this one. * gnu/packages/syndication.scm (newsboat)[cargo-inputs]: Adjust to use rust-bitflags-1. --- gnu/packages/crates-io.scm | 47 ++++++++++++++------------------------------ gnu/packages/syndication.scm | 2 +- 2 files changed, 16 insertions(+), 33 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 15e67d5561..ae9092a3d3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6126,41 +6126,18 @@ types.") (define-public rust-bitflags-1 (package - (name "rust-bitflags") - (version "1.2.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "bitflags" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "14qnd5nq8p2almk79m4m8ydqhd413yaxsyjp5xd19g3mikzf47fg")))) - (build-system cargo-build-system) - (home-page "https://github.com/bitflags/bitflags") - (synopsis "Macro to generate structures which behave like bitflags") - (description "This package provides a macro to generate structures which -behave like a set of bitflags.") - (license (list license:asl2.0 - license:expat)))) - -;; TODO: Absorb this package into rust-bitflags-1 in core-updates with the -;; newer version of rust so we don't have to track down all dependants of this -;; package to ensure a compatible version of rust. -(define-public rust-bitflags-1.3 - (package - (inherit rust-bitflags-1) (name "rust-bitflags") (version "1.3.2") (source - (origin - (method url-fetch) - (uri (crate-uri "bitflags" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "12ki6w8gn1ldq7yz9y680llwk5gmrhrzszaa17g1sbrw2r2qvwxy")))) + (origin + (method url-fetch) + (uri (crate-uri "bitflags" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "12ki6w8gn1ldq7yz9y680llwk5gmrhrzszaa17g1sbrw2r2qvwxy")))) + (build-system cargo-build-system) (arguments - `(#:tests? #f ; Tests require rust-1.46 or newer. + `(#:tests? #f ; Tests require rust-1.46 or newer. #:cargo-inputs (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)) @@ -6170,7 +6147,13 @@ behave like a set of bitflags.") ("rust-serde-derive" ,rust-serde-derive-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-trybuild" ,rust-trybuild-1) - ("rust-walkdir" ,rust-walkdir-2)))))) + ("rust-walkdir" ,rust-walkdir-2)))) + (home-page "https://github.com/bitflags/bitflags") + (synopsis "Macro to generate structures which behave like bitflags") + (description "This package provides a macro to generate structures which +behave like a set of bitflags.") + (license (list license:asl2.0 + license:expat)))) (define-public rust-bitflags-0.9 (package diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index e9f5de4737..ae1f9bdb02 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -247,7 +247,7 @@ cards.") #:install-source? #f #:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3) - ("rust-bitflags" ,rust-bitflags-1.3) + ("rust-bitflags" ,rust-bitflags-1) ("rust-chrono" ,rust-chrono-0.4) ("rust-clap" ,rust-clap-2) ("rust-curl-sys" ,rust-curl-sys-0.4) -- cgit v1.2.3 n>Simon Tournier 2022-11-11gnu: valgrind: Add version 3.20.0....Ludovic Courtès 2022-05-09gnu: valgrind: Remove input labels....Ludovic Courtès 2022-05-09gnu: valgrind: Allow ld.so symbols to be found....Denis 'GNUtoo' Carikli 2022-05-09gnu: valgrind: Sort imports alphabetically....Denis 'GNUtoo' Carikli 2022-02-16gnu: valgrind: Remove riscv64-linux from supported-systems....Efraim Flashner 2022-01-28gnu: valgrind: Add version 3.18.1....Ludovic Courtès 2021-12-13gnu: Simplify package inputs....Ludovic Courtès 2021-06-23gnu: valgrind: Update to 3.17.0....Chris Marusich 2020-06-27gnu: valgrind: Update to 3.16.1....Marius Bakke 2020-06-27gnu: valgrind: Don't depend on GDB....Marius Bakke 2020-05-17gnu: valgrind: Fix build on powerpc....Efraim Flashner 2020-04-28gnu: valgrind: Update source uri....Efraim Flashner