Commit Graph

3073 Commits

Author SHA1 Message Date
Lluís Batlle i Rossell
ba274e578c Made graphicsmagick-config not say anything about libraries that would be needed for static linking, because we are linking it dynamically.
Made octave link with graphicsmagick to get imread() working.

Nevertheless, imread does not work, because of some problems between octave and latest versions of graphicsmagick: http://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-February/015295.html

Next to do: add an older version of graphics magick for octave.

svn path=/nixpkgs/trunk/; revision=20389
2010-03-04 16:41:10 +00:00
Lluís Batlle i Rossell
22065c11d9 Adding 'awesome' (and two packages it was depending on)
svn path=/nixpkgs/trunk/; revision=20385
2010-03-04 14:44:56 +00:00
Lluís Batlle i Rossell
aa38df2611 Adding GraphicsMagick
svn path=/nixpkgs/trunk/; revision=20383
2010-03-04 14:44:47 +00:00
Lluís Batlle i Rossell
c2cbd65668 Getting a better seg3d build. Now it runs from TMPDIR at least.
The installation still fails.

svn path=/nixpkgs/trunk/; revision=20382
2010-03-04 14:44:43 +00:00
Eelco Dolstra
2880af03c8 * Add a Nix expression for the Nix SQLite branch (temporarily).
svn path=/nixpkgs/trunk/; revision=20377
2010-03-04 14:39:47 +00:00
Ludovic Courtès
07356746ef Add GNU cppi.
svn path=/nixpkgs/trunk/; revision=20363
2010-03-04 11:10:44 +00:00
Ludovic Courtès
344f2efc5f libcanberra 0.23.
svn path=/nixpkgs/trunk/; revision=20353
2010-03-03 14:27:17 +00:00
Sander van der Burg
e51cfc777a Added libv4l which is now a required dependency for kdenetwork-4.4.1
svn path=/nixpkgs/trunk/; revision=20349
2010-03-03 10:37:38 +00:00
Rob Vermaas
af2f53ab89 hydra-ant-logger
svn path=/nixpkgs/trunk/; revision=20332
2010-03-02 15:37:04 +00:00
Lluís Batlle i Rossell
cc068f0be8 Adding the itk libraries.
Adding a skeleton of the seg3d package. It builds, but libraries and rpaths are wrong.
I hope to fix it soon.

svn path=/nixpkgs/trunk/; revision=20320
2010-03-01 23:31:35 +00:00
Lluís Batlle i Rossell
eb047010f8 Trying to get a better expression for uboot upstream, allowing normal and cross build
with proper assertions.


svn path=/nixpkgs/trunk/; revision=20319
2010-03-01 23:22:48 +00:00
Ludovic Courtès
a86e0ad8aa pyopengl: Move to `python-packages.nix'.
svn path=/nixpkgs/trunk/; revision=20317
2010-03-01 17:08:25 +00:00
Rob Vermaas
f3f922f474 ecj for darwin
svn path=/nixpkgs/trunk/; revision=20311
2010-03-01 16:20:47 +00:00
Ludovic Courtès
67b7a89daf Move zope.interface' to python-packages.nix'.
svn path=/nixpkgs/trunk/; revision=20305
2010-03-01 13:12:52 +00:00
Ludovic Courtès
ff88e57803 GNU Parted 2.2.
svn path=/nixpkgs/trunk/; revision=20304
2010-03-01 13:12:48 +00:00
Lluís Batlle i Rossell
b7abafeedc Adding a new python package to allow calibre preview the books
svn path=/nixpkgs/trunk/; revision=20292
2010-02-28 22:55:08 +00:00
Lluís Batlle i Rossell
30a9cbf018 Updating calibre (I had to add a new python package for it: cssutils)
svn path=/nixpkgs/trunk/; revision=20291
2010-02-28 22:42:39 +00:00
Lluís Batlle i Rossell
305a7a2ddf More testing allows fixing more errors from the recent commits.
svn path=/nixpkgs/trunk/; revision=20279
2010-02-27 21:21:20 +00:00
Lluís Batlle i Rossell
4677180b0d Barf. I have to test the expressions before commiting.
svn path=/nixpkgs/trunk/; revision=20278
2010-02-27 20:37:58 +00:00
Lluís Batlle i Rossell
81b325b33f Adding a cross compiler condition for sparc64 due to a gcc bug
svn path=/nixpkgs/trunk/; revision=20277
2010-02-27 20:29:39 +00:00
Lluís Batlle i Rossell
11aa65c28a Simplified much more the expressions for cross building and multiplatform.
I introduce the new nixpkgs parameter "platform", defaulting to "pc",
which was before defined as an attribute of nixpkgs.

I made the crossSystem nixpkgs attribute set parameter contain its own 'platform'.

This allows cross-building a kernel for a given crossSystem.platform in a non-PC
platform.

The actual native platform can be taken from stdenv.platform, and this way we also
avoid the constant passing of 'platform' to packages for platform-dependant builds
(kernel, initrd, ...).

I will update nixos accordingly to these changes, for non-PC platforms to work.

I think we are gaining on flexibility and clearness. I could cross build succesfully
an ultrasparc kernel and a mipsel kernel on PC. But since this change, I should be able
to do this also in non-PC.

Before this change, there was no possibility of distinguishing the "target platform" or
the "native build platform" when cross building, being the single "platform" attribute
always interpreted as target platform.

The platform is a quite relevant attribute set, as it determines the linuxHeaders used
(in the case, by now the only one supported, of linux targets).

The platform attributes are quite linux centric still. Let's hope for more generality to come.

svn path=/nixpkgs/trunk/; revision=20273
2010-02-27 17:35:47 +00:00
Lluís Batlle i Rossell
b1b7266aa3 After some testing with an ultrasparc cross-compiler:
Updating the cross-build expressions, adding some flexibility.
Updated the linux headers used cross building, as 2.6.28 had bugs on endianness in
sparc64.
There were, as usual some bugs in gcc. Maybe not many make a cross compiler to
ultrasparc.

For the record, I could build an ultrasparc kernel with this base nix:
import /etc/nixos/nixpkgs/default.nix   # The root nixpkgs default.nix
{
    crossSystem = {
        config = "sparc64-unknown-linux";
        bigEndian = true;
        arch = "sparc64";
        float = "soft";
        withTLS = true;
        cpu = "ultrasparc";
    };

    config = pkgs: {
      packageOverrides = pkgs : {
        platform = {
            name = "sparc64";
            kernelHeadersBaseConfig = "sparc64_defconfig";
            kernelBaseConfig = "sparc64_defconfig";
            kernelArch = "sparc";
            kernelAutoModules = false;
            kernelTarget = "zImage";
            uboot = null;
        };
      };
    };
}

Although it did not boot directly in qemu-system-sparc64:
[sparc64] Kernel already loaded
Unhandled Exception 0x0000000000000020
PC = 0x0000000000404000 NPC = 0x0000000000404004

svn path=/nixpkgs/trunk/; revision=20269
2010-02-27 00:52:48 +00:00
Eelco Dolstra
61c9c2434f * Updated fbcondecor for Linux 2.6.33.
svn path=/nixpkgs/trunk/; revision=20257
2010-02-25 14:15:42 +00:00
Rob Vermaas
e9404a5d83 * remove sawmill
svn path=/nixpkgs/trunk/; revision=20252
2010-02-25 13:28:36 +00:00
Eelco Dolstra
e04c9a452a * Linux 2.6.33.
svn path=/nixpkgs/trunk/; revision=20246
2010-02-25 12:40:03 +00:00
Rob Vermaas
c4332bb7a1 nix 0.15pre20231 as nixUnstable
svn path=/nixpkgs/trunk/; revision=20243
2010-02-25 10:01:33 +00:00
Lluís Batlle i Rossell
e668d2689e Adding 'gt5', a diff-capable 'du' browser
svn path=/nixpkgs/trunk/; revision=20236
2010-02-24 19:06:25 +00:00
Michael Raskin
7ec7268649 Added Clozure CL
svn path=/nixpkgs/trunk/; revision=20211
2010-02-24 09:04:29 +00:00
Michael Raskin
f90ab6394b Make Vim expression overridable
svn path=/nixpkgs/trunk/; revision=20201
2010-02-23 18:29:11 +00:00
Eelco Dolstra
a4d524eb8b * Use ATerm 2.5 for Nix.
svn path=/nixpkgs/trunk/; revision=20197
2010-02-23 16:14:21 +00:00
Lluís Batlle i Rossell
a13774ecfe Making opencascade build its visualization, DRAW, and WOK libraries/tools.
svn path=/nixpkgs/trunk/; revision=20193
2010-02-23 14:20:10 +00:00
Lluís Batlle i Rossell
5ec8e9cc7e Removing mentions in all-packages to already removed expressions (old cross build)
svn path=/nixpkgs/trunk/; revision=20183
2010-02-22 23:43:29 +00:00
Michael Raskin
4b22e9d61d Adding cfdg - context-free design grammar
svn path=/nixpkgs/trunk/; revision=20166
2010-02-22 10:46:49 +00:00
Lluís Batlle i Rossell
454fb58a39 Updating psi, so it builds with gcc 4.4
svn path=/nixpkgs/trunk/; revision=20165
2010-02-22 09:53:17 +00:00
Ludovic Courtès
913503155a GNU Sharutils: Pass `gettext'; run the test suite.
svn path=/nixpkgs/trunk/; revision=20164
2010-02-22 09:52:39 +00:00
Ludovic Courtès
7abc6a6b7d GNU Sharutils 4.8.
svn path=/nixpkgs/trunk/; revision=20163
2010-02-22 09:07:15 +00:00
Michael Raskin
5c8272b0bc Adding asymptote graphic generation tool
svn path=/nixpkgs/trunk/; revision=20158
2010-02-21 17:36:41 +00:00
Alexander Tsamutali
8c82537f9a applications/misc/sakura: New nixpkg.
svn path=/nixpkgs/trunk/; revision=20152
2010-02-21 11:36:49 +00:00
Ludovic Courtès
97c9ff361f GNU Guile 1.9.8.
svn path=/nixpkgs/trunk/; revision=20140
2010-02-20 16:19:36 +00:00
Michael Raskin
7db8225aed Update Data Matrix library and ifx its build
svn path=/nixpkgs/trunk/; revision=20139
2010-02-20 11:56:23 +00:00
Eelco Dolstra
06f07381c4 * Fix some evaluation errors.
* Removed glibc 2.10.

svn path=/nixpkgs/trunk/; revision=20130
2010-02-19 15:40:37 +00:00
Lluís Batlle i Rossell
912bbd7aa1 Removing the qt as an opencascade dependency. It is not used at all there.
svn path=/nixpkgs/trunk/; revision=20128
2010-02-19 14:25:23 +00:00
Lluís Batlle i Rossell
7506ae348d Updating qemu
svn path=/nixpkgs/trunk/; revision=20115
2010-02-18 18:42:11 +00:00
Lluís Batlle i Rossell
cdf6235ac9 Making opencascade link properly its shared objects with their dependencies. Its libtool script
used 'file' to find the shared object needed on linking.

svn path=/nixpkgs/trunk/; revision=20112
2010-02-18 16:24:45 +00:00
Michael Raskin
89d1b7881f Update SGT puzzles and improve builderDefs processing of propagated(Native)BuildInputs after stdenv merge
svn path=/nixpkgs/trunk/; revision=20093
2010-02-18 10:29:40 +00:00
Marc Weber
f57a5d2273 libXi: build man pages
svn path=/nixpkgs/trunk/; revision=20089
2010-02-18 01:49:53 +00:00
Lluís Batlle i Rossell
7b4529cfc7 Allowing multiplatform uboot (sheevaplug/integratorcp).
svn path=/nixpkgs/trunk/; revision=20079
2010-02-17 21:09:27 +00:00
Lluís Batlle i Rossell
aca3e65338 Adding the mainline uboot.
svn path=/nixpkgs/trunk/; revision=20078
2010-02-17 20:53:01 +00:00
Michael Raskin
6a51d0465d Try updating SBCL
svn path=/nixpkgs/trunk/; revision=20066
2010-02-17 06:50:45 +00:00
Ludovic Courtès
859d2702b9 GNU MyServer 0.9.2.
svn path=/nixpkgs/trunk/; revision=20042
2010-02-16 10:48:06 +00:00
Eelco Dolstra
822d59d4f9 * Remove phpIniBuilder (obsolete).
svn path=/nixpkgs/trunk/; revision=20028
2010-02-15 20:29:50 +00:00
Lluís Batlle i Rossell
7390c0e31f Making pulseaudio optional on libao.
svn path=/nixpkgs/trunk/; revision=20018
2010-02-15 17:10:35 +00:00
Lluís Batlle i Rossell
6c622c014d octave wants x11 (I reported this to octave as a bug).
Maybe it got in from their recent fltk/gl attempts to make their own plotter.

svn path=/nixpkgs/trunk/; revision=20017
2010-02-15 17:10:25 +00:00
Eelco Dolstra
e9ad76a2ff * Upstart updated to 0.6.5.
* Added libnih (a dependency of Upstart).
* Removed the old Upstart 0.3.x.

svn path=/nixpkgs/trunk/; revision=20015
2010-02-15 15:55:39 +00:00
Eelco Dolstra
65aecdd00b * Zabbix updated to 1.8.1.
svn path=/nixpkgs/trunk/; revision=20009
2010-02-15 14:20:28 +00:00
Marco Maggesi
513d653d68 Add HOL Light and its dependencies.
Add pkgs/applications/science/logic/hol_light
and pkgs/applications/science/emacs-modes/hol_light

Some functionalities of HOL Light requires the compiled sources of
OCaml.  For now we provide a new package ocaml_with_sources.  After
this shuold be merged with the current version of OCaml already
present in nixpkgs.


svn path=/nixpkgs/trunk/; revision=20008
2010-02-15 11:00:02 +00:00
Sander van der Burg
019db7b9dc - Added libssh (used by kdebase-runtime)
- Completed kdebase-runtime 4.4.0


svn path=/nixpkgs/trunk/; revision=19994
2010-02-14 21:56:35 +00:00
Eelco Dolstra
1d2c0eea75 svn path=/nixpkgs/trunk/; revision=19991 2010-02-14 16:21:42 +00:00
Ludovic Courtès
62665b519e Add GNU TeXmacs.
svn path=/nixpkgs/trunk/; revision=19985
2010-02-13 19:22:16 +00:00
Marco Maggesi
f1f60cef0d Add package dmtcp_devel
svn path=/nixpkgs/trunk/; revision=19972
2010-02-13 11:02:08 +00:00
Lluís Batlle i Rossell
683688f476 Updating skype. Finally!
I think that patchelf was breaking the binary, and I decided to use a wrapper
with a LD_LIBRARY_PATH.

svn path=/nixpkgs/trunk/; revision=19968
2010-02-12 23:19:37 +00:00
Lluís Batlle i Rossell
76c8738552 Adding the GAP gimp plugin, and making nix-env recurse into the gimp plugins attribute set.
svn path=/nixpkgs/trunk/; revision=19936
2010-02-11 15:08:05 +00:00
Eelco Dolstra
8fab70fde3 * redland: make the dependency on postgresql, mysql, sqlite and db4
optional.  It's really not necessary for KDE to depend on four
  different databases...

svn path=/nixpkgs/trunk/; revision=19932
2010-02-11 14:31:49 +00:00
Sander van der Burg
740a6fe281 - Some updates to KDE 4.4. kdelibs is still broken though
- Updated eduke32 to use the new polymer renderer which is so cool :-)


svn path=/nixpkgs/trunk/; revision=19930
2010-02-11 13:34:28 +00:00
Michael Raskin
d257f66c62 TeXLive needs fontconfig
svn path=/nixpkgs/trunk/; revision=19916
2010-02-10 20:43:59 +00:00
Eelco Dolstra
81fabfeb04 * gnupg updated to 1.4.10. Also, build with bzip2 support. Duplicity
can use this to better compress backups.

svn path=/nixpkgs/trunk/; revision=19915
2010-02-10 19:03:48 +00:00
Eelco Dolstra
dae4ffdfdf * Added `boto', a Python interface to AWS.
* Add boto as a dependency to duplicity to support backups to Amazon
  S3.

svn path=/nixpkgs/trunk/; revision=19913
2010-02-10 18:10:22 +00:00
Eelco Dolstra
faa98ce5d6 * Duplicity needs gpg.
svn path=/nixpkgs/trunk/; revision=19912
2010-02-10 16:51:01 +00:00
Sander van der Burg
e7739553e6 Added PyQt 4.7 expression required by KDE 4.4.x
svn path=/nixpkgs/trunk/; revision=19911
2010-02-10 16:09:12 +00:00
Sander van der Burg
31cbd149d2 - Completed all dependencies for kdelibs-4.4.0
- Added SIP 4.10 required for pyqt-4.7.x
- Removed kde libs experimental, which does not exists anymore in 4.4.0


svn path=/nixpkgs/trunk/; revision=19910
2010-02-10 16:01:55 +00:00
Sander van der Burg
bcb6e407ea Added my initial KDE 4.4 expression
svn path=/nixpkgs/trunk/; revision=19906
2010-02-10 15:06:50 +00:00
Ludovic Courtès
da1f088b3f TDB, the trivial database.
svn path=/nixpkgs/trunk/; revision=19895
2010-02-10 11:28:18 +00:00
Michael Raskin
038ca191a6 Pass Python to TeXLive
svn path=/nixpkgs/trunk/; revision=19893
2010-02-10 05:24:21 +00:00
Alexander Tsamutali
1d6086a742 games/warsow: Needs libjpeg62.
svn path=/nixpkgs/trunk/; revision=19891
2010-02-09 23:12:47 +00:00
Rob Vermaas
a5cecee12e added libmilter, opendkim
svn path=/nixpkgs/trunk/; revision=19875
2010-02-09 10:32:55 +00:00
Rob Vermaas
10acccb622 added tre-0.8.0
svn path=/nixpkgs/trunk/; revision=19873
2010-02-09 09:09:25 +00:00
Rob Vermaas
b3dfc53d15 added opendbx 1.4.4
svn path=/nixpkgs/trunk/; revision=19872
2010-02-09 09:05:14 +00:00
Lluís Batlle i Rossell
61417a05c7 Removing a dependency on stdenvCross: there was a .buildDrv mentioned when there was
no cross build planned.

svn path=/nixpkgs/trunk/; revision=19871
2010-02-09 07:43:36 +00:00
Rob Vermaas
3d841892a7 unbound 1.4.1
svn path=/nixpkgs/trunk/; revision=19870
2010-02-09 07:28:32 +00:00
Eelco Dolstra
97a6ecb879 * Incorrect filename: 4.3.2 -> 4.3.1
svn path=/nixpkgs/trunk/; revision=19869
2010-02-08 17:46:34 +00:00
Ludovic Courtès
b34165054d Ratpoison: Fix glibc 2.11 builds.
svn path=/nixpkgs/trunk/; revision=19867
2010-02-08 15:33:18 +00:00
Lluís Batlle i Rossell
ef43e6fc18 Making the cross-stdenv not to be used unless cross-compiling. This way,
no "hostDrv" or "buildDrv" attributes are added to derivations.

svn path=/nixpkgs/trunk/; revision=19866
2010-02-08 15:28:05 +00:00
Rob Vermaas
2bbb78ab94 use gmp 4.3.2 on i686-darwin
svn path=/nixpkgs/trunk/; revision=19864
2010-02-08 13:58:25 +00:00
Alexander Tsamutali
df30fb33c4 data/fonts/terminus-font: New nixpkg.
svn path=/nixpkgs/trunk/; revision=19855
2010-02-06 22:28:39 +00:00
Eelco Dolstra
bdfff8e769 * Comment out uclibc because it causes evaluation errors.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19850
2010-02-05 23:08:11 +00:00
Eelco Dolstra
d8c6bb130c * Sync with the trunk one last time.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19849
2010-02-05 23:06:36 +00:00
Eelco Dolstra
aee659e1e2 * Fix various broken URLs / mirrors.
* Updated tcpdump, ImageMagick, lsof.

svn path=/nixpkgs/trunk/; revision=19847
2010-02-05 22:00:51 +00:00
Eelco Dolstra
8c8631d974 * Don't set `platforms' on Google Earth because we don't want Hydra to
build it.

svn path=/nixpkgs/trunk/; revision=19839
2010-02-05 19:22:26 +00:00
Eelco Dolstra
874b4869a3 * Nix stable updated to 0.14.
svn path=/nixpkgs/trunk/; revision=19830
2010-02-05 10:41:24 +00:00
Lluís Batlle i Rossell
df0800e91d Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19825
2010-02-04 19:08:28 +00:00
Peter Simons
4193cac8de Added an interactive variant of sqlite3 that has readline support enabled.
svn path=/nixpkgs/trunk/; revision=19823
2010-02-04 16:07:15 +00:00
Marco Maggesi
3ab915e1fc Add new package pkgs/os-specific/linux/dmtcp/
svn path=/nixpkgs/trunk/; revision=19819
2010-02-04 15:41:45 +00:00
Lluís Batlle i Rossell
c83ce140e1 Adding 'duplicity', and its dependency 'librsync'
svn path=/nixpkgs/trunk/; revision=19813
2010-02-04 13:42:41 +00:00
Peter Simons
29efcf85c9 pkgs/top-level/all-packages.nix: don't try to link ipmitool statically on Darwin
svn path=/nixpkgs/trunk/; revision=19812
2010-02-04 10:31:55 +00:00
Eelco Dolstra
a709fd64e5 * Turn libxcrypt back on. Without it, it's impossible to login to
NixOS (because pam_unix2 then cannot handle the passwords in
  /etc/shadow).

svn path=/nixpkgs/branches/stdenv-updates/; revision=19810
2010-02-04 09:35:51 +00:00
Eelco Dolstra
82f0eb65e3 * Disable the HPN patch in OpenSSH. It breaks connection sharing.
E.g. in `nix-copy-closure --to ...', the master hangs in futex().

svn path=/nixpkgs/trunk/; revision=19803
2010-02-04 01:39:00 +00:00
Sander van der Burg
318dc53aa3 Fixed dbus-glib compilation on FreeBSD
svn path=/nixpkgs/branches/stdenv-updates/; revision=19793
2010-02-03 20:20:00 +00:00
Sander van der Burg
d26683f5a9 Fixed compilation for GLib on FreeBSD
svn path=/nixpkgs/branches/stdenv-updates/; revision=19790
2010-02-03 16:12:19 +00:00
Eelco Dolstra
a617a7c239 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
2010-02-03 14:23:43 +00:00
Ludovic Courtès
b5088abe20 Tahoe-LAFS 1.6.0.
svn path=/nixpkgs/trunk/; revision=19784
2010-02-03 13:38:03 +00:00