git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #107759 from mweinelt/kea

kea: 1.5.0-P1 -> 1.8.2

commit1fb0c48cf24dd7a4d04bcceffbdbe5ddcda877b1 authorSandro <sandro.jaeckel@gmail.com> dateSat 16 Jan 2021, 16:04 (6 years ago) parent974201cf07cef2
2 files changed+36−18
pkgs/tools/networking/kea/default.nix+26−10 pkgs/tools/networking/kea/dont-create-var.patch+10−8
pkgs/tools/networking/kea/default.nix+26−10
@@ -1,15 +1,22 @@
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 }:
512
613stdenv.mkDerivation rec {
714 pname = "kea";
8− version = "1.5.0-P1";
15+ version = "1.8.2";
916
1017 src = fetchurl {
1118 url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz";
12− sha256 = "0bqxzp3f7cmraa5davj2az1hx1gbbchqzlz3ai26c802agzafyhz";
19+ sha256 = "0f8x1blfmbcak0cd21jm1zpz4w8iimldhjilwkwgvmmrxnmsfv28";
1320 };
1421
1522 patches = [ ./dont-create-var.patch ];
@@ -20,15 +27,24 @@ stdenv.mkDerivation rec {
2027 '';
2128
2229 configureFlags = [
30+ "--enable-perfdhcp"
31+ "--enable-shell"
2332 "--localstatedir=/var"
24− "--with-pgsql=${postgresql}/bin/pg_config"
2533 "--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config"
34+ "--with-pgsql=${postgresql}/bin/pg_config"
35+ ];
36+
37+ nativeBuildInputs = [
38+ autoreconfHook
39+ pkg-config
2640 ];
2741
28− nativeBuildInputs = [ autoreconfHook pkgconfig ];
2942 buildInputs = [
30− openssl log4cplus boost python3 libmysqlclient
31− botan2 gmp bzip2
43+ boost
44+ botan2
45+ libmysqlclient
46+ log4cplus
47+ python3
3248 ];
3349
3450 enableParallelBuilding = true;
pkgs/tools/networking/kea/dont-create-var.patch+10−8
@@ -1,26 +1,28 @@
11diff --git a/Makefile.am b/Makefile.am
2−index 2c0733c..974bb5e 100644
2+index 10708e7..d4efd73 100644
33--- a/Makefile.am
44+++ 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
88
9+-
910-# These steps are necessary during installation
1011-install-exec-hook:
1112- 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}
1315-
1416 EXTRA_DIST = tools/path_replacer.sh
1517 EXTRA_DIST += tools/mk_cfgrpt.sh
1618
1719diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
18−index 564f623..7cea9f2 100644
20+index a0a0289..ba42f8a 100644
1921--- a/src/lib/dhcpsrv/Makefile.am
2022+++ 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 \
2225 parsers/simple_parser6.h
2326
24−
2527-install-data-local:
2628- $(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir)