unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Aaron Covrig via Guix-patches via <guix-patches@gnu.org>
To: 69620@debbugs.gnu.org
Cc: Aaron Covrig <aaron.covrig.us@ieee.org>
Subject: [bug#69620] [rust-team v3 8/9] gnu: Bumps rust-rocket-0.4 to 0.4.11
Date: Sun, 24 Mar 2024 11:20:00 -0400	[thread overview]
Message-ID: <20240324152001.148236-10-aaron.covrig.us@ieee.org> (raw)
In-Reply-To: <20240324152001.148236-2-aaron.covrig.us@ieee.org>

* gnu/packages/crates-web.scm (rust-rocket-0.4): Bumps to 0.4.11 and
  enables building
---
 gnu/packages/crates-web.scm | 56 ++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index fbdce9e9f6..bf848a9f54 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -4634,31 +4634,49 @@ (define-public rust-rocket-0.4
   (package
     (inherit rust-rocket-0.5)
     (name "rust-rocket")
-    (version "0.4.7")
+    (version "0.4.11")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rocket" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "04ybnhjw92zaan92lsmx6mkhqc9cpsg3885svb3wzyj39pyzvsvz"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-atty" ,rust-atty-0.2)
-        ("rust-base64" ,rust-base64-0.12)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-memchr" ,rust-memchr-2)
-        ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-pear" ,rust-pear-0.1)
-        ("rust-rocket-codegen" ,rust-rocket-codegen-0.4)
-        ("rust-rocket-http" ,rust-rocket-http-0.4)
-        ("rust-state" ,rust-state-0.4)
-        ("rust-time" ,rust-time-0.1)
-        ("rust-toml" ,rust-toml-0.4)
-        ("rust-version-check" ,rust-version-check-0.9)
-        ("rust-yansi" ,rust-yansi-0.5)
-        ("rust-yansi" ,rust-yansi-0.5))))))
+        (base32 "0pimz9v0737dvz487j0kij7kasjyahaxd7ba2bcc3p6513fdkfc3"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   ;; enable nightly/dev in build.rs for RUSTC_BOOTSTRAP build
+                   (substitute* "build.rs"
+                     (("if !channel.supports_features")
+                      "/* if !channel.supports_features")
+                     (("if !version.at_least")
+                      "*/ \nif !version.at_least"))
+                   ;; Add missing development dependency (for tests)
+                   (substitute* "Cargo.toml"
+                     (("\\[features\\]" all)
+                      (string-append "[dev-dependencies.lazy_static]" "\n"
+                                     "version = \"1\"" "\n" all))) #t))))
+    (arguments
+     `(#:cargo-inputs (("rust-atty" ,rust-atty-0.2)
+                       ("rust-base64" ,rust-base64-0.12)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-num-cpus" ,rust-num-cpus-1)
+                       ("rust-pear" ,rust-pear-0.1)
+                       ("rust-rocket-codegen" ,rust-rocket-codegen-0.4)
+                       ("rust-rocket-http" ,rust-rocket-http-0.4)
+                       ("rust-state" ,rust-state-0.4)
+                       ("rust-time" ,rust-time-0.1)
+                       ("rust-toml" ,rust-toml-0.4)
+                       ("rust-version-check" ,rust-version-check-0.9)
+                       ("rust-yansi" ,rust-yansi-0.5)
+                       ("rust-yansi" ,rust-yansi-0.5))
+       ;; Adding in missing dev dependency
+       #:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1))
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))))
 
 (define-public rust-rocket-codegen-0.5
   (package
-- 
2.41.0





  parent reply	other threads:[~2024-03-24 15:40 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-08  2:08 [bug#69620] [PATCH rust-team 0/2] Upgrading rust-rocket and rust-pear Aaron Covrig via Guix-patches via
2024-03-08  2:14 ` [bug#69620] [PATCH rust-team 1/2] gnu: rust-pear: Added version 0.2.8 with deps Aaron Covrig via Guix-patches via
2024-03-08  2:14   ` [bug#69620] [PATCH rust-team 2/2] gnu: rust-rocket: Upgraded and enabled full build Aaron Covrig via Guix-patches via
2024-03-08  2:37 ` [bug#69620] [PATCH rust-team v2 0/2] Update Aaron Covrig via Guix-patches via
2024-03-08  2:37   ` [bug#69620] [PATCH rust-team v2 1/2] gnu: rust-pear: Added version 0.2.8 with deps Aaron Covrig via Guix-patches via
2024-03-08  2:37   ` [bug#69620] [PATCH rust-team v2 2/2] gnu: rust-rocket: Upgraded and enabled full build Aaron Covrig via Guix-patches via
2024-03-24 15:19 ` [bug#69620] [rust-team v3 0/9] Enables building of rust-rocket Aaron Covrig via Guix-patches via
2024-03-24 15:19   ` [bug#69620] [rust-team v3 1/9] gnu: Add rust-inlinable-string-0.1 Aaron Covrig via Guix-patches via
2024-03-24 15:19   ` [bug#69620] [rust-team v3 2/9] gnu: Enables rust-pear-codegen-0.2 tests Aaron Covrig via Guix-patches via
2024-03-24 15:19   ` [bug#69620] [rust-team v3 3/9] gnu: Enables building rust-pear-codegen-0.1 Aaron Covrig via Guix-patches via
2024-03-24 15:19   ` [bug#69620] [rust-team v3 4/9] gnu: Enables building rust-pear-0.1 Aaron Covrig via Guix-patches via
2024-03-24 15:19   ` [bug#69620] [rust-team v3 5/9] gnu: Bumps rust-hyper-sync-rustls to 0.3.0-rc.17 Aaron Covrig via Guix-patches via
2024-03-24 15:19   ` [bug#69620] [rust-team v3 6/9] gnu: Bumps rust-rocket-codegen-0.4 to 0.4.11 Aaron Covrig via Guix-patches via
2024-03-24 15:19   ` [bug#69620] [rust-team v3 7/9] gnu: Bumps rust-rocket-http-0.4 " Aaron Covrig via Guix-patches via
2024-03-24 15:20   ` Aaron Covrig via Guix-patches via [this message]
2024-03-24 15:20   ` [bug#69620] [rust-team v3 9/9] gnu: Bumps rust-pear to v0.2.9 Aaron Covrig via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240324152001.148236-10-aaron.covrig.us@ieee.org \
    --to=guix-patches@gnu.org \
    --cc=69620@debbugs.gnu.org \
    --cc=aaron.covrig.us@ieee.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).