Clean up deps

- `strictDeps`

- Ensure it builds with and without `doCheck`
This commit is contained in:
John Ericson 2024-01-25 11:32:00 -05:00
parent 1471aacadc
commit 1bd195a513
2 changed files with 24 additions and 10 deletions

View file

@ -68,6 +68,12 @@
build = forEachSystem (system: packages.${system}.hydra); build = forEachSystem (system: packages.${system}.hydra);
buildNoTests = forEachSystem (system:
packages.${system}.hydra.overrideAttrs (_: {
doCheck = false;
})
);
manual = forEachSystem (system: manual = forEachSystem (system:
let pkgs = pkgsBySystem.${system}; in let pkgs = pkgsBySystem.${system}; in
pkgs.runCommand "hydra-manual-${pkgs.hydra.version}" { } pkgs.runCommand "hydra-manual-${pkgs.hydra.version}" { }

View file

@ -136,41 +136,49 @@ stdenv.mkDerivation {
inherit src; inherit src;
strictDeps = true;
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
autoreconfHook autoreconfHook
nukeReferences nukeReferences
pkg-config pkg-config
mdbook mdbook
nix
perlDeps
perl
unzip
]; ];
buildInputs = [ buildInputs = [
unzip
libpqxx libpqxx
top-git
mercurial
darcs
subversion
breezy
openssl openssl
bzip2
libxslt libxslt
nix nix
perlDeps perlDeps
perl perl
pixz
boost boost
postgresql_13
nlohmann_json nlohmann_json
prometheus-cpp prometheus-cpp
]; ];
nativeCheckInputs = [
bzip2
darcs
top-git
mercurial
subversion
breezy
openldap
postgresql_13
pixz
];
checkInputs = [ checkInputs = [
cacert cacert
foreman foreman
glibcLocales glibcLocales
libressl.nc libressl.nc
openldap
python3 python3
]; ];