From e02368e3e8859b2e66211b11d870a4172cefa356 Mon Sep 17 00:00:00 2001
From: SharzyL <me@sharzy.in>
Date: Wed, 17 Jul 2024 14:14:28 +0800
Subject: [PATCH 01/28] beancount: maintainers remove bhipple, add sharzy &
 polarmutex

---
 pkgs/development/python-modules/beancount/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix
index ebe39136080e..81cf300fe559 100644
--- a/pkgs/development/python-modules/beancount/default.nix
+++ b/pkgs/development/python-modules/beancount/default.nix
@@ -58,6 +58,6 @@ buildPythonPackage rec {
       generate a variety of reports from them, and provides a web interface.
     '';
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ bhipple ];
+    maintainers = with maintainers; [ sharzy polarmutex ];
   };
 }

From 20215bee7461f9d900b433cdb1e53589d641dbfd Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 17 Jul 2024 22:13:41 +0800
Subject: [PATCH 02/28] top-level/python-packages.nix: move removal notice to
 python-aliases.nix

---
 pkgs/top-level/python-aliases.nix  |  8 ++++++++
 pkgs/top-level/python-packages.nix | 16 ----------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 34fa065b9945..7f4eb0e9ab84 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -90,8 +90,16 @@ mapAliases ({
   case = throw "case has been removed, since it is an unused leaf package with a dependency on the nose test framework"; # added 2024-07-08
   cchardet = faust-cchardet; # added 2023-03-02
   cepa = throw "cepa has been removed, as onionshare switched back to stem"; # added 2024-05-07
+  chiabip158 = throw "chiabip158 has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
+  chiapos = throw "chiapos has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
+  chiavdf = throw "chiavdf has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
+  chia-rs = throw "chia-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
   class-registry = phx-class-registry; # added 2021-10-05
   cld2-cffi = throw "cld2-cffi has been removed, as the last release was in 2016"; # added 2024-05-20
+  clvm = throw "clvm has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
+  clvm-rs = throw "clvm-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
+  clvm-tools = throw "clvm-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
+  clvm-tools-rs = throw "clvm-tools-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
   cntk = throw "cntk has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09
   codespell = throw "codespell has been promoted to a top-level attribute name: `pkgs.codespell`"; # Added 2022-10-02
   ColanderAlchemy = colanderalchemy; # added 2023-02-19
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e6b0da130ca3..5f877823c243 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2151,14 +2151,6 @@ self: super: with self; {
 
   chex = callPackage ../development/python-modules/chex { };
 
-  chiabip158 = throw "chiabip158 has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
-
-  chiapos = throw "chiapos has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
-
-  chiavdf = throw "chiavdf has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
-
-  chia-rs = throw "chia-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
-
   chirpstack-api = callPackage ../development/python-modules/chirpstack-api { };
 
   chispa = callPackage ../development/python-modules/chispa { };
@@ -2333,14 +2325,6 @@ self: super: with self; {
 
   clustershell = callPackage ../development/python-modules/clustershell { };
 
-  clvm = throw "clvm has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
-
-  clvm-rs = throw "clvm-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
-
-  clvm-tools = throw "clvm-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
-
-  clvm-tools-rs = throw "clvm-tools-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
-
   cma = callPackage ../development/python-modules/cma { };
 
   cmaes = callPackage ../development/python-modules/cmaes { };

From beae2027686e2c5eff2a206b2ae0b3c9136f22d1 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 17 Jul 2024 22:14:13 +0800
Subject: [PATCH 03/28] top-level/all-packages.nix: move removal notice to
 aliases.nix

---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f171a84d8f3e..77f851d01ec6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1290,6 +1290,7 @@ mapAliases ({
   slmenu = throw "slmenu has been removed (upstream is gone)"; # Added 2023-04-06
   slurm-llnl = slurm; # renamed July 2017
   smesh = throw "'smesh' has been removed as it's unmaintained and depends on opencascade-oce, which is also unmaintained"; # Added 2023-09-18
+  snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04;
   soldat-unstable = opensoldat; # Added 2022-07-02
   solr_8 = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16
   solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e810e7726d56..661cf0304648 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -842,8 +842,6 @@ with pkgs;
 
   tarsum = callPackage ../build-support/docker/tarsum.nix { };
 
-  snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04;
-
   nix-prefetch-docker = callPackage ../build-support/docker/nix-prefetch-docker.nix { };
 
   docker-ls = callPackage ../tools/misc/docker-ls { };

From a07d062363bc74cac1dade6b970edb0030bbe25b Mon Sep 17 00:00:00 2001
From: Niklas Halonen <niklas.halonen@protonmail.com>
Date: Thu, 18 Jul 2024 23:59:45 +0300
Subject: [PATCH 04/28] maintainers: add niklashh

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5716dc7a271c..a4180ee9def7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14503,6 +14503,13 @@
     githubId = 6391776;
     name = "Nikita Voloboev";
   };
+  niklashh = {
+    email = "niklas.2.halonen@aalto.fi";
+    github = "xhalo32";
+    githubId = 15152190;
+    keys = [ { fingerprint = "AF3B 80CD A027 245B 51FC  6D9B E83A 373D A5AF 5068"; } ];
+    name = "Niklas Halonen";
+  };
   niklaskorz = {
     name = "Niklas Korz";
     email = "niklas@niklaskorz.de";

From e81cf4f892acf7d2dae7c922a22f11d896f1a557 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Fri, 19 Jul 2024 19:30:29 -0400
Subject: [PATCH 05/28] buzztrax: fix build with clang 16

After the libxml2 2.12 update, buzztrax fails to build due to an incompatible function pointer error. This error has not been fixed upstream, so just suppress it.
---
 pkgs/applications/audio/buzztrax/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/buzztrax/default.nix b/pkgs/applications/audio/buzztrax/default.nix
index 38bb5d68e69b..30961d5b320a 100644
--- a/pkgs/applications/audio/buzztrax/default.nix
+++ b/pkgs/applications/audio/buzztrax/default.nix
@@ -62,7 +62,9 @@ stdenv.mkDerivation {
   ];
 
   # 'g_memdup' is deprecated: Use 'g_memdup2' instead
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"
+    # Suppress incompatible function pointer error in clang due to libxml2 2.12 const changes
+    + lib.optionalString stdenv.cc.isClang " -Wno-error=incompatible-function-pointer-types";
 
   meta = with lib; {
     description = "Buzztrax is a modular music composer for Linux";

From 4527b45e865e2ff38fe5defb0137831b484e959f Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 20 Jul 2024 01:56:40 -0400
Subject: [PATCH 06/28] gtksourceview5: fix build on x86_64-darwin

---
 pkgs/development/libraries/gtksourceview/5.x.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix
index d4ac1e9bb09f..f1a12eb0de12 100644
--- a/pkgs/development/libraries/gtksourceview/5.x.nix
+++ b/pkgs/development/libraries/gtksourceview/5.x.nix
@@ -40,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
     ./4.x-nix_share_path.patch
   ];
 
+  # The 10.12 SDK used by x86_64-darwin requires defining `_POSIX_C_SOURCE` to use `strnlen`.
+  env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "-D_POSIX_C_SOURCE=200809L";
+
   nativeBuildInputs = [
     meson
     ninja
@@ -113,7 +116,5 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = platforms.unix;
     license = licenses.lgpl21Plus;
     maintainers = teams.gnome.members;
-    # https://hydra.nixos.org/build/258191535/nixlog/1
-    broken = stdenv.isDarwin && stdenv.isx86_64;
   };
 })

From 08f4ed25f25da5bbf2cac83406d14db37941d1c4 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 20 Jul 2024 00:33:52 -0400
Subject: [PATCH 07/28] icon-library: use gettext from nixpkgs

The vendored gettext fails to build with clang 16 on Darwin. The gettext in nixpkgs works.
---
 pkgs/applications/graphics/icon-library/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/applications/graphics/icon-library/default.nix b/pkgs/applications/graphics/icon-library/default.nix
index 2f4aae6dc261..8b2347f43818 100644
--- a/pkgs/applications/graphics/icon-library/default.nix
+++ b/pkgs/applications/graphics/icon-library/default.nix
@@ -2,12 +2,14 @@
 , stdenv
 , fetchurl
 , wrapGAppsHook4
+, buildPackages
 , cargo
 , desktop-file-utils
 , meson
 , ninja
 , pkg-config
 , rustc
+, gettext
 , gdk-pixbuf
 , glib
 , gtk4
@@ -25,6 +27,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-nWGTYoSa0/fxnD0Mb2132LkeB1oa/gj/oIXBbI+FDw8=";
   };
 
+  env = lib.optionalAttrs stdenv.isDarwin {
+    # Set the location to gettext to ensure the nixpkgs one on Darwin instead of the vendored one.
+    # The vendored gettext does not build with clang 16.
+    GETTEXT_BIN_DIR = "${lib.getBin buildPackages.gettext}/bin";
+    GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include";
+    GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib";
+  };
+
   nativeBuildInputs = [
     cargo
     desktop-file-utils

From 744305bce4cf59d9bec124b6170db925bf71ac63 Mon Sep 17 00:00:00 2001
From: Someone Serge <sergei.kozlukov@aalto.fi>
Date: Sun, 14 Jul 2024 13:54:08 +0000
Subject: [PATCH 08/28] lib: add getOutput', a nix-lang counterpart of
 _overrideFirst

---
 lib/attrsets.nix | 73 +++++++++++++++++++++++++++++++++++++++++++++++-
 lib/default.nix  |  4 +--
 2 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index c0ac6eeb41bc..ea802e551e0a 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -1798,6 +1798,48 @@ rec {
       then pkg.${output} or pkg.out or pkg
       else pkg;
 
+  /**
+    Like `getOutput` but with a list of fallback output names.
+    This function is alligned with `_overrideFirst()` from the `multiple-outputs.sh` setup hook.
+
+    # Inputs
+
+    `outputs`
+
+    : 1\. Function argument
+
+    `pkg`
+
+    : 2\. Function argument
+
+    # Type
+
+    ```
+    getFirstOutput :: [String] -> Derivation -> String
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.attrsets.getFirstOutput` usage example
+
+    ```nix
+    getFirstOutput [ "include" "dev" ] pkgs.openssl
+    => "/nix/store/00000000000000000000000000000000-openssl-1.0.1r-dev"
+    ```
+
+    :::
+  */
+  getFirstOutput =
+    candidates: pkg:
+    let
+      outputs = builtins.filter (name: hasAttr name pkg) candidates;
+      output = builtins.head outputs;
+    in
+    if pkg.outputSpecified or false || outputs == [ ] then
+      pkg
+    else
+      pkg.${output};
+
   /**
     Get a package's `bin` output.
     If the output does not exist, fallback to `.out` and then to the default.
@@ -1820,7 +1862,7 @@ rec {
 
     ```nix
     getBin pkgs.openssl
-    => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r"
+    => "/nix/store/00000000000000000000000000000000-openssl-1.0.1r"
     ```
 
     :::
@@ -1887,6 +1929,35 @@ rec {
   */
   getDev = getOutput "dev";
 
+  /**
+    Get a package's `include` output.
+    If the output does not exist, fallback to `.dev`, then to `.out`, and then to the default.
+
+    # Inputs
+
+    `pkg`
+
+    : The package whose `include` output will be retrieved.
+
+    # Type
+
+    ```
+    getInclude :: Derivation -> String
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.attrsets.getInclude` usage example
+
+    ```nix
+    getInclude pkgs.openssl
+    => "/nix/store/00000000000000000000000000000000-openssl-1.0.1r-dev"
+    ```
+
+    :::
+  */
+  getInclude = getFirstOutput [ "include" "dev" "out" ];
+
 
   /**
     Get a package's `man` output.
diff --git a/lib/default.nix b/lib/default.nix
index 2605da47679e..adc7caa6bb9e 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -86,8 +86,8 @@ let
       mapAttrs' mapAttrsToList attrsToList concatMapAttrs mapAttrsRecursive
       mapAttrsRecursiveCond genAttrs isDerivation toDerivation optionalAttrs
       zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil
-      recursiveUpdate matchAttrs mergeAttrsList overrideExisting showAttrPath getOutput
-      getBin getLib getDev getMan chooseDevOutputs zipWithNames zip
+      recursiveUpdate matchAttrs mergeAttrsList overrideExisting showAttrPath getOutput getFirstOutput
+      getBin getLib getDev getInclude getMan chooseDevOutputs zipWithNames zip
       recurseIntoAttrs dontRecurseIntoAttrs cartesianProduct cartesianProductOfSets
       mapCartesianProduct updateManyAttrsByPath listToAttrs hasAttr getAttr isAttrs intersectAttrs removeAttrs;
     inherit (self.lists) singleton forEach map foldr fold foldl foldl' imap0 imap1

From 76db6ba81a95254e54445efd970a76fbf0c24388 Mon Sep 17 00:00:00 2001
From: Someone Serge <sergei.kozlukov@aalto.fi>
Date: Sat, 20 Jul 2024 19:54:07 +0000
Subject: [PATCH 09/28] lib: reflect effective signatures of getOutput
 functions

---
 lib/attrsets.nix | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index ea802e551e0a..833fc5871486 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -1764,6 +1764,7 @@ rec {
   /**
     Get a package output.
     If no output is found, fallback to `.out` and then to the default.
+    The function is idempotent: `getOutput "b" (getOutput "a" p) == getOutput "a" p`.
 
 
     # Inputs
@@ -1779,7 +1780,7 @@ rec {
     # Type
 
     ```
-    getOutput :: String -> Derivation -> String
+    getOutput :: String -> :: Derivation -> Derivation
     ```
 
     # Examples
@@ -1787,7 +1788,7 @@ rec {
     ## `lib.attrsets.getOutput` usage example
 
     ```nix
-    getOutput "dev" pkgs.openssl
+    "${getOutput "dev" pkgs.openssl}"
     => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev"
     ```
 
@@ -1799,8 +1800,9 @@ rec {
       else pkg;
 
   /**
-    Like `getOutput` but with a list of fallback output names.
+    Get the first of the `outputs` provided by the package, or the default.
     This function is alligned with `_overrideFirst()` from the `multiple-outputs.sh` setup hook.
+    Like `getOutput`, the function is idempotent.
 
     # Inputs
 
@@ -1815,7 +1817,7 @@ rec {
     # Type
 
     ```
-    getFirstOutput :: [String] -> Derivation -> String
+    getFirstOutput :: [String] -> Derivation -> Derivation
     ```
 
     # Examples
@@ -1823,7 +1825,7 @@ rec {
     ## `lib.attrsets.getFirstOutput` usage example
 
     ```nix
-    getFirstOutput [ "include" "dev" ] pkgs.openssl
+    "${getFirstOutput [ "include" "dev" ] pkgs.openssl}"
     => "/nix/store/00000000000000000000000000000000-openssl-1.0.1r-dev"
     ```
 
@@ -1853,7 +1855,7 @@ rec {
     # Type
 
     ```
-    getBin :: Derivation -> String
+    getBin :: Derivation -> Derivation
     ```
 
     # Examples
@@ -1861,7 +1863,7 @@ rec {
     ## `lib.attrsets.getBin` usage example
 
     ```nix
-    getBin pkgs.openssl
+    "${getBin pkgs.openssl}"
     => "/nix/store/00000000000000000000000000000000-openssl-1.0.1r"
     ```
 
@@ -1883,7 +1885,7 @@ rec {
     # Type
 
     ```
-    getLib :: Derivation -> String
+    getLib :: Derivation -> Derivation
     ```
 
     # Examples
@@ -1891,7 +1893,7 @@ rec {
     ## `lib.attrsets.getLib` usage example
 
     ```nix
-    getLib pkgs.openssl
+    "${getLib pkgs.openssl}"
     => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-lib"
     ```
 
@@ -1913,7 +1915,7 @@ rec {
     # Type
 
     ```
-    getDev :: Derivation -> String
+    getDev :: Derivation -> Derivation
     ```
 
     # Examples
@@ -1921,7 +1923,7 @@ rec {
     ## `lib.attrsets.getDev` usage example
 
     ```nix
-    getDev pkgs.openssl
+    "${getDev pkgs.openssl}"
     => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev"
     ```
 
@@ -1942,7 +1944,7 @@ rec {
     # Type
 
     ```
-    getInclude :: Derivation -> String
+    getInclude :: Derivation -> Derivation
     ```
 
     # Examples
@@ -1950,7 +1952,7 @@ rec {
     ## `lib.attrsets.getInclude` usage example
 
     ```nix
-    getInclude pkgs.openssl
+    "${getInclude pkgs.openssl}"
     => "/nix/store/00000000000000000000000000000000-openssl-1.0.1r-dev"
     ```
 
@@ -1972,7 +1974,7 @@ rec {
     # Type
 
     ```
-    getMan :: Derivation -> String
+    getMan :: Derivation -> Derivation
     ```
 
     # Examples
@@ -1980,7 +1982,7 @@ rec {
     ## `lib.attrsets.getMan` usage example
 
     ```nix
-    getMan pkgs.openssl
+    "${getMan pkgs.openssl}"
     => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-man"
     ```
 
@@ -2000,7 +2002,7 @@ rec {
     # Type
 
     ```
-    chooseDevOutputs :: [Derivation] -> [String]
+    chooseDevOutputs :: [Derivation] -> [Derivation]
     ```
   */
   chooseDevOutputs = builtins.map getDev;

From 98384afab5a12447eda2daf1d432224650c18ed5 Mon Sep 17 00:00:00 2001
From: Someone Serge <sergei.kozlukov@aalto.fi>
Date: Sun, 21 Jul 2024 11:27:03 +0000
Subject: [PATCH 10/28] lib: add getStatic

---
 lib/attrsets.nix | 29 +++++++++++++++++++++++++++++
 lib/default.nix  |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 833fc5871486..8bb4ef972fd8 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -1901,6 +1901,35 @@ rec {
   */
   getLib = getOutput "lib";
 
+  /**
+    Get a package's `static` output.
+    If the output does not exist, fallback to `.lib`, then to `.out`, and then to the default.
+
+    # Inputs
+
+    `pkg`
+
+    : The package whose `static` output will be retrieved.
+
+    # Type
+
+    ```
+    getStatic :: Derivation -> Derivation
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.attrsets.getStatic` usage example
+
+    ```nix
+    "${lib.getStatic pkgs.glibc}"
+    => "/nix/store/00000000000000000000000000000000-glibc-2.39-52-static"
+    ```
+
+    :::
+  */
+  getStatic = getFirstOutput [ "static" "lib" "out" ];
+
 
   /**
     Get a package's `dev` output.
diff --git a/lib/default.nix b/lib/default.nix
index adc7caa6bb9e..ecf4fbb75339 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -87,7 +87,7 @@ let
       mapAttrsRecursiveCond genAttrs isDerivation toDerivation optionalAttrs
       zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil
       recursiveUpdate matchAttrs mergeAttrsList overrideExisting showAttrPath getOutput getFirstOutput
-      getBin getLib getDev getInclude getMan chooseDevOutputs zipWithNames zip
+      getBin getLib getStatic getDev getInclude getMan chooseDevOutputs zipWithNames zip
       recurseIntoAttrs dontRecurseIntoAttrs cartesianProduct cartesianProductOfSets
       mapCartesianProduct updateManyAttrsByPath listToAttrs hasAttr getAttr isAttrs intersectAttrs removeAttrs;
     inherit (self.lists) singleton forEach map foldr fold foldl foldl' imap0 imap1

From 81033984364b00b42894a4d417daad3acb46e304 Mon Sep 17 00:00:00 2001
From: Nathan Henrie <nate@n8henrie.com>
Date: Sun, 21 Jul 2024 17:04:28 -0600
Subject: [PATCH 11/28] pycookiecheat: add n8henrie to maintainers

This is my project -- I had no idea it was on nixpkgs!
---
 pkgs/development/python-modules/pycookiecheat/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pycookiecheat/default.nix b/pkgs/development/python-modules/pycookiecheat/default.nix
index c90aee856a3c..be5d6f82cba6 100644
--- a/pkgs/development/python-modules/pycookiecheat/default.nix
+++ b/pkgs/development/python-modules/pycookiecheat/default.nix
@@ -69,6 +69,9 @@ buildPythonPackage rec {
     homepage = "https://github.com/n8henrie/pycookiecheat";
     changelog = "https://github.com/n8henrie/pycookiecheat/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    maintainers = with maintainers; [
+      fab
+      n8henrie
+    ];
   };
 }

From 3827d51c23b9799323c180bc0d528b80ef365ad9 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 21 Jul 2024 19:13:27 -0700
Subject: [PATCH 12/28] llvmPackages_git: 19.0.0-git-2024-07-14 ->
 19.0.0-git-2024-07-21

---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index f6f96c04ae35..a4b8b548a0bd 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -23,9 +23,9 @@ let
     "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";
     "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
     "19.0.0-git".gitRelease = {
-      rev = "8da3852f44c64ac4535128741695b9e9d8ee27ef";
-      rev-version = "19.0.0-unstable-2024-07-14";
-      sha256 = "sha256-yGmbzueu1kkfGbQaIG+ImnpIS+RwaUl/Gx/+1w6SHRc=";
+      rev = "d15ada24b1fbbd72776022383a5c557a1a056413";
+      rev-version = "19.0.0-unstable-2024-07-21";
+      sha256 = "sha256-ZvsHGgbcSwE0Ko8KjvRzKQLkig6VcQD7/A2XClq+kt0=";
     };
   } // llvmVersions;
 

From bd5255a137ca6b947f3a49c076d5cec04bebb343 Mon Sep 17 00:00:00 2001
From: Niklas Halonen <niklas.halonen@protonmail.com>
Date: Fri, 19 Jul 2024 19:18:06 +0300
Subject: [PATCH 13/28] python312Packages.plasTeX: init at 3.1

---
 .../python-modules/plasTeX/default.nix        | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/python-modules/plasTeX/default.nix

diff --git a/pkgs/development/python-modules/plasTeX/default.nix b/pkgs/development/python-modules/plasTeX/default.nix
new file mode 100644
index 000000000000..407918ec4042
--- /dev/null
+++ b/pkgs/development/python-modules/plasTeX/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  typing-extensions,
+  pillow,
+  jinja2,
+  unidecode,
+}:
+buildPythonPackage {
+  pname = "plasTeX";
+  version = "3.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    repo = "plastex";
+    owner = "plastex";
+    rev = "193747318f7ebadd19eaaa1e9996da42a31a2697"; # The same as what is published on PyPi for version 3.1. See <https://github.com/plastex/plastex/issues/386>
+    hash = "sha256-Muuin7n0aPOZwlUaB32pONy5eyIjtPNb4On5gC9wOcQ=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    typing-extensions
+    pillow
+    jinja2
+    unidecode
+  ];
+
+  meta = {
+    description = "plasTeX is a Python package to convert LaTeX markup to DOM";
+    homepage = "https://plastex.github.io/plastex/";
+    maintainers = with lib.maintainers; [ niklashh ];
+    license = lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4ead26c9e215..76e6ebee875b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10408,6 +10408,8 @@ self: super: with self; {
 
   plaster = callPackage ../development/python-modules/plaster { };
 
+  plasTeX = callPackage ../development/python-modules/plasTeX { };
+
   plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy { };
 
   platformdirs = callPackage ../development/python-modules/platformdirs { };

From 8ca7bd846e0e75ecea1d3c2c2f0124e35743a88d Mon Sep 17 00:00:00 2001
From: Niklas Halonen <niklas.halonen@protonmail.com>
Date: Fri, 19 Jul 2024 19:19:05 +0300
Subject: [PATCH 14/28] python312Packages.plastexdepgraph: init at 0.0.4

---
 .../plastexdepgraph/default.nix               | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/plastexdepgraph/default.nix

diff --git a/pkgs/development/python-modules/plastexdepgraph/default.nix b/pkgs/development/python-modules/plastexdepgraph/default.nix
new file mode 100644
index 000000000000..7fcc029ad97f
--- /dev/null
+++ b/pkgs/development/python-modules/plastexdepgraph/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  pygraphviz,
+  plasTeX,
+}:
+buildPythonPackage {
+  pname = "plastexdepgraph";
+  version = "0.0.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    repo = "plastexdepgraph";
+    owner = "PatrickMassot";
+    rev = "0.0.4";
+    hash = "sha256-Q13uYYZe1QgZHS4Nj8ugr+Fmhva98ttJj3AlXTK6XDw=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    pygraphviz
+    plasTeX
+  ];
+
+  meta = {
+    description = "plasTeX plugin allowing to build dependency graphs";
+    homepage = "https://github.com/PatrickMassot/plastexdepgraph";
+    maintainers = with lib.maintainers; [ niklashh ];
+    license = lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 76e6ebee875b..143b16557fd1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10410,6 +10410,8 @@ self: super: with self; {
 
   plasTeX = callPackage ../development/python-modules/plasTeX { };
 
+  plastexdepgraph = callPackage ../development/python-modules/plastexdepgraph { };
+
   plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy { };
 
   platformdirs = callPackage ../development/python-modules/platformdirs { };

From c46383a57c59a15d0931d0893b3bd52a7c9adfda Mon Sep 17 00:00:00 2001
From: Niklas Halonen <niklas.halonen@protonmail.com>
Date: Fri, 19 Jul 2024 19:19:20 +0300
Subject: [PATCH 15/28] python312Packages.plastexshowmore: init at 0.0.2

---
 .../plastexshowmore/default.nix               | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/plastexshowmore/default.nix

diff --git a/pkgs/development/python-modules/plastexshowmore/default.nix b/pkgs/development/python-modules/plastexshowmore/default.nix
new file mode 100644
index 000000000000..907869829a03
--- /dev/null
+++ b/pkgs/development/python-modules/plastexshowmore/default.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  plasTeX,
+}:
+
+buildPythonPackage {
+  pname = "plastexshowmore";
+  version = "0.0.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    repo = "plastexshowmore";
+    owner = "PatrickMassot";
+    rev = "0.0.2";
+    hash = "sha256-b45VHHEwFA41FaInDteix56O7KYDzyKiRRSl7heHqEA=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ plasTeX ];
+
+  meta = {
+    description = "PlasTeX plugin for adding navigation buttons";
+    homepage = "https://github.com/PatrickMassot/plastexshowmore";
+    maintainers = with lib.maintainers; [ niklashh ];
+    license = lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 143b16557fd1..e96de88c8ea5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10412,6 +10412,8 @@ self: super: with self; {
 
   plastexdepgraph = callPackage ../development/python-modules/plastexdepgraph { };
 
+  plastexshowmore = callPackage ../development/python-modules/plastexshowmore { };
+
   plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy { };
 
   platformdirs = callPackage ../development/python-modules/platformdirs { };

From bdb7b33b731d87e2bb904aa09797a50bc139ea5b Mon Sep 17 00:00:00 2001
From: Niklas Halonen <niklas.halonen@protonmail.com>
Date: Fri, 19 Jul 2024 20:26:25 +0300
Subject: [PATCH 16/28] python312Packages.leanblueprint: init at 0.0.10

---
 .../python-modules/leanblueprint/default.nix  | 54 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/leanblueprint/default.nix

diff --git a/pkgs/development/python-modules/leanblueprint/default.nix b/pkgs/development/python-modules/leanblueprint/default.nix
new file mode 100644
index 000000000000..20a8a51b0a7d
--- /dev/null
+++ b/pkgs/development/python-modules/leanblueprint/default.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  plasTeX,
+  plastexshowmore,
+  plastexdepgraph,
+  click,
+  rich,
+  rich-click,
+  tomlkit,
+  jinja2,
+  gitpython,
+}:
+buildPythonPackage {
+  pname = "leanblueprint";
+  version = "0.0.10";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    repo = "leanblueprint";
+    owner = "PatrickMassot";
+    rev = "v0.0.10";
+    hash = "sha256-CUYdxEXgTf2vKDiOoeW4RV6tQ6prFhA4qMc0olZtZBM=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    plasTeX
+    plastexshowmore
+    plastexdepgraph
+    click
+    rich
+    rich-click
+    tomlkit
+    jinja2
+    gitpython
+  ];
+
+  pythonImportsCheck = [ "leanblueprint" ];
+
+  meta = {
+    description = "This plasTeX plugin allowing to write blueprints for Lean 4 projects";
+    homepage = "https://github.com/PatrickMassot/leanblueprint";
+    maintainers = with lib.maintainers; [ niklashh ];
+    license = lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e96de88c8ea5..fda13de5e5cd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6711,6 +6711,8 @@ self: super: with self; {
 
   leather = callPackage ../development/python-modules/leather { };
 
+  leanblueprint = callPackage ../development/python-modules/leanblueprint { };
+
   leb128 = callPackage ../development/python-modules/leb128 { };
 
   led-ble = callPackage ../development/python-modules/led-ble { };

From c675eb8ce9db110e04e5528ba8d6446240d68dff Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 21 Jul 2024 18:50:52 -0300
Subject: [PATCH 17/28] emacsPackages.font-lock-plus: adopted by AndersonTorres

Also, implement passthru.updateScript.
---
 .../elisp-packages/manual-packages/font-lock-plus/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix
index 1360d3bff7f7..d7e8390b40b8 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix
@@ -2,6 +2,7 @@
   lib,
   fetchFromGitHub,
   melpaBuild,
+  unstableGitUpdater,
 }:
 
 melpaBuild {
@@ -16,9 +17,12 @@ melpaBuild {
     hash = "sha256-lFmdVMXIIXZ9ZohAJw5rhxpTv017qIyzmpuKOWDdeJ4=";
   };
 
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = {
     homepage = "https://github.com/emacsmirror/font-lock-plus";
     description = "Enhancements to standard library font-lock.el";
     license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
   };
 }

From c2ac76bfdae507a5675359d2cdc2e29d697b4d90 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 21 Jul 2024 18:43:49 -0300
Subject: [PATCH 18/28] emacsPackages.voicemacs: adopted by AndersonTorres

Also implement passthru.updateScript
---
 .../elisp-packages/manual-packages/voicemacs/default.nix  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix
index 4dc7b493cb91..593dac257976 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix
@@ -13,6 +13,7 @@
   melpaBuild,
   nav-flash,
   porthole,
+  unstableGitUpdater,
   yasnippet,
 }:
 
@@ -27,7 +28,9 @@ melpaBuild {
     hash = "sha256-/MBB2R9/V0aYZp15e0vx+67ijCPp2iPlgxe262ldmtc=";
   };
 
-  patches = [ ./0000-add-missing-require.patch ];
+  patches = [
+    ./0000-add-missing-require.patch
+  ];
 
   packageRequires = [
     avy
@@ -44,9 +47,12 @@ melpaBuild {
     yasnippet
   ];
 
+  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
+
   meta = {
     homepage = "https://github.com/jcaw/voicemacs/";
     description = "Set of utilities for controlling Emacs by voice";
     license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
   };
 }

From 50eaa3013005bcf181a9e38c65d4801f3a7b8235 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 22 Jul 2024 19:33:50 -0300
Subject: [PATCH 19/28] emacsPackages.elisp-ffi: adopted by AndersonTorres

Also implement passthru.updateScript and set meta.homepage
---
 .../elisp-packages/manual-packages/elisp-ffi/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix
index 4e21c8e8e79e..3bc5b686e548 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix
@@ -1,9 +1,10 @@
 {
   lib,
-  melpaBuild,
   fetchFromGitHub,
-  pkg-config,
   libffi,
+  melpaBuild,
+  pkg-config,
+  unstableGitUpdater,
 }:
 
 melpaBuild {
@@ -26,7 +27,10 @@ melpaBuild {
     make
   '';
 
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = {
+    homepage = "https://github.com/skeeto/elisp-ffi";
     description = "Emacs Lisp Foreign Function Interface";
     longDescription = ''
       This library provides an FFI for Emacs Lisp so that Emacs
@@ -35,5 +39,6 @@ melpaBuild {
       values on to Emacs.
     '';
     license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
   };
 }

From c26ba30c69d2f9dfe415576d78b5c3e99c4a6ed5 Mon Sep 17 00:00:00 2001
From: strawbee <henigingames@gmail.com>
Date: Mon, 22 Jul 2024 10:10:35 -0700
Subject: [PATCH 20/28] maintainers: add strawbee

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 490cd20e6d16..3bdd1f06086b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19471,6 +19471,12 @@
     githubId = 48666;
     name = "Matthew \"strager\" Glazar";
   };
+  strawbee = {
+    email = "henigingames@gmail.com";
+    github = "StillToad";
+    githubId = 57422776;
+    name = "strawbee";
+  };
   strikerlulu = {
     email = "strikerlulu7@gmail.com";
     github = "strikerlulu";

From 4ac9e605fa712087ff1975c110379e7ff8b0c9eb Mon Sep 17 00:00:00 2001
From: strawbee <henigingames@gmail.com>
Date: Sun, 21 Jul 2024 22:29:39 -0700
Subject: [PATCH 21/28] manuskript: override python version

---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5a285502f32..c7b1adcb5f82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30891,7 +30891,9 @@ with pkgs;
     }
   );
 
-  manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
+  manuskript = libsForQt5.callPackage ../applications/editors/manuskript {
+    python3Packages = python311Packages;
+  };
 
   metacubexd = callPackage ../by-name/me/metacubexd/package.nix {
     pnpm = callPackage ../development/tools/pnpm/generic.nix {

From 9859c235846a8dec293df62b805f7bbb0cfdbf87 Mon Sep 17 00:00:00 2001
From: strawbee <henigingames@gmail.com>
Date: Mon, 22 Jul 2024 10:11:54 -0700
Subject: [PATCH 22/28] manuskript: add strawbee as maintainer

---
 .../editors/manuskript/default.nix            | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix
index f598c686998d..8fa589c13b5d 100644
--- a/pkgs/applications/editors/manuskript/default.nix
+++ b/pkgs/applications/editors/manuskript/default.nix
@@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
   patchPhase = ''
     substituteInPlace manuskript/ui/welcome.py \
       --replace sample-projects $out/share/${pname}/sample-projects
-   '';
+  '';
 
   buildPhase = "";
 
@@ -44,19 +44,19 @@ python3Packages.buildPythonApplication rec {
     description = "Open-source tool for writers";
     homepage = "https://www.theologeek.ch/manuskript";
     longDescription = ''
-    Manuskript is a tool for those writer who like to organize and
-    plan everything before writing.  The snowflake method can help you
-    grow your idea into a book, by leading you step by step and asking
-    you questions to go deeper. While writing, keep track of notes
-    about every characters, plot, event, place in your story.
+      Manuskript is a tool for those writer who like to organize and
+      plan everything before writing.  The snowflake method can help you
+      grow your idea into a book, by leading you step by step and asking
+      you questions to go deeper. While writing, keep track of notes
+      about every characters, plot, event, place in your story.
 
-    Develop complex characters and keep track of all useful infos.
-    Create intricate plots, linked to your characters, and use them to
-    outline your story. Organize your ideas about the world your
-    characters live in.
+      Develop complex characters and keep track of all useful infos.
+      Create intricate plots, linked to your characters, and use them to
+      outline your story. Organize your ideas about the world your
+      characters live in.
     '';
     license = lib.licenses.gpl3;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ strawbee ];
     platforms = lib.platforms.unix;
     mainProgram = "manuskript";
   };

From 2923c0c14a33c78a2f195fa8cef4df84d0b825bc Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 22 Jul 2024 20:21:40 -0300
Subject: [PATCH 23/28] emacsPackages.rect-mark: adopted by AndersonTorres

- get rid of rec
- implement passthru.updateScript
---
 .../manual-packages/rect-mark/default.nix             | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix
index 890893115b1c..aee5c8ba2dbf 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix
@@ -2,11 +2,15 @@
   lib,
   melpaBuild,
   fetchFromGitHub,
+  gitUpdater,
 }:
 
-melpaBuild rec {
-  pname = "rect-mark";
+let
   version = "1.4";
+in
+melpaBuild {
+  pname = "rect-mark";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "emacsmirror";
@@ -15,9 +19,12 @@ melpaBuild rec {
     hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM=";
   };
 
+  passthru.updateScript = gitUpdater { };
+
   meta = {
     homepage = "http://emacswiki.org/emacs/RectangleMark";
     description = "Mark a rectangle of text with highlighting";
     license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
   };
 }

From 598659a488918341d44a0f195f107dcc475879a3 Mon Sep 17 00:00:00 2001
From: arthsmn <arthsmn@proton.me>
Date: Mon, 22 Jul 2024 21:17:14 -0300
Subject: [PATCH 24/28] ff2mpv-rust: remove arthsmn from the maintainers

---
 pkgs/by-name/ff/ff2mpv-rust/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ff/ff2mpv-rust/package.nix b/pkgs/by-name/ff/ff2mpv-rust/package.nix
index 2ffd89d1ef0b..c6db7961d0ed 100644
--- a/pkgs/by-name/ff/ff2mpv-rust/package.nix
+++ b/pkgs/by-name/ff/ff2mpv-rust/package.nix
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec {
     description = "Native messaging host for ff2mpv written in Rust";
     homepage = "https://github.com/ryze312/ff2mpv-rust";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ arthsmn ryze ];
+    maintainers = with maintainers; [ ryze ];
     mainProgram = "ff2mpv-rust";
   };
 }

From a1814d2dbf15dcc7950ad8a15c8b2c930633f99c Mon Sep 17 00:00:00 2001
From: arthsmn <arthsmn@proton.me>
Date: Mon, 22 Jul 2024 21:12:47 -0300
Subject: [PATCH 25/28] ffmpeg: remove arthsmn from the maintainers

---
 pkgs/development/libraries/ffmpeg/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 6d54d63c6ca8..cb6d5a50b4a0 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -928,7 +928,7 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = platforms.all;
     # See https://github.com/NixOS/nixpkgs/pull/295344#issuecomment-1992263658
     broken = stdenv.hostPlatform.isMinGW && stdenv.hostPlatform.is64bit;
-    maintainers = with maintainers; [ atemu arthsmn jopejoe1 ];
+    maintainers = with maintainers; [ atemu jopejoe1 ];
     mainProgram = "ffmpeg";
   };
 } // lib.optionalAttrs withCudaLLVM {

From 2deb3dd45f1f7238053ae043f11caeb1223a4902 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 21 Jul 2024 21:28:35 -0700
Subject: [PATCH 26/28] llvmPackages_git.compiler-rt: disable codesign

---
 pkgs/development/compilers/llvm/common/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index 7e8e65b51c1e..a7de2bb2041c 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -361,8 +361,7 @@ let
             # See here for some context:
             # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
             ++ lib.optional (
-              stdenv.targetPlatform.isDarwin
-              && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"
+              stdenv.targetPlatform.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"
             ) (metadata.getVersionFile "lldb/cpu_subtype_arm64e_replacement.patch");
         }
         // lib.optionalAttrs (lib.versions.major metadata.release_version == "16") {
@@ -592,7 +591,13 @@ let
           ./compiler-rt/armv6-no-ldrexd-strexd.patch
           ./compiler-rt/armv6-scudo-no-yield.patch
           ./compiler-rt/armv6-scudo-libatomic.patch
-        ];
+        ]
+        ++ lib.optional (lib.versionAtLeast metadata.release_version "19") (
+          fetchpatch {
+            url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch";
+            hash = "sha256-1CkA+RzI+645uG/QXsmOMKrLAjhVpfLUjNtgZ0QTv1E=";
+          }
+        );
     in
     {
       compiler-rt-libc = callPackage ./compiler-rt {

From 67783fd0d59bacf55765580b6f8a8c95a1d761f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Jul 2024 20:44:35 +0000
Subject: [PATCH 27/28] telegraf: 1.31.1 -> 1.31.2

---
 pkgs/servers/monitoring/telegraf/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index 5deb6180704f..8a8768c2a373 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -9,7 +9,7 @@
 
 buildGoModule rec {
   pname = "telegraf";
-  version = "1.31.1";
+  version = "1.31.2";
 
   subPackages = [ "cmd/telegraf" ];
 
@@ -17,10 +17,10 @@ buildGoModule rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = "v${version}";
-    hash = "sha256-itZPLiD6XQ6OwXsVrreWM7W268aLc8cz3hqXLdZryAU=";
+    hash = "sha256-LTo9wWCqjLoA9wjCXhZ6EjvRR/Xp8ByHvq/ytgS8sCo=";
   };
 
-  vendorHash = "sha256-zhGxla5SQcpwAUzaeG54Sdos3fpJ3zO+ymanLpZtmyg=";
+  vendorHash = "sha256-spXS1vNRgXBO2xZIyVgsfO5V+SYK8dC6YDA/dGOYt6g=";
   proxyVendor = true;
 
   ldflags = [

From 681e984f8e3d66f4fd8a94ea28bb7a8b87b27216 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 19 Jul 2024 10:06:23 +0200
Subject: [PATCH 28/28] coqPackages.equations: 1.3.1 for Coq 8.20

---
 pkgs/development/coq-modules/equations/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix
index 83662720c7f7..b517d16ab2d4 100644
--- a/pkgs/development/coq-modules/equations/default.nix
+++ b/pkgs/development/coq-modules/equations/default.nix
@@ -6,6 +6,7 @@
   repo = "Coq-Equations";
   inherit version;
   defaultVersion = lib.switch coq.coq-version [
+    { case = "8.20"; out = "1.3.1+8.20"; }
     { case = "8.19"; out = "1.3+8.19"; }
     { case = "8.18"; out = "1.3+8.18"; }
     { case = "8.17"; out = "1.3+8.17"; }
@@ -63,6 +64,8 @@
     release."1.3+8.18".sha256         = "sha256-8MZO9vWdr8wlAov0lBTYMnde0RuMyhaiM99zp7Zwfao=";
     release."1.3+8.19".rev            = "v1.3-8.19";
     release."1.3+8.19".sha256         = "sha256-roBCWfAHDww2Z2JbV5yMI3+EOfIsv3WvxEcUbBiZBsk=";
+    release."1.3.1+8.20".rev          = "v1.3.1-8.20";
+    release."1.3.1+8.20".sha256       = "sha256-u8LB1KiACM5zVaoL7dSdHYvZgX7pf30VuqtjLLGuTzc=";
 
   mlPlugin = true;