diff --git a/.guix/modules/crates-io.scm b/.guix/modules/crates-io.scm index ee74dc7..ad2b524 100644 --- a/.guix/modules/crates-io.scm +++ b/.guix/modules/crates-io.scm @@ -3533,7 +3533,7 @@ lazy-initialized intl formatters.") (home-page "https://github.com/unicode-org/icu4x") (synopsis "Custom derive for the zerovec crate") (description "Custom derive for the zerovec crate") - (license unknown-license!))) + (license #f))) (define-public rust-zerofrom-derive-0.1 (package @@ -3556,7 +3556,7 @@ lazy-initialized intl formatters.") (home-page "https://github.com/unicode-org/icu4x") (synopsis "Custom derive for the zerofrom crate") (description "Custom derive for the zerofrom crate") - (license unknown-license!))) + (license #f))) (define-public rust-zerofrom-0.1 (package @@ -3576,7 +3576,7 @@ lazy-initialized intl formatters.") (home-page "https://github.com/unicode-org/icu4x") (synopsis "ZeroFrom trait for constructing") (description "@code{ZeroFrom} trait for constructing") - (license unknown-license!))) + (license #f))) (define-public rust-yoke-derive-0.7 (package @@ -3599,7 +3599,7 @@ lazy-initialized intl formatters.") (home-page "https://github.com/unicode-org/icu4x") (synopsis "Custom derive for the yoke crate") (description "Custom derive for the yoke crate") - (license unknown-license!))) + (license #f))) (define-public rust-yoke-0.7 (package @@ -3625,7 +3625,7 @@ lazy-initialized intl formatters.") (description "Abstraction allowing borrowed data to be carried along with the backing data it borrows from") - (license unknown-license!))) + (license #f))) (define-public rust-t1ha-0.1 (package @@ -3675,7 +3675,7 @@ borrows from") (home-page "https://github.com/unicode-org/icu4x") (synopsis "Zero-copy vector backed by a byte array") (description "Zero-copy vector backed by a byte array") - (license unknown-license!))) + (license #f))) (define-public rust-synstructure-0.13 (package @@ -3721,7 +3721,7 @@ borrows from") (home-page "https://github.com/unicode-org/icu4x") (synopsis "Custom derive for the databake crate") (description "Custom derive for the databake crate") - (license unknown-license!))) + (license #f))) (define-public rust-databake-0.1 (package @@ -3745,7 +3745,7 @@ borrows from") "Trait that lets structs represent themselves as (const) Rust expressions") (description "Trait that lets structs represent themselves as (const) Rust expressions") - (license unknown-license!))) + (license #f))) (define-public rust-tinystr-0.7 (package @@ -3769,7 +3769,7 @@ borrows from") (synopsis "A small ASCII-only bounded length string representation.") (description "This package provides a small ASCII-only bounded length string representation.") - (license unknown-license!))) + (license #f))) (define-public rust-unic-langid-impl-0.9 (package @@ -5077,7 +5077,7 @@ to be linked into Rust code.") (home-page "https://github.com/briansmith/ring") (synopsis "Safe, fast, small crypto using Rust.") (description "Safe, fast, small crypto using Rust.") - (license unknown-license!))) + (license #f))) (define-public rust-rustls-webpki-0.101 (package diff --git a/.guix/modules/meowy-webring.scm b/.guix/modules/meowy-webring.scm index 6d2fd1d..e61b42f 100644 --- a/.guix/modules/meowy-webring.scm +++ b/.guix/modules/meowy-webring.scm @@ -13,6 +13,43 @@ (or (git-predicate (current-source-directory)) (const #t))) + +; temp package to debug build issues +(define-public proc-macros + (package + (name "proc-macros") + (version "0.1.0-git") + (source (local-file "../../crates/proc-macros" "proc-macros-checkout" + #:recursive? #t + #:select? keep-file?)) + (build-system cargo-build-system) + (arguments (list #:cargo-inputs `(("rust-syn" ,rust-syn-2) + ("rust-quote" ,rust-quote-1)))) + (synopsis "") + (description "") + (home-page "") + (license license:cc0))) + +; temp package to debug build issues +(define-public meowy-assets + (package + (name "meowy-assets") + (version "0.1.0-git") + (source (local-file "../../crates/meowy-assets" "meowy-assets-checkout" + #:recursive? #t + #:select? keep-file?)) + (build-system cargo-build-system) + (arguments (list #:cargo-inputs `(("proc-macros" ,proc-macros) + ("rust-askama-rocket" ,rust-askama-rocket-0.12) + ("rust-askama" ,rust-askama-0.12) + ("rust-embed" ,rust-embed-6) + ("rust-hex" ,rust-hex-0.4) + ("rust-rocket" ,rust-rocket-0.5)))) + (synopsis "") + (description "") + (home-page "") + (license license:cc0))) + (define-public meowy-webring (package (name "meowy-webring") @@ -21,8 +58,16 @@ #:recursive? #t #:select? keep-file?)) (build-system cargo-build-system) - (arguments (list #:cargo-inputs `(("rust-rocket" ,rust-rocket-0.5) - ("rust-serde" ,rust-serde-1)))) + (arguments (list #:cargo-inputs `(("rust-askama-rocket" ,rust-askama-rocket-0.12) + ("rust-askama" ,rust-askama-0.12) + ("rust-directories" ,rust-directories-5) + ("rust-embed" ,rust-embed-6) + ("rust-hex" ,rust-hex-0.4) + ("rust-notify" ,rust-notify-6) + ("rust-rocket" ,rust-rocket-0.5) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-simple-logger" ,rust-simple-logger-4)))) (synopsis "") (description "") (home-page "") diff --git a/Cargo.toml b/Cargo.toml index 510a1d1..0e88fb2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ lto = "thin" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies.rocket] -version = "=0.5.0-rc.3" +version = "0.5.0" default-features = false features = ["json"] diff --git a/crates/meowy-assets/Cargo.toml b/crates/meowy-assets/Cargo.toml index 1f29b66..3bc5581 100644 --- a/crates/meowy-assets/Cargo.toml +++ b/crates/meowy-assets/Cargo.toml @@ -9,19 +9,16 @@ edition = "2021" hex = "0.4" [dependencies.rocket] -version = "=0.5.0-rc.3" +version = "=0.5.0" default-features = false [dependencies.askama_rocket] -git = "https://github.com/djc/askama.git" package = "askama_rocket" -rev = "b9e51601560398766eac445517fb17c35090a952" +version = "0.12" default-features = false [dependencies.askama] -git = "https://github.com/djc/askama.git" package = "askama" -rev = "b9e51601560398766eac445517fb17c35090a952" version = "0.12" default-features = false