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-03-21 09:23:54 +01:00
parent d210a4a8fa 90b2dcdd2a
commit 22fb1ad99e
80 changed files with 766 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/git-and-tools/default.nix
+3 -4
View File
@@ -49,10 +49,9 @@ rec {
editDistance extensibleExceptions filepath gnutls hamlet hinotify hS3
hslogger httpConduit httpTypes HUnit IfElse json liftedBase MissingH
monadControl mtl network networkInfo networkMulticast networkProtocolXmpp
QuickCheck random regexCompat SafeSemaphore SHA stm text time
QuickCheck random regexCompat SafeSemaphore SHA stm text time regexTdfa
transformers transformersBase utf8String uuid wai waiLogger warp
xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack
cabalInstall;
xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack;
};
qgit = import ./qgit {
@@ -72,7 +71,7 @@ rec {
};
topGit = lib.makeOverridable (import ./topgit) {
inherit stdenv fetchurl unzip;
inherit stdenv fetchurl;
};
tig = import ./tig {
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+13 -13
View File
@@ -6,19 +6,18 @@
, networkInfo, networkMulticast, networkProtocolXmpp, openssh, QuickCheck
, random, regexCompat, rsync, SafeSemaphore, SHA, stm, text, time, transformers
, transformersBase, utf8String, uuid, wai, waiLogger, warp, xmlConduit, xmlTypes
, yesod, yesodDefault, yesodForm, yesodStatic, testpack
, cabalInstall # TODO: remove this build input at the next update
, yesod, yesodDefault, yesodForm, yesodStatic, testpack, regexTdfa
}:
let
version = "4.20130227";
version = "4.20130314";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
sha256 = "1zw5kzb08zz43ahbhrazjpq9zn73l3kwnqilp464frf7fg7rwan6";
sha256 = "0rwirg9qdbd75c7wl6413blv9045sbxmw20idvbm47qc4q14gzv9";
name = "git-annex-${version}.tar.gz";
};
@@ -30,20 +29,21 @@ stdenv.mkDerivation {
networkProtocolXmpp openssh QuickCheck random regexCompat rsync
SafeSemaphore SHA stm text time transformers transformersBase utf8String
uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault yesodForm
yesodStatic which perl testpack cabalInstall ];
yesodStatic which perl testpack regexTdfa ];
configurePhase = ''
makeFlagsArray=( PREFIX=$out )
makeFlagsArray=( PREFIX=$out CABAL=./Setup )
patchShebangs .
# cabal-install wants to store stuff in $HOME
mkdir ../tmp
export HOME=$PWD/../tmp
cabal configure -f-fast -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -fwebapp -fassistant -fdbus -finotify -fwebdav -fs3
ghc -O2 --make Setup
./Setup configure -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -fwebapp -fassistant -fdbus -finotify -fwebdav -fs3
'';
checkPhase = "./git-annex test";
doCheck = true;
checkPhase = ''
export HOME="$NIX_BUILD_TOP/tmp"
mkdir "$HOME"
./git-annex test
'';
meta = {
homepage = "http://git-annex.branchable.com/";
pkgs/applications/version-management/git-and-tools/topgit/default.nix
+12 -19
View File
@@ -1,33 +1,26 @@
{ stdenv, fetchurl, unzip }:
{ stdenv, fetchurl }:
let
version = "0.8-45-gd279e29";
lib = stdenv.lib;
in
stdenv.mkDerivation {
name = "topgit-${version}";
stdenv.mkDerivation rec {
name = "topgit-0.9";
src = fetchurl {
url = "http://repo.or.cz/w/topgit.git/snapshot/topgit-${version}.zip";
sha256 = "0vzrng1w2k7m4z0x9h6zbrcf33dx08ly8fnbxzz3ms2k2dbsmpl6";
url = "https://github.com/greenrd/topgit/archive/${name}.tar.gz";
sha256 = "1z9x42a0cmn8n2n961qcfl522nd6j9a3dpx1jbqfp24ddrk5zd94";
};
buildInputs = [unzip];
configurePhase = "export prefix=$out";
configurePhase = "makeFlags=prefix=$out";
postInstall = ''
mkdir -p "$out/share/doc/topgit-${version}"
cp README "$out/share/doc/topgit-${version}/"
mkdir -p "$out/etc/bash_completion.d"
make prefix="$out" install
mv "contrib/tg-completion.bash" "$out/etc/bash_completion.d/"
mkdir -p "$out/share/doc/${name}" "$out/etc/bash_completion.d/"
mv README "$out/share/doc/${name}/"
mv contrib/tg-completion.bash "$out/etc/bash_completion.d/"
'';
meta = {
description = "TopGit aims to make handling of large amount of interdependent topic branches easier";
maintainers = [ lib.maintainers.marcweber lib.maintainers.ludo lib.maintainers.simons ];
homepage = http://repo.or.cz/w/topgit.git;
homepage = "https://github.com/greenrd/topgit";
description = "TopGit manages large amount of interdependent topic branches";
license = "GPLv2";
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ marcweber ludo simons ];
};
}