[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
18/145: gnu: rust-bitflags-1: Absorb rust-bitflags-1.3.
From: |
guix-commits |
Subject: |
18/145: gnu: rust-bitflags-1: Absorb rust-bitflags-1.3. |
Date: |
Mon, 10 Jan 2022 11:44:02 -0500 (EST) |
apteryx pushed a commit to branch version-1.4.0
in repository guix.
commit 1e8a3e5f1f609d40e2e91ac3edeb9de13a94e1e3
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Dec 17 16:03:19 2021 -0500
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 93878e5a97..58f85461ce 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -6043,41 +6043,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))
@@ -6087,7 +6064,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)
- 22/145: gnu: cairo: Use bash-minimal unconditionally., (continued)
- 22/145: gnu: cairo: Use bash-minimal unconditionally., guix-commits, 2022/01/10
- 26/145: gnu: glib: Fix cross-compilation., guix-commits, 2022/01/10
- 31/145: gnu: glibmm-2.64: Fix libsigc++ propagation., guix-commits, 2022/01/10
- 24/145: gnu: libcap: Use #$output unconditionally., guix-commits, 2022/01/10
- 41/145: gnu: gsettings-desktop-schemas: Add python to native inputs., guix-commits, 2022/01/10
- 35/145: gnu: cmake-bootstrap: Update to 3.21.4., guix-commits, 2022/01/10
- 10/145: gnu: Remove meson-0.59 workarounds., guix-commits, 2022/01/10
- 06/145: gnu: python-pyparsing: Update to 3.0.6., guix-commits, 2022/01/10
- 09/145: gnu: meson: Update to 0.60.2 and absorb meson-wrapped., guix-commits, 2022/01/10
- 16/145: gnu: binutils: Absorb binutils-next., guix-commits, 2022/01/10
- 18/145: gnu: rust-bitflags-1: Absorb rust-bitflags-1.3.,
guix-commits <=
- 29/145: gnu: pciutils: Fix the conditional for the kmod input., guix-commits, 2022/01/10
- 30/145: gnu: glibmm: Remove trailing #t., guix-commits, 2022/01/10
- 32/145: gnu: gnupg: Update to 2.2.32., guix-commits, 2022/01/10
- 20/145: gnu: mozjs-60: Use quasiquote, addressing TODO., guix-commits, 2022/01/10
- 33/145: gnu: util-linux: Update to 2.37.2., guix-commits, 2022/01/10
- 34/145: gnu: eudev: Update to 3.2.11., guix-commits, 2022/01/10
- 36/145: gnu: libpcap: Update to 2.62., guix-commits, 2022/01/10
- 39/145: gnu: rust-1.39: Update mrustc to commit c70665., guix-commits, 2022/01/10
- 42/145: gnu: python-gnupg: Update to 0.4.8., guix-commits, 2022/01/10
- 02/145: gnu: libx11: Update to 1.7.3.1., guix-commits, 2022/01/10