diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 12:51:57 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 13:11:40 -0400 |
| commit | 5e2140511c1ad9ccd731438b74d61b62111da1e6 (patch) | |
| tree | a4ff748ad26e121b88469b5d921001ef1382be8f /gnu/packages/sequoia.scm | |
| parent | 9e3a5ee417ea7fe9721be8804ff047e80c4f22ed (diff) | |
| parent | 353bdae32f72b720c7ddd706576ccc40e2b43f95 (diff) | |
| download | guix-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar.gz guix-5e2140511c1ad9ccd731438b74d61b62111da1e6.zip | |
Merge branch 'staging'
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/gdb.scm
gnu/packages/llvm.scm
gnu/packages/package-management.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/sequoia.scm')
| -rw-r--r-- | gnu/packages/sequoia.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index 714f2b5ab0..8f2b351031 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -83,7 +83,7 @@ ("rust-dirs" ,rust-dirs-2.0) ;;("rust-failure" included ("rust-filetime" ,rust-filetime-0.2) - ("rust-flate2" ,rust-flate2-1.0) + ("rust-flate2" ,rust-flate2-1) ("rust-fs2" ,rust-fs2-0.4) ("rust-futures" ,rust-futures-0.1) ("rust-http" ,rust-http-0.1) @@ -98,7 +98,7 @@ ("rust-native-tls" ,rust-native-tls-0.2) ("rust-nettle" ,rust-nettle-7) ("rust-parity-tokio-ipc" ,rust-parity-tokio-ipc-0.4) - ("rust-percent-encoding" ,rust-percent-encoding-2.1) + ("rust-percent-encoding" ,rust-percent-encoding-2) ("rust-prettytable-rs" ,rust-prettytable-rs-0.8) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quickcheck" ,rust-quickcheck-0.9) @@ -107,11 +107,11 @@ ("rust-rusqlite" ,rust-rusqlite-0.19) ("rust-structopt" ,rust-structopt-0.3) ("rust-tempfile" ,rust-tempfile-3) - ("rust-thiserror" ,rust-thiserror-1.0) + ("rust-thiserror" ,rust-thiserror-1) ("rust-tokio" ,rust-tokio-0.1) ("rust-tokio-core" ,rust-tokio-core-0.1) ("rust-unicode-normalization" ,rust-unicode-normalization-0.1) - ("rust-url" ,rust-url-2.1) + ("rust-url" ,rust-url-2) ("rust-zbase32" ,rust-zbase32-0.1)) #:cargo-development-inputs (("rust-bindgen" ,rust-bindgen-0.51) ;; FIXME for nettle-sys and rusqlite |