3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

60 commits

Author SHA1 Message Date
Frederik Rietdijk 7a13e5a7df Merge remote-tracking branch 'upstream/python-unstable' into HEAD 2017-11-24 19:58:07 +01:00
adisbladis d99378654f pythonPackages: Add version and pname attributes to packages 2017-11-23 17:49:43 +01:00
John Ericson da19c34d0f stdenv setup: Always use both propagated files
This continues #23374, which always kept around both attributes, by
always including both propagated files: `propgated-native-build-inputs`
and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still
defined as before, however, so this change should only barely
observable.

This is an incremental step to fully keeping the dependencies separate
in all cases.
2017-11-21 10:44:44 -05:00
Frederik Rietdijk 8f2ea38f8f Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-17 18:34:17 +02:00
Rickard Nilsson 1f9d9deb8a libxslt: Patch for CVE-2017-5029 2017-08-17 13:23:49 +02:00
Tuomas Tynkkynen 1ff422aa23 treewide: Add man & info outputs where necessary (instead of doc)
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
2017-08-11 21:32:54 +03:00
John Ericson 16be434b0b Merge accepted cross compilation PRs into staging 2017-06-28 23:17:21 -04:00
John Ericson 099b83f90d libxslt: Don't use stdenv.cross 2017-06-28 00:55:21 -04:00
David McFarland 3c76cd7626 libxslt: fix cygwin libtool error 2017-06-26 09:26:10 -03:00
Dan Peebles 1a4ca220e1 treewide: fix assorted issues revealed by the meta checker
Turns out a couple of the licenses were wrong, as well as being strings.
2017-04-28 23:07:42 -04:00
Jörg Thalheim 50d63e1e3f
libxslt: add option to enable crypto support 2016-12-11 19:22:34 +01:00
Eric Litak 605f923e92 libxslt: fixed crossDrv, where no python is available 2016-12-04 07:11:23 -08:00
Frederik Rietdijk be31980848 libxslt: build python bindings
and add a pythonPackages.libxslt alias.
2016-11-08 17:10:04 +01:00
Vladimír Čunát 06d8dd3ed4 libxslt: drop patch already included in release
I didn't test building on MinGW, but this commit can't make it worse.
2016-09-28 17:11:46 +02:00
Jörg Thalheim dafd585f9d
libxslt: 1.1.28 -> 1.1.29 2016-09-28 15:43:02 +02:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Vladimír Čunát 49bec81730 libxslt: fix on mingw by upstream patch
It's only static, as libxml2 is only static ATM.
2016-04-23 10:52:03 +02:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Vladimír Čunát e4728dd05f libxslt: fix CVE-2015-7995 by upstream patch 2016-02-06 13:21:18 +01:00
Luca Bruno e289717414 rename moveToOutput and propagatedBuildInputs 2015-12-02 10:05:36 +01:00
Vladimír Čunát 38313d5d87 libxml2,libxslt: split into multiple outputs
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
2015-10-05 13:44:16 +02:00
Eelco Dolstra e1f78bf677 More docs/manpages in separate outputs 2015-07-27 00:27:54 +02:00
Domen Kožar b9e0e67604 ftp://xmlsoft.org -> http://xmlsoft.org 2015-04-04 16:07:31 +02:00
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