From 895c222ef4e2c2bdae3c68e1a4495f3ae9f9dc89 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 25 Jul 2024 21:58:31 +0100
Subject: [PATCH 01/24] libndp: 1.8 -> 1.9

While at it added a trivial updater.

Changes: https://github.com/jpirko/libndp/compare/v1.8...v1.9
---
 pkgs/development/libraries/libndp/default.nix | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/development/libraries/libndp/default.nix
index 953b1101e709..17831d646cbc 100644
--- a/pkgs/development/libraries/libndp/default.nix
+++ b/pkgs/development/libraries/libndp/default.nix
@@ -1,29 +1,25 @@
-{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook, gitUpdater }:
 
 stdenv.mkDerivation rec {
   pname = "libndp";
-  version = "1.8";
+  version = "1.9";
 
   src = fetchurl {
     url = "http://libndp.org/files/libndp-${version}.tar.gz";
-    sha256 = "sha256-iP+2buLrUn8Ub1wC9cy8OLqX0rDVfrRr+6SIghqwwCs=";
+    hash = "sha256-qKshTgHcOpthUnaQU5VjfzkSmMhNd2UfDL8LEILdLdQ=";
   };
 
-  patches = [
-    (fetchpatch {
-      # https://github.com/jpirko/libndp/issues/26
-      name = "CVE-2024-5564.patch";
-      url = "https://github.com/jpirko/libndp/commit/05e4ba7b0d126eea4c04387dcf40596059ee24af.patch";
-      hash = "sha256-O7AHjCqic7iUfMbKYLGgBAU+wdR9/MDWxBWJw+CFn/c=";
-    })
-  ];
-
   nativeBuildInputs = [ autoreconfHook ];
 
   configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
   ];
 
+  passthru.updateScript = gitUpdater {
+    url = "https://github.com/jpirko/libndp.git";
+    rev-prefix = "v";
+  };
+
   meta = with lib; {
     homepage = "http://libndp.org/";
     description = "Library for Neighbor Discovery Protocol";

From e240e87ef04aedfddf56c3ff3ff356373258750b Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Tue, 30 Jul 2024 18:44:11 +0200
Subject: [PATCH 02/24] tclvfs: init at 1.4-unstable-2023-11-23

---
 pkgs/by-name/tc/tclvfs/package.nix | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pkgs/by-name/tc/tclvfs/package.nix

diff --git a/pkgs/by-name/tc/tclvfs/package.nix b/pkgs/by-name/tc/tclvfs/package.nix
new file mode 100644
index 000000000000..9ac69b5bb153
--- /dev/null
+++ b/pkgs/by-name/tc/tclvfs/package.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  tcl,
+  fetchzip,
+}:
+
+tcl.mkTclDerivation {
+  pname = "tclvfs";
+  version = "1.4-unstable-2023-11-23";
+
+  src = fetchzip {
+    url = "https://core.tcl-lang.org/tclvfs/tarball/8cdab08997fe82d8/tclvfs-8cdab08997fe82d8.tar.gz";
+    hash = "sha256-DzZ4Puwscbr0KarMyEKeah7jDJy7cfKNBbBSh0boaUw=";
+  };
+
+  meta = {
+    description = "Tcl extension that exposes Tcl's Virtual File System (VFS) subsystem to the script level";
+    homepage = "https://core.tcl.tk/tclvfs";
+    license = lib.licenses.tcltk;
+    longDescription = ''
+      The TclVfs project aims to provide an extension to the Tcl language which
+      allows Virtual Filesystems to be built using Tcl scripts only. It is also
+      a repository of such Tcl-implemented filesystems (metakit, zip, ftp, tar,
+      http, webdav, namespace, url)
+    '';
+    maintainers = with lib.maintainers; [ fgaz ];
+  };
+}

From c790b114e6acf17b188f769a3a964ca9a3395edd Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Sat, 3 Aug 2024 22:09:06 +0200
Subject: [PATCH 03/24] tcludp: init at 1.0.11

---
 pkgs/by-name/tc/tcludp/package.nix | 39 ++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/tc/tcludp/package.nix

diff --git a/pkgs/by-name/tc/tcludp/package.nix b/pkgs/by-name/tc/tcludp/package.nix
new file mode 100644
index 000000000000..890b0d4366fc
--- /dev/null
+++ b/pkgs/by-name/tc/tcludp/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  tcl,
+  fetchfossil,
+}:
+
+tcl.mkTclDerivation rec {
+  pname = "tcludp";
+  version = "1.0.11";
+
+  src = fetchfossil {
+    url = "https://core.tcl-lang.org/tcludp";
+    rev = "ver_" + lib.replaceStrings [ "." ] [ "_" ] version;
+    hash = "sha256-PckGwUqL2r5KJEet8sS4U504G63flX84EkQEkQdMifY=";
+  };
+
+  # Add missing pkgIndex.tcl.in
+  postPatch = ''
+    test ! -e pkgIndex.tcl.in
+    cat > pkgIndex.tcl.in <<EOF
+    package ifneeded @PACKAGE_NAME@ @PACKAGE_VERSION@ \
+    [list load [file join $dir @PKG_LIB_FILE@] @PACKAGE_NAME@]
+    EOF
+  '';
+
+  # Some tests fail because of the sandbox.
+  # However, tcltest always returns exit code 0, so this always succeeds.
+  # https://wuhrr.wordpress.com/2013/09/13/tcltest-part-9-provides-exit-code/
+  doInstallCheck = true;
+
+  installCheckTarget = "test";
+
+  meta = {
+    description = "UDP socket support for Tcl";
+    homepage = "https://core.tcl-lang.org/tcludp";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fgaz ];
+  };
+}

From 3fe77df3a76582235fb4608a1afb8d2a33933a7f Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Sat, 3 Aug 2024 22:55:34 +0200
Subject: [PATCH 04/24] pdf4tcl: init at 0.9.4

---
 pkgs/by-name/pd/pdf4tcl/package.nix | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/pd/pdf4tcl/package.nix

diff --git a/pkgs/by-name/pd/pdf4tcl/package.nix b/pkgs/by-name/pd/pdf4tcl/package.nix
new file mode 100644
index 000000000000..94ba20ebd742
--- /dev/null
+++ b/pkgs/by-name/pd/pdf4tcl/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  tcl,
+  fetchzip,
+}:
+
+tcl.mkTclDerivation rec {
+  pname = "pdf4tcl";
+  version = "0.9.4";
+
+  src = fetchzip {
+    url = "mirror://sourceforge/pdf4tcl/pdf4tcl${lib.replaceStrings [ "." ] [ "" ] version}.tar.gz";
+    hash = "sha256-lmSt0UQDfUef8S7zevAvvbeWB/vd6jLbKz7Y5A7xJm4=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/lib/pdf4tcl
+    cp -r * $out/lib/pdf4tcl/
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Tcl package for generating PDF files";
+    homepage = "https://pdf4tcl.sourceforge.net/";
+    license = lib.licenses.tcltk;
+    maintainers = with lib.maintainers; [ fgaz ];
+  };
+}

From 658fff5fabf2998fbcde8c022744a294d7299979 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Sat, 3 Aug 2024 23:12:22 +0200
Subject: [PATCH 05/24] tdom: init at 0.9.4

---
 pkgs/by-name/td/tdom/package.nix | 40 ++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 pkgs/by-name/td/tdom/package.nix

diff --git a/pkgs/by-name/td/tdom/package.nix b/pkgs/by-name/td/tdom/package.nix
new file mode 100644
index 000000000000..3cd36bde2e03
--- /dev/null
+++ b/pkgs/by-name/td/tdom/package.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  tcl,
+  fetchzip,
+  expat,
+  gumbo,
+  pkg-config,
+}:
+
+tcl.mkTclDerivation rec {
+  pname = "tdom";
+  version = "0.9.4";
+
+  src = fetchzip {
+    url = "http://tdom.org/downloads/tdom-${version}-src.tgz";
+    hash = "sha256-7RvHzb4ae1HbJGkXCd68B23q/zhEK6ysYOnT6yeTLU8=";
+  };
+
+  buildInputs = [
+    expat
+    gumbo
+  ];
+
+  nativeBuildInputs = [ pkg-config ];
+
+  configureFlags = [
+    "--enable-html5"
+    "--with-expat=${lib.getDev expat}"
+  ];
+
+  doInstallCheck = true;
+  installCheckTarget = "test";
+
+  meta = {
+    description = "XML / DOM / XPath / XSLT / HTML / JSON implementation for Tcl";
+    homepage = "http://www.tdom.org";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ fgaz ];
+  };
+}

From e0d4ac275b1f1a8b7ebc765c0ff845a574824cb0 Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 11 Aug 2024 03:50:04 -0500
Subject: [PATCH 06/24] nzbget: move to by-name

---
 .../nzbget/default.nix => by-name/nz/nzbget/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/networking/nzbget/default.nix => by-name/nz/nzbget/package.nix} (100%)

diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/by-name/nz/nzbget/package.nix
similarity index 100%
rename from pkgs/tools/networking/nzbget/default.nix
rename to pkgs/by-name/nz/nzbget/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0420320704d3..8391bf9fc2f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10931,8 +10931,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security CoreServices;
   };
 
-  nzbget = callPackage ../tools/networking/nzbget { };
-
   oapi-codegen = callPackage ../tools/networking/oapi-codegen { };
 
   oath-toolkit = callPackage ../tools/security/oath-toolkit { };

From 392f3c9396c7b6329f8190253a3581a58fc85c8e Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 11 Aug 2024 10:23:12 -0500
Subject: [PATCH 07/24] nzbget: 24.1 -> 24.2

---
 pkgs/by-name/nz/nzbget/package.nix | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/nz/nzbget/package.nix b/pkgs/by-name/nz/nzbget/package.nix
index 19323e18fc5d..165ee6dfc827 100644
--- a/pkgs/by-name/nz/nzbget/package.nix
+++ b/pkgs/by-name/nz/nzbget/package.nix
@@ -1,7 +1,8 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, autoreconfHook
+, fetchpatch2
+, cmake
 , boost
 , pkg-config
 , gnutls
@@ -13,21 +14,30 @@
 , ncurses
 , openssl
 , zlib
+, deterministic-uname
 , nixosTests
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nzbget";
-  version = "24.1";
+  version = "24.2";
 
   src = fetchFromGitHub {
     owner = "nzbgetcom";
     repo = "nzbget";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HovfnTsgu07/lp/spI+iA8H7lOj0Qyrri2MOJKyMKHQ=";
+    hash = "sha256-+iJ5n/meBrMxKHSLxL5QJ7+TI0RMfAM5n/8dwYupGoU=";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
+  patches = [
+    (fetchpatch2 {
+      # status page buffer overflow fix: https://github.com/nzbgetcom/nzbget/pull/346 -- remove when version > 24.2
+      url = "https://github.com/nzbgetcom/nzbget/commit/f89978f7479cbb0ff2f96c8632d9d2f31834e6c8.patch";
+      hash = "sha256-9K7PGzmoZ8cvEKBm5htfw5fr1GBSddNkDC/Vi4ngRto=";
+    })
+  ];
+
+  nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = [
     boost
@@ -42,8 +52,13 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
   ];
 
-  prePatch = ''
-    sed -i 's/AC_INIT.*/AC_INIT( nzbget, m4_esyscmd_s( echo ${finalAttrs.version} ) )/' configure.ac
+  postPatch = ''
+    substituteInPlace daemon/util/Util.cpp \
+      --replace-fail "std::string(\"uname \")" "std::string(\"${lib.getExe deterministic-uname} \")"
+  '';
+
+  postInstall = ''
+    install -Dm444 nzbget.conf $out/share/nzbget/nzbget.conf
   '';
 
   enableParallelBuilding = true;

From 46c3afb271ffe9b73f6d2b75e4b7243618280a7e Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 12 Aug 2024 19:48:45 +0100
Subject: [PATCH 08/24] cassandra: add meta.sourceProvenance information

---
 pkgs/servers/nosql/cassandra/generic.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index 51ab6ac13326..f7f5f36a6d0e 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -122,6 +122,10 @@ stdenv.mkDerivation rec {
     description = "Massively scalable open source NoSQL database";
     platforms = platforms.unix;
     license = licenses.asl20;
+    sourceProvenance = with sourceTypes; [
+      binaryBytecode
+      binaryNativeCode  # bundled dependency libsigar
+    ];
     maintainers = [ maintainers.roberth ];
   } // extraMeta;
 }

From fc95088f1188b5584d54093b54b6d628446333cb Mon Sep 17 00:00:00 2001
From: luftmensch-luftmensch <valentinobocchetti59@gmail.com>
Date: Wed, 14 Aug 2024 14:11:49 +0200
Subject: [PATCH 09/24] poptop: init at 0.1.8

---
 pkgs/by-name/po/poptop/package.nix | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 pkgs/by-name/po/poptop/package.nix

diff --git a/pkgs/by-name/po/poptop/package.nix b/pkgs/by-name/po/poptop/package.nix
new file mode 100644
index 000000000000..8796c2b16272
--- /dev/null
+++ b/pkgs/by-name/po/poptop/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+let
+  pname = "poptop";
+  version = "0.1.8";
+in
+buildGoModule {
+  inherit pname version;
+
+  src = fetchFromGitHub {
+    owner = "bakks";
+    repo = "poptop";
+    rev = "v${version}";
+    hash = "sha256-CwJpkGNTDmtXfJx6GGz2XRU0fMeKl7I3fXm4BJ9MAQ4=";
+  };
+
+  vendorHash = "sha256-Ccvr+J+GDKnhlrlv0/kTaQYD986As7yb/h6Vyiuqjoc=";
+
+  meta = {
+    description = "Modern top command that charts system metrics like CPU load, network IO, etc in the terminal";
+    changelog = "https://github.com/bakks/poptop/releases/tag/v${version}";
+    homepage = "https://github.com/bakks/poptop";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
+    mainProgram = "poptop";
+  };
+}

From 5b5e7b07febd4dda47e945ced8a5c6551c1323f6 Mon Sep 17 00:00:00 2001
From: goatastronaut0212 <goatastronaut0212@outlook.com>
Date: Thu, 15 Aug 2024 09:11:25 +0700
Subject: [PATCH 10/24] maintainers: update goatastronaut0212's email

---
 .mailmap                        | 1 +
 maintainers/maintainer-list.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 26abb4c7cfc0..d7e9caacea7e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -3,6 +3,7 @@ Anderson Torres <torres.anderson.85@protonmail.com>
 Atemu <git@atemu.net> <atemu.main@gmail.com>
 Daniel Løvbrøtte Olsen <me@dandellion.xyz> <daniel.olsen99@gmail.com>
 Fabian Affolter <mail@fabian-affolter.ch> <fabian@affolter-engineering.ch>
+goatastronaut0212 <goatastronaut0212@proton.me> <goatastronaut0212@outlook.com>
 Janne Heß <janne@hess.ooo> <dasJ@users.noreply.github.com>
 Jörg Thalheim <joerg@thalheim.io> <Mic92@users.noreply.github.com>
 Martin Weinelt <hexa@darmstadt.ccc.de> <mweinelt@users.noreply.github.com>
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 04f5f6785c42..90719d3f5822 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1887,7 +1887,7 @@
     keys = [ { fingerprint = "BF47 81E1 F304 1ADF 18CE  C401 DE16 C7D1 536D A72F"; } ];
   };
   astronaut0212 = {
-    email = "goatastronaut0212@proton.me";
+    email = "goatastronaut0212@outlook.com";
     github = "goatastronaut0212";
     githubId = 119769817;
     name = "goatastronaut0212";

From 910e535cde54dc9bdee1af4c65853caf4231d0f3 Mon Sep 17 00:00:00 2001
From: goatastronaut0212 <goatastronaut0212@outlook.com>
Date: Thu, 15 Aug 2024 08:05:05 +0700
Subject: [PATCH 11/24] caprine: init at 2.60.1

---
 pkgs/by-name/ca/caprine/package.nix | 93 +++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 pkgs/by-name/ca/caprine/package.nix

diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix
new file mode 100644
index 000000000000..214b304ff577
--- /dev/null
+++ b/pkgs/by-name/ca/caprine/package.nix
@@ -0,0 +1,93 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  buildNpmPackage,
+  makeDesktopItem,
+  copyDesktopItems,
+  electron,
+}:
+
+let
+  electronDist = electron + (if stdenv.isDarwin then "/Applications" else "/libexec/electron");
+in
+buildNpmPackage rec {
+  pname = "caprine";
+  version = "2.60.1";
+
+  src = fetchFromGitHub {
+    owner = "sindresorhus";
+    repo = "caprine";
+    rev = "v${version}";
+    hash = "sha256-y4W295i7FhgJC3SlwSr801fLOGJY1WF136bbkkBUvyw=";
+  };
+
+  ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+
+  npmDepsHash = "sha256-JHaUc2p+wHsqWtls8xquHK9qnypuCrR0AQMGxcrTsC0=";
+
+  nativeBuildInputs = [ copyDesktopItems ];
+
+  postBuild = ''
+    cp -r ${electronDist} electron-dist
+    chmod -R u+w electron-dist
+
+    npm exec electron-builder -- \
+        --dir \
+        -c.npmRebuild=true \
+        -c.asarUnpack="**/*.node" \
+        -c.electronDist=electron-dist \
+        -c.electronVersion=${electron.version}
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    ${lib.optionalString stdenv.isLinux ''
+      mkdir -p $out/share/caprine
+      cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/caprine
+
+      makeWrapper ${lib.getExe electron} $out/bin/caprine \
+          --add-flags $out/share/caprine/resources/app.asar \
+          --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
+          --set-default ELECTRON_IS_DEV 0 \
+          --inherit-argv0
+
+      install -Dm644 build/icon.png $out/share/icons/hicolor/512x512/apps/caprine.png
+    ''}
+
+    ${lib.optionalString stdenv.isDarwin ''
+      mkdir -p $out/Applications
+      cp -r dist/mac*/"Caprine.app" $out/Applications
+      makeWrapper "$out/Applications/Caprine.app/Contents/MacOS/Caprine" $out/bin/caprine
+    ''}
+
+    runHook postInstall
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "caprine";
+      exec = "caprine %U";
+      icon = "caprine";
+      desktopName = "Caprine";
+      comment = meta.description;
+      categories = [
+        "Network"
+        "InstantMessaging"
+        "Chat"
+      ];
+      mimeTypes = [ "x-scheme-handler/caprine" ];
+      terminal = false;
+    })
+  ];
+
+  meta = {
+    changelog = "https://github.com/sindresorhus/caprine/releases/tag/${src.rev}";
+    description = "Elegant Facebook Messenger desktop app";
+    homepage = "https://github.com/sindresorhus/caprine";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ astronaut0212 ];
+    inherit (electron.meta) platforms;
+  };
+}

From 28505bd0025e8757259664cfec4d5913fdfe3832 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Aug 2024 22:55:05 +0000
Subject: [PATCH 12/24] python312Packages.anthropic: 0.33.0 -> 0.34.0

---
 pkgs/development/python-modules/anthropic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix
index 27b6ee0acf94..014b1feaa0f6 100644
--- a/pkgs/development/python-modules/anthropic/default.nix
+++ b/pkgs/development/python-modules/anthropic/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "anthropic";
-  version = "0.33.0";
+  version = "0.34.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "anthropics";
     repo = "anthropic-sdk-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Xaj4FPveqiivud6Hi/LlRkM9/8jrvX6IDirO/laad5U=";
+    hash = "sha256-UjwBxuhXuwJfWewg9si/oIuXgiqbNAYm4lK2f+C6VJU=";
   };
 
   build-system = [

From 0713f4eb031597cc59fc98a8674904c84913f196 Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@gmail.com>
Date: Tue, 20 Aug 2024 17:55:15 +0200
Subject: [PATCH 13/24] apache-jena-fuseki: fix provided scripts

Fuseki provides a suite of utility scripts that don't need to be wrapped,
but that are broken by the wrapping because they look at their own name.

By only wrapping the actual fuseki binaries, we fix the issue.
---
 pkgs/servers/nosql/apache-jena/fuseki-binary.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
index 65a5b720d468..ade900bacb60 100644
--- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
+++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     cp -r . "$out"
     chmod +x $out/fuseki
     ln -s "$out"/{fuseki-backup,fuseki-server,fuseki} "$out/bin"
-    for i in "$out"/bin/*; do
+    for i in "$out"/bin/fuseki*; do
       # It is necessary to set the default $FUSEKI_BASE directory to a writable location
       # By default it points to $FUSEKI_HOME/run which is in the nix store
       wrapProgram "$i" \

From 587eb1d0b04c25f9fe50adf3f90c782b053d52db Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Tue, 20 Aug 2024 09:18:11 -0700
Subject: [PATCH 14/24] openscad-unstable: 2024-07-24 -> 2024-08-17

---
 pkgs/by-name/op/openscad-unstable/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix
index b0881fe10e05..4e3237a68292 100644
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -82,12 +82,12 @@ in
 # clang consume much less RAM than GCC
 clangStdenv.mkDerivation rec {
   pname = "openscad-unstable";
-  version = "2024-07-24";
+  version = "2024-08-17";
   src = fetchFromGitHub {
     owner = "openscad";
     repo = "openscad";
-    rev = "48f4430b12c29a95ab89ffdd8307205d7189421c";
-    hash = "sha256-A75JHmWVNlgURb5one5JFkztCrVff2RbyaDaObUp4ZY=";
+    rev = "a16ca2a670840cfecb76254967380385d4d573cb";
+    hash = "sha256-YadbrYaxxdVNejasFW0MbcYwjwTHHQbVjqen9PKEsYQ=";
     fetchSubmodules = true;
   };
   patches = [ ./test.diff ];

From 4c8bd34ce05f399e4876ff1496898b87c4780ea4 Mon Sep 17 00:00:00 2001
From: pedohorse <13556996+pedohorse@users.noreply.github.com>
Date: Wed, 21 Aug 2024 18:03:37 +0200
Subject: [PATCH 15/24] houdini: 20.5.278 -> 20.5.332

---
 pkgs/applications/misc/houdini/runtime.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index ed8f44f45266..a660ee2a5d83 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -1,11 +1,11 @@
 { requireFile, callPackage }:
 
 callPackage ./runtime-build.nix rec {
-  version = "20.5.278";
+  version = "20.5.332";
   eulaDate = "2021-10-13";
   src = requireFile {
     name = "houdini-${version}-linux_x86_64_gcc11.2.tar.gz";
-    hash = "sha256-O5oAoiDiu+xrmDfTnilPqZue8+dXVTHnK0yrX6moTSc=";
+    hash = "sha256-ZqbLCWfPUo0fXS9liKOXsUEpm1d60bHIkbx+K98gFtU=";
     url = "https://www.sidefx.com/download/daily-builds/?production=true";
   };
 }

From 91ef5d55dcc8f5d7c15fbffcf1d480d08dba895a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 Aug 2024 23:56:49 +0000
Subject: [PATCH 16/24] python312Packages.unstructured: 0.15.1 -> 0.15.7

---
 pkgs/development/python-modules/unstructured/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix
index 64c823484817..06f4ccc6b58d 100644
--- a/pkgs/development/python-modules/unstructured/default.nix
+++ b/pkgs/development/python-modules/unstructured/default.nix
@@ -57,7 +57,7 @@
   grpcio,
 }:
 let
-  version = "0.15.1";
+  version = "0.15.7";
   optional-dependencies = {
     huggingflace = [
       langdetect
@@ -100,7 +100,7 @@ buildPythonPackage {
     owner = "Unstructured-IO";
     repo = "unstructured";
     rev = "refs/tags/${version}";
-    hash = "sha256-zDlkqeP89O3u5Yir9Xi+Z6BpLd6r0QXJ563kc2krjAs=";
+    hash = "sha256-Tcb9Mv60T6WztFGKfSgfQdxegK9OAjeArmEQAVvLbEQ=";
   };
 
   propagatedBuildInputs = [

From ca94e8528c367de289d3b475720a74fc76626f44 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 22 Aug 2024 01:54:18 +0200
Subject: [PATCH 17/24] music-assistant: 2.1.1 -> 2.2.0

https://github.com/music-assistant/server/releases/tag/2.2.0
---
 pkgs/by-name/mu/music-assistant/frontend.nix  |  4 ++--
 pkgs/by-name/mu/music-assistant/package.nix   | 17 ++---------------
 pkgs/by-name/mu/music-assistant/providers.nix |  7 +++++--
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/mu/music-assistant/frontend.nix b/pkgs/by-name/mu/music-assistant/frontend.nix
index b889fe359618..cd7c6793b5f2 100644
--- a/pkgs/by-name/mu/music-assistant/frontend.nix
+++ b/pkgs/by-name/mu/music-assistant/frontend.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "music-assistant-frontend";
-  version = "2.7.0";
+  version = "2.8.7";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KrloxxdqIwQ5NsxAGm28D5StHnw9LTqDDtcchD5X5Qk=";
+    hash = "sha256-L7ASmYtJja+Hy4MnGrNWIwSjvhfq2iXfWm4gGKAnEec=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix
index c40ccf1a6716..73845eec3bc4 100644
--- a/pkgs/by-name/mu/music-assistant/package.nix
+++ b/pkgs/by-name/mu/music-assistant/package.nix
@@ -11,19 +11,6 @@ let
   python = python3.override {
     self = python;
     packageOverrides = self: super: {
-      aiojellyfin = super.aiojellyfin.overridePythonAttrs rec {
-        version = "0.9.2";
-
-        src = fetchFromGitHub {
-          owner = "jc2k";
-          repo = "aiojellyfin";
-          rev = "refs/tags/v${version}";
-          hash = "sha256-q+b1tKr46qq3PULPkCaQk2VoC1aaNxPK/E1Kj4PABfI=";
-        };
-
-        doCheck = false;
-      };
-
       music-assistant-frontend = self.callPackage ./frontend.nix { };
     };
   };
@@ -37,14 +24,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "music-assistant";
-  version = "2.1.1";
+  version = "2.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "server";
     rev = "refs/tags/${version}";
-    hash = "sha256-ALsl2xfAFYejDEhR5/ZpeIxoHFgvz471tb4OP5xQAUE=";
+    hash = "sha256-GQvbkdyybJ3X09fCKwu+iZvq7UdHIMzCpYjenGg/zQA=";
   };
 
   patches = [
diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix
index 702dadf127dd..4e50e3fcf045 100644
--- a/pkgs/by-name/mu/music-assistant/providers.nix
+++ b/pkgs/by-name/mu/music-assistant/providers.nix
@@ -1,7 +1,7 @@
 # Do not edit manually, run ./update-providers.py
 
 {
-  version = "2.1.1";
+  version = "2.2.0";
   providers = {
     airplay = [
     ];
@@ -61,7 +61,10 @@
     ];
     soundcloud = [
     ]; # missing soundcloudpy
-    spotify = [
+    spotify = ps: with ps; [
+      pkce
+    ];
+    template_player_provider = [
     ];
     test = [
     ];

From 4a8caa04a807ce116c288d32764756fbcf5d491e Mon Sep 17 00:00:00 2001
From: Tom McLaughlin <tom@codedown.io>
Date: Mon, 12 Aug 2024 18:55:35 -0700
Subject: [PATCH 18/24] kata-runtime: init at 3.7.0

Release notes: https://github.com/kata-containers/kata-containers/releases/tag/3.7.0
---
 pkgs/by-name/ka/kata-runtime/kata-images.nix | 49 +++++++++++
 pkgs/by-name/ka/kata-runtime/package.nix     | 92 ++++++++++++++++++++
 2 files changed, 141 insertions(+)
 create mode 100644 pkgs/by-name/ka/kata-runtime/kata-images.nix
 create mode 100644 pkgs/by-name/ka/kata-runtime/package.nix

diff --git a/pkgs/by-name/ka/kata-runtime/kata-images.nix b/pkgs/by-name/ka/kata-runtime/kata-images.nix
new file mode 100644
index 000000000000..b145c9a340d4
--- /dev/null
+++ b/pkgs/by-name/ka/kata-runtime/kata-images.nix
@@ -0,0 +1,49 @@
+# Derived from https://github.com/colemickens/nixpkgs-kubernetes
+{
+  fetchzip,
+  lib,
+  stdenv,
+  version,
+}:
+
+let
+  imageSuffix =
+    {
+      "x86_64-linux" = "amd64";
+      "aarch64-linux" = "arm64";
+    }
+    ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+
+  imageHash =
+    {
+      "x86_64-linux" = "sha256-6ySKAqrbHDRgVlI7wm2p4Uw96ZMzUpP00liujxlruSM=";
+      "aarch64-linux" = "sha256-pEPkDXT4OunfN2sGb8Ru05tFHaBsYUcmG5Iy7yH4kX8=";
+    }
+    ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+
+in
+fetchzip {
+  name = "kata-images-${version}";
+  url = "https://github.com/kata-containers/kata-containers/releases/download/${version}/kata-static-${version}-${imageSuffix}.tar.xz";
+  hash = imageHash;
+
+  postFetch = ''
+    mv $out/kata/share/kata-containers kata-containers
+    rm -r $out
+    mkdir -p $out/share
+    mv kata-containers $out/share/kata-containers
+  '';
+
+  meta = {
+    description = "Lightweight Virtual Machines like containers that provide the workload isolation and security of VMs";
+    homepage = "https://github.com/kata-containers/kata-containers";
+    changelog = "https://github.com/kata-containers/kata-containers/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ thomasjm ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+}
diff --git a/pkgs/by-name/ka/kata-runtime/package.nix b/pkgs/by-name/ka/kata-runtime/package.nix
new file mode 100644
index 000000000000..403ea76d21ba
--- /dev/null
+++ b/pkgs/by-name/ka/kata-runtime/package.nix
@@ -0,0 +1,92 @@
+# Derived from https://github.com/colemickens/nixpkgs-kubernetes
+{
+  buildGoModule,
+  callPackage,
+  fetchFromGitHub,
+  lib,
+  qemu_kvm,
+  stdenv,
+  virtiofsd,
+  yq-go,
+}:
+
+let
+  version = "3.7.0";
+
+  kata-images = callPackage ./kata-images.nix { inherit version; };
+
+  qemuSystemBinary =
+    {
+      "x86_64-linux" = "qemu-system-x86_64";
+      "aarch64-linux" = "qemu-system-aarch64";
+    }
+    ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+
+in
+buildGoModule rec {
+  pname = "kata-runtime";
+  inherit version;
+
+  # https://github.com/NixOS/nixpkgs/issues/25959
+  hardeningDisable = [ "fortify" ];
+
+  src = fetchFromGitHub {
+    owner = "kata-containers";
+    repo = "kata-containers";
+    rev = version;
+    hash = "sha256-Ir+/ZZJHm6E+044wczU3UvL+Py9Wprgw2QKJaYyDrKU=";
+  };
+
+  sourceRoot = "source/src/runtime";
+
+  vendorHash = null;
+
+  dontConfigure = true;
+
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "DEFAULT_HYPERVISOR=qemu"
+    "HYPERVISORS=qemu"
+    "QEMUPATH=${qemu_kvm}/bin/${qemuSystemBinary}"
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    mkdir -p $TMPDIR/gopath/bin
+    ln -s ${yq-go}/bin/yq $TMPDIR/gopath/bin/yq
+    HOME=$TMPDIR GOPATH=$TMPDIR/gopath make ${toString makeFlags}
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    HOME=$TMPDIR GOPATH=$TMPDIR/gopath make ${toString makeFlags} install
+    ln -s $out/bin/containerd-shim-kata-v2 $out/bin/containerd-shim-kata-qemu-v2
+    ln -s $out/bin/containerd-shim-kata-v2 $out/bin/containerd-shim-kata-clh-v2
+
+    # Update a few paths to the Nix-provided versions: kata-images, virtiofsd, and qemu_kvm
+    sed -i \
+      -e "s!$out/share/kata-containers!${kata-images}/share/kata-containers!" \
+      -e "s!^virtio_fs_daemon.*!virtio_fs_daemon=\"${virtiofsd}/bin/virtiofsd\"!" \
+      -e "s!^valid_virtio_fs_daemon_paths.*!valid_virtio_fs_daemon_paths=[\"${qemu_kvm}/libexec/virtiofsd\"]!" \
+      "$out/share/defaults/kata-containers/"*.toml
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    inherit kata-images;
+  };
+
+  meta = {
+    description = "Lightweight Virtual Machines like containers that provide the workload isolation and security of VMs";
+    homepage = "https://github.com/kata-containers/kata-containers";
+    changelog = "https://github.com/kata-containers/kata-containers/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ thomasjm ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+  };
+}

From b86f7c24baf550a420581d47112fa976effe1397 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 Aug 2024 00:30:53 +0000
Subject: [PATCH 19/24] buildah-unwrapped: 1.37.1 -> 1.37.2

---
 pkgs/development/tools/buildah/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index ab971e5b9615..c242ab3b4ff3 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -17,13 +17,13 @@
 
 buildGoModule rec {
   pname = "buildah";
-  version = "1.37.1";
+  version = "1.37.2";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "buildah";
     rev = "v${version}";
-    hash = "sha256-43p2sD6mpcoMukr7mY2GTsti4FVC7Blq0ZozuIJlC30=";
+    hash = "sha256-ZZa/83Ut2+obDsh/t8/G6gUAfnBEohXeIQxC8yCQzHs=";
   };
 
   outputs = [ "out" "man" ];

From dbecfcef10b0e38fc02f7779b23dbeba731c4c13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 Aug 2024 03:50:33 +0000
Subject: [PATCH 20/24] ginkgo: 2.20.0 -> 2.20.1

---
 pkgs/development/tools/ginkgo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix
index 2cd8c9a0fc10..42916115601d 100644
--- a/pkgs/development/tools/ginkgo/default.nix
+++ b/pkgs/development/tools/ginkgo/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "ginkgo";
-  version = "2.20.0";
+  version = "2.20.1";
 
   src = fetchFromGitHub {
     owner = "onsi";
     repo = "ginkgo";
     rev = "v${version}";
-    sha256 = "sha256-18j9eBqFz2D3eK1uQPQgAUilJZmFbyS+0DqOjno9LTE=";
+    sha256 = "sha256-RbxqFzWJcfoRMHqQUq3it4+eqn98nUirC6a1f2EOpmk=";
   };
   vendorHash = "sha256-RfIkiASUEK1TBSBx/rx9UWVE8NuZssYmoTKggkj/kQE=";
 

From a755db719210fd946f208180dbc643982e483717 Mon Sep 17 00:00:00 2001
From: Markus Theil <theil.markus@gmail.com>
Date: Thu, 22 Aug 2024 10:51:33 +0200
Subject: [PATCH 21/24] mstflint_access: 4.28.0-1 -> 4.29.0-1

This is a small follow-up on the mstflint bump to 4.29.0-1.
I added a reminder for this in the future.

Signed-off-by: Markus Theil <theil.markus@gmail.com>
---
 pkgs/os-specific/linux/mstflint_access/default.nix | 2 +-
 pkgs/tools/misc/mstflint/default.nix               | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/mstflint_access/default.nix b/pkgs/os-specific/linux/mstflint_access/default.nix
index 5d9a60216a54..a423f38506d6 100644
--- a/pkgs/os-specific/linux/mstflint_access/default.nix
+++ b/pkgs/os-specific/linux/mstflint_access/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/Mellanox/mstflint/releases/download/v${version}/kernel-mstflint-${version}.tar.gz";
-    hash = "sha256-bWYglHJUNCPT13N7aBdjbLPMZIk7vjvF+o9W3abDNr0=";
+    hash = "sha256-D++AnLUEB8d9WlReY/Ewp8E2cvbapJ3QrvYySKwaszk=";
   };
 
   nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies;
diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix
index b03c155ecc29..5ab999792f56 100644
--- a/pkgs/tools/misc/mstflint/default.nix
+++ b/pkgs/tools/misc/mstflint/default.nix
@@ -25,6 +25,8 @@
 
 stdenv.mkDerivation rec {
   pname = "mstflint";
+
+  # if you update the version of this package, also update the input hash in mstflint_access!
   version = "4.29.0-1";
 
   src = fetchurl {

From dc868e06afb12d5e6971228ed43daecb6fe3de1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 Aug 2024 09:13:01 +0000
Subject: [PATCH 22/24] pyright: 1.1.376 -> 1.1.377

---
 pkgs/by-name/py/pyright/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix
index 555e3cab65be..5f24f8e592bc 100644
--- a/pkgs/by-name/py/pyright/package.nix
+++ b/pkgs/by-name/py/pyright/package.nix
@@ -1,13 +1,13 @@
 { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }:
 
 let
-  version = "1.1.376";
+  version = "1.1.377";
 
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "pyright";
     rev = "${version}";
-    hash = "sha256-OxLZF2ZqAHdiXRAO+bC9e9gU05di+NufZhmN/wesm3I=";
+    hash = "sha256-OvdA3IFUdeBEU97+F9C86k6PDGOYggExj+ZoIt77PuI=";
   };
 
   patchedPackageJSON = runCommand "package.json" { } ''
@@ -37,7 +37,7 @@ let
     pname = "pyright-internal";
     inherit version src;
     sourceRoot = "${src.name}/packages/pyright-internal";
-    npmDepsHash = "sha256-j7+uigtOnYFqHKxcnOJWaQcvGoHJ5FM3BkW6folfkuw=";
+    npmDepsHash = "sha256-nvqg0145zW+4uvgoATWqzexQVmUBmateowxd6E14Tl8=";
     dontNpmBuild = true;
     installPhase = ''
       runHook preInstall
@@ -51,7 +51,7 @@ buildNpmPackage rec {
   inherit version src;
 
   sourceRoot = "${src.name}/packages/pyright";
-  npmDepsHash = "sha256-m66enEsj5G0jq3xTnJySIc9bS9SW6YagO00H37lIEIU=";
+  npmDepsHash = "sha256-aTBk8O6yEwOt1N/WaFOOfPZvfILZ5x7E2vm9N7+qth4=";
 
   postPatch = ''
     chmod +w ../../

From d820fe987ecc555f250633db6f78f0d3b72e010c Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Thu, 22 Aug 2024 12:12:17 +0200
Subject: [PATCH 23/24] nixos/etc: wantedBy -> requiredBy for mounting overlay
 etc

I've observed that sometimes the overlay mount unit does not get started
when using wantedBy. requiredBy makes this relationship stricter and if
necessary will restart the initrd-fs.target and thus ensure that when
this target is reached /etc has alredy been mounted. This is in line
with the description of initrd-fs.target in systemd.special:

> Thus, once this target is reached the /sysroot/ hierarchy is fully set up
---
 nixos/modules/system/etc/etc-activation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/etc/etc-activation.nix b/nixos/modules/system/etc/etc-activation.nix
index f47fd771c659..ed9f50941771 100644
--- a/nixos/modules/system/etc/etc-activation.nix
+++ b/nixos/modules/system/etc/etc-activation.nix
@@ -64,7 +64,7 @@
             ] ++ lib.optionals (!config.system.etc.overlay.mutable) [
               "ro"
             ]);
-            wantedBy = [ "initrd-fs.target" ];
+            requiredBy = [ "initrd-fs.target" ];
             before = [ "initrd-fs.target" ];
             requires = lib.mkIf config.system.etc.overlay.mutable [ "rw-etc.service" ];
             after = lib.mkIf config.system.etc.overlay.mutable [ "rw-etc.service" ];

From 7845b89e24ff9e91e6e13f66ee5a1a73958d22fb Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Thu, 22 Aug 2024 12:17:18 +0200
Subject: [PATCH 24/24] nixos/etc: unmount old /etc hierarchy lazily

This should fix errors where /etc is reported to be busy and thus cannot
be unmounted.

Another solution we can consider if this doesn't work out as we expect
is to forcefully unmount /etc.
---
 nixos/modules/system/etc/etc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix
index 69f4ab92548f..ae186467ee6b 100644
--- a/nixos/modules/system/etc/etc.nix
+++ b/nixos/modules/system/etc/etc.nix
@@ -279,7 +279,7 @@ in
         ${pkgs.move-mount-beneath}/bin/move-mount --move --beneath $tmpEtcMount /etc
 
         # Unmount the top /etc mount to atomically reveal the new mount.
-        umount --recursive /etc
+        umount --lazy --recursive /etc
       fi
     '' else ''
       # Set up the statically computed bits of /etc.