Commit Graph

37 Commits

Author SHA1 Message Date
Eelco Dolstra
1e5242931b libxslt: Fix propagation of the libxml2 setup hook 2014-11-25 17:52:43 +01:00
Vladimír Čunát
e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Vladimír Čunát
91ead93811 libxslt: minor update to fix DOS security problem 2013-12-23 19:42:19 +01:00
Peter Simons
c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Eelco Dolstra
da426c7df5 Fix some meta.platforms attributes to build more stuff on Darwin 2013-11-05 10:46:59 +01:00
Peter Simons
0823aea0a6 Merge branch 'master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/libxslt/default.nix

Commit 1764ea2b0a introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
2013-03-25 13:43:45 +01:00
Peter Simons
1764ea2b0a libxslt: fix impurity on 'native-stdenv' platforms
libxslt has optional dependencies which may be found in /usr or
/usr/local on platforms that have a native stdenv. With those features
enabled, the build generated binaries that depend on libraries outside
of the store. In this particular case, the NixOS channel had binaries
for FreeBSD that depended on libgcrypt, apparently because that packages
happens to be installed outside of Nix on the build machine. On other
machines, however, those binaries failed with unresolvable references.
2013-03-25 13:16:28 +01:00
Peter Simons
e655c6afd7 libxslt: revert impurity fix on 'native-stdenv' platforms
Commit 16863d8ffe caused massive re-builds.
This change needs to be made differently.
2013-03-25 13:02:03 +01:00
Peter Simons
16863d8ffe libxslt: fix impurity on 'native-stdenv' platforms
libxslt has optional dependencies which may be found in /usr or
/usr/local on platforms that have a native stdenv. With those features
enabled, the build generated binaries that depend on libraries outside
of the store. In this particular case, the NixOS channel had binaries
for FreeBSD that depended on libgcrypt, apparently because that packages
happens to be installed outside of Nix on the build machine. On other
machines, however, those binaries failed with unresolvable references.
2013-03-25 12:44:23 +01:00
Danny Wilson
c041dbb1d2 Fix libxslt build on Illumos. 2013-02-28 20:04:03 +01:00
Eelco Dolstra
745cb58e4e Doh 2012-09-29 14:40:56 -04:00
Eelco Dolstra
14310ed2c8 libxslt: Update to 1.1.27 2012-09-28 17:44:38 -04:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +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
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
27251483f1 Allow libxslt to get extra arguments as it is inside deepOverride from webkit
svn path=/nixpkgs/trunk/; revision=17953
2009-10-24 20:10:03 +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
Pjotr Prins
0e6536e5c6 sha256 for libxslt changed?!
svn path=/nixpkgs/trunk/; revision=12948
2008-10-05 08:47:34 +00:00
Eelco Dolstra
cd60dc0ede * Various updates.
svn path=/nixpkgs/branches/stdenv-updates/; revision=12051
2008-06-12 09:49:40 +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
ad897a7c96 * Update more URLs.
svn path=/nixpkgs/trunk/; revision=6713
2006-10-12 14:53:45 +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
80e72c6c7e 1.1.17, untested
svn path=/nixpkgs/trunk/; revision=5935
2006-07-25 09:58:11 +00:00
Armijn Hemel
f644035715 prepare for multiple versions
svn path=/nixpkgs/trunk/; revision=5930
2006-07-24 23:55:32 +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
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
d02d998b65 * Libxslt updated to 1.1.10.
svn path=/nixpkgs/trunk/; revision=1456
2004-09-18 21:16:23 +00:00
Eelco Dolstra
12ae5363ea * Remove trivial builders.
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
2004-03-29 17:23:01 +00:00
Eelco Dolstra
2fcc5fdb08 * "!isNull x" -> "x != null". Done automatically. Hope nothing
broke.

svn path=/nixpkgs/trunk/; revision=870
2004-03-29 10:25:25 +00:00
Eelco Dolstra
ef2f51e930 * Added libxslt.
svn path=/nixpkgs/trunk/; revision=539
2003-11-25 13:45:51 +00:00