Commit b36a8544 authored by jopejoe1's avatar jopejoe1
Browse files

netsurf: drop package set

parent 829014a2
Loading
Loading
Loading
Loading
+0 −46
Original line number Diff line number Diff line
{ lib, pkgs }:

lib.makeScope pkgs.newScope (
  self:
  let
    inherit (self) callPackage;
  in
  {
    # ui can be: gtk2, gtk3, sixel, framebuffer. Note that console display (sixel)
    # requires a terminal that supports `sixel` capabilities, such as mlterm
    # or xterm -ti 340
    ui = "gtk3";
    uilib =
      {
        "framebuffer" = "framebuffer";
        "gtk2" = "gtk2";
        "gtk3" = "gtk3";
        "sixel" = "framebuffer";
      }
      .${self.ui} or null; # Null will never happen
    SDL =
      {
        "sixel" = pkgs.SDL_sixel;
        "framebuffer" = pkgs.SDL;
      }
      .${self.ui} or null;

    browser = pkgs.netsurf-browser;

    buildsystem = pkgs.netsurf-buildsystem;
    libcss = pkgs.libcss;
    libdom = pkgs.libdom;
    libhubbub = pkgs.libhubbub;
    libnsbmp = pkgs.libnsbmp;
    libnsfb = pkgs.libnsfb;
    libnsgif = pkgs.libnsgif;
    libnslog = pkgs.libnslog;
    libnspsl = pkgs.libnspsl;
    libnsutils = pkgs.libnsutils;
    libparserutils = pkgs.libparserutils;
    libsvgtiny = pkgs.libsvgtiny;
    libutf8proc = pkgs.libutf8proc;
    libwapcaplet = pkgs.libwapcaplet;
    nsgenbind = pkgs.nsgenbind;
  }
)
+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@
  libjxl,
  libpng,
  librsvg,
  netsurf,
  libnsgif,
  libheif,
}:

@@ -56,9 +56,9 @@ let
      librsvg
      libheif
      libjxl
      libnsgif
      ;
    libjpeg = libjpeg_turbo;
    inherit (netsurf) libnsgif;
  };

  backendFlags = builtins.map (
+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
  lensfun,
  libspiro,
  maxflow,
  netsurf,
  libnsgif,
  pango,
  poly2tri-c,
  poppler,
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
    lensfun
    libspiro
    maxflow
    netsurf.libnsgif
    libnsgif
    pango
    poly2tri-c
    poppler
+18 −0
Original line number Diff line number Diff line
@@ -1663,6 +1663,24 @@ mapAliases {
  netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02
  netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22
  netbox_3_7 = throw "netbox 3.7 series has been removed as it was EOL"; # Added 2025-04-23
  netsurf = recurseIntoAttrs {
    browser = lib.warnOnInstantiate "'netsurf.browser' has been renamed to 'netsurf-browser'" netsurf-browser; # Added 2025-03-26
    buildsystem = lib.warnOnInstantiate "'netsurf.buildsystem' has been renamed to 'netsurf-buildsystem'" netsurf-buildsystem; # Added 2025-03-26
    libcss = lib.warnOnInstantiate "'netsurf.libcss' has been renamed to 'libcss'" libcss; # Added 2025-03-26
    libdom = lib.warnOnInstantiate "'netsurf.libdom' has been renamed to 'libdom'" libdom; # Added 2025-03-26
    libhubbub = lib.warnOnInstantiate "'netsurf.libhubbub' has been renamed to 'libhubbub'" libhubbub; # Added 2025-03-26
    libnsbmp = lib.warnOnInstantiate "'netsurf.libnsbmp' has been renamed to 'libnsbmp'" libnsbmp; # Added 2025-03-26
    libnsfb = lib.warnOnInstantiate "'netsurf.libnsfb' has been renamed to 'libnsfb'" libnsfb; # Added 2025-03-26
    libnsgif = lib.warnOnInstantiate "'netsurf.libnsgif' has been renamed to 'libnsgif'" libnsgif; # Added 2025-03-26
    libnslog = lib.warnOnInstantiate "'netsurf.libnslog' has been renamed to 'libnslog'" libnslog; # Added 2025-03-26
    libnspsl = lib.warnOnInstantiate "'netsurf.libnspsl' has been renamed to 'libnspsl'" libnspsl; # Added 2025-03-26
    libnsutils = lib.warnOnInstantiate "'netsurf.libnsutils' has been renamed to 'libnsutils'" libnsutils; # Added 2025-03-26
    libparserutils = lib.warnOnInstantiate "'netsurf.libparserutils' has been renamed to 'libparserutils'" libparserutils; # Added 2025-03-26
    libsvgtiny = lib.warnOnInstantiate "'netsurf.libsvgtiny' has been renamed to 'libsvgtiny'" libsvgtiny; # Added 2025-03-26
    libutf8proc = lib.warnOnInstantiate "'netsurf.libutf8proc' has been renamed to 'libutf8proc'" libutf8proc; # Added 2025-03-26
    libwapcaplet = lib.warnOnInstantiate "'netsurf.libwapcaplet' has been renamed to 'libwapcaplet'" libwapcaplet; # Added 2025-03-26
    nsgenbind = lib.warnOnInstantiate "'netsurf.nsgenbind' has been renamed to 'nsgenbind'" nsgenbind; # Added 2025-03-26
  };
  nettools = net-tools; # Added 2025-06-11
  newt-go = fosrl-newt; # Added 2025-06-24
  notify-sharp = throw "'notify-sharp' has been removed as it was unmaintained and depends on deprecated dbus-sharp versions"; # Added 2025-08-25
+0 −2
Original line number Diff line number Diff line
@@ -3393,8 +3393,6 @@ with pkgs;
    withCloudUi = true;
  };

  netsurf = recurseIntoAttrs (callPackage ../applications/networking/browsers/netsurf { });

  nyxt = callPackage ../applications/networking/browsers/nyxt {
    sbcl = sbcl_2_4_6;
    inherit (gst_all_1)