git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #83832 from jtojnar/samba-things

Clean up & update samba things

commit08306f3f2632058da1af5ce894f6c0a9409ff74e authorJan Tojnar <jtojnar@gmail.com> dateTue 31 Mar 2020, 20:38 (7 years ago) parent22536bf1be7664
6 files changed+140−70
pkgs/development/libraries/ldb/default.nix+37−24 pkgs/development/libraries/ntdb/default.nix+27−11 pkgs/development/libraries/talloc/default.nix+22−5 pkgs/development/libraries/tdb/default.nix+20−9 pkgs/development/libraries/tevent/default.nix+31−12 pkgs/top-level/all-packages.nix+3−9
pkgs/development/libraries/ldb/default.nix+37−24
@@ -1,49 +1,62 @@
1−{ stdenv, fetchurl, python, pkgconfig, readline, tdb, talloc, tevent
2−, popt, libxslt, docbook_xsl, docbook_xml_dtd_42, cmocka
1+{ stdenv
2+, fetchurl
3+, python3
4+, pkg-config
5+, readline
6+, tdb
7+, talloc
8+, tevent
9+, popt
10+, libxslt
11+, docbook-xsl-nons
12+, docbook_xml_dtd_42
13+, cmocka
14+, wafHook
315}:
416
517stdenv.mkDerivation rec {
6− name = "ldb-1.3.3";
18+ pname = "ldb";
19+ version = "2.1.1";
720
821 src = fetchurl {
9− url = "mirror://samba/ldb/${name}.tar.gz";
10− sha256 = "14gsrm7dvyjpbpnc60z75j6fz2p187abm2h353lq95kx2bv70c1b" ;
22+ url = "mirror://samba/ldb/${pname}-${version}.tar.gz";
23+ sha256 = "jO+y8l/KkT+hinktDvsDrwf4f1uVGkze0DD1uY8lx7A=";
1124 };
1225
1326 outputs = [ "out" "dev" ];
1427
15− nativeBuildInputs = [ pkgconfig ];
16− buildInputs = [
17− python readline tdb talloc tevent popt
18− libxslt docbook_xsl docbook_xml_dtd_42
19− cmocka
28+ nativeBuildInputs = [
29+ pkg-config
30+ python3
31+ wafHook
32+ libxslt
33+ docbook-xsl-nons
34+ docbook_xml_dtd_42
2035 ];
2136
22− patches = [
23− # CVE-2019-3824
24− # downloading the patch from debian as they have ported the patch from samba to ldb but otherwise is identical to
25− # https://bugzilla.samba.org/attachment.cgi?id=14857
26− (fetchurl {
27− name = "CVE-2019-3824.patch";
28− url = "https://sources.debian.org/data/main/l/ldb/2:1.1.27-1+deb9u1/debian/patches/CVE-2019-3824-master-v4-5-02.patch";
29− sha256 = "1idnqckvjh18rh9sbq90rr4sxfviha9nd1ca9pd6lai0y6r6q4yd";
30− })
37+ buildInputs = [
38+ python3
39+ readline # required to build python
40+ tdb
41+ talloc
42+ tevent
43+ popt
44+ cmocka
3145 ];
3246
33− preConfigure = ''
34− sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf
35− '';
47+ wafPath = "buildtools/bin/waf";
3648
37− configureFlags = [
49+ wafConfigureFlags = [
3850 "--bundled-libraries=NONE"
3951 "--builtin-libraries=replace"
52+ "--without-ldb-lmdb"
4053 ];
4154
4255 stripDebugList = "bin lib modules";
4356
4457 meta = with stdenv.lib; {
4558 description = "A LDAP-like embedded database";
46− homepage = https://ldb.samba.org/;
59+ homepage = "https://ldb.samba.org/";
4760 license = licenses.lgpl3Plus;
4861 platforms = platforms.all;
4962 };
pkgs/development/libraries/ntdb/default.nix+27−11
@@ -1,32 +1,48 @@
1−{ stdenv, fetchurl, python, pkgconfig, readline, gettext, libxslt
2−, docbook_xsl, docbook_xml_dtd_42
1+{ stdenv
2+, fetchurl
3+, python3
4+, pkg-config
5+, readline
6+, gettext
7+, libxslt
8+, docbook-xsl-nons
9+, docbook_xml_dtd_42
10+, wafHook
311}:
412
513stdenv.mkDerivation rec {
6− name = "ntdb-1.0";
14+ pname = "ntdb";
15+ version = "1.0";
716
817 src = fetchurl {
9− url = "mirror://samba/tdb/${name}.tar.gz";
18+ url = "mirror://samba/tdb/${pname}-${version}.tar.gz";
1019 sha256 = "0jdzgrz5sr25k83yrw7wqb3r0yj1v04z4s3lhsmnr5z6n5ifhyl1";
1120 };
1221
13− nativeBuildInputs = [ pkgconfig ];
22+ nativeBuildInputs = [
23+ pkg-config
24+ gettext
25+ libxslt
26+ docbook-xsl-nons
27+ docbook_xml_dtd_42
28+ wafHook
29+ ];
30+
1431 buildInputs = [
15− python readline gettext libxslt docbook_xsl docbook_xml_dtd_42
32+ python3
33+ readline # required to build python
1634 ];
1735
18− preConfigure = ''
19− patchShebangs buildtools/bin/waf
20− '';
36+ wafPath = "buildtools/bin/waf";
2137
22− configureFlags = [
38+ wafConfigureFlags = [
2339 "--bundled-libraries=NONE"
2440 "--builtin-libraries=replace,ccan"
2541 ];
2642
2743 meta = with stdenv.lib; {
2844 description = "The not-so trivial database";
29− homepage = https://tdb.samba.org/;
45+ homepage = "https://tdb.samba.org/";
3046 license = licenses.lgpl3Plus;
3147 platforms = platforms.all;
3248 };
pkgs/development/libraries/talloc/default.nix+22−5
@@ -1,5 +1,12 @@
1−{ stdenv, fetchurl, python, pkgconfig, readline, libxslt
2−, docbook_xsl, docbook_xml_dtd_42, fixDarwinDylibNames
1+{ stdenv
2+, fetchurl
3+, python
4+, pkg-config
5+, readline
6+, libxslt
7+, docbook-xsl-nons
8+, docbook_xml_dtd_42
9+, fixDarwinDylibNames
310, wafHook
411}:
512
@@ -12,9 +19,19 @@ stdenv.mkDerivation rec {
1219 sha256 = "0xwzgzrqamfdlklwacp9d219pqkah0yfrhxb1j7bxlmgzp924j7g";
1320 };
1421
15− nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python wafHook
16− docbook_xsl docbook_xml_dtd_42 ];
17− buildInputs = [ readline libxslt ];
22+ nativeBuildInputs = [
23+ pkg-config
24+ fixDarwinDylibNames
25+ python
26+ wafHook
27+ docbook-xsl-nons
28+ docbook_xml_dtd_42
29+ ];
30+
31+ buildInputs = [
32+ readline
33+ libxslt
34+ ];
1835
1936 wafPath = "buildtools/bin/waf";
2037
pkgs/development/libraries/tdb/default.nix+20−9
@@ -1,23 +1,34 @@
1−{ stdenv, fetchurl, pkgconfig
2−, wafHook, python3, readline
3−, libxslt, docbook_xsl, docbook_xml_dtd_45
1+{ stdenv
2+, fetchurl
3+, pkg-config
4+, wafHook
5+, python3
6+, readline
7+, libxslt
8+, docbook-xsl-nons
9+, docbook_xml_dtd_45
410}:
511
612stdenv.mkDerivation rec {
7− name = "tdb-1.4.3";
13+ pname = "tdb";
14+ version = "1.4.3";
815
916 src = fetchurl {
10− url = "mirror://samba/tdb/${name}.tar.gz";
17+ url = "mirror://samba/tdb/${pname}-${version}.tar.gz";
1118 sha256 = "06waz0k50c7v3chd08mzp2rv7w4k4q9isbxx3vhlfpx1vy9q61f8";
1219 };
1320
1421 nativeBuildInputs = [
15− pkgconfig wafHook
16− libxslt docbook_xsl docbook_xml_dtd_45
22+ pkg-config
23+ wafHook
24+ libxslt
25+ docbook-xsl-nons
26+ docbook_xml_dtd_45
1727 ];
1828
1929 buildInputs = [
20− python3 readline
30+ python3
31+ readline # required to build python
2132 ];
2233
2334 wafPath = "buildtools/bin/waf";
@@ -35,7 +46,7 @@ stdenv.mkDerivation rec {
3546 and uses locking internally to keep writers from trampling on each
3647 other. TDB is also extremely small.
3748 '';
38− homepage = https://tdb.samba.org/;
49+ homepage = "https://tdb.samba.org/";
3950 license = licenses.lgpl3Plus;
4051 platforms = platforms.all;
4152 };
pkgs/development/libraries/tevent/default.nix+31−12
@@ -1,32 +1,51 @@
1−{ stdenv, fetchurl, python, pkgconfig, readline, talloc
2−, libxslt, docbook_xsl, docbook_xml_dtd_42
1+{ stdenv
2+, fetchurl
3+, python3
4+, pkg-config
5+, readline
6+, talloc
7+, libxslt
8+, docbook-xsl-nons
9+, docbook_xml_dtd_42
10+, which
11+, wafHook
312}:
413
514stdenv.mkDerivation rec {
6− name = "tevent-0.9.37";
15+ pname = "tevent";
16+ version = "0.10.2";
717
818 src = fetchurl {
9− url = "mirror://samba/tevent/${name}.tar.gz";
10− sha256 = "1q77vbjic2bb79li2a54ffscnrnwwww55fbpry2kgh7acpnlb0qn";
19+ url = "mirror://samba/tevent/${pname}-${version}.tar.gz";
20+ sha256 = "+EJ4IuWyh4+4so1vUNloSHNPPzEwYS+1dP3S0hSKZpY=";
1121 };
1222
13− nativeBuildInputs = [ pkgconfig ];
23+ nativeBuildInputs = [
24+ pkg-config
25+ which
26+ python3
27+ libxslt
28+ docbook-xsl-nons
29+ docbook_xml_dtd_42
30+ wafHook
31+ ];
32+
1433 buildInputs = [
15− python readline talloc libxslt docbook_xsl docbook_xml_dtd_42
34+ python3
35+ readline # required to build python
36+ talloc
1637 ];
1738
18− preConfigure = ''
19− sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf
20− '';
39+ wafPath = "buildtools/bin/waf";
2140
22− configureFlags = [
41+ wafConfigureFlags = [
2342 "--bundled-libraries=NONE"
2443 "--builtin-libraries=replace"
2544 ];
2645
2746 meta = with stdenv.lib; {
2847 description = "An event system based on the talloc memory management library";
29− homepage = https://tevent.samba.org/;
48+ homepage = "https://tevent.samba.org/";
3049 license = licenses.lgpl3Plus;
3150 platforms = platforms.all;
3251 };
pkgs/top-level/all-packages.nix+3−9
@@ -12351,9 +12351,7 @@ in
1235112351
1235212352 ldacbt = callPackage ../development/libraries/ldacbt { };
1235312353
12354− ldb = callPackage ../development/libraries/ldb {
12355− python = python2;
12356− };
12354+ ldb = callPackage ../development/libraries/ldb { };
1235712355
1235812356 lensfun = callPackage ../development/libraries/lensfun {};
1235912357
@@ -14633,9 +14631,7 @@ in
1463314631
1463414632 tclx = callPackage ../development/libraries/tclx { };
1463514633
14636− ntdb = callPackage ../development/libraries/ntdb {
14637− python = python2;
14638− };
14634+ ntdb = callPackage ../development/libraries/ntdb { };
1463914635
1464014636 tdb = callPackage ../development/libraries/tdb {};
1464114637
@@ -14657,9 +14653,7 @@ in
1465714653
1465814654 termbox = callPackage ../development/libraries/termbox { };
1465914655
14660− tevent = callPackage ../development/libraries/tevent {
14661− python = python2;
14662− };
14656+ tevent = callPackage ../development/libraries/tevent { };
1466314657
1466414658 tet = callPackage ../development/tools/misc/tet { };
1466514659