diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-06-19 22:25:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-19 22:25:49 +0100 |
| commit | 5da1db3dcfe596af1b6364c1737b21beebaf4ddc (patch) | |
| tree | fe19cc40eadd1a8e45dcb743245b983805d8e4df /pkgs/applications/version-management | |
| parent | 3441dbafe362e20a9a9876387cae3ff9f5067610 (diff) | |
| parent | cad9e875bc3169d605bc26254c53966691e97523 (diff) | |
| download | nixpkgs-5da1db3dcfe596af1b6364c1737b21beebaf4ddc.tar nixpkgs-5da1db3dcfe596af1b6364c1737b21beebaf4ddc.tar.gz nixpkgs-5da1db3dcfe596af1b6364c1737b21beebaf4ddc.tar.bz2 nixpkgs-5da1db3dcfe596af1b6364c1737b21beebaf4ddc.tar.lz nixpkgs-5da1db3dcfe596af1b6364c1737b21beebaf4ddc.tar.xz nixpkgs-5da1db3dcfe596af1b6364c1737b21beebaf4ddc.tar.zst nixpkgs-5da1db3dcfe596af1b6364c1737b21beebaf4ddc.zip | |
Merge pull request #16319 from mimadrid/update/bazaar-2.7.0
bazaar: 2.6.0 -> 2.7.0
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/bazaar/add_certificates.patch | 18 | ||||
| -rw-r--r-- | pkgs/applications/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 332f42aa89c..18fac36daec 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 28406cecbb0..29dee3f03c5 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 ]; |