Unverified Commit 7004e2ad authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

[Backport release-25.05] midori: drop (#409393)

parents 338e3843 e8bf3e2f

nixos/tests/custom-ca.nix

+2 −6
Original line number Diff line number Diff line 
# Checks that `security.pki` options are working in curl and the main browser

# engines: Gecko (via Firefox), Chromium, QtWebEngine (via qutebrowser) and

# WebKitGTK (via Midori). The test checks that certificates issued by a custom

# engines: Gecko (via Firefox), Chromium, QtWebEngine (via qutebrowser).

# The test checks that certificates issued by a custom

# trusted CA are accepted but those from an unknown CA are rejected.



{
@@ -210,8 +210,4 @@ in 
    args = "-T";

    error = "Certificate error";

  };

  midori = {

    args = "-p";

    error = "Security";

  };

}

pkgs/by-name/mi/midori-unwrapped/package.nix

deleted100644 → 0
+0 −72
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchurl,

  cmake,

  ninja,

  pkg-config,

  intltool,

  vala,

  wrapGAppsHook3,

  gcr,

  libpeas,

  gtk3,

  webkitgtk_4_0,

  sqlite,

  gsettings-desktop-schemas,

  libsoup_2_4,

  glib-networking,

  json-glib,

  libarchive,

}:



stdenv.mkDerivation rec {

  pname = "midori";

  version = "9.0";



  src = fetchurl {

    url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.tar.gz";

    sha256 = "05i04qa83dnarmgkx4xsk6fga5lw1lmslh4rb3vhyyy4ala562jy";

  };



  nativeBuildInputs = [

    cmake

    intltool

    ninja

    pkg-config

    vala

    wrapGAppsHook3

  ];



  buildInputs = [

    (libsoup_2_4.override { gnomeSupport = true; })

    gcr

    glib-networking

    gsettings-desktop-schemas

    gtk3

    libpeas

    sqlite

    webkitgtk_4_0

    json-glib

    libarchive

  ];



  passthru = {

    inherit gtk3;

    applicationName = "Midori";

  };



  meta = with lib; {

    description = "Lightweight WebKitGTK web browser";

    mainProgram = "midori";

    homepage = "https://github.com/midori-browser/core";

    license = with licenses; [ lgpl21Plus ];

    platforms = with platforms; linux;

    maintainers = with maintainers; [

      raskin

      ramkromberg

    ];

    # https://github.com/NixOS/nixpkgs/issues/374354

    broken = true;

  };

}

pkgs/top-level/aliases.nix

+2 −0
Original line number Diff line number Diff line
@@ -1209,6 +1209,8 @@ mapAliases { 
  micropad = throw "micropad has been removed, since it was unmaintained and blocked the Electron 27 removal."; # Added 2025-02-24

  microsoft-edge = throw "microsoft-edge has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-19

  microsoft_gsl = microsoft-gsl; # Added 2023-05-26

  midori = throw "'midori' original project has been abandonned upstream and the package was broken for a while in nixpkgs"; # Added 2025-05-19

  midori-unwrapped = midori; # Added 2025-05-19

  MIDIVisualizer = midivisualizer; # Added 2024-06-12

  mikutter = throw "'mikutter' has been removed because the package was broken and had no maintainers"; # Added 2024-10-01

  mime-types = mailcap; # Added 2022-01-21

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -13268,8 +13268,6 @@ with pkgs; 














  michabo = libsForQt5.callPackage ../applications/misc/michabo { };



























  midori = wrapFirefox midori-unwrapped { };



























  miniaudicle = qt6Packages.callPackage ../applications/audio/miniaudicle { };





























  minitube = libsForQt5.callPackage ../applications/video/minitube { };