# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2017-08-11 14:13:50
# Node ID 7dbc2fc037314adbc1180b883332931419d18235
# Parent  dab33ccc9830b9cf5290ee902c99a09860b17ebe

svn: bumped to version 1.9.7 with latest security releases

diff --git a/default.nix b/default.nix
--- a/default.nix
+++ b/default.nix
@@ -36,11 +36,12 @@ let
     in
 
     pkgs.lib.overrideDerivation subversionWithPython (oldAttrs: {
-      patches = (oldAttrs.patches or []) ++
-        pkgs.lib.optionals pkgs.stdenv.isDarwin [
-          # johbo: "import svn.client" fails on darwin currently.
-          ./pkgs/subversion-1.9.4-darwin.patch
-        ];
+      name = "subversion-1.9.7";
+      src = pkgs.fetchurl {
+        url = "https://www.apache.org/dist/subversion/subversion-1.9.7.tar.gz";
+        sha256 = "0g3cs2h008z8ymgkhbk54jp87bjh7y049rn42igj881yi2f20an7";
+      };
+
     });
 
   });
diff --git a/pkgs/subversion-1.9.4-darwin.patch b/pkgs/subversion-1.9.4-darwin.patch
deleted file mode 100644
--- a/pkgs/subversion-1.9.4-darwin.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -rup subversion-1.9.4-orig/subversion/include/svn_auth.h subversion-1.9.4/subversion/include/svn_auth.h
---- subversion-1.9.4-orig/subversion/include/svn_auth.h	2015-02-13 12:17:40.000000000 +0100
-+++ subversion-1.9.4/subversion/include/svn_auth.h	2016-09-21 12:55:27.000000000 +0200
-@@ -943,7 +943,7 @@ svn_auth_get_windows_ssl_server_trust_pr
- 
- #endif /* WIN32 && !__MINGW32__ || DOXYGEN */
- 
--#if defined(DARWIN) || defined(DOXYGEN)
-+#if defined(SVN_HAVE_KEYCHAIN_SERVICES) || defined(DOXYGEN)
- /**
-  * Set @a *provider to an authentication provider of type @c
-  * svn_auth_cred_simple_t that gets/sets information from the user's
-@@ -984,7 +984,7 @@ void
- svn_auth_get_keychain_ssl_client_cert_pw_provider(
-   svn_auth_provider_object_t **provider,
-   apr_pool_t *pool);
--#endif /* DARWIN || DOXYGEN */
-+#endif /* SVN_HAVE_KEYCHAIN_SERVICES || DOXYGEN */
- 
- /* Note that the gnome keyring unlock prompt related items below must be
-  * declared for all platforms in order to allow SWIG interfaces to be
-diff -rup subversion-1.9.4-orig/subversion/libsvn_subr/auth.h subversion-1.9.4/subversion/libsvn_subr/auth.h
---- subversion-1.9.4-orig/subversion/libsvn_subr/auth.h	2015-08-27 06:00:31.000000000 +0200
-+++ subversion-1.9.4/subversion/libsvn_subr/auth.h	2016-09-21 12:56:20.000000000 +0200
-@@ -103,7 +103,7 @@ svn_auth__get_windows_ssl_server_trust_p
-   apr_pool_t *pool);
- #endif /* WIN32 && !__MINGW32__ || DOXYGEN */
- 
--#if defined(DARWIN) || defined(DOXYGEN)
-+#if defined(SVN_HAVE_KEYCHAIN_SERVICES) || defined(DOXYGEN)
- /**
-  * Set @a *provider to an authentication provider of type @c
-  * svn_auth_cred_simple_t that gets/sets information from the user's
-@@ -134,7 +134,7 @@ void
- svn_auth__get_keychain_ssl_client_cert_pw_provider(
-   svn_auth_provider_object_t **provider,
-   apr_pool_t *pool);
--#endif /* DARWIN || DOXYGEN */
-+#endif /* SVN_HAVE_KEYCHAIN_SERVICES || DOXYGEN */
- 
- #if !defined(WIN32) || defined(DOXYGEN)
- /**
-diff -rup subversion-1.9.4-orig/subversion/libsvn_subr/deprecated.c subversion-1.9.4/subversion/libsvn_subr/deprecated.c
---- subversion-1.9.4-orig/subversion/libsvn_subr/deprecated.c	2015-08-27 06:00:31.000000000 +0200
-+++ subversion-1.9.4/subversion/libsvn_subr/deprecated.c	2016-09-21 12:57:08.000000000 +0200
-@@ -1479,7 +1479,7 @@ svn_auth_get_windows_ssl_server_trust_pr
- #endif /* WIN32 && !__MINGW32__ */
- 
- /*** From macos_keychain.c ***/
--#if defined(DARWIN)
-+#if defined(SVN_HAVE_KEYCHAIN_SERVICES)
- void
- svn_auth_get_keychain_simple_provider(svn_auth_provider_object_t **provider,
-                                       apr_pool_t *pool)
-@@ -1494,7 +1494,7 @@ svn_auth_get_keychain_ssl_client_cert_pw
- {
-   svn_auth__get_keychain_ssl_client_cert_pw_provider(provider, pool);
- }
--#endif /* DARWIN */
-+#endif /* SVN_HAVE_KEYCHAIN_SERVICES */
- 
- #if !defined(WIN32)
- void