From 2ef17b38fbc7a6845567def91204bfa64091f762 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 31 Mar 2020 04:28:43 +0200
Subject: [PATCH] =?UTF-8?q?tevent:=200.9.37=20=E2=86=92=200.10.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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
---
 pkgs/development/libraries/tevent/default.nix | 29 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  4 +--
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix
index b3c31ffd88d2..66d65e639510 100644
--- a/pkgs/development/libraries/tevent/default.nix
+++ b/pkgs/development/libraries/tevent/default.nix
@@ -1,41 +1,44 @@
 { stdenv
 , fetchurl
-, python
+, python3
 , pkg-config
 , readline
 , talloc
 , libxslt
 , docbook-xsl-nons
 , docbook_xml_dtd_42
+, which
+, wafHook
 }:
 
 stdenv.mkDerivation rec {
   pname = "tevent";
-  version = "0.9.37";
+  version = "0.10.2";
 
   src = fetchurl {
     url = "mirror://samba/tevent/${pname}-${version}.tar.gz";
-    sha256 = "1q77vbjic2bb79li2a54ffscnrnwwww55fbpry2kgh7acpnlb0qn";
+    sha256 = "+EJ4IuWyh4+4so1vUNloSHNPPzEwYS+1dP3S0hSKZpY=";
   };
 
   nativeBuildInputs = [
     pkg-config
-  ];
-
-  buildInputs = [
-    python
-    readline
-    talloc
+    which
+    python3
     libxslt
     docbook-xsl-nons
     docbook_xml_dtd_42
+    wafHook
   ];
 
-  preConfigure = ''
-    sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf
-  '';
+  buildInputs = [
+    python3
+    readline # required to build python
+    talloc
+  ];
 
-  configureFlags = [
+  wafPath = "buildtools/bin/waf";
+
+  wafConfigureFlags = [
     "--bundled-libraries=NONE"
     "--builtin-libraries=replace"
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5638580166c8..72a76af34036 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14653,9 +14653,7 @@ in
 
   termbox = callPackage ../development/libraries/termbox { };
 
-  tevent = callPackage ../development/libraries/tevent {
-    python = python2;
-  };
+  tevent = callPackage ../development/libraries/tevent { };
 
   tet = callPackage ../development/tools/misc/tet { };