diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-23 16:04:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-23 16:04:53 +0200 |
| commit | 96cec2a7bdf2482ae58fe04cce5e87a1eec644f9 (patch) | |
| tree | ea48b901c9ba0ac2b4a249ae94bd966c4a025001 /pkgs/applications/version-management/bazaar/default.nix | |
| parent | db83d9a35b09a7cc548d9b8b2ad63c1f8ca8ba28 (diff) | |
| parent | 084626deecaffcaa017af07eaab00682eff5d6f3 (diff) | |
| download | nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.gz nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.bz2 nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.lz nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.xz nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.zst nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.zip | |
Merge 'staging' into multiple-outputs
Conflicts: pkgs/applications/audio/flac/default.nix pkgs/build-support/gcc-wrapper/builder.sh pkgs/development/libraries/apr-util/default.nix pkgs/development/libraries/apr/default.nix pkgs/development/libraries/atk/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/glibc/2.17/builder.sh pkgs/development/libraries/glibc/2.17/locales.nix pkgs/development/libraries/libjpeg/default.nix pkgs/development/libraries/libogg/default.nix pkgs/development/libraries/libsamplerate/default.nix pkgs/development/libraries/libtiff/default.nix pkgs/development/libraries/libvorbis/default.nix pkgs/development/libraries/mesa/default.nix pkgs/development/libraries/pango/default.nix pkgs/development/web/nodejs/default.nix pkgs/os-specific/linux/pam/default.nix pkgs/os-specific/linux/systemd/default.nix pkgs/stdenv/generic/setup.sh pkgs/stdenv/linux/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-small.nix
Diffstat (limited to 'pkgs/applications/version-management/bazaar/default.nix')
| -rw-r--r-- | pkgs/applications/version-management/bazaar/default.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 1eb114ecd8ce..648d59ac01c2 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -1,20 +1,28 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, pythonPackages, cacert }: stdenv.mkDerivation rec { - version = "2.5"; - release = ".1"; + version = "2.6"; + release = ".0"; name = "bazaar-${version}${release}"; src = fetchurl { 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. 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 = '' python setup.py install --prefix=$out wrapPythonPrograms @@ -23,6 +31,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://bazaar-vcs.org/; description = "A distributed version control system that Just Works"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } |