From patchwork Wed Jul 19 02:26:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Distopico X-Patchwork-Id: 51840 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 5BCBC27BBE2; Wed, 19 Jul 2023 03:29:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 89D4827BBE9 for ; Wed, 19 Jul 2023 03:29:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLww4-0003Up-Bv; Tue, 18 Jul 2023 22:29:04 -0400 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 1qLww3-0003Uh-JV for guix-patches@gnu.org; Tue, 18 Jul 2023 22:29:03 -0400 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 1qLww3-0004yF-CB for guix-patches@gnu.org; Tue, 18 Jul 2023 22:29:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLww2-000534-G5; Tue, 18 Jul 2023 22:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64720] [PATCH] gnu: rust-analyzer: Fix build of rust-analyzer. Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Wed, 19 Jul 2023 02:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64720@debbugs.gnu.org Cc: Distopico , efraim@flashner.co.il X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: efraim@flashner.co.il Received: via spool by submit@debbugs.gnu.org id=B.168973372819384 (code B ref -1); Wed, 19 Jul 2023 02:29:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Jul 2023 02:28:48 +0000 Received: from localhost ([127.0.0.1]:54588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLwvo-00052a-FY for submit@debbugs.gnu.org; Tue, 18 Jul 2023 22:28:48 -0400 Received: from lists.gnu.org ([2001:470:142::17]:49296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLwvl-00052M-RT for submit@debbugs.gnu.org; Tue, 18 Jul 2023 22:28:47 -0400 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 1qLwvg-0003RX-DH for guix-patches@gnu.org; Tue, 18 Jul 2023 22:28:40 -0400 Received: from mx0.riseup.net ([198.252.153.6]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLwvd-0004sm-M4 for guix-patches@gnu.org; Tue, 18 Jul 2023 22:28:39 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx0.riseup.net (Postfix) with ESMTPS id 4R5KW70L6wz9tF8 for ; Wed, 19 Jul 2023 02:28:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1689733715; bh=OnmnX8VHHambe45NQDRMW9wPd0rTPK29Y6cMv2WBQ70=; h=From:To:Cc:Subject:Date:From; b=Q+Fdsw3hGTBR4Vrrks6rWQNirG7JoA0M4M5jdYuSLsqsnvkY2KPo1TvDZT1+LzwBP GrM60aqFzZHMBbqdf7FOHjGWqLka6te/6oMqm2V6TrAI3eO3IpIkj+A6C09h1paTh7 7aNumXg3pj39+EKQzfAujTvt7D6KnPsBzmO47S4w= X-Riseup-User-ID: EBFC44B17279BBCBDF121ADC7CA3AA542168E71EFEB6D0BC1A2F1122551604F9 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4R5KW62L9czFqjr; Wed, 19 Jul 2023 02:28:34 +0000 (UTC) From: Distopico Date: Tue, 18 Jul 2023 21:26:18 -0500 Message-ID: <20230719022804.19613-1-distopico@riseup.net> MIME-Version: 1.0 Received-SPF: pass client-ip=198.252.153.6; envelope-from=distopico@riseup.net; helo=mx0.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Fixes build of rust-analyzer version 2022-01-10 that requires pined version of rust-notify which is `rust-notify-pre.13`. I'm working to update `rust-analizer` to 2023-07-17 but it require add more packages and update other, it's a WIP but for now this is just to fix the build. * gnu/packages/crates-io.scm (rust-notify-5-pre.13): New variable. * gnu/packages/rust-apps.scm --- gnu/packages/crates-io.scm | 13 +++++++++++++ gnu/packages/rust-apps.scm | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) base-commit: 917a299831361f253ea664f009176b4bbe06900a diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f9574e2797..5dd9e0d349 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38927,6 +38927,19 @@ (define-public rust-notify-5 notification library.") (license (list license:cc0 license:artistic2.0)))) +(define-public rust-notify-5-pre.13 + (package + (inherit rust-notify-5) + (name "rust-notify") + (version "5.0.0-pre.13") + (source (origin + (method url-fetch) + (uri (crate-uri "notify" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0za8mpacxkr62fii5h7ny4h396y0m8myd3hf08njqdg2h21kap94")))))) + (define-public rust-notify-4 (package (inherit rust-notify-5) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 8c29969712..0571af498c 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1775,7 +1775,7 @@ (define-public rust-analyzer ("rust-memmap2" ,rust-memmap2-0.5) ("rust-mimalloc" ,rust-mimalloc-0.1) ("rust-miow" ,rust-miow-0.4) - ("rust-notify" ,rust-notify-5) + ("rust-notify" ,rust-notify-5-pre.13) ("rust-object" ,rust-object-0.28) ("rust-once-cell" ,rust-once-cell-1) ("rust-parking-lot" ,rust-parking-lot-0.11)