Merge recent master

This commit is contained in:
Vladimír Čunát
2014-06-15 17:55:35 +02:00
118 changed files with 1797 additions and 298 deletions

View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "cabal-bounds";
version = "0.5";
sha256 = "0sx6vyf3p62khg7qv7nwgd8fns6dsfpw34gpl7zmb6n0c1kjj60b";
version = "0.6";
sha256 = "0dl8rf8y365a20yz5kk1c9y860k5mkg1jp5dipvbf451h7a7h9w5";
isLibrary = true;
isExecutable = true;
buildDepends = [

View File

@@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
version = "1.61";
sha256 = "058bwswkhsj3rbxl42n23ri79smmhkaj6wid4c6x02yl3m8l7xsy";
version = "1.63";
sha256 = "12frnhm86w5i6rmhghrdngdv658332bh9j5nr04ql439yysvkypj";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];

View File

@@ -1,21 +1,21 @@
{ cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive
, conduit, conduitExtra, dataDefault, filepath, fsnotify, hspec
, httpConduit, httpReverseProxy, httpTypes, liftedBase, mtl
, network, networkConduitTls, random, regexTdfa, stm, systemFileio
, systemFilepath, tar, text, time, transformers, unixCompat
, unorderedContainers, vector, wai, waiAppStatic, waiExtra, warp
, warpTls, yaml, zlib
, httpClient, httpConduit, httpReverseProxy, httpTypes, liftedBase
, mtl, network, networkConduitTls, random, regexTdfa, stm
, systemFileio, systemFilepath, tar, text, time, transformers
, unixCompat, unorderedContainers, vector, wai, waiAppStatic
, waiExtra, warp, warpTls, yaml, zlib
}:
cabal.mkDerivation (self: {
pname = "keter";
version = "1.3.0";
sha256 = "1fvb93iga4c0kfv29ksrmn9bjznl7wfspg1v9a5d3svwrszl4is3";
version = "1.3.1";
sha256 = "19isyslrxbp430ira7v2d3r5f1j1526rg7v6lzzyl3dsyfpvxjg6";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson async attoparsec blazeBuilder caseInsensitive conduit
conduitExtra dataDefault filepath fsnotify httpConduit
conduitExtra dataDefault filepath fsnotify httpClient httpConduit
httpReverseProxy httpTypes liftedBase mtl network networkConduitTls
random regexTdfa stm systemFileio systemFilepath tar text time
transformers unixCompat unorderedContainers vector wai waiAppStatic

View File

@@ -0,0 +1,16 @@
{ cabal, json, mtl, parsec, regexCompat }:
cabal.mkDerivation (self: {
pname = "ShellCheck";
version = "0.3.3";
sha256 = "15lmc7cbi6s852qhd6h9asgz7ss1khfhq7wj4sgblr5mgppldg93";
isLibrary = true;
isExecutable = true;
buildDepends = [ json mtl parsec regexCompat ];
meta = {
homepage = "http://www.shellcheck.net/";
description = "Shell script analysis tool";
license = self.stdenv.lib.licenses.agpl3Plus;
platforms = self.ghc.meta.platforms;
};
})

View File

@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="cl-launch";
version="4.0.4";
version="4.0.5";
name="${baseName}-${version}";
hash="152m834myhcgi4iacfqn81fznlbqxn7pvdlxvk2lbba09h0slm56";
url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.0.4.tar.gz";
sha256="152m834myhcgi4iacfqn81fznlbqxn7pvdlxvk2lbba09h0slm56";
hash="00i11pkwsb9r9cjzxjmj0dsp369i0gpz04f447xss9a9v192dhlj";
url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.0.5.tar.gz";
sha256="00i11pkwsb9r9cjzxjmj0dsp369i0gpz04f447xss9a9v192dhlj";
};
buildInputs = [
];