Commit graph

4359 commits

Author SHA1 Message Date
Eelco Dolstra 3b4c29781b * Turn off obsolete kernels.
svn path=/nixpkgs/trunk/; revision=23722
2010-09-10 14:12:15 +00:00
Eelco Dolstra 9ff5c12798 * Remove the systemtap option from linux-2.6.32.nix and use
extraConfig instead.

svn path=/nixpkgs/trunk/; revision=23720
2010-09-10 14:06:56 +00:00
Eelco Dolstra cea083bec9 * Set the Python search path for Xen's Python scripts. As an
experiment, do this by patching a line setting sys.path into the
  script, rather than using makeWrapper.
* Xen requires pythonFull because it needs https/ssl support.

svn path=/nixpkgs/trunk/; revision=23710
2010-09-10 10:53:17 +00:00
Eelco Dolstra d4c7538648 * Add "gtk" to the top-level scope (just like "glib") and remove all
those "inherit (gtkLibs) gtk" lines.

svn path=/nixpkgs/trunk/; revision=23699
2010-09-09 16:48:13 +00:00
Eelco Dolstra c1867fe704 * Get Xen to build. It's not tested yet and doesn't include a Dom0
kernel.

svn path=/nixpkgs/trunk/; revision=23698
2010-09-09 16:45:18 +00:00
Marco Maggesi df21c86e08 Improve hol_light:
*   Upgrade hol_light to the latest svn version on google code (r57).

  *   Improve and semplify the mechanism for the generation of checkpointed binaries.

  *   Make hol to work with camlp5 and thus with recent version of ocaml (>=3.10, <=3.11).

  *   Remove ocaml_with_sources which is not needed anymore.

svn path=/nixpkgs/trunk/; revision=23685
2010-09-08 13:07:45 +00:00
Andres Löh 9534550af5 gitit should now work with ghc-6.12.3
svn path=/nixpkgs/trunk/; revision=23671
2010-09-07 13:11:21 +00:00
Andres Löh 923d30959f Added yst; updated happstack, pandoc, gitit and dependencies.
svn path=/nixpkgs/trunk/; revision=23670
2010-09-07 12:58:07 +00:00
Andres Löh b936683cc4 Small refactoring to prepare for future changes.
svn path=/nixpkgs/trunk/; revision=23669
2010-09-07 12:58:01 +00:00
Ludovic Courtès e4ef870382 Remove another reference to attribute `guileLib'.
svn path=/nixpkgs/trunk/; revision=23660
2010-09-06 15:36:41 +00:00
Ludovic Courtès 420adcd354 Remove another reference to attribute `guileLib'.
svn path=/nixpkgs/trunk/; revision=23659
2010-09-06 08:45:24 +00:00
Ludovic Courtès 78adb9fbf1 org-mode: Pass the full path to which'; use callPackage'.
svn path=/nixpkgs/trunk/; revision=23657
2010-09-06 07:58:13 +00:00
Eelco Dolstra b724075063 * Audacious 2.4.0.
svn path=/nixpkgs/trunk/; revision=23656
2010-09-06 07:29:18 +00:00
Lluís Batlle i Rossell 7e27052bd6 Applying the patch adding 'detox' from Tom Ridge and Karn Kallio.
svn path=/nixpkgs/trunk/; revision=23655
2010-09-06 07:21:08 +00:00
Michael Raskin 29db2ca0c9 Adding Ekiga
svn path=/nixpkgs/trunk/; revision=23653
2010-09-05 23:37:54 +00:00
Ludovic Courtès 895ba33eb4 Guile-Lib 0.1.9.
svn path=/nixpkgs/trunk/; revision=23650
2010-09-05 15:19:23 +00:00
Yury G. Kudryashov aa7164d7de Add grantlee
svn path=/nixpkgs/trunk/; revision=23625
2010-09-03 17:40:55 +00:00
Eelco Dolstra 3cfc942bdc * Added a function `applyGlobalOverrides' to return Nixpkgs with the
specified overrides applied.  This does the same as the
  `packageOverrides' attribute in ~/.nixpkgs/config.nix, but can be
  used within all-packages.nix to do a "deep" override for some
  specific package.  For instance, to build Thunderbird with an older
  version of Glib, you can say:

    thunderbird3 =
      let
        pkgs = applyGlobalOverrides (pkgsOrig:
          { gtkLibs220 = pkgsOrig.gtkLibs220 // 
              { glib = pkgsOrig.gtkLibs218.glib; };
          });
      in
        pkgs.callPackage .../thunderbird/3.x.nix {
          inherit (pkgs.gnome) libIDL;
        };

  Note that `pkgsFun' now has an argument `pkgs' to refer to its own
  result.

* Moved callPackage etc. into pkgsFun so that it uses the right
  overriden packages, if applicable.  `defaultScope' isn't in the
  result set because that causes nix-env to go into an apparently
  infinite recursion.

* Dropped the optional pkgsOrig argument to ~/.nixpkgs/config.nix,
  because it's probably not useful or used.

svn path=/nixpkgs/trunk/; revision=23613
2010-09-03 10:46:18 +00:00
Andres Löh c51b2a8beb Minor syntactic simplification.
svn path=/nixpkgs/trunk/; revision=23607
2010-09-03 07:16:57 +00:00
Andres Löh e208e8ae76 Added HaRe, the Haskell Refactorer.
svn path=/nixpkgs/trunk/; revision=23599
2010-09-02 10:02:26 +00:00
Andres Löh 6609f91e61 Fixing Haskell Platform attribute names in release.nix.
svn path=/nixpkgs/trunk/; revision=23569
2010-08-31 15:54:08 +00:00
Michael Raskin b7a15bae9f Adding libosip - GNU SIP library
svn path=/nixpkgs/trunk/; revision=23555
2010-08-31 09:58:09 +00:00
Andres Löh e94147754c Switching haskell-packages.nix to callPackage ...
svn path=/nixpkgs/trunk/; revision=23551
2010-08-30 17:10:21 +00:00
Rob Vermaas 1776b95afe added open-iscsi
svn path=/nixpkgs/trunk/; revision=23541
2010-08-30 09:40:44 +00:00
Rob Vermaas f6e0a38226 added iscsitarget
svn path=/nixpkgs/trunk/; revision=23540
2010-08-30 09:15:27 +00:00
Lluís Batlle i Rossell 65e7754f51 Allowing abcde to make mp3. I had to add id3v2, and fix the id3lib build.
svn path=/nixpkgs/trunk/; revision=23513
2010-08-29 15:53:42 +00:00
Lluís Batlle i Rossell 66004ecba7 Update fuse and make wdfs build with the latest neon. neon026 does not build with the current
SSL. We should either remove neon026 or fix it.

svn path=/nixpkgs/trunk/; revision=23505
2010-08-29 12:27:41 +00:00
Michael Raskin d5f6f72342 Enable AUFS2 patch
svn path=/nixpkgs/trunk/; revision=23499
2010-08-29 10:38:39 +00:00
Lluís Batlle i Rossell 2377a46c8f Adding the game Advanced Strategic Command.
I had to add an old version of libsigc++ for it.

svn path=/nixpkgs/trunk/; revision=23490
2010-08-29 09:43:46 +00:00
Lluís Batlle i Rossell 159474361c Adding the game UFO: Alien Invasion.
svn path=/nixpkgs/trunk/; revision=23488
2010-08-29 00:45:29 +00:00
Rob Vermaas fedbaa9d7a remove pdfssa4met again, because it was added by accident
svn path=/nixpkgs/trunk/; revision=23474
2010-08-27 06:53:36 +00:00
Rob Vermaas 092ab39b1b added rdflib, pdfssa4met python packages
svn path=/nixpkgs/trunk/; revision=23473
2010-08-27 06:32:49 +00:00
Lluís Batlle i Rossell 9884d381c0 Tell hydra to build the kernels 2.6.34 and 2.6.35
svn path=/nixpkgs/trunk/; revision=23472
2010-08-26 20:53:10 +00:00
Eelco Dolstra fee41ba2fb * Make sitecopy build against Neon 0.29.
svn path=/nixpkgs/trunk/; revision=23461
2010-08-26 13:09:52 +00:00
Peter Simons a2aef1ab80 pkgs/top-level/python-packages.nix: pexpect doesn't have regression tests
svn path=/nixpkgs/trunk/; revision=23459
2010-08-26 12:52:43 +00:00
Peter Simons 0bc62c5ad7 pkgs/top-level/all-packages.nix: wrap emacs23Packages in "recurseIntoAttrs" so that these packages are visible in nix-env
svn path=/nixpkgs/trunk/; revision=23456
2010-08-26 12:21:15 +00:00
Peter Simons 3b94efffe5 pkgs/development/interpreters/python/2.5: removed obsolete python version 2.5
Python 2.5 is unused in nixpkgs -- 2.6 has been the default version for
quite a while.

svn path=/nixpkgs/trunk/; revision=23454
2010-08-26 12:09:42 +00:00
Peter Simons eb37b385f9 pkgs/top-level/python-packages.nix: added pexpect version 2.3
svn path=/nixpkgs/trunk/; revision=23452
2010-08-26 12:03:17 +00:00
Peter Simons 340d4a6ddd pkgs/applications/science/logic/prover9: initial version
svn path=/nixpkgs/trunk/; revision=23446
2010-08-26 11:37:05 +00:00
Peter Simons d25c8b5882 pkgs/top-level/all-packages.nix: stripped trailing whitespace
svn path=/nixpkgs/trunk/; revision=23444
2010-08-26 09:45:10 +00:00
Peter Simons f79ba3cde3 pkgs/top-level/all-packages.nix: don't use getPkgConfig to configure Doxygen; use override instead
svn path=/nixpkgs/trunk/; revision=23443
2010-08-26 09:44:53 +00:00
Michael Raskin 05c7e81eaa Move E prover to applications/science/logic
svn path=/nixpkgs/trunk/; revision=23434
2010-08-25 22:38:11 +00:00
Peter Simons 970b3402e9 pkgs/applications/science/logic/hol: initial version
svn path=/nixpkgs/trunk/; revision=23430
2010-08-25 19:50:24 +00:00
Rob Vermaas 9fa88c5291 added libxpdf and pdf2xml
svn path=/nixpkgs/trunk/; revision=23427
2010-08-25 14:25:51 +00:00
Andres Löh 907b921c61 Applied (with edits) the patch provided by James Cook to add the
Haskell fingertree library. Thanks for the contribution.

svn path=/nixpkgs/trunk/; revision=23424
2010-08-25 13:08:32 +00:00
Ludovic Courtès 821c95173f libuuid: Add static cross-build for GNU/Hurd.
svn path=/nixpkgs/trunk/; revision=23419
2010-08-25 12:49:54 +00:00
Ludovic Courtès a806414146 libuuid: Make cross-buildable for GNU/Hurd (needed by GNU Parted).
svn path=/nixpkgs/trunk/; revision=23415
2010-08-25 08:57:10 +00:00
Lluís Batlle i Rossell 02e4b5ffa4 Adding another nvidia legacy driver. (they have one more, '71').
I use their major numbers to distinguish.
They seem to do so in http://www.nvidia.com/object/unix.html .

svn path=/nixpkgs/trunk/; revision=23411
2010-08-24 21:56:47 +00:00
Lluís Batlle i Rossell 4ecebb6465 Updating xmoto
svn path=/nixpkgs/trunk/; revision=23409
2010-08-24 19:59:06 +00:00
Lluís Batlle i Rossell 03ccbe3f78 Adding a more-or-less working 'egoboo'. I'll update to a better expression after some
egoboo upstream work.

svn path=/nixpkgs/trunk/; revision=23408
2010-08-24 19:36:42 +00:00
Michael Raskin 90603fd593 Update Midori
svn path=/nixpkgs/trunk/; revision=23397
2010-08-24 13:58:57 +00:00
Rob Vermaas 68a6fa773a added seperate meta-environment packages, use callpackage for aterm28
svn path=/nixpkgs/trunk/; revision=23394
2010-08-24 13:20:55 +00:00
Eelco Dolstra 8e73500282 * Gens/GS doesn't build on 64-bit systems.
svn path=/nixpkgs/trunk/; revision=23390
2010-08-24 09:57:57 +00:00
Peter Simons 14760d869b Add Nix expression for Emacs mode htmlize.
svn path=/nixpkgs/trunk/; revision=23382
2010-08-24 08:25:51 +00:00
Peter Simons ed19b4faf0 Add Nix expression for Ur/Web.
svn path=/nixpkgs/trunk/; revision=23381
2010-08-24 08:25:07 +00:00
Peter Simons f101a46d19 Add libmhash, a cryptographic hash library.
Add Nix expression to package libmhash, a library providing a collection
of cryptographic hash algorithms.

svn path=/nixpkgs/trunk/; revision=23379
2010-08-24 08:24:33 +00:00
Peter Simons f17a4cfbf9 Add package mlton, an optimizing compiler for Standard ML.
This commit packages mlton.  Note that the documentation has not
been built or included.

svn path=/nixpkgs/trunk/; revision=23378
2010-08-24 08:23:16 +00:00
Eelco Dolstra 261a3eec35 * Added Gens/GS, a Mega Drive emulator.
svn path=/nixpkgs/trunk/; revision=23377
2010-08-23 20:28:14 +00:00
Ludovic Courtès 8d6af9d471 GNU Gnash 0.8.8.
svn path=/nixpkgs/trunk/; revision=23365
2010-08-23 14:52:48 +00:00
Eelco Dolstra 554b5f804a * Added libcloud.
svn path=/nixpkgs/trunk/; revision=23355
2010-08-23 10:17:30 +00:00
Lluís Batlle i Rossell 53b8411c7a Adding torcs
svn path=/nixpkgs/trunk/; revision=23354
2010-08-22 14:18:58 +00:00
Lluís Batlle i Rossell 397a10aba2 Adding Kicad
svn path=/nixpkgs/trunk/; revision=23352
2010-08-22 12:09:47 +00:00
Lluís Batlle i Rossell 5c8b4043ee Adding espeak (and one of the libraries it needs, portaudio)
svn path=/nixpkgs/trunk/; revision=23351
2010-08-22 12:08:55 +00:00
Lluís Batlle i Rossell 63eaf8dd0f Adding NaviPOWM (I don't know how to use it though)
svn path=/nixpkgs/trunk/; revision=23348
2010-08-22 12:04:03 +00:00
Lluís Batlle i Rossell 86d5e94cda Adding 'navit' (it still does not build because it wants to download maps)
svn path=/nixpkgs/trunk/; revision=23346
2010-08-22 11:33:57 +00:00
Yury G. Kudryashov 3537d94672 Move yakuake to pkgs
svn path=/nixpkgs/trunk/; revision=23331
2010-08-21 19:30:15 +00:00
Yury G. Kudryashov 682e4ae09e Move konversation to pkgs
svn path=/nixpkgs/trunk/; revision=23330
2010-08-21 19:29:47 +00:00
Yury G. Kudryashov 608cde4f82 Explicit pkgs.prefix
svn path=/nixpkgs/trunk/; revision=23329
2010-08-21 19:27:31 +00:00
Yury G. Kudryashov 8d7045e1ff Disable fbcondecor patch - doesn't work with 2.6.35.2
svn path=/nixpkgs/trunk/; revision=23301
2010-08-21 09:56:01 +00:00
Michael Raskin 202cd08724 Looks like 2.6.35.2 commits a fix that breaks AUFS2
svn path=/nixpkgs/trunk/; revision=23295
2010-08-20 21:39:22 +00:00
Michael Raskin 2497cff295 Use AUFS2 patch for Linux 2_6_35
svn path=/nixpkgs/trunk/; revision=23289
2010-08-20 20:49:33 +00:00
Yury G. Kudryashov 3beeb6611a Use pkgs. in override, override qjson in kde-4.5
svn path=/nixpkgs/trunk/; revision=23287
2010-08-20 20:13:01 +00:00
Yury G. Kudryashov 10c5146a78 Add fbcondecor-2.6.35
svn path=/nixpkgs/trunk/; revision=23286
2010-08-20 20:12:03 +00:00
Yury G. Kudryashov 879baa7c58 MPlayer: various updates
1. Add pulseaudio and xsreensaver support
2. Use default arguments instead of custom args in all-packages.nix.
3. Remove ? null. callPackage passes all these args anyway.
4. Add binary codecs for non-i686 platforms. Have no video to test.
5. Use fetchsvn instead of gentoo-made snapshot.

svn path=/nixpkgs/trunk/; revision=23285
2010-08-20 20:09:22 +00:00
Eelco Dolstra 3be78e74fb * Added xmlstarlet.
svn path=/nixpkgs/trunk/; revision=23271
2010-08-20 10:07:35 +00:00
Eelco Dolstra 9d4feab5c5 * NixOS: use nixStable.
svn path=/nixpkgs/trunk/; revision=23267
2010-08-20 08:52:59 +00:00
Eelco Dolstra e8f1c8a08a * Check eval-release.nix.
svn path=/nixpkgs/trunk/; revision=23250
2010-08-19 14:33:44 +00:00
Eelco Dolstra 1ac9dcd24d * Fix eval-release.nix by testing whether all attributes of a
derivation evaluate inside the tryEval.  This catches cases such as
  aufs2-util, which fails due to an assertion in its dependency aufs2.
* Explicitly blacklist "xbursttools" because it gives some
  evaluation error in cross-OpenSSL.  No idea why, probably due to
  some pass-through attribute.

svn path=/nixpkgs/trunk/; revision=23247
2010-08-19 12:37:10 +00:00
Eelco Dolstra 435ba71ac0 * Fix a "undefined variable `pyrex'" error that only happens on Nix
0.15, not 0.16.

svn path=/nixpkgs/trunk/; revision=23244
2010-08-19 09:55:50 +00:00
Yury G. Kudryashov 2957f9cc11 Now packageOverrides = p: { kde4 = kde45; qt4 = qt47; } should work
svn path=/nixpkgs/trunk/; revision=23241
2010-08-18 23:04:21 +00:00
Yury G. Kudryashov 9c1a9c2c4b Make qt47 more override-friendly
svn path=/nixpkgs/trunk/; revision=23240
2010-08-18 22:53:42 +00:00
Ludovic Courtès 4a909f0838 libcanberra: Remove useless ‘gthread’ argument.
svn path=/nixpkgs/trunk/; revision=23226
2010-08-18 14:27:04 +00:00
Ludovic Courtès 904c8cfa0a Castle-Combat: Start fixing; rewrite using `buildPythonPackage'.
svn path=/nixpkgs/trunk/; revision=23225
2010-08-18 14:25:07 +00:00
Marco Maggesi 4b4ab6551c Improve os-specific/linux/blcr. Fix a problem with shared objects
svn path=/nixpkgs/trunk/; revision=23213
2010-08-17 16:53:34 +00:00
Eelco Dolstra f5f32a5b4b * Nix 0.16.
svn path=/nixpkgs/trunk/; revision=23208
2010-08-17 15:21:42 +00:00
Eelco Dolstra ed5011cc02 * Make sure that in an override like:
python = pkgs.python27Full;
    pythonBase = pkgs.python27Base;

  a build of (say) Firefox doesn't depend on python26 as well as
  python27.  This happens because python27Full has this line:

    inherit (xlibs) libX11 xproto;

  which causes python27Full to use libX11 from pkgsOrig, where the
  override hasn't been applied.  The solution is to change it to
  
    inherit (pkgs.xlibs) libX11 xproto;

  In the future, to prevent this, we should make all-packages.nix a
  non-rec set and require all package references to explicitly go
  through pkgs.<attr>.  (Then we can also drop the ugly __overrides
  language "feature".)

svn path=/nixpkgs/trunk/; revision=23203
2010-08-17 11:35:49 +00:00
Peter Simons f99f1bc055 pkgs/top-level/all-packages.nix: lower priority of the various python versions to give preference to pythonWrapper
svn path=/nixpkgs/trunk/; revision=23202
2010-08-17 10:19:48 +00:00
Peter Simons 9670fca780 Added "python-$version-wrapper" expression.
The python wrapper expression expects a list of Python modules, $extraLibs,
which are added to $PYTHONPATH before executing the actual Python interpreter.

svn path=/nixpkgs/trunk/; revision=23194
2010-08-16 17:03:35 +00:00
Peter Simons 42b5198e5b pkgs/top-level/all-packages.nix: disable doCheck for setuptools when run with Python 2.7
The regression test suite fails with the following error:

  ======================================================================
  FAIL: test_get_script_header_jython_workaround (setuptools.tests.test_resources.ScriptHeaderTests)
  ----------------------------------------------------------------------
  Traceback (most recent call last):
    File "/tmp/nix-build-0zz04maf217x7a6fq18ccmx5s1mrijlr-setuptools-0.6c11.drv-0/setuptools-0.6c11/setuptools/tests/test_resources.py", line 524, in test_get_script_header_jython_workaround
      self.assert_('Unable to adapt shebang line' in sys.stdout.getvalue())
  AssertionError: False is not True

I'm not sure yet what the problem is.

svn path=/nixpkgs/trunk/; revision=23193
2010-08-16 17:03:19 +00:00
Yury G. Kudryashov f9a218b691 Add ebook-tools-0.1.1
svn path=/nixpkgs/trunk/; revision=23189
2010-08-16 12:40:03 +00:00
Yury G. Kudryashov 0ee0fb9387 Add libktorrent
svn path=/nixpkgs/trunk/; revision=23186
2010-08-16 08:34:26 +00:00
Yury G. Kudryashov 4db5058475 Add libqalculate
svn path=/nixpkgs/trunk/; revision=23180
2010-08-15 13:55:02 +00:00
Yury G. Kudryashov db36f89eca Add cln
svn path=/nixpkgs/trunk/; revision=23179
2010-08-15 13:54:27 +00:00
Michael Raskin 69a9e0a9fa Fix stupid typo in linux_2_6_35_oldI686 definition
svn path=/nixpkgs/trunk/; revision=23174
2010-08-14 17:13:42 +00:00
Michael Raskin 3a2f493750 Add latest Linux kernel for real i686 platform, not modern amd64-in-32bit-mode
svn path=/nixpkgs/trunk/; revision=23173
2010-08-14 16:04:02 +00:00
Yury G. Kudryashov 83a87e9959 More meta.platforms
svn path=/nixpkgs/trunk/; revision=23168
2010-08-13 23:11:58 +00:00
Andres Löh 2bf5f684c9 GHC 6.12 compatibility of some Haskell libraries.
svn path=/nixpkgs/trunk/; revision=23160
2010-08-13 13:04:30 +00:00
Andres Löh ced0d6de0d emacsPackages should inherit emacs to add the correct version
to the inner scope

svn path=/nixpkgs/trunk/; revision=23159
2010-08-13 07:55:57 +00:00
David Guibert 92d437c54f kernel updates and add kernel 2.6.35.1
svn path=/nixpkgs/trunk/; revision=23155
2010-08-12 16:33:19 +00:00
Peter Simons 04ee1d78ad pkgs/top-level/all-packages.nix: obsoleted setuptools_python26 and setuptools_python27
Instead of having different setuptools expressions, buildPythonPackage
uses override to choose the desired python version. Now, technically,
buildPythonPackage shouldn't exist in multiple versions either. Maybe
the whole thing should be moved into python packages?

svn path=/nixpkgs/trunk/; revision=23151
2010-08-12 14:01:51 +00:00