From 60371b06b8f54fe194723f09029a810048dd480d Mon Sep 17 00:00:00 2001
From: embr <git@liclac.eu>
Date: Fri, 21 Jun 2024 18:27:07 +0200
Subject: [PATCH 1/2] nix-web: 0.3.0 -> 0.4.2

---
 pkgs/by-name/ni/nix-web/package.nix | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ni/nix-web/package.nix b/pkgs/by-name/ni/nix-web/package.nix
index 50ef3aed969eb..f48634f46208c 100644
--- a/pkgs/by-name/ni/nix-web/package.nix
+++ b/pkgs/by-name/ni/nix-web/package.nix
@@ -15,23 +15,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "nix-web";
-  version = "0.3.0";
+  version = "0.4.2";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "gorgon";
     repo = "gorgon";
     rev = "nix-web-v${version}";
-    hash = "sha256-/tjcin3p+nE9Y7bhTCj7D4lpjKEFGM1bRqKE8T6igJE=";
-
-    # Various unit tests contain /nix/store/* paths. This breaks the fetcher in a very funny way:
-    #   error: illegal path references in fixed-output derivation '/nix/store/52nmkc6v9qhdyzszlvbncndxyrcdfjn3-source.drv'
-    nativeBuildInputs = [ nukeReferences ];
-    postFetch = ''
-      find $out -name "*.rs" -print0 | xargs -0 nuke-refs
-    '';
+    hash = "sha256-lAk2VfhclHswsctA0RQgEj5oEX1fowh8TCaKykGEioY=";
   };
-  cargoHash = "sha256-5pPn6APz0kdxuBdz9pgqvECTk6KhXnW/YTjxKgiuD9Q=";
+  cargoHash = "sha256-romL/RALr/pmwUA8/SN4AOwc+Vndspd1Yrqs0AHPYRY=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = lib.optional (!stdenv.isDarwin) openssl
@@ -47,11 +40,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoBuildFlags = cargoFlags;
   cargoTestFlags = cargoFlags;
-  checkFlags = [
-    # Skip tests that rely on store paths nuked by `nuke-refs`.
-    "--skip=test_env_value_to_html_store_path_subpath"
-    "--skip=test_env_value_to_html_store_path"
-  ];
 
   NIX_WEB_BUILD_NIX_CLI_PATH = "${nixPackage}/bin/nix";
 

From 4a6a82fbadfb213d763a95a2f1765ff45554f675 Mon Sep 17 00:00:00 2001
From: embr <git@liclac.eu>
Date: Fri, 21 Jun 2024 22:11:15 +0200
Subject: [PATCH 2/2] nix-web: Depend on SystemConfiguration.framework on
 Darwin

---
 pkgs/by-name/ni/nix-web/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ni/nix-web/package.nix b/pkgs/by-name/ni/nix-web/package.nix
index f48634f46208c..4f73413d28884 100644
--- a/pkgs/by-name/ni/nix-web/package.nix
+++ b/pkgs/by-name/ni/nix-web/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = lib.optional (!stdenv.isDarwin) openssl
-    ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
+    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]);
 
   postPatch = ''
     substituteInPlace nix-web/nix-web.service \