summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-03-05 17:40:00 +0100
committerJan Tojnar <jtojnar@gmail.com>2019-03-06 00:20:55 +0100
commitd3ff902e946aa7eed206332c14b7caad06ee233d (patch)
treefe58079ded1cfeb9b4c8182f9cb835a15b04222c /pkgs/top-level
parent78b94d335d33d8e4d093a5cad661d2865706c0fb (diff)
downloadnixpkgs-d3ff902e946aa7eed206332c14b7caad06ee233d.tar
nixpkgs-d3ff902e946aa7eed206332c14b7caad06ee233d.tar.gz
nixpkgs-d3ff902e946aa7eed206332c14b7caad06ee233d.tar.bz2
nixpkgs-d3ff902e946aa7eed206332c14b7caad06ee233d.tar.lz
nixpkgs-d3ff902e946aa7eed206332c14b7caad06ee233d.tar.xz
nixpkgs-d3ff902e946aa7eed206332c14b7caad06ee233d.tar.zst
nixpkgs-d3ff902e946aa7eed206332c14b7caad06ee233d.zip
webkit: move to aliases
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix6
-rw-r--r--pkgs/top-level/release-small.nix2
3 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 252a87266e7..59eb707c8af 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -342,6 +342,7 @@ mapAliases ({
   vimprobable2Wrapper = vimprobable2; # added 2015-01
   virtviewer = virt-viewer; # added 2015-12-24
   vorbisTools = vorbis-tools; # added 2016-01-26
+  webkit = webkitgtk; # added 2019-03-05
   weechat-xmpp = weechatScripts.weechat-xmpp; # added 2018-09-06
   weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06
   wineStaging = wine-staging; # added 2018-01-08
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b48d1b491d..ded711a54a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13022,8 +13022,6 @@ in
 
   wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { };
 
-  webkit = webkitgtk;
-
   wcslib = callPackage ../development/libraries/wcslib { };
 
   webkitgtk = callPackage ../development/libraries/webkitgtk {
@@ -19805,7 +19803,7 @@ in
   uwimap = callPackage ../tools/networking/uwimap { };
 
   uzbl = callPackage ../applications/networking/browsers/uzbl {
-    webkit = webkitgtk24x-gtk2;
+    webkitgtk = webkitgtk24x-gtk2;
   };
 
   utox = callPackage ../applications/networking/instant-messengers/utox { };
@@ -22999,7 +22997,7 @@ in
   });
 
   vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 {
-    webkit = webkitgtk24x-gtk2;
+    webkitgtk = webkitgtk24x-gtk2;
   };
   vimprobable2 = wrapFirefox vimprobable2-unwrapped { };
 
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 01cbc004b8f..17239c6d879 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -162,7 +162,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
   utillinux = linux;
   utillinuxMinimal = linux;
   w3m = all;
-  webkit = linux;
+  webkitgtk = linux;
   wget = all;
   which = all;
   wicd = linux;