From cf5592c66a415354528e05286b0f76ff96072a3c Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 18 Sep 2024 18:03:03 +0200
Subject: [PATCH 1/2] TMP: flake: Update nixpkgs to release-24.05 (3a458f7,
 2024-09-18)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This includes https://github.com/NixOS/nixpkgs/pull/342817

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c3d4ac725177c030b1e289015989da2ad9d56af0' (2024-08-15)
  → 'github:NixOS/nixpkgs/3a458f7c763ca62c6bf454b8d828bd86b7250671' (2024-09-18)
---
 flake.lock | 8 ++++----
 flake.nix  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index b5d0b881c5c..7737f0bd7bc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -80,16 +80,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1723688146,
-        "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
+        "lastModified": 1726674819,
+        "narHash": "sha256-qyfnYJsZq8cBBat6oGjHnu5MaWbNw47Ph31fX0iWPIU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
+        "rev": "3a458f7c763ca62c6bf454b8d828bd86b7250671",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "release-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index cbcf100211b..d8875d3575f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "The purely functional package manager";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
   inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
   inputs.nixpkgs-23-11.url = "github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446";
   inputs.flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };

From 97bd6ebfed4a5af2c899220052fc20fbbc19d157 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 18 Sep 2024 18:06:53 +0200
Subject: [PATCH 2/2] Add hydraJobs.tests.nix-serve

---
 flake.nix                | 6 ++++++
 package.nix              | 5 +++++
 packaging/everything.nix | 3 +++
 tests/nixos/default.nix  | 7 +++++++
 4 files changed, 21 insertions(+)

diff --git a/flake.nix b/flake.nix
index d8875d3575f..15867192671 100644
--- a/flake.nix
+++ b/flake.nix
@@ -139,6 +139,12 @@
 
           nix = final.nixComponents.nix;
 
+          nix-serve =
+            prev.nix-serve.override {
+              # undo potential version pinning
+              nix = final.nix;
+            };
+
           # See https://github.com/NixOS/nixpkgs/pull/214409
           # Remove when fixed in this flake's nixpkgs
           pre-commit =
diff --git a/package.nix b/package.nix
index 8ab1846679c..7c2a94eab41 100644
--- a/package.nix
+++ b/package.nix
@@ -27,6 +27,7 @@
 , mdbook
 , mdbook-linkcheck
 , mercurial
+, nix-perl-bindings
 , openssh
 , openssl
 , pkg-config
@@ -334,6 +335,10 @@ in {
 
   hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
 
+  passthru = lib.optionalAttrs (stdenv.buildPlatform.canExecute stdenv.hostPlatform) {
+    perl-bindings = nix-perl-bindings;
+  };
+
   meta = {
     platforms = lib.platforms.unix ++ lib.platforms.windows;
     mainProgram = "nix";
diff --git a/packaging/everything.nix b/packaging/everything.nix
index 6dae7f1c208..f34df9689cd 100644
--- a/packaging/everything.nix
+++ b/packaging/everything.nix
@@ -122,5 +122,8 @@
         nix-main-c
       ;
     };
+  }
+  // lib.optionalAttrs (stdenv.buildPlatform.canExecute stdenv.hostPlatform) {
+    perl-bindings = nix-perl-bindings;
   };
 })
diff --git a/tests/nixos/default.nix b/tests/nixos/default.nix
index 62fc6b10f91..fc59bd2b65b 100644
--- a/tests/nixos/default.nix
+++ b/tests/nixos/default.nix
@@ -160,3 +160,10 @@ in
 
   cgroups = runNixOSTestFor "x86_64-linux" ./cgroups;
 }
+// (let
+  inherit (nixpkgsFor."x86_64-linux".native) nixosTests;
+in {
+  nix-serve =
+    assert nixosTests.nix-serve.config.nodes.machine.services.nix-serve.package.nix == self.packages.x86_64-linux.nix;
+    nixosTests.nix-serve;
+})