summaryrefslogtreecommitdiffstats
path: root/krebs/5pkgs/much/default.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-10-17 15:59:58 +0200
committerlassulus <lass@aidsballs.de>2015-10-17 15:59:58 +0200
commit21b6854a15a827850b50040f52c853ca8ba56024 (patch)
tree2a45e2393be9980d0c485dc6cf726d1601454a04 /krebs/5pkgs/much/default.nix
parent62af75a108efa64683532f949110bf412ffecfd9 (diff)
parent8cfdca6b6d6eed24953c1259b11239260e5a849f (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/5pkgs/much/default.nix')
-rw-r--r--krebs/5pkgs/much/default.nix58
1 files changed, 12 insertions, 46 deletions
diff --git a/krebs/5pkgs/much/default.nix b/krebs/5pkgs/much/default.nix
index 82586b422..ba5ab2327 100644
--- a/krebs/5pkgs/much/default.nix
+++ b/krebs/5pkgs/much/default.nix
@@ -1,63 +1,29 @@
{ pkgs, ... }:
-let
- hspkgs = pkgs.haskellngPackages.override {
- overrides = self: super: {
- email-header = self.callPackage (
-{ mkDerivation, attoparsec, base, base64-bytestring, bytestring
-, case-insensitive, containers, exceptions, fetchgit, QuickCheck
-, stdenv, tasty, tasty-quickcheck, text, text-icu, time
-}:
-mkDerivation {
- pname = "email-header";
- version = "0.3.0";
- src = fetchgit {
- url = "https://github.com/4z3/email-header";
- sha256 = "f33fba567a39b1f2448869b269c26c40d8007599c23ab83bde5b4dfd9fd76ebc";
- rev = "7b179bd31192ead8afe7a0b6e34bcad4039deaa8";
- };
- buildDepends = [
- attoparsec base base64-bytestring bytestring case-insensitive
- containers exceptions text text-icu time
- ];
- testDepends = [
- base bytestring case-insensitive containers QuickCheck tasty
- tasty-quickcheck text time
- ];
- jailbreak = true;
- homepage = "http://github.com/knrafto/email-header";
- description = "Parsing and rendering of email and MIME headers";
- license = stdenv.lib.licenses.bsd3;
-}
-) {};
- };
- };
-in
-
-hspkgs.callPackage (
+pkgs.haskellngPackages.callPackage (
{ mkDerivation, aeson, attoparsec, base, base64-bytestring
-, blaze-builder, bytestring, case-insensitive, containers, deepseq
+, blaze-builder, blessings, bytestring, case-insensitive, containers, deepseq
, directory, docopt, email-header, fetchgit, filepath
, friendly-time, hyphenation, linebreak, old-locale, process
-, random, rosezipper, safe, split, stdenv, terminal-size, text
+, random, rosezipper, safe, scanner, split, stdenv, terminal-size, text
, time, transformers, transformers-compat, unix, vector
}:
mkDerivation {
pname = "much";
- version = "0.0.0.0";
+ version = "1.0.0";
src = fetchgit {
- url = "http://cgit.nomic/much";
- sha256 = "f0bcc34456cb876d3439694d1e16db414a540e13f476fa3ff1ad70d1d3caccb2";
- rev = "bfd854e05207a073eaa983c49f27c37555ccfce5";
+ url = "http://cgit.cd.retiolum/much";
+ rev = "045dc986b4de225a927175f81c8ccfdab450202c";
+ sha256 = "cec175e3dc32ef93029ee5285f6c4042ce11d637945bc8cec02cb6699d06cc13";
};
isLibrary = false;
isExecutable = true;
buildDepends = [
- aeson attoparsec base base64-bytestring blaze-builder bytestring
- case-insensitive containers deepseq directory docopt email-header
- filepath friendly-time hyphenation linebreak old-locale process
- random rosezipper safe split terminal-size text time transformers
- transformers-compat unix vector
+ aeson attoparsec base base64-bytestring blaze-builder blessings bytestring
+ case-insensitive containers deepseq directory docopt email-header filepath
+ friendly-time hyphenation linebreak old-locale process random rosezipper
+ safe scanner split terminal-size text time transformers transformers-compat
+ unix vector
];
license = stdenv.lib.licenses.mit;
}