Commit Graph

6825 Commits

Author SHA1 Message Date
Eelco Dolstra
cb6942d923 * Merged the stdenv-updates branch. Enjoy :-)
svn path=/nixpkgs/trunk/; revision=15324
2009-04-26 18:00:49 +00:00
Eelco Dolstra
00d58458c8 svn path=/nixpkgs/branches/stdenv-updates/; revision=15323 2009-04-26 17:40:45 +00:00
Eelco Dolstra
8f3972b61c * More repair.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15322
2009-04-26 17:38:17 +00:00
Eelco Dolstra
39ab6f252a * Repairing some mergeinfo that got screwed up by the cherrypick in
r14605.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15321
2009-04-26 17:30:22 +00:00
Eelco Dolstra
914f2d6cf6 * Last sync.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15320
2009-04-26 17:21:58 +00:00
Michael Raskin
b3d965858b Update xmoto
svn path=/nixpkgs/trunk/; revision=15319
2009-04-26 17:00:10 +00:00
Marc Weber
3a9bfe866c adding small emacs session mode packages remembering inputs
svn path=/nixpkgs/trunk/; revision=15318
2009-04-26 11:06:54 +00:00
Marc Weber
4c72da6b82 adding pydb, a python debugging with gdb like commands
svn path=/nixpkgs/trunk/; revision=15317
2009-04-26 11:06:51 +00:00
Marc Weber
5d5995eb38 adding figlet
svn path=/nixpkgs/trunk/; revision=15316
2009-04-26 11:06:48 +00:00
Marc Weber
8d6fd9cb2b samba: Use /etc/samba as default configuration directory
svn path=/nixpkgs/trunk/; revision=15315
2009-04-26 11:06:41 +00:00
Eelco Dolstra
09fd56cc9e * Upstart in the stdenv branch is incompatible with Upstart in the
trunk: it segfaults when it tries to start the new Upstart, which
  locks up the entire system.  This may be because of the different
  Glibc, or something.  In any case, require a reboot.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15314
2009-04-25 22:48:48 +00:00
Eelco Dolstra
5a2284ac61 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15313
2009-04-25 22:45:32 +00:00
Eelco Dolstra
f7454eae9c * Be able to cope with future changes to Upstart.
svn path=/nixpkgs/trunk/; revision=15311
2009-04-25 22:36:33 +00:00
Eelco Dolstra
ecd43e2bfe * Updated the script that copies tarballs used in Nixpkgs to
nixos.org/tarballs.  It no longer greps the source for fetchurl
  calls, because a lot of URLs are now computed
  (e.g. "http://foo/${name}.tar.bz2").  So instead we evaluate the Nix
  expression with "nix-instantiate --xml --strict" and look for URLs
  in the result.  Because I'm lazy the script no longer checks whether
  the hash of the download matches the hash in the expression.

svn path=/nixpkgs/trunk/; revision=15310
2009-04-25 18:34:11 +00:00
Lluís Batlle i Rossell
c2d651ef68 Removing static compilation of the driver for cromfs, so the package works again in x86_64
svn path=/nixpkgs/trunk/; revision=15309
2009-04-25 16:22:12 +00:00
Lluís Batlle i Rossell
1e8fff0915 Updating Wine.
svn path=/nixpkgs/trunk/; revision=15308
2009-04-25 16:22:08 +00:00
Lluís Batlle i Rossell
1f8e1f296d Updating freeimage and vxl.
svn path=/nixpkgs/trunk/; revision=15307
2009-04-25 16:21:56 +00:00
Andres Löh
1a6e7109d1 Don't build the Haskell Platform on Darwin.
svn path=/nixpkgs/trunk/; revision=15306
2009-04-25 15:39:25 +00:00
Andres Löh
922c14e372 Added MonadRandom Haskell package.
svn path=/nixpkgs/trunk/; revision=15305
2009-04-25 15:33:37 +00:00
Andres Löh
2a1fae29f8 Added some SDL-related Haskell libs.
svn path=/nixpkgs/trunk/; revision=15304
2009-04-25 15:33:29 +00:00
Sander van der Burg
d1a57e454e Fixed version number of qt
svn path=/nixpkgs/branches/stdenv-updates/; revision=15303
2009-04-25 15:07:46 +00:00
Sander van der Burg
5ad095f5ed Upgraded to qt-4.5.1
svn path=/nixpkgs/branches/stdenv-updates/; revision=15302
2009-04-25 14:54:14 +00:00
Andres Löh
66f3af0bdd ghc-wrapper now detects installed pkgs automatically.
svn path=/nixpkgs/trunk/; revision=15301
2009-04-25 14:23:00 +00:00
Eelco Dolstra
671d53dd35 * Allow the user to install stdenv (nix-env -i stdenv) and get all the
packages in the stdenv as propagated user environment packages.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15300
2009-04-25 14:08:29 +00:00
Michael Raskin
c26271927a Remove multiversion expression for tailor for easier use of custom versions
svn path=/nixpkgs/trunk/; revision=15296
2009-04-25 11:19:42 +00:00
Eelco Dolstra
e405332741 * Bumped the version number.
svn path=/nixpkgs/trunk/; revision=15294
2009-04-24 21:59:56 +00:00
Eelco Dolstra
72f7747c68 svn path=/nixpkgs/trunk/; revision=15290 2009-04-24 20:51:51 +00:00
Eelco Dolstra
96443f794e * Unfortunately, the Gentoo mirror of the attr library is no more
stable than the SGI source.  So we'll mirror it ourselves.  Thanks
  to Matthew Curry for reporting this.

svn path=/nixpkgs/trunk/; revision=15289
2009-04-24 20:27:54 +00:00
Ludovic Courtès
0b2be106e0 GNU Time: Improve meta-information.
svn path=/nixpkgs/trunk/; revision=15288
2009-04-24 13:28:16 +00:00
Ludovic Courtès
72656e7d1c GNU Zile 2.3.7.
svn path=/nixpkgs/trunk/; revision=15287
2009-04-24 12:48:37 +00:00
Peter Simons
d1045dc8d0 qgit: update to version 2.2.
svn path=/nixpkgs/trunk/; revision=15286
2009-04-24 12:31:33 +00:00
Eelco Dolstra
20a0a02d15 * Fix GHC 6.8.3.
svn path=/nixpkgs/trunk/; revision=15285
2009-04-23 18:44:52 +00:00
Andres Löh
2bb2373cf9 Try to link readline Haskell package against ncursesw.
svn path=/nixpkgs/trunk/; revision=15284
2009-04-23 17:48:06 +00:00
Andres Löh
cea9c12283 Trying to update haxr, but not finished.
svn path=/nixpkgs/trunk/; revision=15283
2009-04-23 17:48:03 +00:00
Andres Löh
cd018e50d4 64bit support in Cabal builder
svn path=/nixpkgs/trunk/; revision=15282
2009-04-23 17:21:14 +00:00
Eelco Dolstra
5175cce9a9 * Oops. We don't call genericBuild, so the fixupPhase (which creates
the setup hook) is never run.  So revert.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15281
2009-04-23 16:23:12 +00:00
Eelco Dolstra
2c2f0d913c * Release notes.
svn path=/nixpkgs/trunk/; revision=15279
2009-04-23 15:02:09 +00:00
Eelco Dolstra
e82ac236ab svn path=/nixpkgs/trunk/; revision=15278 2009-04-23 15:01:53 +00:00
Eelco Dolstra
7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Eelco Dolstra
0f10222e4e * Merge libjpeg and libjpeg-static.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15275
2009-04-23 13:26:14 +00:00
Eelco Dolstra
6e32a4cea8 svn path=/nixpkgs/branches/stdenv-updates/; revision=15273 2009-04-23 12:46:14 +00:00
Eelco Dolstra
7a891eabe2 * Apparently the pythondir hack isn't needed with libxml2 2.7.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15272
2009-04-23 12:35:36 +00:00
Eelco Dolstra
a61894ea81 svn path=/nixpkgs/branches/stdenv-updates/; revision=15271 2009-04-23 12:34:56 +00:00
Eelco Dolstra
49f47f92e3 * Disable some Haskell packages on Darwin.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15270
2009-04-23 12:33:09 +00:00
Eelco Dolstra
f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Eelco Dolstra
c13587d6b3 * Bump the default kernel to 2.6.28.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15268
2009-04-23 11:17:17 +00:00
Eelco Dolstra
acd26a3353 * Fixed the gphoto2 build.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15267
2009-04-23 11:12:25 +00:00
Michael Raskin
4c02ccd107 Fix git-with-svn instantiation
svn path=/nixpkgs/trunk/; revision=15266
2009-04-23 10:56:23 +00:00
Michael Raskin
35bb7d6412 Python-not-2.4 support for libxml2
svn path=/nixpkgs/trunk/; revision=15265
2009-04-23 10:24:40 +00:00
Eelco Dolstra
e13bce06c4 * Latest irssi. This also fixes --disable-static breakage.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15264
2009-04-23 10:11:02 +00:00