From 8477009310c0cde111af3da9313d3c99902a48c7 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 26 Jan 2024 17:28:07 +0100
Subject: [PATCH 1/2] doc/manual: fix instructions in contribution guidelines

In 5db374cb500b687039ba4701b205ca7dfa67caba the `bootstrap` script was
removed, however it's still referenced in the contribution guidelines.
Change that to `autoreconfPhase` as intended by the commit.
---
 doc/manual/src/hacking.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/src/hacking.md b/doc/manual/src/hacking.md
index 72a74c82..49c17395 100644
--- a/doc/manual/src/hacking.md
+++ b/doc/manual/src/hacking.md
@@ -18,7 +18,7 @@ $ nix-shell
 To build Hydra, you should then do:
 
 ```console
-[nix-shell]$ ./bootstrap
+[nix-shell]$ autoreconfPhase
 [nix-shell]$ configurePhase
 [nix-shell]$ make
 ```

From b4c91b5a6ab91177d2c52c5b68c880277b4fd35f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 26 Jan 2024 17:30:07 +0100
Subject: [PATCH 2/2] package: move foreman to nativeCheckInputs

In 1bd195a5138b3c69c52110d713c706cb4908ba16 strictDeps was set for the
Hydra package. As a result, `checkInputs` aren't available anymore in
the local dev-shell which is the sole purpose of foreman, to start
services and a database for development.
---
 package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.nix b/package.nix
index 0f8f004d..f8b1849f 100644
--- a/package.nix
+++ b/package.nix
@@ -183,6 +183,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeCheckInputs = [
     bzip2
     darcs
+    foreman
     top-git
     mercurial
     subversion
@@ -194,7 +195,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   checkInputs = [
     cacert
-    foreman
     glibcLocales
     libressl.nc
     python3