gnu: Remove workarounds for missing libarchive nettle propagation.
* gnu/packages/gnome.scm (brasero, libgxps, aisleriot, grilo, grilo-plugins, totem, rhythmbox, gvfs, d-feet, gnome-session, gnome-autoar, tracker, nautilus)[inputs]: Remove NETTLE. * gnu/packages/linux.scm (singularity)[inputs]: Likewise. * gnu/packages/mate.scm (atril)[inputs]: Likewise. * gnu/packages/package-management.scm (rpm, libostree, flatpak)[inputs]: Likewise.
This commit is contained in:
		
							parent
							
								
									1664e2ab39
								
							
						
					
					
						commit
						0a6e9e13c5
					
				
					 4 changed files with 3 additions and 27 deletions
				
			
		|  | @ -223,7 +223,6 @@ | ||||||
|        ("libnotify" ,libnotify) |        ("libnotify" ,libnotify) | ||||||
|        ("libsm" ,libsm) |        ("libsm" ,libsm) | ||||||
|        ("libxml2" ,libxml2) |        ("libxml2" ,libxml2) | ||||||
|        ("nettle" ,nettle) |  | ||||||
|        ("totem-pl-parser" ,totem-pl-parser))) |        ("totem-pl-parser" ,totem-pl-parser))) | ||||||
|     (home-page "https://projects.gnome.org/brasero/") |     (home-page "https://projects.gnome.org/brasero/") | ||||||
|     (synopsis "CD/DVD burning tool for Gnome") |     (synopsis "CD/DVD burning tool for Gnome") | ||||||
|  | @ -428,8 +427,7 @@ access the common Google services, and has full asynchronous support.") | ||||||
|      `(("gtk+" ,gtk+) |      `(("gtk+" ,gtk+) | ||||||
|        ("libjpeg" ,libjpeg-turbo) |        ("libjpeg" ,libjpeg-turbo) | ||||||
|        ("lcms" ,lcms) |        ("lcms" ,lcms) | ||||||
|        ("libtiff" ,libtiff) |        ("libtiff" ,libtiff))) | ||||||
|        ("nettle" ,nettle))) |  | ||||||
|     (propagated-inputs |     (propagated-inputs | ||||||
|      ;; In Requires of libgxps.pc. |      ;; In Requires of libgxps.pc. | ||||||
|      `(("cairo" ,cairo) |      `(("cairo" ,cairo) | ||||||
|  | @ -818,10 +816,6 @@ forgotten when the session ends.") | ||||||
|        ("libcanberra" ,libcanberra) |        ("libcanberra" ,libcanberra) | ||||||
|        ("libsecret" ,libsecret) |        ("libsecret" ,libsecret) | ||||||
| 
 | 
 | ||||||
|        ;; XXX: 'libarchive.pc' adds '-lnettle' so Nettle should really be |  | ||||||
|        ;; propagated from there. |  | ||||||
|        ("nettle" ,nettle) |  | ||||||
| 
 |  | ||||||
|        ;; For tests. |        ;; For tests. | ||||||
|        ("dogtail" ,python2-dogtail))) |        ("dogtail" ,python2-dogtail))) | ||||||
|     (native-inputs |     (native-inputs | ||||||
|  | @ -3332,8 +3326,7 @@ settings, themes, mouse settings, and startup of other daemons.") | ||||||
|       ("libgcrypt" ,libgcrypt) |       ("libgcrypt" ,libgcrypt) | ||||||
|       ("libxml2" ,libxml2))) |       ("libxml2" ,libxml2))) | ||||||
|    (inputs |    (inputs | ||||||
|     `(("nettle" ,nettle) |     `(("libsoup" ,libsoup))) | ||||||
|       ("libsoup" ,libsoup))) |  | ||||||
|    (home-page "https://projects.gnome.org/totem") |    (home-page "https://projects.gnome.org/totem") | ||||||
|    (synopsis "Library to parse and save media playlists for GNOME") |    (synopsis "Library to parse and save media playlists for GNOME") | ||||||
|    (description "Totem-pl-parser is a GObjects-based library to parse and save |    (description "Totem-pl-parser is a GObjects-based library to parse and save | ||||||
|  | @ -3788,7 +3781,6 @@ as possible!") | ||||||
|        ("libxml2" ,libxml2) |        ("libxml2" ,libxml2) | ||||||
|        ("liboauth" ,liboauth) |        ("liboauth" ,liboauth) | ||||||
|        ("libsoup" ,libsoup) |        ("libsoup" ,libsoup) | ||||||
|        ("nettle" ,nettle) |  | ||||||
|        ("totem-pl-parser" ,totem-pl-parser))) |        ("totem-pl-parser" ,totem-pl-parser))) | ||||||
|     (arguments |     (arguments | ||||||
|      `(#:phases |      `(#:phases | ||||||
|  | @ -3837,7 +3829,6 @@ for application developers.") | ||||||
|        ("pkg-config" ,pkg-config))) |        ("pkg-config" ,pkg-config))) | ||||||
|     (inputs |     (inputs | ||||||
|      `(("grilo" ,grilo) |      `(("grilo" ,grilo) | ||||||
|        ("nettle" ,nettle) ; XXX: required by libgrlpls-0.3.la |  | ||||||
|        ("glib" ,glib) |        ("glib" ,glib) | ||||||
|        ("libxml2" ,libxml2) |        ("libxml2" ,libxml2) | ||||||
|        ("sqlite" ,sqlite) |        ("sqlite" ,sqlite) | ||||||
|  | @ -3926,7 +3917,6 @@ for application developers.") | ||||||
|        ("totem-pl-parser" ,totem-pl-parser) |        ("totem-pl-parser" ,totem-pl-parser) | ||||||
|        ("grilo" ,grilo) |        ("grilo" ,grilo) | ||||||
|        ("grilo-plugins" ,grilo-plugins) |        ("grilo-plugins" ,grilo-plugins) | ||||||
|        ("nettle" ,nettle) |  | ||||||
|        ("vala" ,vala))) |        ("vala" ,vala))) | ||||||
|     (arguments |     (arguments | ||||||
|      `(#:glib-or-gtk? #t |      `(#:glib-or-gtk? #t | ||||||
|  | @ -4028,7 +4018,6 @@ which can read a large number of file formats.") | ||||||
|       ("python-pygobject" ,python2-pygobject) |       ("python-pygobject" ,python2-pygobject) | ||||||
|       ("vala" ,vala) |       ("vala" ,vala) | ||||||
|       ("gmime" ,gmime) |       ("gmime" ,gmime) | ||||||
|       ("nettle" ,nettle) |  | ||||||
|       ("adwaita-icon-theme" ,adwaita-icon-theme) |       ("adwaita-icon-theme" ,adwaita-icon-theme) | ||||||
|       ("grilo" ,grilo) |       ("grilo" ,grilo) | ||||||
|       ("grilo-plugins" ,grilo-plugins) |       ("grilo-plugins" ,grilo-plugins) | ||||||
|  | @ -4244,7 +4233,6 @@ part of udev-extras, then udev, then systemd.  It's now a project on its own.") | ||||||
|        ("libsmbclient" ,samba) |        ("libsmbclient" ,samba) | ||||||
|        ("libsoup" ,libsoup) |        ("libsoup" ,libsoup) | ||||||
|        ("libxml2" ,libxml2) |        ("libxml2" ,libxml2) | ||||||
|        ("nettle" ,nettle) ; XXX: required by libarchive.pc |  | ||||||
|        ("openssh" ,openssh) |        ("openssh" ,openssh) | ||||||
|        ("polkit" ,polkit) |        ("polkit" ,polkit) | ||||||
|        ("udisks" ,udisks))) |        ("udisks" ,udisks))) | ||||||
|  | @ -4760,7 +4748,6 @@ share them with others via social networking and more.") | ||||||
|        ("json-glib" ,json-glib) |        ("json-glib" ,json-glib) | ||||||
|        ("libarchive" ,libarchive) |        ("libarchive" ,libarchive) | ||||||
|        ("libnotify" ,libnotify) |        ("libnotify" ,libnotify) | ||||||
|        ("nettle" ,nettle) |  | ||||||
|        ("itstool" ,itstool) |        ("itstool" ,itstool) | ||||||
|        ("libxml2" ,libxml2))) |        ("libxml2" ,libxml2))) | ||||||
|     (synopsis "Graphical archive manager for GNOME") |     (synopsis "Graphical archive manager for GNOME") | ||||||
|  | @ -6217,8 +6204,7 @@ as SASL, TLS and VeNCrypt.  Additionally it supports encoding extensions.") | ||||||
|     (propagated-inputs |     (propagated-inputs | ||||||
|      `(("libarchive" ,libarchive)))  ; XXX document why |      `(("libarchive" ,libarchive)))  ; XXX document why | ||||||
|     (inputs |     (inputs | ||||||
|      `(("gtk+" ,gtk+) |      `(("gtk+" ,gtk+))) | ||||||
|        ("nettle" ,nettle))) ; XXX: required by libarchive.pc |  | ||||||
|     (synopsis "Archives integration support for GNOME") |     (synopsis "Archives integration support for GNOME") | ||||||
|     (home-page "https://git.gnome.org/browse/gnome-autoar/") |     (home-page "https://git.gnome.org/browse/gnome-autoar/") | ||||||
|     (description |     (description | ||||||
|  | @ -6286,7 +6272,6 @@ easy, safe, and automatic.") | ||||||
|        ("gstreamer" ,gstreamer) |        ("gstreamer" ,gstreamer) | ||||||
|        ("gst-plugins-base" ,gst-plugins-base) |        ("gst-plugins-base" ,gst-plugins-base) | ||||||
|        ("sqlite" ,sqlite) |        ("sqlite" ,sqlite) | ||||||
|        ("nettle" ,nettle)  ; XXX why is this needed? |  | ||||||
|        ("python" ,python) |        ("python" ,python) | ||||||
|        ("poppler" ,poppler) |        ("poppler" ,poppler) | ||||||
|        ("libgsf" ,libgsf) |        ("libgsf" ,libgsf) | ||||||
|  | @ -6355,7 +6340,6 @@ shared object databases, search tools and indexing.") | ||||||
|        ("gnome-autoar" ,gnome-autoar) |        ("gnome-autoar" ,gnome-autoar) | ||||||
|        ("libseccomp" ,libseccomp) |        ("libseccomp" ,libseccomp) | ||||||
|        ("libselinux" ,libselinux) |        ("libselinux" ,libselinux) | ||||||
|        ("nettle" ,nettle) ; XXX required by libarchive.pc via gnome-autoar |  | ||||||
|        ("tracker" ,tracker) |        ("tracker" ,tracker) | ||||||
|        ;; XXX: gtk+ is required by libnautilus-extension.pc |        ;; XXX: gtk+ is required by libnautilus-extension.pc | ||||||
|        ;; |        ;; | ||||||
|  |  | ||||||
|  | @ -90,7 +90,6 @@ | ||||||
|   #:use-module (gnu packages multiprecision) |   #:use-module (gnu packages multiprecision) | ||||||
|   #:use-module (gnu packages ncurses) |   #:use-module (gnu packages ncurses) | ||||||
|   #:use-module (gnu packages netpbm) |   #:use-module (gnu packages netpbm) | ||||||
|   #:use-module (gnu packages nettle) |  | ||||||
|   #:use-module (gnu packages networking) |   #:use-module (gnu packages networking) | ||||||
|   #:use-module (gnu packages ninja) |   #:use-module (gnu packages ninja) | ||||||
|   #:use-module (gnu packages nss) |   #:use-module (gnu packages nss) | ||||||
|  | @ -3182,7 +3181,6 @@ thanks to the use of namespaces.") | ||||||
|     (inputs |     (inputs | ||||||
|      `(("libarchive" ,libarchive) |      `(("libarchive" ,libarchive) | ||||||
|        ("python" ,python-wrapper) |        ("python" ,python-wrapper) | ||||||
|        ("nettle" ,nettle) |  | ||||||
|        ("zlib" ,zlib) |        ("zlib" ,zlib) | ||||||
|        ("squashfs-tools" ,squashfs-tools))) |        ("squashfs-tools" ,squashfs-tools))) | ||||||
|     (home-page "https://singularity.lbl.gov/") |     (home-page "https://singularity.lbl.gov/") | ||||||
|  |  | ||||||
|  | @ -56,7 +56,6 @@ | ||||||
|   #:use-module (gnu packages libcanberra) |   #:use-module (gnu packages libcanberra) | ||||||
|   #:use-module (gnu packages linux) |   #:use-module (gnu packages linux) | ||||||
|   #:use-module (gnu packages messaging) |   #:use-module (gnu packages messaging) | ||||||
|   #:use-module (gnu packages nettle) |  | ||||||
|   #:use-module (gnu packages nss) |   #:use-module (gnu packages nss) | ||||||
|   #:use-module (gnu packages pkg-config) |   #:use-module (gnu packages pkg-config) | ||||||
|   #:use-module (gnu packages pdf) |   #:use-module (gnu packages pdf) | ||||||
|  | @ -819,7 +818,6 @@ infamous 'Wanda the Fish'.") | ||||||
|        ("libgnome-keyring" ,libgnome-keyring) |        ("libgnome-keyring" ,libgnome-keyring) | ||||||
|        ("libarchive" ,libarchive) |        ("libarchive" ,libarchive) | ||||||
|        ("marco" ,marco) |        ("marco" ,marco) | ||||||
|        ("nettle" ,nettle) |  | ||||||
|        ("openjpeg" ,openjpeg-1) |        ("openjpeg" ,openjpeg-1) | ||||||
|        ("pango" ,pango) |        ("pango" ,pango) | ||||||
|        ;;("texlive" ,texlive) |        ;;("texlive" ,texlive) | ||||||
|  |  | ||||||
|  | @ -58,7 +58,6 @@ | ||||||
|   #:use-module (gnu packages linux) |   #:use-module (gnu packages linux) | ||||||
|   #:use-module (gnu packages lisp) |   #:use-module (gnu packages lisp) | ||||||
|   #:use-module (gnu packages man) |   #:use-module (gnu packages man) | ||||||
|   #:use-module (gnu packages nettle) |  | ||||||
|   #:use-module (gnu packages nss) |   #:use-module (gnu packages nss) | ||||||
|   #:use-module (gnu packages patchutils) |   #:use-module (gnu packages patchutils) | ||||||
|   #:use-module (gnu packages perl) |   #:use-module (gnu packages perl) | ||||||
|  | @ -542,7 +541,6 @@ symlinks to the files in a common directory such as /usr/local.") | ||||||
|        ("nss" ,nss) |        ("nss" ,nss) | ||||||
|        ("nspr" ,nspr) |        ("nspr" ,nspr) | ||||||
|        ("libarchive" ,libarchive) |        ("libarchive" ,libarchive) | ||||||
|        ("nettle" ,nettle)            ;XXX: actually a dependency of libarchive |  | ||||||
|        ("file" ,file) |        ("file" ,file) | ||||||
|        ("bzip2" ,bzip2) |        ("bzip2" ,bzip2) | ||||||
|        ("zlib" ,zlib) |        ("zlib" ,zlib) | ||||||
|  | @ -1012,7 +1010,6 @@ for packaging and deployment of cross-compiled Windows applications.") | ||||||
|        ("gpgme" ,gpgme) |        ("gpgme" ,gpgme) | ||||||
|        ("libarchive" ,libarchive) |        ("libarchive" ,libarchive) | ||||||
|        ("libsoup" ,libsoup) |        ("libsoup" ,libsoup) | ||||||
|        ("nettle" ,nettle)               ; required by 'libarchive.la' |  | ||||||
|        ("util-linux" ,util-linux))) |        ("util-linux" ,util-linux))) | ||||||
|     (home-page "https://ostree.readthedocs.io/en/latest/") |     (home-page "https://ostree.readthedocs.io/en/latest/") | ||||||
|     (synopsis "Operating system and container binary deployment and upgrades") |     (synopsis "Operating system and container binary deployment and upgrades") | ||||||
|  | @ -1071,7 +1068,6 @@ the boot loader configuration.") | ||||||
|              ("libsoup" ,libsoup) |              ("libsoup" ,libsoup) | ||||||
|              ("libxau" ,libxau) |              ("libxau" ,libxau) | ||||||
|              ("libxml2" ,libxml2) |              ("libxml2" ,libxml2) | ||||||
|              ("nettle" ,nettle) |  | ||||||
|              ("util-linux" ,util-linux))) |              ("util-linux" ,util-linux))) | ||||||
|    (home-page "https://flatpak.org") |    (home-page "https://flatpak.org") | ||||||
|    (synopsis "System for building, distributing, and running sandboxed desktop |    (synopsis "System for building, distributing, and running sandboxed desktop | ||||||
|  |  | ||||||
		Reference in a new issue