netsurf.*: move to by-name (#393433)

pkgs/applications/networking/browsers/netsurf/browser.nix pkgs/by-name/ne/netsurf-browser/package.nix

···
   xxd,
 
   # Netsurf-specific dependencies
-  buildsystem,
+  netsurf-buildsystem,
   libcss,
   libdom,
   libhubbub,
···
   nsgenbind,
 
   # Configuration
-  uilib,
+  uilib ? "gtk3",
 }:
+
+assert lib.assertOneOf "uilib" uilib [
+  "framebuffer"
+  "gtk2"
+  "gtk3"
+];
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "netsurf";
···
     libwebp
     libxml2
     openssl
-
     libcss
     libdom
     libhubbub
     libnsbmp
-    libnsfb
+    (libnsfb.override {
+      inherit
+        SDL
+        uilib
+        ;
+    })
     libnsgif
     libnslog
     libnspsl
···
       capable of handling many of the web standards in use today.
     '';
     license = lib.licenses.gpl2Only;
-    inherit (buildsystem.meta) maintainers platforms;
+    inherit (netsurf-buildsystem.meta) maintainers platforms;
   };
 })

pkgs/applications/networking/browsers/netsurf/default.nix

···
-{ 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 = callPackage ./browser.nix { };
-
-    buildsystem = callPackage ./buildsystem.nix { };
-    libcss = callPackage ./libcss.nix { };
-    libdom = callPackage ./libdom.nix { };
-    libhubbub = callPackage ./libhubbub.nix { };
-    libnsbmp = callPackage ./libnsbmp.nix { };
-    libnsfb = callPackage ./libnsfb.nix { };
-    libnsgif = callPackage ./libnsgif.nix { };
-    libnslog = callPackage ./libnslog.nix { };
-    libnspsl = callPackage ./libnspsl.nix { };
-    libnsutils = callPackage ./libnsutils.nix { };
-    libparserutils = callPackage ./libparserutils.nix { };
-    libsvgtiny = callPackage ./libsvgtiny.nix { };
-    libutf8proc = callPackage ./libutf8proc.nix { };
-    libwapcaplet = callPackage ./libwapcaplet.nix { };
-    nsgenbind = callPackage ./nsgenbind.nix { };
-  }
-)

pkgs/applications/networking/browsers/netsurf/libcss.nix pkgs/by-name/li/libcss/package.nix

···
   fetchpatch,
   perl,
   pkg-config,
-  buildsystem,
+  netsurf-buildsystem,
   libparserutils,
   libwapcaplet,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "netsurf-libcss";
+  pname = "libcss";
   version = "0.9.2";
 
   src = fetchurl {
···
 
   buildInputs = [
     perl
-    buildsystem
+    netsurf-buildsystem
     libparserutils
     libwapcaplet
   ];
 
   makeFlags = [
     "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+    "NSSHARED=${netsurf-buildsystem}/share/netsurf-buildsystem"
   ];
 
   env.NIX_CFLAGS_COMPILE = toString [
···
       license.
     '';
     license = lib.licenses.mit;
-    inherit (buildsystem.meta) maintainers platforms;
+    inherit (netsurf-buildsystem.meta) maintainers platforms;
   };
 })

pkgs/applications/networking/browsers/netsurf/libdom.nix pkgs/by-name/li/libdom/package.nix

···
   fetchpatch,
   expat,
   pkg-config,
-  buildsystem,
+  netsurf-buildsystem,
   libparserutils,
   libwapcaplet,
   libhubbub,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "netsurf-libdom";
+  pname = "libdom";
   version = "0.4.2";
 
   src = fetchurl {
···
 
   buildInputs = [
     expat
-    buildsystem
+    netsurf-buildsystem
     libhubbub
     libparserutils
     libwapcaplet
···
 
   makeFlags = [
     "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+    "NSSHARED=${netsurf-buildsystem}/share/netsurf-buildsystem"
   ];
 
   enableParallelBuilding = true;
···
       in other projects under a more permissive license.
     '';
     license = lib.licenses.mit;
-    inherit (buildsystem.meta) maintainers platforms;
+    inherit (netsurf-buildsystem.meta) maintainers platforms;
   };
 })

pkgs/applications/networking/browsers/netsurf/libhubbub.nix pkgs/by-name/li/libhubbub/package.nix

···
   gperf,
   perl,
   pkg-config,
-  buildsystem,
+  netsurf-buildsystem,
   libparserutils,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "netsurf-libhubbub";
+  pname = "libhubbub";
   version = "0.3.8";
 
   src = fetchurl {
···
   buildInputs = [
     gperf
     perl
-    buildsystem
+    netsurf-buildsystem
     libparserutils
   ];
 
   makeFlags = [
     "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+    "NSSHARED=${netsurf-buildsystem}/share/netsurf-buildsystem"
   ];
 
   meta = {
···
       content well.
     '';
     license = lib.licenses.mit;
-    inherit (buildsystem.meta) maintainers platforms;
+    inherit (netsurf-buildsystem.meta) maintainers platforms;
   };
 })

pkgs/applications/networking/browsers/netsurf/libnsbmp.nix pkgs/by-name/li/libnsbmp/package.nix

···
   stdenv,
   fetchurl,
   pkg-config,
-  buildsystem,
+  netsurf-buildsystem,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "netsurf-libnsbmp";
+  pname = "libnsbmp";
   version = "0.1.7";
 
   src = fetchurl {
···
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ buildsystem ];
+  buildInputs = [ netsurf-buildsystem ];
 
   makeFlags = [
     "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+    "NSSHARED=${netsurf-buildsystem}/share/netsurf-buildsystem"
   ];
 
   meta = {
     homepage = "https://www.netsurf-browser.org/";
     description = "BMP Decoder for netsurf browser";
     license = lib.licenses.mit;
-    inherit (buildsystem.meta) maintainers platforms;
+    inherit (netsurf-buildsystem.meta) maintainers platforms;
   };
 })

pkgs/applications/networking/browsers/netsurf/libnsfb.nix pkgs/by-name/li/libnsfb/package.nix

···
   fetchurl,
   SDL,
   pkg-config,
-  buildsystem,
-  uilib,
+  netsurf-buildsystem,
+  uilib ? "gtk3",
 }:
 
+assert lib.assertOneOf "uilib" uilib [
+  "framebuffer"
+  "gtk2"
+  "gtk3"
+];
+
 stdenv.mkDerivation (finalAttrs: {
-  pname = "netsurf-libnsfb";
+  pname = "libnsfb";
   version = "0.2.2";
 
   src = fetchurl {
···
 
   buildInputs = [
     SDL
-    buildsystem
+    netsurf-buildsystem
   ];
 
   makeFlags = [
     "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+    "NSSHARED=${netsurf-buildsystem}/share/netsurf-buildsystem"
     "TARGET=${uilib}"
   ];
 
···
     homepage = "https://www.netsurf-browser.org/projects/libnsfb/";
     description = "Netsurf framebuffer abstraction library";
     license = lib.licenses.mit;
-    inherit (buildsystem.meta) maintainers platforms;
+    inherit (netsurf-buildsystem.meta) maintainers platforms;
   };
 })

pkgs/applications/networking/browsers/netsurf/libnsgif.nix pkgs/by-name/li/libnsgif/package.nix

···
   fetchurl,
   pkg-config,
   buildPackages,
-  buildsystem,
+  netsurf-buildsystem,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "netsurf-libnsgif";
+  pname = "libnsgif";
   version = "1.0.0";
 
   src = fetchurl {
···
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ buildsystem ];
+  buildInputs = [ netsurf-buildsystem ];
 
   makeFlags = [
     "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+    "NSSHARED=${netsurf-buildsystem}/share/netsurf-buildsystem"
     "BUILD_CC=$(CC_FOR_BUILD)"
   ];
 
···
     homepage = "https://www.netsurf-browser.org/projects/libnsgif/";
     description = "GIF Decoder for netsurf browser";
     license = lib.licenses.mit;
-    inherit (buildsystem.meta) maintainers platforms;
+    inherit (netsurf-buildsystem.meta) maintainers platforms;
   };
 })

pkgs/applications/networking/browsers/netsurf/libnslog.nix pkgs/by-name/li/libnslog/package.nix

···
   bison,
   flex,
   pkg-config,
-  buildsystem,
+  netsurf-buildsystem,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "netsurf-libnslog";
+  pname = "libnslog";
   version = "0.1.3";
 
   src = fetchurl {
···
     pkg-config
   ];
 
-  buildInputs = [ buildsystem ];
+  buildInputs = [ netsurf-buildsystem ];
 
   makeFlags = [
     "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+    "NSSHARED=${netsurf-buildsystem}/share/netsurf-buildsystem"
   ];
 
   meta = {
     homepage = "https://www.netsurf-browser.org/";
     description = "NetSurf Parametric Logging Library";
     license = lib.licenses.isc;
-    inherit (buildsystem.meta) maintainers platforms;
+    inherit (netsurf-buildsystem.meta) maintainers platforms;
   };
 })

pkgs/applications/networking/browsers/netsurf/libnspsl.nix pkgs/by-name/li/libnspsl/package.nix

···
   stdenv,
   fetchurl,
   pkg-config,
-  buildsystem,
+  netsurf-buildsystem,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "netsurf-libnspsl";
+  pname = "libnspsl";
   version = "0.1.6";
 
   src = fetchurl {
···
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ buildsystem ];
+  buildInputs = [ netsurf-buildsystem ];
 
   makeFlags = [
     "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+    "NSSHARED=${netsurf-buildsystem}/share/netsurf-buildsystem"
   ];
 
   meta = {
     homepage = "https://www.netsurf-browser.org/";
     description = "NetSurf Public Suffix List - Handling library";
     license = lib.licenses.mit;
-    inherit (buildsystem.meta) maintainers platforms;
+    inherit (netsurf-buildsystem.meta) maintainers platforms;
   };
 })

pkgs/applications/networking/browsers/netsurf/libnsutils.nix pkgs/by-name/li/libnsutils/package.nix

···
   stdenv,
   fetchurl,
   pkg-config,
-  buildsystem,
+  netsurf-buildsystem,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "netsurf-libnsutils";
+  pname = "libnsutils";
   version = "0.1.1";
 
   src = fetchurl {
···
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ buildsystem ];
+  buildInputs = [ netsurf-buildsystem ];
 
   makeFlags = [
     "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+    "NSSHARED=${netsurf-buildsystem}/share/netsurf-buildsystem"
   ];
 
   meta = {
     homepage = "https://www.netsurf-browser.org/";
     description = "Generalised utility library for netsurf browser";
     license = lib.licenses.mit;
-    inherit (buildsystem.meta) maintainers platforms;
+    inherit (netsurf-buildsystem.meta) maintainers platforms;
   };
 })

pkgs/applications/networking/browsers/netsurf/libparserutils.nix pkgs/by-name/li/libparserutils/package.nix

···
   stdenv,
   fetchurl,
   perl,
-  buildsystem,
+  netsurf-buildsystem,
   libiconv,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "netsurf-libparserutils";
+  pname = "libparserutils";
   version = "0.2.5";
 
   src = fetchurl {
···
 
   buildInputs = [
     perl
-    buildsystem
+    netsurf-buildsystem
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
···
 
   makeFlags = [
     "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+    "NSSHARED=${netsurf-buildsystem}/share/netsurf-buildsystem"
   ];
 
   meta = {
     homepage = "https://www.netsurf-browser.org/projects/libparserutils/";
     description = "Parser building library for netsurf browser";
     license = lib.licenses.mit;
-    inherit (buildsystem.meta) maintainers platforms;
+    inherit (netsurf-buildsystem.meta) maintainers platforms;
   };
 })

pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix pkgs/by-name/li/libsvgtiny/package.nix

···
   fetchpatch,
   gperf,
   pkg-config,
-  buildsystem,
+  netsurf-buildsystem,
   libdom,
   libhubbub,
   libparserutils,
···
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "netsurf-libsvgtiny";
+  pname = "libsvgtiny";
   version = "0.1.8";
 
   src = fetchurl {
···
   ];
 
   buildInputs = [
-    buildsystem
+    netsurf-buildsystem
     libdom
     libhubbub
     libparserutils
···
 
   makeFlags = [
     "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+    "NSSHARED=${netsurf-buildsystem}/share/netsurf-buildsystem"
   ];
 
   enableParallelBuilding = true;
···
     homepage = "https://www.netsurf-browser.org/projects/libsvgtiny/";
     description = "NetSurf SVG decoder";
     license = lib.licenses.mit;
-    inherit (buildsystem.meta) maintainers platforms;
+    inherit (netsurf-buildsystem.meta) maintainers platforms;
   };
 })

pkgs/applications/networking/browsers/netsurf/libutf8proc.nix pkgs/by-name/li/libutf8proc/package.nix

···
   stdenv,
   fetchurl,
   pkg-config,
-  buildsystem,
+  netsurf-buildsystem,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "netsurf-libutf8proc";
+  pname = "libutf8proc";
   version = "2.4.0-1";
 
   src = fetchurl {
···
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ buildsystem ];
+  buildInputs = [ netsurf-buildsystem ];
 
   makeFlags = [
     "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+    "NSSHARED=${netsurf-buildsystem}/share/netsurf-buildsystem"
   ];
 
   meta = {
     homepage = "https://www.netsurf-browser.org/";
     description = "UTF8 Processing library for netsurf browser";
     license = lib.licenses.mit;
-    inherit (buildsystem.meta) maintainers platforms;
+    inherit (netsurf-buildsystem.meta) maintainers platforms;
   };
 })

pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix pkgs/by-name/li/libwapcaplet/package.nix

···
   lib,
   stdenv,
   fetchurl,
-  buildsystem,
+  netsurf-buildsystem,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "netsurf-libwapcaplet";
+  pname = "libwapcaplet";
   version = "0.4.3";
 
   src = fetchurl {
···
     hash = "sha256-myqh3W1mRfjpkrNpf9vYfwwOHaVyH6VO0ptITRMWDFw=";
   };
 
-  buildInputs = [ buildsystem ];
+  buildInputs = [ netsurf-buildsystem ];
 
   makeFlags = [
     "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+    "NSSHARED=${netsurf-buildsystem}/share/netsurf-buildsystem"
   ];
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";
···
     homepage = "https://www.netsurf-browser.org/projects/libwapcaplet/";
     description = "String internment library for netsurf browser";
     license = lib.licenses.mit;
-    inherit (buildsystem.meta) maintainers platforms;
+    inherit (netsurf-buildsystem.meta) maintainers platforms;
   };
 })

pkgs/applications/networking/browsers/netsurf/nsgenbind.nix pkgs/by-name/ns/nsgenbind/package.nix

···
   fetchurl,
   bison,
   flex,
-  buildsystem,
+  netsurf-buildsystem,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "netsurf-nsgenbind";
+  pname = "nsgenbind";
   version = "0.8";
 
   src = fetchurl {
···
     flex
   ];
 
-  buildInputs = [ buildsystem ];
+  buildInputs = [ netsurf-buildsystem ];
 
   makeFlags = [
     "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+    "NSSHARED=${netsurf-buildsystem}/share/netsurf-buildsystem"
   ];
 
   meta = {
···
     description = "Generator for JavaScript bindings for netsurf browser";
     mainProgram = "nsgenbind";
     license = lib.licenses.mit;
-    inherit (buildsystem.meta) maintainers platforms;
+    inherit (netsurf-buildsystem.meta) maintainers platforms;
   };
 })

pkgs/by-name/im/imv/package.nix

···
   libjxl,
   libpng,
   librsvg,
-  netsurf,
+  libnsgif,
   libheif,
 }:
 
···
       librsvg
       libheif
       libjxl
+      libnsgif
       ;
     libjpeg = libjpeg_turbo;
-    inherit (netsurf) libnsgif;
   };
 
   backendFlags = builtins.map (

pkgs/development/libraries/gegl/default.nix

···
   lensfun,
   libspiro,
   maxflow,
-  netsurf,
+  libnsgif,
   pango,
   poly2tri-c,
   poppler,
···
     lensfun
     libspiro
     maxflow
-    netsurf.libnsgif
+    libnsgif
     pango
     poly2tri-c
     poppler

pkgs/top-level/aliases.nix

···
   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

pkgs/top-level/all-packages.nix

···
     withCloudUi = true;
   };
 
-  netsurf = recurseIntoAttrs (callPackage ../applications/networking/browsers/netsurf { });
-  netsurf-browser = netsurf.browser;
-
   nyxt = callPackage ../applications/networking/browsers/nyxt {
     sbcl = sbcl_2_4_6;
     inherit (gst_all_1)