From 48ae783679f5b8f88b0a45e9f79895bbe3ff8e6b Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Thu, 17 Apr 2025 13:29:35 +0200 Subject: [PATCH] libhttpseverywhere: remove The upstream repo [1] is unmaintained since 2019. [1] https://gitlab.gnome.org/GNOME/libhttpseverywhere --- .../by-name/li/libhttpseverywhere/package.nix | 87 ------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 pkgs/by-name/li/libhttpseverywhere/package.nix diff --git a/pkgs/by-name/li/libhttpseverywhere/package.nix b/pkgs/by-name/li/libhttpseverywhere/package.nix deleted file mode 100644 index c24eb6ab7780..000000000000 --- a/pkgs/by-name/li/libhttpseverywhere/package.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - meson, - ninja, - makeFontsConf, - vala, - fetchpatch, - gnome, - libgee, - glib, - json-glib, - libarchive, - libsoup_2_4, - gobject-introspection, -}: - -let - pname = "libhttpseverywhere"; - version = "0.8.3"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w"; - }; - - nativeBuildInputs = [ - vala - gobject-introspection - meson - ninja - pkg-config - ]; - buildInputs = [ - glib - libgee - json-glib - libsoup_2_4 - libarchive - ]; - - patches = [ - # Fixes build with vala >=0.42 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/commit/6da08ef1ade9ea267cecf14dd5cb2c3e6e5e50cb.patch"; - sha256 = "1nwjlh8iqgjayccwdh0fbpq2g1h8bg1k1g9i324f2bhhvyhmpq8f"; - }) - # fix build with meson 0.60 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/-/commit/4c38b2ca25802c464f3204a62815201d8cf549fd.patch"; - sha256 = "sha256-1+fmR0bpvJ9ISN2Hr+BTIQz+Bf6VfY1RdVZ/OohUlWU="; - }) - ]; - - mesonFlags = [ "-Denable_valadoc=true" ]; - - doCheck = true; - - checkPhase = "(cd test && ./httpseverywhere_test)"; - - FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; - - outputs = [ - "out" - "devdoc" - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Library to use HTTPSEverywhere in desktop applications"; - homepage = "https://gitlab.gnome.org/GNOME/libhttpseverywhere"; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ sternenseemann ] ++ teams.gnome.members; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6671271001d2..cf7b8e977533 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -933,6 +933,7 @@ mapAliases { libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22 libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17 libheimdal = heimdal; # Added 2022-11-18 + libhttpseverywhere = throw "'libhttpseverywhere' has been removed due to lack of upstream maintenance. It was no longer used in nixpkgs."; # Added 2025-04-17 libiconv-darwin = darwin.libiconv; libixp_hg = libixp; libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17