reaktor2: inline blessings 2.5.0

2 files changed, 21 insertions, 29 deletions

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 866796a4e..8046d9b71 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -20,7 +20,27 @@ fix (foldl' (flip extends) (self: super) (
   [
     (self: super: {
       brockman = self.haskellPackages.brockman;
-      reaktor2 = self.haskellPackages.reaktor2;
+      reaktor2 = self.haskellPackages.reaktor2.override {
+        blessings =
+          self.haskellPackages.callPackage (
+            { mkDerivation, base, bytestring, extra, fetchgit, hspec, lib
+            , QuickCheck, text, wcwidth
+            }:
+            mkDerivation {
+              pname = "blessings";
+              version = "2.5.0";
+              src = fetchgit {
+                url = "https://cgit.krebsco.de/blessings";
+                sha256 = "1spwm4xjz72c76wkkxxxbvxpgkxam344iwq37js5lhfbb2hbjqbx";
+                rev = "8f9b20f3aa93f7fbba9d24de7732f4cca0119154";
+                fetchSubmodules = true;
+              };
+              libraryHaskellDepends = [ base bytestring extra text wcwidth ];
+              testHaskellDepends = [ base hspec QuickCheck ];
+              license = lib.licenses.mit;
+            }
+          ) {};
+      };
     })
   ]
 ))
diff --git a/krebs/5pkgs/haskell/blessings.nix b/krebs/5pkgs/haskell/blessings.nix
deleted file mode 100644
index 2176db2ff..000000000
--- a/krebs/5pkgs/haskell/blessings.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, base, fetchgit, hspec, QuickCheck, lib, stockholm, text }:
-with stockholm.lib;
-
-let
-  cfg = {
-    "18.03" = {
-      version = "1.1.0";
-      sha256 = "1k908zap3694fcxdk4bb29s54b0lhdh557y10ybjskfwnym7szn1";
-    };
-  }.${versions.majorMinor version} or {
-    version = "2.2.0";
-    sha256 = "1pb56dgf3jj2kq3cbbppwzyg3ccgqy9xara62hkjwyxzdx20clk1";
-  };
-
-in mkDerivation {
-  pname = "blessings";
-  version = cfg.version;
-  src = fetchgit {
-    url = http://cgit.ni.krebsco.de/blessings;
-    rev = "refs/tags/v${cfg.version}";
-    sha256 = cfg.sha256;
-  };
-  libraryHaskellDepends = [ base text ];
-  testHaskellDepends = [ base hspec QuickCheck ];
-  doHaddock = false;
-  # WTFPL is the true license, which is unknown to cabal.
-  license = lib.licenses.wtfpl;
-}