Merge remote-tracking branch 'cd/master'
This commit is contained in:
commit
9b0874ceee
17
krebs/5pkgs/haskell-overrides/hyphenation.nix
Normal file
17
krebs/5pkgs/haskell-overrides/hyphenation.nix
Normal file
|
@ -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;
|
||||||
|
}
|
|
@ -14,7 +14,7 @@ with import <stockholm/lib>;
|
||||||
stockholm.file = "/home/tv/stockholm";
|
stockholm.file = "/home/tv/stockholm";
|
||||||
nixpkgs.git = {
|
nixpkgs.git = {
|
||||||
url = https://github.com/NixOS/nixpkgs;
|
url = https://github.com/NixOS/nixpkgs;
|
||||||
ref = "0195ab84607ac3a3aa07a79d2d6c2781b1bb6731";
|
ref = "238c7e0dbf73d7f330689cb6ec4b1218526cee4e";
|
||||||
};
|
};
|
||||||
} // optionalAttrs host.secure {
|
} // optionalAttrs host.secure {
|
||||||
secrets-master.file = "/home/tv/secrets/master";
|
secrets-master.file = "/home/tv/secrets/master";
|
||||||
|
|
|
@ -32,6 +32,9 @@ let
|
||||||
get = {};
|
get = {};
|
||||||
hack = {};
|
hack = {};
|
||||||
load-env = {};
|
load-env = {};
|
||||||
|
loldns = {
|
||||||
|
cgit.desc = "toy DNS server";
|
||||||
|
};
|
||||||
make-snapshot = {};
|
make-snapshot = {};
|
||||||
much = {};
|
much = {};
|
||||||
netcup = {
|
netcup = {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user