Merge remote-tracking branch 'ni/master'

8 files changed, 20 insertions, 20 deletions

diff --git a/krebs/5pkgs/haskell/reaktor2/default.nix b/krebs/5pkgs/haskell/reaktor2/default.nix
index 9ff2bd883..7f89c0b1f 100644
--- a/krebs/5pkgs/haskell/reaktor2/default.nix
+++ b/krebs/5pkgs/haskell/reaktor2/default.nix
@@ -1,18 +1,18 @@
 { mkDerivation, aeson, async, attoparsec, base, blessings
-, bytestring, containers, data-default, fetchgit, filepath
-, hashable, lens, lens-aeson, network, network-simple
-, network-simple-tls, network-uri, pcre-light, process, random
-, servant-server, lib, string-conversions, stringsearch, text
-, time, transformers, unagi-chan, unix, unordered-containers
-, vector, wai, warp
+, bytestring, containers, data-default, filepath, hashable, lens
+, lens-aeson, lib, network, network-simple, network-simple-tls
+, network-uri, pcre-light, process, random, servant-server
+, string-conversions, stringsearch, text, time, transformers
+, unagi-chan, unix, unordered-containers, vector, wai, warp
+, fetchgit
 }:
-mkDerivation rec {
+mkDerivation {
   pname = "reaktor2";
-  version = "0.4.0a";
+  version = "0.4.2";
   src = fetchgit {
-    url = "https://cgit.lassul.us/reaktor2";
-    sha256 = "sha256-x1i2TWcycYVFij6832xaBiQa1RQ1VmSfu5Qt1QrUtds=";
-    rev = "6d3eb6de5e770ee26874bb7449934f0c55bd1efa";
+    url = "https://cgit.krebsco.de/reaktor2";
+    hash = "sha256-JPQyy0hDSH5JqQGjwoO5BNsD4qk+GKP1VH+j4/2cqes";
+    rev = "53a11f421fb18e8687fa06e5511cea8bd9defc36";
     fetchSubmodules = true;
   };
   isLibrary = false;
diff --git a/submodules/krops b/submodules/krops
-Subproject 89e5e67659bbbf0da53cc2cc5dea644b9a2301f
+Subproject 3aa04be96f19cc5f4866b2b36a351f88f6667bd
diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix
index c09e7f9b1..bddd69efa 100644
--- a/tv/1systems/alnus/config.nix
+++ b/tv/1systems/alnus/config.nix
@@ -18,8 +18,8 @@ with import <stockholm/lib>;
   environment.systemPackages = [
     pkgs.firefox
     pkgs.networkmanagerapplet
-    (pkgs.pidgin-with-plugins.override {
-      plugins = [ pkgs.pidginotr ];
+    (pkgs.pidgin.override {
+      plugins = [ pkgs.pidgin-otr ];
     })
   ];
 
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 21be25766..00bd5da15 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -63,8 +63,8 @@ with import <stockholm/lib>;
     pkgs.iptables
     pkgs.libreoffice
     pkgs.plasma-pa
-    (pkgs.pidgin-with-plugins.override {
-      plugins = [ pkgs.pidginotr ];
+    (pkgs.pidgin.override {
+      plugins = [ pkgs.pidgin-otr ];
     })
     pkgs.skypeforlinux
     pkgs.slock
diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix
index ad82915f4..44c7685e8 100644
--- a/tv/1systems/querel/config.nix
+++ b/tv/1systems/querel/config.nix
@@ -26,8 +26,8 @@ with import <stockholm/lib>;
     pkgs.gimp
     pkgs.kate
     pkgs.libreoffice
-    (pkgs.pidgin-with-plugins.override {
-      plugins = [ pkgs.pidginotr ];
+    (pkgs.pidgin.override {
+      plugins = [ pkgs.pidgin-otr ];
     })
     pkgs.sxiv
     pkgs.texlive.combined.scheme-full
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 4f6643c7e..5a018a166 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ../../lib;
 let
   pushBack = x: xs:
     if elem x xs then
diff --git a/tv/5pkgs/override/default.nix b/tv/5pkgs/override/default.nix
index 4cc4749d0..f719a9f69 100644
--- a/tv/5pkgs/override/default.nix
+++ b/tv/5pkgs/override/default.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ../../../lib;
 self: super:
 
 mapNixDir (path: import path self super) ./.
diff --git a/tv/5pkgs/simple/default.nix b/tv/5pkgs/simple/default.nix
index 6ba4fec83..9fb45dd1a 100644
--- a/tv/5pkgs/simple/default.nix
+++ b/tv/5pkgs/simple/default.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ../../../lib;
 
 self: super: