summaryrefslogtreecommitdiffstats
path: root/krebs/5pkgs/haskell
diff options
context:
space:
mode:
Diffstat (limited to 'krebs/5pkgs/haskell')
-rw-r--r--krebs/5pkgs/haskell/brockman.nix19
-rw-r--r--krebs/5pkgs/haskell/scanner.nix9
2 files changed, 16 insertions, 12 deletions
diff --git a/krebs/5pkgs/haskell/brockman.nix b/krebs/5pkgs/haskell/brockman.nix
index 20af4b707..5f1166a25 100644
--- a/krebs/5pkgs/haskell/brockman.nix
+++ b/krebs/5pkgs/haskell/brockman.nix
@@ -1,23 +1,26 @@
-{ mkDerivation, aeson, async, base, bloomfilter, bytestring
-, conduit, containers, feed, hslogger, irc-conduit, microlens
-, network, optparse-applicative, stdenv, stm, text, wreq
+{ mkDerivation, aeson, aeson-pretty, base, bloomfilter, bytestring
+, case-insensitive, conduit, containers, directory, feed, filepath
+, hslogger, html-entity, http-client, irc-conduit, lens, network
+, optparse-applicative, random, safe, stdenv, text, time, timerep
+, wreq
, fetchFromGitHub
}:
mkDerivation rec {
pname = "brockman";
- version = "1.4.5";
+ version = "3.2.3";
src = fetchFromGitHub {
owner = "kmein";
repo = "brockman";
rev = version;
- sha256 = "0fdvfj2fwwz8inj0h1q6msryj1xsxs1lfmgv5kynmxrqpdibb3fw";
+ sha256 = "1qbjbf0l1ikfzmvky4cnvv7nlcwi2in4afliifh618j0a4f7j427";
};
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- aeson async base bloomfilter bytestring conduit containers feed
- hslogger irc-conduit microlens network optparse-applicative stm
- text wreq
+ aeson aeson-pretty base bloomfilter bytestring case-insensitive
+ conduit containers directory feed filepath hslogger html-entity
+ http-client irc-conduit lens network optparse-applicative random
+ safe text time timerep wreq
];
license = stdenv.lib.licenses.mit;
}
diff --git a/krebs/5pkgs/haskell/scanner.nix b/krebs/5pkgs/haskell/scanner.nix
index 071fd757f..28f89b069 100644
--- a/krebs/5pkgs/haskell/scanner.nix
+++ b/krebs/5pkgs/haskell/scanner.nix
@@ -1,12 +1,13 @@
{ mkDerivation, base, fetchgit, stdenv }:
mkDerivation {
pname = "scanner";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchgit {
- url = http://cgit.ni.krebsco.de/scanner;
- rev = "7f091a3bc152ad3974a1873b460fa1759bf8dcad";
+ url = "http://cgit.ni.krebsco.de/scanner";
sha256 = "1lgl158axczsm4fx53fyq1d4116v91jsx4dbz66ka4k1ljqrmhgn";
+ rev = "7f091a3bc152ad3974a1873b460fa1759bf8dcad";
+ fetchSubmodules = true;
};
libraryHaskellDepends = [ base ];
- license = stdenv.lib.licenses.wtfpl;
+ license = stdenv.lib.licenses.mit;
}