From 161d5f2d964dadc848bc722fded69a75c9398b9d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 4 Feb 2021 17:56:36 +0100
Subject: brockman: 3.2.3 -> 3.2.4

---
 krebs/5pkgs/haskell/brockman.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/haskell/brockman.nix b/krebs/5pkgs/haskell/brockman.nix
index 5f1166a25..aec89b7ad 100644
--- a/krebs/5pkgs/haskell/brockman.nix
+++ b/krebs/5pkgs/haskell/brockman.nix
@@ -1,26 +1,26 @@
-{ mkDerivation, aeson, aeson-pretty, base, bloomfilter, bytestring
+{ mkDerivation, aeson, aeson-pretty, base, bytestring
 , case-insensitive, conduit, containers, directory, feed, filepath
-, hslogger, html-entity, http-client, irc-conduit, lens, network
-, optparse-applicative, random, safe, stdenv, text, time, timerep
-, wreq
+, hslogger, html-entity, http-client, irc-conduit, lens, lrucache
+, network, optparse-applicative, random, safe, stdenv, text, time
+, timerep, wreq
 , fetchFromGitHub
 }:
 mkDerivation rec {
   pname = "brockman";
-  version = "3.2.3";
+  version = "3.2.4";
   src = fetchFromGitHub {
     owner = "kmein";
     repo = "brockman";
     rev = version;
-    sha256 = "1qbjbf0l1ikfzmvky4cnvv7nlcwi2in4afliifh618j0a4f7j427";
+    sha256 = "1jh2i3rxbw8x0p5xs9ph95ixpsa6h6qm0msjb9xqnw9j8by2fkk2";
   };
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [
-    aeson aeson-pretty base bloomfilter bytestring case-insensitive
-    conduit containers directory feed filepath hslogger html-entity
-    http-client irc-conduit lens network optparse-applicative random
-    safe text time timerep wreq
+    aeson aeson-pretty base bytestring case-insensitive conduit
+    containers directory feed filepath hslogger html-entity http-client
+    irc-conduit lens lrucache network optparse-applicative random safe
+    text time timerep wreq
   ];
   license = stdenv.lib.licenses.mit;
 }
-- 
cgit v1.2.3


From 61305cb1e2d93f72d49af7e51419ab77899cd54e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 4 Feb 2021 19:21:42 +0100
Subject: brockman: move to folder

---
 krebs/5pkgs/haskell/brockman.nix         | 26 --------------------------
 krebs/5pkgs/haskell/brockman/default.nix | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 krebs/5pkgs/haskell/brockman.nix
 create mode 100644 krebs/5pkgs/haskell/brockman/default.nix

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/haskell/brockman.nix b/krebs/5pkgs/haskell/brockman.nix
deleted file mode 100644
index aec89b7ad..000000000
--- a/krebs/5pkgs/haskell/brockman.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, aeson, aeson-pretty, base, bytestring
-, case-insensitive, conduit, containers, directory, feed, filepath
-, hslogger, html-entity, http-client, irc-conduit, lens, lrucache
-, network, optparse-applicative, random, safe, stdenv, text, time
-, timerep, wreq
-, fetchFromGitHub
-}:
-mkDerivation rec {
-  pname = "brockman";
-  version = "3.2.4";
-  src = fetchFromGitHub {
-    owner = "kmein";
-    repo = "brockman";
-    rev = version;
-    sha256 = "1jh2i3rxbw8x0p5xs9ph95ixpsa6h6qm0msjb9xqnw9j8by2fkk2";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    aeson aeson-pretty base bytestring case-insensitive conduit
-    containers directory feed filepath hslogger html-entity http-client
-    irc-conduit lens lrucache network optparse-applicative random safe
-    text time timerep wreq
-  ];
-  license = stdenv.lib.licenses.mit;
-}
diff --git a/krebs/5pkgs/haskell/brockman/default.nix b/krebs/5pkgs/haskell/brockman/default.nix
new file mode 100644
index 000000000..aec89b7ad
--- /dev/null
+++ b/krebs/5pkgs/haskell/brockman/default.nix
@@ -0,0 +1,26 @@
+{ mkDerivation, aeson, aeson-pretty, base, bytestring
+, case-insensitive, conduit, containers, directory, feed, filepath
+, hslogger, html-entity, http-client, irc-conduit, lens, lrucache
+, network, optparse-applicative, random, safe, stdenv, text, time
+, timerep, wreq
+, fetchFromGitHub
+}:
+mkDerivation rec {
+  pname = "brockman";
+  version = "3.2.4";
+  src = fetchFromGitHub {
+    owner = "kmein";
+    repo = "brockman";
+    rev = version;
+    sha256 = "1jh2i3rxbw8x0p5xs9ph95ixpsa6h6qm0msjb9xqnw9j8by2fkk2";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    aeson aeson-pretty base bytestring case-insensitive conduit
+    containers directory feed filepath hslogger html-entity http-client
+    irc-conduit lens lrucache network optparse-applicative random safe
+    text time timerep wreq
+  ];
+  license = stdenv.lib.licenses.mit;
+}
-- 
cgit v1.2.3


From ce0393f43aab8928c783276ac6d14e92f754391b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 10 Feb 2021 15:58:59 +0100
Subject: brockman: 3.2.4 -> 3.4.0

---
 krebs/5pkgs/haskell/brockman/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/haskell/brockman/default.nix b/krebs/5pkgs/haskell/brockman/default.nix
index aec89b7ad..92051a025 100644
--- a/krebs/5pkgs/haskell/brockman/default.nix
+++ b/krebs/5pkgs/haskell/brockman/default.nix
@@ -1,26 +1,26 @@
 { mkDerivation, aeson, aeson-pretty, base, bytestring
 , case-insensitive, conduit, containers, directory, feed, filepath
-, hslogger, html-entity, http-client, irc-conduit, lens, lrucache
-, network, optparse-applicative, random, safe, stdenv, text, time
-, timerep, wreq
+, hashable, hslogger, html-entity, http-client, irc-conduit, lens
+, lrucache, lrucaching, network, optparse-applicative, random, safe
+, stdenv, text, time, timerep, wreq
 , fetchFromGitHub
 }:
 mkDerivation rec {
   pname = "brockman";
-  version = "3.2.4";
+  version = "3.4.0";
   src = fetchFromGitHub {
     owner = "kmein";
     repo = "brockman";
     rev = version;
-    sha256 = "1jh2i3rxbw8x0p5xs9ph95ixpsa6h6qm0msjb9xqnw9j8by2fkk2";
+    sha256 = "02nval6a9xcddj6znzxvcb8g6klzjydj1lb4ych64i9mr4a8jvic";
   };
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [
     aeson aeson-pretty base bytestring case-insensitive conduit
-    containers directory feed filepath hslogger html-entity http-client
-    irc-conduit lens lrucache network optparse-applicative random safe
-    text time timerep wreq
+    containers directory feed filepath hashable hslogger html-entity
+    http-client irc-conduit lens lrucache lrucaching network
+    optparse-applicative random safe text time timerep wreq
   ];
   license = stdenv.lib.licenses.mit;
 }
-- 
cgit v1.2.3


From d462900b7a9a38b18ab08f831efc6d30343e9a78 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 10 Feb 2021 15:59:36 +0100
Subject: rss-bridge: 2020-11-10 -> unstable-2021-01-10

---
 krebs/5pkgs/simple/rss-bridge/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/simple/rss-bridge/default.nix b/krebs/5pkgs/simple/rss-bridge/default.nix
index 13ad9d69a..bbe5c1bdb 100644
--- a/krebs/5pkgs/simple/rss-bridge/default.nix
+++ b/krebs/5pkgs/simple/rss-bridge/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rss-bridge";
-  version = "2020-11-10";
+  version = "unstable-2021-01-10";
 
   src = fetchFromGitHub {
     owner = "RSS-Bridge";
     repo = "rss-bridge";
-    rev = version;
-    sha256 = "00cp61lqvhi7b7j0rglsqg3l7cg8s9b8vq098bgvg5dygyi44hyv";
+    rev = "98352845a14b9f2eb8925ad7a04a5f6cc6a5af06";
+    sha256 = "1nv1f6f17cn057k9mydd3a0bmj2xa5k410fdq7nhw5b7msyxy2qv";
   };
 
   patchPhase = ''
-- 
cgit v1.2.3


From 5d0c18a7f62646ab80c8d191a7aaa9ccefc04df8 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 10 Feb 2021 23:28:30 +0100
Subject: home-assistant: import from unstable

---
 krebs/5pkgs/simple/home-assistant.nix | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 krebs/5pkgs/simple/home-assistant.nix

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/simple/home-assistant.nix b/krebs/5pkgs/simple/home-assistant.nix
new file mode 100644
index 000000000..58a6edf33
--- /dev/null
+++ b/krebs/5pkgs/simple/home-assistant.nix
@@ -0,0 +1,8 @@
+{ pkgs, lib, ... }: let
+  unstable = pkgs.fetchFromGitHub {
+    owner = "nixos";
+    repo = "nixpkgs";
+    rev = (lib.importJSON ../../nixpkgs-unstable.json).rev;
+    sha256 = (lib.importJSON ../../nixpkgs-unstable.json).sha256;
+  };
+in (import unstable {}).home-assistant
-- 
cgit v1.2.3


From 2c59f04f5f15d36dbc826cfc7581f5cea1f5d0d1 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 11 Feb 2021 17:13:04 +0100
Subject: remove broken hass override

---
 krebs/5pkgs/simple/home-assistant.nix | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 krebs/5pkgs/simple/home-assistant.nix

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/simple/home-assistant.nix b/krebs/5pkgs/simple/home-assistant.nix
deleted file mode 100644
index 58a6edf33..000000000
--- a/krebs/5pkgs/simple/home-assistant.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, lib, ... }: let
-  unstable = pkgs.fetchFromGitHub {
-    owner = "nixos";
-    repo = "nixpkgs";
-    rev = (lib.importJSON ../../nixpkgs-unstable.json).rev;
-    sha256 = (lib.importJSON ../../nixpkgs-unstable.json).sha256;
-  };
-in (import unstable {}).home-assistant
-- 
cgit v1.2.3