Commit Graph

1256 Commits

Author SHA1 Message Date
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
f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Michael Raskin
4c02ccd107 Fix git-with-svn instantiation
svn path=/nixpkgs/trunk/; revision=15266
2009-04-23 10:56:23 +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
Eelco Dolstra
7ec61219db * lib/site_perl -> lib/perl5/site_perl.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15258
2009-04-22 23:04:18 +00:00
Lluís Batlle i Rossell
2021063052 Adding vwm, the console window manager.
svn path=/nixpkgs/trunk/; revision=15255
2009-04-22 21:33:24 +00:00
Eelco Dolstra
94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +00:00
Andres Löh
d2f9333dca Made it even worse -- hopefully fixed now, sorry.
svn path=/nixpkgs/trunk/; revision=15186
2009-04-20 14:30:01 +00:00
Lluís Batlle i Rossell
ff894ae773 Fixing the openoffice build, to run with a single job.
svn path=/nixpkgs/trunk/; revision=15182
2009-04-20 13:51:31 +00:00
Lluís Batlle i Rossell
fc3574b125 Updating openoffice to 3.0.1.
svn path=/nixpkgs/trunk/; revision=15181
2009-04-20 13:50:07 +00:00
Andres Löh
3fd1093d2d xmonad and xmobar updates
svn path=/nixpkgs/trunk/; revision=15180
2009-04-20 13:01:34 +00:00
Eelco Dolstra
c61c9dc35b * Drop the "perl" prefix from Perl attribute names. It's redundant
now that Perl packages are in their own namespace
  (perlPackages.<pkg>).

svn path=/nixpkgs/trunk/; revision=15176
2009-04-20 12:49:35 +00:00
Eelco Dolstra
ac24816344 * Move all the Perl packages out of all-packages.nix into a separate
file, perl-packages.nix.

svn path=/nixpkgs/trunk/; revision=15171
2009-04-20 12:08:09 +00:00
Sander van der Burg
205d181222 Fixed inkscape compilation on glibc 2.9
svn path=/nixpkgs/branches/stdenv-updates/; revision=15168
2009-04-20 11:18:53 +00:00
Eelco Dolstra
e72b00b2d7 * Leksah: forgot to commit. Also, use makeWrapper to set
XDG_DATA_DIRS to gtksourceview; otherwise, gtksourceview can't find
  its syntax highlighting files.
* Updated gtk2hs to the latest version from Darcs.  Otherwise Leksah
  crashes on GHC 6.10.2.

svn path=/nixpkgs/trunk/; revision=15162
2009-04-19 19:06:34 +00:00
Andres Löh
35ac416328 More Haskell platform packages.
svn path=/nixpkgs/trunk/; revision=15151
2009-04-19 13:21:40 +00:00
Eelco Dolstra
ffbb7c03d5 * Removed applications/msic, a rather obvious typo.
svn path=/nixpkgs/trunk/; revision=15149
2009-04-19 11:47:01 +00:00
Andres Löh
1643888f80 Added cabalized darcs-2 and associated Haskell libs.
svn path=/nixpkgs/trunk/; revision=15141
2009-04-19 10:07:41 +00:00
Eelco Dolstra
37f707fd92 * Removed Darcs 1.x.
* Updated Darcs to 2.2.1 and switched to the Cabal builder.  However,
  there are some dependencies missing that Andres will add :-)

svn path=/nixpkgs/trunk/; revision=15128
2009-04-18 15:42:59 +00:00
Eelco Dolstra
cee387e845 * Move the composition of Haskell packages out of all-packages.nix
into haskell-packages.nix, which depends on an instance of GHC.
  This allows a consistent set of packages to be built with the same
  GHC.  For instance,

  $ nix-build -A haskellPackages_ghc683.xmonad

  builds xmonad and all its dependencies with GHC 6.8.3, while

  $ nix-build -A haskellPackages_ghc6102.xmonad

  does the same with GHC 6.10.2.  This is the same technique used with
  kernelPackages.  It also means that we don't need things like
  "cabal682" and "cabal683" anymore.

* The setup hook is now in a separate wrapper package so that we don't
  have to recompile all of GHC every time we want to make a small
  change.

* cinelerra: this package appears to have an accidental dependency on
  the "X11" Haskell package.

svn path=/nixpkgs/trunk/; revision=15125
2009-04-18 12:47:11 +00:00
Eelco Dolstra
3e9cbbc1ba * Subversion 1.6.1.
svn path=/nixpkgs/trunk/; revision=15105
2009-04-16 21:59:55 +00:00
Lluís Batlle i Rossell
b211399689 Making nvi avoid /var/tmp.
svn path=/nixpkgs/trunk/; revision=15102
2009-04-16 20:09:07 +00:00
Lluís Batlle i Rossell
4cb42e9647 Adding nvi, another small vi clone.
svn path=/nixpkgs/trunk/; revision=15099
2009-04-16 19:28:57 +00:00
Lluís Batlle i Rossell
1ce494d81d Adding elvis, although I can't see the characters in an xterm with black background
svn path=/nixpkgs/trunk/; revision=15098
2009-04-16 19:28:42 +00:00
Eelco Dolstra
fb6ccb6355 * Include the kernel version number in the Virtualbox name attribute
to disambiguate between the various Virtualbox builds.

svn path=/nixpkgs/trunk/; revision=15087
2009-04-16 13:44:06 +00:00
Sander van der Burg
93b2ffcf38 Removed all earlier virtualbox attempts, since they are obsolete now
svn path=/nixpkgs/trunk/; revision=15069
2009-04-15 14:34:02 +00:00
Eelco Dolstra
adf97c3ad8 * gphoto2 updated to 2.4.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15067
2009-04-15 13:39:41 +00:00
Eelco Dolstra
a4c304ef84 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15065
2009-04-15 13:25:01 +00:00
Sander van der Burg
dd3608c0de Added patchelf instruction in order to compile virtualbox on x86-64
svn path=/nixpkgs/trunk/; revision=15063
2009-04-15 12:16:50 +00:00
Lluís Batlle i Rossell
6917fa229d Fixing the license of google earth according to ludo advices:
"There is no google license, we can use the general 'unfree' license metainfo"

svn path=/nixpkgs/trunk/; revision=15052
2009-04-15 09:09:48 +00:00
Lluís Batlle i Rossell
17e7e8be97 Marking google earth as i686-linux only.
svn path=/nixpkgs/trunk/; revision=15051
2009-04-15 09:09:45 +00:00
Lluís Batlle i Rossell
b8969ff4ae Making mplayer compile with mesa, so it gets 'gl' output.
svn path=/nixpkgs/trunk/; revision=15041
2009-04-14 21:01:16 +00:00
Eelco Dolstra
ec2802e690 * Thunderbird 2.0.0.21.
svn path=/nixpkgs/trunk/; revision=15037
2009-04-14 14:02:23 +00:00
Eelco Dolstra
ce358d750d * Urgh.
svn path=/nixpkgs/trunk/; revision=15033
2009-04-14 13:47:45 +00:00
Sander van der Burg
140a3d416f Added wrapper script and desktop item support to VirtualBox
svn path=/nixpkgs/trunk/; revision=15030
2009-04-14 13:29:19 +00:00
Marc Weber
7901f76355 adding ttf2pt1-3.4.4
svn path=/nixpkgs/trunk/; revision=15024
2009-04-14 12:27:42 +00:00
Eelco Dolstra
fd03290fc0 * Simplified the pthread_cancel fix a bit: you just need to use -lgcc_s.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15017
2009-04-13 17:07:20 +00:00
Lluís Batlle i Rossell
8e09a9bb3d Adding gtkpod, and fixing libgpod meta info.
svn path=/nixpkgs/trunk/; revision=15016
2009-04-13 15:41:10 +00:00
Lluís Batlle i Rossell
06a957ecf6 Adding google earth.
svn path=/nixpkgs/trunk/; revision=15014
2009-04-13 15:40:51 +00:00
Eelco Dolstra
5e9c1113ba * Firefox 3.0.8.
svn path=/nixpkgs/trunk/; revision=15013
2009-04-13 12:18:04 +00:00
Sander van der Burg
34a1bb38ab Added Nix expression for VirtualBox 2.2.0 which also installs and compiles the kernel module
svn path=/nixpkgs/trunk/; revision=15003
2009-04-12 21:59:40 +00:00
Michael Raskin
3d5d738895 Added Gajim XMPP client in nearly full-feature configuration with all dependencies
svn path=/nixpkgs/trunk/; revision=15001
2009-04-12 19:34:20 +00:00
Sander van der Burg
db2d658c41 Updated konversation to version 1.1
svn path=/nixpkgs/trunk/; revision=14999
2009-04-12 16:54:10 +00:00
Sander van der Burg
6c3c5448d6 Upgraded kile to 2.0.3
svn path=/nixpkgs/trunk/; revision=14997
2009-04-12 16:08:13 +00:00
Michael Raskin
e5831a409f Updated mrxvt
svn path=/nixpkgs/trunk/; revision=14993
2009-04-12 08:42:04 +00:00
Eelco Dolstra
977e608a38 * xine-ui: put $gcc/lib in the RPATH, because otherwise it will barf
(on exit) with "libgcc_s.so.1 must be installed for pthread_cancel
  to work".

svn path=/nixpkgs/branches/stdenv-updates/; revision=14980
2009-04-09 15:27:48 +00:00
Eelco Dolstra
eeed10ba8e * g77 -> gfortran throughout. Got rid of the separate
expressions/builders for Fortran.  Tested by building Octave with
  gfortran 4.3.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14978
2009-04-09 15:24:33 +00:00
Ludovic Courtès
a1540b57ae GNU Zile 2.3.6.
svn path=/nixpkgs/trunk/; revision=14971
2009-04-09 13:51:39 +00:00
Eelco Dolstra
2eb05cf933 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14965
2009-04-09 12:19:57 +00:00
Lluís Batlle i Rossell
813a3b6c6d Adding freepv, without its mozilla plug-in.
svn path=/nixpkgs/trunk/; revision=14954
2009-04-08 20:05:59 +00:00
Lluís Batlle i Rossell
2c3aaf09d1 Adding autopano-sift-C, a C implementation of autopano-sift, made by the hugin people.
svn path=/nixpkgs/trunk/; revision=14916
2009-04-07 19:15:53 +00:00
Lluís Batlle i Rossell
613cc80e1d Adding sha256 hash to panotools, and improving its description.
svn path=/nixpkgs/trunk/; revision=14900
2009-04-06 09:34:28 +00:00
Lluís Batlle i Rossell
dab0ce81ac Fixing the hugin build, and its meta information, with help of civodul.
svn path=/nixpkgs/trunk/; revision=14899
2009-04-06 09:19:51 +00:00
Ludovic Courtès
61a559cf97 Hugin: Fix `meta.license'.
svn path=/nixpkgs/trunk/; revision=14898
2009-04-06 08:26:13 +00:00
Ludovic Courtès
e5ed8fe009 GNU IceCat 3.0.8-g1.
svn path=/nixpkgs/trunk/; revision=14897
2009-04-06 08:19:41 +00:00
Lluís Batlle i Rossell
c36012783f Fixing licenses for the last packages I added.
svn path=/nixpkgs/trunk/; revision=14895
2009-04-05 21:41:47 +00:00
Lluís Batlle i Rossell
2dd00f1a57 Adding enblend-fuse, libxmi and hugin. Maybe hugin doesn't run well enough still.
svn path=/nixpkgs/trunk/; revision=14894
2009-04-05 21:41:38 +00:00
Lluís Batlle i Rossell
7f9d11782e Adding panotools.
svn path=/nixpkgs/trunk/; revision=14893
2009-04-05 21:41:24 +00:00
Lluís Batlle i Rossell
0b76035b66 Adding qtpfsgui and pfstools. Updating fftw because the src URL didn't work anymore.
svn path=/nixpkgs/trunk/; revision=14892
2009-04-05 21:41:13 +00:00
Ludovic Courtès
dc57ca58fe PAvucontrol: Add dependency on `intltool'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14873
2009-04-03 21:04:13 +00:00
Eelco Dolstra
f6e7c5b326 * vlc 0.9.9.
svn path=/nixpkgs/trunk/; revision=14872
2009-04-03 20:25:23 +00:00
Ludovic Courtès
676d58778d PAvucontrol: Disable Lynx.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14868
2009-04-03 16:58:07 +00:00
Ludovic Courtès
061fd96ad2 Add Pavucontrol (untested).
svn path=/nixpkgs/branches/stdenv-updates/; revision=14864
2009-04-03 15:58:18 +00:00
Lluís Batlle i Rossell
19ac94dee3 Adding cinepaint 0.22.1 and as a dependency, also fltk 1.1.9
svn path=/nixpkgs/trunk/; revision=14841
2009-04-02 15:20:19 +00:00
Michael Raskin
042e3eddd9 Updated Mercurial
svn path=/nixpkgs/trunk/; revision=14831
2009-04-02 12:18:53 +00:00
Eelco Dolstra
d27514cb28 * Sync with the trunk once more.
* Turn on everything in Hydra.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14806
2009-03-31 15:30:47 +00:00
Lluís Batlle i Rossell
0edebf5d84 Adding paraview.
svn path=/nixpkgs/trunk/; revision=14794
2009-03-30 20:06:31 +00:00
Marc Weber
807aae2fd6 updated eclipse binary to 3.5M6
thereby allowing the user to copy the whole store path to a user
location so that update sites work properly

svn path=/nixpkgs/trunk/; revision=14773
2009-03-30 10:32:53 +00:00
Lluís Batlle i Rossell
f031955f3c Updating audacity to 1.3.7 (I changed the builderDefs builder to stdenv's)
svn path=/nixpkgs/trunk/; revision=14770
2009-03-30 07:33:31 +00:00
Lluís Batlle i Rossell
c29118795a Adding gwenview.
svn path=/nixpkgs/trunk/; revision=14761
2009-03-29 20:32:53 +00:00
Lluís Batlle i Rossell
40b58959a5 Adding pdf2djvu, updating djvulibre, and getting more headers from poppler.
svn path=/nixpkgs/trunk/; revision=14760
2009-03-29 20:32:41 +00:00
Marc Weber
5c0764de01 adding qcad-2.0.5.0
svn path=/nixpkgs/trunk/; revision=14744
2009-03-28 02:25:03 +00:00
Ludovic Courtès
08a56109fa Evince: Add dependency on `which'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14724
2009-03-26 12:55:50 +00:00
Michael Raskin
6986ddc2cf Updated Monotone to 0.43
svn path=/nixpkgs/trunk/; revision=14704
2009-03-25 16:06:00 +00:00
Ludovic Courtès
3fee8acbaa Evince 2.26.0.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14699
2009-03-25 13:10:44 +00:00
Lluís Batlle i Rossell
ac404e713f Unison version update to 2.27.57
svn path=/nixpkgs/trunk/; revision=14689
2009-03-24 17:52:13 +00:00
Eelco Dolstra
e230599c08 * Removed Subversion 1.4 - obsolete.
* Updated Subversion 1.5.x to 1.5.6.

svn path=/nixpkgs/trunk/; revision=14685
2009-03-24 15:07:11 +00:00
Peter Simons
ea443ec70a subversion: updated to version 1.6.0
svn path=/nixpkgs/trunk/; revision=14682
2009-03-24 10:31:39 +00:00
Eelco Dolstra
37de59a3be * Dutch tax return program for 2008.
(And the government is *still* violating the LGPL...)

svn path=/nixpkgs/trunk/; revision=14678
2009-03-24 09:00:34 +00:00
Ludovic Courtès
0474b4f148 GNU gv 3.6.7.
svn path=/nixpkgs/trunk/; revision=14662
2009-03-23 15:42:14 +00:00
Ludovic Courtès
a3f009935f GNU IceCat 3.0.7-g1.
svn path=/nixpkgs/trunk/; revision=14644
2009-03-22 12:37:16 +00:00
Armijn Hemel
19eaf90e36 update to 2.6.6
svn path=/nixpkgs/trunk/; revision=14636
2009-03-20 21:11:37 +00:00
Eelco Dolstra
d8e436c742 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14634
2009-03-20 16:49:02 +00:00
Ludovic Courtès
f77e783622 Evince: Fix typo.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14621
2009-03-19 23:56:34 +00:00
Ludovic Courtès
3a43ab3860 Add Impressive (formerly known as `KeyJNote').
svn path=/nixpkgs/trunk/; revision=14618
2009-03-19 16:40:28 +00:00
Michael Raskin
32154f3dac Updated monotone
svn path=/nixpkgs/trunk/; revision=14565
2009-03-16 21:30:43 +00:00
Eelco Dolstra
3593b97d63 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
2009-03-16 12:45:27 +00:00
Nicolas Pierron
44b6165af2 * Update suckless package location.
* Update dmenu version (3.8 -> 3.9)
* Update wmii version (20070516 -> 20071116)

svn path=/nixpkgs/trunk/; revision=14544
2009-03-15 20:09:50 +00:00
Eelco Dolstra
8ac53703f0 * vlc: use faad.
svn path=/nixpkgs/trunk/; revision=14502
2009-03-10 23:28:06 +00:00
Eelco Dolstra
1485c905f7 * ffmpeg: build with faad2 support. However, vlc still won't play
mp4a audio.
* faad2: latest version.
* vlc: fix the hard-coded OSD font path name.  Dunno why they don't
  use fontconfig.

svn path=/nixpkgs/trunk/; revision=14501
2009-03-10 22:45:27 +00:00
Eelco Dolstra
44ac9e249c * MPlayer: updated to the SVN version.
* VLC: updated to 0.9.8a.  It now uses Qt for the GUI, which looks a
  lot better than the wxWidgets one.
* libdvdread, libdvdnav: updated to 4.1.3.
* ffmpeg: updated to 0.5 (a new release!).  Got rid of the SVN
  version, which shouldn't be necessary anymore.

svn path=/nixpkgs/trunk/; revision=14500
2009-03-10 21:03:51 +00:00
Michael Raskin
13a25d33d3 My attempts to build Thunderbird3beta on Xulrunner. Maybe it is impossible; if not - there are some things others could reuse...
svn path=/nixpkgs/trunk/; revision=14438
2009-03-07 17:18:48 +00:00
Ludovic Courtès
e9917baddd GNU Zile 2.3.4.
svn path=/nixpkgs/trunk/; revision=14432
2009-03-07 11:28:56 +00:00
Marc Weber
23ca0bb3c2 vim version (7.2), optional .nix filetype detection and syntax highlighting
svn path=/nixpkgs/trunk/; revision=14431
2009-03-07 00:27:13 +00:00
Marc Weber
b56ed35851 replacing applyAndFun by lib.defaultOverridableDelayableArgs
applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.

I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.

important refactoring:
  applyAndFun had .fun and .funMerge only when passing the merge
  function lib.mergeOrApply

  composableDerivation {
    initial = {
      ...
    };
  }

to

  overridableDelayableArgs has always .replace and .merge
  composableDerivation {} {
    ...
  }

svn path=/nixpkgs/trunk/; revision=14428
2009-03-06 23:21:28 +00:00
Ludovic Courtès
f301e8423b GNU Gnash 0.8.5.
svn path=/nixpkgs/trunk/; revision=14415
2009-03-06 14:24:27 +00:00
Eelco Dolstra
e263446442 * Firefox 3.0.7.
* Chatzilla 0.9.84.

svn path=/nixpkgs/trunk/; revision=14346
2009-03-05 14:06:07 +00:00
Armijn Hemel
53bf781136 update to 2.5.5
svn path=/nixpkgs/trunk/; revision=14339
2009-03-04 23:05:11 +00:00
Lluís Batlle i Rossell
f3a4388ddc Updating flashplayer10 for i686, and adding it for x64.
I haven't tried the builder for i686, but I think it should work. The fix should be easy in any cas.
I don't think I've written pretty nix code, so I'm looking forward for revision.


svn path=/nixpkgs/trunk/; revision=14324
2009-03-04 11:04:16 +00:00
Ludovic Courtès
fb9ace2e56 CEDET: Run the test suite the right way.
svn path=/nixpkgs/trunk/; revision=14318
2009-03-03 19:45:04 +00:00