From 4181c49850831375b829c08433bc1637a5a8ab2b Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Tue, 31 Dec 2024 12:39:36 +0900
Subject: [PATCH 01/22] criticality-score: migrate from python3Packages

---
 .../cr/criticality-score/package.nix}                     | 8 +++-----
 pkgs/top-level/python-aliases.nix                         | 1 +
 pkgs/top-level/python-packages.nix                        | 2 --
 3 files changed, 4 insertions(+), 7 deletions(-)
 rename pkgs/{development/python-modules/criticality-score/default.nix => by-name/cr/criticality-score/package.nix} (85%)

diff --git a/pkgs/development/python-modules/criticality-score/default.nix b/pkgs/by-name/cr/criticality-score/package.nix
similarity index 85%
rename from pkgs/development/python-modules/criticality-score/default.nix
rename to pkgs/by-name/cr/criticality-score/package.nix
index dba803fe8127..c9b79acc2e2e 100644
--- a/pkgs/development/python-modules/criticality-score/default.nix
+++ b/pkgs/by-name/cr/criticality-score/package.nix
@@ -1,12 +1,10 @@
 {
   lib,
-  buildPythonPackage,
+  python3Packages,
   fetchPypi,
-  pygithub,
-  python-gitlab,
 }:
 
-buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   pname = "criticality_score";
   version = "1.0.8";
 
@@ -15,7 +13,7 @@ buildPythonPackage rec {
     hash = "sha256-5XkVT0blnLG158a01jDfQl1Rx9U1LMsqaMjTdN7Q4QQ=";
   };
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3Packages; [
     pygithub
     python-gitlab
   ];
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 83264b2be12a..7cd24af65439 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -130,6 +130,7 @@ mapAliases ({
   covCore = throw "covCore was renamed to cov-core and subsequently removed since it has ben unmaintained since 2014"; # added 2024-05-20
   cov-core = throw "cov-core has been removed, it was archived and unmaintained since 2014"; # added 2024-05-21
   cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14
+  criticality-score = throw "use pkgs.criticality-score instead"; # added 2024-12-31
   cryptacular = throw "cryptacular was removed, because it was disabled on all python version since 3.6 and last updated in 2021"; # Added 2024-05-13
   cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23
   cx_Freeze = cx-freeze; # added 2023-08-02
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index acc79f773b74..cc29046fd1e6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2720,8 +2720,6 @@ self: super: with self; {
 
   credstash = callPackage ../development/python-modules/credstash { };
 
-  criticality-score = callPackage ../development/python-modules/criticality-score { };
-
   crocoddyl = toPythonModule (pkgs.crocoddyl.override {
     pythonSupport = true;
     python3Packages = self;

From e6179050ae7ff461a2ebf1c1f74f0921654a57a6 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 01:16:12 +0900
Subject: [PATCH 02/22] criticality-score: 1.0.8 -> 2.0.4

Diff: https://github.com/ossf/criticality_score/compare/v1.0.8...v2.0.4

Changelog: https://github.com/ossf/criticality_score/releases/tag/v2.0.4
---
 pkgs/by-name/cr/criticality-score/package.nix | 57 +++++++++++++------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/cr/criticality-score/package.nix b/pkgs/by-name/cr/criticality-score/package.nix
index c9b79acc2e2e..bec3173c5059 100644
--- a/pkgs/by-name/cr/criticality-score/package.nix
+++ b/pkgs/by-name/cr/criticality-score/package.nix
@@ -1,33 +1,54 @@
 {
   lib,
-  python3Packages,
-  fetchPypi,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
 }:
 
-python3Packages.buildPythonApplication rec {
-  pname = "criticality_score";
-  version = "1.0.8";
+buildGoModule rec {
+  pname = "criticality-score";
+  version = "2.0.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-5XkVT0blnLG158a01jDfQl1Rx9U1LMsqaMjTdN7Q4QQ=";
+  src = fetchFromGitHub {
+    owner = "ossf";
+    repo = "criticality_score";
+    tag = "v${version}";
+    hash = "sha256-p2ZXNpPFwIKPWDKCdEUZQvt/hvLQS9xjZaaquNTaUB0=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
-    pygithub
-    python-gitlab
+  proxyVendor = true;
+
+  vendorHash = "sha256-mKCwyAE/fI9ateKcrTLDAdULbT6pUpV0cMZ0X5bqT1M=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=main.version=${version}"
+    "-X=main.commit=${src.tag}"
+    "-X=main.date=1970-01-01T00:00:00Z"
   ];
 
-  doCheck = false;
+  subPackages = [
+    "cmd/collect_signals"
+    "cmd/criticality_score"
+    "cmd/csv_transfer"
+    "cmd/enumerate_github"
+    "cmd/scorer"
+  ];
 
-  pythonImportsCheck = [ "criticality_score" ];
+  doInstallCheck = true;
 
-  meta = with lib; {
-    description = "Python tool for computing the Open Source Project Criticality Score";
-    mainProgram = "criticality_score";
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
+  versionCheckProgramArg = [ "--version" ];
+
+  meta = {
+    description = "Gives criticality score for an open source project";
     homepage = "https://github.com/ossf/criticality_score";
     changelog = "https://github.com/ossf/criticality_score/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ wamserma ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ wamserma ];
+    mainProgram = "criticality_score";
   };
 }

From 8e7104fd7fd1a65f727c9e4e4774524db1a9a57e Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 01:30:30 +0900
Subject: [PATCH 03/22] python312Packages.dash-renderer: remove

dash-renderer has been removed since it is abandoned
---
 .../python-modules/dash-renderer/default.nix  | 25 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 pkgs/development/python-modules/dash-renderer/default.nix

diff --git a/pkgs/development/python-modules/dash-renderer/default.nix b/pkgs/development/python-modules/dash-renderer/default.nix
deleted file mode 100644
index 46936194b447..000000000000
--- a/pkgs/development/python-modules/dash-renderer/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-}:
-
-buildPythonPackage rec {
-  pname = "dash_renderer";
-  version = "1.9.1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "73a69e3d145880e68e42723ad10182251d92b44f3efe92b8763145cfd2158e7e";
-  };
-
-  # No tests in archive
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Renderer for the Dash framework";
-    homepage = "https://dash.plot.ly/";
-    license = licenses.mit;
-    maintainers = [ maintainers.antoinerg ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 83264b2be12a..2555bed07af4 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -136,6 +136,7 @@ mapAliases ({
   cx_oracle = cx-oracle; # added 2024-01-03
   d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30
   dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24
+  dash-renderer = throw "dash-renderer has been removed since it is abandoned"; # added 2025-01-01
   dateutil = python-dateutil; # added 2021-07-03
   debian = python-debian; # added 2024-12-10
   deep_merge = throw "deep_merge has been removed, since it is no longer maintained and may be broken."; # added 2023-10-09
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index acc79f773b74..13cb949f7737 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2922,8 +2922,6 @@ self: super: with self; {
 
   dash-html-components = callPackage ../development/python-modules/dash-html-components { };
 
-  dash-renderer = callPackage ../development/python-modules/dash-renderer { };
-
   dash-table = callPackage ../development/python-modules/dash-table { };
 
   dashing = callPackage ../development/python-modules/dashing { };

From 398c3b0fd69c627a2e53d528de27914cc1d30c9f Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 01:39:14 +0900
Subject: [PATCH 04/22] python312Packages.delegator-py: refactor

---
 .../python-modules/delegator-py/default.nix    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/delegator-py/default.nix b/pkgs/development/python-modules/delegator-py/default.nix
index 0e4fc71161a7..a14074fe726c 100644
--- a/pkgs/development/python-modules/delegator-py/default.nix
+++ b/pkgs/development/python-modules/delegator-py/default.nix
@@ -2,29 +2,35 @@
   buildPythonPackage,
   lib,
   fetchFromGitHub,
+  setuptools,
   pexpect,
 }:
 
 buildPythonPackage rec {
   version = "0.1.1";
-  pname = "delegator.py";
+  pname = "delegator-py";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "amitt001";
     repo = "delegator.py";
-    rev = "v${version}";
-    sha256 = "17n9h3xzjsfxmwclh33vc4yg3c9yzh9hfhaj12kv5ah3fy8rklwb";
+    tag = "v${version}";
+    hash = "sha256-i9OZkXcDqrKnCFJBBxP8PrHxPGF7DEgZr91p+fuAyZ4=";
   };
 
-  propagatedBuildInputs = [ pexpect ];
+  build-system = [ setuptools ];
+
+  dependencies = [ pexpect ];
+
+  pythonImportsCheck = [ "delegator" ];
 
   # no tests in github or pypi
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Subprocesses for Humans 2.0";
     homepage = "https://github.com/amitt001/delegator.py";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }

From c62ac197df55ed119b1d9b6b12bfe4202222d205 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 02:32:00 +0900
Subject: [PATCH 05/22] python312Packages.pygithub3: refactor

---
 .../python-modules/github3-py/default.nix     | 55 ++++++++-----------
 1 file changed, 24 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/python-modules/github3-py/default.nix b/pkgs/development/python-modules/github3-py/default.nix
index 59535eb25a70..893508c56043 100644
--- a/pkgs/development/python-modules/github3-py/default.nix
+++ b/pkgs/development/python-modules/github3-py/default.nix
@@ -1,12 +1,12 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchPypi,
   requests,
   uritemplate,
   python-dateutil,
   pyjwt,
+  pytest-xdist,
   pytestCheckHook,
   betamax,
   betamax-matchers,
@@ -15,32 +15,16 @@
 }:
 
 buildPythonPackage rec {
-  pname = "github3.py";
+  pname = "github3-py";
   version = "4.0.1";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.6";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "github3.py";
+    inherit version;
     hash = "sha256-MNVxB2dT78OJ7cf5qu8zik/LJLVNiWjV85sTQvRd3TY=";
   };
 
-  nativeBuildInputs = [ hatchling ];
-
-  propagatedBuildInputs = [
-    pyjwt
-    python-dateutil
-    requests
-    uritemplate
-  ] ++ pyjwt.optional-dependencies.crypto;
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    betamax
-    betamax-matchers
-  ];
-
   patches = [
     (fetchpatch {
       # disable tests with "AttributeError: 'MockHTTPResponse' object has no attribute 'close'", due to betamax
@@ -49,20 +33,29 @@ buildPythonPackage rec {
     })
   ];
 
-  # Solves "__main__.py: error: unrecognized arguments: -nauto"
-  preCheck = ''
-    rm tox.ini
-  '';
+  build-system = [ hatchling ];
 
-  disabledTests = [
-    # FileNotFoundError: [Errno 2] No such file or directory: 'tests/id_rsa.pub'
-    "test_delete_key"
+  dependencies = [
+    pyjwt
+    python-dateutil
+    requests
+    uritemplate
+  ] ++ pyjwt.optional-dependencies.crypto;
+
+  pythonImportsCheck = [ "github3" ];
+
+  nativeCheckInputs = [
+    pytest-xdist
+    pytestCheckHook
+    betamax
+    betamax-matchers
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github3py.readthedocs.org/en/master/";
     description = "Wrapper for the GitHub API written in python";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ pSub ];
+    changelog = "https://github.com/sigmavirus24/github3.py/blob/${version}/docs/source/release-notes/${version}.rst";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ pSub ];
   };
 }

From 29f117d90a44811134d6450a73884bfb598480d4 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 3 Jan 2025 14:49:42 +0900
Subject: [PATCH 06/22] mactop: 0.1.9 -> 0.2.3

Diff: https://github.com/context-labs/mactop/compare/refs/tags/v0.1.9...v0.2.3

Changelog: https://github.com/context-labs/mactop/releases/tag/v0.2.3
---
 pkgs/by-name/ma/mactop/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ma/mactop/package.nix b/pkgs/by-name/ma/mactop/package.nix
index 660e642a33f6..54025548a0d4 100644
--- a/pkgs/by-name/ma/mactop/package.nix
+++ b/pkgs/by-name/ma/mactop/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "mactop";
-  version = "0.1.9";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "context-labs";
     repo = "mactop";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-r9je+oeedQJsFBWWbOUcUls/EX0JZveUkmsXXtC8O0Q=";
+    tag = "v${version}";
+    hash = "sha256-xWUCOmNwhxmutY7G+FmxT7mabexuBIcgFzX++zsdnN4=";
   };
 
-  vendorHash = "sha256-/KecVx4Gp776t8gFSO29E1q9v29nwrKIWZYCpj7IlSo=";
+  vendorHash = "sha256-BFvd1jJzGYsI2E6BdFy+BwHOAy7VgblcByV/oRCKORs=";
 
   ldflags = [
     "-s"
@@ -25,7 +25,7 @@ buildGoModule rec {
   meta = {
     description = "Terminal-based monitoring tool 'top' designed to display real-time metrics for Apple Silicon chips";
     homepage = "https://github.com/context-labs/mactop";
-    changelog = "https://github.com/context-labs/mactop/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/context-labs/mactop/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
     mainProgram = "mactop";

From 471bff0b46a6d43a1a7d0f87252cd42802f2076b Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 3 Jan 2025 14:58:53 +0900
Subject: [PATCH 07/22] mactop: enable version check

---
 pkgs/by-name/ma/mactop/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ma/mactop/package.nix b/pkgs/by-name/ma/mactop/package.nix
index 54025548a0d4..8cdc9432040e 100644
--- a/pkgs/by-name/ma/mactop/package.nix
+++ b/pkgs/by-name/ma/mactop/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  versionCheckHook,
 }:
 
 buildGoModule rec {
@@ -22,6 +23,10 @@ buildGoModule rec {
     "-w"
   ];
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = [ "--version" ];
+
   meta = {
     description = "Terminal-based monitoring tool 'top' designed to display real-time metrics for Apple Silicon chips";
     homepage = "https://github.com/context-labs/mactop";

From 30ae86f315db4e543afdbd58da92d4fd1dd422b6 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 3 Jan 2025 17:30:52 +0900
Subject: [PATCH 08/22] markdownlint-cli2: 0.16.0 -> 0.17.1

Changelog: https://github.com/DavidAnson/markdownlint-cli2/blob/v0.17.1/CHANGELOG.md
---
 pkgs/by-name/ma/markdownlint-cli2/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/markdownlint-cli2/package.nix b/pkgs/by-name/ma/markdownlint-cli2/package.nix
index de467c551c38..f3687940d045 100644
--- a/pkgs/by-name/ma/markdownlint-cli2/package.nix
+++ b/pkgs/by-name/ma/markdownlint-cli2/package.nix
@@ -11,7 +11,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "markdownlint-cli2";
-  version = "0.16.0";
+  version = "0.17.1";
 
   # upstream is not interested in including package-lock.json in the source
   # https://github.com/DavidAnson/markdownlint-cli2/issues/198#issuecomment-1690529976
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   # so use the tarball from the archlinux mirror
   src = fetchurl {
     url = "https://us.mirrors.cicku.me/archlinux/extra/os/x86_64/markdownlint-cli2-${finalAttrs.version}-1-any.pkg.tar.zst";
-    hash = "sha256-VkT94QS2XeUp2cJLGvK+MZnDdlqmG9szTmzv6lKyxUs=";
+    hash = "sha256-NdZDh0Di+relrzJzYmMb9kE9xUHe1do+9m3G4WttGlU=";
   };
 
   nativeBuildInputs = [
@@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     mkdir -p $out/bin
     cp -r lib share $out
     makeWrapper "${lib.getExe nodejs}" "$out/bin/markdownlint-cli2" \
-      --add-flags "$out/lib/node_modules/markdownlint-cli2/markdownlint-cli2.js"
+      --add-flags "$out/lib/node_modules/markdownlint-cli2/markdownlint-cli2-bin.mjs"
 
     runHook postInstall
   '';

From ff07c07608740e2297605b9b0b6d47a84d4126a3 Mon Sep 17 00:00:00 2001
From: Lukas Werling <lukas@lwrl.de>
Date: Tue, 7 Jan 2025 14:13:44 +0100
Subject: [PATCH 09/22] nixos/caddy: Fix default log file for http:// hostnames

Caddy hostnames can begin with http:// to disable automatic HTTPS.
The default value for services.caddy.<host>.logFormat puts the hostname
in the log filename, resulting in a broken path. Similarly, multiple
space-separated host names would not work before.

Since version 2.9.0 (commit 7c52e7a), caddy fails to start if it cannot
open the log file. This caused NixOS test failures (e.g.,
nixosTests.dokuwiki).
---
 nixos/modules/services/web-servers/caddy/vhost-options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/caddy/vhost-options.nix b/nixos/modules/services/web-servers/caddy/vhost-options.nix
index 04feb6dc66c6..73ef4b87ee52 100644
--- a/nixos/modules/services/web-servers/caddy/vhost-options.nix
+++ b/nixos/modules/services/web-servers/caddy/vhost-options.nix
@@ -58,7 +58,7 @@ in
     logFormat = mkOption {
       type = types.lines;
       default = ''
-        output file ${cfg.logDir}/access-${config.hostName}.log
+        output file ${cfg.logDir}/access-${lib.replaceStrings [ "/" " " ] [ "_" "_" ] config.hostName}.log
       '';
       defaultText = ''
         output file ''${config.services.caddy.logDir}/access-''${hostName}.log

From 21a14a0881d25aedb99859c62e7603cd76fc546c Mon Sep 17 00:00:00 2001
From: Lukas Werling <lukas@lwrl.de>
Date: Tue, 7 Jan 2025 18:50:14 +0100
Subject: [PATCH 10/22] nixosTests.caddy: Fix with-plugins hash

---
 nixos/tests/caddy.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix
index 36d0051cf037..a5ca2f3d29bf 100644
--- a/nixos/tests/caddy.nix
+++ b/nixos/tests/caddy.nix
@@ -70,7 +70,7 @@ import ./make-test-python.nix (
             services.caddy = {
               package = pkgs.caddy.withPlugins {
                 plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20241211194404-3865845790a7" ];
-                hash = "sha256-zgMdtOJbmtRSfTlrrg8njr11in2C7OAXLB+34V23jek=";
+                hash = "sha256-BorJJWICgAWU7DrpDZJWifMnIYtGWldt/4S1VELwGJI=";
               };
               configFile = pkgs.writeText "Caddyfile" ''
                 {

From dacfe3f0295e4e827048cd08424da628c9ff4802 Mon Sep 17 00:00:00 2001
From: Lukas Werling <lukas@lwrl.de>
Date: Tue, 7 Jan 2025 23:13:54 +0100
Subject: [PATCH 11/22] nixosTests.caddy: Add test for multiple hostnames

---
 nixos/tests/caddy.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix
index a5ca2f3d29bf..71d73465d088 100644
--- a/nixos/tests/caddy.nix
+++ b/nixos/tests/caddy.nix
@@ -41,6 +41,11 @@ import ./make-test-python.nix (
               "http://localhost:8081" = { };
             };
           };
+          specialisation.multiple-hostnames.configuration = {
+            services.caddy.virtualHosts = {
+              "http://localhost:8080 http://localhost:8081" = { };
+            };
+          };
           specialisation.rfc42.configuration = {
             services.caddy.settings = {
               apps.http.servers.default = {
@@ -93,6 +98,7 @@ import ./make-test-python.nix (
         explicitConfigFile = "${nodes.webserver.system.build.toplevel}/specialisation/explicit-config-file";
         justReloadSystem = "${nodes.webserver.system.build.toplevel}/specialisation/config-reload";
         multipleConfigs = "${nodes.webserver.system.build.toplevel}/specialisation/multiple-configs";
+        multipleHostnames = "${nodes.webserver.system.build.toplevel}/specialisation/multiple-hostnames";
         rfc42Config = "${nodes.webserver.system.build.toplevel}/specialisation/rfc42";
         withPluginsConfig = "${nodes.webserver.system.build.toplevel}/specialisation/with-plugins";
       in
@@ -117,6 +123,13 @@ import ./make-test-python.nix (
             webserver.wait_for_open_port(8080)
             webserver.wait_for_open_port(8081)
 
+        with subtest("a virtual host with multiple hostnames works"):
+            webserver.succeed(
+                "${multipleHostnames}/bin/switch-to-configuration test >&2"
+            )
+            webserver.wait_for_open_port(8080)
+            webserver.wait_for_open_port(8081)
+
         with subtest("rfc42 settings config"):
             webserver.succeed(
                 "${rfc42Config}/bin/switch-to-configuration test >&2"

From cafe63f62bc61fff2c30a87ccd9d46e790da2c37 Mon Sep 17 00:00:00 2001
From: Will Leinweber <will@bitfission.com>
Date: Tue, 7 Jan 2025 21:30:02 +0100
Subject: [PATCH 12/22] bat: 0.24.0 -> 0.25.0

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

diff --git a/pkgs/by-name/ba/bat/package.nix b/pkgs/by-name/ba/bat/package.nix
index d40bc370aeee..9ed8d3b6943c 100644
--- a/pkgs/by-name/ba/bat/package.nix
+++ b/pkgs/by-name/ba/bat/package.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   rustPlatform,
   fetchFromGitHub,
   pkg-config,
@@ -12,15 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bat";
-  version = "0.24.0";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "bat";
     rev = "v${version}";
-    hash = "sha256-1RjlJEmY/jMf0IYQbrWrT1CHFyiqgarOl72u9xjjQiQ=";
+    hash = "sha256-82IhLhw0TdaMh21phBxcUZ5JI5xOXb0DrwnBmPwyfAQ=";
   };
-  cargoHash = "sha256-b7wNWdKQ4QLeCf7bNZRfzT9hD/D/oDglU7Xyb65IrGY=";
+
+  cargoHash = "sha256-07D3N1xJnrTueI+7SpQPUnCzKOLJTldyyIG2mNfJzME=";
 
   nativeBuildInputs = [
     pkg-config

From cafe15ecec6177fdc1525a39baa9f63c0a433f8f Mon Sep 17 00:00:00 2001
From: Will Leinweber <will@bitfission.com>
Date: Wed, 8 Jan 2025 17:26:02 +0100
Subject: [PATCH 13/22] bat-extras: mark as broken due to bat v0.25.0 changes

---
 pkgs/tools/misc/bat-extras/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix
index fa2dd823ec8b..b831aa86edca 100644
--- a/pkgs/tools/misc/bat-extras/default.nix
+++ b/pkgs/tools/misc/bat-extras/default.nix
@@ -103,6 +103,7 @@ let
       license = with licenses; [ mit ];
       maintainers = with maintainers; [ bbigras ];
       platforms = platforms.all;
+      broken = true;
     };
   };
   script =

From adf873d0ab27d236868fefdc18cacdc84eafb7ee Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Thu, 9 Jan 2025 07:25:49 +0100
Subject: [PATCH 14/22] bat-extras: add broken comment

---
 pkgs/tools/misc/bat-extras/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix
index b831aa86edca..d5bd52641da9 100644
--- a/pkgs/tools/misc/bat-extras/default.nix
+++ b/pkgs/tools/misc/bat-extras/default.nix
@@ -103,6 +103,7 @@ let
       license = with licenses; [ mit ];
       maintainers = with maintainers; [ bbigras ];
       platforms = platforms.all;
+      # not compatible with bat 0.25.0
       broken = true;
     };
   };

From ee1d8d4d66c4285ee5ed0cc290ee2063c27314f8 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 9 Jan 2025 11:32:15 -0500
Subject: [PATCH 15/22] opentofu: 1.8.8 -> 1.9.0

Diff: https://github.com/opentofu/opentofu/compare/v1.8.8...v1.9.0

Changelog: https://github.com/opentofu/opentofu/blob/v1.9.0/CHANGELOG.md
---
 pkgs/by-name/op/opentofu/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix
index 592e41687554..1a6b0cceb86f 100644
--- a/pkgs/by-name/op/opentofu/package.nix
+++ b/pkgs/by-name/op/opentofu/package.nix
@@ -15,16 +15,16 @@
 let
   package = buildGoModule rec {
     pname = "opentofu";
-    version = "1.8.8";
+    version = "1.9.0";
 
     src = fetchFromGitHub {
       owner = "opentofu";
       repo = "opentofu";
-      rev = "v${version}";
-      hash = "sha256-qH08gSQijn/o+YlMUXKdNaSY8lBk0u/pN28TBcevDvE=";
+      tag = "v${version}";
+      hash = "sha256-e0ZzbQdex0DD7Bj9WpcVI5roh0cMbJuNr5nsSVaOSu4=";
     };
 
-    vendorHash = "sha256-Ijgr5XhsFM3M8f4bnMAQ691kNnQPAGQ8pHv1BCqZU3I=";
+    vendorHash = "sha256-fMTbLSeW+pw6GK8/JLZzG2ER90ss2g1FSDX5+f292do=";
     ldflags = [
       "-s"
       "-w"

From 28328dfb02f8a58c9c9abf685febd5d0816bdada Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 10 Jan 2025 01:02:01 +0100
Subject: [PATCH 16/22] python313Packages.pyflick: 1.1.2 -> 1.1.3

https://github.com/ZephireNZ/PyFlick/releases/tag/v1.1.3
---
 pkgs/development/python-modules/pyflick/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyflick/default.nix b/pkgs/development/python-modules/pyflick/default.nix
index 6d21852ca348..8f657c52db51 100644
--- a/pkgs/development/python-modules/pyflick/default.nix
+++ b/pkgs/development/python-modules/pyflick/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pyflick";
-  version = "1.1.2";
+  version = "1.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ZephireNZ";
     repo = "PyFlick";
     tag = "v${version}";
-    hash = "sha256-Csm5gXMIGEhHgzN/7sO/1iM/wZklI2Jc0C69tgYWxnQ=";
+    hash = "sha256-JROtklRimr6I1/6+yYaDL6rNGSj7O15nI/C9ZSj6eFo=";
   };
 
   pythonRelaxDeps = [ "aiohttp" ];

From b86b8690a779818adea5a8cff65f2975a343eff1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 10 Jan 2025 01:02:10 +0100
Subject: [PATCH 17/22] home-assistant: 2025.1.1 -> 2025.1.2

https://github.com/home-assistant/core/releases/tag/2025.1.2
---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 pkgs/servers/home-assistant/default.nix            | 6 +++---
 pkgs/servers/home-assistant/frontend.nix           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 492b8dd71044..c4579c382343 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2025.1.1";
+  version = "2025.1.2";
   components = {
     "3_day_blinds" =
       ps: with ps; [
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 982e396b88dd..fecafa2b8a39 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -289,7 +289,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2025.1.1";
+  hassVersion = "2025.1.2";
 
 in
 python.pkgs.buildPythonApplication rec {
@@ -310,13 +310,13 @@ python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = "refs/tags/${version}";
-    hash = "sha256-fiGdRXQmH+CcgnGQloktl66Yh8iiFEDCQyOL3jfXjdU=";
+    hash = "sha256-dEjTSByjv8+YwAcztFwCvQp+GWcS0QZxP1norxd8MmY=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-CYvi2Z1d3hbcfet08TR/jScuOKGgipTEWmno7/r5qLU=";
+    hash = "sha256-AO2n3t2QobFuN2IrlYcwBA4LRxsMr7B/T0dc2IWZrfg=";
   };
 
   build-system = with python.pkgs; [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 60b22f13295d..c3aa598f5f0a 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20250106.0";
+  version = "20250109.0";
   format = "wheel";
 
   src = fetchPypi {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-Jhbw/HNOInLAihHeP+Vpsvsukjf3OY32EbBayDEuU+k=";
+    hash = "sha256-kZmBZyiCUxODRcg8GnRUMWk+T+Lry1gdgY2yzQznFPI=";
   };
 
   # there is nothing to strip in this package

From ed3bd8871ee7ed70cc141e8eaefbc898d95c9e13 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 10 Jan 2025 00:26:02 +0100
Subject: [PATCH 18/22] vimPlugins.cspell-nvim: init at 2024-11-21

---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix  |  7 +++++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 3 files changed, 20 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index d074843f35e9..979441ed87b3 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -2933,6 +2933,18 @@ final: prev:
     meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/";
   };
 
+  cspell-nvim = buildVimPlugin {
+    pname = "cspell.nvim";
+    version = "2024-11-21";
+    src = fetchFromGitHub {
+      owner = "davidmh";
+      repo = "cspell.nvim";
+      rev = "be04e47348c04f89614d99cf73a7ce1165a2e3ec";
+      sha256 = "0cwfc7zqlfpz9x4s6xxv6dadh6xxyp19f595pjp9sp9sxb21r7hj";
+    };
+    meta.homepage = "https://github.com/davidmh/cspell.nvim/";
+  };
+
   csv-vim = buildVimPlugin {
     pname = "csv.vim";
     version = "2024-12-15";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index f2ae2f39bdae..c84d0e792ad0 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -829,6 +829,13 @@ in
     nvimRequireCheck = "crates";
   };
 
+  cspell-nvim = super.cspell-nvim.overrideAttrs {
+    dependencies = with self; [
+      none-ls-nvim
+      plenary-nvim
+    ];
+  };
+
   ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs {
     # drop Python 2 patches
     # https://github.com/JazzCore/ctrlp-cmatcher/pull/44
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 26a545f92bd7..428704ad1d50 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -242,6 +242,7 @@ https://github.com/nixprime/cpsm/,,
 https://github.com/saecki/crates.nvim/,,
 https://github.com/godlygeek/csapprox/,,
 https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/,HEAD,
+https://github.com/davidmh/cspell.nvim/,HEAD,
 https://github.com/chrisbra/csv.vim/,,
 https://github.com/hat0uma/csvview.nvim/,HEAD,
 https://github.com/JazzCore/ctrlp-cmatcher/,,

From ffacb08c63d78e1d62fc206096569ba8995f26c6 Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara.grouwstra@gmail.com>
Date: Thu, 26 Dec 2024 23:15:33 +0100
Subject: [PATCH 19/22] opentofu: move the plugin patch from `plugins` to
 `withPlugins`

makes it easier to transparently swap out terraform/opentofu.
---
 pkgs/by-name/op/opentofu/package.nix | 29 ++++++++++++----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix
index 592e41687554..9d43d0272efc 100644
--- a/pkgs/by-name/op/opentofu/package.nix
+++ b/pkgs/by-name/op/opentofu/package.nix
@@ -99,10 +99,17 @@ let
     in
     test;
 
-  plugins =
-    lib.mapAttrs
-      (
-        _: provider:
+  plugins = removeAttrs terraform-providers [
+    "override"
+    "overrideDerivation"
+    "recurseForDerivations"
+  ];
+
+  withPlugins =
+    plugins:
+    let
+      actualPlugins = lib.lists.map (
+        provider:
         if provider ? override then
           # use opentofu plugin registry over terraform's
           provider.override (oldArgs: {
@@ -116,19 +123,7 @@ let
           })
         else
           provider
-      )
-      (
-        removeAttrs terraform-providers [
-          "override"
-          "overrideDerivation"
-          "recurseForDerivations"
-        ]
-      );
-
-  withPlugins =
-    plugins:
-    let
-      actualPlugins = plugins package.plugins;
+      ) (plugins package.plugins);
 
       # Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries
       wrapperInputs = lib.unique (

From 4c488e035590d1d5af49e2f70b635b0a3ded322e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 10 Jan 2025 03:29:05 +0100
Subject: [PATCH 20/22] python313Packages.homeassistant-stubs: 2025.1.1 ->
 2025.1.2

https://github.com/KapJI/homeassistant-stubs/releases/tag/2025.1.2
---
 pkgs/servers/home-assistant/stubs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 7943fc3137c0..4fe2b9169882 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2025.1.1";
+  version = "2025.1.2";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     rev = "refs/tags/${version}";
-    hash = "sha256-9z8HX9zNzRfMTWJiHwbCpOAmYF9yfHsM/FR9siB7D/E=";
+    hash = "sha256-35JzLlzx7+zQ6/RLqNwlqfAKAZ/axPa7lwFc6xtQbzQ=";
   };
 
   build-system = [

From caaf7227d835d9fa6006f61434f511473520be2e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 10 Jan 2025 03:29:55 +0100
Subject: [PATCH 21/22] 
 home-assistant.python.pkgs.pytest-homeassistant-custom-component: 0.13.201 ->
 0.13.202

https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/refs/tags/0.13.202/CHANGELOG.md
---
 .../home-assistant/pytest-homeassistant-custom-component.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
index 3254c7594ca8..92bc01a8dd0f 100644
--- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
+++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-homeassistant-custom-component";
-  version = "0.13.201";
+  version = "0.13.202";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "MatthewFlamm";
     repo = "pytest-homeassistant-custom-component";
     rev = "refs/tags/${version}";
-    hash = "sha256-WWfVxLYW5V5q0huBoST3n64Fm9f69rjv8B6g96ZaFDc=";
+    hash = "sha256-MoOIEoJna3nROYYvMzVSV6qpQN/qoDumr3sDOrECZh4=";
   };
 
   build-system = [ setuptools ];

From e46a62c61ac41af2fc5430e87a10f4cacdbdc2b2 Mon Sep 17 00:00:00 2001
From: Rishik Yalamanchili <73787402+Rishik-Y@users.noreply.github.com>
Date: Thu, 9 Jan 2025 23:03:54 +0530
Subject: [PATCH 22/22] =?UTF-8?q?fastfetch:=202.33.0=20=E2=86=92=202.34.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index 99b20250f273..d28c873e837c 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -45,13 +45,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastfetch";
-  version = "2.33.0";
+  version = "2.34.0";
 
   src = fetchFromGitHub {
     owner = "fastfetch-cli";
     repo = "fastfetch";
-    rev = finalAttrs.version;
-    hash = "sha256-GCUG9b98UmuC/6psDs4PNAoquEWOMz0kl/IBQXRGX5o=";
+    tag = finalAttrs.version;
+    hash = "sha256-ZTtDYUnLp8IzGluJXLCHBxHCZAXxO+akUkPOCPMdA5w=";
   };
 
   outputs = [