git.iko.soy/typeable/nixpkgs
on master help sign in
webkit: move to aliases
commitd3ff902e946aa7eed206332c14b7caad06ee233d authorJan Tojnar <jtojnar@gmail.com> dateTue 5 Mar 2019, 17:40 (8 years ago) parent78b94d3
9 files changed+16−17
pkgs/applications/networking/browsers/uzbl/default.nix+2−2 pkgs/applications/networking/browsers/vimb/default.nix+2−2 pkgs/applications/networking/browsers/vimprobable2/default.nix+2−2 pkgs/applications/office/gnucash/default.nix+2−2 pkgs/applications/science/misc/openmodelica/default.nix+2−2 pkgs/development/libraries/java/swt/default.nix+2−2 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+2−4 pkgs/top-level/release-small.nix+1−1
pkgs/applications/networking/browsers/uzbl/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, pkgconfig, python3, makeWrapper
2−, webkit, glib-networking, gsettings-desktop-schemas, python2Packages
2+, webkitgtk, glib-networking, gsettings-desktop-schemas, python2Packages
33}:
44# This package needs python3 during buildtime,
55# but Python 2 + packages during runtime.
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
4040
4141 nativeBuildInputs = [ pkgconfig python3 makeWrapper ];
4242
43− buildInputs = [ gsettings-desktop-schemas webkit ];
43+ buildInputs = [ gsettings-desktop-schemas webkitgtk ];
4444 propagatedBuildInputs = with python2Packages; [ pygtk six ];
4545}
pkgs/applications/networking/browsers/vimb/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, libsoup, webkit, gtk3, glib-networking
1+{ stdenv, fetchFromGitHub, pkgconfig, libsoup, webkitgtk, gtk3, glib-networking
22, gsettings-desktop-schemas, wrapGAppsHook
33}:
44
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 };
1515
1616 nativeBuildInputs = [ wrapGAppsHook pkgconfig ];
17− buildInputs = [ gtk3 libsoup webkit glib-networking gsettings-desktop-schemas ];
17+ buildInputs = [ gtk3 libsoup webkitgtk glib-networking gsettings-desktop-schemas ];
1818
1919 makeFlags = [ "PREFIX=${placeholder "out"}" ];
2020
pkgs/applications/networking/browsers/vimprobable2/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, makeWrapper, glib-networking, gtk2, libsoup, libX11, perl,
2− pkgconfig, webkit, gsettings-desktop-schemas }:
2+ pkgconfig, webkitgtk, gsettings-desktop-schemas }:
33
44stdenv.mkDerivation rec {
55 version = "1.4.2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 nativeBuildInputs = [ pkgconfig ];
13− buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings-desktop-schemas ];
13+ buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkitgtk gsettings-desktop-schemas ];
1414
1515 hardeningDisable = [ "format" ];
1616
pkgs/applications/office/gnucash/default.nix+2−2
@@ -1,6 +1,6 @@
11{ fetchurl, stdenv, pkgconfig, makeWrapper, cmake, gtest
22, boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales
3−, webkit, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi
3+, webkitgtk, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi
44, libdbiDrivers, guile, perl, perlPackages
55}:
66
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636
3737 buildInputs = [
3838 boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales
39− webkit dconf hicolor-icon-theme libofx aqbanking gwenhywfar libdbi
39+ webkitgtk dconf hicolor-icon-theme libofx aqbanking gwenhywfar libdbi
4040 libdbiDrivers guile
4141 perlWrapper perl
4242 ] ++ (with perlPackages; [ FinanceQuote DateManip ]);
pkgs/applications/science/misc/openmodelica/default.nix+2−2
@@ -1,5 +1,5 @@
11{stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake,
2−hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which,
2+hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkitgtk, which,
33lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison,
44doxygen, boost, openscenegraph, gnome2, pangox_compat, xorg, git, bash, gtk2, makeWrapper }:
55
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515 src = fetchgit (import ./src-main.nix);
1616
1717 buildInputs = [autoconf cmake automake libtool gfortran clang gnumake
18− hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which
18+ hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkitgtk which
1919 lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison
2020 doxygen boost openscenegraph gnome2.gtkglext pangox_compat xorg.libXmu
2121 git gtk2 makeWrapper];
pkgs/development/libraries/java/swt/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2
2−, libXt, libXtst, libXi, libGLU_combined, webkit, libsoup, xorg
2+, libXt, libXtst, libXi, libGLU_combined, webkitgtk, libsoup, xorg
33, pango, gdk_pixbuf, glib
44}:
55
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
3636 sourceRoot = ".";
3737
3838 nativeBuildInputs = [ unzip pkgconfig ];
39− buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU_combined webkit libsoup ];
39+ buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU_combined webkitgtk libsoup ];
4040
4141 NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk_pixbuf glib ]) ++
4242 [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ];
pkgs/top-level/aliases.nix+1
@@ -342,6 +342,7 @@ mapAliases ({
342342 vimprobable2Wrapper = vimprobable2; # added 2015-01
343343 virtviewer = virt-viewer; # added 2015-12-24
344344 vorbisTools = vorbis-tools; # added 2016-01-26
345+ webkit = webkitgtk; # added 2019-03-05
345346 weechat-xmpp = weechatScripts.weechat-xmpp; # added 2018-09-06
346347 weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06
347348 wineStaging = wine-staging; # added 2018-01-08
pkgs/top-level/all-packages.nix+2−4
@@ -13022,8 +13022,6 @@ in
1302213022
1302313023 wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { };
1302413024
13025− webkit = webkitgtk;
13026−
1302713025 wcslib = callPackage ../development/libraries/wcslib { };
1302813026
1302913027 webkitgtk = callPackage ../development/libraries/webkitgtk {
@@ -19805,7 +19803,7 @@ in
1980519803 uwimap = callPackage ../tools/networking/uwimap { };
1980619804
1980719805 uzbl = callPackage ../applications/networking/browsers/uzbl {
19808− webkit = webkitgtk24x-gtk2;
19806+ webkitgtk = webkitgtk24x-gtk2;
1980919807 };
1981019808
1981119809 utox = callPackage ../applications/networking/instant-messengers/utox { };
@@ -22999,7 +22997,7 @@ in
2299922997 });
2300022998
2300122999 vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 {
23002− webkit = webkitgtk24x-gtk2;
23000+ webkitgtk = webkitgtk24x-gtk2;
2300323001 };
2300423002 vimprobable2 = wrapFirefox vimprobable2-unwrapped { };
2300523003
pkgs/top-level/release-small.nix+1−1
@@ -162,7 +162,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
162162 utillinux = linux;
163163 utillinuxMinimal = linux;
164164 w3m = all;
165− webkit = linux;
165+ webkitgtk = linux;
166166 wget = all;
167167 which = all;
168168 wicd = linux;