Commit Graph

58 Commits

Author SHA1 Message Date
Eelco Dolstra
e611215f5c Move finding XML catalogs into a separate setup hook
This is because libxml/libxslt are not the only implementations that
respect $XML_CATALOG_FILES.

Also, look in share/xml for catalogs (in addition to the
now-deprecated xml/dtd and xml/xsl).
2014-11-25 16:23:48 +01:00
Peter Simons
b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Domen Kožar
419f15b060 Remove http_proxy/ftp_proxy overrides used in setup hooks.
Partially reverts eaa4db148dc402f7a124bc9c17583067710a7814. Used
together with nix-shell it results into unresolvable domains. For
example: `nix-shell -p libxml2` spawns a shell with non-working DNS.

chroot should remove such unpurities.
2014-10-28 23:20:59 +01:00
Domen Kožar
3e81fe92e4 libxml2: 2.9.1 -> 2.9.2 (CVE-2014-3660) fixes #4679 2014-10-27 20:07:09 +01:00
Eelco Dolstra
e3f7dbbac8 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
Florian Friesdorf
19dd74c59a libxml2 version passthru 2014-07-10 16:33:45 +02:00
Daniel Oertwig
42560c78bb libxml2 w/o python --with-python=no on all systems
When building libxml2 without python enabled, pass "--with-python=no" to
configure on all systems, not only on FreeBSD. Omitting mentioned
configure option results in building libxml2 WITH python enabled. In
this case, configure is looking for python by itself in system paths.
With a rootless configuration, python includes from the host are accessed.
If those files (Python.h) are not available, building libxml2 fails.
2013-12-16 21:30:36 +01:00
Vladimír Čunát
9220d5b002 libxml2 on FreeBSD: disable impure python detection
This might be good for all platforms,
when we do some big rebuild again.
2013-11-12 14:09:15 +01:00
Vladimír Čunát
85d21a6963 libxml2: bump 2.9.0 -> 2.9.1 (CVE-2013-1969)
And drop patch that has been merged upstream.
Close #1199.
Hack around python install problems (the rest is from bjornfor).
2013-11-11 22:32:46 +01:00
Eelco Dolstra
da426c7df5 Fix some meta.platforms attributes to build more stuff on Darwin 2013-11-05 10:46:59 +01:00
Ivan Kozik
1866619acc Fix a few typos 2013-08-11 10:55:53 +00:00
Ludovic Courtès
b91a3927e6 libxml2: FreeBSD: add explicit dependency on XZ 2012-10-23 09:02:52 +02:00
Eelco Dolstra
36b4ab4163 Fix building libxml2 on non-Linux platforms 2012-10-16 11:50:35 -04:00
Eelco Dolstra
745cb58e4e Doh 2012-09-29 14:40:56 -04:00
Eelco Dolstra
3ffc960b18 Fix libxml2Python build
hydra.nixos.org/build/3106762
2012-09-29 12:08:25 -04:00
Eelco Dolstra
c7658cf9b0 libxml2: Update to 2.9.0 2012-09-28 17:44:38 -04:00
Michael Raskin
4233eece19 Update and fix WebKit
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33323
2012-03-21 10:47:00 +00:00
Eelco Dolstra
cb4a883683 * Update libxml2 to 2.7.7. This is necessary because of the zlib
update - xsltproc segfaults otherwise.  (From the release notes:
  "libxml violates the zlib interface and crashes".)

svn path=/nixpkgs/branches/x-updates/; revision=22655
2010-07-19 08:17:42 +00:00
Michael Raskin
7c5e566c5c Cleaned up the unspecified-extra-argument calls where there is no way to access extra arguments. Tarball and full instantiation checks passed.
svn path=/nixpkgs/trunk/; revision=22539
2010-07-08 19:22:50 +00:00
Michael Raskin
ccc497f80d Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense.
svn path=/nixpkgs/trunk/; revision=22529
2010-07-08 13:25:52 +00:00
Eelco Dolstra
f01feca4ef * Updated libxml2 / libxslt.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18053
2009-10-30 12:42:48 +00:00
Michael Raskin
edbbddce1d A case study in transitive overrides. WebKit needs fresh glib. This means it needs a whole slice of system built against glib-2.22.. Added overrides are generic enough, though. So the same way can be used to override everything. I have failed (so far?) to add mkOverridable into stdenv, though.
svn path=/nixpkgs/trunk/; revision=17661
2009-10-06 05:43:51 +00:00
Eelco Dolstra
11e76d7303 * libxml2 2.7.4. Quite a few packages depend on libxml2, so this
isn't the default yet.

svn path=/nixpkgs/trunk/; revision=17245
2009-09-18 11:41:37 +00:00
Eelco Dolstra
7a891eabe2 * Apparently the pythondir hack isn't needed with libxml2 2.7.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15272
2009-04-23 12:35:36 +00:00
Eelco Dolstra
f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Michael Raskin
35bb7d6412 Python-not-2.4 support for libxml2
svn path=/nixpkgs/trunk/; revision=15265
2009-04-23 10:24:40 +00:00
Eelco Dolstra
205aa93e92 * libxml2 updated to 2.7.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13972
2009-02-03 16:14:23 +00:00
Eelco Dolstra
fc5eebdf8b * Merged the stdenv branch
(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
2008-06-13 11:46:39 +00:00
Eelco Dolstra
cd60dc0ede * Various updates.
svn path=/nixpkgs/branches/stdenv-updates/; revision=12051
2008-06-12 09:49:40 +00:00
Ludovic Courtès
2d15d4c269 Augment `libxml2' setup hook to add XSL stylesheets to XML catalogs.
This allows, for instance, `docbook_xsl' to be visible (as part of
`$XML_CATALOG_FILES') by packages that use it as a build input.

svn path=/nixpkgs/trunk/; revision=11047
2008-03-11 08:42:26 +00:00
Eelco Dolstra
eaa4db148d * libxml2 / libxslt: provide a setup hook that prevents xmllint and
xsltproc from downloading DTDs from the network, which is impure.
  This caused a lot of problems with Gnome builds in the build farm,
  because those downloads are slow and would sometimes fail.

  The setup hook also sets up $XML_CATALOG_FILES.

svn path=/nixpkgs/trunk/; revision=9471
2007-10-18 21:08:47 +00:00
Eelco Dolstra
d0d721b0da * Latest libxml2, libxslt.
svn path=/nixpkgs/trunk/; revision=9186
2007-08-22 10:51:14 +00:00
Armijn Hemel
d0b41fda3e libxml2 2.6.27, libxslt 1.1.20
svn path=/nixpkgs/trunk/; revision=8685
2007-05-14 01:18:36 +00:00
Eelco Dolstra
ef9b025dbe * Remove a bunch of unused Nix expressions.
svn path=/nixpkgs/trunk/; revision=6716
2006-10-12 15:43:01 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Armijn Hemel
d41d5a6970 make 2.6.26 default
svn path=/nixpkgs/trunk/; revision=5934
2006-07-25 09:28:19 +00:00
Armijn Hemel
46d7a1ac7f actually link to zlib
svn path=/nixpkgs/trunk/; revision=5931
2006-07-25 00:52:21 +00:00
Armijn Hemel
56d8395f3d easier version switching
svn path=/nixpkgs/trunk/; revision=5929
2006-07-24 23:34:38 +00:00
Armijn Hemel
c4d7d5811b libxml2 2.6.26
svn path=/nixpkgs/trunk/; revision=5635
2006-07-06 22:31:05 +00:00
Eelco Dolstra
12f0f1ad20 * Updated a few packages.
svn path=/nixpkgs/trunk/; revision=5246
2006-05-01 17:57:42 +00:00
Eelco Dolstra
3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Eelco Dolstra
82e678362f * "." -> "source".
svn path=/nixpkgs/trunk/; revision=4335
2005-12-05 14:11:09 +00:00
Eelco Dolstra
552de99c19 * Update a bunch of base packages.
svn path=/nixpkgs/trunk/; revision=4065
2005-10-11 14:29:30 +00:00
Eelco Dolstra
b8bae3582b * Lots of updates, especially GTK and X libraries.
svn path=/nixpkgs/trunk/; revision=3193
2005-06-17 11:43:15 +00:00
Eelco Dolstra
aac8011c8b * GTK 2.6 plus associated libraries.
* Updated libtiff, libpng, libxml2, libxslt, gettext.

svn path=/nixpkgs/trunk/; revision=2238
2005-02-15 16:22:20 +00:00
Eelco Dolstra
e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
2005-02-15 14:44:19 +00:00
Eelco Dolstra
1d558d08ac * Libxml updated to 2.6.13.
svn path=/nixpkgs/trunk/; revision=1455
2004-09-18 21:14:31 +00:00
Martin Bravenboer
f407ca0506 Missing file
svn path=/nixpkgs/trunk/; revision=1298
2004-08-19 15:29:10 +00:00
Martin Bravenboer
d1003bca3b Added arguments to the libxml2 Nix expression to control the creation of Python bindings. De default libxml2 in all-packages-generic now creates Python bindings for libxml2.
svn path=/nixpkgs/trunk/; revision=1297
2004-08-19 15:28:48 +00:00
Eelco Dolstra
24cb251dd0 * Some more updates.
svn path=/nixpkgs/trunk/; revision=884
2004-03-30 17:42:45 +00:00