summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-11-06 12:47:11 +0100
committerlassulus <lass@aidsballs.de>2016-11-06 12:47:11 +0100
commit9b0874ceee9b3736942ddc2b549636307033c78b (patch)
tree9b2bc0d1bdeb5eb5fda1e819faf8d2bdd6b71e36
parentbe75882a3b9ad9b6cab14be73f551c4f9dafce39 (diff)
parent174c7ab9bd60d948c494d42621cdc85fde8ac318 (diff)
Merge remote-tracking branch 'cd/master'
-rw-r--r--krebs/5pkgs/haskell-overrides/hyphenation.nix17
-rw-r--r--tv/2configs/default.nix2
-rw-r--r--tv/2configs/git.nix3
3 files changed, 21 insertions, 1 deletions
diff --git a/krebs/5pkgs/haskell-overrides/hyphenation.nix b/krebs/5pkgs/haskell-overrides/hyphenation.nix
new file mode 100644
index 000000000..6e5fe9455
--- /dev/null
+++ b/krebs/5pkgs/haskell-overrides/hyphenation.nix
@@ -0,0 +1,17 @@
+# Same as upstream but with doCheck = false because doctest has wrong version.
+{ mkDerivation, base, bytestring, containers, directory
+, filepath, unordered-containers, zlib, stdenv
+}:
+mkDerivation {
+ pname = "hyphenation";
+ version = "0.6";
+ sha256 = "2f673666c18f63581422f7c6389b78b0ff754406671296a3d680d417942512f7";
+ libraryHaskellDepends = [
+ base bytestring containers unordered-containers zlib
+ ];
+ homepage = "http://github.com/ekmett/hyphenation";
+ description = "Configurable Knuth-Liang hyphenation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ doCheck = false;
+}
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 1114ac1a5..514d313c1 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -14,7 +14,7 @@ with import <stockholm/lib>;
stockholm.file = "/home/tv/stockholm";
nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs;
- ref = "0195ab84607ac3a3aa07a79d2d6c2781b1bb6731";
+ ref = "238c7e0dbf73d7f330689cb6ec4b1218526cee4e";
};
} // optionalAttrs host.secure {
secrets-master.file = "/home/tv/secrets/master";
diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix
index d937be2c4..eb13e4282 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -32,6 +32,9 @@ let
get = {};
hack = {};
load-env = {};
+ loldns = {
+ cgit.desc = "toy DNS server";
+ };
make-snapshot = {};
much = {};
netcup = {