From ba2b91866b7097c9f6aa6983387dce625ed8d24c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20N=C3=BCtzi?= <gnuetzi@gmail.com>
Date: Fri, 13 Sep 2024 13:25:19 +0200
Subject: [PATCH 01/25] chore: typos and comment fixups in Go build-support
 function

---
 pkgs/build-support/go/module.nix | 42 ++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index ab8491da34cd..f34390883a4e 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -1,56 +1,62 @@
 { go, cacert, git, lib, stdenv }:
 
 { name ? "${args'.pname}-${args'.version}"
+  # The source used to build the derivation.
 , src
+  # Native build inputs used for the derivation.
 , nativeBuildInputs ? [ ]
 , passthru ? { }
 , patches ? [ ]
 
-  # A function to override the goModules derivation
+  # A function to override the `goModules` derivation.
 , overrideModAttrs ? (_oldAttrs: { })
 
-  # path to go.mod and go.sum directory
+  # Directory to the `go.mod` and `go.sum` relative to the `src`.
 , modRoot ? "./"
 
-  # vendorHash is the SRI hash of the vendored dependencies
-  #
-  # if vendorHash is null, then we won't fetch any dependencies and
-  # rely on the vendor folder within the source.
+  # The SRI hash of the vendored dependencies.
+  # If `vendorHash` is `nulL`, no dependencies are fetched and
+  # the build relies on the vendor folder within the source.
 , vendorHash ? throw (
     if args'?vendorSha256 then
       "buildGoModule: Expect vendorHash instead of vendorSha256"
     else
       "buildGoModule: vendorHash is missing"
   )
+
   # Whether to delete the vendor folder supplied with the source.
 , deleteVendor ? false
+
   # Whether to fetch (go mod download) and proxy the vendor directory.
   # This is useful if your code depends on c code and go mod tidy does not
   # include the needed sources to build or if any dependency has case-insensitive
   # conflicts which will produce platform dependant `vendorHash` checksums.
 , proxyVendor ? false
 
-  # We want parallel builds by default
+  # We want parallel builds by default.
 , enableParallelBuilding ? true
 
   # Do not enable this without good reason
-  # IE: programs coupled with the compiler
+  # IE: programs coupled with the compiler.
 , allowGoReference ? false
 
+  # Go env. variable to enable CGO.
 , CGO_ENABLED ? go.CGO_ENABLED
 
+  # Meta data for the final derivation.
 , meta ? { }
 
-  # Not needed with buildGoModule
+  # Not needed with `buildGoModule`.
 , goPackagePath ? ""
 
+  # Go linker flags.
 , ldflags ? [ ]
-
+  # Go build flags.
 , GOFLAGS ? [ ]
 
-  # needed for buildFlags{,Array} warning
-, buildFlags ? ""
-, buildFlagsArray ? ""
+  # Needed for buildFlags{,Array} warning
+, buildFlags ? "" # deprecated
+, buildFlagsArray ? "" # deprecated
 
 , ...
 }@args':
@@ -73,10 +79,10 @@ let
     inherit (go) GOOS GOARCH;
     inherit GO111MODULE GOTOOLCHAIN;
 
-    # The following inheritence behavior is not trivial to expect, and some may
+    # The following inheritance behavior is not trivial to expect, and some may
     # argue it's not ideal. Changing it may break vendor hashes in Nixpkgs and
     # out in the wild. In anycase, it's documented in:
-    # doc/languages-frameworks/go.section.md
+    # doc/languages-frameworks/go.section.md.
     prePatch = args.prePatch or "";
     patches = args.patches or [ ];
     patchFlags = args.patchFlags or [ ];
@@ -151,8 +157,8 @@ let
 
     outputHashMode = "recursive";
     outputHash = vendorHash;
-    # Handle empty vendorHash; avoid
-    # error: empty hash requires explicit hash algorithm
+    # Handle empty `vendorHash`; avoid error:
+    # empty hash requires explicit hash algorithm.
     outputHashAlgo = if vendorHash == "" then "sha256" else null;
   }).overrideAttrs overrideModAttrs;
 
@@ -307,7 +313,7 @@ let
     passthru = passthru // { inherit go goModules vendorHash; };
 
     meta = {
-      # Add default meta information
+      # Add default meta information.
       platforms = go.meta.platforms or lib.platforms.all;
     } // meta;
   });

From fa49cf159d1130325ac15a191b96e68c2bbc9154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 18 Jul 2024 09:57:50 -0700
Subject: [PATCH 02/25] python312Packages.icalendar: 5.0.13 -> 6.0.0

Diff: https://github.com/collective/icalendar/compare/refs/tags/v5.0.13...v6.0.0

Changelog: https://github.com/collective/icalendar/blob/v6.0.0/CHANGES.rst
---
 .../python-modules/icalendar/default.nix      | 23 ++++++++++++++-----
 .../icalendar/no-dynamic-version.patch        | 17 ++++++++++++++
 2 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/python-modules/icalendar/no-dynamic-version.patch

diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix
index 1170485bf39f..e03544ac41d4 100644
--- a/pkgs/development/python-modules/icalendar/default.nix
+++ b/pkgs/development/python-modules/icalendar/default.nix
@@ -2,17 +2,19 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  replaceVars,
   pythonOlder,
-  setuptools,
+  hatch-vcs,
+  hatchling,
   backports-zoneinfo,
   python-dateutil,
-  pytz,
+  tzdata,
   hypothesis,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
-  version = "5.0.13";
+  version = "6.0.0";
   pname = "icalendar";
   pyproject = true;
 
@@ -20,14 +22,23 @@ buildPythonPackage rec {
     owner = "collective";
     repo = "icalendar";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2gpWfLXR4HThw23AWxY2rY9oiK6CF3Qiad8DWHCs4Qk=";
+    hash = "sha256-eWFDY/pNVfcUk3PfB0vXqh9swuSGtflUw44IMDJI+yI=";
   };
 
-  build-system = [ setuptools ];
+  patches = [
+    (replaceVars ./no-dynamic-version.patch {
+      inherit version;
+    })
+  ];
+
+  build-system = [
+    hatch-vcs
+    hatchling
+  ];
 
   dependencies = [
     python-dateutil
-    pytz
+    tzdata
   ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/icalendar/no-dynamic-version.patch b/pkgs/development/python-modules/icalendar/no-dynamic-version.patch
new file mode 100644
index 000000000000..4754b6441a5f
--- /dev/null
+++ b/pkgs/development/python-modules/icalendar/no-dynamic-version.patch
@@ -0,0 +1,17 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 9730e46..9834686 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -34,11 +34,7 @@ maintainers = [
+   { name="Christian Geier" },
+   { name="Jaca", email="vitouejj@gmail.com" },
+ ]
+-# These attributes are dynamically generated by hatch-vcs
+-dynamic = [
+-    "urls",
+-    "version"
+-]
++version = "@version@"
+ description = "iCalendar parser/generator"
+ readme = { file = "README.rst", content-type = "text/x-rst" }
+ 

From 562ccf65eae3bb1b24f0c4787a7f13eb7e3b0db5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 29 Sep 2024 22:42:30 -0700
Subject: [PATCH 03/25] python312Packages.x-wr-timezone: 0.0.7 -> 1.0.1

Diff: https://github.com/niccokunzmann/x-wr-timezone/compare/v0.0.7...v1.0.1

Changelog: https://github.com/niccokunzmann/x-wr-timezone/blob/v1.0.1/README.rst#changelog
---
 .../python-modules/x-wr-timezone/default.nix  | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/x-wr-timezone/default.nix b/pkgs/development/python-modules/x-wr-timezone/default.nix
index 4d873e9590f5..507180439589 100644
--- a/pkgs/development/python-modules/x-wr-timezone/default.nix
+++ b/pkgs/development/python-modules/x-wr-timezone/default.nix
@@ -4,46 +4,43 @@
   fetchFromGitHub,
   setuptools,
   icalendar,
-  pytz,
+  tzdata,
   pytestCheckHook,
   restructuredtext-lint,
   pygments,
+  pytz,
 }:
 
 buildPythonPackage rec {
   pname = "x-wr-timezone";
-  version = "0.0.7";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "niccokunzmann";
     repo = "x-wr-timezone";
     rev = "v${version}";
-    hash = "sha256-itqsVYYUcpbKTh0BM6IHk6F9xhB+pAQnnJsnZAVpNL4=";
+    hash = "sha256-MDFniFhgRuNtYITH/IUUP/HHC79coqxgXrlErj+Yrcs=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     icalendar
-    pytz
+    tzdata
   ];
 
   nativeCheckInputs = [
     pytestCheckHook
     restructuredtext-lint
     pygments
+    pytz
   ];
 
   preCheck = ''
     export PATH=$out/bin:$PATH
   '';
 
-  disabledTests = [
-    "test_input_to_output"
-    "test_output_stays_the_same"
-  ];
-
   pythonImportsCheck = [ "x_wr_timezone" ];
 
   meta = {

From 7e4c6016a082970a91bd3f0dd62ebde47f7a16a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 29 Sep 2024 22:42:39 -0700
Subject: [PATCH 04/25] python312Packages.recurring-ical-events: 3.3.0 -> 3.3.2

Diff: https://github.com/niccokunzmann/python-recurring-ical-events/compare/v3.3.0...v3.3.2

Changelog: https://github.com/niccokunzmann/python-recurring-ical-events/blob/v3.3.2/README.rst#changelog
---
 .../python-modules/recurring-ical-events/default.nix   | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix
index 3be853d2fc5e..de3e2f377d88 100644
--- a/pkgs/development/python-modules/recurring-ical-events/default.nix
+++ b/pkgs/development/python-modules/recurring-ical-events/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "recurring-ical-events";
-  version = "3.3.0";
+  version = "3.3.2";
 
   disabled = pythonOlder "3.8";
 
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "niccokunzmann";
     repo = "python-recurring-ical-events";
     rev = "v${version}";
-    hash = "sha256-1Ggxi61epge6Rxc/vJ7OuuNjjeaQYReEPeOZV8DLghk=";
+    hash = "sha256-1cWjOaL+STrHMux/fc+FaRVQIOMcseznNRcghsV+DtM=";
   };
 
   build-system = [ setuptools ];
@@ -47,12 +47,6 @@ buildPythonPackage rec {
     pygments
   ];
 
-  disabledTests = lib.optionals (lib.versionOlder icalendar.version "6") [
-    # ModuleNotFoundError: No module named 'icalendar.timezone'
-    "test_can_import_zoneinfo"
-    "test_documentation_file"
-  ];
-
   pythonImportsCheck = [ "recurring_ical_events" ];
 
   meta = {

From 828ad80e8f5bb4fde4a048edbfb997743b200b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Mon, 30 Sep 2024 22:18:37 -0700
Subject: [PATCH 05/25] xandikos: fix compatibility with icalendar v6

---
 pkgs/servers/xandikos/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix
index c22db465b223..c393f48ef9e9 100644
--- a/pkgs/servers/xandikos/default.nix
+++ b/pkgs/servers/xandikos/default.nix
@@ -1,5 +1,6 @@
 { lib
 , fetchFromGitHub
+, fetchpatch2
 , python3Packages
 , nixosTests
 }:
@@ -18,6 +19,15 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-cBsceJ6tib8OYx5L2Hv2AqRS+ADRSLIuJGIULNpAmEI=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "fix-compatibility-with-icalendar-v6.patch";
+      url = "https://github.com/jelmer/xandikos/commit/ae8924c374ed86b2efde5bfbc75e56f6d8318086.patch";
+      excludes = [ "requirements.txt" ];
+      hash = "sha256-PCKo5C6Ejw9ZsFFLAMw1ZtMoCq9gJxR65K7CM6RUYwU=";
+    })
+  ];
+
   nativeBuildInputs = with python3Packages; [
     setuptools
     wheel
@@ -31,6 +41,7 @@ python3Packages.buildPythonApplication rec {
     icalendar
     jinja2
     multidict
+    pytz
     vobject
   ];
 

From 2ac9749b76c66670dae493bec03316eafcbf3522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Mon, 30 Sep 2024 22:20:57 -0700
Subject: [PATCH 06/25] xandikos: modernize

---
 pkgs/servers/xandikos/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix
index c393f48ef9e9..d86ff503e803 100644
--- a/pkgs/servers/xandikos/default.nix
+++ b/pkgs/servers/xandikos/default.nix
@@ -1,14 +1,15 @@
-{ lib
-, fetchFromGitHub
-, fetchpatch2
-, python3Packages
-, nixosTests
+{
+  fetchFromGitHub,
+  fetchpatch2,
+  lib,
+  nixosTests,
+  python3Packages,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "xandikos";
   version = "0.2.11";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = python3Packages.pythonOlder "3.9";
 
@@ -28,12 +29,11 @@ python3Packages.buildPythonApplication rec {
     })
   ];
 
-  nativeBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
     setuptools
-    wheel
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  dependencies = with python3Packages; [
     aiohttp
     aiohttp-openmetrics
     dulwich

From 504d32e69985ee156c39276cd5730fbd77f4ebbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 1 Oct 2024 13:11:17 -0700
Subject: [PATCH 07/25] todoman: depends on pytz

---
 pkgs/applications/office/todoman/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix
index eae9e424857f..f5f18b7b66b0 100644
--- a/pkgs/applications/office/todoman/default.nix
+++ b/pkgs/applications/office/todoman/default.nix
@@ -34,6 +34,7 @@ python3.pkgs.buildPythonApplication rec {
     parsedatetime
     python-dateutil
     pyxdg
+    pytz
     tabulate
     urwid
   ];

From 0a3284c46c46f0d6044cb2f8aaacea1a6f725200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 1 Oct 2024 13:13:30 -0700
Subject: [PATCH 08/25] todoman: modernize

---
 pkgs/applications/office/todoman/default.nix | 40 ++++++++++----------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix
index f5f18b7b66b0..75adb0425cc9 100644
--- a/pkgs/applications/office/todoman/default.nix
+++ b/pkgs/applications/office/todoman/default.nix
@@ -1,30 +1,32 @@
-{ lib
-, fetchFromGitHub
-, glibcLocales
-, installShellFiles
-, jq
-, python3
+{
+  fetchFromGitHub,
+  installShellFiles,
+  jq,
+  lib,
+  python3,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "todoman";
   version = "4.4.0";
-  format = "pyproject";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pimutils";
-    repo = pname;
+    repo = "todoman";
     rev = "refs/tags/v${version}";
     hash = "sha256-5tQaNT6QVN9mxa9t6OvMux4ZGy4flUqszTAwet2QL0w=";
   };
 
   nativeBuildInputs = [
     installShellFiles
-  ] ++ (with python3.pkgs; [
-    setuptools-scm
-  ]);
+  ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools-scm
+  ];
+
+  dependencies = with python3.pkgs; [
     atomicwrites
     click
     click-log
@@ -40,17 +42,12 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   nativeCheckInputs = with python3.pkgs; [
-    flake8
-    flake8-import-order
     freezegun
     hypothesis
     pytestCheckHook
-    glibcLocales
     pytest-cov-stub
   ];
 
-  LC_ALL = "en_US.UTF-8";
-
   postInstall = ''
     installShellCompletion --bash contrib/completion/bash/_todo
     substituteInPlace contrib/completion/zsh/_todo --replace "jq " "${lib.getExe jq} "
@@ -88,9 +85,14 @@ python3.pkgs.buildPythonApplication rec {
       now.
       Unsupported fields may not be shown but are never deleted or altered.
     '';
-    changelog = "https://todoman.readthedocs.io/en/stable/changelog.html#v${builtins.replaceStrings ["."] ["-"] version}";
+    changelog = "https://todoman.readthedocs.io/en/stable/changelog.html#v${
+      builtins.replaceStrings [ "." ] [ "-" ] version
+    }";
     license = lib.licenses.isc;
-    maintainers = with lib.maintainers; [ leenaars antonmosich ];
+    maintainers = with lib.maintainers; [
+      leenaars
+      antonmosich
+    ];
     mainProgram = "todo";
   };
 }

From 6a037c56377aad9262b3c3a21917379d54d82905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 1 Oct 2024 18:16:56 -0700
Subject: [PATCH 09/25] python312Packages.icalevents: fix compatibility with
 icalendar v6

---
 pkgs/development/python-modules/icalevents/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/icalevents/default.nix b/pkgs/development/python-modules/icalevents/default.nix
index 8c0839590676..b5303060948c 100644
--- a/pkgs/development/python-modules/icalevents/default.nix
+++ b/pkgs/development/python-modules/icalevents/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   pythonOlder,
   pytestCheckHook,
   poetry-core,
@@ -25,6 +26,14 @@ buildPythonPackage rec {
     hash = "sha256-Bp+Wz88q65Gem8LyRz0A4xE5hIgOD+iZ7E1UlnfFiD4=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "icalendar-v6-compat.patch";
+      url = "https://github.com/jazzband/icalevents/commit/fa925430bd63e46b0941b84a1ae2c9a063f2f720.patch";
+      hash = "sha256-MeRC3iJ5raKvl9udzv/44Vs34LxSzq1S6VVKAVFSpiY=";
+    })
+  ];
+
   build-system = [
     poetry-core
   ];

From 30d0cf4bdeb793d085cc578d0505e3e211f162a4 Mon Sep 17 00:00:00 2001
From: ettom <36895504+ettom@users.noreply.github.com>
Date: Wed, 9 Oct 2024 18:31:23 +0300
Subject: [PATCH 10/25] snapweb: init at 0.8.0

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

diff --git a/pkgs/by-name/sn/snapweb/package.nix b/pkgs/by-name/sn/snapweb/package.nix
new file mode 100644
index 000000000000..e3b1673a9180
--- /dev/null
+++ b/pkgs/by-name/sn/snapweb/package.nix
@@ -0,0 +1,40 @@
+{
+  buildNpmPackage,
+  lib,
+  fetchFromGitHub,
+  pkg-config,
+  vips,
+}:
+
+buildNpmPackage rec {
+  pname = "snapweb";
+  version = "0.8.0";
+
+  src = fetchFromGitHub {
+    owner = "badaix";
+    repo = "snapweb";
+    rev = "v${version}";
+    hash = "sha256-rrJmuTFk2dC+GqYmBZ+hu5hx1iknAgSWjr22S7bfmEE=";
+  };
+
+  npmDepsHash = "sha256-n1MmU9zHyuEqtQSfYpQ+0hDM0z6ongcFsGyikPMyNSU=";
+
+  # For 'sharp' dependency, otherwise it will try to build it
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ vips ];
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r dist $out/
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Web client for Snapcast";
+    homepage = "https://github.com/badaix/snapweb";
+    maintainers = with maintainers; [ ettom ];
+    license = licenses.gpl3Plus;
+  };
+}

From 4a9538bdbf9ac920b8ab9ce2ccc89041c5cbac2f Mon Sep 17 00:00:00 2001
From: ettom <36895504+ettom@users.noreply.github.com>
Date: Wed, 9 Oct 2024 18:35:14 +0300
Subject: [PATCH 11/25] nixos/snapserver: default http.docRoot to snapweb

---
 nixos/modules/services/audio/snapserver.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/audio/snapserver.nix b/nixos/modules/services/audio/snapserver.nix
index 20186016afd7..c1e5f8cf43e1 100644
--- a/nixos/modules/services/audio/snapserver.nix
+++ b/nixos/modules/services/audio/snapserver.nix
@@ -186,7 +186,8 @@ in {
 
       http.docRoot = lib.mkOption {
         type = with lib.types; nullOr path;
-        default = null;
+        default = pkgs.snapweb;
+        defaultText = lib.literalExpression "pkgs.snapweb";
         description = ''
           Path to serve from the HTTP servers root.
         '';

From 9a6d7cc9f7870f37929e8baf8bd7cc3f42c834e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20N=C3=BCtzi?= <gnuetzi@gmail.com>
Date: Fri, 11 Oct 2024 12:00:13 +0200
Subject: [PATCH 12/25] module.nix aktualisieren

Co-authored-by: Wael Nasreddine <wael.nasreddine@gmail.com>
---
 pkgs/build-support/go/module.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index f34390883a4e..63299df4c3a8 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -15,7 +15,7 @@
 , modRoot ? "./"
 
   # The SRI hash of the vendored dependencies.
-  # If `vendorHash` is `nulL`, no dependencies are fetched and
+  # If `vendorHash` is `null`, no dependencies are fetched and
   # the build relies on the vendor folder within the source.
 , vendorHash ? throw (
     if args'?vendorSha256 then

From 37534250c50e1d5b547ed05848e97a5995e62c13 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 12 Oct 2024 12:57:10 +0300
Subject: [PATCH 13/25] warp-terminal: 0.2024.10.08.08.02.stable_01 ->
 0.2024.10.08.08.02.stable_02

Changelog: https://docs.warp.dev/getting-started/changelog#id-2024.10.08-v0.2024.10.08.08.02
---
 pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index b8424a4593db..acd09406fe32 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-Awr2NvXsWaEeJpdCA94q7kxQ04IDpwNxnm7GxB4J09w=",
-    "version": "0.2024.10.08.08.02.stable_01"
+    "hash": "sha256-LPH9JbOXOBjT4vMWNGMvQYDVnTE6p2tFTlOe8HOFsk0=",
+    "version": "0.2024.10.08.08.02.stable_02"
   },
   "linux_x86_64": {
-    "hash": "sha256-fNY+wXqlqUSdRVptDNuk1ouddSlIKQrBFPIij9Qa0jM=",
-    "version": "0.2024.10.08.08.02.stable_01"
+    "hash": "sha256-jwbwRgQ7WR04zCki7PQuuMZD7v2tFl3Gm1olZ28FAp8=",
+    "version": "0.2024.10.08.08.02.stable_02"
   },
   "linux_aarch64": {
-    "hash": "sha256-EdQjc8uXG4cpkgnIYRaBXLeuYqhbN7rs4bU+L/Cc7XA=",
-    "version": "0.2024.10.08.08.02.stable_01"
+    "hash": "sha256-Ticn8OMYHWQT88WQSpgcT/kBVnHyoDHNhTk0m4T45bQ=",
+    "version": "0.2024.10.08.08.02.stable_02"
   }
 }

From b0cc794dcd68b21c1113a2372affe8b91ffedf23 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Wed, 25 Sep 2024 02:43:25 +0800
Subject: [PATCH 14/25] emacsPackages.psgml: add upstream bug link

---
 .../editors/emacs/elisp-packages/elpa-common-overrides.nix       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
index 84924fe42e5a..fc77ac423b0e 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
@@ -217,6 +217,7 @@ in
 
   preview-tailor = mkHome super.preview-tailor;
 
+  # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=73325
   psgml = ignoreCompilationError super.psgml; # elisp error
 
   # native-ice https://github.com/mattiase/relint/issues/15

From 8fb8d6f95c9579922ca4b4cd43d7af229ec78824 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Mon, 7 Oct 2024 02:46:47 +0800
Subject: [PATCH 15/25] emacsPackages.chronometrist-key-values: override when
 only needed

---
 .../emacs/elisp-packages/melpa-packages.nix   | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index 0a12189bdb05..0973981990e0 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -853,13 +853,19 @@ let
         # one optional dependency spark is removed in https://github.com/melpa/melpa/pull/9151
         chronometrist = ignoreCompilationError super.chronometrist;
 
-        # https://github.com/melpa/melpa/pull/9184
-        chronometrist-key-values = super.chronometrist-key-values.overrideAttrs (old: {
-          recipe = ''
-            (chronometrist-key-values :fetcher git :url ""
-             :files (:defaults "elisp/chronometrist-key-values.*"))
-          '';
-        });
+        chronometrist-key-values = super.chronometrist-key-values.overrideAttrs (
+          finalAttrs: previousAttrs: {
+            # https://github.com/melpa/melpa/pull/9184
+            recipe =
+              if lib.versionOlder finalAttrs.version "20241006.1831" then
+                ''
+                  (chronometrist-key-values :fetcher git :url ""
+                   :files (:defaults "elisp/chronometrist-key-values.*"))
+                ''
+              else
+                previousAttrs.recipe;
+          }
+        );
 
         # https://github.com/atilaneves/cmake-ide/issues/176
         cmake-ide = addPackageRequires super.cmake-ide [ self.dash ];

From 01ea823ea5f63e6cab5602300709aa018f5f6700 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Mon, 7 Oct 2024 02:55:53 +0800
Subject: [PATCH 16/25] emacsPackages.frontside-javascript: override only when
 needed

---
 .../emacs/elisp-packages/melpa-packages.nix   | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index 0973981990e0..927b2e4ee511 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -1066,15 +1066,20 @@ let
 
         fold-dwim-org = ignoreCompilationError super.fold-dwim-org; # elisp error
 
-        # https://github.com/melpa/melpa/pull/9182
-        frontside-javascript = super.frontside-javascript.overrideAttrs (old: {
-          preBuild =
-            old.preBuild or ""
-            + "\n"
-            + ''
-              rm --verbose packages/javascript/test-suppport.el
-            '';
-        });
+        frontside-javascript = super.frontside-javascript.overrideAttrs (
+          finalAttrs: previousAttrs: {
+            # https://github.com/melpa/melpa/pull/9182
+            preBuild =
+              if lib.versionOlder finalAttrs.version "20240929.1858" then
+                previousAttrs.preBuild or ""
+                + "\n"
+                + ''
+                  rm --verbose packages/javascript/test-suppport.el
+                ''
+              else
+                previousAttrs.preBuild or null;
+          }
+        );
 
         fxrd-mode = ignoreCompilationError super.fxrd-mode; # elisp error
 

From bad80f68410e0aa2c2be99c37c119c83b043ddc6 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Mon, 7 Oct 2024 04:28:21 +0800
Subject: [PATCH 17/25] emacsPackages.alectryon: override only when needed

---
 .../emacs/elisp-packages/melpa-packages.nix   | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index 927b2e4ee511..dfd99077e9fe 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -757,15 +757,20 @@ let
         # https://github.com/gongo/airplay-el/issues/2
         airplay = addPackageRequires super.airplay [ self.request-deferred ];
 
-        # https://github.com/melpa/melpa/pull/9185
-        alectryon = super.alectryon.overrideAttrs (old: {
-          preBuild =
-            old.preBuild or ""
-            + "\n"
-            + ''
-              rm --recursive --verbose etc/elisp/screenshot
-            '';
-        });
+        alectryon = super.alectryon.overrideAttrs (
+          finalAttrs: previousAttrs: {
+            # https://github.com/melpa/melpa/pull/9185
+            preBuild =
+              if lib.versionOlder finalAttrs.version "20241006.1902" then
+                previousAttrs.preBuild or ""
+                + "\n"
+                + ''
+                  rm --recursive --verbose etc/elisp/screenshot
+                ''
+              else
+                previousAttrs.preBuild or null;
+          }
+        );
 
         # https://github.com/gergelypolonkai/alert-termux/issues/2
         alert-termux = addPackageRequires super.alert-termux [ self.alert ];

From afc6b067d18258291021e1b8d3f6d561b57d9af1 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Mon, 14 Oct 2024 02:38:02 +0800
Subject: [PATCH 18/25] emacsPackages.bpr: override only when needed

---
 .../emacs/elisp-packages/melpa-packages.nix   | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index dfd99077e9fe..227b8f784e07 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -808,15 +808,20 @@ let
         # missing optional dependencies
         boogie-friends = addPackageRequires super.boogie-friends [ self.lsp-mode ];
 
-        # https://github.com/melpa/melpa/pull/9181
-        bpr = super.bpr.overrideAttrs (old: {
-          preBuild =
-            old.preBuild or ""
-            + "\n"
-            + ''
-              rm --verbose --force test-bpr.el
-            '';
-        });
+        bpr = super.bpr.overrideAttrs (
+          finalAttrs: previousAttrs: {
+            # https://github.com/melpa/melpa/pull/9181
+            preBuild =
+              if lib.versionOlder finalAttrs.version "20241013.1803" then
+                previousAttrs.preBuild or ""
+                + "\n"
+                + ''
+                  rm --verbose --force test-bpr.el
+                ''
+              else
+                previousAttrs;
+          }
+        );
 
         bts = ignoreCompilationError super.bts; # elisp error
 

From 37e98ac2417ec93d0079e6a2da445db58e5b0254 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 22 Sep 2024 20:25:09 +0200
Subject: [PATCH 19/25] evcc: 0.130.9 -> 0.130.13

https://github.com/evcc-io/evcc/releases/tag/0.130.10
https://github.com/evcc-io/evcc/releases/tag/0.130.11
https://github.com/evcc-io/evcc/releases/tag/0.130.12
https://github.com/evcc-io/evcc/releases/tag/0.130.13
---
 pkgs/servers/home-automation/evcc/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix
index 5f93c5586719..1b33d907afed 100644
--- a/pkgs/servers/home-automation/evcc/default.nix
+++ b/pkgs/servers/home-automation/evcc/default.nix
@@ -1,11 +1,11 @@
 { lib
 , stdenv
-, buildGo123Module
+, buildGoModule
 , fetchFromGitHub
 , fetchNpmDeps
 , cacert
 , git
-, go_1_23
+, go
 , enumer
 , mockgen
 , nodejs
@@ -14,22 +14,22 @@
 , nixosTests
 }:
 
-buildGo123Module rec {
+buildGoModule rec {
   pname = "evcc";
-  version = "0.130.9";
+  version = "0.130.13";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     rev = version;
-    hash = "sha256-g3z2yqw/84OMui5mchfqVHoR/6LdwNHgeBodf1jUtj4=";
+    hash = "sha256-cqw+4/GwdBy8XpAF/ViI5UxaaS17hryJSCw5kMLin4k=";
   };
 
-  vendorHash = "sha256-C2eoNmv0GSi5DV53aUwGcBOw6n2btU/HhniMyu21vLE=";
+  vendorHash = "sha256-WP7ao54/PMLI+jAaZQgj1otCHEPHZd1A3oqb0DTgx1c=";
 
   npmDeps = fetchNpmDeps {
     inherit src;
-    hash = "sha256-60F6j87T77JEt3ej4FVTc8rnnpZSGzomrQp8VPWjv6Q=";
+    hash = "sha256-pec5hsPrvHHTg++NaLb7vL1YIU1e57o8EVxp9OMhm58=";
   };
 
   nativeBuildInputs = [
@@ -40,7 +40,7 @@ buildGo123Module rec {
   overrideModAttrs = _: {
     nativeBuildInputs = [
       enumer
-      go_1_23
+      go
       git
       cacert
       mockgen
@@ -74,6 +74,7 @@ buildGo123Module rec {
       # network access
       "TestOctopusConfigParse"
       "TestTemplates"
+      "TestOcpp"
     ];
   in
   [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ];

From b5efcf2ae66e198feb0856de8421518afcfee580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 13 Oct 2024 18:45:12 -0700
Subject: [PATCH 20/25] python312Packages.icalendar: 6.0.0 -> 6.0.1

Diff: https://github.com/collective/icalendar/compare/refs/tags/v6.0.0...v6.0.1

Changelog: https://github.com/collective/icalendar/blob/v6.0.1/CHANGES.rst
---
 pkgs/development/python-modules/icalendar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix
index e03544ac41d4..fb88bcfebc84 100644
--- a/pkgs/development/python-modules/icalendar/default.nix
+++ b/pkgs/development/python-modules/icalendar/default.nix
@@ -14,7 +14,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "6.0.0";
+  version = "6.0.1";
   pname = "icalendar";
   pyproject = true;
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "collective";
     repo = "icalendar";
     rev = "refs/tags/v${version}";
-    hash = "sha256-eWFDY/pNVfcUk3PfB0vXqh9swuSGtflUw44IMDJI+yI=";
+    hash = "sha256-pcTiXRiHtx7jVzxDkY6WDhzo8sg8fPecqTpRSRIdvfs=";
   };
 
   patches = [

From b23d5f6129afc312cf087fd42e6354bc78d1ad03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 13 Oct 2024 18:45:34 -0700
Subject: [PATCH 21/25] autosuspend: 7.0.1 -> 7.0.2

Diff: https://github.com/languitar/autosuspend/compare/refs/tags/v7.0.1...v7.0.2

Changelog: https://github.com/languitar/autosuspend/releases/tag/v7.0.2
---
 pkgs/by-name/au/autosuspend/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix
index 479f6d69d736..16217b9f3fd6 100644
--- a/pkgs/by-name/au/autosuspend/package.nix
+++ b/pkgs/by-name/au/autosuspend/package.nix
@@ -6,7 +6,8 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "autosuspend";
-  version = "7.0.1";
+  version = "7.0.2";
+  pyproject = true;
 
   disabled = python3.pythonOlder "3.10";
 
@@ -14,9 +15,13 @@ python3.pkgs.buildPythonApplication rec {
     owner = "languitar";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-Zjo8H5PU6JezrBF0XBHvmePUTNeX74BX4NsHtPozcKs=";
+    hash = "sha256-QmZX5I1D1iYUQ6Ll0tkbpjzqaOIBaGAltKHwUqLB6uk=";
   };
 
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
   dependencies = with python3.pkgs; [
     dbus-python
     icalendar

From 6cb9e538e532e11fdec75d873c59a2398e0e264e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 13 Oct 2024 18:53:01 -0700
Subject: [PATCH 22/25] khal: pin icalendar at 5.0.13

---
 pkgs/applications/misc/khal/default.nix | 30 +++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 32c307af6025..1b5f3d54f247 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -6,7 +6,29 @@
 , python3
 }:
 
-python3.pkgs.buildPythonApplication rec {
+let
+  python = python3.override {
+    packageOverrides = self: super: {
+      # https://github.com/pimutils/khal/issues/1361
+      icalendar = super.icalendar.overridePythonAttrs (old: rec {
+        version = "5.0.13";
+        src = fetchFromGitHub {
+          owner = "collective";
+          repo = "icalendar";
+          rev = "refs/tags/v${version}";
+          hash = "sha256-2gpWfLXR4HThw23AWxY2rY9oiK6CF3Qiad8DWHCs4Qk=";
+        };
+        patches = [ ];
+        build-system = with self; [ setuptools ];
+        dependencies = with self; [
+          python-dateutil
+          pytz
+        ];
+      });
+    };
+  };
+in
+python.pkgs.buildPythonApplication rec {
   pname = "khal";
   version = "0.11.3";
   pyproject = true;
@@ -21,13 +43,13 @@ python3.pkgs.buildPythonApplication rec {
   nativeBuildInputs = [
     glibcLocales
     installShellFiles
-  ] ++ (with python3.pkgs; [
+  ] ++ (with python.pkgs; [
     setuptools-scm
     sphinx
     sphinxcontrib-newsfeed
   ]);
 
-  propagatedBuildInputs = with python3.pkgs;[
+  propagatedBuildInputs = with python.pkgs;[
     atomicwrites
     click
     click-log
@@ -45,7 +67,7 @@ python3.pkgs.buildPythonApplication rec {
     urwid
   ];
 
-  nativeCheckInputs = with python3.pkgs;[
+  nativeCheckInputs = with python.pkgs;[
     freezegun
     hypothesis
     packaging

From 9787a44e4ebb04c6c0a477eb7086893b24c2f531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 13 Oct 2024 18:57:11 -0700
Subject: [PATCH 23/25] khal: modernize

---
 pkgs/applications/misc/khal/default.nix | 41 +++++++++++++++----------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 1b5f3d54f247..b4151a9c5095 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -1,9 +1,10 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, glibcLocales
-, installShellFiles
-, python3
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  glibcLocales,
+  installShellFiles,
+  python3,
 }:
 
 let
@@ -40,16 +41,17 @@ python.pkgs.buildPythonApplication rec {
     hash = "sha256-YP2kQ/qXPDwvFvlHf+A2Ymvk49dmt5tAnTaOhrOV92M=";
   };
 
+  build-system = with python.pkgs; [
+    setuptools
+    setuptools-scm
+  ];
+
   nativeBuildInputs = [
     glibcLocales
     installShellFiles
-  ] ++ (with python.pkgs; [
-    setuptools-scm
-    sphinx
-    sphinxcontrib-newsfeed
-  ]);
+  ];
 
-  propagatedBuildInputs = with python.pkgs;[
+  dependencies = with python.pkgs; [
     atomicwrites
     click
     click-log
@@ -67,7 +69,7 @@ python.pkgs.buildPythonApplication rec {
     urwid
   ];
 
-  nativeCheckInputs = with python.pkgs;[
+  nativeCheckInputs = with python.pkgs; [
     freezegun
     hypothesis
     packaging
@@ -83,8 +85,15 @@ python.pkgs.buildPythonApplication rec {
       --fish <(_KHAL_COMPLETE=fish_source $out/bin/khal)
 
     # man page
-    PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib-newsfeed ])}/bin:$PATH" \
-    make -C doc man
+    PATH="${
+      python3.withPackages (
+        ps: with ps; [
+          sphinx
+          sphinxcontrib-newsfeed
+        ]
+      )
+    }/bin:$PATH" \
+      make -C doc man
     installManPage doc/build/man/khal.1
 
     # .desktop file
@@ -93,7 +102,7 @@ python.pkgs.buildPythonApplication rec {
 
   doCheck = !stdenv.hostPlatform.isAarch64;
 
-  LC_ALL = "en_US.UTF-8";
+  env.LC_ALL = "en_US.UTF-8";
 
   disabledTests = [
     # timing based

From 89f13435d2747d9051042e6da0652b5197d9ac0d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Oct 2024 03:01:38 +0000
Subject: [PATCH 24/25] subread: 2.0.6 -> 2.0.7

---
 pkgs/applications/science/biology/subread/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/subread/default.nix b/pkgs/applications/science/biology/subread/default.nix
index d2ee518883b5..66fc2152a4e7 100644
--- a/pkgs/applications/science/biology/subread/default.nix
+++ b/pkgs/applications/science/biology/subread/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "subread";
-  version = "2.0.6";
+  version = "2.0.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/subread/subread-${version}/subread-${version}-source.tar.gz";
-    sha256 = "sha256-8P3aa5hjTSlGAolIwiAlPhCg8nx/pfJJE7ZbOsbLsEU=";
+    sha256 = "sha256-/tjt3hn52NiqEo721K5atnvOLb8iWJ9AlJlaE6cVq3U=";
   };
 
   buildInputs = [

From 383c4d132c704530af0daa2d57cc7ee670c898c6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 14 Oct 2024 14:01:48 +1000
Subject: [PATCH 25/25] fastjet-contrib: 1.053 -> 1.055 (#348372)

---
 .../development/libraries/physics/fastjet-contrib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/development/libraries/physics/fastjet-contrib/default.nix
index 9a42e693da28..e4cf47683ec8 100644
--- a/pkgs/development/libraries/physics/fastjet-contrib/default.nix
+++ b/pkgs/development/libraries/physics/fastjet-contrib/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fastjet-contrib";
-  version = "1.053";
+  version = "1.055";
 
   src = fetchurl {
     url = "https://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz";
-    sha256 = "sha256-sSokjgsUOTTJnjt8jdgyZRIvbGwJUzwqA99E9e/x5vo=";
+    sha256 = "sha256-2apGVg/f2FCC8gKlqc5kdo/gxZhmDwEyBqjJwX7NDzY=";
   };
 
   buildInputs = [ fastjet ];