ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-17 20:27:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: rust-bitflags-1: Absorb rust-bitflags-1.3.

Browse source 
* 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.
This commit is contained in:
Maxim Cournoyer 2021-12-17 16:03:19 -05:00
parent 1bd169b5dc
commit a400a64227
No known key found for this signature in database
GPG key ID: 1260E46482E63562
2 changed files with 16 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
gnu/packages/crates-io.scm
View file

@ -6126,30 +6126,6 @@ (define-public rust-bitfield-0.13
(define-public rust-bitflags-1 (define-public rust-bitflags-1
(package (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") (name "rust-bitflags")
(version "1.3.2") (version "1.3.2")
(source (source
@ -6159,6 +6135,7 @@ (define-public rust-bitflags-1.3
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 "12ki6w8gn1ldq7yz9y680llwk5gmrhrzszaa17g1sbrw2r2qvwxy")))) (base32 "12ki6w8gn1ldq7yz9y680llwk5gmrhrzszaa17g1sbrw2r2qvwxy"))))
(build-system cargo-build-system)
(arguments (arguments
`(#:tests? #f ; Tests require rust-1.46 or newer. `(#:tests? #f ; Tests require rust-1.46 or newer.
#:cargo-inputs #:cargo-inputs
@ -6170,7 +6147,13 @@ (define-public rust-bitflags-1.3
("rust-serde-derive" ,rust-serde-derive-1) ("rust-serde-derive" ,rust-serde-derive-1)
("rust-serde-json" ,rust-serde-json-1) ("rust-serde-json" ,rust-serde-json-1)
("rust-trybuild" ,rust-trybuild-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 (define-public rust-bitflags-0.9
(package (package

2
gnu/packages/syndication.scm
View file

@ -247,7 +247,7 @@ (define-public newsboat
#:install-source? #f #:install-source? #f
#:cargo-inputs #:cargo-inputs
(("rust-backtrace" ,rust-backtrace-0.3) (("rust-backtrace" ,rust-backtrace-0.3)
("rust-bitflags" ,rust-bitflags-1.3) ("rust-bitflags" ,rust-bitflags-1)
("rust-chrono" ,rust-chrono-0.4) ("rust-chrono" ,rust-chrono-0.4)
("rust-clap" ,rust-clap-2) ("rust-clap" ,rust-clap-2)
("rust-curl-sys" ,rust-curl-sys-0.4) ("rust-curl-sys" ,rust-curl-sys-0.4)