From 4e7ebba346c62de9b693e2a83121d0233585e08a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Jul 2024 11:19:15 +0200
Subject: [PATCH 1/3] static-web-server: 2.24.2 -> 2.32.1

---
 pkgs/servers/static-web-server/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix
index a38c1bcc3636..a9ffbf9fdf4c 100644
--- a/pkgs/servers/static-web-server/default.nix
+++ b/pkgs/servers/static-web-server/default.nix
@@ -2,21 +2,25 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "static-web-server";
-  version = "2.24.2";
+  version = "2.32.1";
 
   src = fetchFromGitHub {
     owner = "static-web-server";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-5Axqn3sYLM4yjGkN8d0ZUe8KrjYszaZmTg5GqmamNtc=";
+    hash = "sha256-PkDT6FU6JSIeeKCJeeIjjqZfoo+tGzqyPyWuIiwusQY=";
   };
 
-  cargoHash = "sha256-xS2XARqXXcQ2J1k3jC5St19RdcK2korbEia4koUxG5s=";
+  cargoHash = "sha256-ymI5O6j6NEcgIbMLEYgyUZBBkwxDWDWaVn4hqJScGxA=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Security
   ];
 
+  # Lots of tests fail due to unexpected argument '--test-threads' because CLI options of
+  # test runner is being parsed
+  doCheck = false;
+
   checkFlags = [
     # TODO: investigate why these tests fail
     "--skip=tests::handle_byte_ranges_if_range_too_old"

From f7d4253bc2866cce30b9e3d32752c69435e6cd01 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Jul 2024 11:19:59 +0200
Subject: [PATCH 2/3] static-web-server: reformat

---
 pkgs/servers/static-web-server/default.nix | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix
index a9ffbf9fdf4c..db91eda363a2 100644
--- a/pkgs/servers/static-web-server/default.nix
+++ b/pkgs/servers/static-web-server/default.nix
@@ -1,4 +1,11 @@
-{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, nixosTests }:
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  stdenv,
+  darwin,
+  nixosTests,
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "static-web-server";
@@ -13,9 +20,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-ymI5O6j6NEcgIbMLEYgyUZBBkwxDWDWaVn4hqJScGxA=";
 
-  buildInputs = lib.optionals stdenv.isDarwin [
-    darwin.apple_sdk.frameworks.Security
-  ];
+  buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
   # Lots of tests fail due to unexpected argument '--test-threads' because CLI options of
   # test runner is being parsed
@@ -33,13 +38,18 @@ rustPlatform.buildRustPackage rec {
     install -Dm444 -t $out/lib/systemd/system/ systemd/static-web-server.{service,socket}
   '';
 
-  passthru.tests = { inherit (nixosTests) static-web-server; };
+  passthru.tests = {
+    inherit (nixosTests) static-web-server;
+  };
 
   meta = with lib; {
     description = "Asynchronous web server for static files-serving";
     homepage = "https://static-web-server.net/";
     changelog = "https://github.com/static-web-server/static-web-server/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ mit /* or */ asl20 ];
+    license = with licenses; [
+      mit # or
+      asl20
+    ];
     maintainers = with maintainers; [ figsoda ];
     mainProgram = "static-web-server";
   };

From 3187be929cb1c425fbdf7fd5a6eac9882bb9caf7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 22 Jul 2024 00:37:15 +0200
Subject: [PATCH 3/3] static-web-server: fix tests

---
 pkgs/servers/static-web-server/default.nix | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix
index db91eda363a2..3e29f5aa42d7 100644
--- a/pkgs/servers/static-web-server/default.nix
+++ b/pkgs/servers/static-web-server/default.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  fetchpatch,
   stdenv,
   darwin,
   nixosTests,
@@ -20,18 +21,19 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-ymI5O6j6NEcgIbMLEYgyUZBBkwxDWDWaVn4hqJScGxA=";
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/static-web-server/static-web-server/pull/466.patch";
+      hash = "sha256-VYSoi6swG4nEFmGKvdEaJ05mJlxaXYsjs8cQai40P4g=";
+    })
+  ];
+
   buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
-  # Lots of tests fail due to unexpected argument '--test-threads' because CLI options of
-  # test runner is being parsed
-  doCheck = false;
-
-  checkFlags = [
-    # TODO: investigate why these tests fail
-    "--skip=tests::handle_byte_ranges_if_range_too_old"
-    "--skip=tests::handle_not_modified"
-    "--skip=handle_precondition"
-  ];
+  # Some tests rely on timestamps newer than 18 Nov 1974 00:00:00
+  preCheck = ''
+    find docker/public -exec touch -m {} \;
+  '';
 
   # Need to copy in the systemd units for systemd.packages to discover them
   postInstall = ''