From 102d2515bcf4939f064ed791d09a2bf7aab2ff32 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 3 Nov 2016 15:25:56 +0100 Subject: tv nixpkgs: 0195ab8 -> 238c7e0 --- tv/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.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"; -- cgit v1.2.3 From 4f1625d5dc7024f6e5572abdcc511c9adbe49cfe Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 3 Nov 2016 15:25:07 +0100 Subject: haskellPackages.hyphenation: init at 0.6 --- krebs/5pkgs/haskell-overrides/hyphenation.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 krebs/5pkgs/haskell-overrides/hyphenation.nix 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; +} -- cgit v1.2.3 From 174c7ab9bd60d948c494d42621cdc85fde8ac318 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 4 Nov 2016 23:40:43 +0100 Subject: tv git: add loldns --- tv/2configs/git.nix | 3 +++ 1 file changed, 3 insertions(+) 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 = { -- cgit v1.2.3