mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 15:15:36 +00:00
Code Issues Wiki Activity

tevent: 0.9.37 → 0.10.2

Browse source 
* Now requires Python 3
* Which was also coincidentally required to fix build (https://github.com/NixOS/nixpkgs/issues/82489)
* Also switch to wafhook

Changes:
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=1c73f38633ce40bcf19775fbeaf5e3baacdba9ab
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=db58a50296041ca57675daee15caea8850f1d3f8
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=6f2278018436184785e19f69efc60ec408b14aa7
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=123267138e993c6a87990c0022e89f4970c0ac12
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=4aea5c0972de53c143530cc42ef6d3b8cfafb973
This commit is contained in:
Jan Tojnar 2020-03-31 04:28:43 +02:00
parent f6f09daa23
commit 2ef17b38fb
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,41 +1,44 @@
{ stdenv { stdenv
, fetchurl , fetchurl
, python , python3
, pkg-config , pkg-config
, readline , readline
, talloc , talloc
, libxslt , libxslt
, docbook-xsl-nons , docbook-xsl-nons
, docbook_xml_dtd_42 , docbook_xml_dtd_42
, which
, wafHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tevent"; pname = "tevent";
version = "0.9.37"; version = "0.10.2";
src = fetchurl { src = fetchurl {
url = "mirror://samba/tevent/${pname}-${version}.tar.gz"; url = "mirror://samba/tevent/${pname}-${version}.tar.gz";
sha256 = "1q77vbjic2bb79li2a54ffscnrnwwww55fbpry2kgh7acpnlb0qn"; sha256 = "+EJ4IuWyh4+4so1vUNloSHNPPzEwYS+1dP3S0hSKZpY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
]; which
python3
buildInputs = [
python
readline
talloc
libxslt libxslt
docbook-xsl-nons docbook-xsl-nons
docbook_xml_dtd_42 docbook_xml_dtd_42
wafHook
]; ];
preConfigure = '' buildInputs = [
sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf python3
''; readline # required to build python
talloc
];
configureFlags = [ wafPath = "buildtools/bin/waf";
wafConfigureFlags = [
"--bundled-libraries=NONE" "--bundled-libraries=NONE"
"--builtin-libraries=replace" "--builtin-libraries=replace"
]; ];

4
pkgs/top-level/all-packages.nix
View file

@ -14653,9 +14653,7 @@ in
termbox = callPackage ../development/libraries/termbox { }; termbox = callPackage ../development/libraries/termbox { };
tevent = callPackage ../development/libraries/tevent { tevent = callPackage ../development/libraries/tevent { };
python = python2;
};
tet = callPackage ../development/tools/misc/tet { }; tet = callPackage ../development/tools/misc/tet { };