diff options
author | Florian Friesdorf <flo@chaoflow.net> | 2012-11-29 15:36:17 +0100 |
---|---|---|
committer | Florian Friesdorf <flo@chaoflow.net> | 2012-11-29 15:36:17 +0100 |
commit | 471a4b583fcd99841029af923d035bdab4837ee7 (patch) | |
tree | 8d344db415db0d35c55bcf298fd23c5a3db8ccdc /pkgs/applications/version-management | |
parent | a4ded477764ba35cb4e185f82af27fb43b46cc82 (diff) | |
parent | 2eace0dfe665799d04ef4d8675d119c2843e15a8 (diff) | |
download | nixlib-471a4b583fcd99841029af923d035bdab4837ee7.tar nixlib-471a4b583fcd99841029af923d035bdab4837ee7.tar.gz nixlib-471a4b583fcd99841029af923d035bdab4837ee7.tar.bz2 nixlib-471a4b583fcd99841029af923d035bdab4837ee7.tar.lz nixlib-471a4b583fcd99841029af923d035bdab4837ee7.tar.xz nixlib-471a4b583fcd99841029af923d035bdab4837ee7.tar.zst nixlib-471a4b583fcd99841029af923d035bdab4837ee7.zip |
Merge branch 'channel-nixos' into python-merge
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-annex/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 713cf0d62a61..4096befbf198 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -12,14 +12,14 @@ }: let - version = "3.20121112-161-gb27d9eb"; + version = "3.20121126"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { - url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;h=b27d9ebd0f63bdc449440f2529224d5b655ddbb3;sf=tgz"; - sha256 = "507efc50e33566a51a6abf688920d30fc55ce984c9c35be085e6df0767686b3a"; + url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}"; + sha256 = "7db662ac1869582dda7bfa7d6218a61a962219ea4c94c27153877fa02000be33"; name = "git-annex-${version}.tar.gz"; }; @@ -36,7 +36,6 @@ stdenv.mkDerivation { checkTarget = "test"; doCheck = true; - # The 'add_url' test fails because it attempts to use the network. preConfigure = '' makeFlagsArray=( PREFIX=$out ) sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' Build/mdwn2man diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index b32299092124..857b7de34861 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ let - version = "1.8.0"; + version = "1.8.0.1"; svn = subversionClient.override { perlBindings = true; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha1 = "a03afc33f8f0723ad12649d79f1e8968526b4bf7"; + sha1 = "4e7492f7558f3ba2a450c43efa7de3b0b1adc6c1"; }; patches = [ ./docbook2texi.patch ]; |