Commit graph

2754 commits

Author SHA1 Message Date
Eelco Dolstra
b4636d333c svn path=/nixpkgs/trunk/; revision=18406 2009-11-18 11:46:35 +00:00
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
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
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
Rob Vermaas
ede5426070 name typo
svn path=/nixpkgs/trunk/; revision=18375
2009-11-16 13:57:11 +00:00
Rob Vermaas
30e6d32b33 update baseline for stratego related packages
svn path=/nixpkgs/trunk/; revision=18374
2009-11-16 13:21:12 +00:00
Lluís Batlle i Rossell
81f695899a I think I fixed the gcc builder for the usual stdenv, I broke in the commit
before.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18356
2009-11-15 17:48:10 +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
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
66ef37d260 * Fix "cgo" binary be defining LC_ALL=C inside the binary.
svn path=/nixpkgs/trunk/; revision=18350
2009-11-14 23:39:53 +00:00
Nicolas Pierron
a61a4bc4bc * Fix TimeZone in The Go Programming Language.
svn path=/nixpkgs/trunk/; revision=18349
2009-11-14 23:39:46 +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
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
173bdf6d2f fix ghc-get-packages
svn path=/nixpkgs/trunk/; revision=18331
2009-11-12 07:11:03 +00:00
Rob Vermaas
a40d37b57b other location for tarball
svn path=/nixpkgs/trunk/; revision=18317
2009-11-10 13:58:22 +00:00
Rob Vermaas
0e1a687233 revert previous change
svn path=/nixpkgs/trunk/; revision=18314
2009-11-09 15:05:45 +00:00
Rob Vermaas
83c57ed434 trying to make static linking work on darwin
svn path=/nixpkgs/trunk/; revision=18313
2009-11-09 15:00:24 +00:00
Rob Vermaas
85ee8e90b7 make static sdf2bundle
svn path=/nixpkgs/trunk/; revision=18312
2009-11-09 14:43:01 +00:00
Rob Vermaas
0a56e71716 add static variant for sdf bundle
svn path=/nixpkgs/trunk/; revision=18306
2009-11-09 09:53:57 +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
1c8f15b0aa LZO: Build the shared library.
svn path=/nixpkgs/trunk/; revision=18232
2009-11-06 22:44:18 +00:00
Michael Raskin
bc2ba3677b I think I rolled back to original sbcl-1.0.29 state
svn path=/nixpkgs/trunk/; revision=18223
2009-11-06 19:27:32 +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
Michael Raskin
1dce71822e Missed some added letters in SBCL version number..
svn path=/nixpkgs/trunk/; revision=18217
2009-11-06 18:36:16 +00:00
Andres Löh
1b9fe7411c Updated utf8-string, added mpppc.
svn path=/nixpkgs/trunk/; revision=18207
2009-11-06 14:09:30 +00:00
Andres Löh
c3e966b0cb Updated xmonad to 0.9.
svn path=/nixpkgs/trunk/; revision=18204
2009-11-06 13:08:47 +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
81f103f176 Roll back to 1.0.29
svn path=/nixpkgs/trunk/; revision=18197
2009-11-06 11:31:35 +00:00
Michael Raskin
e78e88ffcf Blacklist more versions of SBCL?
svn path=/nixpkgs/trunk/; revision=18194
2009-11-06 11:23:06 +00:00
Michael Raskin
fe775f8c71 Oops, forgot to use blacklist-enabled updater
svn path=/nixpkgs/trunk/; revision=18193
2009-11-06 10:57:42 +00:00
Michael Raskin
27e0421842 Fix SBCL URL..
svn path=/nixpkgs/trunk/; revision=18190
2009-11-06 10:28:46 +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
b50051494c goSrcDir unneeded for SBCL now
svn path=/nixpkgs/trunk/; revision=18183
2009-11-06 07:17:31 +00:00
Michael Raskin
0e608788c0 Update SBCL
svn path=/nixpkgs/trunk/; revision=18173
2009-11-05 23:30:23 +00:00
Michael Raskin
5638a33600 Update WebKit
svn path=/nixpkgs/trunk/; revision=18172
2009-11-05 23:11:34 +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
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
Michael Raskin
661f082d47 Update directfb
svn path=/nixpkgs/trunk/; revision=18158
2009-11-05 21:10:03 +00:00
Ludovic Courtès
0e02b4ccf9 GCC 4.4.2; new `update-gcc.sh' script.
svn path=/nixpkgs/trunk/; revision=18153
2009-11-05 18:46:52 +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
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
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
Eelco Dolstra
ac4d183051 * Added gnome-icon-theme.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18118
2009-11-04 21:44:01 +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
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
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
Sander van der Burg
ee18789ca4 Added Jetty-util library
svn path=/nixpkgs/trunk/; revision=18072
2009-11-02 16:19:37 +00:00
Sander van der Burg
248fcdc3bb Downgraded smack to 3.0.4. It seems that 3.1.0 contains some annoying bugs
svn path=/nixpkgs/trunk/; revision=18071
2009-11-02 15:12:17 +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
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
78648561c5 * Updated CUPS to 1.4.1.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18048
2009-10-30 09:46:51 +00:00
Eelco Dolstra
27ab1e3cc7 svn path=/nixpkgs/branches/xorg-7.5/; revision=18044 2009-10-30 08:26:20 +00:00
Eelco Dolstra
db52ebcc98 * Urgh.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18037
2009-10-29 18:17:58 +00:00
Eelco Dolstra
7133275ca0 * Purity: don't do a mkdir /var/cache/fontconfig.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18036
2009-10-29 18:17:45 +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
e9a6fc3bc1 * Mesa 7.5.2.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18033
2009-10-29 17:19:25 +00:00
Eelco Dolstra
95324696a3 * cairomm updated to 1.8.4.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18031
2009-10-29 15:26:50 +00:00
Eelco Dolstra
64cdcd8812 * Disable XCB support in Cairo, since it's not really supported
currently
  (http://lists.freedesktop.org/archives/xcb/2008-December/004140.html).

svn path=/nixpkgs/branches/xorg-7.5/; revision=18030
2009-10-29 15:26:39 +00:00
Eelco Dolstra
71f6b12135 * libdrm updated to 2.4.15.
* libpthread_stubs updated to 0.3.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18029
2009-10-29 14:52:10 +00:00
Eelco Dolstra
cb7dfb9652 * libtiff 3.9.1.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18027
2009-10-29 14:19:58 +00:00
Eelco Dolstra
843617bac9 * libpng 1.2.40.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18026
2009-10-29 14:19:39 +00:00
Eelco Dolstra
f210a41f84 * Shocking: a new version of libjpeg!
svn path=/nixpkgs/branches/xorg-7.5/; revision=18024
2009-10-29 14:13:07 +00:00
Eelco Dolstra
da182ce1d4 * Cairo 1.8.8.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18022
2009-10-29 13:32:48 +00:00
Eelco Dolstra
9301524c50 * Fontconfig updated to 2.7.3. Use /etc/fonts as the default
configuration directory so that users on other distributions don't
  need to set $FONTCONFIG_FILE (NIXPKGS-29).  Also use
  /var/cache/fontconfig for the cache to prevent programs run by root
  from writing into the Nix store.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18021
2009-10-29 13:22:43 +00:00
Eelco Dolstra
1b25d01703 * FreeType updated to 2.3.11. Also added an option to enable the
patent-encumbered hinting and sub-pixel rendering.  It's disabled by
  default.  (Or should it be enabled by default?)

svn path=/nixpkgs/branches/xorg-7.5/; revision=18019
2009-10-29 12:48:47 +00:00
Ludovic Courtès
f8d95145b2 G-Wrap 1.9.13.
svn path=/nixpkgs/trunk/; revision=18012
2009-10-29 11:23:10 +00:00
Andres Löh
cf235135f3 Added text and haskeline-class Haskell packages.
svn path=/nixpkgs/trunk/; revision=18011
2009-10-29 11:03:24 +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
Eelco Dolstra
cbfbaf736a * GNU Indent updated to 2.2.10.
svn path=/nixpkgs/trunk/; revision=17990
2009-10-28 13:11:09 +00:00
Eelco Dolstra
cb1b3a0dbe * Removed an unused glib.
svn path=/nixpkgs/trunk/; revision=17989
2009-10-28 13:07:44 +00:00
Marc Weber
748dd33b25 hg2git has been put into repo fast-export. make it work again
svn path=/nixpkgs/trunk/; revision=17977
2009-10-27 17:46:37 +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
Michael Raskin
e618a80968 Adding vbetool
svn path=/nixpkgs/trunk/; revision=17952
2009-10-24 19:58:07 +00:00
Eelco Dolstra
2bdf38dab2 * Updated GTK+, Glib.
* Build GTK+ with CUPS support (mostly to get decent printing in
  Firefox).

svn path=/nixpkgs/trunk/; revision=17951
2009-10-24 17:29:37 +00:00
Michael Raskin
bd7526951e Adding Links2
svn path=/nixpkgs/trunk/; revision=17949
2009-10-24 15:39:54 +00:00
Marc Weber
30006470aa sry
svn path=/nixpkgs/trunk/; revision=17939
2009-10-23 11:30:20 +00:00
Marc Weber
8f588a421d really fix php xdebug
svn path=/nixpkgs/trunk/; revision=17936
2009-10-23 08:56:46 +00:00