From a98047f92455bc8000c3b6c20c9abf70c84c436f Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Sat, 26 Dec 2020 01:21:20 +0100
Subject: [PATCH 1/3] disable Hash2Pub simulation container

---
 nixos/configuration.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 78cb27b..d448055 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -201,12 +201,12 @@ in
 
   # declarative containers
   containers = {
-    hash2PubSim = import ./Hash2PubTestbed.nix
-      {
-        inherit pkgs config;
-        experimentUid = config.users.users.spiollinux.uid;
-        projectDir = "/home/spiollinux/Seafile/Studium/Semester11/INF-PM-FP-ANW";
-      };
+  #  hash2PubSim = import ./Hash2PubTestbed.nix
+  #    {
+  #      inherit pkgs config;
+  #      experimentUid = config.users.users.spiollinux.uid;
+  #      projectDir = "/home/spiollinux/Seafile/Studium/Semester11/INF-PM-FP-ANW";
+  #    };
   };
 
   # stop NetworkManager from managing virtual interfaces

From a8c1495216dc339702bc284fef20e7efb7e0e010 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Sat, 26 Dec 2020 01:22:32 +0100
Subject: [PATCH 2/3] switch back to upstream wireshark as patch does not apply
 anymore

---
 nixos/configuration.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index d448055..7e37baf 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -77,7 +77,6 @@ in
   programs.wireshark =
     {
       enable = true;
-      package = pkgs.wireshark-qt.overrideAttrs (oldAttrs: rec { patches = oldAttrs.patches ++ [ ./133dbc2.diff ];});
     };
 
   programs.adb.enable = true;

From 62d8807b1e9b0a413687bca47c33bbdf20265b61 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Thu, 28 Jan 2021 13:15:49 +0100
Subject: [PATCH 3/3] switch to anki-bin until it can be built from source
 again

---
 home/home.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/home/home.nix b/home/home.nix
index 5fb435a..c0e8e61 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -27,7 +27,7 @@ let
     alacritty
     libreoffice-fresh
     backintime-common
-    anki
+    unstable.anki-bin
     signal-desktop
     (tor-browser-bundle-bin.override { mediaSupport = true; pulseaudioSupport = true; })
     pdfpc
@@ -39,6 +39,8 @@ let
     cawbird
     olifant
     subsurface
+    yate
+    unstable.linphone
 
     # for Hibiscus banking software
     jameica