From 693f27dff8b783c55739e381634300dabc20a4f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sun, 5 Jan 2020 17:30:37 +0100
Subject: Upgrade phpLDAPAdmin to a fork

---
 pkgs/webapps/phpldapadmin/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'pkgs/webapps/phpldapadmin/default.nix')

diff --git a/pkgs/webapps/phpldapadmin/default.nix b/pkgs/webapps/phpldapadmin/default.nix
index 70fd19a..da32f97 100644
--- a/pkgs/webapps/phpldapadmin/default.nix
+++ b/pkgs/webapps/phpldapadmin/default.nix
@@ -1,17 +1,20 @@
-{ config ? "/etc/phpldapadmin/config.php", fetchurl, stdenv, optipng }:
+{ config ? "/etc/phpldapadmin/config.php", fetchurl, fetchFromGitHub, stdenv, optipng }:
 stdenv.mkDerivation rec {
-  version = "1.2.3";
+  version = "1.2.5";
   name = "phpldapadmin-${version}";
-  src = fetchurl {
-    url = "https://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/${version}/${name}.tgz";
-    sha256 = "0n7dhp2a7n1krmnik3pb969jynsmhghmxviivnckifkprv1zijmf";
+  src = fetchFromGitHub {
+    owner = "leenooks";
+    repo = "phpLDAPadmin";
+    rev = "8f4ced96f9c63a09510a5bccb2189a8b92fb29ba";
+    sha256 = "1x6xc3xbvw3aj46i5ds06a8h6mfljxdv3argxrzz02l541ra6ni7";
   };
   patches = [
-    ./ldap-php5_5.patch
-    ./ldap-disable-mcrypt.patch
-    ./ldap-php7_2.patch
+    #./ldap-php5_5.patch
+    #./ldap-disable-mcrypt.patch
+    #./ldap-php7_2.patch
     ./ldap-sort-in-templates.patch
     ./ldap-align-button.patch
+    ./ldap-fix-password.patch
     ];
   buildInputs = [ optipng ];
   buildPhase = ''
-- 
cgit v1.2.3