Commit Graph

4539 Commits

Author SHA1 Message Date
Marco Maggesi
4e5db40581 Update HOL Light to version 20100820 (rev57 on google code).
Also replace the monolitic derivation hol_light_binaries with smaller
derivations.  Now the installation works as follows:

# Install the base system and a script "start_hol_light"
$ nix-env -i hol_light_sources hol_light

# Install a checkpointed executable with the core library preloaded
$ nix-env -i hol_light_core_dmtcp

# Install HOL Light binaries preloaded with other specific libraries:
$ nix-env -i hol_light_multivariate_dmtcp
$ nix-env -i hol_light_complex_dmtcp
$ nix-env -i hol_light_sosa_dmtcp
$ nix-env -i hol_light_card_dmtcp


svn path=/nixpkgs/trunk/; revision=23815
2010-09-15 21:41:18 +00:00
Marco Maggesi
44f2d4439f Change the name of the coq derivation to coq-devel-8.3pre1
i.e., remove the version from the name.  Nix has its own mechanism to
prevent a packages to be upgraded.  Instead we distinguish development
version (coq-dev-VERSION) from stable versions (coq-VERSION).

Also remove derivation for coq-8.3-beta0-1 which is now superseded by
coq-devel-8.3pre1.


svn path=/nixpkgs/trunk/; revision=23813
2010-09-15 19:39:48 +00:00
Yury G. Kudryashov
48c13f4096 Update cmake
Use system libraries, make curses optional, add optional qt4 gui etc.

svn path=/nixpkgs/trunk/; revision=23810
2010-09-15 18:37:21 +00:00
Marco Maggesi
8ab6f9861c Add coq-8.3rc1
Note: In this version we introduce a new schema for the name of the coq
derivations where the coq version is included in the name (i.e.,
"coq8.3-8.3pre1" instead of "coq-8.3pre1").  The reason for this is that often
coq releases introduce several incompatibilities.  Thus I argue that, in
general, users do not want nix-env to upgrade automatically form one release to
another.  Also version string "8.3pre1" is used instead of "8.3-rc1" to trigger
the nix mechanism for versions comparison.


svn path=/nixpkgs/trunk/; revision=23803
2010-09-14 21:15:58 +00:00
Yury G. Kudryashov
2ecfb5cd9d Add libtunepimp
svn path=/nixpkgs/trunk/; revision=23796
2010-09-14 14:29:37 +00:00
Yury G. Kudryashov
163e453e10 Add mp4v2
svn path=/nixpkgs/trunk/; revision=23795
2010-09-14 14:29:31 +00:00
Yury G. Kudryashov
5f4795b5f1 Add libofa
svn path=/nixpkgs/trunk/; revision=23794
2010-09-14 14:29:25 +00:00
Yury G. Kudryashov
09c85666cd Add libmusicbrainz 2.x and 3.x
svn path=/nixpkgs/trunk/; revision=23793
2010-09-14 14:29:19 +00:00
Yury G. Kudryashov
359b360fc2 Add libdiscid
svn path=/nixpkgs/trunk/; revision=23792
2010-09-14 14:29:13 +00:00
Eelco Dolstra
7f2af6acfd svn path=/nixpkgs/trunk/; revision=23784 2010-09-14 12:15:06 +00:00
Eelco Dolstra
9dbbae2c0c * bridge-utils updated to 1.4.
svn path=/nixpkgs/trunk/; revision=23778
2010-09-14 10:54:50 +00:00
Lluís Batlle i Rossell
daea455d15 Removing coreutils_real from release-cross.
It had to be 'coreutils' instead, but I don't think they cross-build. They
cross-build only in stdenv-updates I tihnk.

svn path=/nixpkgs/trunk/; revision=23774
2010-09-13 21:16:10 +00:00
Andres Löh
772abcfaaa bugfix
svn path=/nixpkgs/trunk/; revision=23763
2010-09-13 16:01:33 +00:00
Yury G. Kudryashov
38dec40ddc Upgrade ktorrent
svn path=/nixpkgs/trunk/; revision=23754
2010-09-13 14:23:02 +00:00
Andres Löh
c7f570b473 Addressing problem with conflicting versions of Haskell's time library.
svn path=/nixpkgs/trunk/; revision=23746
2010-09-13 12:07:14 +00:00
Andres Löh
ae49a474ff Added Hakyll and dependencies.
svn path=/nixpkgs/trunk/; revision=23742
2010-09-13 10:30:54 +00:00
Eelco Dolstra
13f346058c * Add a branch of the Linux kernel that can be used in Xen's Dom0.
From http://git.kernel.org/?p=linux/kernel/git/jeremy/xen.git;a=shortlog;h=refs/heads/xen/stable-2.6.32.x

svn path=/nixpkgs/trunk/; revision=23729
2010-09-10 16:27:39 +00:00
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
Lluís Batlle i Rossell
6fb726d36f Making automake 1.11.x not check in Arm, because one test fails.
I still have not reported that upstream.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23702
2010-09-09 17:07:57 +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
Lluís Batlle i Rossell
0a1dcea515 Changing the way 'platform' gets into all-packages, allowing setting it in nixpkgs config.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23635
2010-09-03 21:34:49 +00:00
Lluís Batlle i Rossell
23b5b032de Trying to fix the uclibc cross biulds for linux 2.4
svn path=/nixpkgs/branches/stdenv-updates/; revision=23632
2010-09-03 19:25:05 +00:00
Yury G. Kudryashov
aa7164d7de Add grantlee
svn path=/nixpkgs/trunk/; revision=23625
2010-09-03 17:40:55 +00:00
Lluís Batlle i Rossell
2971149bf4 Trying to get the uclbc sheevaplug cross build working.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23620
2010-09-03 14:59:04 +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
Lluís Batlle i Rossell
52f4540026 Trying to fix the mipsel linux-2.4 cross builds with uclibc (it lacked proper uclibc config)
svn path=/nixpkgs/branches/stdenv-updates/; revision=23606
2010-09-02 21:34:37 +00:00
Lluís Batlle i Rossell
b9e1bd9cd8 Who wants tightvnc? I'll set tigervnc into release-cross.nix instead of tightvnc.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23605
2010-09-02 20:40:33 +00:00
Lluís Batlle i Rossell
488d9103a7 Updating icewm (so yes, gtk included gdk_pixbuf. Thank you niksnut!)
svn path=/nixpkgs/branches/stdenv-updates/; revision=23603
2010-09-02 19:30:20 +00:00
Lluís Batlle i Rossell
14a20b7179 Fixing the evaluation of cross built uclibc in the case of lacking extraConfig
svn path=/nixpkgs/branches/stdenv-updates/; revision=23602
2010-09-02 19:18:04 +00:00
Lluís Batlle i Rossell
6013c0cf8b Adding more platforms to crossbuild to (nanonote and the fuloong minipc)
svn path=/nixpkgs/branches/stdenv-updates/; revision=23601
2010-09-02 18:41:48 +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
Rob Vermaas
a7791cfd1b disabled klib in stdenv branch because it seems to hang in buildfarm and produces logs > 1.5GB
svn path=/nixpkgs/branches/stdenv-updates/; revision=23596
2010-09-02 07:56:11 +00:00
Lluís Batlle i Rossell
8a59e608aa Setting the new binutils snapshot niksnut copied to nixos.org, for the time while they don't
release.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23587
2010-09-01 09:49:53 +00:00
Lluís Batlle i Rossell
a88f348d5b Make mplayer build on the loongson2f
svn path=/nixpkgs/branches/stdenv-updates/; revision=23578
2010-09-01 08:36:09 +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
Lluís Batlle i Rossell
cca1cae042 Updating from trunk. I had to do some changes to make it fit.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23500
2010-08-29 11:09:23 +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
daa0f13358 Fixing the kernel for the fuloong (I should never had deactivated IDE, otherwise it cannot
find the hd controller)

svn path=/nixpkgs/branches/stdenv-updates/; revision=23497
2010-08-29 10:01:46 +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
Lluís Batlle i Rossell
dc19818cc7 Propagating the 'platform' stdenv attribute properly on stdenvLinux,
so it can be used in places like the linuxHeaders expression.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23343
2010-08-21 21:08:57 +00:00
Lluís Batlle i Rossell
13a647ab4c Disabling the legacy IDE in the fuloong2f kernel (that may give sda devices instead of hga?)
svn path=/nixpkgs/branches/stdenv-updates/; revision=23338
2010-08-21 20:03:00 +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
Lluís Batlle i Rossell
e0b377fd81 Adding mpg123 (it even cross-builds fine for the nanonote)
svn path=/nixpkgs/branches/stdenv-updates/; revision=23313
2010-08-21 16:54:02 +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
Ludovic Courtès
92e4866910 Fix path to glibc.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23290
2010-08-20 21:23:05 +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
Ludovic Courtès
87a62c6369 glibc 2.12.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23282
2010-08-20 15:26:50 +00:00
Lluís Batlle i Rossell
f16353b6f2 Updated from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
2010-08-20 13:41:12 +00:00
Lluís Batlle i Rossell
f8f53855d5 Setting a snapshot of unreleased binutils for the fuloong2f
svn path=/nixpkgs/branches/stdenv-updates/; revision=23273
2010-08-20 13:29:57 +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
Peter Simons
63ce55d859 pkgs/top-level/all-packages.nix: lower priority of python27Base to ensure the full version is installed by default
svn path=/nixpkgs/trunk/; revision=23146
2010-08-12 12:53:51 +00:00
Peter Simons
8c1717677e pkgs/top-level/all-packages.nix: dropped TODO note from Python 2.7
The expression used to say "FIXME: We lack ncurses support", but it
looks to me like ncurses *is* supported.

svn path=/nixpkgs/trunk/; revision=23144
2010-08-12 12:53:36 +00:00
Peter Simons
70a603c4bb pkgs/top-level/all-packages.nix: dropped getConfig support for Python 2.7
Python 2.7 can no longer be configured using the obsolete "getConfig"
mechanism. Instead, use "override" to fine-tune the installation.

svn path=/nixpkgs/trunk/; revision=23143
2010-08-12 12:53:26 +00:00
Eelco Dolstra
19158d7dec * CURL: build without scp support on Cygwin because libssh2 doesn't
build.

svn path=/nixpkgs/trunk/; revision=23142
2010-08-12 11:54:55 +00:00
Peter Simons
ff1c057f7a pkgs/top-level/all-packages.nix: removed lowPri modifier from python27Full
The "full" version is preferrable over the "base" version in user
profiles.

svn path=/nixpkgs/trunk/; revision=23141
2010-08-12 11:23:54 +00:00
Peter Simons
a1039a2744 pkgs/top-level/all-packages.nix: stripped trailing whitespace
svn path=/nixpkgs/trunk/; revision=23140
2010-08-12 11:22:06 +00:00
Lluís Batlle i Rossell
3a3867869a Adding tetgen
svn path=/nixpkgs/trunk/; revision=23138
2010-08-12 10:59:05 +00:00
Lluís Batlle i Rossell
b368b4b199 Making more packages build on the Fuloong2f.
I still can't build the kernel because it requires binutils yet to be released.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23132
2010-08-11 20:16:09 +00:00
Lluís Batlle i Rossell
51f6aec764 Fixing the gcc-cross-wrapper; it failed after some changes related to breaking
dependencies with it. (I should never link ld.so with a NIX_LDFLAGS -rpath
forced)

I made vim, scummvm cross-build. I added prboom (that cross-builds).
Mplayer and elinks don't cross-build fine still, but are on the way.
The mplayer fails to build in a weird way; nix does not show either a gcc
error message or even the 'make' error message.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23131
2010-08-11 20:14:25 +00:00
Eelco Dolstra
e897a308a6 * Added MESS, the Multi Emulator Super System.
svn path=/nixpkgs/trunk/; revision=23126
2010-08-11 19:47:05 +00:00
Michael Raskin
670135ecb6 flup and ViewMTN seem to work just as well with default Python
svn path=/nixpkgs/trunk/; revision=23119
2010-08-11 16:28:53 +00:00
Peter Simons
ee70d8481d pkgs/top-level/all-packages.nix: strip trailing whitenspace
svn path=/nixpkgs/trunk/; revision=23118
2010-08-11 15:49:42 +00:00
Peter Simons
2b37d181a5 Added Python version 2.7.
svn path=/nixpkgs/trunk/; revision=23117
2010-08-11 15:49:03 +00:00
Eelco Dolstra
21587bf10b * Use callPackage_i686 for i686-only packages.
svn path=/nixpkgs/trunk/; revision=23113
2010-08-11 13:25:30 +00:00
Rob Vermaas
a60809353a updated nss and nspr, added variant of nss including tools
svn path=/nixpkgs/trunk/; revision=23105
2010-08-11 09:38:09 +00:00
Lluís Batlle i Rossell
f9692a7f40 Update from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=23097
2010-08-10 17:20:15 +00:00
Eelco Dolstra
f6baaeace8 * Add Xfce to the channel.
svn path=/nixpkgs/trunk/; revision=23081
2010-08-10 00:09:29 +00:00
Lluís Batlle i Rossell
a6aae3bc6d Adding the matchbox window manager
svn path=/nixpkgs/trunk/; revision=23076
2010-08-09 22:40:51 +00:00
Lluís Batlle i Rossell
9cba74c95a Adding 'yacas', a CAS implemented in C++.
svn path=/nixpkgs/trunk/; revision=23074
2010-08-09 21:58:21 +00:00
Lluís Batlle i Rossell
ff5d0fa448 Merging from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=23072
2010-08-09 21:21:30 +00:00
Lluís Batlle i Rossell
ac387916b8 Adding the calendar program 'pal'
svn path=/nixpkgs/trunk/; revision=23070
2010-08-09 21:13:36 +00:00
Lluís Batlle i Rossell
1b59ae0b83 Adding 'mupdf', a lightweight PDF 1.7 viewer
As a side effect, I add openjpeg and jbig2dec.

svn path=/nixpkgs/trunk/; revision=23069
2010-08-09 20:59:38 +00:00
Rob Vermaas
2670c1c67b update some perl packages
svn path=/nixpkgs/trunk/; revision=23066
2010-08-09 19:29:06 +00:00
Rob Vermaas
79fcd0a04c updated net::twitter, scope::upper, added uri::googlechart
svn path=/nixpkgs/trunk/; revision=23065
2010-08-09 18:45:44 +00:00
Eelco Dolstra
4ae72f5ab2 * Added pkgs/data/misc/hicolor-icon-theme, required by Xfce.
svn path=/nixpkgs/trunk/; revision=23060
2010-08-09 18:00:08 +00:00
David Guibert
3b6101cd7f msn-pecan: an alternative MSN plugin for pidgin
svn path=/nixpkgs/trunk/; revision=23050
2010-08-09 06:51:34 +00:00
Eelco Dolstra
1089153c7f * Add some more Xfce packages.
svn path=/nixpkgs/trunk/; revision=23047
2010-08-08 22:43:00 +00:00
Lluís Batlle i Rossell
d75e47a383 Fix the cross-building of packages mentioned in stdenvLinux.overrides.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23043
2010-08-08 18:52:21 +00:00
Lluís Batlle i Rossell
eddc9d6ab5 Fixing the nanonote kernel expressions so they work.
In fact only 2.6.34 boots fine, while 2.6.35 needs a fetchsvn new revision,
waiting for an upstream patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23039
2010-08-08 18:46:57 +00:00
Lluís Batlle i Rossell
089ee5da11 Fix the cross-building of packages mentioned in stdenvLinux.overrides.
svn path=/nixpkgs/trunk/; revision=23038
2010-08-08 17:26:30 +00:00
Michael Raskin
87cbef96ca Add Veracity distributed VCS (+ issue tracker)
svn path=/nixpkgs/trunk/; revision=23031
2010-08-07 22:44:25 +00:00
Michael Raskin
5792074ddc Add an RC (1.8.0-rc1) of SpiderMonkey by cloning the release expression
svn path=/nixpkgs/trunk/; revision=23030
2010-08-07 21:44:13 +00:00
Lluís Batlle i Rossell
f2de89336b Removing the 'useFromStdenv' still left on the gcc45 attribute (not properly
updated from trunk)


svn path=/nixpkgs/branches/stdenv-updates/; revision=23029
2010-08-07 21:31:16 +00:00
Lluís Batlle i Rossell
46082f25f9 Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=23027
2010-08-07 20:14:04 +00:00
Eelco Dolstra
49dd595e2d * Add some missing X.org packages to the channel.
svn path=/nixpkgs/trunk/; revision=23025
2010-08-07 18:21:16 +00:00
Eelco Dolstra
d7842faf49 * Added UNetbootin, a program for creating bootable USB sticks from
ISO images.

svn path=/nixpkgs/trunk/; revision=23018
2010-08-06 22:33:14 +00:00
Eelco Dolstra
2148d43a6d * Added mtools.
svn path=/nixpkgs/trunk/; revision=23014
2010-08-06 21:36:54 +00:00
Yury G. Kudryashov
2d9d69cb63 Add lcms2
svn path=/nixpkgs/trunk/; revision=23012
2010-08-06 20:23:56 +00:00
Yury G. Kudryashov
c766124771 Add kdePackage function
svn path=/nixpkgs/trunk/; revision=23008
2010-08-06 20:20:19 +00:00
Peter Simons
6dad13cb74 pkgs/top-level/all-packages.nix: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=23000
2010-08-06 12:47:20 +00:00
Peter Simons
3e095243bd pkgs/top-level/all-packages.nix: don't enable ACL support in rsync when building on Solaris
svn path=/nixpkgs/trunk/; revision=22999
2010-08-06 12:46:18 +00:00
Peter Simons
f4f3078309 pkgs/top-level/all-packages.nix: curl cannot support scp on Solaris because libssh2 doesn't compile
svn path=/nixpkgs/trunk/; revision=22998
2010-08-06 12:45:58 +00:00
Eelco Dolstra
a1e834e85a * Get rid of the ugly `useFromStdenv' hack in all-packages.nix.
Instead, use the generic package override mechanism to use packages
  from earlier bootstrap phases.
* Don't rely on the existence of attributes such as
  `stdenv.coreutils'.

svn path=/nixpkgs/trunk/; revision=22991
2010-08-06 10:34:34 +00:00
Rob Vermaas
d8ba69a16e added older version of sqlite for use in DBD-SQLite perl package, which fails with newest one
svn path=/nixpkgs/trunk/; revision=22989
2010-08-06 08:54:27 +00:00
David Guibert
f3403647d4 pam_ccreds: to locally authenticate using an enterprise identity when the network is unavailable.
svn path=/nixpkgs/trunk/; revision=22987
2010-08-06 08:50:58 +00:00
David Guibert
663cff60a4 pam_krb5: added version 2.3.11-1.
svn path=/nixpkgs/trunk/; revision=22984
2010-08-06 08:49:05 +00:00
Yury G. Kudryashov
80108f291b Add optional scp support to curl
svn path=/nixpkgs/trunk/; revision=22976
2010-08-05 21:06:45 +00:00
Yury G. Kudryashov
217209747b Add libssh2
svn path=/nixpkgs/trunk/; revision=22975
2010-08-05 20:24:32 +00:00
Lluís Batlle i Rossell
8783e812b5 More changes beyond stdenv-linux for the fuloong2f platform
svn path=/nixpkgs/branches/stdenv-updates/; revision=22973
2010-08-05 18:51:12 +00:00
Lluís Batlle i Rossell
c82f2f533d Avoiding to make a profiled bootstrap of gcc on armv5tel-linux, because it fails there.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22970
2010-08-05 18:40:58 +00:00
Eelco Dolstra
5f8b8ae1d1 * Added weechat and updated xfce-terminal and vte. (From Graeme
Caldwell <graemercaldwell@gmail.com>.)

svn path=/nixpkgs/trunk/; revision=22965
2010-08-05 15:47:15 +00:00
Eelco Dolstra
32b5de83c4 svn path=/nixpkgs/trunk/; revision=22959 2010-08-05 10:42:05 +00:00
Eelco Dolstra
b29496c4be * Adobe Reader: updated to 9.3.3. Make it installable on
x86_64-linux.

svn path=/nixpkgs/trunk/; revision=22956
2010-08-05 08:54:58 +00:00
Peter Simons
ae68ed0907 pkgs/top-level/all-packages.nix: prefer sqliteInteractive in user environments, i.e. when running "nix-env -i sqlite"
svn path=/nixpkgs/trunk/; revision=22944
2010-08-04 11:42:10 +00:00
Lluís Batlle i Rossell
b17d1d7d07 Adding nanonote kernel and uboot
svn path=/nixpkgs/branches/stdenv-updates/; revision=22943
2010-08-04 11:07:13 +00:00
Yury G. Kudryashov
ce3aef6d7b Add phonon-backend-vlc
svn path=/nixpkgs/trunk/; revision=22939
2010-08-04 10:04:40 +00:00
Marco Maggesi
8dca34b5ed Upgrade dmtcp to version 1.1.8
svn path=/nixpkgs/trunk/; revision=22933
2010-08-03 17:39:12 +00:00
Yury G. Kudryashov
3c4d5457a8 Add recurseForRelease flag
I don't want kde-4.5 to be visible for nix-env, but I want hydra to build it

svn path=/nixpkgs/trunk/; revision=22930
2010-08-03 14:02:42 +00:00
Yury G. Kudryashov
75bc6a2f78 Inherit some metadata from kdelibs
svn path=/nixpkgs/trunk/; revision=22927
2010-08-03 13:11:58 +00:00
Michael Raskin
e8a33e0c82 Make configurable Vim build with most options
svn path=/nixpkgs/trunk/; revision=22924
2010-08-03 10:59:57 +00:00
Yury G. Kudryashov
e24d7319d4 Use callPackage in kde45
svn path=/nixpkgs/trunk/; revision=22921
2010-08-03 10:38:02 +00:00
Michael Raskin
6cd4db5496 Use the same qt4 for psi as for the used qca2
svn path=/nixpkgs/trunk/; revision=22918
2010-08-03 08:42:28 +00:00