From 1bd1f42a31a970489583682434cda706b0269c26 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 15 Feb 2022 18:09:25 +0100 Subject: gnu: Remove unneeded uses of 'libiconv'. iconv is part of glibc, there is no need to add it as input. * gnu/packages/accessibility.scm (brltty)[inputs]: Remove LIBICONV. * gnu/packages/compression.scm (innoextract)[inputs]: Likewise. * gnu/packages/haskell-apps.scm (darcs)[inputs]: Likewise. * gnu/packages/kde-multimedia.scm (k3b)[inputs]: Likewise. * gnu/packages/linphone.scm (liblinphone)[inputs]: Likewise. * gnu/packages/mail.scm (mailutils)[inputs]: Likewise. * gnu/packages/maths.scm (libqalculate)[inputs]: Likewise. * gnu/packages/pep.scm (pep-engine)[inputs]: Likewise. * gnu/packages/vim.scm (neovim)[inputs]: Likewise. * gnu/packages/wget.scm (wget2)[inputs]: Likewise. * gnu/packages/telegram.scm (telegram-desktop)[inputs]: Likewise. * gnu/packages/video.scm (transcode)[native-inputs]: Likewise. --- gnu/packages/accessibility.scm | 2 -- gnu/packages/compression.scm | 2 +- gnu/packages/haskell-apps.scm | 2 -- gnu/packages/kde-multimedia.scm | 2 -- gnu/packages/linphone.scm | 2 -- gnu/packages/mail.scm | 1 - gnu/packages/maths.scm | 3 +-- gnu/packages/pep.scm | 1 - gnu/packages/telegram.scm | 2 -- gnu/packages/video.scm | 1 - gnu/packages/vim.scm | 1 - gnu/packages/wget.scm | 2 -- 12 files changed, 2 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/accessibility.scm b/gnu/packages/accessibility.scm index b692ec575f..36210d3e52 100644 --- a/gnu/packages/accessibility.scm +++ b/gnu/packages/accessibility.scm @@ -30,7 +30,6 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (gnu packages) #:use-module (gnu packages lisp) - #:use-module (gnu packages base) #:use-module (gnu packages ocaml) #:use-module (gnu packages pcre) #:use-module (gnu packages polkit) @@ -174,7 +173,6 @@ terminals.") flite glib gpm - libiconv icu4c libbraille pcre2 diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 8185a6157e..2b5cbf8850 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2093,7 +2093,7 @@ single-member files which can't be decompressed in parallel.") (build-system cmake-build-system) (arguments `(#:tests? #f)) - (inputs (list boost libiconv xz)) + (inputs (list boost xz)) (native-inputs (list pkg-config)) (home-page "https://constexpr.org/innoextract/") (synopsis "Tool for extracting Inno Setup installers") diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 3ab2f471f6..856791445b 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -41,7 +41,6 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system haskell) #:use-module (gnu packages) - #:use-module (gnu packages base) #:use-module (gnu packages curl) #:use-module (gnu packages gl) #:use-module (gnu packages haskell) @@ -252,7 +251,6 @@ unlit literate code files; and an option to turn off macro-expansion.") ghc ncurses perl - libiconv ghc-network ghc-network-uri)) (native-inputs diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 4638298939..f4e0c0cc4b 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -29,7 +29,6 @@ #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages audio) - #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages cdrom) #:use-module (gnu packages docbook) @@ -411,7 +410,6 @@ variety of formats.") libdvdcss libdvdread ;; TODO: LibFuzzer - libiconv libkcddb libmad libmpcdec diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 285ecb58fd..b025911dd5 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -24,7 +24,6 @@ #:use-module (gnu packages admin) #:use-module (gnu packages audio) #:use-module (gnu packages avahi) - #:use-module (gnu packages base) #:use-module (gnu packages cpp) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) @@ -778,7 +777,6 @@ device.") ("bellesip" ,belle-sip) ("belr" ,belr) ("bzrtp" ,bzrtp) - ("iconv" ,libiconv) ("ldap" ,openldap) ("libxsd" ,xsd) ("lime" ,lime) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index bcc9e11aa0..c9aa89a37b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -365,7 +365,6 @@ example, modify the message headers or body, or encrypt or sign the message.") libltdl gdbm ;; Required for SEARCH CHARSET. - libiconv libunistring)) (home-page "https://mailutils.org") (synopsis "Utilities and library for reading and serving mail") diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 04b7b00972..1683f88ed1 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -7035,8 +7035,7 @@ researchers and developers alike to get started on SAT.") curl icu4c gnuplot - readline - libiconv)) + readline)) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index d0dfb0a685..aaf82e8a99 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -131,7 +131,6 @@ OPENPGP=SEQUOIA pkg-config yml2)) (inputs `(("libetpan" ,fdik-libetpan) - ("libiconv" ,libiconv) ("nettle" ,nettle) ("openssl" ,openssl) ("sequoia" ,sequoia) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 5b036f4767..6c5efc50b9 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -23,7 +23,6 @@ #:use-module (gnu packages assembly) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) - #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -409,7 +408,6 @@ Telegram project, for its use in telegram desktop client.") ("gtk+" ,gtk+) ("hime" ,hime) ("hunspell" ,hunspell) - ("iconv" ,libiconv) ("jemalloc" ,jemalloc) ("kwayland" ,kwayland) ("lib-base-source" diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a6c2eeea97..025372cd40 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -262,7 +262,6 @@ (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("iconv" ,libiconv) ("libtool" ,libtool) ("libxml2" ,libxml2) ("perl" ,perl) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 1f10c58525..28944dd640 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -716,7 +716,6 @@ are detected, the user is notified."))) ("libvterm" ,libvterm) ("unibilium" ,unibilium) ("jemalloc" ,jemalloc) - ("libiconv" ,libiconv) ("lua" ,lua-5.1) ("lua-luv" ,lua5.1-luv) ("lua-lpeg" ,lua5.1-lpeg) diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index d794bd7bad..462c4daeb9 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -24,7 +24,6 @@ (define-module (gnu packages wget) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) - #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) #:use-module (gnu packages gnunet) @@ -160,7 +159,6 @@ online pastebin services.") `(("bzip2" ,bzip2) ("gnutls" ,gnutls/dane) ("gpgme" ,gpgme) - ("libiconv" ,libiconv) ("libidn2" ,libidn2) ("libmicrohttpd" ,libmicrohttpd) ("libpsl" ,libpsl) -- cgit v1.2.3