Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
	pkgs/applications/blockchains/polkadot/default.nix

29 files changed, 29 insertions, 29 deletions

diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix
index 6fb9aea3bfeb1..28fffb24bcf38 100644
--- a/pkgs/misc/arm-trusted-firmware/default.nix
+++ b/pkgs/misc/arm-trusted-firmware/default.nix
@@ -79,7 +79,7 @@ let
 
     meta = with lib; {
       homepage = "https://github.com/ARM-software/arm-trusted-firmware";
-      description = "A reference implementation of secure world software for ARMv8-A";
+      description = "Reference implementation of secure world software for ARMv8-A";
       license = [ licenses.bsd3 ] ++ lib.optionals (!deleteHDCPBlobBeforeBuild) [ licenses.unfreeRedistributable ];
       maintainers = with maintainers; [ lopsided98 ];
     } // extraMeta;
diff --git a/pkgs/misc/barebox/default.nix b/pkgs/misc/barebox/default.nix
index cb77a607e0160..4b1e373ca69d3 100644
--- a/pkgs/misc/barebox/default.nix
+++ b/pkgs/misc/barebox/default.nix
@@ -72,7 +72,7 @@ let
 
     meta = with lib; {
       homepage = "https://www.barebox.org";
-      description = "The Swiss Army Knive for bare metal";
+      description = "Swiss Army Knive for bare metal";
       license = licenses.gpl2;
       maintainers = with maintainers; [ emantor ];
     } // extraMeta;
diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix
index 180b53e1e7686..a11b4ca38ad4d 100644
--- a/pkgs/misc/beep/default.nix
+++ b/pkgs/misc/beep/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "fortify3" ];
 
   meta = with lib; {
-    description = "The advanced PC speaker beeper";
+    description = "Advanced PC speaker beeper";
     homepage = "https://github.com/spkr-beep/beep";
     license = licenses.gpl2Only;
     platforms = platforms.linux;
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 8fae49e38ff54..3fc4ab361e3ea 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -145,7 +145,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://openprinting.github.io/cups/";
-    description = "A standards-based printing system for UNIX";
+    description = "Standards-based printing system for UNIX";
     license = licenses.asl20;
     maintainers = with maintainers; [ matthewbauer ];
     platforms = platforms.unix;
diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix
index 1f95c8cdd0317..cce75b26d71e8 100644
--- a/pkgs/misc/cups/drivers/brlaser/default.nix
+++ b/pkgs/misc/cups/drivers/brlaser/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DCUPS_SERVER_BIN=lib/cups" "-DCUPS_DATA_DIR=share/cups" ];
 
   meta = with lib; {
-    description = "A CUPS driver for Brother laser printers";
+    description = "CUPS driver for Brother laser printers";
     longDescription =
       ''
        Although most Brother printers support a standard printer language such as PCL or PostScript, not all do. If you have a monochrome Brother laser printer (or multi-function device) and the other open source drivers don't work, this one might help.
diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
index 8520ba7aff2e3..f5ec8e29b634b 100644
--- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
@@ -130,7 +130,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "Canon InkJet printer drivers for many Pixma series printers.";
+    description = "Canon InkJet printer drivers for many Pixma series printers";
     longDescription = ''
       Canon InjKet printer drivers for series E200, E300, E3100, E3300, E4200, E450, E470, E480,
       G3000, G3010, G4000, G4010, G5000, G5080, G6000, G6050, G6080, G7000, G7050, G7080, GM2000,
diff --git a/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix b/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix
index a26216cbc7273..7eb957af643fd 100644
--- a/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix
+++ b/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   passthru.tests.vmtest = nixosTests.cups-pdf;
 
   meta = with lib; {
-    description = "A CUPS backend that turns print jobs into searchable PDF files";
+    description = "CUPS backend that turns print jobs into searchable PDF files";
     homepage = "https://github.com/alexivkin/CUPS-PDF-to-PDF";
     license = licenses.gpl2Only;
     maintainers = [ maintainers.yarny ];
diff --git a/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix
index 26e90cbf6bba4..8ebcccbaa2819 100644
--- a/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = with lib; {
-    description = "Brother MFC-5890CN CUPS wrapper driver.";
+    description = "Brother MFC-5890CN CUPS wrapper driver";
     longDescription = "Brother MFC-5890CN CUPS wrapper driver. Use the connection string 'lpd://\${IP_ADDRESS}/binary_p1' when connecting to this printer via the network.";
     homepage = "http://www.brother.com/";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/misc/drivers/argononed/default.nix b/pkgs/misc/drivers/argononed/default.nix
index 5fa28c17c529a..48b5800abb028 100644
--- a/pkgs/misc/drivers/argononed/default.nix
+++ b/pkgs/misc/drivers/argononed/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://gitlab.com/DarkElvenAngel/argononed";
-    description = "A replacement daemon for the Argon One Raspberry Pi case";
+    description = "Replacement daemon for the Argon One Raspberry Pi case";
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = [ maintainers.misterio77 ];
diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix
index 7d9f8a406290d..e7bfbe34ee7f3 100644
--- a/pkgs/misc/drivers/m33-linux/default.nix
+++ b/pkgs/misc/drivers/m33-linux/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     homepage = "https://github.com/donovan6000/M3D-Linux";
-    description = "A Linux program that can communicate with the Micro 3D printer";
+    description = "Linux program that can communicate with the Micro 3D printer";
     mainProgram = "m33-linux";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix
index 50d1133c38201..cd2563779d6fe 100644
--- a/pkgs/misc/drivers/steamcontroller/default.nix
+++ b/pkgs/misc/drivers/steamcontroller/default.nix
@@ -25,7 +25,7 @@ buildPythonApplication {
   pythonImportsCheck = [ "steamcontroller" ];
 
   meta = with lib; {
-    description = "A standalone Steam controller driver";
+    description = "Standalone Steam controller driver";
     homepage    = "https://github.com/ynsta/steamcontroller";
     license     = licenses.mit;
     maintainers = with maintainers; [ rnhmjoj ];
diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix
index e310879eb950d..7f90ceee29153 100644
--- a/pkgs/misc/frescobaldi/default.nix
+++ b/pkgs/misc/frescobaldi/default.nix
@@ -40,7 +40,7 @@ buildPythonApplication rec {
 
   meta = with lib; {
     homepage = "https://frescobaldi.org/";
-    description = "A LilyPond sheet music text editor";
+    description = "LilyPond sheet music text editor";
     longDescription = ''
       Powerful text editor with syntax highlighting and automatic completion,
       Music view with advanced Point & Click, Midi player to proof-listen
diff --git a/pkgs/misc/gnuk/generic.nix b/pkgs/misc/gnuk/generic.nix
index 2556ff42308f6..e9cc3aff2cf6f 100644
--- a/pkgs/misc/gnuk/generic.nix
+++ b/pkgs/misc/gnuk/generic.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     homepage = "https://www.fsij.org/doc-gnuk/";
-    description = "An implementation of USB cryptographic token for gpg";
+    description = "Implementation of USB cryptographic token for gpg";
     license = licenses.gpl3;
     platforms = with platforms; linux;
   };
diff --git a/pkgs/misc/i3a/default.nix b/pkgs/misc/i3a/default.nix
index 5c549bc7f16ae..853b758793c1b 100644
--- a/pkgs/misc/i3a/default.nix
+++ b/pkgs/misc/i3a/default.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = with lib; {
     changelog = "https://git.goral.net.pl/i3a.git/log/";
-    description = "A set of scripts used for automation of i3 and sway window manager layouts";
+    description = "Set of scripts used for automation of i3 and sway window manager layouts";
     homepage = "https://git.goral.net.pl/i3a.git/about";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ moni ];
diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/misc/libcardiacarrest/default.nix
index 4139c5b0f13eb..b5cfa1216eee2 100644
--- a/pkgs/misc/libcardiacarrest/default.nix
+++ b/pkgs/misc/libcardiacarrest/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = src.meta // {
-    description = "A trivial implementation of libpulse PulseAudio library API";
+    description = "Trivial implementation of libpulse PulseAudio library API";
     longDescription = ''
       libcardiacarrest is a trivial implementation of libpulse
       PulseAudio library API that unconditionally (but gracefully)
diff --git a/pkgs/misc/logging/pacemaker/default.nix b/pkgs/misc/logging/pacemaker/default.nix
index a3d365cd41709..2c3fd76b1dfd2 100644
--- a/pkgs/misc/logging/pacemaker/default.nix
+++ b/pkgs/misc/logging/pacemaker/default.nix
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://clusterlabs.org/pacemaker/";
-    description = "Pacemaker is an open source, high availability resource manager suitable for both small and large clusters.";
+    description = "Pacemaker is an open source, high availability resource manager suitable for both small and large clusters";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ ryantm astro ];
diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/misc/long-shebang/default.nix
index 34ad0350771f8..a1d0405186f43 100644
--- a/pkgs/misc/long-shebang/default.nix
+++ b/pkgs/misc/long-shebang/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation {
   };
 
   meta = {
-    description = "A tool for #! scripts with more than one argument";
+    description = "Tool for #! scripts with more than one argument";
 
     homepage = "https://github.com/shlevy/long-shebang";
 
diff --git a/pkgs/misc/lssecret/default.nix b/pkgs/misc/lssecret/default.nix
index 2e5169974fc17..000498acf23af 100644
--- a/pkgs/misc/lssecret/default.nix
+++ b/pkgs/misc/lssecret/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   makeFlags = ["DESTDIR=$(out)"];
 
   meta = {
-    description = "A tool to list passwords and other secrets stored using the org.freedesktop.secrets dbus api";
+    description = "Tool to list passwords and other secrets stored using the org.freedesktop.secrets dbus api";
     homepage = "https://gitlab.com/GrantMoyer/lssecret";
     license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ genericnerdyusername ];
diff --git a/pkgs/misc/present/default.nix b/pkgs/misc/present/default.nix
index 6ed15f03e6e4f..a27b6abe4359b 100644
--- a/pkgs/misc/present/default.nix
+++ b/pkgs/misc/present/default.nix
@@ -23,7 +23,7 @@ python3Packages.buildPythonPackage rec {
   doCheck = false;
 
   meta = with lib; {
-    description = "A terminal-based presentation tool with colors and effects.";
+    description = "Terminal-based presentation tool with colors and effects";
     homepage = "https://github.com/vinayak-mehta/present";
     license = licenses.asl20;
     maintainers = with maintainers; [ lom ];
diff --git a/pkgs/misc/rkdeveloptool-pine64/default.nix b/pkgs/misc/rkdeveloptool-pine64/default.nix
index b70298ded96a3..fbb1a2b725a57 100644
--- a/pkgs/misc/rkdeveloptool-pine64/default.nix
+++ b/pkgs/misc/rkdeveloptool-pine64/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     in
     {
       homepage = "https://gitlab.com/pine64-org/quartz-bsp/rkdeveloptool/";
-      description = "A tool from Rockchip to communicate with Rockusb devices (pine64 fork)";
+      description = "Tool from Rockchip to communicate with Rockusb devices (pine64 fork)";
       license = lib.licenses.gpl2;
       maintainers = [ maintainers.adisbladis ];
       mainProgram = "rkdeveloptool";
diff --git a/pkgs/misc/rkdeveloptool/default.nix b/pkgs/misc/rkdeveloptool/default.nix
index 341232e8cf191..3b6a85764bfa3 100644
--- a/pkgs/misc/rkdeveloptool/default.nix
+++ b/pkgs/misc/rkdeveloptool/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     homepage = "https://github.com/rockchip-linux/rkdeveloptool";
-    description = "A tool from Rockchip to communicate with Rockusb devices";
+    description = "Tool from Rockchip to communicate with Rockusb devices";
     license = licenses.gpl2;
     maintainers = [ maintainers.lopsided98 ];
     mainProgram = "rkdeveloptool";
diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix
index 734f3f515d03d..f1ba5eb0f1e27 100644
--- a/pkgs/misc/screensavers/light-locker/default.nix
+++ b/pkgs/misc/screensavers/light-locker/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/the-cavalry/light-locker";
-    description = "A simple session-locker for LightDM";
+    description = "Simple session-locker for LightDM";
     longDescription = ''
       A simple locker (forked from gnome-screensaver) that aims to
       have simple, sane, secure defaults and be well integrated with
diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix
index dbe5e724835c7..caae1a4ba2c01 100644
--- a/pkgs/misc/screensavers/physlock/default.nix
+++ b/pkgs/misc/screensavers/physlock/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" "SESSION=systemd" ];
 
   meta = with lib; {
-    description = "A secure suspend/hibernate-friendly alternative to `vlock -an`";
+    description = "Secure suspend/hibernate-friendly alternative to `vlock -an`";
     mainProgram = "physlock";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/misc/screensavers/pipes-rs/default.nix b/pkgs/misc/screensavers/pipes-rs/default.nix
index 858b634739458..d1ca26da47587 100644
--- a/pkgs/misc/screensavers/pipes-rs/default.nix
+++ b/pkgs/misc/screensavers/pipes-rs/default.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = with lib; {
-    description = "An over-engineered rewrite of pipes.sh in Rust";
+    description = "Over-engineered rewrite of pipes.sh in Rust";
     mainProgram = "pipes-rs";
     homepage = "https://github.com/lhvy/pipes-rs";
     license = licenses.blueOak100;
diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index e3150928373e8..b29c717e591dd 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -207,7 +207,7 @@ in rec {
     };
     meta = with lib; {
       homepage = "https://draculatheme.com/tmux";
-      description = "A feature packed Dracula theme for tmux!";
+      description = "Feature packed Dracula theme for tmux!";
       license = licenses.mit;
       platforms = platforms.unix;
       maintainers = with maintainers; [ ethancedwards8 ];
diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix
index 48ec7839d3e1a..797f515c1a7c9 100644
--- a/pkgs/misc/tpm2-pkcs11/default.nix
+++ b/pkgs/misc/tpm2-pkcs11/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A PKCS#11 interface for TPM2 hardware";
+    description = "PKCS#11 interface for TPM2 hardware";
     homepage = "https://github.com/tpm2-software/tpm2-pkcs11";
     license = licenses.bsd2;
     platforms = platforms.linux;
diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix
index a4c9a7d92fb49..99ebe5a8be0f6 100644
--- a/pkgs/misc/uq/default.nix
+++ b/pkgs/misc/uq/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "1p6008vxm2pi9v31qhsq7zysanal6rcvcl8553373bkqlfd7w5c4";
 
   meta = with lib; {
-    description = "A simple, user-friendly alternative to sort | uniq";
+    description = "Simple, user-friendly alternative to sort | uniq";
     homepage = "https://github.com/lostutils/uq";
     license = licenses.mit;
     maintainers = with maintainers; [ doronbehar matthiasbeyer ];
diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix
index d601d41347039..611d9ec622d16 100644
--- a/pkgs/misc/urbit/default.nix
+++ b/pkgs/misc/urbit/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://urbit.org";
-    description = "An operating function";
+    description = "Operating function";
     platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
     maintainers = [ maintainers.matthew-levan ];
     license = licenses.mit;
diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix
index e3c6a4f2bb10a..55c2638dba5c1 100644
--- a/pkgs/misc/wiki-tui/default.nix
+++ b/pkgs/misc/wiki-tui/default.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-rKTR7vKt8woWAn7XgNYFiWu4KSiZYhaH+PLEIOfbNIY=";
 
   meta = with lib; {
-    description = "A simple and easy to use Wikipedia Text User Interface";
+    description = "Simple and easy to use Wikipedia Text User Interface";
     homepage = "https://github.com/builditluc/wiki-tui";
     changelog = "https://github.com/Builditluc/wiki-tui/releases/tag/v${version}";
     license = licenses.mit;