From 1bd195a5138b3c69c52110d713c706cb4908ba16 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 25 Jan 2024 11:32:00 -0500
Subject: [PATCH] Clean up deps

- `strictDeps`

- Ensure it builds with and without `doCheck`
---
 flake.nix   |  6 ++++++
 package.nix | 28 ++++++++++++++++++----------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index f7975b27..a6b62cfa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,6 +68,12 @@
 
         build = forEachSystem (system: packages.${system}.hydra);
 
+        buildNoTests = forEachSystem (system:
+          packages.${system}.hydra.overrideAttrs (_: {
+            doCheck = false;
+          })
+        );
+
         manual = forEachSystem (system:
           let pkgs = pkgsBySystem.${system}; in
           pkgs.runCommand "hydra-manual-${pkgs.hydra.version}" { }
diff --git a/package.nix b/package.nix
index 35e29be1..f91e7a24 100644
--- a/package.nix
+++ b/package.nix
@@ -136,41 +136,49 @@ stdenv.mkDerivation {
 
   inherit src;
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     makeWrapper
     autoreconfHook
     nukeReferences
     pkg-config
     mdbook
+    nix
+    perlDeps
+    perl
+    unzip
   ];
 
   buildInputs = [
-    unzip
     libpqxx
-    top-git
-    mercurial
-    darcs
-    subversion
-    breezy
     openssl
-    bzip2
     libxslt
     nix
     perlDeps
     perl
-    pixz
     boost
-    postgresql_13
     nlohmann_json
     prometheus-cpp
   ];
 
+  nativeCheckInputs = [
+    bzip2
+    darcs
+    top-git
+    mercurial
+    subversion
+    breezy
+    openldap
+    postgresql_13
+    pixz
+  ];
+
   checkInputs = [
     cacert
     foreman
     glibcLocales
     libressl.nc
-    openldap
     python3
   ];