From patchwork Mon Jan 8 01:52:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilko Meyer X-Patchwork-Id: 58572 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F3D0C27BBEA; Mon, 8 Jan 2024 01:58:58 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 03A9927BBF4 for ; Mon, 8 Jan 2024 01:58:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMes3-0006ij-Sb; Sun, 07 Jan 2024 20:56:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMes0-0006c3-Mk for guix-patches@gnu.org; Sun, 07 Jan 2024 20:56:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMes0-0004Mr-EY for guix-patches@gnu.org; Sun, 07 Jan 2024 20:56:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMes6-0000BX-Ao for guix-patches@gnu.org; Sun, 07 Jan 2024 20:56:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68312] [PATCH 044/156] gnu: Add rust-diesel-2. Resent-From: Wilko Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 01:56:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68312 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68312@debbugs.gnu.org Cc: Wilko Meyer Received: via spool by 68312-submit@debbugs.gnu.org id=B68312.170467894032594 (code B ref 68312); Mon, 08 Jan 2024 01:56:10 +0000 Received: (at 68312) by debbugs.gnu.org; 8 Jan 2024 01:55:40 +0000 Received: from localhost ([127.0.0.1]:34316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMerc-0008TX-Ad for submit@debbugs.gnu.org; Sun, 07 Jan 2024 20:55:40 -0500 Received: from mail.wmeyer.eu ([95.216.196.112]:48662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMeqt-0008DS-GS for 68312@debbugs.gnu.org; Sun, 07 Jan 2024 20:54:58 -0500 From: Wilko Meyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wmeyer.eu; s=mail; t=1704678884; bh=nl6LpWiYzIXx5ExlzXxMxfZG+zRxT4sTE4w59ClA3zg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TlhJWLIF1aTHY08mbCLH9qrcyNCPcq/7xmTHzJeQYzVJxLQ4yybp0oAZaOW01UlgY tT5pMbt2gxIbe4fmPWOn7jzUChfV+Nom6f61wXdHDAHt+1K8KnlAto5yTavC8//QF4 wexkzi8MoixTG8hOB2fbqCAdCWKtZL/PyUB/C5vc= Date: Mon, 8 Jan 2024 02:52:21 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-diesel-2): New variable. (rust-diesel-1): Inherit from rust-diesel-2. Change-Id: I42b1cbc4e5816e0d64f98711ef404b1cd2c62ce9 --- gnu/packages/crates-io.scm | 52 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e4abfd9d771..2cab9822ebb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21130,8 +21130,56 @@ (define-public rust-dialoguer-0.10 ("rust-tempfile" ,rust-tempfile-3) ("rust-zeroize" ,rust-zeroize-1)))))) +(define-public rust-diesel-2 + (package + (name "rust-diesel") + (version "2.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "diesel" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1n1ihxd5zfqg94zy01zf85ml716fqmsivj7pxiw8qzzi8bwgrik2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" + "--features" "sqlite" + "--" + "--skip=expression::count::count") + #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.3) + ("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.26) + ("rust-mysqlclient-sys" ,rust-mysqlclient-sys-0.2) + ("rust-num-bigint" ,rust-num-bigint-0.4) + ("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-1) + ("rust-time" ,rust-time-0.3) + ("rust-url" ,rust-url-2) + ("rust-uuid" ,rust-uuid-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.6") (source @@ -21143,7 +21191,6 @@ (define-public rust-diesel-1 (sha256 (base32 "0hpmwrc0zx3zvpgwp9zrm6wj8d8i8q8990grlrnfzlivbi6zqyq4")))) - (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--release" @@ -21176,7 +21223,8 @@ (define-public rust-diesel-1 ("rust-dotenv" ,rust-dotenv-0.10) ("rust-quickcheck" ,rust-quickcheck-0.4) ("rust-tempdir" ,rust-tempdir-0.3)))) - (native-inputs (list sqlite)) + (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