From 0425c91a92e569db9d5a8238a69f4588ae7cbc6a Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Mon, 27 Feb 2023 00:11:35 +0000 Subject: [PATCH] gnu: curl-minimal: Remove variable. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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. Signed-off-by: Ludovic Courtès --- 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 46839c802f..3af948efe4 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -496,7 +496,7 @@ in FITS files.") (("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") @@ -663,7 +663,7 @@ astronomical image-processing packages like Drizzle, Swarp or SExtractor.") '(#: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 @@ tunneling, and so on.") "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 debd9b5d30..77c4a12a6e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7612,7 +7612,7 @@ Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom.") ("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 @@ silently and reliably flow across to every other.") (list pkg-config)) (inputs (list bash-minimal - curl-minimal + curl ldc libnotify sqlite))