summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/5pkgs/haskell/much.nix33
-rw-r--r--tv/2configs/xserver/default.nix1
2 files changed, 20 insertions, 14 deletions
diff --git a/krebs/5pkgs/haskell/much.nix b/krebs/5pkgs/haskell/much.nix
index db168f8a1..0a5453c0c 100644
--- a/krebs/5pkgs/haskell/much.nix
+++ b/krebs/5pkgs/haskell/much.nix
@@ -1,29 +1,36 @@
{ mkDerivation, aeson, attoparsec, base, base64-bytestring
, blaze-builder, blessings, bytestring, case-insensitive
-, containers, deepseq, directory, docopt, email-header, fetchgit
-, filepath, friendly-time, hyphenation, linebreak, old-locale
-, process, random, rosezipper, safe, scanner, split, stdenv
-, terminal-size, text, time, transformers, transformers-compat
-, unix, vector
+, containers, data-default, deepseq, directory, either
+, email-header, fetchgit, filepath, friendly-time, http-types
+, hyphenation, linebreak, network, old-locale, optparse-applicative
+, process, random, rosezipper, safe, scanner, servant-server, split
+, stdenv, terminal-size, text, time, transformers
+, transformers-compat, unix, vector, wai, warp
}:
mkDerivation {
pname = "much";
version = "1.2.0";
src = fetchgit {
url = "https://cgit.krebsco.de/much";
- sha256 = "0gfvppi8acylz0q7xh8dkm3dj676d4sc1m1gxwp663bkn4748873";
- rev = "8fc4fbb5bb7781626da8f63cd8df8bb0f554cfe7";
+ sha256 = "0rf27d7gki5hgivy49xi59ld0j6jw3v7nxi4w1gx6byj1xsarwwl";
+ rev = "29749366052a8f6c05b314f1ff17201717855ad7";
fetchSubmodules = true;
};
- isLibrary = false;
+ isLibrary = true;
isExecutable = true;
- executableHaskellDepends = [
+ libraryHaskellDepends = [
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
+ bytestring case-insensitive containers data-default deepseq
+ directory either email-header filepath friendly-time http-types
+ hyphenation linebreak network old-locale optparse-applicative
+ process random rosezipper safe scanner servant-server split
terminal-size text time transformers transformers-compat unix
- vector
+ vector wai warp
+ ];
+ executableHaskellDepends = [
+ aeson base blessings bytestring case-insensitive containers
+ data-default deepseq directory filepath hyphenation linebreak
+ process rosezipper safe scanner text time transformers unix
];
license = stdenv.lib.licenses.mit;
}
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 032df5d90..be155af53 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -128,7 +128,6 @@ in {
config.imgur.xdg-open.browser = "/etc/profiles/per-user/tv/bin/cr";
config.timeout = 200;
})
- pkgs.fzmenu
pkgs.pulseaudioLight.out
pkgs.rxvt_unicode
pkgs.xcalib