Author: simons
Date: Tue Mar 6 11:24:20 2012
New Revision: 32819
URL: https://nixos.org/websvn/nix/?rev=32819&sc=1
Log:
git-annex: updated to version 3.20120230
Note that the latest version of git-annex must be compiled with GHC 7.4.1 or
later, because it takes advantage of some freaky file name encoding guessing
features that are absent in older versions of the base library.
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Tue Mar 6 11:05:50 2012 (r32818)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Tue Mar 6 11:24:20 2012 (r32819)
@@ -47,9 +47,8 @@
gitAnnex = lib.makeOverridable (import ./git-annex) {
inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki
which coreutils;
- inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
- HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl;
- QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1;
+ inherit (haskellPackages_ghc741) ghc MissingH utf8String pcreLight SHA
dataenc
+ HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl
IfElse QuickCheck2;
};
qgit = import ./qgit {
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
Tue Mar 6 11:05:50 2012 (r32818)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
Tue Mar 6 11:24:20 2012 (r32819)
@@ -1,32 +1,33 @@
{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP,
hxt
, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
-, QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils
+, QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils,
IfElse
}:
let
- version = "3.20120123";
+ version = "3.20120230";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url =
"http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";;
- sha256 =
"dad93dad08ddfd0d239ee57bbf61dd2ee3755d9a94e2946ac5d7bb4cfa565488";
+ sha256 =
"2406fd1405bcdc30cb57ba0455919b5bad2be64bcfe6b6f921cd6ea1797a66fa";
};
buildInputs = [
curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2
- rsync SHA testpack utf8String which liftedBase
+ rsync SHA testpack utf8String which liftedBase IfElse
];
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|' mdwn2man
- sed -i -e 's|"cp |"${coreutils}/bin/cp |' -e 's|"rm -f
|"${coreutils}/bin/rm -f |' test.hs
+ sed -i -e 's|"cp |"${coreutils}/bin/cp |' -e 's|"rm -f
|"${coreutils}/bin/rm -f |' -e 's|, test_addurl||' test.hs
'';
meta = {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
