From patchwork Mon Feb 27 00:11:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47415 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 7F57216C03; Mon, 27 Feb 2023 00:13:32 +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.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 6034416884 for ; Mon, 27 Feb 2023 00:13:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWR8b-0001G7-C9; Sun, 26 Feb 2023 19:13:06 -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 1pWR8a-0001Ez-7y for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWR8Z-0007c4-Ih for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWR8Z-0005Ws-Du for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61829] [PATCH 02/11] gnu: curl-minimal: Remove variable. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Feb 2023 00:13:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61829 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61829@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61829-submit@debbugs.gnu.org id=B61829.167745673021150 (code B ref 61829); Mon, 27 Feb 2023 00:13:03 +0000 Received: (at 61829) by debbugs.gnu.org; 27 Feb 2023 00:12:10 +0000 Received: from localhost ([127.0.0.1]:45314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7i-0005Uy-6b for submit@debbugs.gnu.org; Sun, 26 Feb 2023 19:12:10 -0500 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]:51978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7V-0005Sn-2I for 61829@debbugs.gnu.org; Sun, 26 Feb 2023 19:11:57 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id C440F20BE8 for <61829@debbugs.gnu.org>; Mon, 27 Feb 2023 01:11:50 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 6802580098; Mon, 27 Feb 2023 01:11:50 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id PPBb09WzPPcD; Mon, 27 Feb 2023 01:11:50 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id C1B4D80097; Mon, 27 Feb 2023 01:11:49 +0100 (CET) From: Bruno Victal Date: Mon, 27 Feb 2023 00:11:35 +0000 Message-Id: <551c2fabd7202726360d0aaf4f4feacd8caf605c.1677456515.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 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/curl.scm (curl-minimal): Remove variable. * gnu/packages/astronomy.scm (python-fitsio, gnuastro): Use curl. * gnu/packages/games.scm (odamex): Ditto. * gnu/packages/sync.scm (onedrive): Ditto. --- gnu/packages/astronomy.scm | 4 ++-- gnu/packages/curl.scm | 3 --- gnu/packages/games.scm | 2 +- gnu/packages/sync.scm | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index b6ed1e2f49..fe4ec637c6 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -438,7 +438,7 @@ (define-public python-fitsio (("self.use_system_fitsio") "True") (("self.system_fitsio_includedir") includedir) (("self.system_fitsio_libdir") libdir)))))))) - (inputs (list curl-minimal)) + (inputs (list curl)) (propagated-inputs (list python-numpy cfitsio)) (home-page "https://github.com/esheldon/fitsio") @@ -605,7 +605,7 @@ (define-public gnuastro '(#:configure-flags '("--disable-static"))) (inputs (list cfitsio - curl-minimal + curl gsl libgit2 libjpeg-turbo diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 45bd2e6d36..bd00a6d274 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -170,9 +170,6 @@ (define curl-7.84.0 "NUM_THREADS 100\n")))))) (else phases))))))) -(define-public curl-minimal - (deprecated-package "curl-minimal" curl)) - (define-public curl-ssh (package/inherit curl (arguments diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a5783c1d1b..0ee51e3d7f 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7616,7 +7616,7 @@ (define-public odamex ("sdl-mixer" ,sdl2-mixer) ("zlib" ,zlib) ("libpng" ,libpng) - ("curl" ,curl-minimal) + ("curl" ,curl) ("alsa-lib" ,alsa-lib))) (home-page "https://odamex.net/") (synopsis "Multiplayer Doom port") diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index b0d8b4274e..75cd67fd2d 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -408,7 +408,7 @@ (define-public onedrive (list pkg-config)) (inputs (list bash-minimal - curl-minimal + curl ldc libnotify sqlite))