From 67656c9d3b36f02d9d4fbd0bd0fc2bb8c281418f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 14 Aug 2025 10:26:57 +0200
Subject: [PATCH] nix-serve: 2024-09-18 -> 2024-09-20

we don't need to pin nix, because perl bindings are stable enough.
---
 pkgs/by-name/ni/nix-serve/package.nix | 33 +++++++++------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/ni/nix-serve/package.nix b/pkgs/by-name/ni/nix-serve/package.nix
index 294258cc5b27..943b3f76f863 100644
--- a/pkgs/by-name/ni/nix-serve/package.nix
+++ b/pkgs/by-name/ni/nix-serve/package.nix
@@ -3,17 +3,14 @@
   stdenv,
   fetchFromGitHub,
   bzip2,
-  nixVersions,
+  nix,
   makeWrapper,
   nixosTests,
-  fetchpatch,
 }:
 
 let
-  rev = "77ffa33d83d2c7c6551c5e420e938e92d72fec24";
-  sha256 = "sha256-MJRdVO2pt7wjOu5Hk0eVeNbk5bK5+Uo/Gh9XfO4OlMY=";
-  nix = nixVersions.nix_2_24;
-  inherit (nix.perl-bindings) perl;
+  rev = "a7e046db4b29d422fc9aac60ea6b82b31399951a";
+  sha256 = "sha256-6ZQ0OLijq6UtOtUqRdFC19+helhU0Av6MvGCZf6XmcQ=";
 in
 
 stdenv.mkDerivation {
@@ -26,14 +23,6 @@ stdenv.mkDerivation {
     inherit rev sha256;
   };
 
-  patches = [
-    # Part of https://github.com/edolstra/nix-serve/pull/61
-    (fetchpatch {
-      url = "https://github.com/edolstra/nix-serve/commit/9e434fff4486afeb3cc3f631f6dc56492b204704.patch";
-      sha256 = "sha256-TxQ6q6UApTKsYIMdr/RyrkKSA3k47stV63bTbxchNTU=";
-    })
-  ];
-
   nativeBuildInputs = [ makeWrapper ];
 
   dontBuild = true;
@@ -42,20 +31,20 @@ stdenv.mkDerivation {
     install -Dm0755 nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi
 
     makeWrapper ${
-      perl.withPackages (p: [
+      nix.perl-bindings.perl.withPackages (p: [
         p.DBDSQLite
         p.Plack
         p.Starman
         nix.perl-bindings
       ])
     }/bin/starman $out/bin/nix-serve \
-                --prefix PATH : "${
-                  lib.makeBinPath [
-                    bzip2
-                    nix
-                  ]
-                }" \
-                --add-flags $out/libexec/nix-serve/nix-serve.psgi
+      --prefix PATH : "${
+        lib.makeBinPath [
+          bzip2
+          nix
+        ]
+      }" \
+      --add-flags $out/libexec/nix-serve/nix-serve.psgi
   '';
 
   /**