public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bazaar: updated to 2.6.0 and fixed ssl bug

Browse Source 
Fixes #1216
This commit is contained in:
Georges Dubus 2014-02-04 18:43:21 +01:00 committed by Bjørn Forsman
parent 9eaf987e62
commit b9fe0b8fb1
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/version-management/bazaar/add_certificates.patch Normal file
View File

@ -0,0 +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
# XXX: Needs checking, can't trust the interweb ;) -- vila 2012-01-25
u'/etc/openssl/certs/ca-certificates.crt', # Solaris
+ u'@certPath@',
]
def default_ca_certs():
if sys.platform == 'win32':

18
pkgs/applications/version-management/bazaar/default.nix
View File

@ -1,20 +1,28 @@
{ stdenv, fetchurl, pythonPackages }: { stdenv, fetchurl, pythonPackages, cacert }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.5"; version = "2.6";
release = ".1"; release = ".0";
name = "bazaar-${version}${release}"; name = "bazaar-${version}${release}";
src = fetchurl { src = fetchurl {
url = "http://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz"; url = "http://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz";
sha256 = "10krjbzia2avn09p0cdlbx2wya0r5v11w5ymvyl72af5dkx4cwwn"; sha256 = "1c6sj77h5f97qimjc14kr532kgc0jk3wq778xrkqi0pbh9qpk509";
}; };
buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; buildInputs = [ pythonPackages.python pythonPackages.wrapPython cacert ];
# Readline support is needed by bzrtools. # Readline support is needed by bzrtools.
pythonPath = [ pythonPackages.readline ]; pythonPath = [ pythonPackages.readline ];
# Bazaar can't find the certificates alone
patches = [ ./add_certificates.patch ];
postPatch = ''
substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \
--subst-var-by "certPath" "${cacert}/etc/ca-bundle.crt"
'';
installPhase = '' installPhase = ''
python setup.py install --prefix=$out python setup.py install --prefix=$out
wrapPythonPrograms wrapPythonPrograms