From 478b6313057a0fbad1b03166b251c79514144ae1 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 19 Apr 2017 02:36:17 +0200
Subject: machines/aszlig: Revert whitelisting webkitgtk

This reverts the following commits:

  * f34f60216a94f41e684b2b2a29be9ca5f8f72940
  * fb6cd06936a469fad708e1095b5ee25ad1298375

Using permittedInsecurePackages on all my machines isn't something I
want to pursue, because this really affects *one* single package and I
really don't want to whitelist webkitgtk-2.4.11 across all of my
machines.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 machines/aszlig/arilou.nix          | 5 -----
 machines/aszlig/dnyarri.nix         | 4 ----
 machines/aszlig/managed/brawndo.nix | 4 ----
 machines/aszlig/managed/tyree.nix   | 4 ----
 machines/aszlig/tishtushi.nix       | 5 -----
 5 files changed, 22 deletions(-)

(limited to 'machines')

diff --git a/machines/aszlig/arilou.nix b/machines/aszlig/arilou.nix
index a0cfc195..8fbc4353 100644
--- a/machines/aszlig/arilou.nix
+++ b/machines/aszlig/arilou.nix
@@ -7,11 +7,6 @@ let
 
   modulesPath = "${import ../../nixpkgs-path.nix}/nixos/modules";
 in {
-  # whitelist insecure webkitgtk
-  nixpkgs.config.permittedInsecurePackages = [
-    "webkitgtk-2.4.11"
-  ];
-
   vuizvui.user.aszlig.profiles.workstation.enable = true;
   imports = [ "${modulesPath}/profiles/all-hardware.nix" ];
 
diff --git a/machines/aszlig/dnyarri.nix b/machines/aszlig/dnyarri.nix
index 6223255a..97be2d72 100644
--- a/machines/aszlig/dnyarri.nix
+++ b/machines/aszlig/dnyarri.nix
@@ -63,10 +63,6 @@ in {
     packageOverrides = super: {
       hplip = super.hplip.override { withPlugin = true; };
     };
-    # whitelist insecure webkitgtk
-    permittedInsecurePackages = [
-      "webkitgtk-2.4.11"
-    ];
   };
 
   hardware.sane.enable = true;
diff --git a/machines/aszlig/managed/brawndo.nix b/machines/aszlig/managed/brawndo.nix
index 69d6a414..5154d1ce 100644
--- a/machines/aszlig/managed/brawndo.nix
+++ b/machines/aszlig/managed/brawndo.nix
@@ -53,10 +53,6 @@ in {
     allowUnfree = true; # XXX: More granularity!
     chromium.enablePepperFlash = true;
     pulseaudio = true;
-    # whitelist insecure webkitgtk
-    permittedInsecurePackages = [
-      "webkitgtk-2.4.11"
-    ];
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix
index 0ceb1920..ecc93217 100644
--- a/machines/aszlig/managed/tyree.nix
+++ b/machines/aszlig/managed/tyree.nix
@@ -58,10 +58,6 @@
   nixpkgs.config = {
     pulseaudio = true;
     chromium.enablePepperFlash = true;
-    # whitelist insecure webkitgtk
-    permittedInsecurePackages = [
-      "webkitgtk-2.4.11"
-    ];
   };
 
   programs.bash.enableCompletion = true;
diff --git a/machines/aszlig/tishtushi.nix b/machines/aszlig/tishtushi.nix
index 9fcc4e82..21ba9b3a 100644
--- a/machines/aszlig/tishtushi.nix
+++ b/machines/aszlig/tishtushi.nix
@@ -6,11 +6,6 @@ let
   storeUUID = "ce1db87b-d717-450d-a212-3685a224f626";
   diskID = "ata-Hitachi_HTS543232A7A384_E2P31243FGB6PJ";
 in {
-  # whitelist insecure webkitgtk
-  nixpkgs.config.permittedInsecurePackages = [
-    "webkitgtk-2.4.11"
-  ];
-
   vuizvui.user.aszlig.profiles.workstation.enable = true;
 
   vuizvui.user.aszlig.system.kernel.enable = true;
-- 
cgit 1.4.1