b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #208795 from wucke13/dev/wucke13/fix-sssd

Browse source
This commit is contained in:
Lassulus 2023-02-09 20:50:56 +05:30 committed by GitHub
parent 02e2ee0374 9b4cf10855
commit 7b2a482ea0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 45 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/ldb/default.nix
View file

@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "ldb";
version = "2.3.0";
version = "2.6.1";
src = fetchurl {
url = "mirror://samba/ldb/${pname}-${version}.tar.gz";
sha256 = "0bcjj4gv48ddg44wyxpsvrs26xry6yy9x9k16qgz0bljs2rhilx4";
sha256 = "sha256-RnQD9334Z4LDlluxdUQLqi7XUan+uVYBlL2MBr8XNsk=";
};
outputs = [ "out" "dev" ];
@ -44,6 +44,13 @@ stdenv.mkDerivation rec {
cmocka
];
# otherwise the configure script fails with
# PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make!
preConfigure = ''
export PKGCONFIG="$PKG_CONFIG"
export PYTHONHASHSEED=1
'';
wafPath = "buildtools/bin/waf";
wafConfigureFlags = [

11
pkgs/development/libraries/talloc/default.nix
View file

@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "talloc";
version = "2.3.3";
version = "2.3.4";
src = fetchurl {
url = "mirror://samba/talloc/${pname}-${version}.tar.gz";
sha256 = "sha256-a+lbI2i9CvHEzXqIFG62zuoY5Gw//JMwv2JitA0diqo=";
sha256 = "sha256-F5+eviZeZ+SrLCbK0rfeS2p3xsIS+WaQM4KGnwa+ZQU=";
};
nativeBuildInputs = [
@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
libxcrypt
];
# otherwise the configure script fails with
# PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make!
preConfigure = ''
export PKGCONFIG="$PKG_CONFIG"
export PYTHONHASHSEED=1
'';
wafPath = "buildtools/bin/waf";
wafConfigureFlags = [

11
pkgs/development/libraries/tdb/default.nix
View file

@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "tdb";
version = "1.4.6";
version = "1.4.7";
src = fetchurl {
url = "mirror://samba/tdb/${pname}-${version}.tar.gz";
sha256 = "sha256-1okr2L7+BKd2QqHdVuSoeTSb8c9bLAv1+4QQYZON7ws=";
sha256 = "sha256-pPsWje9TPzH/LAf32YRLsxMeZ5nwlOvnfQOArcmHwg4=";
};
nativeBuildInputs = [
@ -34,6 +34,13 @@ stdenv.mkDerivation rec {
libxcrypt
];
# otherwise the configure script fails with
# PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make!
preConfigure = ''
export PKGCONFIG="$PKG_CONFIG"
export PYTHONHASHSEED=1
'';
wafPath = "buildtools/bin/waf";
wafConfigureFlags = [

13
pkgs/development/libraries/tevent/default.nix
View file

@ -2,6 +2,7 @@
, fetchurl
, python3
, pkg-config
, cmocka
, readline
, talloc
, libxslt
@ -13,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "tevent";
version = "0.10.2";
version = "0.13.0";
src = fetchurl {
url = "mirror://samba/tevent/${pname}-${version}.tar.gz";
sha256 = "15k6i8ad5lpxfjsjyq9h64zlyws8d3cm0vwdnaw8z1xjwli7hhpq";
sha256 = "sha256-uUN6kX+lU0Q2G+tk7J4AQumcroh5iCpi3Tj2q+I3HQw=";
};
nativeBuildInputs = [
@ -32,10 +33,18 @@ stdenv.mkDerivation rec {
buildInputs = [
python3
cmocka
readline # required to build python
talloc
];
# otherwise the configure script fails with
# PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make!
preConfigure = ''
export PKGCONFIG="$PKG_CONFIG"
export PYTHONHASHSEED=1
'';
wafPath = "buildtools/bin/waf";
wafConfigureFlags = [

7
pkgs/servers/samba/4.x.nix
View file

@ -20,9 +20,12 @@
, gnutls
, systemd
, samba
, talloc
, jansson
, ldb
, libtasn1
, tdb
, tevent
, libxcrypt
, cmocka
, rpcsvc-proto
@ -100,8 +103,11 @@ stdenv.mkDerivation rec {
libarchive
zlib
gnutls
ldb
talloc
libtasn1
tdb
tevent
libxcrypt
] ++ optionals stdenv.isLinux [ liburing systemd ]
++ optionals stdenv.isDarwin [ libiconv ]
@ -143,6 +149,7 @@ stdenv.mkDerivation rec {
++ optionals (!enableLDAP) [
"--without-ldap"
"--without-ads"
"--bundled-libraries=!ldb,!pyldb-util!talloc,!pytalloc-util,!tevent,!tdb,!pytdb"
] ++ optional enableLibunwind "--with-libunwind"
++ optional enableProfiling "--with-profiling-data"
++ optional (!enableAcl) "--without-acl-support"