diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-17 14:19:14 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-17 14:19:14 +0100 |
| commit | 5bb548d2e4c866ce55efdd2e1cee5e9e72863156 (patch) | |
| tree | 9276447eeac077bcea3e6013ebb37f7bba642be8 /pkgs/applications/version-management | |
| parent | b4dd943f1635a7e8d2e440b703fa01c6c2126164 (diff) | |
| parent | 3544f3223166583f1e5459822250f1821b258c1e (diff) | |
| download | nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.gz nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.bz2 nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.lz nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.xz nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.zst nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/bazaar/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 856320f01684..1eb114ecd8ce 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.3"; + version = "2.5"; release = ".1"; name = "bazaar-${version}${release}"; src = fetchurl { url = "http://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz"; - sha256 = "07kx41w4gqv68bcykdflsg68wvpmcyqknzyb4vr1zqlf27hahp53"; + sha256 = "10krjbzia2avn09p0cdlbx2wya0r5v11w5ymvyl72af5dkx4cwwn"; }; buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 8e454ad9f8f0..885e4310a593 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.7.7"; + version = "1.7.8"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion//${name}.tar.bz2"; - sha1 = "c9fc0c5992eda36ba9affd93a15929e25958a951"; + sha1 = "12c7d8d5414bba74c9777c4d1dae74f152df63c2"; }; buildInputs = [ zlib apr aprutil sqlite ] |