Merge remote-tracking branch 'prism/lassulus'

12 files changed, 35 insertions, 15 deletions

diff --git a/krebs/5pkgs/cac-api/default.nix b/krebs/5pkgs/cac-api/default.nix
index 85a906e1d..e2bd8c148 100644
--- a/krebs/5pkgs/cac-api/default.nix
+++ b/krebs/5pkgs/cac-api/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "cac-api-1.1.2";
 
   src = fetchgit {
-    url = http://cgit.cd.krebsco.de/cac-api;
+    url = http://cgit.ni.krebsco.de/cac-api;
     rev = "67e93510e7742acae44db30275abbfe671aa9b7b";
     sha256 = "1vxh57j7vrq5sg9j1sam0538kkkhqpgf230vvdz2ifzgkj01z27l";
   };
diff --git a/krebs/5pkgs/get/default.nix b/krebs/5pkgs/get/default.nix
index 7dda86601..83f6b0228 100644
--- a/krebs/5pkgs/get/default.nix
+++ b/krebs/5pkgs/get/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "get-1.4.1";
 
   src = fetchgit {
-    url = http://cgit.cd.krebsco.de/get;
+    url = http://cgit.ni.krebsco.de/get;
     rev = "41c0c35805ec1708729f73d14650d8ebc94a405b";
     sha256 = "0rx1qsbb4py14795yhhqwlvaibj2569fqm7x2671l868xi59h9f9";
   };
diff --git a/krebs/5pkgs/github-hosts-sync/default.nix b/krebs/5pkgs/github-hosts-sync/default.nix
index 0dcbe7fd8..bc4c58bb0 100644
--- a/krebs/5pkgs/github-hosts-sync/default.nix
+++ b/krebs/5pkgs/github-hosts-sync/default.nix
@@ -1,13 +1,9 @@
-{ stdenv, fetchgit, pkgs, ... }:
+{ pkgs, stdenv, ... }:
 
 stdenv.mkDerivation {
   name = "github-hosts-sync";
 
-  src = fetchgit {
-    url = https://github.com/krebscode/painload;
-    rev = "35ccac73d563ad30d2851b9aeed4cfef69ff74e3";
-    sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35";
-  };
+  src = pkgs.painload;
 
   phases = [
     "unpackPhase"
diff --git a/krebs/5pkgs/haskell-overrides/blessings.nix b/krebs/5pkgs/haskell-overrides/blessings.nix
index ba776b352..5fb57a332 100644
--- a/krebs/5pkgs/haskell-overrides/blessings.nix
+++ b/krebs/5pkgs/haskell-overrides/blessings.nix
@@ -3,7 +3,7 @@ mkDerivation {
   pname = "blessings";
   version = "1.0.0";
   src = fetchgit {
-    url = http://cgit.cd.krebsco.de/blessings;
+    url = http://cgit.ni.krebsco.de/blessings;
     rev = "25a510dcb38ea9158e9969d56eb66cb1b860ab5f";
     sha256 = "0xg329h1y68ndg4w3m1jp38pkg3gqg7r19q70gqqj4mswb6qcrqc";
   };
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/krebs/5pkgs/haskell-overrides/scanner.nix b/krebs/5pkgs/haskell-overrides/scanner.nix
index 5146fa41d..071fd757f 100644
--- a/krebs/5pkgs/haskell-overrides/scanner.nix
+++ b/krebs/5pkgs/haskell-overrides/scanner.nix
@@ -3,7 +3,7 @@ mkDerivation {
   pname = "scanner";
   version = "1.0.0";
   src = fetchgit {
-    url = http://cgit.cd.krebsco.de/scanner;
+    url = http://cgit.ni.krebsco.de/scanner;
     rev = "7f091a3bc152ad3974a1873b460fa1759bf8dcad";
     sha256 = "1lgl158axczsm4fx53fyq1d4116v91jsx4dbz66ka4k1ljqrmhgn";
   };
diff --git a/krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix b/krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix
index 12eab943d..bf19e7d66 100644
--- a/krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix
+++ b/krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix
@@ -5,7 +5,7 @@ mkDerivation {
   pname = "xmonad-stockholm";
   version = "1.1.0";
   src = fetchgit {
-    url = http://cgit.cd.krebsco.de/xmonad-stockholm;
+    url = http://cgit.ni.krebsco.de/xmonad-stockholm;
     rev = "179d29fd4c765dee698058ef63295331ac603639";
     sha256 = "0c6mj68xsxxr4j8adkzhjszi7bg6cpisrsmqn587a16sblpbrnkj";
   };
diff --git a/krebs/5pkgs/much/default.nix b/krebs/5pkgs/much/default.nix
index 61a58b01b..aa3c56fe0 100644
--- a/krebs/5pkgs/much/default.nix
+++ b/krebs/5pkgs/much/default.nix
@@ -12,7 +12,7 @@ mkDerivation {
   pname = "much";
   version = "1.0.0";
   src = fetchgit {
-    url = "http://cgit.cd.krebsco.de/much";
+    url = "http://cgit.ni.krebsco.de/much";
     rev = "045dc986b4de225a927175f81c8ccfdab450202c";
     sha256 = "17jbw7x82a3bgn1qv5k764f103knrf865dmx48h7192vdh8gz766";
   };
diff --git a/krebs/5pkgs/painload/default.nix b/krebs/5pkgs/painload/default.nix
new file mode 100644
index 000000000..10fd379c0
--- /dev/null
+++ b/krebs/5pkgs/painload/default.nix
@@ -0,0 +1,7 @@
+{ fetchgit, ... }:
+
+fetchgit {
+  url = https://github.com/krebscode/painload;
+  rev = "8df031f810a2776d8c43b03a9793cb49398bd33b";
+  sha256 = "03md5k6fmz0j1ny22iw96dzq7cvijbz24ii85i0h2dhcychdp650";
+}
diff --git a/krebs/5pkgs/populate/default.nix b/krebs/5pkgs/populate/default.nix
index dc5750bda..3ec432229 100644
--- a/krebs/5pkgs/populate/default.nix
+++ b/krebs/5pkgs/populate/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   version = "1.2.0";
 
   src = fetchgit {
-    url = http://cgit.cd.krebsco.de/populate;
+    url = http://cgit.ni.krebsco.de/populate;
     rev = "refs/tags/v${version}";
     sha256 = "0q3110hkkxn9bc3a63xbx1hyd1fpzz4wrck4lng3j5a9i1y1jm07";
   };
diff --git a/krebs/5pkgs/push/default.nix b/krebs/5pkgs/push/default.nix
index 9a627fe36..2e0291aac 100644
--- a/krebs/5pkgs/push/default.nix
+++ b/krebs/5pkgs/push/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   name = "push-1.1.2";
 
   src = fetchgit {
-    url = http://cgit.cd.krebsco.de/push;
+    url = http://cgit.ni.krebsco.de/push;
     rev = "da5b3a4b05ef822cc41d36b6cc2071a2e78506d4";
     sha256 = "0gfxz207lm11g77rw02jcqpvzhx07j9hzgjgscbmslzl5r8icd6g";
   };
diff --git a/krebs/5pkgs/with-tmpdir/default.nix b/krebs/5pkgs/with-tmpdir/default.nix
index 517e46310..9862671f8 100644
--- a/krebs/5pkgs/with-tmpdir/default.nix
+++ b/krebs/5pkgs/with-tmpdir/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "with-tmpdir-1";
 
   src = fetchgit {
-    url = http://cgit.cd.krebsco.de/with-tmpdir;
+    url = http://cgit.ni.krebsco.de/with-tmpdir;
     rev = "3243c02ed8cd27a04c080bd39560204980f6c16a";
     sha256 = "80ee6cafb2c337999ddcd1e41747d6256b7cfcea605358c2046eb7e3729555c6";
   };