Commit graph

2709 commits

Author SHA1 Message Date
Eelco Dolstra 7f5b839524 * Removed selectVersion. There's no good reason to write
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403
2009-11-18 09:39:59 +00:00
Lluís Batlle i Rossell e7c8e8da4f I made the whole nixpkgs dependencies available to the cross compiler, no
needing to keep a new tree of expressions apart for the expressions to get
cross-compiled.

I changed the whole way of using cross compilation with nixpkgs, which before
was done through a simple adapter.

Now the adapter became complex, and I've tried to avoid the most obvious
recursivities. For example, the fetchurl expression should
never be cross-compiled, as the gmp, mpfr, and some others, like
some ncurses, perl, ... I made overrided copies of those necessary as
perlNoCross, ncursesNoCross, as stdenvNoCross, keeping in mind that
the stdenv (capable of cross compilation) is built upon stdenvNoCross using
an adapter.

So, to cross compile, instead of building using "nixpkgs/default.nix",
you should build with your
own "myarchiteture.nix", which should have contents like these, for example:

import /etc/nixos/nixpkgs/default.nix
{
    crossSystem = {
        config = "armv5tel-unknown-linux-gnueabi";
        bigEndian = false;
        arch = "arm";
        float = "soft";
    };
}


svn path=/nixpkgs/branches/stdenv-updates/; revision=18398
2009-11-17 22:58:48 +00:00
Lluís Batlle i Rossell 0c631f6181 Trying to move all stdenv cross-compiling details out of the stdenv expression,
into a stdenv adapater.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18397
2009-11-17 21:14:57 +00:00
Sander van der Burg 52e9488541 Upgraded ejabberd to the latest stable 2.1.0 and also claimed maintainership since I really need this for one of my experiments
svn path=/nixpkgs/trunk/; revision=18396
2009-11-17 16:54:04 +00:00
Eelco Dolstra 802fa4ba0b * Remove sumArgs and its few remaining uses. Idem for composedArgs.
svn path=/nixpkgs/trunk/; revision=18388
2009-11-17 15:26:22 +00:00
Rob Vermaas b82da9824b make nix overridable
svn path=/nixpkgs/trunk/; revision=18380
2009-11-17 12:30:17 +00:00
Lluís Batlle i Rossell 2c7fa189fb Making the definition of the cross compiling target an attribute set.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18378
2009-11-16 23:21:13 +00:00
Nicolas Pierron 01e98e49b1 * Add a stdenv adapter which can remove all maintainers fields. This can
be used to remove error reports from development branches.

svn path=/nixpkgs/trunk/; revision=18377
2009-11-16 22:23:11 +00:00
Nicolas Pierron 29384d43f2 * Update Go's version. Make 8g & 8l commands working with no need of
extra argument to locate the Go's libraries.

svn path=/nixpkgs/trunk/; revision=18376
2009-11-16 18:42:43 +00:00
Lluís Batlle i Rossell d82c7e0a69 Adding uboot cross compilation. I had to adapt the package a bit, because it
does not use autotools.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18362
2009-11-15 22:56:06 +00:00
Lluís Batlle i Rossell 307cbd7b3b First attempt for the full stdenvCross. I think that it should work. The
toolchain for arm built.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18355
2009-11-15 16:48:36 +00:00
Lluís Batlle i Rossell 2412034611 Cleaning a bit around gcc43_RealCross
svn path=/nixpkgs/branches/stdenv-updates/; revision=18352
2009-11-15 05:39:22 +00:00
Lluís Batlle i Rossell 9b977f5c60 Fixing many things related to the cross compilation in stdenvCross.
It still does not work, but I think I already get glibc cross compiled.
Next: gcc and g++, and set some setup script hooks on stdenvCross.

It took quite enough hours for this commit.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18351
2009-11-15 05:28:35 +00:00
Nicolas Pierron da1311b893 * Add the Go Programming Language compiler.
svn path=/nixpkgs/trunk/; revision=18348
2009-11-14 20:14:28 +00:00
Nicolas Pierron c8cb5210fb * Add a fetchhg builder to checkout mercurial repositories.
svn path=/nixpkgs/trunk/; revision=18347
2009-11-14 20:14:21 +00:00
Nicolas Pierron 47de42835a * Add https support for mercurial.
svn path=/nixpkgs/trunk/; revision=18345
2009-11-14 20:14:09 +00:00
Lluís Batlle i Rossell 2aba922d30 My first attempt at getting cross compilers in nixpkgs.
My idea is to provide special stdenv expressions that will contain in the path
additional cross compilers. As most expressions for programs accept a stdenv parameter, 
we could substitute this parameter with the special stdenv, which will have a
generic builder that attempts the usual "--target=..." and can additionally
have an env variable like "cross" with the target architecture set.
So, finally we could have additional expressions like this:

bashRealArm = makeOverridable (import ../shells/bash) {
    inherit fetchurl bison;
    stdenv = stdenvCross "armv5tel-unknown-linux-gnueabi";
};

Meanwhile it does not work - I still cannot get the cross-gcc to build.

I think it does not fill the previous expressions with a lot of noise, so I
think it may be a good path to follow.

I only touched some files of the current stdenv: gcc-4.3, kernel headers
2.6.28, glibc 2.9, ...

I tried to use the gcc-cross-wrapper, that may be very outdated. Maybe I will
update it, or update the gcc-wrapper expression to make it fit the cross tools,
but meanwhile I even cannot build gcc, so I have not tested the wrapper.

This new idea on cross compiling is not similar to that of the
nixpkgs/branches/cross-compilation, which mostly added bare new expressions for
anything to be cross compiled, if I understood it correctly.

I cared not to break anything of the usual stdenv in all this work.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18343
2009-11-14 08:11:30 +00:00
Lluís Batlle i Rossell 6864119104 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18341
2009-11-13 19:19:34 +00:00
Marc Weber f5d0193047 synergy broke by xorg-update
svn path=/nixpkgs/trunk/; revision=18335
2009-11-12 16:11:44 +00:00
Sander van der Burg ac64ef2275 Upgraded JBoss to 5.1.0
svn path=/nixpkgs/trunk/; revision=18329
2009-11-11 15:52:26 +00:00
Pjotr Prins 84147f4477 Force gcc42 for arb (otherwise headers balk)
svn path=/nixpkgs/trunk/; revision=18324
2009-11-10 17:16:06 +00:00
Marco Maggesi 849f42d7bc Add package OpenAFS
svn path=/nixpkgs/trunk/; revision=18319
2009-11-10 14:59:39 +00:00
Marco Maggesi e2057ffe04 Add package ledger
svn path=/nixpkgs/trunk/; revision=18316
2009-11-10 11:02:45 +00:00
Rob Vermaas 85ee8e90b7 make static sdf2bundle
svn path=/nixpkgs/trunk/; revision=18312
2009-11-09 14:43:01 +00:00
Marco Maggesi c0a1119f10 Reintroduced attribute scsh accidentally removed in revision 18299.
svn path=/nixpkgs/trunk/; revision=18311
2009-11-09 13:20:27 +00:00
Lluís Batlle i Rossell de6aa89c45 Updating xchm.
svn path=/nixpkgs/trunk/; revision=18310
2009-11-09 11:55:31 +00:00
Lluís Batlle i Rossell 4f906f38a8 Updating qemu to 0.11.0, and making it use stdenv with the usual gcc, and not an older.
svn path=/nixpkgs/trunk/; revision=18305
2009-11-09 09:15:58 +00:00
Wouter den Breejen 5fae957741 Added par2, unzip/rar as dependencies so they are not picked up from PATH
svn path=/nixpkgs/trunk/; revision=18304
2009-11-08 23:39:06 +00:00
Michael Raskin 6722c6c22f A package to feed to HAL to get synaptics support
svn path=/nixpkgs/trunk/; revision=18299
2009-11-08 22:12:55 +00:00
Wouter den Breejen 123e595990 Added sabnzbd usenet download tool :)
svn path=/nixpkgs/trunk/; revision=18294
2009-11-08 19:55:37 +00:00
Lluís Batlle i Rossell be2ff23280 Making the 'makeInitrd' expression use "platform"
svn path=/nixpkgs/branches/stdenv-updates/; revision=18292
2009-11-08 18:47:55 +00:00
Lluís Batlle i Rossell 4b27d28701 Porting changes from stdenv-updates into this branch.
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00
Marco Maggesi 4d0e24acd3 Add packages scsh, The Scheme Shell
svn path=/nixpkgs/trunk/; revision=18248
2009-11-07 11:17:53 +00:00
Ludovic Courtès a7faea338c GnuTLS 2.8.5, with LZO support, and with external libtasn1.
svn path=/nixpkgs/trunk/; revision=18233
2009-11-06 22:44:23 +00:00
Ludovic Courtès 1cebea089b GNU Plotutils: cosmetic changes; adding myself as co-maintainer.
svn path=/nixpkgs/trunk/; revision=18231
2009-11-06 22:44:13 +00:00
Lluís Batlle i Rossell 005bf71e51 Updating neverball. That required adding physfs.
svn path=/nixpkgs/trunk/; revision=18220
2009-11-06 19:25:45 +00:00
Peter Simons 56e06c9790 pkgs/top-level/all-packages.nix: added support for overriding Nix's storeDir and stateDir in nix-pkgs.conf
This patch allows Nix to be build using store locations other than "/nix".

svn path=/nixpkgs/trunk/; revision=18206
2009-11-06 13:30:06 +00:00
Marco Maggesi b1e7aac0fd Add MIT Kerberos implementation krb5.
svn path=/nixpkgs/trunk/; revision=18202
2009-11-06 12:57:29 +00:00
Rob Vermaas e3099a7cec * added haskell libraries: webserver, json 0.3.6, http 3001, base64string, CS173Tourney
* added dep on getopt to couchdb


svn path=/nixpkgs/trunk/; revision=18201
2009-11-06 12:38:54 +00:00
Michael Raskin 3b273b945a Build 2.6.31-zen-stable kernels
svn path=/nixpkgs/trunk/; revision=18195
2009-11-06 11:24:49 +00:00
Michael Raskin 8334ad8b2a Roll back SBCL
svn path=/nixpkgs/trunk/; revision=18189
2009-11-06 10:13:00 +00:00
Michael Raskin 73933c7f9b Comment out gcl as broken
svn path=/nixpkgs/trunk/; revision=18188
2009-11-06 09:44:03 +00:00
Michael Raskin 2e99554064 Try using latest CLisp for SBCL in case SBCL fixed compatibility issues
svn path=/nixpkgs/trunk/; revision=18184
2009-11-06 07:39:59 +00:00
Eelco Dolstra ade60645af * Nix 0.13.
svn path=/nixpkgs/trunk/; revision=18175
2009-11-05 23:47:53 +00:00
Michael Raskin dca59abcca Update Zen Kernel
svn path=/nixpkgs/trunk/; revision=18174
2009-11-05 23:32:48 +00:00
Michael Raskin ddae0905e3 Update x11vnc arguments
svn path=/nixpkgs/trunk/; revision=18171
2009-11-05 22:27:46 +00:00
Michael Raskin 4d02c927e6 Fix ratpoison dependencies
svn path=/nixpkgs/trunk/; revision=18166
2009-11-05 21:53:37 +00:00
Ludovic Courtès 82579d30d0 Remove old, commented GCJ expression.
svn path=/nixpkgs/trunk/; revision=18165
2009-11-05 21:43:05 +00:00
Ludovic Courtès 24c70760cd GCJ 4.4: Fix missing <X11/extensions/XInput.h> by adding `libXi'.
That header used to be provided by inputproto-1.4 but is no longer
provided by inputproto-2.0.

svn path=/nixpkgs/trunk/; revision=18164
2009-11-05 21:43:00 +00:00
Lluís Batlle i Rossell 8120292b21 Fixing some wxGTK dangling attributes I forgot in a recent commit.
svn path=/nixpkgs/trunk/; revision=18162
2009-11-05 21:34:44 +00:00
Lluís Batlle i Rossell 91c8df91bf Adding the Unichrome xorg video driver, and updating the Openchrome.
svn path=/nixpkgs/trunk/; revision=18161
2009-11-05 21:34:31 +00:00
Michael Raskin 09f38459d3 GCL expression unfinished..
svn path=/nixpkgs/trunk/; revision=18160
2009-11-05 21:11:39 +00:00
Michael Raskin e4a67dbe5b Fix wxGTK reference for xchm
svn path=/nixpkgs/trunk/; revision=18156
2009-11-05 21:08:53 +00:00
Ludovic Courtès 05437f62c9 Add hwloc 0.9.2, renamed from libtopology.
svn path=/nixpkgs/trunk/; revision=18152
2009-11-05 18:46:46 +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
Rob Vermaas 3bfd5b2d9c added couchdb 0.8.1-incubating
svn path=/nixpkgs/trunk/; revision=18141
2009-11-05 14:41:05 +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
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
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 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
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
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
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 8fd610bff9 * Fixed Qt 3.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18083
2009-11-03 21:55:53 +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
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
Marco Maggesi a0207b3dc7 Updated Coq to version 8.2pl1
svn path=/nixpkgs/trunk/; revision=18069
2009-11-02 11:44:27 +00:00
Marco Maggesi c4533b8d24 Added camlp5 the preprocessor-pretty-printer for OCaml
svn path=/nixpkgs/trunk/; revision=18068
2009-11-02 10:47:24 +00:00
Eelco Dolstra 45ba16864f * Deleted some obsolete kernels (2.6.20, 2.6.21, 2.6.22, 2.6.23 and
the 2.6.31rcs).

svn path=/nixpkgs/trunk/; revision=18065
2009-11-01 17:17:40 +00:00
Ludovic Courtès 061daca90c Rename Tahoe to Tahoe-LAFS.
svn path=/nixpkgs/trunk/; revision=18059
2009-10-31 22:34:24 +00:00
Michael Raskin 9c94b20629 Try using Gnome-2.28
svn path=/nixpkgs/branches/xorg-7.5/; revision=18058
2009-10-31 12:59:33 +00:00
Eelco Dolstra 65d399ff81 * Upstart 0.6.2.
svn path=/nixpkgs/trunk/; revision=18056
2009-10-30 18:12:28 +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
Eelco Dolstra 6f04e6a5d6 * Merge the temporary copy of dbus.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18052
2009-10-30 12:36:32 +00:00
Eelco Dolstra 404007aab3 * Build CUPS with dbus support, plus some purity fixes.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18051
2009-10-30 12:33:34 +00:00
Rob Vermaas a73cef1057 added chromeWrapper, like firefoxWrapper, to allow plugins to work, added previously undefined dependencies on flash plugin
svn path=/nixpkgs/trunk/; revision=18050
2009-10-30 12:28:44 +00:00
Eelco Dolstra 78648561c5 * Updated CUPS to 1.4.1.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18048
2009-10-30 09:46:51 +00:00
Rob Vermaas d025709a8a chrome 20565
svn path=/nixpkgs/trunk/; revision=18046
2009-10-30 08:45:58 +00:00
Lluís Batlle i Rossell c22d173893 Adding the bootchart capture script. It worked for me, run standalone, not as init.
I tried their website renderer, but it did not work for me. It may be shut down,
because their last update is for 2006.
Next steps: put it into nixos, and build the renderer (java!).

svn path=/nixpkgs/trunk/; revision=18041
2009-10-29 23:15:10 +00:00
Eelco Dolstra 05ff927d83 * Bring back libXxf86misc and xf86miscproto. These were removed from
X.org, but some packages still need them.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18038
2009-10-29 18:25:53 +00:00
Eelco Dolstra 5884530154 * Deleted KDE 4.2.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18035
2009-10-29 18:04:46 +00:00
Eelco Dolstra 28d718aceb * X.org 7.5.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18034
2009-10-29 17:56:10 +00:00
Eelco Dolstra b90a6b4ba0 * Make GTK 2.18 the default, and get rid of the deep overrides. (BTW,
there seems to be a much cleaner solution than deepOverride, namely
  call all-packages.nix with an appropriate packageOverrides set.)

svn path=/nixpkgs/branches/xorg-7.5/; revision=18025
2009-10-29 14:19:13 +00:00
Peter Simons 56ab8201f2 pkgs/top-level/all-packages.nix: allow distcc to be configured via $NIXPKGS_CONFIG
Set distcc = { avahi = true; gtk = true; }; to enable support for the
corresponding libraries.

svn path=/nixpkgs/trunk/; revision=18016
2009-10-29 11:58:07 +00:00
Peter Simons 96a32cffe2 Added wxMaxima version 0.8.3.
svn path=/nixpkgs/trunk/; revision=18015
2009-10-29 11:57:58 +00:00
Eelco Dolstra 849f2e1683 * Replace some "inherit (gtkLibs) glib" statements with "inherit glib".
svn path=/nixpkgs/trunk/; revision=18013
2009-10-29 11:43:02 +00:00
Eelco Dolstra 5682b2e9ea * Finished getting rid of gtk-libs.
svn path=/nixpkgs/trunk/; revision=18010
2009-10-29 10:53:54 +00:00
Ludovic Courtès 4c5fcfb0a8 GDB: Build with Expat support, to get syscall info.
svn path=/nixpkgs/trunk/; revision=18009
2009-10-28 22:25:50 +00:00
Ludovic Courtès f7947871a3 GNU Guile 1.9 with coverage analysis builds.
svn path=/nixpkgs/trunk/; revision=17994
2009-10-28 16:16:23 +00:00
Eelco Dolstra 82baac23a7 * Idem for gtk-libs/2.16.
svn path=/nixpkgs/trunk/; revision=17993
2009-10-28 15:31:52 +00:00
Eelco Dolstra 5398eceff3 * Getting rid of gtk-libs by moving the packages in gtk-libs to
development/libraries/{glib,gtk+,pango,atk,...}.  Done for glib/gtk+
  1.2.  Also deleted some obsolete, unused versions (gtkLibs 2.10,
  2.12, and 2.14).

svn path=/nixpkgs/trunk/; revision=17992
2009-10-28 15:06:18 +00:00
Eelco Dolstra f53195f29e * Improved a bunch of "name" attributes (mostly missing version
numbers).

svn path=/nixpkgs/trunk/; revision=17991
2009-10-28 14:06:56 +00:00