mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
git-annex: update to 3.20120624
This commit is contained in:
parent
31d237129d
commit
a97e27fc82
@ -46,7 +46,7 @@ rec {
|
||||
inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils openssh;
|
||||
inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
|
||||
HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse
|
||||
QuickCheck bloomfilter editDistance;
|
||||
QuickCheck bloomfilter editDistance stm hinotify;
|
||||
};
|
||||
|
||||
qgit = import ./qgit {
|
||||
|
@ -1,18 +1,18 @@
|
||||
{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt
|
||||
, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
|
||||
, QuickCheck, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils
|
||||
, IfElse, bloomfilter, editDistance, openssh
|
||||
, IfElse, bloomfilter, editDistance, openssh, stm, hinotify
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.20120614";
|
||||
version = "3.20120624";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "git-annex-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}";
|
||||
sha256 = "ecb3b144a75a2eeb27061c46f3300c5117a5df260dddb36349eb8e75b6eebb16";
|
||||
sha256 = "b568bc7f8c93e4bd6f3cef1668d05bd38b7197fe1910afb941790dd499926480";
|
||||
name = "git-annex-${version}.tar.gz";
|
||||
};
|
||||
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
||||
curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
|
||||
libuuid MissingH monadControl mtl network pcreLight perl QuickCheck
|
||||
rsync SHA testpack utf8String which liftedBase IfElse bloomfilter
|
||||
editDistance openssh
|
||||
editDistance openssh stm hinotify
|
||||
];
|
||||
|
||||
checkTarget = "test";
|
||||
|
13
pkgs/development/libraries/haskell/hinotify/default.nix
Normal file
13
pkgs/development/libraries/haskell/hinotify/default.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hinotify";
|
||||
version = "0.3.2";
|
||||
sha256 = "0gr9rv1af6w7g2hbjhz1livi5zfhzdswjyapvjz3d7cga906bj48";
|
||||
meta = {
|
||||
homepage = "http://code.haskell.org/hinotify/README.html";
|
||||
description = "Haskell binding to INotify";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
@ -839,6 +839,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
highlightingKate = callPackage ../development/libraries/haskell/highlighting-kate {};
|
||||
|
||||
hinotify = callPackage ../development/libraries/haskell/hinotify {};
|
||||
|
||||
hint = callPackage ../development/libraries/haskell/hint {};
|
||||
|
||||
Hipmunk = callPackage ../development/libraries/haskell/Hipmunk {};
|
||||
|
@ -2825,10 +2825,10 @@ rec {
|
||||
};
|
||||
|
||||
PerlMagick = buildPerlPackage {
|
||||
name = "PerlMagick-6.74";
|
||||
name = "PerlMagick-6.77";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-6.74.tar.gz;
|
||||
sha256 = "6f2fbd3398610f2f02d5670eb5e0f5cb58079fba0e6b9d26519f469c104b969a";
|
||||
url = mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-6.77.tar.gz;
|
||||
sha256 = "0axbj3n5avjxvlxradjs9zxiv84i00drmnjsb7hq9sjn9fzggngg";
|
||||
};
|
||||
buildInputs = [pkgs.imagemagick];
|
||||
preConfigure =
|
||||
|
Loading…
Reference in New Issue
Block a user