Merge remote-tracking branch 'lass/master'

3 files changed, 38 insertions, 4 deletions

diff --git a/tv/5pkgs/haskell/default.nix b/tv/5pkgs/haskell/default.nix
index fcede2f9c..33fd2506a 100644
--- a/tv/5pkgs/haskell/default.nix
+++ b/tv/5pkgs/haskell/default.nix
@@ -10,11 +10,15 @@ in
     haskell = super.haskell // {
       packages = mapAttrs (name: value:
         if hasAttr "override" value
-          then value.override { inherit overrides; }
+          then value.override (old: {
+            overrides =
+              composeExtensions (old.overrides or (_: _: { })) overrides;
+          })
           else value
       ) super.haskell.packages;
     };
-    haskellPackages = super.haskellPackages.override {
-      inherit overrides;
-    };
+    haskellPackages = super.haskellPackages.override (old: {
+      overrides =
+        composeExtensions (old.overrides or (_: _: { })) overrides;
+    });
   }
diff --git a/tv/5pkgs/override/jc.nix b/tv/5pkgs/override/jc.nix
new file mode 100644
index 000000000..346dd3eee
--- /dev/null
+++ b/tv/5pkgs/override/jc.nix
@@ -0,0 +1,21 @@
+self: super:
+
+let
+  version = "1.21.0";
+in
+
+# Prevent downgrades.
+assert self.lib.versionAtLeast version super.jc.version;
+
+self.python3.pkgs.toPythonApplication
+  (self.python3.pkgs.jc.overrideAttrs
+    (oldAttrs: {
+      name = "jc-${version}";
+      version = version;
+      src = self.fetchFromGitHub {
+        owner = "kellyjonbrazil";
+        repo = "jc";
+        rev = "v${version}";
+        sha256 = "sha256-kS42WokR7ZIqIPi8LbX4tmtjn37tckea2ELbuqzTm2o";
+      };
+    }))
diff --git a/tv/5pkgs/simple/weechat-tv.nix b/tv/5pkgs/simple/weechat-tv.nix
new file mode 100644
index 000000000..17d286366
--- /dev/null
+++ b/tv/5pkgs/simple/weechat-tv.nix
@@ -0,0 +1,9 @@
+{ lib, pkgs }:
+
+pkgs.wrapWeechat pkgs.weechat-unwrapped {
+  configure = { availablePlugins, ... }: {
+    scripts = [
+      pkgs.weechatScripts.weechat-matrix
+    ];
+  };
+}