Merge pull request #1312 from obsidiansystems/clean-up-deps

Cleanup deps
This commit is contained in:
Eelco Dolstra 2023-12-04 15:15:09 +01:00 committed by GitHub
commit 4dc8fe0b08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 17 deletions

View file

@ -80,7 +80,7 @@ $ nix-build
You can use the provided shell.nix to get a working development environment:
```
$ nix-shell
$ ./bootstrap
$ autoreconfPhase
$ configurePhase # NOTE: not ./configure
$ make
```

View file

@ -1,2 +0,0 @@
#! /bin/sh -e
exec autoreconf -vfi

View file

@ -61,10 +61,11 @@
};
hydra = with final; let
perlDeps = buildEnv {
hydra = let
inherit (final) lib stdenv;
perlDeps = final.buildEnv {
name = "hydra-perl-deps";
paths = with perlPackages; lib.closePropagation
paths = with final.perlPackages; lib.closePropagation
[
AuthenSASL
CatalystActionREST
@ -98,7 +99,7 @@
FileSlurper
FileWhich
final.nix.perl-bindings
git
final.git
IOCompress
IPCRun
IPCRun3
@ -141,15 +142,20 @@
src = self;
buildInputs =
[
nativeBuildInputs =
with final.buildPackages; [
makeWrapper
autoconf
autoreconfHook
automake
libtool
unzip
nukeReferences
pkg-config
mdbook
];
buildInputs =
with final; [
unzip
libpqxx
top-git
mercurial
@ -162,7 +168,6 @@
final.nix
perlDeps
perl
mdbook
pixz
boost
postgresql_13
@ -172,7 +177,7 @@
prometheus-cpp
];
checkInputs = [
checkInputs = with final; [
cacert
foreman
glibcLocales
@ -181,7 +186,7 @@
python3
];
hydraPath = lib.makeBinPath (
hydraPath = with final; lib.makeBinPath (
[
subversion
openssh
@ -203,7 +208,7 @@
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ]
);
OPENLDAP_ROOT = openldap;
OPENLDAP_ROOT = final.openldap;
shellHook = ''
pushd $(git rev-parse --show-toplevel) >/dev/null
@ -218,8 +223,6 @@
popd >/dev/null
'';
preConfigure = "autoreconf -vfi";
NIX_LDFLAGS = [ "-lpthread" ];
enableParallelBuilding = true;