From 7c160fd1fac105402c27925a46a84cec9c12ca1a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 25 Jan 2019 14:26:50 +0100
Subject: blessings: 1.3.0 -> 2.1.0

---
 krebs/5pkgs/haskell/blessings.nix   |  4 ++--
 krebs/5pkgs/haskell/much.nix        | 29 +++++++++++++++++++++++++++++
 krebs/5pkgs/haskell/reaktor2.nix    |  6 +++---
 krebs/5pkgs/simple/much/cabal.nix   | 28 ----------------------------
 krebs/5pkgs/simple/much/default.nix |  3 ---
 5 files changed, 34 insertions(+), 36 deletions(-)
 create mode 100644 krebs/5pkgs/haskell/much.nix
 delete mode 100644 krebs/5pkgs/simple/much/cabal.nix
 delete mode 100644 krebs/5pkgs/simple/much/default.nix

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/haskell/blessings.nix b/krebs/5pkgs/haskell/blessings.nix
index 19f8da19d..97e4a717c 100644
--- a/krebs/5pkgs/haskell/blessings.nix
+++ b/krebs/5pkgs/haskell/blessings.nix
@@ -7,8 +7,8 @@ with import <stockholm/lib>;
       sha256 = "1k908zap3694fcxdk4bb29s54b0lhdh557y10ybjskfwnym7szn1";
     };
     "18.09" = {
-      version = "1.3.0";
-      sha256 = "1y9jhh9pchrr48zgfib2jip97x1fkm7qb1gnfx477rmmryjs500h";
+      version = "2.1.0";
+      sha256 = "0wc8v48bb0bkvypc0j6imvnf8xc8572hykk9sgjhzf2w0ggqxv5d";
     };
   }.${versions.majorMinor nixpkgsVersion};
 
diff --git a/krebs/5pkgs/haskell/much.nix b/krebs/5pkgs/haskell/much.nix
new file mode 100644
index 000000000..db168f8a1
--- /dev/null
+++ b/krebs/5pkgs/haskell/much.nix
@@ -0,0 +1,29 @@
+{ mkDerivation, aeson, attoparsec, base, base64-bytestring
+, blaze-builder, blessings, bytestring, case-insensitive
+, containers, deepseq, directory, docopt, email-header, fetchgit
+, filepath, friendly-time, hyphenation, linebreak, old-locale
+, process, random, rosezipper, safe, scanner, split, stdenv
+, terminal-size, text, time, transformers, transformers-compat
+, unix, vector
+}:
+mkDerivation {
+  pname = "much";
+  version = "1.2.0";
+  src = fetchgit {
+    url = "https://cgit.krebsco.de/much";
+    sha256 = "0gfvppi8acylz0q7xh8dkm3dj676d4sc1m1gxwp663bkn4748873";
+    rev = "8fc4fbb5bb7781626da8f63cd8df8bb0f554cfe7";
+    fetchSubmodules = true;
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    aeson attoparsec base base64-bytestring blaze-builder blessings
+    bytestring case-insensitive containers deepseq directory docopt
+    email-header filepath friendly-time hyphenation linebreak
+    old-locale process random rosezipper safe scanner split
+    terminal-size text time transformers transformers-compat unix
+    vector
+  ];
+  license = stdenv.lib.licenses.mit;
+}
diff --git a/krebs/5pkgs/haskell/reaktor2.nix b/krebs/5pkgs/haskell/reaktor2.nix
index c0c7281a6..f0835428d 100644
--- a/krebs/5pkgs/haskell/reaktor2.nix
+++ b/krebs/5pkgs/haskell/reaktor2.nix
@@ -6,11 +6,11 @@
 }:
 mkDerivation {
   pname = "reaktor2";
-  version = "0.1.3";
+  version = "0.1.4";
   src = fetchgit {
     url = "https://cgit.krebsco.de/reaktor2";
-    sha256 = "15qhycfja7psnd7v5hn4qb5wrs6bjx4qhny49nkhb7agj4vzwnwi";
-    rev = "6c629a0cc422872abdfc40f9621ac0c4f6a420a8";
+    sha256 = "1qfm3vb78r02ma8wdcfbwzmigj6skjl53nmp2z7czjcfjhm1zyq5";
+    rev = "147f818a72f4561ed57131e0d181704b599d09f6";
     fetchSubmodules = true;
   };
   isLibrary = false;
diff --git a/krebs/5pkgs/simple/much/cabal.nix b/krebs/5pkgs/simple/much/cabal.nix
deleted file mode 100644
index 09bc7b5df..000000000
--- a/krebs/5pkgs/simple/much/cabal.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, aeson, attoparsec, base, base64-bytestring
-, blaze-builder, blessings, bytestring, case-insensitive
-, containers, deepseq, directory, docopt, email-header, fetchgit
-, filepath, friendly-time, hyphenation, linebreak, old-locale
-, process, random, rosezipper, safe, scanner, split, stdenv
-, terminal-size, text, time, transformers, transformers-compat
-, unix, vector
-}:
-mkDerivation {
-  pname = "much";
-  version = "1.1.0";
-  src = fetchgit {
-    url = "http://cgit.ni.krebsco.de/much";
-    sha256 = "1325554zymr1dd0clj8c5ygl70c791csvs0hz33jcfr6b8wysdrl";
-    rev = "dfec37d848e11c00d9b7f03295af1fc7b0e83ef5";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    aeson attoparsec base base64-bytestring blaze-builder blessings
-    bytestring case-insensitive containers deepseq directory docopt
-    email-header filepath friendly-time hyphenation linebreak
-    old-locale process random rosezipper safe scanner split
-    terminal-size text time transformers transformers-compat unix
-    vector
-  ];
-  license = stdenv.lib.licenses.mit;
-}
diff --git a/krebs/5pkgs/simple/much/default.nix b/krebs/5pkgs/simple/much/default.nix
deleted file mode 100644
index cf55eb537..000000000
--- a/krebs/5pkgs/simple/much/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{ haskellPackages, ... }:
-
-haskellPackages.callPackage ./cabal.nix {}
-- 
cgit v1.2.3


From b3c65141b8179dddbfdcd783e14a20575be5d2e2 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 25 Jan 2019 14:54:31 +0100
Subject: reaktor2: 0.1.4 -> 0.1.5

---
 krebs/5pkgs/haskell/reaktor2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/haskell/reaktor2.nix b/krebs/5pkgs/haskell/reaktor2.nix
index f0835428d..6c0a3e634 100644
--- a/krebs/5pkgs/haskell/reaktor2.nix
+++ b/krebs/5pkgs/haskell/reaktor2.nix
@@ -6,11 +6,11 @@
 }:
 mkDerivation {
   pname = "reaktor2";
-  version = "0.1.4";
+  version = "0.1.5";
   src = fetchgit {
     url = "https://cgit.krebsco.de/reaktor2";
-    sha256 = "1qfm3vb78r02ma8wdcfbwzmigj6skjl53nmp2z7czjcfjhm1zyq5";
-    rev = "147f818a72f4561ed57131e0d181704b599d09f6";
+    sha256 = "1n20ms61pp0yncs0y0mx40nj80ivv9qqv4l2ya39rfp21anmwf1s";
+    rev = "f8c5b4cfe57cb50503b8333d5d06bd0f99fdecc6";
     fetchSubmodules = true;
   };
   isLibrary = false;
-- 
cgit v1.2.3