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

Merge changes from branch 'master' into stdenv-updates.

Browse Source 
Conflicts:
	pkgs/development/libraries/icu/default.nix
	pkgs/tools/misc/coreutils/default.nix
This commit is contained in:
Peter Simons
2013-04-19 11:48:11 +02:00
parent d7be1e84d0 b6c7c4a142
commit 4914e63a89
159 changed files with 15305 additions and 3941 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/git-and-tools/default.nix
+1 -1
View File
@@ -51,7 +51,7 @@ rec {
monadControl mtl network networkInfo networkMulticast networkProtocolXmpp
QuickCheck random regexCompat SafeSemaphore SHA stm text time regexTdfa
transformers transformersBase utf8String uuid wai waiLogger warp
xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack;
xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic;
};
qgit = import ./qgit {
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+4 -4
View File
@@ -6,18 +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, regexTdfa
, yesod, yesodDefault, yesodForm, yesodStatic, regexTdfa
}:
let
version = "4.20130314";
version = "4.20130405";
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 = "0rwirg9qdbd75c7wl6413blv9045sbxmw20idvbm47qc4q14gzv9";
sha256 = "13lzkvk5095qj8026lc1p56w0q1c95v7nx8g9p9zrf8mhx6yxb9n";
name = "git-annex-${version}.tar.gz";
};
@@ -29,7 +29,7 @@ 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 regexTdfa ];
yesodStatic which perl regexTdfa ];
configurePhase = ''
makeFlagsArray=( PREFIX=$out CABAL=./Setup )
pkgs/applications/version-management/git-and-tools/github-backup/default.nix
+5 -9
View File
@@ -1,20 +1,16 @@
{ cabal, fetchurl, extensibleExceptions, filepath, github, hslogger, IfElse
, MissingH, mtl, network, prettyShow
{ cabal, extensibleExceptions, filepath, github, hslogger, IfElse
, MissingH, mtl, network, prettyShow, text
}:
cabal.mkDerivation (self: {
pname = "github-backup";
version = "1.20120314";
src = fetchurl {
url = "https://github.com/joeyh/github-backup/archive/1.20120314.tar.gz";
sha256 = "0rmgkylsnxbry02g5bxq5af03azgydfz6dzyvqzbhnkwavhqdlqy";
name = "github-backup-${self.pname}.tar.gz";
};
version = "1.20130414";
sha256 = "1s8s1kv4kj086kzq8iq28zyrlg65hrzg3563fw3dazfik73cmlcp";
isLibrary = false;
isExecutable = true;
buildDepends = [
extensibleExceptions filepath github hslogger IfElse MissingH mtl
network prettyShow
network prettyShow text
];
meta = {
homepage = "https://github.com/joeyh/github-backup";