From cad9e875bc3169d605bc26254c53966691e97523 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 18 Jun 2016 23:46:32 +0200
Subject: [PATCH] bazaar: 2.6.0 -> 2.7.0

---
 .../bazaar/add_certificates.patch              | 18 +++++++++---------
 .../version-management/bazaar/default.nix      |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/version-management/bazaar/add_certificates.patch b/pkgs/applications/version-management/bazaar/add_certificates.patch
index 332f42aa89cc..18fac36daec5 100644
--- a/pkgs/applications/version-management/bazaar/add_certificates.patch
+++ b/pkgs/applications/version-management/bazaar/add_certificates.patch
@@ -1,11 +1,11 @@
-diff -ru orig/bzrlib/transport/http/_urllib2_wrappers.py bzr-2.6.0/bzrlib/transport/http/_urllib2_wrappers.py
---- orig/bzrlib/transport/http/_urllib2_wrappers.py	2013-07-27 13:50:53.000000000 +0200
-+++ bzr-2.6.0/bzrlib/transport/http/_urllib2_wrappers.py	2014-02-04 18:34:15.838622492 +0100
-@@ -86,6 +86,7 @@
-     u"/usr/local/share/certs/ca-root-nss.crt", # FreeBSD
+diff -ru orig/bzrlib/transport/http/_urllib2_wrappers.py bzr-2.7.0/bzrlib/transport/http/_urllib2_wrappers.py
+--- orig/bzr-2.7.0/bzrlib/transport/http/_urllib2_wrappers.py	2016-02-01 20:49:17.000000000 +0100
++++ bzr-2.7.0/bzrlib/transport/http/_urllib2_wrappers.py	2016-06-18 23:15:21.089511349 +0200
+@@ -95,6 +95,7 @@
+     u"/usr/local/share/certs/ca-root-nss.crt",  # FreeBSD
      # XXX: Needs checking, can't trust the interweb ;) -- vila 2012-01-25
-     u'/etc/openssl/certs/ca-certificates.crt', # Solaris
+     u'/etc/openssl/certs/ca-certificates.crt',  # Solaris
 +    u'@certPath@',
-     ]
- def default_ca_certs():
-     if sys.platform == 'win32':
+ ]
+
+
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix
index 28406cecbb00..29dee3f03c57 100644
--- a/pkgs/applications/version-management/bazaar/default.nix
+++ b/pkgs/applications/version-management/bazaar/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  version = "2.6";
+  version = "2.7";
   release = ".0";
   name = "bazaar-${version}${release}";
 
   src = fetchurl {
-    url = "http://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz";
-    sha256 = "1c6sj77h5f97qimjc14kr532kgc0jk3wq778xrkqi0pbh9qpk509";
+    url = "https://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz";
+    sha256 = "1cysix5k3wa6y7jjck3ckq3abls4gvz570s0v0hxv805nwki4i8d";
   };
 
   buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];