pyrox.dev
kea: 1.5.0-P1 -> 1.8.2
Enables kea-shell and perfdhcp, drops several unused dependencies.
+26
-10
pkgs/tools/networking/kea/default.nix
+26
-10
pkgs/tools/networking/kea/default.nix
···
1
-
{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan2, log4cplus
2
-
, boost, python3, postgresql, libmysqlclient, gmp, bzip2 }:
3
-
4
-
let inherit (stdenv) lib; in
1
+
{ stdenv
2
+
, lib
3
+
, fetchurl
4
+
, autoreconfHook
5
+
, pkg-config
6
+
, boost
7
+
, botan2
8
+
, libmysqlclient
9
+
, log4cplus
10
+
, postgresql
11
+
, python3 }:
5
12
6
13
stdenv.mkDerivation rec {
7
14
pname = "kea";
8
-
version = "1.5.0-P1";
15
+
version = "1.8.2";
9
16
10
17
src = fetchurl {
11
18
url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz";
12
-
sha256 = "0bqxzp3f7cmraa5davj2az1hx1gbbchqzlz3ai26c802agzafyhz";
19
+
sha256 = "0f8x1blfmbcak0cd21jm1zpz4w8iimldhjilwkwgvmmrxnmsfv28";
13
20
};
14
21
15
22
patches = [ ./dont-create-var.patch ];
···
20
27
'';
21
28
22
29
configureFlags = [
30
+
"--enable-perfdhcp"
31
+
"--enable-shell"
23
32
"--localstatedir=/var"
24
-
"--with-pgsql=${postgresql}/bin/pg_config"
25
33
"--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config"
34
+
"--with-pgsql=${postgresql}/bin/pg_config"
26
35
];
27
36
28
-
nativeBuildInputs = [ autoreconfHook pkgconfig ];
37
+
nativeBuildInputs = [
38
+
autoreconfHook
39
+
pkg-config
40
+
];
41
+
29
42
buildInputs = [
30
-
openssl log4cplus boost python3 libmysqlclient
31
-
botan2 gmp bzip2
43
+
boost
44
+
botan2
45
+
libmysqlclient
46
+
log4cplus
47
+
python3
32
48
];
33
49
34
50
enableParallelBuilding = true;
+10
-8
pkgs/tools/networking/kea/dont-create-var.patch
+10
-8
pkgs/tools/networking/kea/dont-create-var.patch
···
1
1
diff --git a/Makefile.am b/Makefile.am
2
-
index 2c0733c..974bb5e 100644
2
+
index 10708e7..d4efd73 100644
3
3
--- a/Makefile.am
4
4
+++ b/Makefile.am
5
-
@@ -135,11 +135,6 @@ cppcheck:
6
-
--template '{file}:{line}: check_fail: {message} ({severity},{id})' \
7
-
src
5
+
@@ -150,13 +150,6 @@ cppcheck:
6
+
docs:
7
+
$(MAKE) -C doc/sphinx
8
8
9
+
-
9
10
-# These steps are necessary during installation
10
11
-install-exec-hook:
11
12
- mkdir -p $(DESTDIR)${localstatedir}/log/
12
-
- mkdir -p $(DESTDIR)${localstatedir}/run/${PACKAGE_NAME}
13
+
- mkdir -p $(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}
14
+
- mkdir -p $(DESTDIR)${runstatedir}/${PACKAGE_NAME}
13
15
-
14
16
EXTRA_DIST = tools/path_replacer.sh
15
17
EXTRA_DIST += tools/mk_cfgrpt.sh
16
18
17
19
diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
18
-
index 564f623..7cea9f2 100644
20
+
index a0a0289..ba42f8a 100644
19
21
--- a/src/lib/dhcpsrv/Makefile.am
20
22
+++ b/src/lib/dhcpsrv/Makefile.am
21
-
@@ -352,5 +352,3 @@ libkea_dhcpsrv_parsers_include_HEADERS = \
23
+
@@ -408,5 +408,3 @@ libkea_dhcpsrv_parsers_include_HEADERS = \
24
+
parsers/simple_parser4.h \
22
25
parsers/simple_parser6.h
23
-
24
26
25
27
-install-data-local:
26
28
- $(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir)