efraim pushed a commit to branch rust-team
in repository guix.
commit 2d9ed8f1b842f95832cbbb0507d0b630d4ee3a36
Author: Efraim Flashner <[email protected]>
AuthorDate: Thu Dec 26 20:42:39 2024 +0200
gnu: rust-diesel: Move to (gnu packages crates-database).
* gnu/packages/crates-io.scm (rust-diesel-2, rust-diesel-1,
rust-diesel-derives-2, rust-diesel-derives-1, rust-diesel-migrations-2,
rust-diesel-migrations-1, rust-diesel-table-macro-syntax-0.1): Move from
here ...
* gnu/packages/crates-database.scm: ... to here.
Change-Id: Iaf4c5bc4bbeef5b85dcabe086fc25a6cdb7db9a9
---
gnu/packages/crates-database.scm | 232 +++++++++++++++++++++++++++++++++++++++
gnu/packages/crates-io.scm | 229 --------------------------------------
gnu/packages/gnome.scm | 1 +
3 files changed, 233 insertions(+), 229 deletions(-)
diff --git a/gnu/packages/crates-database.scm b/gnu/packages/crates-database.scm
index 22f28175a2..7581c6b8f6 100644
--- a/gnu/packages/crates-database.scm
+++ b/gnu/packages/crates-database.scm
@@ -2,7 +2,10 @@
;;; Copyright © 2020 Hartmut Goebel <[email protected]>
;;; Copyright © 2020 Arun Isaac <[email protected]>
;;; Copyright © 2021 Nicolas Goaziou <[email protected]>
+;;; Copyright © 2021 Léo Le Bouter <[email protected]>
+;;; Copyright © 2021 Vinicius Monego <[email protected]>
;;; Copyright © 2021, 2023, 2024 Efraim Flashner <[email protected]>
+;;; Copyright © 2024 Giacomo Leidi <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -33,6 +36,235 @@
#:use-module (gnu packages databases)
#:use-module (gnu packages sqlite))
+(define-public rust-diesel-2
+ (package
+ (name "rust-diesel")
+ (version "2.1.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "diesel" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0ndmiv98xq2glkr4bqfq58fc3qncscfzx63xpj4ipwlqf30hbz03"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-test-flags
+ '("--release"
+ "--features" "sqlite")
+ #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.1)
+ ("rust-bitflags" ,rust-bitflags-2)
+ ("rust-byteorder" ,rust-byteorder-1)
+ ("rust-chrono" ,rust-chrono-0.4)
+ ("rust-diesel-derives" ,rust-diesel-derives-2)
+ ("rust-ipnet" ,rust-ipnet-2)
+ ("rust-ipnetwork" ,rust-ipnetwork-0.17)
+ ("rust-itoa" ,rust-itoa-1)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.20)
+ ("rust-mysqlclient-sys" ,rust-mysqlclient-sys-0.2)
+ ("rust-num-bigint" ,rust-num-bigint-0.2)
+ ("rust-num-integer" ,rust-num-integer-0.1)
+ ("rust-num-traits" ,rust-num-traits-0.2)
+ ("rust-percent-encoding" ,rust-percent-encoding-2)
+ ("rust-pq-sys" ,rust-pq-sys-0.4)
+ ("rust-quickcheck" ,rust-quickcheck-1)
+ ("rust-r2d2" ,rust-r2d2-0.8)
+ ("rust-serde-json" ,rust-serde-json-0.9)
+ ("rust-time" ,rust-time-0.3)
+ ("rust-url" ,rust-url-2)
+ ("rust-uuid" ,rust-uuid-0.7))
+ #:cargo-development-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-dotenvy" ,rust-dotenvy-0.15)
+ ("rust-ipnetwork" ,rust-ipnetwork-0.17)
+ ("rust-quickcheck" ,rust-quickcheck-1))))
+ (native-inputs (list sqlite))
+ (home-page "https://diesel.rs";)
+ (synopsis "Safe, extensible ORM and Query Builder")
+ (description "This package provides a safe, extensible ORM and Query
+Builder for PostgreSQL, SQLite, and MySQL.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-diesel-1
+ (package
+ (inherit rust-diesel-2)
+ (name "rust-diesel")
+ (version "1.4.8")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "diesel" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0kcfkfhsv5yv3ksj440ajgic930359i2bqi77ss4dm5pyvn3b0dj"))))
+ (arguments
+ `(#:cargo-test-flags
+ '("--release"
+ "--features" "sqlite"
+ "--"
+ "--skip=expression::count::count"
+ "--skip=macros::internal::parse_type_args_with_bounds"
+
"--skip=macros::internal::parse_type_args_with_bounds_containing_braces_and_commas"
+
"--skip=macros::internal::parse_type_args_with_existentials_and_lifetimes"
+ "--skip=macros::internal::parse_type_args_with_trailer")
+ #:cargo-inputs
+ (("rust-bigdecimal" ,rust-bigdecimal-0.1)
+ ("rust-bitflags" ,rust-bitflags-1)
+ ("rust-byteorder" ,rust-byteorder-1)
+ ("rust-chrono" ,rust-chrono-0.4)
+ ("rust-diesel-derives" ,rust-diesel-derives-1)
+ ("rust-ipnetwork" ,rust-ipnetwork-0.17)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.20)
+ ("rust-mysqlclient-sys" ,rust-mysqlclient-sys-0.2)
+ ("rust-num-bigint" ,rust-num-bigint-0.2)
+ ("rust-num-integer" ,rust-num-integer-0.1)
+ ("rust-num-traits" ,rust-num-traits-0.2)
+ ("rust-pq-sys" ,rust-pq-sys-0.4)
+ ("rust-quickcheck" ,rust-quickcheck-0.4)
+ ("rust-r2d2" ,rust-r2d2-0.8)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-time" ,rust-time-0.1)
+ ("rust-url" ,rust-url-1)
+ ("rust-uuid" ,rust-uuid-0.5)
+ ("rust-uuid" ,rust-uuid-0.8))
+ #:cargo-development-inputs
+ (("rust-cfg-if" ,rust-cfg-if-0.1)
+ ("rust-dotenv" ,rust-dotenv-0.10)
+ ("rust-quickcheck" ,rust-quickcheck-0.4)
+ ("rust-tempdir" ,rust-tempdir-0.3))))))
+
+(define-public rust-diesel-derives-2
+ (package
+ (name "rust-diesel-derives")
+ (version "2.1.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "diesel_derives" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "036f3i1hsl2m2c0basg28adc9rh3vnr2vp0xwvzi9rsah75yw0jx"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-test-flags
+ '("--release" "--"
+ "--skip=derive_insertable"
+ "--skip=derive_multiconnection"
+ "--skip=derive_queryable"
+ "--skip=derive_queryable_by_name")
+ #:cargo-inputs
+ (("rust-diesel-table-macro-syntax" ,rust-diesel-table-macro-syntax-0.1)
+ ("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-2))
+ #:cargo-development-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-diesel" ,rust-diesel-2)
+ ("rust-dotenvy" ,rust-dotenvy-0.15))))
+ (native-inputs (list sqlite))
+ (home-page "https://diesel.rs";)
+ (synopsis "Crate internal to Diesel")
+ (description "You should not use this crate directly, it is internal to
+Diesel.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-diesel-derives-1
+ (package
+ (inherit rust-diesel-derives-2)
+ (name "rust-diesel-derives")
+ (version "1.4.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "diesel_derives" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1lsq133fwk0zj8xvxhdxqgg0xs31zf3abnwdyshaf0ldca7hkxa5"))))
+ (arguments
+ `(#:tests? #f ; cannot find type `SqliteConnection` in this scope
+ #:cargo-test-flags
+ '("--release"
+ "--features" "sqlite"
+ "--"
+ "--skip=expression::count::count")
+ #:cargo-inputs
+ (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))
+ #:cargo-development-inputs
+ (("rust-cfg-if" ,rust-cfg-if-0.1)
+ ("rust-diesel" ,rust-diesel-1)
+ ("rust-dotenv" ,rust-dotenv-0.10))))))
+
+(define-public rust-diesel-migrations-2
+ (package
+ (name "rust-diesel-migrations")
+ (version "2.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "diesel_migrations" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1b0ld4azk73rg2axwq7a4wnpwba3085f43jp3cw62n8c2bqb6dk0"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-diesel" ,rust-diesel-2)
+ ("rust-migrations-internals" ,rust-migrations-internals-2)
+ ("rust-migrations-macros" ,rust-migrations-macros-2))
+ #:cargo-development-inputs
+ (("rust-cfg-if" ,rust-cfg-if-0.1)
+ ("rust-dotenvy" ,rust-dotenvy-0.15)
+ ("rust-tempfile" ,rust-tempfile-3))))
+ (home-page "https://diesel.rs";)
+ (synopsis "Migration management for diesel")
+ (description "This package provides migration management for Diesel.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-diesel-migrations-1
+ (package
+ (inherit rust-diesel-migrations-2)
+ (name "rust-diesel-migrations")
+ (version "1.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "diesel_migrations" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0k4g03ciqwya2xc1xvy5s9cs6q55k45wxa1gszswfg9m2f2dwg5z"))))
+ (arguments
+ `(#:tests? #f ;doctest_setup.rs: No such file or directory
+ #:cargo-inputs
+ (("rust-migrations-internals" ,rust-migrations-internals-1)
+ ("rust-migrations-macros" ,rust-migrations-macros-1))
+ #:cargo-development-inputs
+ (("rust-cfg-if" ,rust-cfg-if-0.1)
+ ("rust-diesel" ,rust-diesel-1)
+ ("rust-dotenv" ,rust-dotenv-0.10))))))
+
+(define-public rust-diesel-table-macro-syntax-0.1
+ (package
+ (name "rust-diesel-table-macro-syntax")
+ (version "0.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "diesel_table_macro_syntax" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1i9115qgsnargr6a707lqcjc45wqzq351a2gbvnnyw2kqkpmfmgw"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-syn" ,rust-syn-2))))
+ (home-page "https://diesel.rs";)
+ (synopsis "Internal diesel crate")
+ (description "Internal diesel crate.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-libsqlite3-sys-0.30
(package
(name "rust-libsqlite3-sys")
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index efdf93a7e9..1be8263719 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22979,235 +22979,6 @@ dhcproto.")
("rust-tempfile" ,rust-tempfile-3)
("rust-zeroize" ,rust-zeroize-1))))))
-(define-public rust-diesel-2
- (package
- (name "rust-diesel")
- (version "2.1.5")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "diesel" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32 "0ndmiv98xq2glkr4bqfq58fc3qncscfzx63xpj4ipwlqf30hbz03"))))
- (build-system cargo-build-system)
- (arguments
- `(#:cargo-test-flags
- '("--release"
- "--features" "sqlite")
- #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.1)
- ("rust-bitflags" ,rust-bitflags-2)
- ("rust-byteorder" ,rust-byteorder-1)
- ("rust-chrono" ,rust-chrono-0.4)
- ("rust-diesel-derives" ,rust-diesel-derives-2)
- ("rust-ipnet" ,rust-ipnet-2)
- ("rust-ipnetwork" ,rust-ipnetwork-0.17)
- ("rust-itoa" ,rust-itoa-1)
- ("rust-libc" ,rust-libc-0.2)
- ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.20)
- ("rust-mysqlclient-sys" ,rust-mysqlclient-sys-0.2)
- ("rust-num-bigint" ,rust-num-bigint-0.2)
- ("rust-num-integer" ,rust-num-integer-0.1)
- ("rust-num-traits" ,rust-num-traits-0.2)
- ("rust-percent-encoding" ,rust-percent-encoding-2)
- ("rust-pq-sys" ,rust-pq-sys-0.4)
- ("rust-quickcheck" ,rust-quickcheck-1)
- ("rust-r2d2" ,rust-r2d2-0.8)
- ("rust-serde-json" ,rust-serde-json-0.9)
- ("rust-time" ,rust-time-0.3)
- ("rust-url" ,rust-url-2)
- ("rust-uuid" ,rust-uuid-0.7))
- #:cargo-development-inputs (("rust-cfg-if" ,rust-cfg-if-1)
- ("rust-dotenvy" ,rust-dotenvy-0.15)
- ("rust-ipnetwork" ,rust-ipnetwork-0.17)
- ("rust-quickcheck" ,rust-quickcheck-1))))
- (native-inputs (list sqlite))
- (home-page "https://diesel.rs";)
- (synopsis "Safe, extensible ORM and Query Builder")
- (description "This package provides a safe, extensible ORM and Query
-Builder for PostgreSQL, SQLite, and MySQL.")
- (license (list license:expat license:asl2.0))))
-
-(define-public rust-diesel-1
- (package
- (inherit rust-diesel-2)
- (name "rust-diesel")
- (version "1.4.8")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "diesel" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "0kcfkfhsv5yv3ksj440ajgic930359i2bqi77ss4dm5pyvn3b0dj"))))
- (arguments
- `(#:cargo-test-flags
- '("--release"
- "--features" "sqlite"
- "--"
- "--skip=expression::count::count"
- "--skip=macros::internal::parse_type_args_with_bounds"
-
"--skip=macros::internal::parse_type_args_with_bounds_containing_braces_and_commas"
-
"--skip=macros::internal::parse_type_args_with_existentials_and_lifetimes"
- "--skip=macros::internal::parse_type_args_with_trailer")
- #:cargo-inputs
- (("rust-bigdecimal" ,rust-bigdecimal-0.1)
- ("rust-bitflags" ,rust-bitflags-1)
- ("rust-byteorder" ,rust-byteorder-1)
- ("rust-chrono" ,rust-chrono-0.4)
- ("rust-diesel-derives" ,rust-diesel-derives-1)
- ("rust-ipnetwork" ,rust-ipnetwork-0.17)
- ("rust-libc" ,rust-libc-0.2)
- ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.20)
- ("rust-mysqlclient-sys" ,rust-mysqlclient-sys-0.2)
- ("rust-num-bigint" ,rust-num-bigint-0.2)
- ("rust-num-integer" ,rust-num-integer-0.1)
- ("rust-num-traits" ,rust-num-traits-0.2)
- ("rust-pq-sys" ,rust-pq-sys-0.4)
- ("rust-quickcheck" ,rust-quickcheck-0.4)
- ("rust-r2d2" ,rust-r2d2-0.8)
- ("rust-serde-json" ,rust-serde-json-1)
- ("rust-time" ,rust-time-0.1)
- ("rust-url" ,rust-url-1)
- ("rust-uuid" ,rust-uuid-0.5)
- ("rust-uuid" ,rust-uuid-0.8))
- #:cargo-development-inputs
- (("rust-cfg-if" ,rust-cfg-if-0.1)
- ("rust-dotenv" ,rust-dotenv-0.10)
- ("rust-quickcheck" ,rust-quickcheck-0.4)
- ("rust-tempdir" ,rust-tempdir-0.3))))))
-
-(define-public rust-diesel-derives-2
- (package
- (name "rust-diesel-derives")
- (version "2.1.3")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "diesel_derives" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32 "036f3i1hsl2m2c0basg28adc9rh3vnr2vp0xwvzi9rsah75yw0jx"))))
- (build-system cargo-build-system)
- (arguments
- `(#:cargo-test-flags
- '("--release" "--"
- "--skip=derive_insertable"
- "--skip=derive_multiconnection"
- "--skip=derive_queryable"
- "--skip=derive_queryable_by_name")
- #:cargo-inputs
- (("rust-diesel-table-macro-syntax" ,rust-diesel-table-macro-syntax-0.1)
- ("rust-proc-macro2" ,rust-proc-macro2-1)
- ("rust-quote" ,rust-quote-1)
- ("rust-syn" ,rust-syn-2))
- #:cargo-development-inputs (("rust-cfg-if" ,rust-cfg-if-1)
- ("rust-diesel" ,rust-diesel-2)
- ("rust-dotenvy" ,rust-dotenvy-0.15))))
- (native-inputs (list sqlite))
- (home-page "https://diesel.rs";)
- (synopsis "Crate internal to Diesel")
- (description "You should not use this crate directly, it is internal to
-Diesel.")
- (license (list license:expat license:asl2.0))))
-
-(define-public rust-diesel-derives-1
- (package
- (inherit rust-diesel-derives-2)
- (name "rust-diesel-derives")
- (version "1.4.1")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "diesel_derives" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "1lsq133fwk0zj8xvxhdxqgg0xs31zf3abnwdyshaf0ldca7hkxa5"))))
- (arguments
- `(#:tests? #f ; cannot find type `SqliteConnection` in this scope
- #:cargo-test-flags
- '("--release"
- "--features" "sqlite"
- "--"
- "--skip=expression::count::count")
- #:cargo-inputs
- (("rust-proc-macro2" ,rust-proc-macro2-1)
- ("rust-quote" ,rust-quote-1)
- ("rust-syn" ,rust-syn-1))
- #:cargo-development-inputs
- (("rust-cfg-if" ,rust-cfg-if-0.1)
- ("rust-diesel" ,rust-diesel-1)
- ("rust-dotenv" ,rust-dotenv-0.10))))))
-
-(define-public rust-diesel-migrations-2
- (package
- (name "rust-diesel-migrations")
- (version "2.1.0")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "diesel_migrations" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32 "1b0ld4azk73rg2axwq7a4wnpwba3085f43jp3cw62n8c2bqb6dk0"))))
- (build-system cargo-build-system)
- (arguments
- `(#:cargo-inputs
- (("rust-diesel" ,rust-diesel-2)
- ("rust-migrations-internals" ,rust-migrations-internals-2)
- ("rust-migrations-macros" ,rust-migrations-macros-2))
- #:cargo-development-inputs
- (("rust-cfg-if" ,rust-cfg-if-0.1)
- ("rust-dotenvy" ,rust-dotenvy-0.15)
- ("rust-tempfile" ,rust-tempfile-3))))
- (home-page "https://diesel.rs";)
- (synopsis "Migration management for diesel")
- (description "This package provides migration management for Diesel.")
- (license (list license:expat license:asl2.0))))
-
-(define-public rust-diesel-migrations-1
- (package
- (inherit rust-diesel-migrations-2)
- (name "rust-diesel-migrations")
- (version "1.4.0")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "diesel_migrations" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32 "0k4g03ciqwya2xc1xvy5s9cs6q55k45wxa1gszswfg9m2f2dwg5z"))))
- (arguments
- `(#:tests? #f ;doctest_setup.rs: No such file or directory
- #:cargo-inputs
- (("rust-migrations-internals" ,rust-migrations-internals-1)
- ("rust-migrations-macros" ,rust-migrations-macros-1))
- #:cargo-development-inputs
- (("rust-cfg-if" ,rust-cfg-if-0.1)
- ("rust-diesel" ,rust-diesel-1)
- ("rust-dotenv" ,rust-dotenv-0.10))))))
-
-(define-public rust-diesel-table-macro-syntax-0.1
- (package
- (name "rust-diesel-table-macro-syntax")
- (version "0.1.0")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "diesel_table_macro_syntax" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32 "1i9115qgsnargr6a707lqcjc45wqzq351a2gbvnnyw2kqkpmfmgw"))))
- (build-system cargo-build-system)
- (arguments
- `(#:cargo-inputs (("rust-syn" ,rust-syn-2))))
- (home-page "https://diesel.rs";)
- (synopsis "Internal diesel crate")
- (description "Internal diesel crate.")
- (license (list license:expat license:asl2.0))))
-
(define-public rust-diff-0.1
(package
(name "rust-diff")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d27ca1e495..a5891cb82d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -117,6 +117,7 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages crates-check)
#:use-module (gnu packages crates-crypto)
+ #:use-module (gnu packages crates-database)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages crates-graphics)
#:use-module (gnu packages crates-gtk)
