Author: raskin Date: 2010-06-17 05:20:16 +0000 (Thu, 17 Jun 2010) New Revision: 22304
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22304&view=rev Modified: nixpkgs/trunk/pkgs/development/libraries/webkit/default.nix nixpkgs/trunk/pkgs/development/libraries/webkit/src-for-default.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix Log: Try updating WebKit. Dependency check passes; will abuse Hydra to build it all. Changes: Modified: nixpkgs/trunk/pkgs/development/libraries/webkit/default.nix =================================================================== --- nixpkgs/trunk/pkgs/development/libraries/webkit/default.nix 2010-06-17 05:19:26 UTC (rev 22303) +++ nixpkgs/trunk/pkgs/development/libraries/webkit/default.nix 2010-06-17 05:20:16 UTC (rev 22304) @@ -13,7 +13,7 @@ gettext libjpeg libpng libtiff libxml2 libxslt pango sqlite icu gperf bison flex autoconf automake libtool perl intltool pkgconfig libsoup gtkdoc libXt libproxy - enchant + enchant python ruby ]; propagatedBuildInputs = [ @@ -23,10 +23,15 @@ configureCommand = "./autogen.sh "; configureFlags = [ "--enable-3D-transforms" - "--enable-filters" "--enable-web-sockets" - # WML fails recent builds.. - # "--enable-wml" + "--enable-indexeddb" + "--enable-image-resizer" + "--enable-xhtmlmp" + "--enable-mathml" + "--enable-wml" + "--enable-blob-slice" + "--enable-file-reader" + "--enable-file-writer" ]; /* doConfigure should be specified separately */ Modified: nixpkgs/trunk/pkgs/development/libraries/webkit/src-for-default.nix =================================================================== --- nixpkgs/trunk/pkgs/development/libraries/webkit/src-for-default.nix 2010-06-17 05:19:26 UTC (rev 22303) +++ nixpkgs/trunk/pkgs/development/libraries/webkit/src-for-default.nix 2010-06-17 05:20:16 UTC (rev 22304) @@ -1,9 +1,9 @@ rec { - version="r53178"; - name="webkit-r53178"; - hash="0452kfqd73igmkgp0v4w13lk3ycypqz4zl9hnspg7ns5vlyknqcn"; - url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r53178.tar.bz2";; - advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r53178.tar.bz2";; + version="r61173"; + name="webkit-r61173"; + hash="1gmqgf3scbac682dkbzrfkl876y46j8rxd9asjqcx7xm4m6hrlkn"; + url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r61173.tar.bz2";; + advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r61173.tar.bz2";; } Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-17 05:19:26 UTC (rev 22303) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-17 05:20:16 UTC (rev 22304) @@ -5363,7 +5363,8 @@ inherit freetype fontconfig gettext gperf curl libjpeg libtiff libpng libxml2 libxslt sqlite icu cairo perl intltool automake libtool - pkgconfig autoconf bison libproxy enchant; + pkgconfig autoconf bison libproxy enchant + python ruby; inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg gstPluginsGood; flex = flex2535; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
