public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into stdenv-updates.

Browse Source
This commit is contained in:
Peter Simons
2013-06-01 11:48:21 +02:00
parent 8326038d2b 9f4612961b
commit 5718931dd3
160 changed files with 4240 additions and 2684 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+3 -3
View File
@@ -10,14 +10,14 @@
}:
let
version = "4.20130501";
version = "4.20130521";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "https://github.com/joeyh/git-annex/tarball/${version}";
sha256 = "1280sdj3d3s3k5a1znzl7xzzyncv9kz522bprhwb9if03v6xh2kl";
sha256 = "0wa3sgw0xbqykl5r6ba0gannwj61y0h024glm0xjj97fy06b77i0";
name = "git-annex-${version}.tar.gz";
};
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
makeFlagsArray=( PREFIX=$out CABAL=./Setup )
patchShebangs .
ghc -O2 --make Setup
./Setup configure -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -fwebapp -fassistant -fdbus -finotify -fwebdav -fs3
./Setup configure -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -f-webapp -fassistant -fdbus -finotify -fwebdav -fs3
'';
doCheck = true;