summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-12-05 05:21:51 -0500
committerworldofpeace <worldofpeace@protonmail.ch>2019-12-05 07:01:28 -0500
commita11e0232010e62c3568c119f8b1335f5b7e19b7a (patch)
tree09a761724bc6388d11f356805a7ce6fdd7843c57 /pkgs/top-level
parent989711d6f46fe71cb76510194885c1e03c215253 (diff)
downloadnixpkgs-a11e0232010e62c3568c119f8b1335f5b7e19b7a.tar
nixpkgs-a11e0232010e62c3568c119f8b1335f5b7e19b7a.tar.gz
nixpkgs-a11e0232010e62c3568c119f8b1335f5b7e19b7a.tar.bz2
nixpkgs-a11e0232010e62c3568c119f8b1335f5b7e19b7a.tar.lz
nixpkgs-a11e0232010e62c3568c119f8b1335f5b7e19b7a.tar.xz
nixpkgs-a11e0232010e62c3568c119f8b1335f5b7e19b7a.tar.zst
nixpkgs-a11e0232010e62c3568c119f8b1335f5b7e19b7a.zip
webkitgtk24x-gtk{3.2}: remove
It goes without saying that we should remove this 😅️.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/aliases.nix2
-rw-r--r--pkgs/top-level/all-packages.nix13
2 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index fac7e40adf8..3cfbb68c9cf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -425,6 +425,8 @@ mapAliases ({
   virtmanager-qt = virt-manager-qt; # added 2019-10-29
   vorbisTools = vorbis-tools; # added 2016-01-26
   webkit = webkitgtk; # added 2019-03-05
+  webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05
+  webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05
   weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06
   wineStaging = wine-staging; # added 2018-01-08
   winusb = woeusb; # added 2017-12-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0cff108cfd2..892c20a6886 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14465,19 +14465,6 @@ in
     stdenv = clangStdenv; # TODO: https://github.com/NixOS/nixpkgs/issues/36947
   };
 
-  webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
-    harfbuzz = harfbuzzFull.override {
-      icu = icu58;
-    };
-    gst-plugins-base = gst_all_1.gst-plugins-base;
-    inherit (darwin) libobjc;
-  };
-
-  webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override {
-    withGtk2 = true;
-    enableIntrospection = false;
-  };
-
   websocketpp = callPackage ../development/libraries/websocket++ { };
 
   webrtc-audio-processing = callPackage ../development/libraries/webrtc-audio-processing { };