Commit graph

8387 commits

Author SHA1 Message Date
Nicolas Pierron 09bed4bffc * Report file locations in the stack-trace when multiple option
declarations cannot be merged.

svn path=/nixpkgs/trunk/; revision=18149
2009-11-05 16:36:03 +00:00
Nicolas Pierron d8bbae877a * Add a type for read-only options. Options which are only declared
are used when a module produces read-only data for other modules.

svn path=/nixpkgs/trunk/; revision=18148
2009-11-05 15:39:45 +00:00
Nicolas Pierron 5684506470 * Add isDefined to each options. This will clean-up NixOS introspection.
svn path=/nixpkgs/trunk/; revision=18147
2009-11-05 15:39:39 +00:00
Marco Maggesi c713b0ed67 Preliminary version of package ssreflect
Add expression for ssreflect, an extension to the Coq Proof Assistant.
Still has some clitches (see TODO in default.nix) but is usable anyway.


svn path=/nixpkgs/trunk/; revision=18145
2009-11-05 15:08:12 +00:00
Eelco Dolstra d843b24fbe * Added Ubuntu 9.10 ("Karmic Koala").
svn path=/nixpkgs/trunk/; revision=18142
2009-11-05 14:49:17 +00:00
Rob Vermaas 3bfd5b2d9c added couchdb 0.8.1-incubating
svn path=/nixpkgs/trunk/; revision=18141
2009-11-05 14:41:05 +00:00
Eelco Dolstra f7282b61c3 * Allow additional Deb provides/requires to be specified.
svn path=/nixpkgs/trunk/; revision=18139
2009-11-05 14:40:25 +00:00
Ludovic Courtès 9e1729637e Don't build GNU Emacs on non-gtk-supported platforms.
svn path=/nixpkgs/trunk/; revision=18138
2009-11-05 14:36:49 +00:00
Ludovic Courtès 9ec817f18a ECJ 3.5.1.
Includes bug fixes needed for IcedTea, see
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=375 .

svn path=/nixpkgs/trunk/; revision=18137
2009-11-05 14:36:45 +00:00
Peter Simons 4d675a283e pkgs/development/interpreters/python/2.6/default.nix: fixed build on Darwin
svn path=/nixpkgs/trunk/; revision=18136
2009-11-05 13:44:30 +00:00
Peter Simons 1981322cc5 pkgs/misc/cups/default.nix: don't install files to /etc or /usr
The cups build tries to install files into global system directories.
This patch changes those paths to locations underneath of $out.

svn path=/nixpkgs/trunk/; revision=18134
2009-11-05 13:33:36 +00:00
Lluís Batlle i Rossell 9b7670ce5b Setting wxGTK to use the old gtk libs. Until wxGTK 2.8.11 they will not fix
a symbol clash with glib 2.21. So we keep with glib 2.20.
I also changed the default wxGTK from 2.6 to 2.8, caring so no hash is changed due to
this change. Some packages using 2.6 may well build with 2.8, so we can try updating
them for another commit.

svn path=/nixpkgs/trunk/; revision=18133
2009-11-05 13:29:52 +00:00
Sander van der Burg 775075a0e8 Upgraded KDE to 4.3.3
svn path=/nixpkgs/trunk/; revision=18132
2009-11-05 12:13:46 +00:00
Rob Vermaas 724d21e3b0 updated version of chrome
svn path=/nixpkgs/trunk/; revision=18131
2009-11-05 10:50:57 +00:00
Eelco Dolstra d9f65496d4 * "Fix" Perl on Cygwin.
svn path=/nixpkgs/trunk/; revision=18129
2009-11-05 09:11:25 +00:00
Eelco Dolstra f08bc4c561 * Apply the Redland fix to version 1.0.8 as well (since that's what
KDE 4.3 uses).

svn path=/nixpkgs/trunk/; revision=18127
2009-11-05 08:19:35 +00:00
Eelco Dolstra b039fddfbc * Merged the xorg-7.5 branch, which provides X.org 7.5 and various
other X-related updates.

svn path=/nixpkgs/trunk/; revision=18124
2009-11-04 22:42:44 +00:00
Lluís Batlle i Rossell 2e8ae96930 Updating vwm and its libraries.
svn path=/nixpkgs/trunk/; revision=18123
2009-11-04 22:38:26 +00:00
Eelco Dolstra 4f839e9a54 * Sync with the trunk.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18122
2009-11-04 22:37:24 +00:00
Lluís Batlle i Rossell 13a369476b Updating truecrypt from 6.2a to 6.3, mostly because the old src disappeared.
svn path=/nixpkgs/trunk/; revision=18121
2009-11-04 22:17:08 +00:00
Eelco Dolstra 304e339d4f * Added libglademm.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18120
2009-11-04 22:07:32 +00:00
Eelco Dolstra 81f1c3e7d5 * Get rid of Gnome 2.26.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18119
2009-11-04 21:50:13 +00:00
Eelco Dolstra ac4d183051 * Added gnome-icon-theme.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18118
2009-11-04 21:44:01 +00:00
Eelco Dolstra 7a233c1629 * GIMP updated to 2.6.7. It no longer needs libgtkhtml.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18117
2009-11-04 21:28:11 +00:00
Eelco Dolstra 9a4cd33d10 * Fix the synaptics driver.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18115
2009-11-04 19:53:23 +00:00
Eelco Dolstra dba29df1dc * Same as r18113.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18114
2009-11-04 18:37:48 +00:00
Eelco Dolstra 23ef4c4f79 * Before selecting an attribute from `x', check whether it's an
attribute set.  `tryEval' no longer catches this.

svn path=/nixpkgs/trunk/; revision=18113
2009-11-04 18:37:11 +00:00
Peter Simons 4c0ff006f3 pkgs/development/libraries/redland/1.0.9.nix: fix build with sqlite 3.6.19
Redland's use of the pre-processor symbol SQLITE_API collides with a
symbol of the same name in sqlite 3.6.19. Patching the source code to
use REDLAND_SQLITE_API instead works around the problem.

svn path=/nixpkgs/trunk/; revision=18100
2009-11-04 15:14:12 +00:00
Lluís Batlle i Rossell ae1f064c0c Updating doxygen from 1.5.8 to 1.6.1
svn path=/nixpkgs/trunk/; revision=18099
2009-11-04 14:58:39 +00:00
Eelco Dolstra 25a675da23 * Subversion 1.6.6.
svn path=/nixpkgs/trunk/; revision=18093
2009-11-04 13:41:55 +00:00
Peter Simons dd1a6f8ab1 pkgs/development/libraries/sqlite/default.nix: enable amalgamation build
Sqlite has a build mode called "amalgamation" that gathers all 90+ source code
files into a single sqlite3.c file before compiling the library. Building
sqlite this way reportedly gives a 5-10% performance gain because the compiler
can perform more sophisticated optimizations.

svn path=/nixpkgs/trunk/; revision=18092
2009-11-04 13:07:27 +00:00
Peter Simons 600d6a9bac pkgs/development/libraries/sqlite/default.nix: updated to version 3.6.19
The new version requires Tcl at build time in order to construct sqlite3.h,
even when the --without-tcl option is passed to configure. That feels odd
because the sqlite web site does advertise "no dependencies", but then it's
probably not a big deal either. The build of the Tcl plugin for sqlite is still
disabled, so there is no run-time dependency.

svn path=/nixpkgs/trunk/; revision=18091
2009-11-04 13:07:21 +00:00
Peter Simons f9b71e1c54 pkgs/development/interpreters/python/2.6/default.nix: updated to version 2.6.4
svn path=/nixpkgs/trunk/; revision=18090
2009-11-04 10:29:43 +00:00
Peter Simons 3659747127 pkgs/applications/editors/emacs-modes/haskell/default.nix: updated to version 2.6.1
svn path=/nixpkgs/trunk/; revision=18089
2009-11-04 10:29:38 +00:00
Eelco Dolstra cfe0ffad3a * Fixed some more Gnome packages.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18088
2009-11-04 09:17:27 +00:00
Eelco Dolstra 7cec6e4f52 * Fix startup-notification.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18087
2009-11-04 07:33:27 +00:00
Michael Raskin 19c6cba987 Try removing gnome26 references
svn path=/nixpkgs/branches/xorg-7.5/; revision=18086
2009-11-04 00:39:27 +00:00
Eelco Dolstra b98502f06a * Fix xf86inputsynaptics.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18085
2009-11-03 23:54:08 +00:00
Eelco Dolstra 56ea7df62d * Several buildInputs of Gnome-related packages should be
propagatedBuildInputs, because those inputs are required by the *.pc
  or *.la files of the package:

  - If a *.pc file references a non-propagated input, then Gnome
    packages have the bad tendency to silently ignore this problem in
    configure scripts - the failure of a command like `pkg-config
    --cflags foo' will be ignored if a dependency of foo.pc is
    missing, so no flags will be added, and the build will fail later
    on a missing header or library.

  - If a *.la file references a non-propagated input, the build will
    also fail, because Libtool will add library dependencies that it
    cannot find.  (Arguably *.la files should never reference packages
    that aren't in the corresponding *.pc file, but they do it
    anyway).

  By setting the propagatedBuildInputs properly, it should be possible
  to get rid of all the NIX_CFLAGS_COMPILE / NIX_LDFLAGS hacks in the
  Gnome expressions.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18084
2009-11-03 23:26:14 +00:00
Eelco Dolstra 8fd610bff9 * Fixed Qt 3.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18083
2009-11-03 21:55:53 +00:00
Eelco Dolstra eadf38f8de svn path=/nixpkgs/branches/xorg-7.5/; revision=18082 2009-11-03 21:49:59 +00:00
Eelco Dolstra 6fbcf62941 * Fix libgsf.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18081
2009-11-03 21:48:09 +00:00
Eelco Dolstra f1f8debe62 * Lots of packages refer to gnomevfs and startupnotification.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18079
2009-11-03 20:56:26 +00:00
Peter Simons b06c0d1a1d pkgs/applications/version-management/git-and-tools/default.nix: use docbook dtd 4.5
Ensure that the 4.5 DTD required by asciidoc is available.

svn path=/nixpkgs/trunk/; revision=18078
2009-11-03 15:57:31 +00:00
Peter Simons c0773ee99d pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix: added docbook 4.5 XML DTD
The new asciidoc version generates docbook output for this version.

svn path=/nixpkgs/trunk/; revision=18077
2009-11-03 15:57:27 +00:00
Peter Simons 9e98a71eaa pkgs/tools/typesetting/asciidoc: updated to version 8.5.1
New asciidoc versions do have a proper configure script. Using that simplifies
the build instructions a bit.

svn path=/nixpkgs/trunk/; revision=18076
2009-11-03 15:57:22 +00:00
Peter Simons 990d7c05e7 pkgs/applications/window-managers/ratpoison/default.nix: updated to version 1.4.5
svn path=/nixpkgs/trunk/; revision=18075
2009-11-03 15:57:17 +00:00
Sander van der Burg 5ed64ae7c0 Enabled my eclipse package again, since I want to have eclipse installed when typing nix-env -i. BTW. the eclipse plugins can be installed this way either
svn path=/nixpkgs/trunk/; revision=18074
2009-11-03 11:00:18 +00:00
Lluís Batlle i Rossell 3cc62cefa8 Finally I decided to add High Performance SSH.
http://www.psc.edu/networking/projects/hpn-ssh/

I tried to keep the openssh hash not changing, unless the user sets hpn in getConfig
style. I think that does not look as good as a patch changing the hash, but it may
annoy less. Let me know if it is not ok.

I don't think hpn should be the default, because it may have some insecurity implications
I don't know of. But I used to enable it in all my machines, and I hope to do so unless
advised otherwise.

svn path=/nixpkgs/trunk/; revision=18073
2009-11-02 21:49:06 +00:00
Sander van der Burg ee18789ca4 Added Jetty-util library
svn path=/nixpkgs/trunk/; revision=18072
2009-11-02 16:19:37 +00:00