Merge remote-tracking branch 'nixpkgs/nixos-unstable' HEAD master

author: Alyssa Ross <hi@alyssa.is> 2024-06-23 00:32:22 +0200
committer: Alyssa Ross <hi@alyssa.is> 2024-06-23 00:32:22 +0200
commit: 6402b188ddd100b3cd6afe7b8a3e553365203f43 (patch)
tree: 676b85e4a6ffee092e413e723f7dce8ba01bb48f /nixpkgs/pkgs/data
parent: 5a1826585861b32ce2509c0643e793196d81893e (diff)
parent: d603719ec6e294f034936c0d0dc06f689d91b6c3 (diff)
download: nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.tar
nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.tar.gz
nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.tar.bz2
nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.tar.lz
nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.tar.xz
nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.tar.zst
nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.zip
255 files changed, 732 insertions, 896 deletions
diff --git a/nixpkgs/pkgs/data/documentation/linux-manual/default.nix b/nixpkgs/pkgs/data/documentation/linux-manual/default.nix
index 27690f9b99cd..e9cfe258a7fa 100644
--- a/nixpkgs/pkgs/data/documentation/linux-manual/default.nix
+++ b/nixpkgs/pkgs/data/documentation/linux-manual/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, perl, linuxPackages_latest }:
+{ lib, stdenv, perl, linuxPackages_latest }:
 
 stdenv.mkDerivation rec {
   pname = "linux-manual";
diff --git a/nixpkgs/pkgs/data/documentation/man-pages/default.nix b/nixpkgs/pkgs/data/documentation/man-pages/default.nix
index 3bb5c3b1d18c..1a58c4380a76 100644
--- a/nixpkgs/pkgs/data/documentation/man-pages/default.nix
+++ b/nixpkgs/pkgs/data/documentation/man-pages/default.nix
@@ -2,16 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "man-pages";
-  version = "6.7";
+  version = "6.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
-    hash = "sha256-gkA61LwXqtuST2hji3nWkwssvVUVMSSKepaId52077I=";
+    hash = "sha256-0Uyv9UzGYvNLG3C89i1OJ+TC/SYGcqNbbnSvcbP3H4g=";
   };
 
   makeFlags = [
-    # Clobber /usr/bin/env with the one in PATH.
-    "SHELL=env"
     "prefix=${placeholder "out"}"
   ];
 
diff --git a/nixpkgs/pkgs/data/documentation/nginx-doc/default.nix b/nixpkgs/pkgs/data/documentation/nginx-doc/default.nix
index c367912d6f98..4c0409e2e19c 100644
--- a/nixpkgs/pkgs/data/documentation/nginx-doc/default.nix
+++ b/nixpkgs/pkgs/data/documentation/nginx-doc/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "A reverse proxy and lightweight webserver (documentation)";
+    description = "Reverse proxy and lightweight webserver (documentation)";
     homepage    = "https://nginx.org/";
     license     = licenses.bsd2;
     platforms   = platforms.all;
diff --git a/nixpkgs/pkgs/data/documentation/zeal/default.nix b/nixpkgs/pkgs/data/documentation/zeal/default.nix
index 3dd2f1c02c94..dc05465e0a1c 100644
--- a/nixpkgs/pkgs/data/documentation/zeal/default.nix
+++ b/nixpkgs/pkgs/data/documentation/zeal/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals isQt5 [ qtx11extras ];
 
   meta = {
-    description = "A simple offline API documentation browser";
+    description = "Simple offline API documentation browser";
     longDescription = ''
       Zeal is a simple offline API documentation browser inspired by Dash (macOS
       app), available for Linux and Windows.
diff --git a/nixpkgs/pkgs/data/fonts/0xproto/default.nix b/nixpkgs/pkgs/data/fonts/0xproto/default.nix
index 6a0cf9b5f11e..9b7fd3959362 100644
--- a/nixpkgs/pkgs/data/fonts/0xproto/default.nix
+++ b/nixpkgs/pkgs/data/fonts/0xproto/default.nix
@@ -4,14 +4,14 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "0xproto";
-  version = "2.000";
+  version = "2.100";
 
   src = let
     underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
   in
     fetchzip {
       url = "https://github.com/0xType/0xProto/releases/download/${version}/0xProto_${underscoreVersion}.zip";
-      hash = "sha256-ekoCvN3A0mrYUwIG61508bRAvLdOa+MQ4IXPWE5zKHw=";
+      hash = "sha256-hUQGCsktnun9924+k6ECQuQ1Ddl/qGmtuLWERh/vDpc=";
     };
 
   installPhase = ''
diff --git a/nixpkgs/pkgs/data/fonts/aileron/default.nix b/nixpkgs/pkgs/data/fonts/aileron/default.nix
index c52824dbe120..fa92d9296069 100644
--- a/nixpkgs/pkgs/data/fonts/aileron/default.nix
+++ b/nixpkgs/pkgs/data/fonts/aileron/default.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
-    description = "A helvetica font in nine weights";
+    description = "Helvetica font in nine weights";
     platforms = platforms.all;
     maintainers = with maintainers; [ leenaars minijackson ];
     license = licenses.cc0;
diff --git a/nixpkgs/pkgs/data/fonts/alegreya/default.nix b/nixpkgs/pkgs/data/fonts/alegreya/default.nix
index b2ec1de0cc89..03efbff4ebf5 100644
--- a/nixpkgs/pkgs/data/fonts/alegreya/default.nix
+++ b/nixpkgs/pkgs/data/fonts/alegreya/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "An elegant and versatile font family for comfortable reading";
+    description = "Elegant and versatile font family for comfortable reading";
     longDescription = ''
 Alegreya is a typeface originally intended for literature. Among its crowning characteristics, it conveys a dynamic and varied rhythm which facilitates the reading of long texts. Also, it provides freshness to the page while referring to the calligraphic letter, not as a literal interpretation, but rather in a contemporary typographic language.
 
diff --git a/nixpkgs/pkgs/data/fonts/alkalami/default.nix b/nixpkgs/pkgs/data/fonts/alkalami/default.nix
index eb0c3ed79262..b9dfd27e5796 100644
--- a/nixpkgs/pkgs/data/fonts/alkalami/default.nix
+++ b/nixpkgs/pkgs/data/fonts/alkalami/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://software.sil.org/alkalami/";
-    description = "A font for Arabic-based writing systems in the Kano region of Nigeria and in Niger";
+    description = "Font for Arabic-based writing systems in the Kano region of Nigeria and in Niger";
     license = licenses.ofl;
     maintainers = [ maintainers.vbgl ];
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/amiri/default.nix b/nixpkgs/pkgs/data/fonts/amiri/default.nix
index bfd7c60bf531..de65e7fb18b7 100644
--- a/nixpkgs/pkgs/data/fonts/amiri/default.nix
+++ b/nixpkgs/pkgs/data/fonts/amiri/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A classical Arabic typeface in Naskh style";
+    description = "Classical Arabic typeface in Naskh style";
     homepage = "https://www.amirifont.org/";
     license = licenses.ofl;
     maintainers = [ maintainers.vbgl ];
diff --git a/nixpkgs/pkgs/data/fonts/andika/default.nix b/nixpkgs/pkgs/data/fonts/andika/default.nix
index 22900b4b7fcd..897c4ab3c5d1 100644
--- a/nixpkgs/pkgs/data/fonts/andika/default.nix
+++ b/nixpkgs/pkgs/data/fonts/andika/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://software.sil.org/andika";
-    description = "A family designed especially for literacy use taking into account the needs of beginning readers";
+    description = "Family designed especially for literacy use taking into account the needs of beginning readers";
     longDescription = ''
       Andika is a sans serif, Unicode-compliant font designed especially for literacy use, taking into account the needs of beginning readers. The focus is on clear, easy-to-perceive letterforms that will not be readily confused with one another.
 
diff --git a/nixpkgs/pkgs/data/fonts/apl386/default.nix b/nixpkgs/pkgs/data/fonts/apl386/default.nix
deleted file mode 100644
index e1bab248f394..000000000000
--- a/nixpkgs/pkgs/data/fonts/apl386/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenvNoCC, fetchFromGitHub }:
-
-stdenvNoCC.mkDerivation {
-  pname = "apl386";
-  version = "unstable-2022-03-07";
-
-  src = fetchFromGitHub {
-    owner = "abrudz";
-    repo = "APL386";
-    rev = "6332c9dbb588946a0e8c9d7984dd0c003eeea266";
-    hash = "sha256-oHk4e7NRgAjGtZzQmZToYz7wCZETaj7/yRwZMeeYF2M=";
-  };
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm444 -t $out/share/fonts/truetype *.ttf
-
-    runHook postInstall
-  '';
-
-  meta = {
-    homepage = "https://abrudz.github.io/APL386/";
-    description = "APL385 Unicode font evolved";
-    license = lib.licenses.unlicense;
-    maintainers = with lib.maintainers; [ sigmanificient ];
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/nixpkgs/pkgs/data/fonts/barlow/default.nix b/nixpkgs/pkgs/data/fonts/barlow/default.nix
index ad1d985c31e6..ebdebb825384 100644
--- a/nixpkgs/pkgs/data/fonts/barlow/default.nix
+++ b/nixpkgs/pkgs/data/fonts/barlow/default.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A grotesk variable font superfamily";
+    description = "Grotesk variable font superfamily";
     homepage = "https://tribby.com/fonts/barlow/";
     license = licenses.ofl;
     maintainers = [ ];
diff --git a/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix b/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix
index 143975f28db7..f7305e9de987 100644
--- a/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/font-store/BehdadFont";
-    description = "A Persian/Arabic Open Source Font";
+    description = "Persian/Arabic Open Source Font";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = [ ];
diff --git a/nixpkgs/pkgs/data/fonts/blackout/default.nix b/nixpkgs/pkgs/data/fonts/blackout/default.nix
index 44cb10b408e9..2a69a5e2dbf9 100644
--- a/nixpkgs/pkgs/data/fonts/blackout/default.nix
+++ b/nixpkgs/pkgs/data/fonts/blackout/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A bad-ass, unholy-mother-shut-your-mouth stencil sans-serif";
+    description = "Bad-ass, unholy-mother-shut-your-mouth stencil sans-serif";
     longDescription = ''
       Eats holes for breakfast lunch and dinner. Inspired by filling in
       sans-serif newspaper headlines. Continually updated with coffee and
diff --git a/nixpkgs/pkgs/data/fonts/bqn386/default.nix b/nixpkgs/pkgs/data/fonts/bqn386/default.nix
index de1be0cc6f55..35c59a39f37c 100644
--- a/nixpkgs/pkgs/data/fonts/bqn386/default.nix
+++ b/nixpkgs/pkgs/data/fonts/bqn386/default.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = {
-    description = "An APL and BQN font extending on APL386";
+    description = "APL and BQN font extending on APL386";
     homepage = "https://dzaima.github.io/BQN386/";
     license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ skykanin ];
diff --git a/nixpkgs/pkgs/data/fonts/cabin/default.nix b/nixpkgs/pkgs/data/fonts/cabin/default.nix
index 186a5359c44f..0c6327d1e542 100644
--- a/nixpkgs/pkgs/data/fonts/cabin/default.nix
+++ b/nixpkgs/pkgs/data/fonts/cabin/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A humanist sans with 4 weights and true italics";
+    description = "Humanist sans with 4 weights and true italics";
     longDescription = ''
       The Cabin font family is a humanist sans with 4 weights and true italics,
       inspired by Edward Johnston’s and Eric Gill’s typefaces, with a touch of
diff --git a/nixpkgs/pkgs/data/fonts/caladea/default.nix b/nixpkgs/pkgs/data/fonts/caladea/default.nix
index bd00e807309a..b97dae690d9c 100644
--- a/nixpkgs/pkgs/data/fonts/caladea/default.nix
+++ b/nixpkgs/pkgs/data/fonts/caladea/default.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec {
     # This font doesn't appear to have any official web site but this
     # one provides some good information and samples.
     homepage = "http://openfontlibrary.org/en/font/caladea";
-    description = "A serif font metric-compatible with Microsoft Cambria";
+    description = "Serif font metric-compatible with Microsoft Cambria";
     longDescription = ''
       Caladea is a free font that is metric-compatible with the
       Microsoft Cambria font. Developed by Carolina Giovagnoli and
diff --git a/nixpkgs/pkgs/data/fonts/camingo-code/default.nix b/nixpkgs/pkgs/data/fonts/camingo-code/default.nix
index c852303021d0..6bb3f02d7b1f 100644
--- a/nixpkgs/pkgs/data/fonts/camingo-code/default.nix
+++ b/nixpkgs/pkgs/data/fonts/camingo-code/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://www.myfonts.com/fonts/jan-fromm/camingo-code/";
-    description = "A monospaced typeface designed for source-code editors";
+    description = "Monospaced typeface designed for source-code editors";
     platforms = platforms.all;
     license = licenses.cc-by-nd-30;
   };
diff --git a/nixpkgs/pkgs/data/fonts/carlito/default.nix b/nixpkgs/pkgs/data/fonts/carlito/default.nix
index a8b77e7d91ca..a83d8a547a15 100644
--- a/nixpkgs/pkgs/data/fonts/carlito/default.nix
+++ b/nixpkgs/pkgs/data/fonts/carlito/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
     # This font doesn't appear to have any official web site but this
     # one provides some good information and samples.
     homepage = "http://openfontlibrary.org/en/font/carlito";
-    description = "A sans-serif font metric-compatible with Microsoft Calibri";
+    description = "Sans-serif font metric-compatible with Microsoft Calibri";
     longDescription = ''
       Carlito is a free font that is metric-compatible with the
       Microsoft Calibri font. The font is designed by Łukasz Dziedzic
diff --git a/nixpkgs/pkgs/data/fonts/catamaran/default.nix b/nixpkgs/pkgs/data/fonts/catamaran/default.nix
new file mode 100644
index 000000000000..253f458bc4b6
--- /dev/null
+++ b/nixpkgs/pkgs/data/fonts/catamaran/default.nix
@@ -0,0 +1,43 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchzip,
+}:
+stdenvNoCC.mkDerivation rec {
+  pname = "catamaran";
+  version = "0-unstable-2024-03-02";
+
+  src = fetchzip {
+    url = "https://www.1001fonts.com/download/catamaran.zip";
+    stripRoot = false;
+    hash = "sha256-9s11lZSS4pYJZwl8Uk7qtdwfZ2bkoZkSIf1MkQlv7H4=";
+  };
+
+  stripRoot = false;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/fonts/truetype
+    mv *.ttf $out/share/fonts/truetype/
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://fonts.google.com/specimen/Catamaran";
+    description = "A stylish sans-serif Tamil and Latin typeface";
+    longDescription = ''
+      Catamaran is a Unicode-compliant Latin and Tamil text type family designed for the digital age.
+      The Tamil is monolinear and was designed alongside the sans serif Latin and Devanagari family Palanquin.
+
+      It currently comprises of 9 text weights, making it a versatile family that strikes a balance between typographic conventions and that bit of sparkle.
+      (A catamaran is a multihulled vessel consisting of two parallel hulls of equal size.
+      The catamaran concept is a relative newcomer for Western boat designers, been used since time immemorial among the Dravidian people, in South India.)
+    '';
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [wyred50];
+  };
+}
+
diff --git a/nixpkgs/pkgs/data/fonts/charis-sil/default.nix b/nixpkgs/pkgs/data/fonts/charis-sil/default.nix
index b4880fd218de..a75fabb9ae35 100644
--- a/nixpkgs/pkgs/data/fonts/charis-sil/default.nix
+++ b/nixpkgs/pkgs/data/fonts/charis-sil/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://software.sil.org/charis";
-    description = "A family of highly readable fonts for broad multilingual use";
+    description = "Family of highly readable fonts for broad multilingual use";
     longDescription = ''
       This Charis SIL font is essentially the same design as the SIL Charis font first released by SIL in 1997. Charis is similar to Bitstream Charter, one of the first fonts designed specifically for laser printers. It is highly readable and holds up well in less-than-ideal reproduction environments. It also has a full set of styles – regular, italic, bold, bold italic. Charis is a serif, proportionally-spaced font optimized for readability in long printed documents.
 
diff --git a/nixpkgs/pkgs/data/fonts/chonburi/default.nix b/nixpkgs/pkgs/data/fonts/chonburi/default.nix
index 4a14368f1f5f..e3c4cddd7cae 100644
--- a/nixpkgs/pkgs/data/fonts/chonburi/default.nix
+++ b/nixpkgs/pkgs/data/fonts/chonburi/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://cadsondemak.github.io/chonburi/";
-    description = "A Didonic Thai and Latin display typeface";
+    description = "Didonic Thai and Latin display typeface";
     longDescription = ''
       The objective of this project is to create a Thai and Latin Display
       typeface. Chonburi is a display typeface with high contrast in a Didone
diff --git a/nixpkgs/pkgs/data/fonts/chunk/default.nix b/nixpkgs/pkgs/data/fonts/chunk/default.nix
index fec1c043bfa1..5e92ae35b0a2 100644
--- a/nixpkgs/pkgs/data/fonts/chunk/default.nix
+++ b/nixpkgs/pkgs/data/fonts/chunk/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "An ultra-bold, ultra-awesome slab serif typeface";
+    description = "Ultra-bold, ultra-awesome slab serif typeface";
     longDescription = ''
       Chunk is an ultra-bold slab serif typeface that is reminiscent of old
       American Western woodcuts, broadsides, and newspaper headlines. Used
diff --git a/nixpkgs/pkgs/data/fonts/clearlyU/default.nix b/nixpkgs/pkgs/data/fonts/clearlyU/default.nix
index 9799955d05f3..c0824cf7d40e 100644
--- a/nixpkgs/pkgs/data/fonts/clearlyU/default.nix
+++ b/nixpkgs/pkgs/data/fonts/clearlyU/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A Unicode font";
+    description = "Unicode font";
     license = licenses.mit;
     maintainers = [ maintainers.raskin ];
   };
diff --git a/nixpkgs/pkgs/data/fonts/comfortaa/default.nix b/nixpkgs/pkgs/data/fonts/comfortaa/default.nix
index f47da9fc5306..defdd9b86bba 100644
--- a/nixpkgs/pkgs/data/fonts/comfortaa/default.nix
+++ b/nixpkgs/pkgs/data/fonts/comfortaa/default.nix
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "http://aajohan.deviantart.com/art/Comfortaa-font-105395949";
-    description = "A clean and modern font suitable for headings and logos";
+    description = "Clean and modern font suitable for headings and logos";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = [ maintainers.rycee ];
diff --git a/nixpkgs/pkgs/data/fonts/comic-mono/default.nix b/nixpkgs/pkgs/data/fonts/comic-mono/default.nix
index fc3b8d6085be..b635c1379489 100644
--- a/nixpkgs/pkgs/data/fonts/comic-mono/default.nix
+++ b/nixpkgs/pkgs/data/fonts/comic-mono/default.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "A legible monospace font that looks like Comic Sans";
+    description = "Legible monospace font that looks like Comic Sans";
     longDescription = ''
       A legible monospace font... the very typeface you’ve been trained to
       recognize since childhood. This font is a fork of Shannon Miwa’s Comic
diff --git a/nixpkgs/pkgs/data/fonts/comic-neue/default.nix b/nixpkgs/pkgs/data/fonts/comic-neue/default.nix
index 7485d435cb23..66eb4087efaa 100644
--- a/nixpkgs/pkgs/data/fonts/comic-neue/default.nix
+++ b/nixpkgs/pkgs/data/fonts/comic-neue/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "http://comicneue.com/";
-    description = "A casual type face: Make your lemonade stand look like a fortune 500 company";
+    description = "Casual type face: Make your lemonade stand look like a fortune 500 company";
     longDescription = ''
       ComicNeue is inspired by Comic Sans but more regular. It was
       designed by Craig Rozynski. It is available in two variants:
diff --git a/nixpkgs/pkgs/data/fonts/comic-relief/default.nix b/nixpkgs/pkgs/data/fonts/comic-relief/default.nix
index c4c7648acd29..fe1c1b512812 100644
--- a/nixpkgs/pkgs/data/fonts/comic-relief/default.nix
+++ b/nixpkgs/pkgs/data/fonts/comic-relief/default.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://fontlibrary.org/en/font/comic-relief";
-    description = "A font metric-compatible with Microsoft Comic Sans";
+    description = "Font metric-compatible with Microsoft Comic Sans";
     longDescription = ''
       Comic Relief is a typeface designed to be metrically equivalent
       to the popular Comic Sans MS. Comic Relief can be used in place
diff --git a/nixpkgs/pkgs/data/fonts/commit-mono/default.nix b/nixpkgs/pkgs/data/fonts/commit-mono/default.nix
index ea358bba2b55..0d952d17cbaf 100644
--- a/nixpkgs/pkgs/data/fonts/commit-mono/default.nix
+++ b/nixpkgs/pkgs/data/fonts/commit-mono/default.nix
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "An anonymous and neutral programming typeface focused on creating a better reading experience";
+    description = "Anonymous and neutral programming typeface focused on creating a better reading experience";
     homepage = "https://commitmono.com/";
     license = licenses.ofl;
     maintainers = [ maintainers.yoavlavi ];
diff --git a/nixpkgs/pkgs/data/fonts/cooper-hewitt/default.nix b/nixpkgs/pkgs/data/fonts/cooper-hewitt/default.nix
index 843fb851c140..743c1ed8a6b8 100644
--- a/nixpkgs/pkgs/data/fonts/cooper-hewitt/default.nix
+++ b/nixpkgs/pkgs/data/fonts/cooper-hewitt/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://www.cooperhewitt.org/open-source-at-cooper-hewitt/cooper-hewitt-the-typeface-by-chester-jenkins/";
-    description = "A contemporary sans serif, with characters composed of modified-geometric curves and arches";
+    description = "Contemporary sans serif, with characters composed of modified-geometric curves and arches";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = [ ];
diff --git a/nixpkgs/pkgs/data/fonts/corefonts/default.nix b/nixpkgs/pkgs/data/fonts/corefonts/default.nix
deleted file mode 100644
index 059350da7d4f..000000000000
--- a/nixpkgs/pkgs/data/fonts/corefonts/default.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{ lib, stdenv, fetchurl, cabextract }:
-
-let
-  fonts = [
-    { name = "andale";  sha256 = "0w7927hlwayqf3vvanf8f3qp2g1i404jzqvhp1z3mp0sjm1gw905"; }
-    { name = "arial";   sha256 = "1xkqyivbyb3z9dcalzidf8m4npzfpls2g0kldyn8g73f2i6plac5"; }
-    { name = "arialb";  sha256 = "1a60zqrg63kjnykh5hz7dbpzvx7lyivn3vbrp7jyv9d1nvzz09d4"; }
-    { name = "comic";   sha256 = "0ki0rljjc1pxkbsxg515fwx15yc95bdyaksa3pjd89nyxzzg6vcw"; }
-    { name = "courie";  sha256 = "111k3waxki9yyxpjwl2qrdkswvsd2dmvhbjmmrwyipam2s31sldv"; }
-    { name = "georgi";  sha256 = "0083jcpd837j2c06kp1q8glfjn9k7z6vg3wi137savk0lv6psb1c"; }
-    { name = "impact";  sha256 = "1yyc5z7zmm3s418hmrkmc8znc55afsrz5dgxblpn9n81fhxyyqb0"; }
-    { name = "times";   sha256 = "1aq7z3l46vwgqljvq9zfgkii6aivy00z1529qbjkspggqrg5jmnv"; }
-    { name = "trebuc";  sha256 = "1jfsgz80pvyqvpfpaiz5pd8zwlcn67rg2jgynjwf22sip2dhssas"; }
-    { name = "webdin";  sha256 = "0nnp2znmnmx87ijq9zma0vl0hd46npx38p0cc6lgp00hpid5nnb4"; }
-    { name = "verdan";  sha256 = "15mdbbfqbyp25a6ynik3rck3m3mg44plwrj79rwncc9nbqjn3jy1"; }
-    { name = "wd97vwr"; sha256 = "1lmkh3zb6xv47k0z2mcwk3vk8jff9m845c9igxm14bbvs6k2c4gn"; }
-  ];
-
-  eula = fetchurl {
-    url = "https://corefonts.sourceforge.net/eula.htm";
-    sha256 = "1aqbcnl032g2hd7iy56cs022g47scb0jxxp3mm206x1yqc90vs1c";
-  };
-in
-stdenv.mkDerivation {
-  pname = "corefonts";
-  version = "1";
-
-  exes = map ({name, sha256}: fetchurl {
-    url = "mirror://sourceforge/corefonts/${name}32.exe";
-    inherit sha256;
-  }) fonts;
-
-  nativeBuildInputs = [ cabextract ];
-
-  buildCommand = ''
-    for i in $exes; do
-      cabextract --lowercase $i
-    done
-    cabextract --lowercase viewer1.cab
-
-    # rename to more standard names
-    # handle broken macOS file-system
-    mv andalemo.ttf  Andale_Mono.ttf
-    mv ariblk.ttf    Arial_Black.ttf
-    mv arial.ttf     Arial.ttf.tmp
-    mv Arial.ttf.tmp Arial.ttf
-    mv arialbd.ttf   Arial_Bold.ttf
-    mv arialbi.ttf   Arial_Bold_Italic.ttf
-    mv ariali.ttf    Arial_Italic.ttf
-    mv comic.ttf     Comic_Sans_MS.ttf
-    mv comicbd.ttf   Comic_Sans_MS_Bold.ttf
-    mv cour.ttf      Courier_New.ttf
-    mv courbd.ttf    Courier_New_Bold.ttf
-    mv couri.ttf     Courier_New_Italic.ttf
-    mv courbi.ttf    Courier_New_Bold_Italic.ttf
-    mv georgia.ttf   Georgia.ttf.tmp
-    mv Georgia.ttf.tmp   Georgia.ttf
-    mv georgiab.ttf  Georgia_Bold.ttf
-    mv georgiai.ttf  Georgia_Italic.ttf
-    mv georgiaz.ttf  Georgia_Bold_Italic.ttf
-    mv impact.ttf    Impact.ttf.tmp
-    mv Impact.ttf.tmp    Impact.ttf
-    mv tahoma.ttf    Tahoma.ttf.tmp
-    mv Tahoma.ttf.tmp    Tahoma.ttf
-    mv times.ttf     Times_New_Roman.ttf
-    mv timesbd.ttf   Times_New_Roman_Bold.ttf
-    mv timesbi.ttf   Times_New_Roman_Bold_Italic.ttf
-    mv timesi.ttf    Times_New_Roman_Italic.ttf
-    mv trebuc.ttf    Trebuchet_MS.ttf
-    mv trebucbd.ttf  Trebuchet_MS_Bold.ttf
-    mv trebucit.ttf  Trebuchet_MS_Italic.ttf
-    mv trebucbi.ttf  Trebuchet_MS_Italic.ttf
-    mv verdana.ttf   Verdana.ttf.tmp
-    mv Verdana.ttf.tmp   Verdana.ttf
-    mv verdanab.ttf  Verdana_Bold.ttf
-    mv verdanai.ttf  Verdana_Italic.ttf
-    mv verdanaz.ttf  Verdana_Bold_Italic.ttf
-    mv webdings.ttf  Webdings.ttf.tmp
-    mv Webdings.ttf.tmp  Webdings.ttf
-
-    install -m444 -Dt $out/share/fonts/truetype *.ttf
-
-    # Also put the EULA there to be on the safe side.
-    cp ${eula} $out/share/fonts/truetype/eula.html
-
-    # Set up no-op font configs to override any aliases set up by other packages.
-    mkdir -p $out/etc/fonts/conf.d
-    for name in Andale-Mono Arial-Black Arial Comic-Sans-MS \
-                Courier-New Georgia Impact Times-New-Roman \
-                Trebuchet Verdana Webdings ; do
-      substitute ${./no-op.conf} $out/etc/fonts/conf.d/30-''${name,,}.conf \
-        --subst-var-by fontname "''${name//-/ }"
-    done
-  '';
-
-  meta = with lib; {
-    homepage = "https://corefonts.sourceforge.net/";
-    description = "Microsoft's TrueType core fonts for the Web";
-    platforms = platforms.all;
-    license = licenses.unfreeRedistributable;
-    # Set a non-zero priority to allow easy overriding of the
-    # fontconfig configuration files.
-    priority = 5;
-  };
-}
diff --git a/nixpkgs/pkgs/data/fonts/corefonts/no-op.conf b/nixpkgs/pkgs/data/fonts/corefonts/no-op.conf
deleted file mode 100644
index 3f8a9b9b5444..000000000000
--- a/nixpkgs/pkgs/data/fonts/corefonts/no-op.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
-<fontconfig>
-  <!-- This configuation is intentionally left empty in order to
-       override any other font package that may wish to set up an
-       alias for the Microsoft @fontname@ font. If you actually do
-       want to have the alias then please change the priority of that
-       package; see the Nix manual page for nix-env for details. -->
-</fontconfig>
diff --git a/nixpkgs/pkgs/data/fonts/cozette/default.nix b/nixpkgs/pkgs/data/fonts/cozette/default.nix
index caf7790cab83..815024778772 100644
--- a/nixpkgs/pkgs/data/fonts/cozette/default.nix
+++ b/nixpkgs/pkgs/data/fonts/cozette/default.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A bitmap programming font optimized for coziness";
+    description = "Bitmap programming font optimized for coziness";
     homepage = "https://github.com/slavfox/cozette";
     changelog = "https://github.com/slavfox/Cozette/blob/v.${version}/CHANGELOG.md";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/data/fonts/creep/default.nix b/nixpkgs/pkgs/data/fonts/creep/default.nix
index d25464da813f..1c3f6ab49141 100644
--- a/nixpkgs/pkgs/data/fonts/creep/default.nix
+++ b/nixpkgs/pkgs/data/fonts/creep/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A pretty sweet 4px wide pixel font";
+    description = "Pretty sweet 4px wide pixel font";
     homepage = "https://github.com/romeovs/creep";
     license = licenses.mit;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/crimson-pro/default.nix b/nixpkgs/pkgs/data/fonts/crimson-pro/default.nix
index 29066b5ec3c3..7b302b61eb91 100644
--- a/nixpkgs/pkgs/data/fonts/crimson-pro/default.nix
+++ b/nixpkgs/pkgs/data/fonts/crimson-pro/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     homepage = "https://github.com/Fonthausen/CrimsonPro";
-    description = "A professionally produced redesign of Crimson by Jacques Le Bailly";
+    description = "Professionally produced redesign of Crimson by Jacques Le Bailly";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = with maintainers; [ ncfavier ];
diff --git a/nixpkgs/pkgs/data/fonts/crimson/default.nix b/nixpkgs/pkgs/data/fonts/crimson/default.nix
index 1868c897bd53..82c9c9ace6c7 100644
--- a/nixpkgs/pkgs/data/fonts/crimson/default.nix
+++ b/nixpkgs/pkgs/data/fonts/crimson/default.nix
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/skosch/Crimson";
-    description = "A font family inspired by beautiful oldstyle typefaces";
+    description = "Font family inspired by beautiful oldstyle typefaces";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = [ maintainers.rycee ];
diff --git a/nixpkgs/pkgs/data/fonts/curie/default.nix b/nixpkgs/pkgs/data/fonts/curie/default.nix
index 5e8195211b05..ba7d43055f95 100644
--- a/nixpkgs/pkgs/data/fonts/curie/default.nix
+++ b/nixpkgs/pkgs/data/fonts/curie/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "An upscaled version of scientifica";
+    description = "Upscaled version of scientifica";
     homepage = "https://github.com/NerdyPepper/curie";
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/dejavu-fonts/default.nix b/nixpkgs/pkgs/data/fonts/dejavu-fonts/default.nix
index ba9fed1be282..1fdb20ff3ced 100644
--- a/nixpkgs/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/dejavu-fonts/default.nix
@@ -4,7 +4,7 @@ let
   version = "2.37";
 
   meta = {
-    description = "A typeface family based on the Bitstream Vera fonts";
+    description = "Typeface family based on the Bitstream Vera fonts";
     longDescription = ''
       The DejaVu fonts are TrueType fonts based on the BitStream Vera fonts,
       providing more styles and with greater coverage of Unicode.
diff --git a/nixpkgs/pkgs/data/fonts/dina/default.nix b/nixpkgs/pkgs/data/fonts/dina/default.nix
index 4a0612efd3e5..37bf08611f35 100644
--- a/nixpkgs/pkgs/data/fonts/dina/default.nix
+++ b/nixpkgs/pkgs/data/fonts/dina/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "A monospace bitmap font aimed at programmers";
+    description = "Monospace bitmap font aimed at programmers";
     longDescription = ''
       Dina is a monospace bitmap font, primarily aimed at programmers. It is
       relatively compact to allow a lot of code on screen, while (hopefully)
diff --git a/nixpkgs/pkgs/data/fonts/dm-sans/default.nix b/nixpkgs/pkgs/data/fonts/dm-sans/default.nix
index c2d8f33eff69..e8d51945254d 100644
--- a/nixpkgs/pkgs/data/fonts/dm-sans/default.nix
+++ b/nixpkgs/pkgs/data/fonts/dm-sans/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = {
-    description = "A geometric sans-serif typeface";
+    description = "Geometric sans-serif typeface";
     homepage = "https://github.com/googlefonts/dm-fonts";
     license = lib.licenses.ofl;
     maintainers = with lib.maintainers; [ gilice ];
diff --git a/nixpkgs/pkgs/data/fonts/dosis/default.nix b/nixpkgs/pkgs/data/fonts/dosis/default.nix
index a33f086c9bbe..5a9470a43ec8 100644
--- a/nixpkgs/pkgs/data/fonts/dosis/default.nix
+++ b/nixpkgs/pkgs/data/fonts/dosis/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A very simple, rounded, sans serif family";
+    description = "Very simple, rounded, sans serif family";
     longDescription = ''
       Dosis is a very simple, rounded, sans serif family.
 
diff --git a/nixpkgs/pkgs/data/fonts/doulos-sil/default.nix b/nixpkgs/pkgs/data/fonts/doulos-sil/default.nix
index 5db5e942f6ef..d4a21382bbfa 100644
--- a/nixpkgs/pkgs/data/fonts/doulos-sil/default.nix
+++ b/nixpkgs/pkgs/data/fonts/doulos-sil/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://software.sil.org/doulos";
-    description = "A font that provides complete support for the International Phonetic Alphabet";
+    description = "Font that provides complete support for the International Phonetic Alphabet";
     longDescription = ''
       This Doulos SIL font is essentially the same design as the SIL Doulos font first released by SIL in 1992. The design has been changed from the original in that it has been scaled down to be a better match with contemporary digital fonts, such as Times New Roman®. This current release is a regular typeface, with no bold or italic version available or planned. It is intended for use alongside other Times-like fonts where a range of styles (italic, bold) are not needed. Therefore, just one font is included in the Doulos SIL release: Doulos SIL Regular.
 
diff --git a/nixpkgs/pkgs/data/fonts/edwin/default.nix b/nixpkgs/pkgs/data/fonts/edwin/default.nix
index 2ccb44d45d2e..58a2ed3e3ec6 100644
--- a/nixpkgs/pkgs/data/fonts/edwin/default.nix
+++ b/nixpkgs/pkgs/data/fonts/edwin/default.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A text font for musical scores";
+    description = "Text font for musical scores";
     homepage = "https://github.com/MuseScoreFonts/Edwin";
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/efont-unicode/default.nix b/nixpkgs/pkgs/data/fonts/efont-unicode/default.nix
index e45bdab7a4d8..cc41646a1263 100644
--- a/nixpkgs/pkgs/data/fonts/efont-unicode/default.nix
+++ b/nixpkgs/pkgs/data/fonts/efont-unicode/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "bdf" ];
 
   meta = with lib; {
-    description = "The /efont/ Unicode bitmap font";
+    description = "/efont/ Unicode bitmap font";
     homepage = "http://openlab.ring.gr.jp/efont/unicode/";
     license = licenses.bsd3;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/encode-sans/default.nix b/nixpkgs/pkgs/data/fonts/encode-sans/default.nix
index 1c9fc453c7d3..ec48dc9ee009 100644
--- a/nixpkgs/pkgs/data/fonts/encode-sans/default.nix
+++ b/nixpkgs/pkgs/data/fonts/encode-sans/default.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A versatile sans serif font family";
+    description = "Versatile sans serif font family";
     longDescription = ''
       The Encode Sans family is a versatile workhorse. Featuring a huge range of
       weights and widths, it's ready for all kind of typographic challenges. It
diff --git a/nixpkgs/pkgs/data/fonts/et-book/default.nix b/nixpkgs/pkgs/data/fonts/et-book/default.nix
index d1b59e2cdc0f..6dfa369d606d 100644
--- a/nixpkgs/pkgs/data/fonts/et-book/default.nix
+++ b/nixpkgs/pkgs/data/fonts/et-book/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "The typeface used in Edward Tufte’s books.";
+    description = "Typeface used in Edward Tufte’s books";
     license = licenses.mit;
     platforms = platforms.all;
     maintainers = with maintainers; [ jethro ];
diff --git a/nixpkgs/pkgs/data/fonts/eunomia/default.nix b/nixpkgs/pkgs/data/fonts/eunomia/default.nix
index ea3613b5f81f..d51c797d2800 100644
--- a/nixpkgs/pkgs/data/fonts/eunomia/default.nix
+++ b/nixpkgs/pkgs/data/fonts/eunomia/default.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     homepage = "http://dotcolon.net/font/eunomia/";
-    description = "A futuristic decorative font";
+    description = "Futuristic decorative font";
     platforms = platforms.all;
     maintainers = with maintainers; [ leenaars minijackson ];
     license = licenses.ofl;
diff --git a/nixpkgs/pkgs/data/fonts/f1_8/default.nix b/nixpkgs/pkgs/data/fonts/f1_8/default.nix
index 93e44be17cda..7020e43f1035 100644
--- a/nixpkgs/pkgs/data/fonts/f1_8/default.nix
+++ b/nixpkgs/pkgs/data/fonts/f1_8/default.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
-    description = "A weighted decorative font";
+    description = "Weighted decorative font";
     platforms = platforms.all;
     maintainers = with maintainers; [ minijackson ];
     license = licenses.ofl;
diff --git a/nixpkgs/pkgs/data/fonts/f5_6/default.nix b/nixpkgs/pkgs/data/fonts/f5_6/default.nix
index f1e8e7698f27..9ba404f4b38f 100644
--- a/nixpkgs/pkgs/data/fonts/f5_6/default.nix
+++ b/nixpkgs/pkgs/data/fonts/f5_6/default.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
-    description = "A weighted decorative font";
+    description = "Weighted decorative font";
     platforms = platforms.all;
     maintainers = with maintainers; [ leenaars minijackson ];
     license = licenses.ofl;
diff --git a/nixpkgs/pkgs/data/fonts/fa_1/default.nix b/nixpkgs/pkgs/data/fonts/fa_1/default.nix
index 1c21bb279be6..11302b9c6f6e 100644
--- a/nixpkgs/pkgs/data/fonts/fa_1/default.nix
+++ b/nixpkgs/pkgs/data/fonts/fa_1/default.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
-    description = "A weighted decorative font";
+    description = "Weighted decorative font";
     platforms = platforms.all;
     maintainers = with maintainers; [ minijackson ];
     license = licenses.ofl;
diff --git a/nixpkgs/pkgs/data/fonts/fantasque-sans-mono/default.nix b/nixpkgs/pkgs/data/fonts/fantasque-sans-mono/default.nix
index d4d60d95bc94..9d594a7f7580 100644
--- a/nixpkgs/pkgs/data/fonts/fantasque-sans-mono/default.nix
+++ b/nixpkgs/pkgs/data/fonts/fantasque-sans-mono/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/belluzj/fantasque-sans";
-    description = "A font family with a great monospaced variant for programmers";
+    description = "Font family with a great monospaced variant for programmers";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = [ maintainers.rycee ];
diff --git a/nixpkgs/pkgs/data/fonts/fanwood/default.nix b/nixpkgs/pkgs/data/fonts/fanwood/default.nix
index 669ee6ac206e..01e2e7da79f1 100644
--- a/nixpkgs/pkgs/data/fonts/fanwood/default.nix
+++ b/nixpkgs/pkgs/data/fonts/fanwood/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A serif based on the work of a famous Czech-American type designer of yesteryear";
+    description = "Serif based on the work of a famous Czech-American type designer of yesteryear";
     longDescription = ''
       Based on work of a famous Czech-American type designer of yesteryear. The
       package includes roman and italic.
diff --git a/nixpkgs/pkgs/data/fonts/ferrum/default.nix b/nixpkgs/pkgs/data/fonts/ferrum/default.nix
index 5f6459a1f6bf..8d90a9328f24 100644
--- a/nixpkgs/pkgs/data/fonts/ferrum/default.nix
+++ b/nixpkgs/pkgs/data/fonts/ferrum/default.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
-    description = "A decorative font";
+    description = "Decorative font";
     platforms = platforms.all;
     maintainers = with maintainers; [ leenaars minijackson ];
     license = licenses.cc0;
diff --git a/nixpkgs/pkgs/data/fonts/fg-virgil/default.nix b/nixpkgs/pkgs/data/fonts/fg-virgil/default.nix
index da9ecb235005..d7c04d9b9e88 100644
--- a/nixpkgs/pkgs/data/fonts/fg-virgil/default.nix
+++ b/nixpkgs/pkgs/data/fonts/fg-virgil/default.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://github.com/excalidraw/virgil";
-    description = "The font that powers Excalidraw";
+    description = "Font that powers Excalidraw";
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ drupol ];
     license = lib.licenses.ofl;
diff --git a/nixpkgs/pkgs/data/fonts/fraunces/default.nix b/nixpkgs/pkgs/data/fonts/fraunces/default.nix
index b41dc1ea8099..d74e84a570d3 100644
--- a/nixpkgs/pkgs/data/fonts/fraunces/default.nix
+++ b/nixpkgs/pkgs/data/fonts/fraunces/default.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A display, “Old Style” soft-serif typeface inspired by early 20th century typefaces";
+    description = "Display, “Old Style” soft-serif typeface inspired by early 20th century typefaces";
     homepage = "https://github.com/undercasetype/Fraunces";
     license = licenses.ofl;
     maintainers = [ ];
diff --git a/nixpkgs/pkgs/data/fonts/gandom-fonts/default.nix b/nixpkgs/pkgs/data/fonts/gandom-fonts/default.nix
index 53ea5558c1f1..5d128448f1c7 100644
--- a/nixpkgs/pkgs/data/fonts/gandom-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/gandom-fonts/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/rastikerdar/gandom-font";
-    description = "A Persian (Farsi) Font - فونت (قلم) فارسی گندم";
+    description = "Persian (Farsi) Font - فونت (قلم) فارسی گندم";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = [ ];
diff --git a/nixpkgs/pkgs/data/fonts/gelasio/default.nix b/nixpkgs/pkgs/data/fonts/gelasio/default.nix
index cea8e439d36b..9f62d7464185 100644
--- a/nixpkgs/pkgs/data/fonts/gelasio/default.nix
+++ b/nixpkgs/pkgs/data/fonts/gelasio/default.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "a font which is metric-compatible with Microsoft's Georgia";
+    description = "Font which is metric-compatible with Microsoft's Georgia";
     longDescription = ''
       Gelasio is an original typeface which is metrics compatible with Microsoft's
       Georgia in its Regular, Bold, Italic and Bold Italic weights. Interpolated
diff --git a/nixpkgs/pkgs/data/fonts/gentium-book-basic/default.nix b/nixpkgs/pkgs/data/fonts/gentium-book-basic/default.nix
index 5cbc31accf07..c9541b307ff0 100644
--- a/nixpkgs/pkgs/data/fonts/gentium-book-basic/default.nix
+++ b/nixpkgs/pkgs/data/fonts/gentium-book-basic/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://software.sil.org/gentium/";
-    description = "A high-quality typeface family for Latin, Cyrillic, and Greek";
+    description = "High-quality typeface family for Latin, Cyrillic, and Greek";
     maintainers = with maintainers; [ ];
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/gentium/default.nix b/nixpkgs/pkgs/data/fonts/gentium/default.nix
index ae454ef42232..e9d8435db26d 100644
--- a/nixpkgs/pkgs/data/fonts/gentium/default.nix
+++ b/nixpkgs/pkgs/data/fonts/gentium/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://software.sil.org/gentium/";
-    description = "A high-quality typeface family for Latin, Cyrillic, and Greek";
+    description = "High-quality typeface family for Latin, Cyrillic, and Greek";
     longDescription = ''
       Gentium is a typeface family designed to enable the diverse ethnic groups
       around the world who use the Latin, Cyrillic and Greek scripts to produce
diff --git a/nixpkgs/pkgs/data/fonts/go-font/default.nix b/nixpkgs/pkgs/data/fonts/go-font/default.nix
index 63d62ec2e82e..db96e3183e26 100644
--- a/nixpkgs/pkgs/data/fonts/go-font/default.nix
+++ b/nixpkgs/pkgs/data/fonts/go-font/default.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://blog.golang.org/go-fonts";
-    description = "The Go font family";
+    description = "Go font family";
     changelog = "https://go.googlesource.com/image/+log/refs/heads/master/font/gofont";
     license = licenses.bsd3;
     maintainers = with maintainers; [ sternenseemann ];
diff --git a/nixpkgs/pkgs/data/fonts/gohufont/default.nix b/nixpkgs/pkgs/data/fonts/gohufont/default.nix
index 37fb622e1310..6892742de799 100644
--- a/nixpkgs/pkgs/data/fonts/gohufont/default.nix
+++ b/nixpkgs/pkgs/data/fonts/gohufont/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , xorg, bdf2psf, bdftopcf
 , libfaketime
 }:
diff --git a/nixpkgs/pkgs/data/fonts/goudy-bookletter-1911/default.nix b/nixpkgs/pkgs/data/fonts/goudy-bookletter-1911/default.nix
index 14997cd62b6e..5f0880ca036f 100644
--- a/nixpkgs/pkgs/data/fonts/goudy-bookletter-1911/default.nix
+++ b/nixpkgs/pkgs/data/fonts/goudy-bookletter-1911/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A public domain font based on Frederic Goudy’s Kennerley Oldstyle";
+    description = "Public domain font based on Frederic Goudy’s Kennerley Oldstyle";
     homepage = "https://www.theleagueofmoveabletype.com/goudy-bookletter-1911";
     license = lib.licenses.ofl;
     maintainers = with lib.maintainers; [ minijackson ];
diff --git a/nixpkgs/pkgs/data/fonts/gubbi/default.nix b/nixpkgs/pkgs/data/fonts/gubbi/default.nix
index 9ae46d089925..0b6b42493fe3 100644
--- a/nixpkgs/pkgs/data/fonts/gubbi/default.nix
+++ b/nixpkgs/pkgs/data/fonts/gubbi/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     inherit (src.meta) homepage;
-    description = "A Kannada font";
+    description = "Kannada font";
     license = licenses.gpl3Plus;
     platforms = platforms.all;
     maintainers = with maintainers; [ ehmry ];
diff --git a/nixpkgs/pkgs/data/fonts/hack/default.nix b/nixpkgs/pkgs/data/fonts/hack/default.nix
index e39815a2e153..a503ade5d239 100644
--- a/nixpkgs/pkgs/data/fonts/hack/default.nix
+++ b/nixpkgs/pkgs/data/fonts/hack/default.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A typeface designed for source code";
+    description = "Typeface designed for source code";
     longDescription = ''
       Hack is hand groomed and optically balanced to be a workhorse face for
       code. It has deep roots in the libre, open source typeface community and
diff --git a/nixpkgs/pkgs/data/fonts/hackgen/default.nix b/nixpkgs/pkgs/data/fonts/hackgen/default.nix
index 6ea5312a98aa..d3f83f5800fd 100644
--- a/nixpkgs/pkgs/data/fonts/hackgen/default.nix
+++ b/nixpkgs/pkgs/data/fonts/hackgen/default.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A composite font of Hack and GenJyuu-Goghic";
+    description = "Composite font of Hack and GenJyuu-Goghic";
     homepage = "https://github.com/yuru7/HackGen";
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/hackgen/nerdfont.nix b/nixpkgs/pkgs/data/fonts/hackgen/nerdfont.nix
index c75e1d306084..9e06496163aa 100644
--- a/nixpkgs/pkgs/data/fonts/hackgen/nerdfont.nix
+++ b/nixpkgs/pkgs/data/fonts/hackgen/nerdfont.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A composite font of Hack, GenJyuu-Gothic and nerd-fonts";
+    description = "Composite font of Hack, GenJyuu-Gothic and nerd-fonts";
     homepage = "https://github.com/yuru7/HackGen";
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/hasklig/default.nix b/nixpkgs/pkgs/data/fonts/hasklig/default.nix
index b0d37aca9e12..5868452c5793 100644
--- a/nixpkgs/pkgs/data/fonts/hasklig/default.nix
+++ b/nixpkgs/pkgs/data/fonts/hasklig/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/i-tu/Hasklig";
-    description = "A font with ligatures for Haskell code based off Source Code Pro";
+    description = "Font with ligatures for Haskell code based off Source Code Pro";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = with maintainers; [ davidrusu ];
diff --git a/nixpkgs/pkgs/data/fonts/hubot-sans/default.nix b/nixpkgs/pkgs/data/fonts/hubot-sans/default.nix
index 5db592ae8b4f..3711aeb028d1 100644
--- a/nixpkgs/pkgs/data/fonts/hubot-sans/default.nix
+++ b/nixpkgs/pkgs/data/fonts/hubot-sans/default.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A variable font from GitHub";
+    description = "Variable font from GitHub";
     homepage = "https://github.com/github/hubot-sans";
     changelog = "https://github.com/github/hubot-sans/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.ofl;
diff --git a/nixpkgs/pkgs/data/fonts/hyperscrypt/default.nix b/nixpkgs/pkgs/data/fonts/hyperscrypt/default.nix
index c72e4b9e19a0..a55702fbf2e5 100644
--- a/nixpkgs/pkgs/data/fonts/hyperscrypt/default.nix
+++ b/nixpkgs/pkgs/data/fonts/hyperscrypt/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://velvetyne.fr/fonts/hyper-scrypt/";
-    description = "A modern stencil typeface inspired by stained glass technique";
+    description = "Modern stencil typeface inspired by stained glass technique";
     longDescription = ''
       The Hyper Scrypt typeface was designed for the Hyper Chapelle
       exhibition. It was commissioned by AAAAA Atelier to Studio
diff --git a/nixpkgs/pkgs/data/fonts/i-dot-ming/default.nix b/nixpkgs/pkgs/data/fonts/i-dot-ming/default.nix
index fb2679b2eba2..bd09d6efaeb7 100644
--- a/nixpkgs/pkgs/data/fonts/i-dot-ming/default.nix
+++ b/nixpkgs/pkgs/data/fonts/i-dot-ming/default.nix
@@ -40,7 +40,7 @@ stdenvNoCC.mkDerivation rec {
   };
 
   meta = with lib; {
-    description = "An open source Pan-CJK serif typeface";
+    description = "Open source Pan-CJK serif typeface";
     homepage = "https://github.com/ichitenfont/I.Ming";
     license = licenses.ipa;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/inconsolata/default.nix b/nixpkgs/pkgs/data/fonts/inconsolata/default.nix
index 180fa12b1066..79431995a496 100644
--- a/nixpkgs/pkgs/data/fonts/inconsolata/default.nix
+++ b/nixpkgs/pkgs/data/fonts/inconsolata/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     homepage = "https://www.levien.com/type/myfonts/inconsolata.html";
-    description = "A monospace font for both screen and print";
+    description = "Monospace font for both screen and print";
     maintainers = with maintainers; [ appsforartists mikoim raskin ];
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/inter/default.nix b/nixpkgs/pkgs/data/fonts/inter/default.nix
index 0cbf67902f1c..2bed6db734bb 100644
--- a/nixpkgs/pkgs/data/fonts/inter/default.nix
+++ b/nixpkgs/pkgs/data/fonts/inter/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://rsms.me/inter/";
-    description = "A typeface specially designed for user interfaces";
+    description = "Typeface specially designed for user interfaces";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = with maintainers; [ demize dtzWill ];
diff --git a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
index 0f6d46546ded..6e12c918cfb9 100644
--- a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
+++ b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "30.0.1";
+  version = "30.1.1";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
diff --git a/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/nixpkgs/pkgs/data/fonts/iosevka/default.nix
index 5628df5393cf..2377636d7741 100644
--- a/nixpkgs/pkgs/data/fonts/iosevka/default.nix
+++ b/nixpkgs/pkgs/data/fonts/iosevka/default.nix
@@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = "Iosevka${toString set}";
-  version = "30.0.1";
+  version = "30.2.0";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
     rev = "v${version}";
-    hash = "sha256-THs6kN5VZpTvzTK7w/sGQbxoEyyPwzl93JDOvwucgeo=";
+    hash = "sha256-L08xBKZHFFByemEa4GgwQRr+wRCocuT/RO+hV/S+hFA=";
   };
 
-  npmDepsHash = "sha256-maDIkbe4BKY7XYOQNGdOalyTGdBXgIU5t0QjVJW6lvQ=";
+  npmDepsHash = "sha256-oRV6QVcJiVKvUtfrewTtnmlIMDaGknn0lEHdcNM3V2g=";
 
   nativeBuildInputs = [
     remarshal
@@ -127,7 +127,7 @@ buildNpmPackage rec {
   meta = with lib; {
     homepage = "https://typeof.net/Iosevka/";
     downloadPage = "https://github.com/be5invis/Iosevka/releases";
-    description = "Versatile typeface for code, from code.";
+    description = "Versatile typeface for code, from code";
     longDescription = ''
       Iosevka is an open-source, sans-serif + slab-serif, monospace +
       quasi‑proportional typeface family, designed for writing code, using in
@@ -137,7 +137,6 @@ buildNpmPackage rec {
     platforms = platforms.all;
     maintainers = with maintainers; [
       ttuegel
-      babariviere
       rileyinman
       AluisioASG
       lunik1
diff --git a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
index 0bf703f6955c..a3933935ad07 100644
--- a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
+++ b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
@@ -1,93 +1,93 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  Iosevka = "1p805i26vf0979k9rgf31634ll6sbyj9xp5mws1gpdpb9xainrzm";
-  IosevkaAile = "1qxayq5cs0rf35k3gr8vilpcnnjq41dmldxb3nib178hi1kcagv2";
-  IosevkaCurly = "1gbsm9x02mjl61l1xc5jbmqkhj7wgqs5mai9czrs0cqvcxgj2cp1";
-  IosevkaCurlySlab = "14fcfspcgf0y7z4bbwvs54s6k82c4bcpj9fyj87ljmsxw2h325rx";
-  IosevkaEtoile = "0qkq357kg1a4clbjgr8k2miainrl594jd054wv9igxb0iwjcqj49";
-  IosevkaSlab = "1ygw3dn4zz62333bxd1k2zvyh8zmv2lrqybsbnidd654ikq0y2ly";
-  IosevkaSS01 = "15j85zp1jqhb07fgl90qnidz8da64nq2r3dw4a337kwqzmgfrbl1";
-  IosevkaSS02 = "0snia7xjh6d72ddz6yrzzx2pfx46c7kg2163qsp2b78p046s93ww";
-  IosevkaSS03 = "1qg3vwp4ybih6vvbb6qpzh8qvqhc8z985k934vkirk41hp5p9564";
-  IosevkaSS04 = "098pncahmhgvfh88m3mfrw7frjslrqly50p2x7qwv9lpz76n18xq";
-  IosevkaSS05 = "1grdfghfh1plbcxqfx49vm3c7vkrlafss40cjf7f7j7ykkyx540z";
-  IosevkaSS06 = "02qqffsyp2bgf6p4jp1ww1d9c7nj4hzs52psgvh5nnn0kvsxbjnn";
-  IosevkaSS07 = "1avb06xsv1mp6lrrdawh6xnwiykh75vhb0364203mzjjj7gir7rw";
-  IosevkaSS08 = "024qrzj8rkgwp71dpx7p424kgid1mzb0sbwfrg83i5v158slh65y";
-  IosevkaSS09 = "178yc58lq1j42pmyap210cjk2qnqcsvhfdry56p7nd5l8gxik1v1";
-  IosevkaSS10 = "0fhz69dhn7g64zyq947m85d73kn0qr2c751aqzrq1rlnbfm4cncs";
-  IosevkaSS11 = "0zvf5a9k1mv1mgybqjqx4xcnpq7fni6vgwmr0hnmzcnxzxapmgqk";
-  IosevkaSS12 = "1vjx11aalwbsm2vnqn9m695h943h3gln8bdayvv687x4bxj8dnfi";
-  IosevkaSS13 = "165ikcmdsjfj30cs6ggsgfl9q0rpl1m4n57c75x8qq1p103yivia";
-  IosevkaSS14 = "1iy95jyh7lsvwyc48rqasm9w9wr3rp0w8xvg8jqw3abnqyj30kxs";
-  IosevkaSS15 = "0kws1bsyzij6mzf8wl80257an071l6r925mxcdh327scg8hdgq54";
-  IosevkaSS16 = "06akd1mgdi9psf6j8ib97k617jilzs1likb3gbx57iqfnxyjfqkj";
-  IosevkaSS17 = "08jvlgia29bd5q77j664hfcdd3y29iwy6gnxnxsq6i2ipgwszpr1";
-  IosevkaSS18 = "01bp1zlfxrnz4b63d0j0zvdyilwxzb8b7m75yy5a73g7ghpjhf7w";
-  SGr-Iosevka = "03zpmihwj1jcvc0q97bhyw8qgccpg8vqbiqw9rf1aaav3rix7jpl";
-  SGr-IosevkaCurly = "1zkvih3ifkxf4ijbf9510b55xnp5rh488vqw899aw42sagdakqi3";
-  SGr-IosevkaCurlySlab = "019hsqhghyw5njqrm2h20yyrrj8md6aqkfsi2nqdq83q8bs6qvq0";
-  SGr-IosevkaFixed = "04g5l10ayvwwa0dhsaccxw2qbxbfyac5gnmlyly52lx126ifnhva";
-  SGr-IosevkaFixedCurly = "0cygz3kz0cbjdx1pdig9qgm9z6kclrx96d9g7wiain4xn4i7dayg";
-  SGr-IosevkaFixedCurlySlab = "1vdsrkbvdsqls344knqq0carcs3vc1ghhliipr44m7bpcnndavf4";
-  SGr-IosevkaFixedSlab = "0hs88kng52iqicdjga0dkvn1b5ih3jsqz6lh7gxwh6qww4crrb84";
-  SGr-IosevkaFixedSS01 = "1hllm1bxrdb8l796kkvd6mhr9fnf90qvxrcb815a6q4x1bxmcb47";
-  SGr-IosevkaFixedSS02 = "0322ky5cwyk95c1xvgv0ny5jmxbsxzznynmq70p827m16mzakvcv";
-  SGr-IosevkaFixedSS03 = "0041lnmv6vycfh7xbi6smr1csywha0ypbyxjk9j9727l16vvy3qp";
-  SGr-IosevkaFixedSS04 = "0ybby2x08zzjgnczair43p3ixbk6igi0pfryjqryz9ziyw7ijx1n";
-  SGr-IosevkaFixedSS05 = "1zf7q3m7pzf8cy28s4bijipxg9f6yl9dnd18syp2gibbzpvsyi9k";
-  SGr-IosevkaFixedSS06 = "0d5gcfydin1a7a4xhsjpqrxk93j5pxc7x8myg0ci36zfcvsy4dg5";
-  SGr-IosevkaFixedSS07 = "0lk43klql6046i9clk14fcqr6cn04dvadg8sv2cwr1130b5iz2b3";
-  SGr-IosevkaFixedSS08 = "1b10x2fzx0clyflid8sz4lcr8is7rbqlk3jyy201sw0p7bfh9bhz";
-  SGr-IosevkaFixedSS09 = "18dkkc4xsnxg0f6zj7hrpp8bybhpvzd0ls7rwyx06v7hcg1nnc7l";
-  SGr-IosevkaFixedSS10 = "03s66zgpn7x1y09qymw9pnridcn7gd7mz0m5b2ccdhc1wmb6vihs";
-  SGr-IosevkaFixedSS11 = "1xbal92f1wbkj1p3097z1cn5vffgdm2n7aa3ljgmrm5x2612whhj";
-  SGr-IosevkaFixedSS12 = "0v34py726vfnrd85bqjr2y61f5rgl4w8w98m0fq18dd9ywjxi83c";
-  SGr-IosevkaFixedSS13 = "1zm815hlff4kys0rg2qi5l8ilpqwmiwvy65qfw3rip1gqv04a3pj";
-  SGr-IosevkaFixedSS14 = "0bvzsyrazd5cx5gi4i590nr0swwsm26647asxmwcfv0pcafnklqw";
-  SGr-IosevkaFixedSS15 = "11cycsdda0dd1vlc5aqsgcpidppgy3fk6dycqxwc7p1cgbdnna60";
-  SGr-IosevkaFixedSS16 = "0asqky6by2i102sapdfw8f91k0pbhlfnr150v0vy3181lryqabay";
-  SGr-IosevkaFixedSS17 = "0yd58bci0f4sarzs2dshdawq4ki3zrdxghh98l6zzi3dnfwajmnq";
-  SGr-IosevkaFixedSS18 = "1r672zk7np5fh934749n86xsxi9vc65bmznqjvhjsrjav3pnzsz1";
-  SGr-IosevkaSlab = "061k6bld4jlylgad19xl8fcqh0yh95yi6hd8gmg4m3kpij64rbas";
-  SGr-IosevkaSS01 = "195jg3wrcqkx98fjx252r6p3xq9gwhr6pzlp3riwvjpbx3avqmvb";
-  SGr-IosevkaSS02 = "0mqhvkhyj9jrx80yh2lrkzpwz15008zs5rkzsimv89jxq0gn3a22";
-  SGr-IosevkaSS03 = "0p92824nrkhn64hrc71b3xwl0pfk5h8nchr2kry3h14hgyq29pkf";
-  SGr-IosevkaSS04 = "1c310vzl8cjjr1367x84vvp5vf6hn3q67qdaxa0hzsdn0w73w46j";
-  SGr-IosevkaSS05 = "08fpvik3pf8zbx4lp3s4dv0w85nwdxfbdh83nh0kznhkpinbmpyn";
-  SGr-IosevkaSS06 = "0dzcgn861lbsxcy7z584r6vpyi4y6hm16dm18k9nwgh21z7pr8n8";
-  SGr-IosevkaSS07 = "038ldpln3yv5icgk5kd2i2ydw22f18y6qzkff968v1azjkmv60n0";
-  SGr-IosevkaSS08 = "0qvj3rkhmpzcfgc26zjgcb36d6c427zgnr8lhwswd10a8dy1632a";
-  SGr-IosevkaSS09 = "0c8m8ly03xgwpcyb9mvrjck7xih8qil9pzcrvg6vv4ssvrvr90lw";
-  SGr-IosevkaSS10 = "1i168k7qgiawnxly129n6y7idjc14dj9iblgkiq60zy99n0q1b4j";
-  SGr-IosevkaSS11 = "1fjxvg3jcx5qphr2ywkly3zdf2vsdjn2macfzkngbhlml79jz9y3";
-  SGr-IosevkaSS12 = "1vbwinqpj5ahxgxd5r6rbzhlvx5q3v32bxmwxzw9krd517ra22kw";
-  SGr-IosevkaSS13 = "1zzj3nb8739xq4bb7i02r0zlfcyczkq9c7rgxih6hdd4nch75pvi";
-  SGr-IosevkaSS14 = "1bvn26mssy61nz1n3g76hbd0amq7cifh2rmdcxzs261wkiym01lw";
-  SGr-IosevkaSS15 = "0r6ggg2w1y4l23k8z2dqbv8g3pzikmyi18bfpgnc3k1mbqaaxf76";
-  SGr-IosevkaSS16 = "1nn8nk5rl1khw4ximl916ai49d1pa3b3wrsfb1qa51p5swsikf60";
-  SGr-IosevkaSS17 = "1vn7s3i6jsv0b8y07ay0sbna7wrwxsk1dyw2h42jswzzv28m0p4c";
-  SGr-IosevkaSS18 = "12zm8s4i8fzhfw63bc9smyj38mva8a69qj69sfkac5z81zrmxa8m";
-  SGr-IosevkaTerm = "0rawxyhfjdd1xhgwf9f7adm2jqdh81ycc792kfi8vhn7piq1g109";
-  SGr-IosevkaTermCurly = "1vrdx9kgy22blcm1ps0lv5snhxc39p6pd70ry6sa4np8swx6h7s3";
-  SGr-IosevkaTermCurlySlab = "00hnq7s9bva1kq921gy410z8ld9mzpr09bifimmpm0kf6dr7q8ll";
-  SGr-IosevkaTermSlab = "1sgvybj60qvh3wyxi11f6mjvik9d7pc517s387k2vfb66j5q3vvq";
-  SGr-IosevkaTermSS01 = "1fg8vslmp3kp7yfr6kwkybmgd5nbyjyhpa6c8h7d5yrl8sghh1jq";
-  SGr-IosevkaTermSS02 = "1qgsyh0jh8ik715n880gkfv3k7j2id06wrqbqkwdhlnljybzzvpv";
-  SGr-IosevkaTermSS03 = "03ahlzgs0sjbvc9nc53fsavdi3j3ym0pj55d3xqyi3wvn0y6g172";
-  SGr-IosevkaTermSS04 = "1b9bhvda2kzwpmsc0k8w44cm18sab3drxpskvb6rc252igd3fzzm";
-  SGr-IosevkaTermSS05 = "0gz35z4zvh7afcppkmdc79x534qkpb3wg60gvnsj86v01xhw1whk";
-  SGr-IosevkaTermSS06 = "07kg4137y3rzsk5pn1i8qcrr9nw5aqs3xhmikbysp28mlyd93xyr";
-  SGr-IosevkaTermSS07 = "047af1c93vm3g3j0nqbav11za143xb638z3sh4hzcngr5jz3avk4";
-  SGr-IosevkaTermSS08 = "0qzzxfkhzykmsn6dxf2h0yl1wgfar5i0dhgvdnibp9b54szxk0pk";
-  SGr-IosevkaTermSS09 = "1fc0cfrpv6mly75jfzwvdga5rb4y3w088lhiy8wac8a9dq928dpk";
-  SGr-IosevkaTermSS10 = "1k3paidjv8213gql5haismbyqsjv41zbflgxp5dk3599raimv8fd";
-  SGr-IosevkaTermSS11 = "06nh95dri3y080rc1pvxcli11a1xq15mnpxzlqk9zs9bgx8aw41d";
-  SGr-IosevkaTermSS12 = "1wisinglhrqfhpswvyhqfzdmx64mzli7ja96cj2bq0r9ksik09bx";
-  SGr-IosevkaTermSS13 = "1xcn4b3cspjqmrpckwi355xhxh2vx7vmiyzvhpjal04zkfv2lqlx";
-  SGr-IosevkaTermSS14 = "13s06y17vj1fp07h83d982l684jpg58ln1airxkvf6xb7dgh57yl";
-  SGr-IosevkaTermSS15 = "0qwkdsc51ssm0y8qbi9m3m3x0adrlf82h36x77xrap29qkz5liwq";
-  SGr-IosevkaTermSS16 = "00py2l35w9kaggrg7xhj333rc3li2lwkl5sblrpjkq98hdwc3m53";
-  SGr-IosevkaTermSS17 = "0afa65dq97mq4c2p7vyhpjzbch0ab0sy12qy0a6krrr1q4abbl1b";
-  SGr-IosevkaTermSS18 = "1ixy8nxm3n7pgswg5dfsy01fmzq5vg1g4r401f30zyri9f21010k";
+  Iosevka = "0ymq4p5chaczhns24n4xal44ppay566pg95zkkkq51ck52f3zf44";
+  IosevkaAile = "1v35phx8ki3yjg43s0fk8snpyc59pa8kg26q56hayxsfrj1dsmck";
+  IosevkaCurly = "0d7sp0w7ryh8wwz4hxyhwimhw3ly668ygm4jcwf2amd3r4xxis5k";
+  IosevkaCurlySlab = "1lajfma7jdwi453jgd3pq1vdgz5zn3f01j502dfiaskqzfan89cb";
+  IosevkaEtoile = "0agg1gg3ymljln8msfask398w58p1wyy5bnzxc0pmmc7ivdajmh4";
+  IosevkaSlab = "1rfzij1p3rybxrq461h3ykpq41hqrgaiwjd7x36dzm4bcm7mga9q";
+  IosevkaSS01 = "0qhzmk8c0npisxqwn2qicxlad2awmnnvik91daidnndwhw4ylq8y";
+  IosevkaSS02 = "15ipbca4c15vs7n62463asl58xshwsrqirhbp23gpr4ixmx2vrmy";
+  IosevkaSS03 = "0nw7jx2smkn8aihcmwkmcqlzs0dhm54qmxrm9102vlsf61dawkpj";
+  IosevkaSS04 = "1bk18a712xjngmv28fzkw6fs560k928b3ahp9w7cvq1xvji5g3qb";
+  IosevkaSS05 = "1xgrbfg1am48j3ps7bnjryyy0pjnx6ahz75zaqwf35cwjb3f5wvf";
+  IosevkaSS06 = "1wk1scyz34dc3dcq1af2c3nla1lh56zbgzx1xinf8qwypb6m01dw";
+  IosevkaSS07 = "1z8gg8h2kbgq7d4lglfl4awbkmzxpjwcqa1xrxxpcpmxa04ppcfq";
+  IosevkaSS08 = "1wid8y6wavxff7b62cxm00y93mjfc3zzjd76g4vgrb7r7ql9kd06";
+  IosevkaSS09 = "06hwzhg4qb8cha7zl32pwzbcnzg1dv8432aq7hzfa0jq2jmvpxax";
+  IosevkaSS10 = "1p8s2lfvr50pacs941gwxp211j4fn9rzxxvprz03swqklvwadir7";
+  IosevkaSS11 = "15izq605ggr2lnc8lljk6lvwkdc87ilx53zw5j7cfdfq8bc6fv6k";
+  IosevkaSS12 = "1xnbap1cm125pdg9x8dbc5lm691fr244k5vblj9mqhaqvbq9pqjs";
+  IosevkaSS13 = "1l98yjgq4zbxnq5xwhlql9m864n2ha0d46xk0b5w32srnaq09ipb";
+  IosevkaSS14 = "0rmd6gc624k3kls98wlz3v407xdq7cynjb06p9zhwxwfy3l9wpwl";
+  IosevkaSS15 = "04qnx6lgp1g3vnwsgbxibjjia2fip1vhf5854kp9dx37qi8qzf7g";
+  IosevkaSS16 = "13xx1s5gv1gly3pnc5rq6zx93rhllmga3k9ik3p86h3kd1valsvb";
+  IosevkaSS17 = "00rc87a09j2v7f1s4spisqgrmlhf67gvvjy14dbmlv7s434z7ap2";
+  IosevkaSS18 = "1fdpsqya1gn939v6b7iwj1sjpskbbxr5ypf0l5rvldxfqisx7zj4";
+  SGr-Iosevka = "0raiapwifmf02560ibic8g47mal8w91wfdcivh8yh7g2ldf5hchr";
+  SGr-IosevkaCurly = "1sg9prv501sa9iy9j4664qsp99d47lmfwn5hqms51kijliplfyfy";
+  SGr-IosevkaCurlySlab = "1g216l92khl22w7833pmwaphvr94zjing3sx8ldnj4py26nvvfqp";
+  SGr-IosevkaFixed = "0f0jk2fhqb4ch5gm6ndip04brchrz20kvs9ja4yarkmild3j1vmg";
+  SGr-IosevkaFixedCurly = "10ayxf5v2yyclpb2gnd06jgkbqvqy0sq5n8vmkjmjb6fx5v0yl7f";
+  SGr-IosevkaFixedCurlySlab = "14iyjj2i29bp084yi7ja1xxh3cl95xiyj29jcwgd6ndzv3xf8ir8";
+  SGr-IosevkaFixedSlab = "0zvm0qy7bjlj9c3gqzip3ldg9lnm3003fdd1s4ks2zvaz6xwk9sy";
+  SGr-IosevkaFixedSS01 = "09npaina3c9rsg84rlm1hadqd64v8i1rjcgbi6d8y5xs01dwn6jg";
+  SGr-IosevkaFixedSS02 = "0r67l52pk1wlqdmfn2wbjkcd4szmpj4d24jcgy5b83gjr3hgmcr4";
+  SGr-IosevkaFixedSS03 = "1dpj0hv1qghwhxqsymvk0xjhjnwxd9av23hr90bi5h10k7rx3nqy";
+  SGr-IosevkaFixedSS04 = "1ffpj0g0jh72x12ibw6mrfkgh87jzhbz4ak15c0yh21rz3bya71a";
+  SGr-IosevkaFixedSS05 = "1q6gw659p5fwgbqb20lzw89px8b0k2p65iasway0a4rihb7am18x";
+  SGr-IosevkaFixedSS06 = "0axqqhlk0811yxnk34kq8a1ayl4cpykjqd7ma9z52y8a1kgdilx2";
+  SGr-IosevkaFixedSS07 = "1jcwwp3w2j1chnn92r2whrq15ka3hfzw96w4ffppwk715s1kc63h";
+  SGr-IosevkaFixedSS08 = "0f5xyr8dgbmgw21z9g12admbj4037lgid9agl6djiavljdn3xwlz";
+  SGr-IosevkaFixedSS09 = "09xi1rrddivsqr2ddw3g10v2y4ybvbwa7p05jl7hz6kwgr1qrqwd";
+  SGr-IosevkaFixedSS10 = "0m6qwkb7svjgskc391dri8vciydzjgx1s91bbsax8gy18mqh3vd7";
+  SGr-IosevkaFixedSS11 = "1l04gmzdpccz1xmjqgn0jhpwxvq1axyqnrmkyafd116q4qszbayf";
+  SGr-IosevkaFixedSS12 = "1i5jx8cffsl1zpjxvyb3m73r82vfh71z4s4dzg55svzh4lkkdfyc";
+  SGr-IosevkaFixedSS13 = "013d0a2kli353vxlrrs5mgwdf1fipv3vsv626izp6whfxfg6pk6h";
+  SGr-IosevkaFixedSS14 = "07n4hkrayr5chy46pa0d86srfaprm8kw56x86wndqj2blk5ydvh6";
+  SGr-IosevkaFixedSS15 = "16lglz0ri7ww68whf8q009qq6kzaygy6lhbps5lmags34jhc9fa5";
+  SGr-IosevkaFixedSS16 = "15j5b2w54bsq8mbi6swq6vd2xvvnnd0j0c3d4dcp4kbhr766841q";
+  SGr-IosevkaFixedSS17 = "14j3miv97mk6hg3q7mafqc57m7z5sg6k7gap53v367793gkz6096";
+  SGr-IosevkaFixedSS18 = "1iylhw0c05gdp48rx8417khs0yih0q917xx8k81bh5xdg0idyjim";
+  SGr-IosevkaSlab = "1wyasyf0ydvh2q0akqvn7bzl66m7kyf2v9p3ry0lgcwv0flrwrpi";
+  SGr-IosevkaSS01 = "1hs0pvamx149l2drvciqnwry75165sq2nvl7g0f4jazclfb4af3c";
+  SGr-IosevkaSS02 = "05pl8asc5zqm1x4lcj00al27da1m301g96zyijsfxx2vybpw53jd";
+  SGr-IosevkaSS03 = "0c60585ss53mzb0swf08r54673a426wq8mamxgnc733yinbsffwx";
+  SGr-IosevkaSS04 = "0yml0y535kl2bid1qflkx3rrq2rq81nxpba18kk7xpscsg04ghjn";
+  SGr-IosevkaSS05 = "03hxlchn96m0ll47rn8lg092c776b1v99pcrsmrlx3x8gslpdlka";
+  SGr-IosevkaSS06 = "04cnymhvm5wi0hb956afi7029acqfqr0djhc1blhpkmldz8pzsn6";
+  SGr-IosevkaSS07 = "1v4khps1z16k59snwxffwwn1y1yj2mp8k4fjkrxli7lb5mrn8lwl";
+  SGr-IosevkaSS08 = "0pvy39fs5carcb0mh3ak8f5hkfjyk2pkmj7nfcaxdgkcgkys2ixn";
+  SGr-IosevkaSS09 = "0cibn02752b2nfjgg12lb10hgigz3a4zcrsc76bh0r9dsgjphscn";
+  SGr-IosevkaSS10 = "165snqk5livrkhpwcssb5b221f6gwwirm5rlsmx8d72y7rlc2vb0";
+  SGr-IosevkaSS11 = "0czb0gxd2cq329123zcmz9axkfpza43kqhn6bi1rq8dgjh4qn0fx";
+  SGr-IosevkaSS12 = "1ycqxpjm5k421a9iwiziab3j69frdgjiz7cwx1k7djqyshqn98k0";
+  SGr-IosevkaSS13 = "18wiv124c868h7qaw6qvdy8xhgh4grfhqri8q2mi8zj5gadkh5yb";
+  SGr-IosevkaSS14 = "1y2cfivf1zg03c2dn9xg5i29zmi4j3mj5diz3kyd68ih4csrzyla";
+  SGr-IosevkaSS15 = "0ghg5f2ay6i2fzbw4xq28hcpbvwjzqvi1pz2nfvd2i2n61960xpr";
+  SGr-IosevkaSS16 = "1132nf2xlsab8mhl5k1fvg8j9j6s1iy1avh5mj7jjb1z2i03z3fb";
+  SGr-IosevkaSS17 = "155vfg5p114vdl722mqdfap3cm25wxydmhldd88n488yr3yviicv";
+  SGr-IosevkaSS18 = "1y76pzsz5gfm0jjw8fa11aajf3zk188xr5fvsf3v89zdzk1ixzgj";
+  SGr-IosevkaTerm = "0rkyy77cdcpf74kw59kbz3l7fs0xl2l0m2zwv8nl4i1x4dbxjj9x";
+  SGr-IosevkaTermCurly = "09r4ag6madsc8889y1r12wk2763pjginrrykrj7w41j11bcvra39";
+  SGr-IosevkaTermCurlySlab = "0bjm43znavfjni7bmi48g4j90v6fp7fg62h32wjvfcpldhycqw8m";
+  SGr-IosevkaTermSlab = "0p4wvgp0nw70gdjn00dqh6vwwsl2fxcl11hf41s0hzr6cj8j0s93";
+  SGr-IosevkaTermSS01 = "1m8n32qs5jlcbfvzjnhm9lafdc1vg2cjya3hb7sphgiiqqjdgkf1";
+  SGr-IosevkaTermSS02 = "14fznvapw4pi3djhfr512pmmlb2air03jkik7d8rw8h69nnragb7";
+  SGr-IosevkaTermSS03 = "14386dbd8yah6j74cp4pddp9cjwi175wg4mq62mi0pxkm1fla578";
+  SGr-IosevkaTermSS04 = "038c4bkcfn8pd18dikipfbv7mqvils3v4fdrhyfmf83770qvkrf0";
+  SGr-IosevkaTermSS05 = "10k49rgwiymbzys8sswfr5ryn1547i1hrg8phb71lbzwxhc4z5m3";
+  SGr-IosevkaTermSS06 = "1pxyydwqbv1f51pdg36pvz5pj45nw28yc0vadj2q3617f2jb2n2h";
+  SGr-IosevkaTermSS07 = "1p1aqqa5h4m6r97q00qf32myfli2fm7lg692aqw45baxxw8sn52l";
+  SGr-IosevkaTermSS08 = "0r7hxaigz66cfgvci88hl0g55177kz3sbb8lji47h1v5r4xhzfl3";
+  SGr-IosevkaTermSS09 = "1ah9kbw9zc0nzfnsyxkbv7wnlaaywyvlkmdv5bfi3ds06w2kjphk";
+  SGr-IosevkaTermSS10 = "08b1l13g4j55sh10pfa6p7z72cvk4r694lml1m9vl4h4ail8w1ml";
+  SGr-IosevkaTermSS11 = "1bqa6d95ga9309m2vr3xzyrhf92dhw3hd3n5awpxip2mfr2k1fbp";
+  SGr-IosevkaTermSS12 = "00949ajl9xzpq7q045wb4hm8hfl94zpyp3fdjx0im7v4k2akzkjp";
+  SGr-IosevkaTermSS13 = "1cdwxb3bykxkr3ifprmh4pwc33cbyrn26d2h1hix9xsjw5nw99c6";
+  SGr-IosevkaTermSS14 = "1k0gwla5xkn8z70m36mhlhs7zm1sj7q33j68mb2wm783lapbll7v";
+  SGr-IosevkaTermSS15 = "1gjac767vi97qs8hqdklzqqb75dz0yx0z9pjr2lribfv0dvxvhss";
+  SGr-IosevkaTermSS16 = "0f738zydh51gvs68f0csax36bf2pi94pqbp0yjjqyrpx5c9m4pq0";
+  SGr-IosevkaTermSS17 = "1rmdb0nbdy47q8v3b7mpb1df5x9yfv7ijs26xwv64aas75hjf8vk";
+  SGr-IosevkaTermSS18 = "0jyidsr9aaccrc9bs7k8m5rj11p6vsxdrl2mslgc2bfwcarg89cm";
 }
diff --git a/nixpkgs/pkgs/data/fonts/iwona/default.nix b/nixpkgs/pkgs/data/fonts/iwona/default.nix
index df5569f53797..6a40b20b28e0 100644
--- a/nixpkgs/pkgs/data/fonts/iwona/default.nix
+++ b/nixpkgs/pkgs/data/fonts/iwona/default.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A two-element sans-serif typeface, created by Małgorzata Budyta";
+    description = "Two-element sans-serif typeface, created by Małgorzata Budyta";
     homepage = "https://jmn.pl/en/kurier-i-iwona/";
     # "[...] GUST Font License (GFL), which is a free license, legally
     # equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or
diff --git a/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix b/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix
index c13f42abe6e1..326659519862 100644
--- a/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix
+++ b/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A typeface made for developers";
+    description = "Typeface made for developers";
     homepage = "https://jetbrains.com/mono/";
     changelog = "https://github.com/JetBrains/JetBrainsMono/blob/v${version}/Changelog.md";
     license = licenses.ofl;
diff --git a/nixpkgs/pkgs/data/fonts/jost/default.nix b/nixpkgs/pkgs/data/fonts/jost/default.nix
index f5d3a1e48b5a..c8577e5e171e 100644
--- a/nixpkgs/pkgs/data/fonts/jost/default.nix
+++ b/nixpkgs/pkgs/data/fonts/jost/default.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/indestructible-type/Jost";
-    description = "A sans serif font by Indestructible Type";
+    description = "Sans serif font by Indestructible Type";
     license = licenses.ofl;
     maintainers = [ maintainers.ar1a ];
   };
diff --git a/nixpkgs/pkgs/data/fonts/joypixels/default.nix b/nixpkgs/pkgs/data/fonts/joypixels/default.nix
index 593817275669..29e4eb118888 100644
--- a/nixpkgs/pkgs/data/fonts/joypixels/default.nix
+++ b/nixpkgs/pkgs/data/fonts/joypixels/default.nix
@@ -20,9 +20,9 @@ let
   };
 
   joypixels-free-license = with systemSpecific; {
-    spdxId = "LicenseRef-JoyPixels-Free-6.0";
-    fullName = "JoyPixels Free License Agreement 6.0";
-    url = "https://cdn.joypixels.com/distributions/${systemTag}/license/free-license.pdf";
+    spdxId = "LicenseRef-JoyPixels-Free";
+    fullName = "JoyPixels Free License Agreement";
+    url = "https://cdn.joypixels.com/free-license.pdf";
     free = false;
   };
 
@@ -43,11 +43,16 @@ let
     unfree licenses.
 
     configuration.nix:
-      nixpkgs.config.allowUnfree = true;
+      nixpkgs.config.allowUnfreePredicate = pkg:
+        builtins.elem (lib.getName pkg) [
+          "joypixels"
+        ];
       nixpkgs.config.joypixels.acceptLicense = true;
 
     config.nix:
-      allowUnfree = true;
+      allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+        "joypixels"
+      ];
       joypixels.acceptLicense = true;
 
     [1]: ${joypixels-free-license.url}
@@ -58,15 +63,15 @@ in
 
 stdenv.mkDerivation rec {
   pname = "joypixels";
-  version = "6.6.0";
+  version = "8.0.0";
 
   src = assert !acceptLicense -> throwLicense;
     with systemSpecific; fetchurl {
       name = fontFile;
       url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}";
       sha256 = {
-        darwin = "0qcmb2vn2nykyikzgnlma627zhks7ksy1vkgvpcmqwyxq4bd38d7";
-      }.${kernel.name} or "17gjaz7353zyprmds64p01qivy2r8pwf88nvvhi57idas2qd604n";
+        darwin = "0kj4nck6k91avhan9iy3n8hhk47xr44rd1lzljjx3w2yzw1w9zvv";
+      }.${kernel.name} or "1bkyclgmvl6ppbdvidc5xr1g6f215slf0glnh5p6fsfbxc5h95bw";
     };
 
   dontUnpack = true;
@@ -80,24 +85,29 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "The finest emoji you can use legally (formerly EmojiOne)";
+    description = "Finest emoji you can use legally (formerly EmojiOne)";
     longDescription = ''
-      Updated for 2021! JoyPixels 6.6 includes 3,559 originally crafted icon
-      designs and is 100% Unicode 13.1 compatible. We offer the largest
-      selection of files ranging from png, svg, iconjar, sprites, and fonts.
+      Updated for 2023! JoyPixels 8.0 includes 3,702 originally crafted icon
+      designs and is 100% Unicode 15.0 compatible. We offer the largest
+      selection of files ranging from png, svg, iconjar, and fonts (sprites
+      available upon request).
     '';
     homepage = "https://www.joypixels.com/fonts";
+    hydraPlatforms = []; # Just a binary file download, nothing to cache.
     license =
       let
         free-license = joypixels-free-license;
         appendix = joypixels-license-appendix;
       in with systemSpecific; {
-        spdxId = "LicenseRef-JoyPixels-Free-6.0-with-${capitalized}-Appendix";
+        spdxId = "LicenseRef-JoyPixels-Free-with-${capitalized}-Appendix";
         fullName = "${free-license.fullName} with ${appendix.fullName}";
         url = free-license.url;
         appendixUrl = appendix.url;
         free = false;
       };
     maintainers = with maintainers; [ toonn jtojnar ];
+    # Not quite accurate since it's a font, not a program, but clearly
+    # indicates we're not actually building it from source.
+    sourceProvenance = [ sourceTypes.binaryNativeCode ];
   };
 }
diff --git a/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/nixpkgs/pkgs/data/fonts/julia-mono/default.nix
index 50172de67f4b..748c043ad62f 100644
--- a/nixpkgs/pkgs/data/fonts/julia-mono/default.nix
+++ b/nixpkgs/pkgs/data/fonts/julia-mono/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A monospaced font for scientific and technical computing";
+    description = "Monospaced font for scientific and technical computing";
     longDescription = ''
       JuliaMono is a monospaced typeface designed for use in text editing
       environments that require a wide range of specialist and technical Unicode
diff --git a/nixpkgs/pkgs/data/fonts/junicode/default.nix b/nixpkgs/pkgs/data/fonts/junicode/default.nix
index 1bc12ad70abb..c3d5fffb5a8e 100644
--- a/nixpkgs/pkgs/data/fonts/junicode/default.nix
+++ b/nixpkgs/pkgs/data/fonts/junicode/default.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "junicode";
-  version = "2.206";
+  version = "2.208";
 
   src = fetchzip {
     url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip";
-    hash = "sha256-oOKg85Yz5/2/pvwjVqeQXE8xE7X+QJvPYwYN+E18oEc=";
+    hash = "sha256-uzPzZ6b/CxdcoXSsxf2Cfs9/MpcGn7pQfdwL37pbvXg=";
   };
 
   outputs = [ "out" "doc" "tex" ];
@@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = {
     homepage = "https://github.com/psb1558/Junicode-font";
-    description = "A Unicode font for medievalists";
+    description = "Unicode font for medievalists";
     maintainers = with lib.maintainers; [ ivan-timokhin ];
     license = lib.licenses.ofl;
   };
diff --git a/nixpkgs/pkgs/data/fonts/kanit/default.nix b/nixpkgs/pkgs/data/fonts/kanit/default.nix
index 8875704ba6b6..88eb8740ee19 100644
--- a/nixpkgs/pkgs/data/fonts/kanit/default.nix
+++ b/nixpkgs/pkgs/data/fonts/kanit/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://cadsondemak.github.io/kanit/";
-    description = "A loopless Thai and sans serif Latin typeface for contemporary and futuristic uses";
+    description = "Loopless Thai and sans serif Latin typeface for contemporary and futuristic uses";
     longDescription = ''
       Kanit means mathematics in Thai, and the Kanit typeface family is a formal
       Loopless Thai and Sans Latin design. It is a combination of concepts,
diff --git a/nixpkgs/pkgs/data/fonts/kawkab-mono/default.nix b/nixpkgs/pkgs/data/fonts/kawkab-mono/default.nix
index 1a2f51a6d625..60e455dae6ca 100644
--- a/nixpkgs/pkgs/data/fonts/kawkab-mono/default.nix
+++ b/nixpkgs/pkgs/data/fonts/kawkab-mono/default.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = {
-    description = "An arab fixed-width font";
+    description = "Arab fixed-width font";
     homepage = "https://makkuk.com/kawkab-mono/";
     license = lib.licenses.ofl;
   };
diff --git a/nixpkgs/pkgs/data/fonts/kode-mono/default.nix b/nixpkgs/pkgs/data/fonts/kode-mono/default.nix
index c4cd9f2de361..3b1563c19657 100644
--- a/nixpkgs/pkgs/data/fonts/kode-mono/default.nix
+++ b/nixpkgs/pkgs/data/fonts/kode-mono/default.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = with lib; {
-    description = "A custom-designed typeface explicitly created for the developer community";
+    description = "Custom-designed typeface explicitly created for the developer community";
     homepage = "https://kodemono.com/";
     changelog = "https://github.com/isaozler/kode-mono/blob/main/CHANGELOG.md";
     license = licenses.ofl;
diff --git a/nixpkgs/pkgs/data/fonts/lalezar-fonts/default.nix b/nixpkgs/pkgs/data/fonts/lalezar-fonts/default.nix
index f54c17b51f3d..e08f638eed38 100644
--- a/nixpkgs/pkgs/data/fonts/lalezar-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/lalezar-fonts/default.nix
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation {
 
   meta = with lib; {
     homepage = "https://github.com/BornaIz/Lalezar";
-    description = "A multi-script display typeface for popular culture";
+    description = "Multi-script display typeface for popular culture";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = [ ];
diff --git a/nixpkgs/pkgs/data/fonts/league-gothic/default.nix b/nixpkgs/pkgs/data/fonts/league-gothic/default.nix
index fd12e0a86591..c119dc3f562f 100644
--- a/nixpkgs/pkgs/data/fonts/league-gothic/default.nix
+++ b/nixpkgs/pkgs/data/fonts/league-gothic/default.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A revival of an old classic, Alternate Gothic #1";
+    description = "Revival of an old classic, Alternate Gothic #1";
     longDescription = ''
       League Gothic is a revival of an old classic, and one of our favorite
       typefaces, Alternate Gothic #1. It was originally designed by Morris
diff --git a/nixpkgs/pkgs/data/fonts/league-script-number-one/default.nix b/nixpkgs/pkgs/data/fonts/league-script-number-one/default.nix
index bc847f4f81c8..19f44bfd5b4a 100644
--- a/nixpkgs/pkgs/data/fonts/league-script-number-one/default.nix
+++ b/nixpkgs/pkgs/data/fonts/league-script-number-one/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A modern, coquettish script font";
+    description = "Modern, coquettish script font";
     longDescription = ''
       This ain’t no Lucinda. League Script #1 is a modern, coquettish script
       font that sits somewhere between your high school girlfriend’s love notes
diff --git a/nixpkgs/pkgs/data/fonts/league-spartan/default.nix b/nixpkgs/pkgs/data/fonts/league-spartan/default.nix
index d0e36e591491..10691f10c8e0 100644
--- a/nixpkgs/pkgs/data/fonts/league-spartan/default.nix
+++ b/nixpkgs/pkgs/data/fonts/league-spartan/default.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A fantastic new revival of ATF's classic Spartan, a geometric sans-serif that has no problem kicking its enemies in the chest.";
+    description = "Fantastic new revival of ATF's classic Spartan, a geometric sans-serif that has no problem kicking its enemies in the chest";
     longDescription = ''
       A new classic, this is a bold, modern, geometric sans-serif that has no
       problem kicking its enemies in the chest.
diff --git a/nixpkgs/pkgs/data/fonts/lexend/default.nix b/nixpkgs/pkgs/data/fonts/lexend/default.nix
index 9bb00bf10595..91eb497e901b 100644
--- a/nixpkgs/pkgs/data/fonts/lexend/default.nix
+++ b/nixpkgs/pkgs/data/fonts/lexend/default.nix
@@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://www.lexend.com";
-    description = "A variable font family designed to aid in reading proficiency";
+    description = "Variable font family designed to aid in reading proficiency";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = with maintainers; [ fufexan ];
diff --git a/nixpkgs/pkgs/data/fonts/libertinus/default.nix b/nixpkgs/pkgs/data/fonts/libertinus/default.nix
index cc60f8096531..4d942c7e2b97 100644
--- a/nixpkgs/pkgs/data/fonts/libertinus/default.nix
+++ b/nixpkgs/pkgs/data/fonts/libertinus/default.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "The Libertinus font family";
+    description = "Libertinus font family";
     longDescription = ''
       The Libertinus font project began as a fork of the Linux Libertine and
       Linux Biolinum fonts. The original impetus was to add an OpenType math
diff --git a/nixpkgs/pkgs/data/fonts/libre-baskerville/default.nix b/nixpkgs/pkgs/data/fonts/libre-baskerville/default.nix
index 56d83554e9ca..0be599e281e9 100644
--- a/nixpkgs/pkgs/data/fonts/libre-baskerville/default.nix
+++ b/nixpkgs/pkgs/data/fonts/libre-baskerville/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A webfont family optimized for body text";
+    description = "Webfont family optimized for body text";
     longDescription = ''
       Libre Baskerville is a webfont family optimized for body text. It's Based
       on 1941 ATF Baskerville Specimens but it has a taller x-height, wider
diff --git a/nixpkgs/pkgs/data/fonts/libre-franklin/default.nix b/nixpkgs/pkgs/data/fonts/libre-franklin/default.nix
index f6fe791743cd..c9b008881600 100644
--- a/nixpkgs/pkgs/data/fonts/libre-franklin/default.nix
+++ b/nixpkgs/pkgs/data/fonts/libre-franklin/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic.";
+    description = "Reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic";
     homepage = "https://github.com/impallari/Libre-Franklin";
     license = licenses.ofl;
     maintainers = with maintainers; [ cmfwyp ];
diff --git a/nixpkgs/pkgs/data/fonts/linden-hill/default.nix b/nixpkgs/pkgs/data/fonts/linden-hill/default.nix
index 9e452d34b99a..60f59ac67897 100644
--- a/nixpkgs/pkgs/data/fonts/linden-hill/default.nix
+++ b/nixpkgs/pkgs/data/fonts/linden-hill/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A digital version of Frederic Goudy’s Deepdene";
+    description = "Digital version of Frederic Goudy’s Deepdene";
     longDescription = ''
       Linden Hill is a digital version of Frederic Goudy’s Deepdene. The
       package includes roman and italic.
diff --git a/nixpkgs/pkgs/data/fonts/linja-pi-pu-lukin/default.nix b/nixpkgs/pkgs/data/fonts/linja-pi-pu-lukin/default.nix
index 40f330cec7c4..3f320a612335 100644
--- a/nixpkgs/pkgs/data/fonts/linja-pi-pu-lukin/default.nix
+++ b/nixpkgs/pkgs/data/fonts/linja-pi-pu-lukin/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "A sitelen pona font resembling the style found in Toki Pona: The Language of Good (lipu pu), by jan Sa.";
+    description = "Sitelen pona font resembling the style found in Toki Pona: The Language of Good (lipu pu), by jan Sa";
     homepage = "https://jansa-tp.github.io/linja-pi-pu-lukin/";
     license = licenses.unfree; # license is unspecified in repository
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/linja-sike/default.nix b/nixpkgs/pkgs/data/fonts/linja-sike/default.nix
index 88c723bff22b..c5fed186c67c 100644
--- a/nixpkgs/pkgs/data/fonts/linja-sike/default.nix
+++ b/nixpkgs/pkgs/data/fonts/linja-sike/default.nix
@@ -15,7 +15,7 @@ fetchurl {
   sha256 = "sha256-LkjG1Oao/LqKwI+eRZPzShTh7lz5DkooltXm7vxZC9w=";
 
   meta = with lib; {
-    description = "An extensive sitelen pona font by lipamanka";
+    description = "Extensive sitelen pona font by lipamanka";
     homepage = "https://docs.google.com/document/d/1d8kUIAVlB-JNgK3LWr_zVCuUOZTh2hF7CfC6xQgxsBs/edit?usp=sharing";
     downloadPage = "https://wyub.github.io/tokipona/linjasike";
     license = licenses.ofl;
diff --git a/nixpkgs/pkgs/data/fonts/lmmath/default.nix b/nixpkgs/pkgs/data/fonts/lmmath/default.nix
index 3881f0f0f4e7..b2b468e2bb41 100644
--- a/nixpkgs/pkgs/data/fonts/lmmath/default.nix
+++ b/nixpkgs/pkgs/data/fonts/lmmath/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth";
+    description = "Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth";
     homepage = "http://www.gust.org.pl/projects/e-foundry/lm-math";
     # "The Latin Modern Math font is licensed under the GUST Font License (GFL),
     # which is a free license, legally equivalent to the LaTeX Project Public
diff --git a/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix b/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix
index e5d8094e3914..8c18f3ed1bba 100644
--- a/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix
+++ b/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://lxgw.github.io/";
-    description = "An open-source Chinese font derived from Fontworks' Klee One";
+    description = "Open-source Chinese font derived from Fontworks' Klee One";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = with maintainers; [ elliot ];
diff --git a/nixpkgs/pkgs/data/fonts/melete/default.nix b/nixpkgs/pkgs/data/fonts/melete/default.nix
index 3d3e24ac81da..480ed2a468c1 100644
--- a/nixpkgs/pkgs/data/fonts/melete/default.nix
+++ b/nixpkgs/pkgs/data/fonts/melete/default.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
-    description = "A headline typeface that could be used as a movie title";
+    description = "Headline typeface that could be used as a movie title";
     platforms = platforms.all;
     maintainers = with maintainers; [ minijackson ];
     license = licenses.ofl;
diff --git a/nixpkgs/pkgs/data/fonts/merriweather/default.nix b/nixpkgs/pkgs/data/fonts/merriweather/default.nix
index d1b3359df26e..f658f7943eb2 100644
--- a/nixpkgs/pkgs/data/fonts/merriweather/default.nix
+++ b/nixpkgs/pkgs/data/fonts/merriweather/default.nix
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/SorkinType/Merriweather";
-    description = "A text face designed to be pleasant to read on screens";
+    description = "Text face designed to be pleasant to read on screens";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = with maintainers; [ emily ];
diff --git a/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix b/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix
index be638a03229f..0712248dc5ac 100644
--- a/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix
+++ b/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   outputHash = "1cppf8sk6r5wjnnas9n6iyag6pj9jvaic66lvwpqg3742s5akx6x";
 
   meta = {
-    description = "A customized version of Apple’s Menlo-Regular font";
+    description = "Customized version of Apple’s Menlo-Regular font";
     homepage = "https://github.com/andreberg/Meslo-Font/";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ ];
diff --git a/nixpkgs/pkgs/data/fonts/migmix/default.nix b/nixpkgs/pkgs/data/fonts/migmix/default.nix
index bcc0666f035d..5c5212189e20 100644
--- a/nixpkgs/pkgs/data/fonts/migmix/default.nix
+++ b/nixpkgs/pkgs/data/fonts/migmix/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   outputHash = "1fhh8wg6lxwrnsg9rl4ihffl0bsp1wqa5gps9fx60kr6j9wpvmbg";
 
   meta = with lib; {
-    description = "A high-quality Japanese font based on M+ fonts and IPA fonts";
+    description = "High-quality Japanese font based on M+ fonts and IPA fonts";
     homepage = "http://mix-mplus-ipa.osdn.jp/migmix";
     license = licenses.ipa;
     maintainers = [ maintainers.mikoim ];
diff --git a/nixpkgs/pkgs/data/fonts/migu/default.nix b/nixpkgs/pkgs/data/fonts/migu/default.nix
index 09992ef5ec8c..76c4afc706e6 100644
--- a/nixpkgs/pkgs/data/fonts/migu/default.nix
+++ b/nixpkgs/pkgs/data/fonts/migu/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   outputHash = "0nbpn21cxdd6gsgr3fadzjsnz84f2swpf81wmscmjgvd56ngndzh";
 
   meta = with lib; {
-    description = "A high-quality Japanese font based on modified M+ fonts and IPA fonts";
+    description = "High-quality Japanese font based on modified M+ fonts and IPA fonts";
     homepage = "http://mix-mplus-ipa.osdn.jp/migu/";
     license = licenses.ipa;
     maintainers = [ maintainers.mikoim ];
diff --git a/nixpkgs/pkgs/data/fonts/mona-sans/default.nix b/nixpkgs/pkgs/data/fonts/mona-sans/default.nix
index c73653c76ec3..c8be0b40a041 100644
--- a/nixpkgs/pkgs/data/fonts/mona-sans/default.nix
+++ b/nixpkgs/pkgs/data/fonts/mona-sans/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A variable font from GitHub";
+    description = "Variable font from GitHub";
     homepage = "https://github.com/mona-sans";
     changelog = "https://github.com/github/mona-sans/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.ofl;
diff --git a/nixpkgs/pkgs/data/fonts/monocraft/default.nix b/nixpkgs/pkgs/data/fonts/monocraft/default.nix
index c1e4be656ce1..88680682a7c9 100644
--- a/nixpkgs/pkgs/data/fonts/monocraft/default.nix
+++ b/nixpkgs/pkgs/data/fonts/monocraft/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, lib, fetchurl }:
+{ stdenvNoCC, lib, fetchurl }:
 
 let
-  version = "2.4";
+  version = "3.0";
   relArtifact = name: hash: fetchurl {
     inherit name hash;
     url = "https://github.com/IdreesInc/Monocraft/releases/download/v${version}/${name}";
   };
 in
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "monocraft";
   inherit version;
 
@@ -18,21 +18,19 @@ stdenv.mkDerivation {
     (relArtifact "Monocraft-nerd-fonts-patched.ttf" "sha256-QxMp8UwcRjWySNHWoNeX2sX9teZ4+tCFj+DG41azsXw=")
   ];
 
-  sourceRoot = ".";
-  unpackCmd = ''cp "$curSrc" $(basename $curSrc)'';
-
+  dontUnpack = true;
   dontConfigure = true;
   dontBuild = true;
 
   installPhase = ''
     runHook preInstall
-    install -Dm644 -t $out/share/fonts/opentype *.otf
-    install -Dm644 -t $out/share/fonts/truetype *.ttf
+    find $srcs -name '*.otf' -exec install -Dm644 --target $out/share/fonts/opentype {} +
+    find $srcs -name '*.ttf' -exec install -Dm644 --target $out/share/fonts/truetype {} +
     runHook postInstall
   '';
 
   meta = with lib; {
-    description = "A programming font based on the typeface used in Minecraft";
+    description = "Programming font based on the typeface used in Minecraft";
     homepage = "https://github.com/IdreesInc/Monocraft";
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/mononoki/default.nix b/nixpkgs/pkgs/data/fonts/mononoki/default.nix
index d943d42be7ac..5c4d3c79adcb 100644
--- a/nixpkgs/pkgs/data/fonts/mononoki/default.nix
+++ b/nixpkgs/pkgs/data/fonts/mononoki/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/madmalik/mononoki";
-    description = "A font for programming and code review";
+    description = "Font for programming and code review";
     license = licenses.ofl;
     platforms = platforms.all;
   };
diff --git a/nixpkgs/pkgs/data/fonts/montserrat/default.nix b/nixpkgs/pkgs/data/fonts/montserrat/default.nix
index 6074018f5545..60ee2ee97f67 100644
--- a/nixpkgs/pkgs/data/fonts/montserrat/default.nix
+++ b/nixpkgs/pkgs/data/fonts/montserrat/default.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A geometric sans serif font with extended latin support (Regular, Alternates, Subrayada)";
+    description = "Geometric sans serif font with extended latin support (Regular, Alternates, Subrayada)";
     homepage = "https://www.fontspace.com/julieta-ulanovsky/montserrat";
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/nacelle/default.nix b/nixpkgs/pkgs/data/fonts/nacelle/default.nix
index 2d670cdc229d..c1ae48dc54a5 100644
--- a/nixpkgs/pkgs/data/fonts/nacelle/default.nix
+++ b/nixpkgs/pkgs/data/fonts/nacelle/default.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
-    description = "A improved version of the Aileron font";
+    description = "Improved version of the Aileron font";
     platforms = platforms.all;
     maintainers = with maintainers; [ minijackson ];
     license = licenses.ofl;
diff --git a/nixpkgs/pkgs/data/fonts/nahid-fonts/default.nix b/nixpkgs/pkgs/data/fonts/nahid-fonts/default.nix
index d036eed35c96..069bf877bf74 100644
--- a/nixpkgs/pkgs/data/fonts/nahid-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/nahid-fonts/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/rastikerdar/nahid-font";
-    description = "A Persian (Farsi) Font - قلم (فونت) فارسی ناهید";
+    description = "Persian (Farsi) Font - قلم (فونت) فارسی ناهید";
     license = licenses.free;
     platforms = platforms.all;
     maintainers = [ ];
diff --git a/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix b/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix
index 3798a33b66c6..74741f6a7d2d 100644
--- a/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix
+++ b/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A contemporary monospaced sans-serif typeface with a warm touch";
+    description = "Contemporary monospaced sans-serif typeface with a warm touch";
     homepage = "https://github.com/naver/nanumfont";
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/navilu/default.nix b/nixpkgs/pkgs/data/fonts/navilu/default.nix
index afd9f85741c3..8aaf36e60ed1 100644
--- a/nixpkgs/pkgs/data/fonts/navilu/default.nix
+++ b/nixpkgs/pkgs/data/fonts/navilu/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   installPhase = "install -Dm444 -t $out/share/fonts/truetype/ Navilu.ttf";
 
   meta = with lib; src.meta // {
-    description = "A Kannada handwriting font";
+    description = "Kannada handwriting font";
     license = licenses.gpl3Plus;
     platforms = platforms.all;
     maintainers = with maintainers; [ ehmry ];
diff --git a/nixpkgs/pkgs/data/fonts/norwester/default.nix b/nixpkgs/pkgs/data/fonts/norwester/default.nix
index f1236d5c05c1..2efbf45fd3d1 100644
--- a/nixpkgs/pkgs/data/fonts/norwester/default.nix
+++ b/nixpkgs/pkgs/data/fonts/norwester/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "http://jamiewilson.io/norwester";
-    description = "A condensed geometric sans serif by Jamie Wilson";
+    description = "Condensed geometric sans serif by Jamie Wilson";
     maintainers = with maintainers; [ leenaars ];
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/office-code-pro/default.nix b/nixpkgs/pkgs/data/fonts/office-code-pro/default.nix
index f05a7ddd319c..5a7d74404544 100644
--- a/nixpkgs/pkgs/data/fonts/office-code-pro/default.nix
+++ b/nixpkgs/pkgs/data/fonts/office-code-pro/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A customized version of Source Code Pro";
+    description = "Customized version of Source Code Pro";
     longDescription = ''
       Office Code Pro is a customized version of Source Code Pro, the monospaced
       sans serif originally created by Paul D. Hunt for Adobe Systems
diff --git a/nixpkgs/pkgs/data/fonts/oldstandard/default.nix b/nixpkgs/pkgs/data/fonts/oldstandard/default.nix
index 33bf37c18bae..b85d9694613f 100644
--- a/nixpkgs/pkgs/data/fonts/oldstandard/default.nix
+++ b/nixpkgs/pkgs/data/fonts/oldstandard/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/akryukov/oldstand";
-    description = "An attempt to revive a specific type of Modern style of serif typefaces";
+    description = "Attempt to revive a specific type of Modern style of serif typefaces";
     maintainers = with maintainers; [ raskin ];
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/open-fonts/default.nix b/nixpkgs/pkgs/data/fonts/open-fonts/default.nix
index 3f7682097942..a6f2db7542dc 100644
--- a/nixpkgs/pkgs/data/fonts/open-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/open-fonts/default.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A collection of beautiful free and open source fonts";
+    description = "Collection of beautiful free and open source fonts";
     homepage = "https://github.com/kiwi0fruit/open-fonts";
     license = licenses.mit;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/ostrich-sans/default.nix b/nixpkgs/pkgs/data/fonts/ostrich-sans/default.nix
index 67ca4b72823c..e4f6c3bae2f6 100644
--- a/nixpkgs/pkgs/data/fonts/ostrich-sans/default.nix
+++ b/nixpkgs/pkgs/data/fonts/ostrich-sans/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A gorgeous modern sans-serif with a very long neck";
+    description = "Gorgeous modern sans-serif with a very long neck";
     longDescription = ''
       A gorgeous modern sans-serif with a very long neck. With a whole slew of
       styles & weights.
diff --git a/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix b/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix
index a91596a66e51..214a9ca58d77 100644
--- a/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/rastikerdar/parastoo-font";
-    description = "A Persian (Farsi) Font - فونت ( قلم ) فارسی پرستو";
+    description = "Persian (Farsi) Font - فونت ( قلم ) فارسی پرستو";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = [ ];
diff --git a/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix b/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix
index 86646ae0ac5d..91132642b2a7 100644
--- a/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix
+++ b/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "http://www.paratype.ru/public/";
-    description = "An open Paratype font";
+    description = "Open Paratype font";
 
     license = "Open Paratype license";
     # no commercial distribution of the font on its own
diff --git a/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix b/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix
index dffd25c23aa5..90d90a56d454 100644
--- a/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix
+++ b/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "http://www.paratype.ru/public/";
-    description = "An open Paratype font";
+    description = "Open Paratype font";
 
     license = "Open Paratype license";
     # no commercial distribution of the font on its own
diff --git a/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix b/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix
index f346382d1f73..4430d94cd7f1 100644
--- a/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix
+++ b/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "http://www.paratype.ru/public/";
-    description = "An open Paratype font";
+    description = "Open Paratype font";
 
     license = "Open Paratype license";
     # no commercial distribution of the font on its own
diff --git a/nixpkgs/pkgs/data/fonts/pretendard/default.nix b/nixpkgs/pkgs/data/fonts/pretendard/default.nix
index 9f62ad8dd4e5..b01b298879cf 100644
--- a/nixpkgs/pkgs/data/fonts/pretendard/default.nix
+++ b/nixpkgs/pkgs/data/fonts/pretendard/default.nix
@@ -23,7 +23,7 @@ let
 
       meta = with lib; {
         homepage = "https://github.com/orioncactus/pretendard";
-        description = "An alternative font to system-ui for all platforms";
+        description = "Alternative font to system-ui for all platforms";
         license = licenses.ofl;
         platforms = platforms.all;
         maintainers = with maintainers; [ sudosubin ];
diff --git a/nixpkgs/pkgs/data/fonts/prociono/default.nix b/nixpkgs/pkgs/data/fonts/prociono/default.nix
index 8749c9d0736e..5d6ef71821e8 100644
--- a/nixpkgs/pkgs/data/fonts/prociono/default.nix
+++ b/nixpkgs/pkgs/data/fonts/prociono/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A roman serif with blackletter elements";
+    description = "Roman serif with blackletter elements";
     longDescription = ''
       "Prociono" (pro-tsee-O-no) is an Esperanto word meaning either the star
       Procyon or the animal species known as the raccoon. It is a roman serif
diff --git a/nixpkgs/pkgs/data/fonts/profont/default.nix b/nixpkgs/pkgs/data/fonts/profont/default.nix
index e201d643afac..a617d61cc98f 100644
--- a/nixpkgs/pkgs/data/fonts/profont/default.nix
+++ b/nixpkgs/pkgs/data/fonts/profont/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     homepage = "https://tobiasjung.name/profont/";
-    description = "A monospaced font created to be a most readable font for programming";
+    description = "Monospaced font created to be a most readable font for programming";
     maintainers = with maintainers; [ myrl ];
     license = licenses.mit;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/proggyfonts/default.nix b/nixpkgs/pkgs/data/fonts/proggyfonts/default.nix
index 195b6ed1d39a..919cdf2a3dce 100644
--- a/nixpkgs/pkgs/data/fonts/proggyfonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/proggyfonts/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://www.upperbounds.net";
-    description = "A set of fixed-width screen fonts that are designed for code listings";
+    description = "Set of fixed-width screen fonts that are designed for code listings";
     license = licenses.mit;
     platforms = platforms.all;
     maintainers = [ maintainers.myrl ];
diff --git a/nixpkgs/pkgs/data/fonts/public-sans/default.nix b/nixpkgs/pkgs/data/fonts/public-sans/default.nix
index 068238897831..18e1b66e0ec5 100644
--- a/nixpkgs/pkgs/data/fonts/public-sans/default.nix
+++ b/nixpkgs/pkgs/data/fonts/public-sans/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A strong, neutral, principles-driven, open source typeface for text or display";
+    description = "Strong, neutral, principles-driven, open source typeface for text or display";
     homepage = "https://public-sans.digital.gov/";
     changelog = "https://github.com/uswds/public-sans/raw/v${version}/FONTLOG.txt";
     license = licenses.ofl;
diff --git a/nixpkgs/pkgs/data/fonts/quattrocento-sans/default.nix b/nixpkgs/pkgs/data/fonts/quattrocento-sans/default.nix
index 765959884232..ce702c1c5993 100644
--- a/nixpkgs/pkgs/data/fonts/quattrocento-sans/default.nix
+++ b/nixpkgs/pkgs/data/fonts/quattrocento-sans/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "http://www.impallari.com/quattrocentosans/";
-    description = "A classic, elegant and sober sans-serif typeface";
+    description = "Classic, elegant and sober sans-serif typeface";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = [ maintainers.rycee ];
diff --git a/nixpkgs/pkgs/data/fonts/quattrocento/default.nix b/nixpkgs/pkgs/data/fonts/quattrocento/default.nix
index a70396437ec1..14618cb2ef39 100644
--- a/nixpkgs/pkgs/data/fonts/quattrocento/default.nix
+++ b/nixpkgs/pkgs/data/fonts/quattrocento/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "http://www.impallari.com/quattrocento/";
-    description = "A classic, elegant, sober and strong serif typeface";
+    description = "Classic, elegant, sober and strong serif typeface";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = [ maintainers.rycee ];
diff --git a/nixpkgs/pkgs/data/fonts/quivira/default.nix b/nixpkgs/pkgs/data/fonts/quivira/default.nix
index 8affc4f6c729..db01e2b7d150 100644
--- a/nixpkgs/pkgs/data/fonts/quivira/default.nix
+++ b/nixpkgs/pkgs/data/fonts/quivira/default.nix
@@ -17,7 +17,7 @@ in fetchurl {
 
   sha256 = "Hhl+0Oc5DDohOpBbEARMunMYCpr6nn4X6RgpQeEksNo=";
   meta = {
-    description = "a free Unicode font in the OpenType format which is supported by every usual office program or printer";
+    description = "Free Unicode font in the OpenType format which is supported by every usual office program or printer";
     homepage = "http://www.quivira-font.com/";
     license = lib.licenses.publicDomain;
     maintainers = [ lib.maintainers.nosewings ];
diff --git a/nixpkgs/pkgs/data/fonts/recursive/default.nix b/nixpkgs/pkgs/data/fonts/recursive/default.nix
index f634a8c5343a..c01bd294ea37 100644
--- a/nixpkgs/pkgs/data/fonts/recursive/default.nix
+++ b/nixpkgs/pkgs/data/fonts/recursive/default.nix
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://recursive.design/";
-    description = "A variable font family for code & UI";
+    description = "Variable font family for code & UI";
     license = licenses.ofl;
     maintainers = [ maintainers.eadwu ];
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/ricty/default.nix b/nixpkgs/pkgs/data/fonts/ricty/default.nix
index 6bdd331c72c4..7c1c6d358736 100644
--- a/nixpkgs/pkgs/data/fonts/ricty/default.nix
+++ b/nixpkgs/pkgs/data/fonts/ricty/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A high-quality Japanese font based on Inconsolata and Migu 1M";
+    description = "High-quality Japanese font based on Inconsolata and Migu 1M";
     homepage = "https://rictyfonts.github.io";
     license = licenses.unfree;
     maintainers = [ maintainers.mikoim ];
diff --git a/nixpkgs/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/nixpkgs/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
index c8d8ca42f9e4..ad1b45061880 100644
--- a/nixpkgs/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
+++ b/nixpkgs/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/hakatashi/RictyDiminished-with-FiraCode";
-    description = "The best Japanese programming font meets the awesome ligatures of Firacode";
+    description = "Best Japanese programming font meets the awesome ligatures of Firacode";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = with maintainers; [ mt-caret ];
diff --git a/nixpkgs/pkgs/data/fonts/roboto-serif/default.nix b/nixpkgs/pkgs/data/fonts/roboto-serif/default.nix
index 99e8ea58b4e4..ba8aa7a831e0 100644
--- a/nixpkgs/pkgs/data/fonts/roboto-serif/default.nix
+++ b/nixpkgs/pkgs/data/fonts/roboto-serif/default.nix
@@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "The Roboto family of fonts";
+    description = "Roboto family of fonts";
     longDescription = ''
       Google’s signature family of fonts, the default font on Android and
       Chrome OS, and the recommended font for Google’s visual language,
diff --git a/nixpkgs/pkgs/data/fonts/roboto/default.nix b/nixpkgs/pkgs/data/fonts/roboto/default.nix
index 02ca82edf10f..b9e287945a4c 100644
--- a/nixpkgs/pkgs/data/fonts/roboto/default.nix
+++ b/nixpkgs/pkgs/data/fonts/roboto/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = {
     homepage = "https://github.com/google/roboto";
-    description = "The Roboto family of fonts";
+    description = "Roboto family of fonts";
     longDescription = ''
       Google’s signature family of fonts, the default font on Android and
       Chrome OS, and the recommended font for Google’s visual language,
diff --git a/nixpkgs/pkgs/data/fonts/rounded-mgenplus/default.nix b/nixpkgs/pkgs/data/fonts/rounded-mgenplus/default.nix
index 688518150fc7..b314fd45eef8 100644
--- a/nixpkgs/pkgs/data/fonts/rounded-mgenplus/default.nix
+++ b/nixpkgs/pkgs/data/fonts/rounded-mgenplus/default.nix
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A Japanese font based on Rounded M+ and Noto Sans Japanese";
+    description = "Japanese font based on Rounded M+ and Noto Sans Japanese";
     homepage = "http://jikasei.me/font/rounded-mgenplus/";
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/route159/default.nix b/nixpkgs/pkgs/data/fonts/route159/default.nix
index e19d25d61d0f..efaf1d6ff242 100644
--- a/nixpkgs/pkgs/data/fonts/route159/default.nix
+++ b/nixpkgs/pkgs/data/fonts/route159/default.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
-    description = "A weighted sans serif font";
+    description = "Weighted sans serif font";
     platforms = platforms.all;
     maintainers = with maintainers; [ leenaars minijackson ];
     license = licenses.ofl;
diff --git a/nixpkgs/pkgs/data/fonts/rubik/default.nix b/nixpkgs/pkgs/data/fonts/rubik/default.nix
index c9e20fa6351a..d77753f515de 100644
--- a/nixpkgs/pkgs/data/fonts/rubik/default.nix
+++ b/nixpkgs/pkgs/data/fonts/rubik/default.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     homepage = "https://fonts.google.com/specimen/Rubik";
-    description = "Rubik Font - is a 5 weight Roman + Italic family.";
+    description = "Rubik Font - is a 5 weight Roman + Italic family";
     longDescription = ''
       The Rubik Fonts project was initiated as part of the Chrome CubeLab
       project.
diff --git a/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix b/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix
index 860a0066270d..7fc48704e798 100644
--- a/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/rastikerdar/sahel-font";
-    description = "A Persian (farsi) Font - فونت (قلم) فارسی ساحل";
+    description = "Persian (farsi) Font - فونت (قلم) فارسی ساحل";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = [ ];
diff --git a/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix b/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix
index a1785e1b9373..2f36075bad93 100644
--- a/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/rastikerdar/samim-font";
-    description = "A Persian (Farsi) Font - فونت (قلم) فارسی صمیم";
+    description = "Persian (Farsi) Font - فونت (قلم) فارسی صمیم";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = [ ];
diff --git a/nixpkgs/pkgs/data/fonts/sarabun/default.nix b/nixpkgs/pkgs/data/fonts/sarabun/default.nix
index 42bc349effe2..3e4fa018e712 100644
--- a/nixpkgs/pkgs/data/fonts/sarabun/default.nix
+++ b/nixpkgs/pkgs/data/fonts/sarabun/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://cadsondemak.github.io/${pname}/";
-    description = "A slightly-condensed looped Thai and sans serif Latin typeface for communications";
+    description = "Slightly-condensed looped Thai and sans serif Latin typeface for communications";
     longDescription = ''
       The most popular typeface from the 13 fonts from SIPA Thailand’s National
       fonts project. Sarabun was designed by Suppakit Chalermlarp to be a
diff --git a/nixpkgs/pkgs/data/fonts/scheherazade/default.nix b/nixpkgs/pkgs/data/fonts/scheherazade/default.nix
index ffaf8aeb7824..81adc546e444 100644
--- a/nixpkgs/pkgs/data/fonts/scheherazade/default.nix
+++ b/nixpkgs/pkgs/data/fonts/scheherazade/default.nix
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://software.sil.org/scheherazade/";
-    description = "A font designed in a similar style to traditional Naskh typefaces";
+    description = "Font designed in a similar style to traditional Naskh typefaces";
     longDescription = ''
 
       Scheherazade${lib.optionalString new " New"}, named after the heroine of
diff --git a/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix b/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix
index c5f5e00e023a..fd8f146eb355 100644
--- a/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/rastikerdar/shabnam-font";
-    description = "A Persian (Farsi) Font - فونت (قلم) فارسی شبنم";
+    description = "Persian (Farsi) Font - فونت (قلم) فارسی شبنم";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = [ ];
diff --git a/nixpkgs/pkgs/data/fonts/shrikhand/default.nix b/nixpkgs/pkgs/data/fonts/shrikhand/default.nix
index 0db94ebd4ecb..ce3423003dbd 100644
--- a/nixpkgs/pkgs/data/fonts/shrikhand/default.nix
+++ b/nixpkgs/pkgs/data/fonts/shrikhand/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation {
 
   meta = with lib; {
     homepage = "https://jonpinhorn.github.io/shrikhand/";
-    description = "A vibrant and playful typeface for both Latin and Gujarati writing systems";
+    description = "Vibrant and playful typeface for both Latin and Gujarati writing systems";
     maintainers = with maintainers; [ sternenseemann ];
     platforms = platforms.all;
     license = licenses.ofl;
diff --git a/nixpkgs/pkgs/data/fonts/siji/default.nix b/nixpkgs/pkgs/data/fonts/siji/default.nix
index 4429729f7a5c..0ae5914eb131 100644
--- a/nixpkgs/pkgs/data/fonts/siji/default.nix
+++ b/nixpkgs/pkgs/data/fonts/siji/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/stark/siji";
-    description = "An iconic bitmap font based on Stlarch with additional glyphs";
+    description = "Iconic bitmap font based on Stlarch with additional glyphs";
     license = licenses.gpl2;
     platforms = platforms.all;
     maintainers = [ maintainers.asymmetric ];
diff --git a/nixpkgs/pkgs/data/fonts/sil-padauk/default.nix b/nixpkgs/pkgs/data/fonts/sil-padauk/default.nix
index fe45da131738..f3df1d1febe2 100644
--- a/nixpkgs/pkgs/data/fonts/sil-padauk/default.nix
+++ b/nixpkgs/pkgs/data/fonts/sil-padauk/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A Unicode-based font family with broad support for writing systems that use the Myanmar script";
+    description = "Unicode-based font family with broad support for writing systems that use the Myanmar script";
     homepage = "https://software.sil.org/padauk";
     license = licenses.ofl;
     maintainers = with maintainers; [ serge ];
diff --git a/nixpkgs/pkgs/data/fonts/sitelen-seli-kiwen/default.nix b/nixpkgs/pkgs/data/fonts/sitelen-seli-kiwen/default.nix
index de0fec7b6f3e..363ce2da5961 100644
--- a/nixpkgs/pkgs/data/fonts/sitelen-seli-kiwen/default.nix
+++ b/nixpkgs/pkgs/data/fonts/sitelen-seli-kiwen/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "A handwritten sitelen pona font supporting UCSUR";
+    description = "Handwritten sitelen pona font supporting UCSUR";
     homepage = "https://www.kreativekorp.com/software/fonts/sitelenselikiwen/";
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/smc-chilanka/default.nix b/nixpkgs/pkgs/data/fonts/smc-chilanka/default.nix
new file mode 100644
index 000000000000..f5e5ee2cb5d8
--- /dev/null
+++ b/nixpkgs/pkgs/data/fonts/smc-chilanka/default.nix
@@ -0,0 +1,39 @@
+{ lib, stdenvNoCC, fetchFromGitLab, python3Packages, gnumake, truetype ? false }:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "chilanka";
+  version = "1.7";
+
+  src = fetchFromGitLab {
+    group = "smc";
+    owner = "fonts";
+    repo = "chilanka";
+    rev = "Version${version}";
+    hash = "sha256-VvotRUQks8vUqJOcYHqy6cuwaAKYg4OqtiAjaBIdBRk=";
+  };
+
+  nativeBuildInputs = [ gnumake python3Packages.fontmake ];
+
+  buildFlags = [ "otf" ] ++ lib.optional truetype "ttf";
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm444 -t $out/share/fonts/opentype build/*.otf
+    ${lib.optionalString truetype "install -Dm444 -t $out/share/fonts/truetype build/*.ttf"}
+
+    install -Dm444 -t $out/etc/fonts/conf.d *.conf
+
+    install -Dm644 -t $out/share/doc/${pname}-${version} OFL.txt FONTLOG.md
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://smc.org.in/fonts/chilanka";
+    description = "Chilanka Malayalam Typeface";
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ adtya ];
+  };
+}
diff --git a/nixpkgs/pkgs/data/fonts/smiley-sans/default.nix b/nixpkgs/pkgs/data/fonts/smiley-sans/default.nix
index 62d65aa5b010..7a863c3d10d7 100644
--- a/nixpkgs/pkgs/data/fonts/smiley-sans/default.nix
+++ b/nixpkgs/pkgs/data/fonts/smiley-sans/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
-    description = "A condensed and oblique Chinese typeface seeking a visual balance between the humanist and the geometric";
+    description = "Condensed and oblique Chinese typeface seeking a visual balance between the humanist and the geometric";
     homepage = "https://atelier-anchor.com/typefaces/smiley-sans/";
     changelog = "https://github.com/atelier-anchor/smiley-sans/blob/main/CHANGELOG.md";
     license = licenses.ofl;
diff --git a/nixpkgs/pkgs/data/fonts/sniglet/default.nix b/nixpkgs/pkgs/data/fonts/sniglet/default.nix
index ab60e9c56f7c..70cfd227d045 100644
--- a/nixpkgs/pkgs/data/fonts/sniglet/default.nix
+++ b/nixpkgs/pkgs/data/fonts/sniglet/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A fun rounded display face that’s great for headlines";
+    description = "Fun rounded display face that’s great for headlines";
     longDescription = ''
       A rounded display face that’s great for headlines. It comes with a full
       character set, so you can type in Icelandic or even French!
diff --git a/nixpkgs/pkgs/data/fonts/sorts-mill-goudy/default.nix b/nixpkgs/pkgs/data/fonts/sorts-mill-goudy/default.nix
index 1edbbd9787ed..55acaafb43af 100644
--- a/nixpkgs/pkgs/data/fonts/sorts-mill-goudy/default.nix
+++ b/nixpkgs/pkgs/data/fonts/sorts-mill-goudy/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A ‘revival’ of Goudy Oldstyle and Italic";
+    description = "‘revival’ of Goudy Oldstyle and Italic";
     longDescription = ''
       A 'revival' of Goudy Oldstyle and Italic, with features including small
       capitals (in the roman only), oldstyle and lining figures, superscripts
diff --git a/nixpkgs/pkgs/data/fonts/source-han-code-jp/default.nix b/nixpkgs/pkgs/data/fonts/source-han-code-jp/default.nix
index 2a64680ee19b..5c00f564320b 100644
--- a/nixpkgs/pkgs/data/fonts/source-han-code-jp/default.nix
+++ b/nixpkgs/pkgs/data/fonts/source-han-code-jp/default.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = {
-    description = "A monospaced Latin font suitable for coding";
+    description = "Monospaced Latin font suitable for coding";
     maintainers = with lib.maintainers; [ mt-caret ];
     platforms = with lib.platforms; all;
     homepage = "https://blogs.adobe.com/CCJKType/2015/06/source-han-code-jp.html";
diff --git a/nixpkgs/pkgs/data/fonts/source-han/default.nix b/nixpkgs/pkgs/data/fonts/source-han/default.nix
index 573cfd6c5b94..2f177160da99 100644
--- a/nixpkgs/pkgs/data/fonts/source-han/default.nix
+++ b/nixpkgs/pkgs/data/fonts/source-han/default.nix
@@ -44,7 +44,7 @@ let
       '';
 
       meta = {
-        description = "An open source Pan-CJK ${description} typeface";
+        description = "Open source Pan-CJK ${description} typeface";
         homepage = "https://github.com/adobe-fonts/source-han-${family}";
         license = lib.licenses.ofl;
         maintainers = with lib.maintainers; [ taku0 emily ];
@@ -71,7 +71,7 @@ let
       postFetch = "install -Dm444 $downloadedFile $out/share/fonts/variable/SourceHan${Family}-VF.${format}.ttc";
 
       meta = {
-        description = "An open source Pan-CJK ${Family} typeface";
+        description = "Open source Pan-CJK ${Family} typeface";
         homepage = "https://github.com/adobe-fonts/source-han-${family}";
         license = lib.licenses.ofl;
         maintainers = with lib.maintainers; [ taku0 emily ];
diff --git a/nixpkgs/pkgs/data/fonts/tamsyn/default.nix b/nixpkgs/pkgs/data/fonts/tamsyn/default.nix
index 64955efd62e8..f99624f4a483 100644
--- a/nixpkgs/pkgs/data/fonts/tamsyn/default.nix
+++ b/nixpkgs/pkgs/data/fonts/tamsyn/default.nix
@@ -35,7 +35,7 @@ in stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "A monospace bitmap font aimed at programmers";
+    description = "Monospace bitmap font aimed at programmers";
     longDescription = ''Tamsyn is a monospace bitmap font, primarily aimed at
     programmers. It was derived from Gilles Boccon-Gibod's MonteCarlo. Tamsyn
     font was further inspired by Gohufont, Terminus, Dina, Proggy, Fixedsys, and
diff --git a/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix b/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix
index 2cd5da73d84d..eb6d139b33a9 100644
--- a/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix
+++ b/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A clean fixed width TTF font";
+    description = "Clean fixed width TTF font";
     longDescription = ''
       Monospaced bitmap font designed for long work with computers
       (TTF version, mainly for Java applications)
diff --git a/nixpkgs/pkgs/data/fonts/terminus-font/default.nix b/nixpkgs/pkgs/data/fonts/terminus-font/default.nix
index 5b405c12405f..760993dcd8cf 100644
--- a/nixpkgs/pkgs/data/fonts/terminus-font/default.nix
+++ b/nixpkgs/pkgs/data/fonts/terminus-font/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   enableParallelInstalling = false;
 
   meta = with lib; {
-    description = "A clean fixed width font";
+    description = "Clean fixed width font";
     longDescription = ''
       Terminus Font is designed for long (8 and more hours per day) work
       with computers. Version 4.30 contains 850 characters, covers about
diff --git a/nixpkgs/pkgs/data/fonts/tewi/default.nix b/nixpkgs/pkgs/data/fonts/tewi/default.nix
index 3e68042631c7..d8906a2284da 100644
--- a/nixpkgs/pkgs/data/fonts/tewi/default.nix
+++ b/nixpkgs/pkgs/data/fonts/tewi/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A nice bitmap font, readable even at small sizes";
+    description = "Nice bitmap font, readable even at small sizes";
     longDescription = ''
       Tewi is a bitmap font, readable even at very small font sizes. This is
       particularily useful while programming, to fit a lot of code on your
diff --git a/nixpkgs/pkgs/data/fonts/theano/default.nix b/nixpkgs/pkgs/data/fonts/theano/default.nix
index 3a3107e13666..08f7c805eda4 100644
--- a/nixpkgs/pkgs/data/fonts/theano/default.nix
+++ b/nixpkgs/pkgs/data/fonts/theano/default.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/akryukov/theano";
-    description = "An old-style font designed from historic samples";
+    description = "Old-style font designed from historic samples";
     maintainers = with maintainers; [ raskin rycee ];
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/times-newer-roman/default.nix b/nixpkgs/pkgs/data/fonts/times-newer-roman/default.nix
index 840e75c710b3..6f856558cb4a 100644
--- a/nixpkgs/pkgs/data/fonts/times-newer-roman/default.nix
+++ b/nixpkgs/pkgs/data/fonts/times-newer-roman/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "A font that looks just like Times New Roman, except each character is 5-10% wider";
+    description = "Font that looks just like Times New Roman, except each character is 5-10% wider";
     homepage = "https://timesnewerroman.com/";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ ];
diff --git a/nixpkgs/pkgs/data/fonts/tlwg/default.nix b/nixpkgs/pkgs/data/fonts/tlwg/default.nix
index 4b0f780a38b5..a9216ad0d356 100644
--- a/nixpkgs/pkgs/data/fonts/tlwg/default.nix
+++ b/nixpkgs/pkgs/data/fonts/tlwg/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ fontforge ];
 
   meta = with lib; {
-    description = "A collection of Thai scalable fonts available under free licenses";
+    description = "Collection of Thai scalable fonts available under free licenses";
     homepage = "https://linux.thai.net/projects/fonts-tlwg";
     license = with licenses; [ gpl2 publicDomain lppl13c free ];
     maintainers = [ maintainers.yrashk ];
diff --git a/nixpkgs/pkgs/data/fonts/tt2020/default.nix b/nixpkgs/pkgs/data/fonts/tt2020/default.nix
index 63b4e1834a3b..a427c4cf14b8 100644
--- a/nixpkgs/pkgs/data/fonts/tt2020/default.nix
+++ b/nixpkgs/pkgs/data/fonts/tt2020/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "An advanced, open source, hyperrealistic, multilingual typewriter font for a new decade";
+    description = "Advanced, open source, hyperrealistic, multilingual typewriter font for a new decade";
     homepage = "https://ctrlcctrlv.github.io/TT2020";
     license = licenses.ofl;
     maintainers = with maintainers; [ sikmir ];
diff --git a/nixpkgs/pkgs/data/fonts/u001/default.nix b/nixpkgs/pkgs/data/fonts/u001/default.nix
index b0359ac1e55e..0a1a552ed9cd 100644
--- a/nixpkgs/pkgs/data/fonts/u001/default.nix
+++ b/nixpkgs/pkgs/data/fonts/u001/default.nix
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A Univers-like typeface that comes with GhostPDL made by URW++";
+    description = "Univers-like typeface that comes with GhostPDL made by URW++";
     homepage = "https://fontlibrary.org/en/font/u001";
     license = licenses.aladdin;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/nixpkgs/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
index 27933b5b139d..4a1dfa00916a 100644
--- a/nixpkgs/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
+++ b/nixpkgs/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "The Ultimate Oldschool PC Font Pack (TTF Fonts)";
+    description = "Ultimate Oldschool PC Font Pack (TTF Fonts)";
     homepage = "https://int10h.org/oldschool-pc-fonts/";
     changelog = "https://int10h.org/oldschool-pc-fonts/readme/#history";
     license = licenses.cc-by-sa-40;
diff --git a/nixpkgs/pkgs/data/fonts/undefined-medium/default.nix b/nixpkgs/pkgs/data/fonts/undefined-medium/default.nix
index f981b9f85e29..8dd3cc71ac27 100644
--- a/nixpkgs/pkgs/data/fonts/undefined-medium/default.nix
+++ b/nixpkgs/pkgs/data/fonts/undefined-medium/default.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://undefined-medium.com/";
-    description = "A pixel grid-based monospace typeface";
+    description = "Pixel grid-based monospace typeface";
     longDescription = ''
       undefined medium is a free and open-source pixel grid-based
       monospace typeface suitable for programming, writing, and
diff --git a/nixpkgs/pkgs/data/fonts/vazir-code-font/default.nix b/nixpkgs/pkgs/data/fonts/vazir-code-font/default.nix
index 6ba69b57feaf..6c76f4c6d503 100644
--- a/nixpkgs/pkgs/data/fonts/vazir-code-font/default.nix
+++ b/nixpkgs/pkgs/data/fonts/vazir-code-font/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/rastikerdar/vazir-code-font";
-    description = "A Persian (farsi) Monospaced Font for coding";
+    description = "Persian (farsi) Monospaced Font for coding";
     license = licenses.publicDomain;
     platforms = platforms.all;
     maintainers = [ maintainers.dearrude ];
diff --git a/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix b/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix
index d65b270c881f..11b991306a0a 100644
--- a/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/rastikerdar/vazir-font";
-    description = "A Persian (Farsi) Font - قلم (فونت) فارسی وزیر";
+    description = "Persian (Farsi) Font - قلم (فونت) فارسی وزیر";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = [ ];
diff --git a/nixpkgs/pkgs/data/fonts/vegur/default.nix b/nixpkgs/pkgs/data/fonts/vegur/default.nix
index e03f25951b54..b161ad4e3e35 100644
--- a/nixpkgs/pkgs/data/fonts/vegur/default.nix
+++ b/nixpkgs/pkgs/data/fonts/vegur/default.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     homepage = "http://dotcolon.net/font/vegur/";
-    description = "A humanist sans serif font";
+    description = "Humanist sans serif font";
     platforms = platforms.all;
     maintainers = with maintainers; [ minijackson samueldr ];
     license = licenses.cc0;
diff --git a/nixpkgs/pkgs/data/fonts/vollkorn/default.nix b/nixpkgs/pkgs/data/fonts/vollkorn/default.nix
index deeeac19c939..466d16b086a4 100644
--- a/nixpkgs/pkgs/data/fonts/vollkorn/default.nix
+++ b/nixpkgs/pkgs/data/fonts/vollkorn/default.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "http://vollkorn-typeface.com/";
-    description = "The free and healthy typeface for bread and butter use";
+    description = "Free and healthy typeface for bread and butter use";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = [ maintainers.schmittlauch ];
diff --git a/nixpkgs/pkgs/data/fonts/work-sans/default.nix b/nixpkgs/pkgs/data/fonts/work-sans/default.nix
index c46b10132817..071c6bafb182 100644
--- a/nixpkgs/pkgs/data/fonts/work-sans/default.nix
+++ b/nixpkgs/pkgs/data/fonts/work-sans/default.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A grotesque sans";
+    description = "Grotesque sans";
     homepage = "https://weiweihuanghuang.github.io/Work-Sans/";
     license = licenses.ofl;
     maintainers = [ ];
diff --git a/nixpkgs/pkgs/data/fonts/wqy-microhei/default.nix b/nixpkgs/pkgs/data/fonts/wqy-microhei/default.nix
index 7c410e7d00e7..ced2c4a3a41d 100644
--- a/nixpkgs/pkgs/data/fonts/wqy-microhei/default.nix
+++ b/nixpkgs/pkgs/data/fonts/wqy-microhei/default.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = {
-    description = "A (mainly) Chinese Unicode font";
+    description = "(mainly) Chinese Unicode font";
     homepage = "http://wenq.org";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.pkmx ];
diff --git a/nixpkgs/pkgs/data/fonts/wqy-zenhei/default.nix b/nixpkgs/pkgs/data/fonts/wqy-zenhei/default.nix
index c59f74d45474..50ab5d81a305 100644
--- a/nixpkgs/pkgs/data/fonts/wqy-zenhei/default.nix
+++ b/nixpkgs/pkgs/data/fonts/wqy-zenhei/default.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = {
-    description = "A (mainly) Chinese Unicode font";
+    description = "(mainly) Chinese Unicode font";
     homepage = "http://wenq.org";
     license = lib.licenses.gpl2; # with font embedding exceptions
     maintainers = [ lib.maintainers.pkmx ];
diff --git a/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix b/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix
index b9ef9f0cda07..003ddcc7da90 100644
--- a/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix
+++ b/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "The xkcd font";
+    description = "Xkcd font";
     homepage = "https://github.com/ipython/xkcd-font";
     license = licenses.cc-by-nc-30;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/fonts/yanone-kaffeesatz/default.nix b/nixpkgs/pkgs/data/fonts/yanone-kaffeesatz/default.nix
index 99cd30f3dfa7..8fced0b73a63 100644
--- a/nixpkgs/pkgs/data/fonts/yanone-kaffeesatz/default.nix
+++ b/nixpkgs/pkgs/data/fonts/yanone-kaffeesatz/default.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = {
-    description = "The free font classic";
+    description = "Free font classic";
     maintainers = with lib.maintainers; [ mt-caret ];
     platforms = with lib.platforms; all;
     homepage = "https://yanone.de/fonts/kaffeesatz/";
diff --git a/nixpkgs/pkgs/data/icons/apple-cursor/default.nix b/nixpkgs/pkgs/data/icons/apple-cursor/default.nix
index 46b4b37f78df..5db50d0fbbe8 100644
--- a/nixpkgs/pkgs/data/icons/apple-cursor/default.nix
+++ b/nixpkgs/pkgs/data/icons/apple-cursor/default.nix
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "Opensource macOS Cursors.";
+    description = "Opensource macOS Cursors";
     homepage = "https://github.com/ful1e5/apple_cursor";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix
index 2950f929912a..a185160d4a3e 100644
--- a/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "arc-icon-theme";
-  version = "2016-11-22";
+  version = "20161122";
 
   src = fetchFromGitHub {
     owner = "horst3180";
-    repo = pname;
-    rev = "55a575386a412544c3ed2b5617a61f842ee4ec15";
-    sha256 = "1ch3hp08qri93510hypzz6m2x4xgg2h15wvnhjwh1x1s1b7jvxjd";
+    repo = "arc-icon-theme";
+    rev = version;
+    hash = "sha256-TfYtzwo69AC5hHbzEqB4r5Muqvn/eghCGSlmjMCFA7I=";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/data/icons/capitaine-cursors-themed/default.nix b/nixpkgs/pkgs/data/icons/capitaine-cursors-themed/default.nix
index bd0147fecde3..e29c38dc5df6 100644
--- a/nixpkgs/pkgs/data/icons/capitaine-cursors-themed/default.nix
+++ b/nixpkgs/pkgs/data/icons/capitaine-cursors-themed/default.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A fork of the capitaine cursor theme, with some additional variants (Gruvbox, Nord, Palenight) and support for HiDPI";
+    description = "Fork of the capitaine cursor theme, with some additional variants (Gruvbox, Nord, Palenight) and support for HiDPI";
     homepage = "https://github.com/sainnhe/capitaine-cursors";
     license = licenses.lgpl3Only;
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix b/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix
index 47fbeda10942..1bb855790055 100644
--- a/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix
+++ b/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix
@@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "An x-cursor theme inspired by macOS and based on KDE Breeze";
+    description = "X-cursor theme inspired by macOS and based on KDE Breeze";
     homepage = "https://github.com/keeferrourke/capitaine-cursors";
     license = licenses.lgpl3;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/data/icons/catppuccin-cursors/default.nix b/nixpkgs/pkgs/data/icons/catppuccin-cursors/default.nix
deleted file mode 100644
index eeb9dd3227f0..000000000000
--- a/nixpkgs/pkgs/data/icons/catppuccin-cursors/default.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
-, unzip
-}:
-
-let
-  dimensions = {
-    palette = [ "Frappe" "Latte" "Macchiato" "Mocha" ];
-    color = [ "Blue" "Dark" "Flamingo" "Green" "Lavender" "Light" "Maroon" "Mauve" "Peach" "Pink" "Red" "Rosewater" "Sapphire" "Sky" "Teal" "Yellow" ];
-  };
-  variantName = { palette, color }: (lib.strings.toLower palette) + color;
-  variants = lib.mapCartesianProduct variantName dimensions;
-in
-stdenvNoCC.mkDerivation rec {
-  pname = "catppuccin-cursors";
-  version = "0.2.0";
-  dontBuild = true;
-
-  src = fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "cursors";
-    rev = "v${version}";
-    sha256 = "sha256-TgV5f8+YWR+h61m6WiBMg3aBFnhqShocZBdzZHSyU2c=";
-    sparseCheckout = [ "cursors" ];
-  };
-
-  nativeBuildInputs = [ unzip ];
-
-  outputs = variants ++ [ "out" ]; # dummy "out" output to prevent breakage
-
-  outputsToInstall = [];
-
-  installPhase = ''
-    runHook preInstall
-
-    for output in $(getAllOutputNames); do
-      if [ "$output" != "out" ]; then
-        local outputDir="''${!output}"
-        local iconsDir="$outputDir"/share/icons
-
-        mkdir -p "$iconsDir"
-
-        # Convert to kebab case with the first letter of each word capitalized
-        local variant=$(sed 's/\([A-Z]\)/-\1/g' <<< "$output")
-        local variant=''${variant^}
-
-        unzip "cursors/Catppuccin-$variant-Cursors.zip" -d "$iconsDir"
-      fi
-    done
-
-    # Needed to prevent breakage
-    mkdir -p "$out"
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Catppuccin cursor theme based on Volantes";
-    homepage = "https://github.com/catppuccin/cursors";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ dixslyf ];
-  };
-}
diff --git a/nixpkgs/pkgs/data/icons/comixcursors/default.nix b/nixpkgs/pkgs/data/icons/comixcursors/default.nix
index 735ff686b49c..be1fa347535b 100644
--- a/nixpkgs/pkgs/data/icons/comixcursors/default.nix
+++ b/nixpkgs/pkgs/data/icons/comixcursors/default.nix
@@ -83,7 +83,7 @@ stdenvNoCC.mkDerivation rec {
   outputsToInstall = [];
 
   meta = with lib; {
-    description = "The Comix Cursors mouse themes";
+    description = "Comix Cursors mouse themes";
     longDescription = ''
       There are many (${toString ((length outputs) - 1)}) variants of color,
       opacity, edge thickness, and right- or left-handedness, for this cursor
diff --git a/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix
index 921c87774c31..4fc2068f870c 100644
--- a/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A sexy and modern icon theme with Tango influences";
+    description = "Sexy and modern icon theme with Tango influences";
     homepage = "https://snwh.org/moka";
     license = with licenses; [ cc-by-sa-40 gpl3 ];
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix b/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix
index 47eeab40acb7..efd91a5f53fd 100644
--- a/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix
+++ b/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix
@@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "The full set of Faba monochrome panel icons";
+    description = "Full set of Faba monochrome panel icons";
     homepage = "https://snwh.org/moka";
     license = licenses.gpl3;
     # moka-icon-theme dependency is restricted to linux
diff --git a/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix
index c19f413ad7d0..9907b18203d7 100644
--- a/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec  {
   pname = "flat-remix-icon-theme";
-  version = "20220525";
+  version = "20240201";
 
   src = fetchFromGitHub {
     owner = "daniruiz";
     repo = "flat-remix";
     rev = version;
-    sha256 = "sha256-JpUa2nxZxrLTd80qdiGpob4Trq41ONthsPA4zFj/6nk=";
+    sha256 = "sha256-3TkBRgoT2AW0Sb0CrXdxh53/jYARAMFC/TIj/r/zruo=";
   };
 
   nativeBuildInputs = [
@@ -22,6 +22,7 @@ stdenvNoCC.mkDerivation rec  {
     hicolor-icon-theme
   ];
 
+  dontFixup = true;
   dontDropIconThemeCache = true;
 
   installPhase = ''
@@ -31,6 +32,8 @@ stdenvNoCC.mkDerivation rec  {
     for theme in $out/share/icons/*; do
       gtk-update-icon-cache $theme
     done
+    symlinkParentIconThemes
+    recordPropagatedDependencies
   '';
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/data/icons/google-cursor/default.nix b/nixpkgs/pkgs/data/icons/google-cursor/default.nix
index c3fb5aad29a3..0000d55ab0b5 100644
--- a/nixpkgs/pkgs/data/icons/google-cursor/default.nix
+++ b/nixpkgs/pkgs/data/icons/google-cursor/default.nix
@@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = with lib; {
-    description = "An opensource cursor theme inspired by Google";
+    description = "Opensource cursor theme inspired by Google";
     homepage = "https://github.com/ful1e5/Google_Cursor";
     license = licenses.gpl3Plus;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/icons/hackneyed/default.nix b/nixpkgs/pkgs/data/icons/hackneyed/default.nix
index e26a32b159ec..e1934337e0a3 100644
--- a/nixpkgs/pkgs/data/icons/hackneyed/default.nix
+++ b/nixpkgs/pkgs/data/icons/hackneyed/default.nix
@@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://gitlab.com/Enthymeme/hackneyed-x11-cursors";
-    description = "A scalable cursor theme that resembles Windows 3.x/NT 3.x cursors";
+    description = "Scalable cursor theme that resembles Windows 3.x/NT 3.x cursors";
     platforms = platforms.all;
     license = licenses.mit;
     maintainers = with maintainers; [ somasis ];
diff --git a/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix
index 6ff07f749e54..15132fac785e 100644
--- a/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix
@@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation rec  {
   };
 
   meta = with lib; {
-    description = "An SVG icon theme in four variants";
+    description = "SVG icon theme in four variants";
     homepage = "https://github.com/bikass/kora";
     license = with licenses; [ gpl3Only ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/data/icons/phinger-cursors/default.nix b/nixpkgs/pkgs/data/icons/phinger-cursors/default.nix
index 26b729b268c9..8baec5add035 100644
--- a/nixpkgs/pkgs/data/icons/phinger-cursors/default.nix
+++ b/nixpkgs/pkgs/data/icons/phinger-cursors/default.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "The most over-engineered cursor theme";
+    description = "Most over-engineered cursor theme";
     homepage = "https://github.com/phisch/phinger-cursors";
     platforms = platforms.unix;
     license = licenses.cc-by-sa-40;
diff --git a/nixpkgs/pkgs/data/icons/quintom-cursor-theme/default.nix b/nixpkgs/pkgs/data/icons/quintom-cursor-theme/default.nix
index 645b2ac54734..3267d619b7a5 100644
--- a/nixpkgs/pkgs/data/icons/quintom-cursor-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/quintom-cursor-theme/default.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "A cursor theme designed to look decent";
+    description = "Cursor theme designed to look decent";
     homepage = "https://gitlab.com/Burning_Cube/quintom-cursor-theme";
     platforms = platforms.unix;
     license = with licenses; [ cc-by-sa-40 gpl3Only ];
diff --git a/nixpkgs/pkgs/data/icons/reversal-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/reversal-icon-theme/default.nix
index b636bba4a301..a9e4dcba89b9 100644
--- a/nixpkgs/pkgs/data/icons/reversal-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/reversal-icon-theme/default.nix
@@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation rec {
   passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
-    description = "A colorful Design Rectangle icon theme";
+    description = "Colorful Design Rectangle icon theme";
     homepage = "https://github.com/yeyushengfan258/Reversal-icon-theme";
     license = licenses.gpl3Plus;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/icons/simp1e-cursors/default.nix b/nixpkgs/pkgs/data/icons/simp1e-cursors/default.nix
index 962f4ea2618a..6e20c13465d1 100644
--- a/nixpkgs/pkgs/data/icons/simp1e-cursors/default.nix
+++ b/nixpkgs/pkgs/data/icons/simp1e-cursors/default.nix
@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "An aesthetic cursor theme for Linux desktops";
+    description = "Aesthetic cursor theme for Linux desktops";
     homepage = "https://gitlab.com/cursors/simp1e";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix
index a607748c7c38..cd981421396f 100644
--- a/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   postInstall = '''${gtk.out}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" '';
 
   meta = with lib; {
-    description = "A basic set of icons";
+    description = "Basic set of icons";
     homepage = "http://tango.freedesktop.org/Tango_Icon_Library";
     platforms = platforms.linux;
     license = licenses.publicDomain;
diff --git a/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix b/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix
index 026120634702..cbd9bf1f663c 100644
--- a/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix
+++ b/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = with lib; {
-    description = "The GTK icon theme for tauOS";
+    description = "GTK icon theme for tauOS";
     homepage = "https://github.com/tau-OS/tau-hydrogen";
     license = licenses.gpl3Only;
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/data/icons/tela-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/tela-icon-theme/default.nix
index d49e77fd0d2e..8b51526e1e71 100644
--- a/nixpkgs/pkgs/data/icons/tela-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/tela-icon-theme/default.nix
@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A flat colorful Design icon theme";
+    description = "Flat colorful Design icon theme";
     homepage = "https://github.com/vinceliuice/tela-icon-theme";
     changelog = "https://github.com/vinceliuice/Tela-icon-theme/releases/tag/${src.rev}";
     license = licenses.gpl3Only;
diff --git a/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix b/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix
index 6e391aa19ef0..bcfbc579da25 100644
--- a/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix
+++ b/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix
@@ -53,7 +53,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "http://jimmac.musichall.cz";
-    description = "A style neutral scalable cursor theme";
+    description = "Style neutral scalable cursor theme";
     platforms = platforms.all;
     license = licenses.cc-by-sa-30;
     maintainers = with maintainers; [ ];
diff --git a/nixpkgs/pkgs/data/icons/vimix-cursor-theme/default.nix b/nixpkgs/pkgs/data/icons/vimix-cursor-theme/default.nix
index 4d20acca83b0..a276ae1ea245 100644
--- a/nixpkgs/pkgs/data/icons/vimix-cursor-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/vimix-cursor-theme/default.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "An x-cursor theme inspired by Materia design and based on capitaine-cursors";
+    description = "X-cursor theme inspired by Materia design and based on capitaine-cursors";
     homepage = "https://github.com/vinceliuice/Vimix-cursors";
     license = licenses.gpl3Only;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/icons/vimix-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/vimix-icon-theme/default.nix
index 45ac27b49650..822b710e32b0 100644
--- a/nixpkgs/pkgs/data/icons/vimix-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/vimix-icon-theme/default.nix
@@ -60,7 +60,7 @@ stdenvNoCC.mkDerivation rec {
   passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
-    description = "A Material Design icon theme based on Paper icon theme";
+    description = "Material Design icon theme based on Paper icon theme";
     homepage = "https://github.com/vinceliuice/vimix-icon-theme";
     license = with licenses; [ cc-by-sa-40 ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/data/icons/whitesur-cursors/default.nix b/nixpkgs/pkgs/data/icons/whitesur-cursors/default.nix
index 167c2b3578b7..a6d522dadee3 100644
--- a/nixpkgs/pkgs/data/icons/whitesur-cursors/default.nix
+++ b/nixpkgs/pkgs/data/icons/whitesur-cursors/default.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = {
-    description = "An x-cursor theme inspired by macOS and based on capitaine-cursors";
+    description = "X-cursor theme inspired by macOS and based on capitaine-cursors";
     homepage = "https://github.com/vinceliuice/WhiteSur-cursors";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ tomasajt ];
diff --git a/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix
index 70f5357a89f8..588389f856ed 100644
--- a/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix
@@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: theme variants" [
 
 stdenvNoCC.mkDerivation rec {
   inherit pname;
-  version = "2024-04-22";
+  version = "2024-05-28";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    hash = "sha256-CnAnD5ky+LNcyE59O/iGeoe+1JyhtPM/XUHwU5d8FA4=";
+    hash = "sha256-60pz/ET3jorEui31Aq6I3LMTz0djwWUv7poEI0USzJw=";
   };
 
   nativeBuildInputs = [ gtk3 jdupes ];
diff --git a/nixpkgs/pkgs/data/machine-learning/mnist/default.nix b/nixpkgs/pkgs/data/machine-learning/mnist/default.nix
index b4c4d43e99ae..3df5001e70ef 100644
--- a/nixpkgs/pkgs/data/machine-learning/mnist/default.nix
+++ b/nixpkgs/pkgs/data/machine-learning/mnist/default.nix
@@ -31,7 +31,7 @@ in
     '';
     dontUnpack = true;
     meta = with lib; {
-      description = "A large database of handwritten digits";
+      description = "Large database of handwritten digits";
       longDescription = ''
         The MNIST database (Modified National Institute of Standards and
         Technology database) is a large database of handwritten digits that is
diff --git a/nixpkgs/pkgs/data/misc/cacert/default.nix b/nixpkgs/pkgs/data/misc/cacert/default.nix
index 7dc047bb1c88..b8b239e4fc58 100644
--- a/nixpkgs/pkgs/data/misc/cacert/default.nix
+++ b/nixpkgs/pkgs/data/misc/cacert/default.nix
@@ -24,7 +24,7 @@ let
   version = if nssOverride != null then nssOverride.version else srcVersion;
   meta = with lib; {
     homepage = "https://curl.haxx.se/docs/caextract.html";
-    description = "A bundle of X.509 certificates of public Certificate Authorities (CA)";
+    description = "Bundle of X.509 certificates of public Certificate Authorities (CA)";
     platforms = platforms.all;
     maintainers = with maintainers; [ fpletz lukegb ];
     license = licenses.mpl20;
diff --git a/nixpkgs/pkgs/data/misc/clash-geoip/default.nix b/nixpkgs/pkgs/data/misc/clash-geoip/default.nix
index bf43ce2a63f2..8be4f99748eb 100644
--- a/nixpkgs/pkgs/data/misc/clash-geoip/default.nix
+++ b/nixpkgs/pkgs/data/misc/clash-geoip/default.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "clash-geoip";
-  version = "20240512";
+  version = "20240612";
 
   src = fetchurl {
     url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb";
-    sha256 = "sha256-vWtiTcuTcAL6E083rHPVhqduIs6tuAOph/EdwLFXHek=";
+    sha256 = "sha256-uLXdQUrhBZC7av5MWvlVC0W8UQBWDsYhdmKwKEfOQfk=";
   };
 
   dontUnpack = true;
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
   };
 
   meta = with lib; {
-    description = "A GeoLite2 data created by MaxMind";
+    description = "GeoLite2 data created by MaxMind";
     homepage = "https://github.com/Dreamacro/maxmind-geoip";
     license = licenses.unfree;
     maintainers = [];
diff --git a/nixpkgs/pkgs/data/misc/colemak-dh/default.nix b/nixpkgs/pkgs/data/misc/colemak-dh/default.nix
index 0ce188bdc906..e37878888592 100644
--- a/nixpkgs/pkgs/data/misc/colemak-dh/default.nix
+++ b/nixpkgs/pkgs/data/misc/colemak-dh/default.nix
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://colemakmods.github.io/mod-dh";
-    description = "A Colemak mod for more comfortable typing";
+    description = "Colemak mod for more comfortable typing";
     license = licenses.publicDomain;
     platforms = platforms.linux;
     maintainers = with maintainers; [ monaaraj ];
diff --git a/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix b/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix
index 9bf3cbdf4cf3..861a00f3a63b 100644
--- a/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix
+++ b/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix
@@ -5,11 +5,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-country-lite";
-  version = "2024-05";
+  version = "2024-06";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-MFhBCnYOJOVQl+xJ4wxi10nyb5MfRHnNVlba9LV1nsY=";
+    hash = "sha256-utCjcaJ05Wo2KgEccGbvLYSGc3eW1n2S4qrgWd6rERM=";
   };
 
   dontUnpack = true;
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   passthru.mmdb = "${finalAttrs.finalPackage}/share/dbip/dbip-country-lite.mmdb";
 
   meta = with lib; {
-    description = "The free IP to Country Lite database by DB-IP";
+    description = "Free IP to Country Lite database by DB-IP";
     homepage = "https://db-ip.com/db/download/ip-to-country-lite";
     license = licenses.cc-by-40;
     maintainers = with maintainers; [ nickcao ];
diff --git a/nixpkgs/pkgs/data/misc/fedora-backgrounds/generic.nix b/nixpkgs/pkgs/data/misc/fedora-backgrounds/generic.nix
index aa6e4137f521..954328c8d49d 100644
--- a/nixpkgs/pkgs/data/misc/fedora-backgrounds/generic.nix
+++ b/nixpkgs/pkgs/data/misc/fedora-backgrounds/generic.nix
@@ -40,7 +40,7 @@ stdenvNoCC.mkDerivation {
 
   meta = with lib; {
     homepage = "https://github.com/fedoradesign/backgrounds";
-    description = "A set of default and supplemental wallpapers for Fedora";
+    description = "Set of default and supplemental wallpapers for Fedora";
     license = licenses.cc-by-sa-40;
     platforms = platforms.unix;
     maintainers = with maintainers; [ ];
diff --git a/nixpkgs/pkgs/data/misc/graphs/default.nix b/nixpkgs/pkgs/data/misc/graphs/default.nix
index 93a0d75aaf69..3244e46d580e 100644
--- a/nixpkgs/pkgs/data/misc/graphs/default.nix
+++ b/nixpkgs/pkgs/data/misc/graphs/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A database of graphs";
+    description = "Database of graphs";
     license = licenses.gpl2;
     platforms = platforms.all;
     maintainers = teams.sage.members;
diff --git a/nixpkgs/pkgs/data/misc/hackage/pin.json b/nixpkgs/pkgs/data/misc/hackage/pin.json
index fd08de133198..e263b38146cd 100644
--- a/nixpkgs/pkgs/data/misc/hackage/pin.json
+++ b/nixpkgs/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
 {
-  "commit": "88d42dc0129b0e3f4f702149a58667c66add9262",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/88d42dc0129b0e3f4f702149a58667c66add9262.tar.gz",
-  "sha256": "0imff76qbg1hsvsdds6dc2wfip0prdsa0bixd5b575jr6yjlkirh",
-  "msg": "Update from Hackage at 2024-05-15T11:29:34Z"
+  "commit": "a71af8d538cda614baa0bcb3e44600061f815d57",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a71af8d538cda614baa0bcb3e44600061f815d57.tar.gz",
+  "sha256": "0hsqzdfb89rqmplipz39x7m80czcvrmk42y05ifnqjhxn6q4v91l",
+  "msg": "Update from Hackage at 2024-05-20T16:06:03Z"
 }
diff --git a/nixpkgs/pkgs/data/misc/media-player-info/default.nix b/nixpkgs/pkgs/data/misc/media-player-info/default.nix
index 652298d1656d..74fb44415296 100644
--- a/nixpkgs/pkgs/data/misc/media-player-info/default.nix
+++ b/nixpkgs/pkgs/data/misc/media-player-info/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-udevdir=${placeholder "out"}/lib/udev" ];
 
   meta = with lib; {
-    description = "A repository of data files describing media player capabilities";
+    description = "Repository of data files describing media player capabilities";
     homepage = "https://www.freedesktop.org/wiki/Software/media-player-info/";
     license = licenses.bsd3;
     maintainers = with maintainers; [ ttuegel ];
diff --git a/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix
index 66e66e18527c..816bb25b1be4 100644
--- a/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix
+++ b/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix
@@ -1,23 +1,32 @@
-{ lib, stdenv, fetchurl, gnome, libxslt }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  gnome,
+  libxslt,
+  libxml2,
+  meson,
+  ninja,
+}:
 
 stdenv.mkDerivation rec {
   pname = "mobile-broadband-provider-info";
-  version = "20230416";
+  version = "20240407";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-4+FAqi23abKZ0d+GqJDpSKuZ1NOIMTAsRS0ft/hWiuw=";
+    hash = "sha256-ib/v8hX0v/jpw/8uwlJQ/bCA0R6b+lnG/HGYKsAcgUo=";
   };
 
   nativeBuildInputs = [
-    # fixes configure: error: xsltproc not found
-    libxslt
+    libxslt # for xsltproc
+    libxml2 # for xmllint
+    meson
+    ninja
   ];
 
   passthru = {
-    updateScript = gnome.updateScript {
-      packageName = pname;
-    };
+    updateScript = gnome.updateScript { packageName = pname; };
   };
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/data/misc/nixos-artwork/wallpapers.nix b/nixpkgs/pkgs/data/misc/nixos-artwork/wallpapers.nix
index 4d5f30e94b91..4cc128c15f15 100644
--- a/nixpkgs/pkgs/data/misc/nixos-artwork/wallpapers.nix
+++ b/nixpkgs/pkgs/data/misc/nixos-artwork/wallpapers.nix
@@ -1,7 +1,12 @@
 { lib, stdenv, fetchurl }:
 
 let
-  mkNixBackground = { name, src, description }:
+  mkNixBackground = {
+    name,
+    src,
+    description,
+    license ? lib.licenses.free
+  }:
 
   let
     pkg = stdenv.mkDerivation {
@@ -10,6 +15,8 @@ let
       dontUnpack = true;
 
       installPhase = ''
+        runHook preInstall
+
         # GNOME
         mkdir -p $out/share/backgrounds/nixos
         ln -s $src $out/share/backgrounds/nixos/${src.name}
@@ -42,6 +49,8 @@ EOF
 Name=${name}
 X-KDE-PluginInfo-Name=${name}
 _EOF
+
+        runHook postInstall
       '';
 
       passthru = {
@@ -50,9 +59,8 @@ _EOF
       };
 
       meta = with lib; {
-        inherit description;
+        inherit description license;
         homepage = "https://github.com/NixOS/nixos-artwork";
-        license = licenses.free;
         platforms = platforms.all;
       };
     };
@@ -62,24 +70,136 @@ in
 
 rec {
 
+  binary-black = mkNixBackground {
+    name = "binary-black-2024-02-15";
+    description = "Black binary wallpaper for Nix";
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/8957e93c95867faafec7f9988cedddd6837859fa/wallpapers/nix-wallpaper-binary-black.png";
+      hash = "sha256-mhSh0wz2ntH/kri3PF5ZrFykjjdQLhmlIlDDGFQIYWw=";
+    };
+    license = lib.licenses.cc-by-sa-40;
+  };
+
+  binary-blue = mkNixBackground {
+    name = "binary-blue-2024-02-15";
+    description = "Blue binary wallpaper for Nix";
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/8957e93c95867faafec7f9988cedddd6837859fa/wallpapers/nix-wallpaper-binary-blue.png";
+      hash = "sha256-oVIRSgool/CsduGingDr0FuJJIkGtfQHXYn0JBI2eho=";
+    };
+    license = lib.licenses.cc-by-sa-40;
+  };
+
+  binary-red = mkNixBackground {
+    name = "binary-red-2024-02-15";
+    description = "Red binary wallpaper for Nix";
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/8957e93c95867faafec7f9988cedddd6837859fa/wallpapers/nix-wallpaper-binary-red.png";
+      hash = "sha256-18UvtroyuAnluJ3EoLJWJAwN8T83s/ImPtsr5QTqvAA=";
+    };
+    license = lib.licenses.cc-by-sa-40;
+  };
+
+  binary-white = mkNixBackground {
+    name = "binary-white-2024-02-15";
+    description = "White binary wallpaper for Nix";
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/8957e93c95867faafec7f9988cedddd6837859fa/wallpapers/nix-wallpaper-binary-white.png";
+      hash = "sha256-imj+OmuhTNxRtE54715wWQUA7pe1f32+q3qi2V37i8U=";
+    };
+    license = lib.licenses.cc-by-sa-40;
+  };
+
+  catppuccin-frappe = mkNixBackground {
+    name = "catppuccin-frappe-2024-02-15";
+    description = "Catppuccin Frappé colorscheme wallpaper for NixOS";
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/97444e18b7fe97705e8caedd29ae05e62cb5d4b7/wallpapers/nixos-wallpaper-catppuccin-frappe.png";
+      hash = "sha256-wtBffKK9rqSJo8+7Wo8OMruRlg091vdroyUZj5mDPfI=";
+    };
+    license = lib.licenses.cc-by-sa-40;
+  };
+
+  catppuccin-latte = mkNixBackground {
+    name = "catppuccin-latte-2024-02-15";
+    description = "Catppuccin Latte colorscheme wallpaper for NixOS";
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/97444e18b7fe97705e8caedd29ae05e62cb5d4b7/wallpapers/nixos-wallpaper-catppuccin-latte.png";
+      hash = "sha256-Y6WCwmHOLBStj1D9mcU2082y1fhAFHna01ajfUHxehk=";
+    };
+    license = lib.licenses.cc-by-sa-40;
+  };
+
+  catppuccin-macchiato = mkNixBackground {
+    name = "catppuccin-macchiato-2024-02-15";
+    description = "Catppuccin Macchiato colorscheme wallpaper for NixOS";
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/97444e18b7fe97705e8caedd29ae05e62cb5d4b7/wallpapers/nixos-wallpaper-catppuccin-macchiato.png";
+      hash = "sha256-SkXrLbHvBOItJ7+8vW+6iXV+2g0f8bUJf9KcCXYOZF0=";
+    };
+    license = lib.licenses.cc-by-sa-40;
+  };
+
+  catppuccin-mocha = mkNixBackground {
+    name = "catppuccin-mocha-2024-02-15";
+    description = "Catppuccin Mochacolorscheme wallpaper for NixOS";
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/97444e18b7fe97705e8caedd29ae05e62cb5d4b7/wallpapers/nixos-wallpaper-catppuccin-mocha.png";
+      hash = "sha256-fmKFYw2gYAYFjOv4lr8IkXPtZfE1+88yKQ4vjEcax1s=";
+    };
+    license = lib.licenses.cc-by-sa-40;
+  };
+
   dracula = mkNixBackground {
     name = "dracula-2020-07-02";
     description = "Nix background based on the Dracula color palette";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/03c6c20be96c38827037d2238357f2c777ec4aa5/wallpapers/nix-wallpaper-dracula.png";
-      sha256 = "07ly21bhs6cgfl7pv4xlqzdqm44h22frwfhdqyd4gkn2jla1waab";
+      hash = "sha256-SykeFJXCzkeaxw06np0QkJCK28e0k30PdY8ZDVcQnh4=";
+    };
+    license = lib.licenses.cc-by-sa-40;
+  };
+
+  gear = mkNixBackground {
+    name = "gear-2022-04-19";
+    description = "3D wallpaper for Nix";
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/bcdd2770f5f4839fddc9b503e68db2bc3a87ca4d/wallpapers/nix-wallpaper-gear.png";
+      hash = "sha256-2sT6b49/iClTs9QuUvpmZ5gcIeXI9kebs5IqgQN1RL8=";
     };
+    license = lib.licenses.cc-by-sa-40;
   };
 
   gnome-dark = simple-dark-gray-bottom;
 
+  gradient-grey = mkNixBackground {
+    name = "gradient-grey-2018-10-20";
+    description = "Simple grey gradient background for NixOS";
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/3f7695afe75239720a32d6c38df7c9888b5ed581/wallpapers/NixOS-Gradient-grey.png";
+      hash = "sha256-Tf4Xruf608hpl7YwL4Mq9l9egBOCN+W4KFKnqrgosLE=";
+    };
+    # license not clarified
+  };
+
+  moonscape = mkNixBackground {
+    name = "moonscape-2022-04-19";
+    description = "3D wallpaper for Nix";
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/bcdd2770f5f4839fddc9b503e68db2bc3a87ca4d/wallpapers/nix-wallpaper-moonscape.png";
+      hash = "sha256-AR3W8avHzQLxMNLfD/A1efyZH+vAdTLKllEhJwBl0xc=";
+    };
+    license = lib.licenses.cc-by-sa-40;
+  };
+
   mosaic-blue = mkNixBackground {
     name = "mosaic-blue-2016-02-19";
     description = "Mosaic blue background for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-mosaic-blue.png";
-      sha256 = "1cbcssa8qi0giza0k240w5yy4yb2bhc1p1r7pw8qmziprcmwv5n5";
+      hash = "sha256-xZbNK8s3/ooRvyeHGxhcYnnifeGAiAnUjw9EjJTWbLE=";
     };
+    license = lib.licenses.cc0;
   };
 
   nineish = mkNixBackground {
@@ -87,8 +207,9 @@ rec {
     description = "Nix background inspired by simpler times";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/da01f68d21ddfdc9f1c6e520c2170871c81f1cf5/wallpapers/nix-wallpaper-nineish.png";
-      sha256 = "1mwvnmflp0z1biyyhfz7mjn7i1nna94n7jyns3na2shbfkaq7i0h";
+      hash = "sha256-EMSD1XQLaqHs0NbLY0lS1oZ4rKznO+h9XOGDS121m9c=";
     };
+    license = lib.licenses.cc-by-sa-40;
   };
 
   nineish-dark-gray = mkNixBackground {
@@ -96,8 +217,39 @@ rec {
     description = "Dark gray Nix background inspired by simpler times";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/f07707cecfd89bc1459d5dad76a3a4c5315efba1/wallpapers/nix-wallpaper-nineish-dark-gray.png";
-      sha256 = "07zl1dlxqh9dav9pibnhr2x1llywwnyphmzcdqaby7dz5js184ly";
+      hash = "sha256-nhIUtCy/Hb8UbuxXeL3l3FMausjQrnjTVi1B3GkL9B8=";
+    };
+    license = lib.licenses.cc-by-sa-40;
+  };
+
+  nineish-solarized-dark = mkNixBackground {
+    name = "nineish-dark-gray-2021-07-20";
+    description = "Solarized dark Nix background inspired by simpler times";
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/f99638d8d1a11d97a99ff7e0e1e7df58c28643ff/wallpapers/nix-wallpaper-nineish-solarized-dark.png";
+      hash = "sha256-ZBrk9izKvsY4Hzsr7YovocCbkRVgUN9i/y1B5IzOOKo=";
     };
+    license = lib.licenses.cc-by-sa-40;
+  };
+
+  nineish-solarized-light = mkNixBackground {
+    name = "nineish-dark-light-2021-07-20";
+    description = "Solarized light Nix background inspired by simpler times";
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/f99638d8d1a11d97a99ff7e0e1e7df58c28643ff/wallpapers/nix-wallpaper-nineish-solarized-light.png";
+      hash = "sha256-gb5s5ePdw7kuIL3SI8VVhOcLcHu0cHMJJ623vg1kz40=";
+    };
+    license = lib.licenses.cc-by-sa-40;
+  };
+
+  recursive = mkNixBackground {
+    name = "recursive-2022-04-19";
+    description = "3D wallpaper for Nix";
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/bcdd2770f5f4839fddc9b503e68db2bc3a87ca4d/wallpapers/nix-wallpaper-recursive.png";
+      hash = "sha256-YvFrlysNGMwJ7eMFOoz0KI8AjoPN3ao+AVOgnVZzkFE=";
+    };
+    license = lib.licenses.cc-by-sa-40;
   };
 
   simple-blue = mkNixBackground {
@@ -105,8 +257,9 @@ rec {
     description = "Simple blue background for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-blue.png";
-      sha256 = "1llr175m454aqixxwbp3kb5qml2hi1kn7ia6lm7829ny6y7xrnms";
+      hash = "sha256-utrcjzfeJoFOpUbFY2eIUNCKy5rjLt57xIoUUssJmdI=";
     };
+    license = lib.licenses.cc0;
   };
 
   simple-dark-gray = mkNixBackground {
@@ -114,26 +267,29 @@ rec {
     description = "Simple dark gray background for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-dark-gray.png";
-      sha256 = "1282cnqc5qynp0q9gdll7bgpw23yp5bhvaqpar59ibkh3iscg8i5";
+      hash = "sha256-JaLHdBxwrphKVherDVe5fgh+3zqUtpcwuNbjwrBlAok=";
     };
+    license = lib.licenses.cc0;
   };
 
   simple-dark-gray-bootloader = mkNixBackground {
     name = "simple-dark-gray-bootloader-2018-08-28";
-    description = "Simple dark gray background for NixOS, specifically bootloaders.";
+    description = "Simple dark gray background for NixOS, specifically bootloaders";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/9d1f11f652ed5ffe460b6c602fbfe2e7e9a08dff/bootloader/nix-wallpaper-simple-dark-gray_bootloader.png";
-      sha256 = "0v26kfydn7alr81f2qpgsqdiq2zk7yrwlgibx2j7k91z9h47dpj9";
+      hash = "sha256-Sd52CEw/pHmk6Cs+yrM/8wscG9bvYuECylQd27ybRmw=";
     };
+    # license not clarified
   };
 
   simple-dark-gray-bottom = mkNixBackground {
     name = "simple-dark-gray-2018-08-28";
-    description = "Simple dark gray background for NixOS, specifically bootloaders and graphical login.";
+    description = "Simple dark gray background for NixOS, specifically bootloaders and graphical login";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/783c38b22de09f6ee33aacc817470a4513392d83/wallpapers/nix-wallpaper-simple-dark-gray_bottom.png";
-      sha256 = "13hi4jwp5ga06dpdw5l03b4znwn58fdjlkqjkg824isqsxzv6k15";
+      hash = "sha256-JUyzf9dYRyLQmxJPKptDxXL7yRqAFt5uM0C9crkkEY4=";
     };
+    # license not clarified
   };
 
   simple-light-gray = mkNixBackground {
@@ -141,8 +297,9 @@ rec {
     description = "Simple light gray background for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-light-gray.png";
-      sha256 = "0i6d0xv1nzrv7na9hjrgzl3jrwn81vnprnq2pxyznlxbjcgkjnk2";
+      hash = "sha256-Ylo5H5OrU/t9vwLbfO0OyPIsB/0vS5iUPTt/G3YHzUQ=";
     };
+    license = lib.licenses.cc0;
   };
 
   simple-red = mkNixBackground {
@@ -150,8 +307,9 @@ rec {
     description = "Simple red background for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-red.png";
-      sha256 = "16drprsi3q8xbxx3bxp54yld04c4lq6jankw8ww1irg7z61a6wjs";
+      hash = "sha256-WnKjgvnn5Rg4R3xaJQ2mhBHQqCfl9jV6Xx3hEXW+uZk=";
     };
+    license = lib.licenses.cc0;
   };
 
   stripes-logo = mkNixBackground {
@@ -159,8 +317,9 @@ rec {
     description = "Stripes logo background for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes-logo.png";
-      sha256 = "0cqjkgp30428c1yy8s4418k4qz0ycr6fzcg4rdi41wkh5g1hzjnl";
+      hash = "sha256-1MoPwytw8kBiy+Sx70xmHnxMJgqEaOR9YEgQMO6bEjM=";
     };
+    license = lib.licenses.cc0;
   };
 
   stripes = mkNixBackground {
@@ -168,8 +327,29 @@ rec {
     description = "Stripes background for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes.png";
-      sha256 = "116337wv81xfg0g0bsylzzq2b7nbj6hjyh795jfc9mvzarnalwd3";
+      hash = "sha256-o3GqbFZ/18ScLOlAL6GRy54l8P/U6wUeeK4HtPkZw4Q=";
+    };
+    license = lib.licenses.cc0;
+  };
+
+  waterfall = mkNixBackground {
+    name = "waterfall-2022-04-19";
+    description = "3D wallpaper for Nix";
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/bcdd2770f5f4839fddc9b503e68db2bc3a87ca4d/wallpapers/nix-wallpaper-waterfall.png";
+      hash = "sha256-ULFNUZPU9khDG6rtkMskLe5sYpUcrJVvcFvEkpvXjMM=";
+    };
+    license = lib.licenses.cc-by-sa-40;
+  };
+
+  watersplash = mkNixBackground {
+    name = "watersplash-2022-04-19";
+    description = "3D wallpaper for Nix";
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/bcdd2770f5f4839fddc9b503e68db2bc3a87ca4d/wallpapers/nix-wallpaper-watersplash.png";
+      hash = "sha256-6Gdjzq3hTvUH7GeZmZnf+aOQruFxReUNEryAvJSgycQ=";
     };
+    license = lib.licenses.cc-by-sa-40;
   };
 
 }
diff --git a/nixpkgs/pkgs/data/misc/osinfo-db/default.nix b/nixpkgs/pkgs/data/misc/osinfo-db/default.nix
index 6689902ed56f..c8fb95c87720 100644
--- a/nixpkgs/pkgs/data/misc/osinfo-db/default.nix
+++ b/nixpkgs/pkgs/data/misc/osinfo-db/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "osinfo-db";
-  version = "20231215";
+  version = "20240523";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
-    hash = "sha256-37fFl1zk7//ZKq3QAJSg98WTtBmI/aU5kV9kWfcWRVQ=";
+    hash = "sha256-ne/y39KUskzsnw1iBC8EQ62P3GYG+L6pUePlMXCpBsU=";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/data/misc/papirus-folders/default.nix b/nixpkgs/pkgs/data/misc/papirus-folders/default.nix
index b701742a9f46..7abcd038bac0 100644
--- a/nixpkgs/pkgs/data/misc/papirus-folders/default.nix
+++ b/nixpkgs/pkgs/data/misc/papirus-folders/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A tool to change papirus icon theme color";
+    description = "Tool to change papirus icon theme color";
     mainProgram = "papirus-folders";
     longDescription = ''
       papirus-folders is a bash script that allows changing the color of
diff --git a/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix b/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix
index 6bad73e68392..9e034d68241d 100644
--- a/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix
+++ b/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "A database of common MIME types";
+    description = "Database of common MIME types";
     homepage = "http://freedesktop.org/wiki/Software/shared-mime-info";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix b/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix
index ac66df424636..134a2581bd20 100644
--- a/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix
+++ b/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix
@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "spdx-license-list-data";
-  version = "3.23";
+  version = "3.24.0";
 
   src = fetchFromGitHub {
     owner = "spdx";
     repo = "license-list-data";
     rev = "v${version}";
-    hash = "sha256-mxTEEkmLB/bh+7r2idKrP3IjT00UBlhI0HnR5bMfu+E=";
+    hash = "sha256-G7xRxHakkDphzMydxqfKEDLUp5ay2JwAtWhTTYiK+IM=";
   };
 
   # List of file formats to package.
diff --git a/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix b/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix
index c8ca0bc93957..d603364335f5 100644
--- a/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix
+++ b/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix
@@ -3,14 +3,14 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20240426060244";
+    version = "20240614093027";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-DkZcqjYwXRNlRnfwbRZL6zlkYL9kig3cZ5H6LEzakeY=";
+      hash = "sha256-IWBih6SyS9rpf6qiQmQSXKsiQeVoBMO9PfB0ZT1FV9c=";
     };
-    vendorHash = "sha256-azvMUi8eLNoNofRa2X4SKTTiMd6aOyO6H/rOiKjkpIY=";
+    vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
     meta = with lib; {
       description = "community managed domain list";
       homepage = "https://github.com/v2fly/domain-list-community";
diff --git a/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix b/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix
index 94631881fb07..f25004016795 100644
--- a/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix
+++ b/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix
@@ -1,6 +1,5 @@
 { lib
 , stdenvNoCC
-, fetchpatch
 , fetchFromGitHub
 , pkgsBuildBuild
 , jq
diff --git a/nixpkgs/pkgs/data/soundfonts/generaluser/default.nix b/nixpkgs/pkgs/data/soundfonts/generaluser/default.nix
index abe1ea4ceac6..87753d61ac0e 100644
--- a/nixpkgs/pkgs/data/soundfonts/generaluser/default.nix
+++ b/nixpkgs/pkgs/data/soundfonts/generaluser/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "a SoundFont bank featuring 259 instrument presets and 11 drum kits";
+    description = "SoundFont bank featuring 259 instrument presets and 11 drum kits";
     homepage = "https://www.schristiancollins.com/generaluser.php";
     license = licenses.generaluser;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/themes/adapta-kde/default.nix b/nixpkgs/pkgs/data/themes/adapta-kde/default.nix
index be9367106d4d..42d29f8127ed 100644
--- a/nixpkgs/pkgs/data/themes/adapta-kde/default.nix
+++ b/nixpkgs/pkgs/data/themes/adapta-kde/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = {
-    description = "A port of the Adapta theme for Plasma";
+    description = "Port of the Adapta theme for Plasma";
     homepage = "https://github.com/PapirusDevelopmentTeam/adapta-kde";
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.tadfisher ];
diff --git a/nixpkgs/pkgs/data/themes/adapta/default.nix b/nixpkgs/pkgs/data/themes/adapta/default.nix
index fc6e5b8c3553..6f32b2b727e2 100644
--- a/nixpkgs/pkgs/data/themes/adapta/default.nix
+++ b/nixpkgs/pkgs/data/themes/adapta/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "An adaptive GTK theme based on Material Design Guidelines";
+    description = "Adaptive GTK theme based on Material Design Guidelines";
     homepage = "https://github.com/adapta-project/adapta-gtk-theme";
     license = with licenses; [ gpl2 cc-by-sa-30 ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix b/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix
index b00e71a5f16c..fd73f1cf4d4d 100644
--- a/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix
+++ b/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
   };
 
   meta = with lib; {
-    description = "The theme from libadwaita ported to GTK-3";
+    description = "Theme from libadwaita ported to GTK-3";
     homepage = "https://github.com/lassekongo83/adw-gtk3";
     license = licenses.lgpl21Only;
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix b/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix
index 314ad37bc4d8..5e2f5e2592a4 100644
--- a/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix
+++ b/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with lib; {
-    description = "A style to bend Qt applications to look like they belong into GNOME Shell";
+    description = "Style to bend Qt applications to look like they belong into GNOME Shell";
     homepage = "https://github.com/FedoraQt/adwaita-qt";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ ];
diff --git a/nixpkgs/pkgs/data/themes/albatross/default.nix b/nixpkgs/pkgs/data/themes/albatross/default.nix
index b53dd553ca2d..04b06ef0684a 100644
--- a/nixpkgs/pkgs/data/themes/albatross/default.nix
+++ b/nixpkgs/pkgs/data/themes/albatross/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "A desktop Suite for Xfce";
+    description = "Desktop Suite for Xfce";
     homepage = "https://github.com/shimmerproject/Albatross";
     license = lib.licenses.gpl2;
     platforms = lib.platforms.unix;
diff --git a/nixpkgs/pkgs/data/themes/andromeda-gtk-theme/default.nix b/nixpkgs/pkgs/data/themes/andromeda-gtk-theme/default.nix
index 9372d611c57f..479a0c29b5e5 100644
--- a/nixpkgs/pkgs/data/themes/andromeda-gtk-theme/default.nix
+++ b/nixpkgs/pkgs/data/themes/andromeda-gtk-theme/default.nix
@@ -2,22 +2,22 @@
 
 stdenvNoCC.mkDerivation {
   pname = "andromeda-gtk-theme";
-  version = "0-unstable-2024-03-04";
+  version = "0-unstable-2024-06-08";
 
   srcs = [
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = "Andromeda-gtk";
-      rev = "250751a546dd0fa2e67eef86d957fbf993b61dfe";
-      hash = "sha256-exr9j/jW2P9cBhKUPQy3AtK5Vgav5vOyWInXUyVhBk0=";
+      rev = "8efb8ffef7118adf7a22d34a287594499d62b9b8";
+      hash = "sha256-AlPSD6tPNYY8iqPFS5IVOO5Zd3UqR3uS5h4l48UZ+dw=";
       name = "Andromeda";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = "Andromeda-gtk";
-      rev = "11a6194d19cb846447db048455a5e782ec830ae1";
-      hash = "sha256-Yy3mih0nyA+ahLqj2D99EKqtmWYJRsvQMkmlLfUPcqQ=";
+      rev = "b8c1a8bd0ba8d3e35dcd43f3fc3c177844b02c9c";
+      hash = "sha256-51IWJtbAHA8jNbrGbudiwqQ9SC4dpj9CTHqovNWOtc8=";
       name = "Andromeda-standard-buttons";
     })
   ];
@@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "An elegant dark theme for gnome, mate, budgie, cinnamon, xfce";
+    description = "Elegant dark theme for gnome, mate, budgie, cinnamon, xfce";
     homepage = "https://github.com/EliverLara/Andromeda-gtk";
     license = licenses.gpl3Only;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/data/themes/ant-theme/ant.nix b/nixpkgs/pkgs/data/themes/ant-theme/ant.nix
index 250b77a66e8f..2cb6961de1f7 100644
--- a/nixpkgs/pkgs/data/themes/ant-theme/ant.nix
+++ b/nixpkgs/pkgs/data/themes/ant-theme/ant.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A flat and light theme with a modern look";
+    description = "Flat and light theme with a modern look";
     homepage = "https://github.com/EliverLara/${themeName}";
     license = licenses.gpl3;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/themes/arc-kde/default.nix b/nixpkgs/pkgs/data/themes/arc-kde/default.nix
index 79467e1743ef..3e0ac2b530c1 100644
--- a/nixpkgs/pkgs/data/themes/arc-kde/default.nix
+++ b/nixpkgs/pkgs/data/themes/arc-kde/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = {
-    description = "A port of the arc theme for Plasma";
+    description = "Port of the arc theme for Plasma";
     homepage = "https://github.com/PapirusDevelopmentTeam/arc-kde";
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.nixy ];
diff --git a/nixpkgs/pkgs/data/themes/catppuccin-gtk/colloid-src-git-reset.patch b/nixpkgs/pkgs/data/themes/catppuccin-gtk/colloid-src-git-reset.patch
deleted file mode 100644
index 7ee1f4bd9b6f..000000000000
--- a/nixpkgs/pkgs/data/themes/catppuccin-gtk/colloid-src-git-reset.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/scripts/create_theme.py b/scripts/create_theme.py
-index 074dc43..7e7a8eb 100644
---- a/scripts/create_theme.py
-+++ b/scripts/create_theme.py
-@@ -34,7 +34,11 @@ def create_theme(types: List[str], accents: List[str], dest: str, link: bool = F
-             os.chdir(work_dir)
-             subprocess.call("./build.sh", shell=True) # Rebuild all scss
-             subprocess.call(install_cmd, shell=True) # Install the theme globally for you
--            subprocess.call("git reset --hard HEAD", shell=True)  # reset colloid repo to original state
-+            # subprocess.call("git reset --hard HEAD", shell=True)  # reset colloid repo to original state
-+            # recreate git reset
-+            os.chdir(repo_dir)
-+            shutil.rmtree("colloid")
-+            shutil.copytree("colloid-base", "colloid")
- 
-             try:
-                 # Rename colloid generated files as per catppuccin
diff --git a/nixpkgs/pkgs/data/themes/catppuccin-gtk/default.nix b/nixpkgs/pkgs/data/themes/catppuccin-gtk/default.nix
deleted file mode 100644
index bbe670f99ec9..000000000000
--- a/nixpkgs/pkgs/data/themes/catppuccin-gtk/default.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
-, gtk3
-, colloid-gtk-theme
-, gnome-themes-extra
-, gtk-engine-murrine
-, python3
-, sassc
-, nix-update-script
-, accents ? [ "blue" ]
-, size ? "standard"
-, tweaks ? [ ]
-, variant ? "frappe"
-}:
-let
-  validAccents = [ "blue" "flamingo" "green" "lavender" "maroon" "mauve" "peach" "pink" "red" "rosewater" "sapphire" "sky" "teal" "yellow" ];
-  validSizes = [ "standard" "compact" ];
-  validTweaks = [ "black" "rimless" "normal" "float" ];
-  validVariants = [ "latte" "frappe" "macchiato" "mocha" ];
-
-  pname = "catppuccin-gtk";
-in
-
-lib.checkListOfEnum "${pname}: theme accent" validAccents accents
-lib.checkListOfEnum "${pname}: color variant" validVariants [variant]
-lib.checkListOfEnum "${pname}: size variant" validSizes [size]
-lib.checkListOfEnum "${pname}: tweaks" validTweaks tweaks
-
-stdenvNoCC.mkDerivation rec {
-  inherit pname;
-  version = "0.7.4";
-
-  src = fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "gtk";
-    rev = "v${version}";
-    hash = "sha256-RFhahwiBTsjeRW71JkAveOHO70O6SbTZhUEvq8oMQ4Y=";
-  };
-
-  nativeBuildInputs = [ gtk3 sassc ];
-
-  patches = [
-    ./colloid-src-git-reset.patch
-  ];
-
-  buildInputs = [
-    gnome-themes-extra
-    (python3.withPackages (ps: [ ps.catppuccin ]))
-  ];
-
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
-
-  postUnpack = ''
-    rm -rf source/colloid
-    cp -r ${colloid-gtk-theme.src} source/colloid
-    chmod -R +w source/colloid
-  '';
-
-  postPatch = ''
-    patchShebangs --build colloid/install.sh colloid/build.sh
-  '';
-
-  dontConfigure = true;
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    cp -r colloid colloid-base
-    mkdir -p $out/share/themes
-    export HOME=$(mktemp -d)
-
-    python3 install.py ${variant} \
-      ${lib.optionalString (accents != []) "--accent " + builtins.toString accents} \
-      ${lib.optionalString (size != []) "--size " + size} \
-      ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \
-      --dest $out/share/themes
-
-    runHook postInstall
-  '';
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = with lib; {
-    description = "Soothing pastel theme for GTK";
-    homepage = "https://github.com/catppuccin/gtk";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ fufexan dixslyf ];
-  };
-}
diff --git a/nixpkgs/pkgs/data/themes/catppuccin-plymouth/default.nix b/nixpkgs/pkgs/data/themes/catppuccin-plymouth/default.nix
deleted file mode 100644
index 994c5ed0df2c..000000000000
--- a/nixpkgs/pkgs/data/themes/catppuccin-plymouth/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenvNoCC
-, lib
-, fetchFromGitHub
-, variant ? "macchiato"
-}:
-
-let
-  pname = "catppuccin-plymouth";
-  validVariants = [ "latte" "frappe" "macchiato" "mocha" ];
-in
-lib.checkListOfEnum "${pname}: color variant" validVariants [ variant ]
-
-stdenvNoCC.mkDerivation rec {
-  inherit pname;
-  version = "unstable-2022-12-10";
-
-  src = fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "plymouth";
-    rev = "d4105cf336599653783c34c4a2d6ca8c93f9281c";
-    hash = "sha256-quBSH8hx3gD7y1JNWAKQdTk3CmO4t1kVo4cOGbeWlNE=";
-  };
-
-  sourceRoot = "${src.name}/themes/catppuccin-${variant}";
-
-  installPhase = ''
-    runHook preInstall
-
-    sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' catppuccin-${variant}.plymouth
-    mkdir -p $out/share/plymouth/themes/catppuccin-${variant}
-    cp * $out/share/plymouth/themes/catppuccin-${variant}
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Soothing pastel theme for Plymouth";
-    homepage = "https://github.com/catppuccin/plymouth";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.spectre256 ];
-  };
-}
diff --git a/nixpkgs/pkgs/data/themes/chili-sddm/default.nix b/nixpkgs/pkgs/data/themes/chili-sddm/default.nix
index a1b26248b8db..ccbbbfba5bf5 100644
--- a/nixpkgs/pkgs/data/themes/chili-sddm/default.nix
+++ b/nixpkgs/pkgs/data/themes/chili-sddm/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
     license = licenses.gpl3;
     maintainers = with lib.maintainers; [ sents ];
     homepage = "https://github.com/MarianArlt/sddm-chili";
-    description = "The chili login theme for SDDM";
+    description = "Chili login theme for SDDM";
     longDescription = ''
       Chili is hot, just like a real chili!
       Spice up the login experience for your users, your family and yourself.
diff --git a/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix b/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix
index 60849a407d86..978500ef6a21 100644
--- a/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix
+++ b/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix
@@ -18,17 +18,17 @@ in
 lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeVariants
 lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants
 lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants
-lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "everforest" "all" "black" "rimless" "normal" "float" ] tweaks
+lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "everforest" "catppuccin" "all" "black" "rimless" "normal" "float" ] tweaks
 
 stdenvNoCC.mkDerivation rec {
   inherit pname;
-  version = "2024-05-13";
+  version = "2024-06-18";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    hash = "sha256-24U1iMByy+cFQuLUWYPBSuvJwYzwS0rCr7L6OWyMUz0=";
+    hash = "sha256-2saj/QfiYCxthGHauaSvRv9VVptlKbXoRTMYs3FWZsc=";
   };
 
   nativeBuildInputs = [
@@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A modern and clean Gtk theme";
+    description = "Modern and clean Gtk theme";
     homepage = "https://github.com/vinceliuice/Colloid-gtk-theme";
     license = licenses.gpl3Only;
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/data/themes/colloid-kde/default.nix b/nixpkgs/pkgs/data/themes/colloid-kde/default.nix
index 5393c54f7c33..4e1e05f359d7 100644
--- a/nixpkgs/pkgs/data/themes/colloid-kde/default.nix
+++ b/nixpkgs/pkgs/data/themes/colloid-kde/default.nix
@@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation rec {
   passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
-    description = "A clean and concise theme for KDE Plasma desktop";
+    description = "Clean and concise theme for KDE Plasma desktop";
     homepage = "https://github.com/vinceliuice/Colloid-kde-theme";
     license = licenses.gpl3Only;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/themes/dracula-theme/default.nix b/nixpkgs/pkgs/data/themes/dracula-theme/default.nix
index d21264f4e075..85a7d205a918 100644
--- a/nixpkgs/pkgs/data/themes/dracula-theme/default.nix
+++ b/nixpkgs/pkgs/data/themes/dracula-theme/default.nix
@@ -2,7 +2,7 @@
 
 let
   themeName = "Dracula";
-  version = "4.0.0-unstable-2024-05-12";
+  version = "4.0.0-unstable-2024-06-11";
 in
 stdenvNoCC.mkDerivation {
   pname = "dracula-theme";
@@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "dracula";
     repo = "gtk";
-    rev = "98ad13fb6efbdcbf944b3c5507de01cf94338c0c";
-    hash = "sha256-qF35jUvoDw3xMGGscET18sKqqQ0+oZJYNnSXbvy7ayM=";
+    rev = "4a5fe924a2b17f82a617f79ef661f1783cacc988";
+    hash = "sha256-azwkng3JTTBlSaisbJUdh9NlMZfDbD3OvTQP++J0oO8=";
   };
 
   propagatedUserEnvPkgs = [
diff --git a/nixpkgs/pkgs/data/themes/e17gtk/default.nix b/nixpkgs/pkgs/data/themes/e17gtk/default.nix
index b6cc44aa0d54..46a1f926402f 100644
--- a/nixpkgs/pkgs/data/themes/e17gtk/default.nix
+++ b/nixpkgs/pkgs/data/themes/e17gtk/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "An Enlightenment-like GTK theme with sharp corners";
+    description = "Enlightenment-like GTK theme with sharp corners";
     homepage = "https://github.com/tsujan/E17gtk";
     license = lib.licenses.gpl3;
     platforms = lib.platforms.unix;
diff --git a/nixpkgs/pkgs/data/themes/equilux-theme/default.nix b/nixpkgs/pkgs/data/themes/equilux-theme/default.nix
index 067c2b88a099..c4773803e41c 100644
--- a/nixpkgs/pkgs/data/themes/equilux-theme/default.nix
+++ b/nixpkgs/pkgs/data/themes/equilux-theme/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     inherit (src.meta) homepage;
-    description = "A Material Design theme for GNOME/GTK based desktop environments";
+    description = "Material Design theme for GNOME/GTK based desktop environments";
     license = licenses.gpl2;
     platforms = platforms.all;
     maintainers = [ maintainers.fpletz ];
diff --git a/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix b/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix
index 3cd6710e5b93..f0cf85783245 100644
--- a/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix
+++ b/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix
@@ -7,25 +7,25 @@
 let
   # make install will use dconf to find desktop background file uri.
   # consider adding an args to allow specify pictures manually.
-  # https://github.com/daniruiz/flat-remix-gnome/blob/20240503/Makefile#L38
+  # https://github.com/daniruiz/flat-remix-gnome/blob/20240526/Makefile#L38
   fake-dconf = writeScriptBin "dconf" "echo -n";
 in
 stdenv.mkDerivation rec {
   pname = "flat-remix-gnome";
-  version = "20240503";
+  version = "20240526";
 
   src = fetchFromGitHub {
     owner = "daniruiz";
     repo = pname;
     rev = version;
-    hash = "sha256-02hYxgq8Go++oYT8r86wA7HVXQJeUZ0JpwIu3VWfjQE=";
+    hash = "sha256-Z4ba+DB4a9cHT+r+UbsGKG46hcqbM8CZHiI36D60/aY=";
   };
 
   nativeBuildInputs = [ glib fake-dconf ];
   makeFlags = [ "PREFIX=$(out)" ];
 
   # make install will back up this file, it will fail if the file doesn't exist.
-  # https://github.com/daniruiz/flat-remix-gnome/blob/20240503/Makefile#L56
+  # https://github.com/daniruiz/flat-remix-gnome/blob/20240526/Makefile#L56
   preInstall = ''
     mkdir -p $out/share/gnome-shell/
     touch $out/share/gnome-shell/gnome-shell-theme.gresource
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "GNOME Shell theme inspired by material design.";
+    description = "GNOME Shell theme inspired by material design";
     homepage = "https://drasite.com/flat-remix-gnome";
     license = licenses.cc-by-sa-40;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/data/themes/fluent-gtk-theme/default.nix b/nixpkgs/pkgs/data/themes/fluent-gtk-theme/default.nix
deleted file mode 100644
index 9efa36aa88b7..000000000000
--- a/nixpkgs/pkgs/data/themes/fluent-gtk-theme/default.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
-, gitUpdater
-, gnome-themes-extra
-, gtk-engine-murrine
-, jdupes
-, sassc
-, themeVariants ? [] # default: blue
-, colorVariants ? [] # default: all
-, sizeVariants ? [] # default: standard
-, tweaks ? []
-}:
-
-let
-  pname = "fluent-gtk-theme";
-
-in
-lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeVariants
-lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants
-lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants
-lib.checkListOfEnum "${pname}: tweaks" [ "solid" "float" "round" "blur" "noborder" "square" ] tweaks
-
-stdenvNoCC.mkDerivation (finalAttrs: {
-  inherit pname;
-  version = "2024-04-28";
-
-  src = fetchFromGitHub {
-    owner = "vinceliuice";
-    repo = "fluent-gtk-theme";
-    rev = finalAttrs.version;
-    hash = "sha256-0zf3fHtWcrbT26jgwgsPEDDhBWErOkgXyvGwSWV8rGs=";
-  };
-
-  nativeBuildInputs = [
-    jdupes
-    sassc
-  ];
-
-  buildInputs = [
-    gnome-themes-extra
-  ];
-
-  propagatedUserEnvPkgs = [
-    gtk-engine-murrine
-  ];
-
-  postPatch = ''
-    patchShebangs install.sh
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    name= HOME="$TMPDIR" ./install.sh \
-      ${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \
-      ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \
-      ${lib.optionalString (sizeVariants != []) "--size " + builtins.toString sizeVariants} \
-      ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \
-      --icon nixos \
-      --dest $out/share/themes
-
-    jdupes --quiet --link-soft --recurse $out/share
-
-    runHook postInstall
-  '';
-
-  passthru.updateScript = gitUpdater { };
-
-  meta = {
-    description = "Fluent design gtk theme";
-    homepage = "https://github.com/vinceliuice/Fluent-gtk-theme";
-    license = lib.licenses.gpl3Only;
-    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ romildo ];
-  };
-})
diff --git a/nixpkgs/pkgs/data/themes/graphite-kde-theme/default.nix b/nixpkgs/pkgs/data/themes/graphite-kde-theme/default.nix
index d098cf6aab45..8cf3d065666f 100644
--- a/nixpkgs/pkgs/data/themes/graphite-kde-theme/default.nix
+++ b/nixpkgs/pkgs/data/themes/graphite-kde-theme/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
-    description = "A flat Design theme for KDE Plasma desktop";
+    description = "Flat Design theme for KDE Plasma desktop";
     homepage = "https://github.com/vinceliuice/Graphite-kde-theme";
     license = licenses.gpl3Only;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/themes/kde-gruvbox/default.nix b/nixpkgs/pkgs/data/themes/kde-gruvbox/default.nix
index e0f478a53cbe..3f75952f8a98 100644
--- a/nixpkgs/pkgs/data/themes/kde-gruvbox/default.nix
+++ b/nixpkgs/pkgs/data/themes/kde-gruvbox/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A suite of themes for KDE applications that match the retro gruvbox colorscheme";
+    description = "Suite of themes for KDE applications that match the retro gruvbox colorscheme";
     homepage = "https://github.com/printesoi/kde-gruvbox";
     license = licenses.mit;
     maintainers = [ maintainers.ymarkus ];
diff --git a/nixpkgs/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/nixpkgs/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
index 99c5f7fe3fe0..59ba5a80b3db 100644
--- a/nixpkgs/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
+++ b/nixpkgs/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
@@ -3,8 +3,9 @@
 , cmake
 , extra-cmake-modules
 , wrapQtAppsHook
+, qtbase
 , kwin
-, kdelibs4support
+, kcmutils
 , libepoxy
 , libxcb
 , lib
@@ -12,27 +13,22 @@
 
 stdenv.mkDerivation rec {
   pname = "kde-rounded-corners";
-  version = "0.6.5";
+  version = "0.6.6";
 
   src = fetchFromGitHub {
     owner = "matinlotfali";
     repo = "KDE-Rounded-Corners";
     rev = "v${version}";
-    hash = "sha256-g7gNFv4/ighfxYz/VXF5KvcoT6t4lT5soDLlV3oAKvc=";
+    hash = "sha256-pmUuYD0RPyF5I2p5MBErziehBrfc5MswQVvfwl4ozg8=";
   };
 
-  postConfigure = ''
-    substituteInPlace cmake_install.cmake \
-      --replace "${kdelibs4support}" "$out"
-  '';
-
   nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];
-  buildInputs = [ kwin kdelibs4support libepoxy libxcb ];
+  buildInputs = [ kcmutils kwin libepoxy libxcb qtbase ];
 
   meta = with lib; {
     description = "Rounds the corners of your windows";
     homepage = "https://github.com/matinlotfali/KDE-Rounded-Corners";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ devusb ];
   };
 }
diff --git a/nixpkgs/pkgs/data/themes/layan-gtk-theme/default.nix b/nixpkgs/pkgs/data/themes/layan-gtk-theme/default.nix
index 597734ae9aef..b72f3d2ffe8d 100644
--- a/nixpkgs/pkgs/data/themes/layan-gtk-theme/default.nix
+++ b/nixpkgs/pkgs/data/themes/layan-gtk-theme/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A flat Material Design theme for GTK 3, GTK 2 and Gnome-Shell.";
+    description = "Flat Material Design theme for GTK 3, GTK 2 and Gnome-Shell";
     homepage = "https://github.com/vinceliuice/Layan-gtk-theme";
     license = licenses.gpl3Only;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/data/themes/layan-kde/default.nix b/nixpkgs/pkgs/data/themes/layan-kde/default.nix
index 7ca55d1dc74f..a0cf318d33bd 100644
--- a/nixpkgs/pkgs/data/themes/layan-kde/default.nix
+++ b/nixpkgs/pkgs/data/themes/layan-kde/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
-    description = "A flat Design theme for KDE Plasma desktop";
+    description = "Flat Design theme for KDE Plasma desktop";
     homepage = "https://github.com/vinceliuice/Layan-kde";
     license = licenses.gpl3Only;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/themes/lightly-boehs/default.nix b/nixpkgs/pkgs/data/themes/lightly-boehs/default.nix
index c8a1b010fc22..e226fd31a3d8 100644
--- a/nixpkgs/pkgs/data/themes/lightly-boehs/default.nix
+++ b/nixpkgs/pkgs/data/themes/lightly-boehs/default.nix
@@ -33,7 +33,7 @@ mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "A fork of the Lightly breeze theme style that aims to be visually modern and minimalistic";
+    description = "Fork of the Lightly breeze theme style that aims to be visually modern and minimalistic";
     mainProgram = "lightly-settings5";
     homepage = "https://github.com/boehs/Lightly";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/data/themes/lightly-qt/default.nix b/nixpkgs/pkgs/data/themes/lightly-qt/default.nix
index 99e7e4eb59ef..cb238a3f745e 100644
--- a/nixpkgs/pkgs/data/themes/lightly-qt/default.nix
+++ b/nixpkgs/pkgs/data/themes/lightly-qt/default.nix
@@ -33,7 +33,7 @@ mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "A fork of breeze theme style that aims to be visually modern and minimalistic";
+    description = "Fork of breeze theme style that aims to be visually modern and minimalistic";
     mainProgram = "lightly-settings5";
     homepage = "https://github.com/Luwx/Lightly";
     license = licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/data/themes/matcha/default.nix b/nixpkgs/pkgs/data/themes/matcha/default.nix
index 94408f67227a..f7c7960fe86e 100644
--- a/nixpkgs/pkgs/data/themes/matcha/default.nix
+++ b/nixpkgs/pkgs/data/themes/matcha/default.nix
@@ -66,7 +66,7 @@ stdenvNoCC.mkDerivation rec {
   passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
-    description = "A stylish flat Design theme for GTK based desktop environments";
+    description = "Stylish flat Design theme for GTK based desktop environments";
     homepage = "https://vinceliuice.github.io/theme-matcha";
     license = licenses.gpl3Only;
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/data/themes/materia-kde/default.nix b/nixpkgs/pkgs/data/themes/materia-kde/default.nix
index 1a3f6dc36ef2..160c0593a07f 100644
--- a/nixpkgs/pkgs/data/themes/materia-kde/default.nix
+++ b/nixpkgs/pkgs/data/themes/materia-kde/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with lib; {
-    description = "A port of the materia theme for Plasma";
+    description = "Port of the materia theme for Plasma";
     homepage = "https://github.com/PapirusDevelopmentTeam/materia-kde";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.diffumist ];
diff --git a/nixpkgs/pkgs/data/themes/nordic/default.nix b/nixpkgs/pkgs/data/themes/nordic/default.nix
index ce17fd9ffd8d..13d352c6b3e1 100644
--- a/nixpkgs/pkgs/data/themes/nordic/default.nix
+++ b/nixpkgs/pkgs/data/themes/nordic/default.nix
@@ -10,70 +10,70 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nordic";
-  version = "2.2.0-unstable-2024-02-20";
+  version = "2.2.0-unstable-2024-05-24";
 
   srcs = [
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "58d5a8e10ae068b98a63e6de2791e289f417842d";
-      hash = "sha256-Z3e7DoakK6f+UMBr78gZ+NJPb5vuJCfDgPRYywFDYeg=";
+      rev = "2f6b72b7b6d7112bb147a5adeca307631dd698cb";
+      hash = "sha256-4GNEJTAS6EAPYyaNOZS1lGu67nobGmMOHoq8I5WaPcA=";
       name = "Nordic";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "cb7d95bd5438728f30f361a888dfb33b7f6ad28c";
-      hash = "sha256-ZWGmDiXjEt0UuALyw7cjTYgdw9kdJJKc0vkclbZkBvo=";
+      rev = "d92b503cdabb4cf263de4c3fd9afba889c65aad1";
+      hash = "sha256-foCWcKNdk9S1MijJOuw8jFV4gnDSNWmTjgSCU9GefzE=";
       name = "Nordic-standard-buttons";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "37b86a30ad3e048f87a689f2813aa28644035fa8";
-      hash = "sha256-+O8+30H6humVQTwgFL3uQkeo5gPYrokpAKbT56PX6YQ=";
+      rev = "b76c48252c9dc6171cccf63c0c412b9afe7fa89c";
+      hash = "sha256-q/duyEin377J1cxD5+uXlEbPN/S27ht2es/02wKoiEY=";
       name = "Nordic-darker";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "926b215d14394ff043f2d2969e730759af7acd86";
-      hash = "sha256-yR0DfmUW1rr38Zbwtr7TUYL6z8vTNyoj0vEhphbZieU=";
+      rev = "b8b16b451bf5fcfada98a92682a6ff97d93fc36f";
+      hash = "sha256-959P2xdpCLhNRedoakMiHXzj+H4SWX1Lb9w6yYRzGds=";
       name = "Nordic-darker-standard-buttons";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "1ae59d40ba8342fc14f3a55a2fb37446a8d10880";
-      hash = "sha256-tFIXPP5Ohw8atNIqvMtB7sLka+/tw+aSbjMdzKfI9r0=";
+      rev = "c45681eca7fce4c129063a0aae727d42b570fcfd";
+      hash = "sha256-8a4pMkyGt+WIVXLSsLKbxCP9i4RdZKX5lvwZB+BemSY=";
       name = "Nordic-bluish-accent";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "aaaa5dab0517f182a85a75d457da70d22e577b26";
-      hash = "sha256-J/nti2jxQ0VfTbp5WfrE0CN6Pvfg1edplL6/QPKUBzc=";
+      rev = "b07b6450ff2389f88ef5ad980a1ead47071b1d63";
+      hash = "sha256-+o46apK051UH6GbG/ugSgxI212MWEnYaVlDK9rWqPMU=";
       name = "Nordic-bluish-accent-standard-buttons";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = "${pname}-polar";
-      rev = "733d5ea57c6ecd8209ec0a928029e28b3f54f83d";
-      hash = "sha256-y3ge0DF0SdKFjH+mZdHDpK3YG7Ng3rN0y0Er2WBC6Sc=";
+      rev = "bc3e7554ab8e8d94e978691054b1b062696eb688";
+      hash = "sha256-tJX/oTEp/9pmzrINBWrnhS9n8JR40T1C0A4LhRLWU9A=";
       name = "Nordic-Polar";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = "${pname}-polar";
-      rev = "667dfe4f6e8157f30a4e0ea5dc1d17438520d6cf";
-      hash = "sha256-p7bY1r8Ik+jsIyjR75UFHw8XuiGz5LmT09txBLyZpx4=";
+      rev = "26b44080c2dbd1a9b576a24d1b14ae01b98519d0";
+      hash = "sha256-5gGiBL7ZKFSPZtnikfrdvrWKG9RkIHdPyWdHYnmSTvg=";
       name = "Nordic-Polar-standard-buttons";
     })
   ];
diff --git a/nixpkgs/pkgs/data/themes/orchis-theme/default.nix b/nixpkgs/pkgs/data/themes/orchis-theme/default.nix
index e1dd0a256594..e093eed71325 100644
--- a/nixpkgs/pkgs/data/themes/orchis-theme/default.nix
+++ b/nixpkgs/pkgs/data/themes/orchis-theme/default.nix
@@ -26,13 +26,13 @@ lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks
 stdenvNoCC.mkDerivation
 rec {
   inherit pname;
-  version = "2024-05-01";
+  version = "2024-05-30";
 
   src = fetchFromGitHub {
     repo = "Orchis-theme";
     owner = "vinceliuice";
     rev = version;
-    hash = "sha256-xi4kYT566bQqQEY4CByTrpwMfC1uhzeIqpprpe59oIM=";
+    hash = "sha256-Dpdt7acRodtR4EE4STIiYHidehZwFGoYS8Oh6DgpXOI=";
   };
 
   nativeBuildInputs = [ gtk3 sassc ];
@@ -58,7 +58,7 @@ rec {
   '';
 
   meta = with lib; {
-    description = "A Material Design theme for GNOME/GTK based desktop environments.";
+    description = "Material Design theme for GNOME/GTK based desktop environments";
     homepage = "https://github.com/vinceliuice/Orchis-theme";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/data/themes/paper-gtk/default.nix b/nixpkgs/pkgs/data/themes/paper-gtk/default.nix
index e7c9179678f0..828528430381 100644
--- a/nixpkgs/pkgs/data/themes/paper-gtk/default.nix
+++ b/nixpkgs/pkgs/data/themes/paper-gtk/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   preferLocalBuild = true;
 
   meta = with lib; {
-    description = "A modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth";
+    description = "Modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth";
     homepage = "https://snwh.org/paper";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/data/themes/pitch-black/default.nix b/nixpkgs/pkgs/data/themes/pitch-black/default.nix
index 95037f90239e..092208f4f417 100644
--- a/nixpkgs/pkgs/data/themes/pitch-black/default.nix
+++ b/nixpkgs/pkgs/data/themes/pitch-black/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec{
   '';
 
   meta = with lib; {
-    description = "A dark plasma theme built with usability in mind";
+    description = "Dark plasma theme built with usability in mind";
     homepage = "https://github.com/freefreeno/Pitch-Black";
     license = licenses.gpl3Only;
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/data/themes/plata/default.nix b/nixpkgs/pkgs/data/themes/plata/default.nix
index 0e7d88a7883c..0400ba5b3c35 100644
--- a/nixpkgs/pkgs/data/themes/plata/default.nix
+++ b/nixpkgs/pkgs/data/themes/plata/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A GTK theme based on Material Design Refresh";
+    description = "GTK theme based on Material Design Refresh";
     homepage = "https://gitlab.com/tista500/plata-theme";
     license = with licenses; [ gpl2 cc-by-sa-40 ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/data/themes/qogir-kde/default.nix b/nixpkgs/pkgs/data/themes/qogir-kde/default.nix
index 1dd3deba8dff..b3f914ae975b 100644
--- a/nixpkgs/pkgs/data/themes/qogir-kde/default.nix
+++ b/nixpkgs/pkgs/data/themes/qogir-kde/default.nix
@@ -53,7 +53,7 @@ stdenvNoCC.mkDerivation rec {
   passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
-    description = "A flat Design theme for KDE Plasma desktop";
+    description = "Flat Design theme for KDE Plasma desktop";
     homepage = "https://github.com/vinceliuice/Qogir-kde";
     license = licenses.gpl3Only;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/themes/qogir/default.nix b/nixpkgs/pkgs/data/themes/qogir/default.nix
index e435ce549450..223e077bfe47 100644
--- a/nixpkgs/pkgs/data/themes/qogir/default.nix
+++ b/nixpkgs/pkgs/data/themes/qogir/default.nix
@@ -24,13 +24,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "image" "square" "round" ] tweaks
 
 stdenv.mkDerivation rec {
   inherit pname;
-  version = "2023-05-24";
+  version = "2024-05-22";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "L19pbmJJFr1xi4ZTp0ocxmdMvWmtkK2zquOFfbV+P5Q=";
+    sha256 = "Q9DWBzaLZjwXsYRa/oDIrccypO3TCbSRXTkbXWRmm70=";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/data/themes/sierra/default.nix b/nixpkgs/pkgs/data/themes/sierra/default.nix
index e87f64661419..41c27b2482b9 100644
--- a/nixpkgs/pkgs/data/themes/sierra/default.nix
+++ b/nixpkgs/pkgs/data/themes/sierra/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "A Mac OSX like theme for GTK based desktop environments";
+    description = "Mac OSX like theme for GTK based desktop environments";
     homepage = "https://github.com/vinceliuice/Sierra-gtk-theme";
     license = licenses.gpl3;
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/data/themes/sweet-nova/default.nix b/nixpkgs/pkgs/data/themes/sweet-nova/default.nix
index 22a16fa9284d..15d393bcab76 100644
--- a/nixpkgs/pkgs/data/themes/sweet-nova/default.nix
+++ b/nixpkgs/pkgs/data/themes/sweet-nova/default.nix
@@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation {
   passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
-    description = "A dark and colorful, blurry theme for the KDE Plasma desktop";
+    description = "Dark and colorful, blurry theme for the KDE Plasma desktop";
     homepage = "https://github.com/EliverLara/Sweet";
     license = licenses.gpl3Only;
     maintainers = [ maintainers.dr460nf1r3 ];
diff --git a/nixpkgs/pkgs/data/themes/tokyonight-gtk-theme/generic.nix b/nixpkgs/pkgs/data/themes/tokyonight-gtk-theme/generic.nix
index e575d13c436b..1adbf674a586 100644
--- a/nixpkgs/pkgs/data/themes/tokyonight-gtk-theme/generic.nix
+++ b/nixpkgs/pkgs/data/themes/tokyonight-gtk-theme/generic.nix
@@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   };
 
   meta = with lib; {
-    description = "A GTK theme based on the Tokyo Night colour palette";
+    description = "GTK theme based on the Tokyo Night colour palette";
     homepage = "https://www.pling.com/p/1681315";
     license = licenses.gpl3Only;
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/data/themes/ubuntu-themes/default.nix b/nixpkgs/pkgs/data/themes/ubuntu-themes/default.nix
index fb23141a64eb..ea6a9abcb779 100644
--- a/nixpkgs/pkgs/data/themes/ubuntu-themes/default.nix
+++ b/nixpkgs/pkgs/data/themes/ubuntu-themes/default.nix
@@ -1,6 +1,5 @@
 { lib, stdenv
 , fetchurl
-, fetchpatch
 , gnome-icon-theme
 , gnome
 , gtk-engine-murrine
diff --git a/nixpkgs/pkgs/data/themes/utterly-nord-plasma/default.nix b/nixpkgs/pkgs/data/themes/utterly-nord-plasma/default.nix
index 4fbb0f5b8a83..c35f919aedd4 100644
--- a/nixpkgs/pkgs/data/themes/utterly-nord-plasma/default.nix
+++ b/nixpkgs/pkgs/data/themes/utterly-nord-plasma/default.nix
@@ -3,27 +3,27 @@
 , fetchFromGitHub
 , breeze-icons
 , kdeclarative
-, kirigami2
+, kirigami
 , plasma-framework
 , plasma-workspace
 }:
 
 stdenv.mkDerivation rec {
   pname = "utterly-nord-plasma";
-  version = "2.1";
+  version = "3.2";
 
   src = fetchFromGitHub {
     owner = "HimDek";
     repo = pname;
-    rev = "6d9ffe008f0bee47c8346c9a7ec71f206d999fd0";
-    hash = "sha256-B5pIwV0BHxDluKWKTy+xuBPaE3N6UOHXip1SIAm2kM8=";
+    rev = "e513b4dfeddd587a34bfdd9ba6b1d1eac8ecadf5";
+    hash = "sha256-moLgBFR+BgoiEBzV3y/LA6JZfLHrG1weL1+h8LN9ztA=";
   };
 
   propagatedUserEnvPkgs = [
     breeze-icons
-    kdeclarative.bin
-    kirigami2
-    plasma-framework.bin
+    kdeclarative
+    kirigami
+    plasma-framework
     plasma-workspace
   ];
 
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/{color-schemes,Kvantum,plasma/look-and-feel,sddm/themes,wallpapers,konsole}
 
     cp -a look-and-feel $out/share/plasma/look-and-feel/Utterly-Nord
-    cp -a look-and-feel-solid $out/share/plasma/look-and-feel/Utterly-Nord-solid
-    cp -a look-and-feel-light $out/share/plasma/look-and-feel/Utterly-Nord-light
-    cp -a look-and-feel-light-solid $out/share/plasma/look-and-feel/Utterly-Nord-light-solid
+    cp -a look-and-feel-solid $out/share/plasma/look-and-feel/Utterly-Nord-Solid
+    cp -a look-and-feel-light $out/share/plasma/look-and-feel/Utterly-Nord-Light
+    cp -a look-and-feel-light-solid $out/share/plasma/look-and-feel/Utterly-Nord-Light-Solid
 
     cp -a *.colors $out/share/color-schemes/
 
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A Plasma theme with Nordic Colors, transparency, blur and round edges for UI elements";
+    description = "Plasma theme with Nordic Colors, transparency, blur and round edges for UI elements";
     homepage = "https://himdek.com/Utterly-Nord-Plasma/";
     license = licenses.gpl2Plus;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/themes/utterly-round-plasma-style/default.nix b/nixpkgs/pkgs/data/themes/utterly-round-plasma-style/default.nix
index 40bdb2f71d88..7510183b10f3 100644
--- a/nixpkgs/pkgs/data/themes/utterly-round-plasma-style/default.nix
+++ b/nixpkgs/pkgs/data/themes/utterly-round-plasma-style/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "HimDek";
     repo = pname;
-    rev = "c3677d5223286f69871f6745cdb3b71367229d40";
-    hash = "sha256-mlqRMz0cAZnnM4xE6p7fMzhGlqCQcM4FxmDlVnbGUgQ=";
+    rev = "6280f69781b7fa9613b7a9c502d8d61e11fefca5";
+    hash = "sha256-b0vah/rkcJH01bnDOGXQ04vrRR1c1Ijgc2HPBmToLuc=";
   };
 
   installPhase = ''
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A rounded desktop theme and window borders for Plasma 5 that follows any color scheme";
+    description = "Rounded desktop theme and window borders for Plasma 5 that follows any color scheme";
     homepage = "https://himdek.com/Utterly-Round-Plasma-Style/";
     license = licenses.gpl2Plus;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/themes/whitesur-kde/default.nix b/nixpkgs/pkgs/data/themes/whitesur-kde/default.nix
index 20dc5a66fe5e..16e4cc79b478 100644
--- a/nixpkgs/pkgs/data/themes/whitesur-kde/default.nix
+++ b/nixpkgs/pkgs/data/themes/whitesur-kde/default.nix
@@ -54,7 +54,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
-    description = "A MacOS big sur like theme for KDE Plasma desktop";
+    description = "MacOS big sur like theme for KDE Plasma desktop";
     homepage = "https://github.com/vinceliuice/WhiteSur-kde";
     license = licenses.gpl3Only;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/themes/yaru/default.nix b/nixpkgs/pkgs/data/themes/yaru/default.nix
index d22064014eba..c49a35e85dab 100644
--- a/nixpkgs/pkgs/data/themes/yaru/default.nix
+++ b/nixpkgs/pkgs/data/themes/yaru/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "yaru";
-  version = "24.04.2";
+  version = "24.04.3";
 
   src = fetchFromGitHub {
     owner = "ubuntu";
     repo = "yaru";
     rev = version;
-    hash = "sha256-nvNJ0ppx3oete+CsklJtpDOLyUA0Oj/oUmcLjsR54MU=";
+    hash = "sha256-Z0qW3hW5Sije5Hn6OB9f5M6xnmMmRnP76p0kjiQZznw=";
   };
 
   nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
author	Alyssa Ross <hi@alyssa.is>	2024-06-23 00:32:22 +0200
committer	Alyssa Ross <hi@alyssa.is>	2024-06-23 00:32:22 +0200
commit	6402b188ddd100b3cd6afe7b8a3e553365203f43 (patch)
tree	676b85e4a6ffee092e413e723f7dce8ba01bb48f /nixpkgs/pkgs/data
parent	5a1826585861b32ce2509c0643e793196d81893e (diff)
parent	d603719ec6e294f034936c0d0dc06f689d91b6c3 (diff)
download	nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.tar nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.tar.gz nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.tar.bz2 nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.tar.lz nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.tar.xz nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.tar.zst nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.zip