1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Commit graph

1814 commits

Author SHA1 Message Date
Lluís Batlle i Rossell 916e0f3840 Updating paraview.
svn path=/nixpkgs/trunk/; revision=19478
2010-01-16 11:05:17 +00:00
Lluís Batlle i Rossell 89944b6cf0 Updating unison.
svn path=/nixpkgs/trunk/; revision=19468
2010-01-15 15:09:46 +00:00
Michael Raskin e1604101fe Fix Dia source link
svn path=/nixpkgs/trunk/; revision=19463
2010-01-15 10:51:44 +00:00
Lluís Batlle i Rossell 9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Sander van der Burg f00b7292e7 Stole a patch from cblfs.cross-lfs.org to fix compilation errors with glibc 2.11
svn path=/nixpkgs/trunk/; revision=19431
2010-01-14 12:29:54 +00:00
Ludovic Courtès 5080aa43d3 GNUnet: Add `meta.platforms'.
svn path=/nixpkgs/trunk/; revision=19414
2010-01-13 21:34:45 +00:00
Sander van der Burg 6608d55291 Updated VirtualBox to version 3.1.2
svn path=/nixpkgs/trunk/; revision=19406
2010-01-13 16:14:22 +00:00
Eelco Dolstra de360dbe76 * Firefox 3.0.17.
svn path=/nixpkgs/trunk/; revision=19392
2010-01-13 13:21:06 +00:00
Peter Simons a5b5690be7 pkgs/applications/science/math/maxima: updated to version 5.20.1
svn path=/nixpkgs/trunk/; revision=19380
2010-01-12 21:39:23 +00:00
Armijn Hemel 577f4d8325 update to 2.6.5, also add python dependency for extensions and all that
svn path=/nixpkgs/trunk/; revision=19352
2010-01-11 13:25:05 +00:00
Eelco Dolstra cdc307536c * Firefox 3.5.7.
svn path=/nixpkgs/trunk/; revision=19349
2010-01-11 10:43:29 +00:00
Ludovic Courtès 8048817e1e GNU IceCat 3.5.7.
svn path=/nixpkgs/trunk/; revision=19348
2010-01-11 10:16:50 +00:00
Lluís Batlle i Rossell 2cbbaa62ae Updating calibre.
I still have not been able to convert any single book to lrf with this calibre.
There may be some tool missing, but I don't guess what.


svn path=/nixpkgs/trunk/; revision=19310
2010-01-08 20:30:24 +00:00
Ludovic Courtès ed8858f9c0 GNU gv 3.6.8.
svn path=/nixpkgs/trunk/; revision=19305
2010-01-08 09:31:01 +00:00
Lluís Batlle i Rossell a4473b8205 Adding calibre. This involved also:
- Adding podofo
- Adding some new python packages
- Making new pkgs attributes for python packages to build with python 2.6
- Updating some python packages expressions to allow python 2.6, and not only 2.5.


svn path=/nixpkgs/trunk/; revision=19303
2010-01-07 22:47:30 +00:00
Alexander Tsamutali 24640da88a applications/window-managers/xcompmgr: New package.
svn path=/nixpkgs/trunk/; revision=19272
2010-01-06 20:45:43 +00:00
Eelco Dolstra d725008855 * IceWM updated to 1.2.37.
svn path=/nixpkgs/trunk/; revision=19244
2010-01-05 22:48:10 +00:00
Armijn Hemel f8106c5cf6 update to 2.6.8, python problems still persist
svn path=/nixpkgs/trunk/; revision=19235
2010-01-05 14:19:00 +00:00
Armijn Hemel ae80a8ed48 update to 3.0.7, requires perl now
svn path=/nixpkgs/trunk/; revision=19231
2010-01-05 12:29:58 +00:00
Ludovic Courtès bfb476c7d6 GNUnet 0.8.1.
svn path=/nixpkgs/trunk/; revision=19219
2010-01-05 11:16:42 +00:00
Andres Löh e9bb8f666a Haskell libs version bumps in order to improve ghc-6.12.1 compatibility.
svn path=/nixpkgs/trunk/; revision=19211
2010-01-04 17:40:51 +00:00
Rob Vermaas c5157f7d9d re-added libjpeg62 for chrome, updated chrome
svn path=/nixpkgs/trunk/; revision=19199
2010-01-04 07:47:32 +00:00
Marc Weber bbf8253985 adding debug version of i686 flash player. See comments
svn path=/nixpkgs/trunk/; revision=19195
2010-01-04 07:44:24 +00:00
Eelco Dolstra 05fce85edc * Thunderbird 3.0. It doesn't use the Xulrunner package, as building
against an external Xulrunner seems to be unsupported currently.

svn path=/nixpkgs/trunk/; revision=19169
2010-01-02 13:21:50 +00:00
Eelco Dolstra 0dc9f7dd4f * Put the Thunderbird 2 and 3 expressions in one directory.
svn path=/nixpkgs/trunk/; revision=19167
2010-01-01 16:35:43 +00:00
Armijn Hemel c8af5fd4dc update to 1.2.4
svn path=/nixpkgs/trunk/; revision=19162
2009-12-30 22:11:43 +00:00
Armijn Hemel cd2a151621 remove some old versions of qemu. svn version has also been outdated, but I'm not removing that one yet
svn path=/nixpkgs/trunk/; revision=19158
2009-12-30 18:02:07 +00:00
Armijn Hemel 8772bf65b0 add 0.12.1
svn path=/nixpkgs/trunk/; revision=19151
2009-12-30 12:56:08 +00:00
Rob Vermaas 6f41d4d034 different hash flash player 10
svn path=/nixpkgs/trunk/; revision=19149
2009-12-30 07:17:42 +00:00
Lluís Batlle i Rossell d864771e26 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19139
2009-12-28 11:40:34 +00:00
Armijn Hemel d993cf0f5f add voice and video
svn path=/nixpkgs/trunk/; revision=19136
2009-12-27 16:49:08 +00:00
Armijn Hemel 67f39a0ca9 update to 0.99.2
svn path=/nixpkgs/trunk/; revision=19129
2009-12-25 21:30:46 +00:00
Armijn Hemel 500f81e68d update to 1.5.20, add perl as extra dependency
svn path=/nixpkgs/trunk/; revision=19127
2009-12-25 20:02:31 +00:00
Armijn Hemel ec3285843f update to 1.0.4
svn path=/nixpkgs/trunk/; revision=19123
2009-12-25 19:22:25 +00:00
Armijn Hemel c066f11f80 update to 3.0.6
svn path=/nixpkgs/trunk/; revision=19120
2009-12-25 18:33:44 +00:00
Armijn Hemel c79eb46c7e update to 2.7.1
svn path=/nixpkgs/trunk/; revision=19119
2009-12-25 18:27:48 +00:00
Armijn Hemel 2009c65a99 konversation project website has moved, konversation.org has been abandoned
svn path=/nixpkgs/trunk/; revision=19117
2009-12-25 17:17:24 +00:00
Armijn Hemel 29bd8e55f8 update to 0.8.14
svn path=/nixpkgs/trunk/; revision=19116
2009-12-25 17:15:44 +00:00
Armijn Hemel 60e4c3e9ab update to 2009.4.0
svn path=/nixpkgs/trunk/; revision=19115
2009-12-25 16:58:17 +00:00
Armijn Hemel 18455cb9bc update to 0.97, use mirror and sha256
svn path=/nixpkgs/trunk/; revision=19114
2009-12-25 16:13:58 +00:00
Armijn Hemel 3093cbc10d update to 2.8.1
svn path=/nixpkgs/trunk/; revision=19113
2009-12-25 15:45:06 +00:00
Armijn Hemel 0814a30d2c update to 2.8.7
svn path=/nixpkgs/trunk/; revision=19111
2009-12-25 14:34:11 +00:00
Armijn Hemel a53ab8a2e7 update to 1.3.2
svn path=/nixpkgs/trunk/; revision=19107
2009-12-25 12:38:08 +00:00
Armijn Hemel 4f84a616d9 update to 2.2.1
svn path=/nixpkgs/trunk/; revision=19097
2009-12-24 21:37:18 +00:00
Lluís Batlle i Rossell bcc9c9ab1e Updated xaos to 3.5
svn path=/nixpkgs/trunk/; revision=19096
2009-12-24 17:02:44 +00:00
Lluís Batlle i Rossell c82d342017 Ouch.
I have a race condition between my commits and tests for the expressions I commit.


svn path=/nixpkgs/trunk/; revision=19095
2009-12-24 15:02:31 +00:00
Lluís Batlle i Rossell 1d70efa3c8 Adding xlsfonts, and adding meta information to xfontsel.
svn path=/nixpkgs/trunk/; revision=19094
2009-12-24 14:59:57 +00:00
Lluís Batlle i Rossell 4354cf8a6b Cleaning the xfontsel expression a bit - I did not want to commit such amount of superfluous
words in it, in the recent commit.


svn path=/nixpkgs/trunk/; revision=19093
2009-12-24 14:55:11 +00:00
Lluís Batlle i Rossell 5a4f1b07f4 Adding xfontsel. A bit hacky (to work well, it requires copying its app-defaults to $HOME)
As app-defaults should be installed with the libXt (maybe it's libXt which loads them), and
stracing that is the place where the code looks for app-defaults (the libXt store path), I
don't know of any better solution in nixpkgs by now.


svn path=/nixpkgs/trunk/; revision=19092
2009-12-24 14:48:36 +00:00
Armijn Hemel 2e6b173032 update to 2.6.4. voice and video are not working atm
svn path=/nixpkgs/trunk/; revision=19086
2009-12-23 21:05:29 +00:00
Lluís Batlle i Rossell 5955f25623 Updating the googleearth version (we follow the binary contents of their single-URL package)
svn path=/nixpkgs/trunk/; revision=19083
2009-12-23 19:55:58 +00:00
Eelco Dolstra 6eb6fec8a1 * Firefox 3.5.6.
svn path=/nixpkgs/trunk/; revision=19075
2009-12-22 09:07:19 +00:00
Lluís Batlle i Rossell 7ee537f955 Getting a new gcc-wrapper on the way. After gnat-wrapper, I introduce
ghdl-wrapper.
I made the gcc-4.3.4 expression allow the 'vhdl' language through ghdl.
The ghdl developer recommends this gcc version; maybe it would work with
gcc-4.4. If not this ghdl version, maybe next versions.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19071
2009-12-21 23:02:06 +00:00
Ludovic Courtès 310d6e4bbf Update from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19066
2009-12-21 11:09:23 +00:00
Lluís Batlle i Rossell 4fc8cd8d35 Adding gtkwave, to view waves generated by ghdl.
svn path=/nixpkgs/trunk/; revision=19065
2009-12-21 10:35:50 +00:00
Marc Weber 1106d431fc fix various builds by updating perl URI package update perl URI package
fix expect: Neither was the executable installed nor the shared library
fix topGit source
update synergy fixing build

svn path=/nixpkgs/trunk/; revision=19064
2009-12-21 08:55:31 +00:00
Lluís Batlle i Rossell fb82bac2fc Adding first built version of the gnat compiler for gcc 4.4.
Some things don't work:
- The ghdl expression (it still needs the gcc 4.3.4 src, ...)
- The gnat wrappers need to be more generic - now they work only for the
  given gnatboot (taken from gentoo) and gnats installed to their $out
  store path.
- Using the cloogppl and ppl. We will need our own gnatboot built with c++
  libraries for that.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19060
2009-12-21 07:49:31 +00:00
Ludovic Courtès 99f646595c GNU IceCat 3.5.6.
svn path=/nixpkgs/trunk/; revision=19053
2009-12-20 19:49:40 +00:00
Lluís Batlle i Rossell 5bae851b1e Merging from trunk. I had to give away some structure to build the native
sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045
2009-12-19 11:14:16 +00:00
Michael Raskin 1497cacb6e adding libxcursor dependency
svn path=/nixpkgs/trunk/; revision=18930
2009-12-14 00:14:55 +00:00
Michael Raskin a996d01af9 Adding content. Unfortunately, currently segfaults
svn path=/nixpkgs/trunk/; revision=18927
2009-12-14 00:00:11 +00:00
Peter Simons 24c117f98d pkgs/applications/version-management/git-and-tools/git: updated to version 1.6.5.6
svn path=/nixpkgs/trunk/; revision=18917
2009-12-13 13:47:10 +00:00
Lluís Batlle i Rossell a534f901bb Updating hugin.
svn path=/nixpkgs/trunk/; revision=18915
2009-12-12 18:58:40 +00:00
Lluís Batlle i Rossell dae3eb2383 Merging from trunk.
I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
2009-12-12 18:39:09 +00:00
Marc Weber 362f811a7a Revert "git: allow applying patches by config"
This reverts commit rev 18897
I should have used overrideDerivation.

svn path=/nixpkgs/trunk/; revision=18911
2009-12-12 18:10:26 +00:00
Marc Weber f62924477e fix hash of libCSS (netsurf browser)
svn path=/nixpkgs/trunk/; revision=18908
2009-12-12 00:20:29 +00:00
Marco Maggesi 98aaa4421c Add expression for Isabelle2009
svn path=/nixpkgs/trunk/; revision=18905
2009-12-11 17:00:52 +00:00
Marco Maggesi 218bdaf214 Add expression for ProofGeneral
svn path=/nixpkgs/trunk/; revision=18904
2009-12-11 16:18:27 +00:00
Marc Weber 0ceae8f6d1 git: allow applying patches by config
svn path=/nixpkgs/trunk/; revision=18897
2009-12-11 13:58:31 +00:00
Marc Weber 5319704f80 removing old bleeding edge cruft replacing it by a niftier version using
source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README.

sourceByName is called sourceFromHead now.

updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update

svn path=/nixpkgs/trunk/; revision=18894
2009-12-11 13:58:23 +00:00
Lluís Batlle i Rossell f3c23487a2 Adding a new version of the gcc-wrapper, named gcc-wrapper2, in order not to rebuild
stdenv.

In this gcc-wrapper2 I made the ld-wrapper.sh to handle the linking with shared
objects through direct pass as ld command arguments of the absolute path to shared
objects, instead of using the -L/-l combinations.

cmake 'FindXXX.cmake' modules make a strong usage of the dynamic linking directly
passing the absolute path to the shared object to the linker, and as our wrapper did
not add any -rpath for those, writting the nix expressions for some cmake packages
resulted in a lot of tricks, compared to using this gcc-wrapper2.

This gcc-wrapper2/ld-wrapper.sh should become the gcc-wrapper/ld-wrapper in a
stdenv update.

I also updated some cmake expressions to use this gcc-wrapper2, and reduced its
tricks.

I also updated the cmake setup-hook for it to make cmake not touch any rpath decided
at build time, when running the 'make install' of makefiles created by cmake.

svn path=/nixpkgs/trunk/; revision=18885
2009-12-10 22:19:52 +00:00
Lluís Batlle i Rossell 89fe676bb3 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
2009-12-10 14:48:45 +00:00
Peter Simons 89b59e3fbc applications/version-management/git-and-tools/git: update to version 1.6.5.5
svn path=/nixpkgs/trunk/; revision=18847
2009-12-08 20:35:51 +00:00
Ludovic Courtès 5d7de35976 Qtpfsgui 1.9.3.
svn path=/nixpkgs/trunk/; revision=18818
2009-12-05 15:43:07 +00:00
Marco Maggesi ec6f4788bb Fixed download url for Unison File Syncronizer.
svn path=/nixpkgs/trunk/; revision=18793
2009-12-03 16:40:18 +00:00
Sander van der Burg 307280e9e3 Reverted guest additions back to 3.0.10 since 3.1.0 has a new installer. I will look at this installer later
svn path=/nixpkgs/trunk/; revision=18760
2009-12-02 13:45:42 +00:00
Sander van der Burg 8681d7d695 Upgraded VirtualBox to version 3.1.0
svn path=/nixpkgs/trunk/; revision=18758
2009-12-02 13:31:56 +00:00
Lluís Batlle i Rossell eaee50c232 Updating truecrypt. Following the trend. I don't know of any repository of
not-the-latest versions.

svn path=/nixpkgs/trunk/; revision=18702
2009-11-29 22:37:07 +00:00
Lluís Batlle i Rossell 3bae8e9590 Fixing the cinepaint expression. Somehow I wrote the wrong date in fetchcvs,
when I commited it, so it has been a expression that only worked for me, I think,
because I had done the proper fetchcvs previously.

svn path=/nixpkgs/trunk/; revision=18699
2009-11-29 19:22:28 +00:00
Lluís Batlle i Rossell 32f2dda5de Fixing hugin (we now install boost without tags on library file names, and
the hugin expression still used the tag for 'multithread' in the boost library
file names).

svn path=/nixpkgs/trunk/; revision=18698
2009-11-29 19:22:22 +00:00
Peter Simons af0a961e3d pkgs/applications/editors/emacs-modes/prolog: initial version of prolog-mode for Emacs
svn path=/nixpkgs/trunk/; revision=18675
2009-11-27 17:40:56 +00:00
Lluís Batlle i Rossell a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory
renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.

svn merge  ^/nixpkgs/trunk


svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
2009-11-26 21:46:08 +00:00
Lluís Batlle i Rossell 3cda62f6e1 Trying to merge from trunk the eclipse-classic -> eclipse move.
svn merge -r 18485:18486 ^/nixpkgs/trunk



svn path=/nixpkgs/branches/stdenv-updates/; revision=18660
2009-11-26 21:42:46 +00:00
Lluís Batlle i Rossell adc61253b9 Merging from trunk, partially, to get rid of the annoying failing commits from
svn when files were removed, recreated and whatever...
 svn merge -r 18479:18485 ^/nixpkgs/trunk



svn path=/nixpkgs/branches/stdenv-updates/; revision=18659
2009-11-26 21:34:53 +00:00
Ludovic Courtès f1f286052e Remove `unpackCmd's not needed with GNU tar format auto-detection (r18492).
svn path=/nixpkgs/branches/stdenv-updates/; revision=18653
2009-11-26 15:50:26 +00:00
Eelco Dolstra a71971f671 * Inkscape 0.47.
svn path=/nixpkgs/trunk/; revision=18641
2009-11-26 12:39:22 +00:00
Ludovic Courtès 57fa034f8a Geeqie: Fix typos.
svn path=/nixpkgs/trunk/; revision=18615
2009-11-25 09:08:27 +00:00
Ludovic Courtès aca6f17400 Add Geeqie, a GQview fork.
svn path=/nixpkgs/trunk/; revision=18613
2009-11-25 08:58:42 +00:00
Lluís Batlle i Rossell 6f2e018c7a Enabling plugins in avidemux.
Adding an assertion, for stdenv having glibc. avidemux wants pthreads.

svn path=/nixpkgs/trunk/; revision=18593
2009-11-24 14:01:48 +00:00
Lluís Batlle i Rossell d634b32abf Adding avidemux.
svn path=/nixpkgs/trunk/; revision=18584
2009-11-24 08:27:18 +00:00
Eelco Dolstra 0df5c155c6 * Firefox 3.5.5.
svn path=/nixpkgs/trunk/; revision=18548
2009-11-22 22:40:39 +00:00
Eelco Dolstra 11c3e92738 * Bring back Emacs 22 by request from Ludovic.
svn path=/nixpkgs/trunk/; revision=18529
2009-11-22 16:29:15 +00:00
Rob Vermaas 132a1db1ee newer version of chrome (32599)
svn path=/nixpkgs/trunk/; revision=18520
2009-11-22 14:41:38 +00:00
Ludovic Courtès 96d3032ea0 Fix Ufraw.
svn path=/nixpkgs/trunk/; revision=18510
2009-11-21 22:30:00 +00:00
Eelco Dolstra 86f8f47d87 * eclipse-classic -> eclipse.
svn path=/nixpkgs/trunk/; revision=18486
2009-11-20 15:33:06 +00:00
Eelco Dolstra e0491358eb * Removed a lot of old Eclipse versions.
* Cleaned up the Eclipse classic expression a bit (e.g. use
  makeWrapper).  Also fall back to GTK 2.16 to fix some GUI glitches.

svn path=/nixpkgs/trunk/; revision=18485
2009-11-20 15:19:00 +00:00
Lluís Batlle i Rossell e85500987b Merging from trunk. I had to do two manual merges, quite trivial I think.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
2009-11-19 19:09:10 +00:00
Eelco Dolstra 58f543f19f * Remove some old Emacs versions.
svn path=/nixpkgs/trunk/; revision=18470
2009-11-19 17:36:43 +00:00
Eelco Dolstra 7f5b839524 * Removed selectVersion. There's no good reason to write
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403
2009-11-18 09:39:59 +00:00
Lluís Batlle i Rossell 6864119104 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18341
2009-11-13 19:19:34 +00:00
Marc Weber f5d0193047 synergy broke by xorg-update
svn path=/nixpkgs/trunk/; revision=18335
2009-11-12 16:11:44 +00:00
Rob Vermaas b325a34361 chrome 31663
svn path=/nixpkgs/trunk/; revision=18328
2009-11-11 15:34:21 +00:00
Ludovic Courtès 8799678836 GNU IceCat 3.5.5.
svn path=/nixpkgs/trunk/; revision=18327
2009-11-11 14:24:52 +00:00
Rob Vermaas efe661ab0e update chrome to version 31662 to let dropdownlists work properly again
svn path=/nixpkgs/trunk/; revision=18326
2009-11-11 14:06:57 +00:00
Marco Maggesi e2057ffe04 Add package ledger
svn path=/nixpkgs/trunk/; revision=18316
2009-11-10 11:02:45 +00:00
Lluís Batlle i Rossell de6aa89c45 Updating xchm.
svn path=/nixpkgs/trunk/; revision=18310
2009-11-09 11:55:31 +00:00
Lluís Batlle i Rossell 4f906f38a8 Updating qemu to 0.11.0, and making it use stdenv with the usual gcc, and not an older.
svn path=/nixpkgs/trunk/; revision=18305
2009-11-09 09:15:58 +00:00
Michael Raskin 24162c6b4a Fix fetchmtn
svn path=/nixpkgs/trunk/; revision=18298
2009-11-08 22:12:14 +00:00
Lluís Batlle i Rossell 4326d07c11 Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates2/; revision=18278
2009-11-08 01:57:40 +00:00
Lluís Batlle i Rossell f1ee14bfaf Removing fetchgit --depth and its usage. It does not provide much advantages...
I think it takes the recent N commits into the repository, which says very little,
even for wanting master/HEAD.

svn path=/nixpkgs/trunk/; revision=18277
2009-11-08 01:51:20 +00:00
Lluís Batlle i Rossell 17876de2c5 Updating from trunk.
Many property change come, all on merge info, because those files have explicit merge info
in trunk already.
It is a problem in trunk, not in stdenv-updates. Every time we will update from trunk, the explcit merge info for these files will be updated.


svn path=/nixpkgs/branches/stdenv-updates2/; revision=18274
2009-11-08 00:40:07 +00:00
Lluís Batlle i Rossell 4b27d28701 Porting changes from stdenv-updates into this branch.
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00
Michael Raskin cd5338a18c Fix Uzbl build
svn path=/nixpkgs/trunk/; revision=18269
2009-11-07 23:09:36 +00:00
Andres Löh c3e966b0cb Updated xmonad to 0.9.
svn path=/nixpkgs/trunk/; revision=18204
2009-11-06 13:08:47 +00:00
Sander van der Burg 866bbe32f2 Updated VirtualBox guest additions and changed some files to support Xorg 7.5
svn path=/nixpkgs/trunk/; revision=18199
2009-11-06 11:41:34 +00:00
Sander van der Burg ab55ac28b4 Upgraded VirtualBox to 3.0.10
svn path=/nixpkgs/trunk/; revision=18196
2009-11-06 11:31:28 +00:00
Michael Raskin dbb59beb89 Update uzbl-experimental
svn path=/nixpkgs/trunk/; revision=18182
2009-11-06 06:22:22 +00:00
Michael Raskin 183e6593be One more program needs libXi explicitly passed..
svn path=/nixpkgs/trunk/; revision=18181
2009-11-06 05:14:41 +00:00
Michael Raskin 4d02c927e6 Fix ratpoison dependencies
svn path=/nixpkgs/trunk/; revision=18166
2009-11-05 21:53:37 +00:00
Michael Raskin 3be216a703 Links2 works in FB without directfb just fine
svn path=/nixpkgs/trunk/; revision=18157
2009-11-05 21:09:36 +00:00
Marco Maggesi c713b0ed67 Preliminary version of package ssreflect
Add expression for ssreflect, an extension to the Coq Proof Assistant.
Still has some clitches (see TODO in default.nix) but is usable anyway.


svn path=/nixpkgs/trunk/; revision=18145
2009-11-05 15:08:12 +00:00
Rob Vermaas 724d21e3b0 updated version of chrome
svn path=/nixpkgs/trunk/; revision=18131
2009-11-05 10:50:57 +00:00
Eelco Dolstra b039fddfbc * Merged the xorg-7.5 branch, which provides X.org 7.5 and various
other X-related updates.

svn path=/nixpkgs/trunk/; revision=18124
2009-11-04 22:42:44 +00:00
Lluís Batlle i Rossell 2e8ae96930 Updating vwm and its libraries.
svn path=/nixpkgs/trunk/; revision=18123
2009-11-04 22:38:26 +00:00
Eelco Dolstra 4f839e9a54 * Sync with the trunk.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18122
2009-11-04 22:37:24 +00:00
Lluís Batlle i Rossell 13a369476b Updating truecrypt from 6.2a to 6.3, mostly because the old src disappeared.
svn path=/nixpkgs/trunk/; revision=18121
2009-11-04 22:17:08 +00:00
Eelco Dolstra ac4d183051 * Added gnome-icon-theme.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18118
2009-11-04 21:44:01 +00:00
Eelco Dolstra 7a233c1629 * GIMP updated to 2.6.7. It no longer needs libgtkhtml.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18117
2009-11-04 21:28:11 +00:00
Eelco Dolstra 25a675da23 * Subversion 1.6.6.
svn path=/nixpkgs/trunk/; revision=18093
2009-11-04 13:41:55 +00:00
Peter Simons 3659747127 pkgs/applications/editors/emacs-modes/haskell/default.nix: updated to version 2.6.1
svn path=/nixpkgs/trunk/; revision=18089
2009-11-04 10:29:38 +00:00
Peter Simons b06c0d1a1d pkgs/applications/version-management/git-and-tools/default.nix: use docbook dtd 4.5
Ensure that the 4.5 DTD required by asciidoc is available.

svn path=/nixpkgs/trunk/; revision=18078
2009-11-03 15:57:31 +00:00
Peter Simons 990d7c05e7 pkgs/applications/window-managers/ratpoison/default.nix: updated to version 1.4.5
svn path=/nixpkgs/trunk/; revision=18075
2009-11-03 15:57:17 +00:00
Sander van der Burg 5ed64ae7c0 Enabled my eclipse package again, since I want to have eclipse installed when typing nix-env -i. BTW. the eclipse plugins can be installed this way either
svn path=/nixpkgs/trunk/; revision=18074
2009-11-03 11:00:18 +00:00
Marco Maggesi a0207b3dc7 Updated Coq to version 8.2pl1
svn path=/nixpkgs/trunk/; revision=18069
2009-11-02 11:44:27 +00:00
Ludovic Courtès dc673480e6 GNU Zile 2.3.13.
svn path=/nixpkgs/trunk/; revision=18066
2009-11-01 20:55:14 +00:00
Ludovic Courtès 806a5a9b6c GNU IceCat 3.5.4.
svn path=/nixpkgs/trunk/; revision=18064
2009-11-01 14:47:13 +00:00
Eelco Dolstra 65c0916cb7 * Updated Firefox 3.0.x to 3.0.15 (because the old tarball disappeared).
svn path=/nixpkgs/branches/xorg-7.5/; revision=18054
2009-10-30 12:45:28 +00:00
Rob Vermaas a73cef1057 added chromeWrapper, like firefoxWrapper, to allow plugins to work, added previously undefined dependencies on flash plugin
svn path=/nixpkgs/trunk/; revision=18050
2009-10-30 12:28:44 +00:00
Rob Vermaas d025709a8a chrome 20565
svn path=/nixpkgs/trunk/; revision=18046
2009-10-30 08:45:58 +00:00
Peter Simons 7fa0d73966 pkgs/applications/science/math/wxmaxima/default.nix: cosmetic changes
Note that wxMaxima does *not* have a proper store path to maxima built
into the binary. It relies on $PATH, /etc/wxMaxima.conf, or ~/.wxMaxima
to find the binary.

svn path=/nixpkgs/trunk/; revision=18020
2009-10-29 12:53:22 +00:00
Peter Simons d330b000fc Updated git to version 1.6.5.2.
svn path=/nixpkgs/trunk/; revision=18018
2009-10-29 12:06:04 +00:00
Peter Simons 96a32cffe2 Added wxMaxima version 0.8.3.
svn path=/nixpkgs/trunk/; revision=18015
2009-10-29 11:57:58 +00:00
Peter Simons 5dd3252557 Updated Maxima to version 5.19.2.
svn path=/nixpkgs/trunk/; revision=18014
2009-10-29 11:57:45 +00:00
Eelco Dolstra 82baac23a7 * Idem for gtk-libs/2.16.
svn path=/nixpkgs/trunk/; revision=17993
2009-10-28 15:31:52 +00:00
Eelco Dolstra 5398eceff3 * Getting rid of gtk-libs by moving the packages in gtk-libs to
development/libraries/{glib,gtk+,pango,atk,...}.  Done for glib/gtk+
  1.2.  Also deleted some obsolete, unused versions (gtkLibs 2.10,
  2.12, and 2.14).

svn path=/nixpkgs/trunk/; revision=17992
2009-10-28 15:06:18 +00:00
Eelco Dolstra f53195f29e * Improved a bunch of "name" attributes (mostly missing version
numbers).

svn path=/nixpkgs/trunk/; revision=17991
2009-10-28 14:06:56 +00:00
Eelco Dolstra 64f2e5d8e4 * Firefox 3.5.4.
svn path=/nixpkgs/trunk/; revision=17984
2009-10-28 11:47:48 +00:00
Michael Raskin cd04c58fe2 Allow not-that-shallow git fetches; enable it for uzbl
svn path=/nixpkgs/trunk/; revision=17980
2009-10-27 19:52:01 +00:00
Marc Weber a7261348d8 Netsurf update
svn path=/nixpkgs/trunk/; revision=17978
2009-10-27 17:46:45 +00:00
Marc Weber 748dd33b25 hg2git has been put into repo fast-export. make it work again
svn path=/nixpkgs/trunk/; revision=17977
2009-10-27 17:46:37 +00:00
Michael Raskin bd7526951e Adding Links2
svn path=/nixpkgs/trunk/; revision=17949
2009-10-24 15:39:54 +00:00
Michael Raskin 59613ffe56 Updating uzbl-experimental
svn path=/nixpkgs/trunk/; revision=17932
2009-10-23 05:26:02 +00:00
Marc Weber efca5daeb7 tell skype where to find its resources - by Russell O'Connor
svn path=/nixpkgs/trunk/; revision=17924
2009-10-22 15:41:34 +00:00
Ludovic Courtès be6b6b73f9 Add Emacs Scala-Mode.
svn path=/nixpkgs/trunk/; revision=17904
2009-10-20 15:12:29 +00:00
Peter Simons 4cf582c570 pkgs/applications/version-management/git-and-tools/git/default.nix: dropped 'set -x' from builder script
svn path=/nixpkgs/trunk/; revision=17903
2009-10-20 14:08:58 +00:00
Peter Simons 2139d48872 pkgs/applications/version-management/git-and-tools/git/default.nix: updated to version 1.6.5.1
svn path=/nixpkgs/trunk/; revision=17902
2009-10-20 14:08:53 +00:00
Eelco Dolstra 24661f4c45 svn path=/nixpkgs/trunk/; revision=17892 2009-10-20 10:33:38 +00:00
Michael Raskin 708c876572 Update LyX
svn path=/nixpkgs/trunk/; revision=17890
2009-10-20 06:57:29 +00:00
Lluís Batlle i Rossell 3b3ee13b9d Updating lame
Updating libgpod
Making gtkpod accept 'ogg' files, and made it convert them well to mp3, if 'lame'
and oggdec is in path. It should better reference lame and libvorbis store path
files.

svn path=/nixpkgs/trunk/; revision=17888
2009-10-19 22:05:34 +00:00
Marc Weber 5411beb172 fix for other platforms (suggested by Eelco Dolstra)
svn path=/nixpkgs/trunk/; revision=17887
2009-10-19 20:47:21 +00:00
Ludovic Courtès 2aaf37cdf9 Add UFRaw.
svn path=/nixpkgs/trunk/; revision=17881
2009-10-19 12:50:45 +00:00
Marc Weber da731ce190 doh!
svn path=/nixpkgs/trunk/; revision=17877
2009-10-19 12:27:51 +00:00
Marc Weber 9ea9133183 adding scribus - don't miss the comment about fonts!
svn path=/nixpkgs/trunk/; revision=17866
2009-10-18 04:44:01 +00:00
Marc Weber 5b3c7c6b7a wireshark update - old source vanished
svn path=/nixpkgs/trunk/; revision=17865
2009-10-18 04:43:59 +00:00
Marc Weber 523d1b8216 updating sox, adding maintainer, enabling mp3 support
svn path=/nixpkgs/trunk/; revision=17864
2009-10-18 04:43:56 +00:00
Marc Weber dd3564aba9 adding ps2edit
svn path=/nixpkgs/trunk/; revision=17863
2009-10-18 04:43:53 +00:00
Marc Weber 6614345f29 adding yate2 telephony engine
svn path=/nixpkgs/trunk/; revision=17861
2009-10-18 04:43:48 +00:00
Marc Weber 84a2555b2c topgit: remove obsolete patches
svn path=/nixpkgs/trunk/; revision=17859
2009-10-18 04:43:43 +00:00
Marc Weber f808690b16 adding python package lxml to make scripts in inkscape work
svn path=/nixpkgs/trunk/; revision=17858
2009-10-18 04:43:40 +00:00
Sander van der Burg d72c439a26 The OpenOffice.org icons should work now. I really mean it this time
svn path=/nixpkgs/trunk/; revision=17854
2009-10-16 15:31:31 +00:00
Sander van der Burg 702871ef25 It appears that the OpenOffice.org desktop files are read only. Changing this so that they can be adapted
svn path=/nixpkgs/trunk/; revision=17853
2009-10-16 12:16:17 +00:00
Sander van der Burg 3c00ca8da0 Corrected path to the .desktop files. Why do I keep making these silly mistakes?
svn path=/nixpkgs/trunk/; revision=17846
2009-10-16 08:56:35 +00:00
Michael Raskin 7d52bceffb Adding support of external utilities in ikiwiki
svn path=/nixpkgs/trunk/; revision=17845
2009-10-16 08:38:25 +00:00
Michael Raskin 206a941597 Add optional Monotone support for ikiwiki; made git support optional.
svn path=/nixpkgs/trunk/; revision=17842
2009-10-16 06:39:29 +00:00
Michael Raskin 22644a3fb6 Remove the debugging config copying. The actual expression hasn't changed for quite a while anyway
svn path=/nixpkgs/trunk/; revision=17841
2009-10-16 05:15:44 +00:00
Lluís Batlle i Rossell 54a04a789a Made ikiwiki work at least using 'git'. I tested the CGI this time.
I had to add some perl modules again.

svn path=/nixpkgs/trunk/; revision=17838
2009-10-15 22:08:35 +00:00
Sander van der Burg 9dced99013 It seems that the OpenOffice.org desktop files have wrong icon identifiers. I corrected them now. Maybe I'll win the most wasted builtime award now
svn path=/nixpkgs/trunk/; revision=17835
2009-10-15 20:48:58 +00:00
Ludovic Courtès 2ea3e03077 Snd: Don't expect /tmp to be writable.
svn path=/nixpkgs/trunk/; revision=17834
2009-10-15 16:53:45 +00:00
Sander van der Burg ea9a9e5fae Fixed directory name for OpenOffice icons, sorry everyone
svn path=/nixpkgs/trunk/; revision=17826
2009-10-15 13:00:43 +00:00
Michael Raskin d1e55d0210 Install monotone Perl API
svn path=/nixpkgs/trunk/; revision=17818
2009-10-15 11:13:21 +00:00
Sander van der Burg 2d6d11772f OpenOffice.org now includes icons so that the menu items will look much nicer in KDE
svn path=/nixpkgs/trunk/; revision=17817
2009-10-15 09:56:40 +00:00
Lluís Batlle i Rossell a1061c1175 Adding the basics for 'ikiwiki'. I did not try how it serves the pages, but
at least "ikiwiki --setup ikiwikipath/etc/auto.setup" works for me with git.

svn path=/nixpkgs/trunk/; revision=17808
2009-10-14 21:00:54 +00:00
Sander van der Burg a7f52f8233 Fixed building of VirtualBox guest additions on x86-64
svn path=/nixpkgs/trunk/; revision=17806
2009-10-14 15:26:42 +00:00
Eelco Dolstra 18439774f8 * Adobe Reader 9.2.
svn path=/nixpkgs/trunk/; revision=17799
2009-10-14 13:08:04 +00:00
Sander van der Burg 5417fb5b3b Added some x86-64 support to the VirtualBox guest additions
svn path=/nixpkgs/trunk/; revision=17798
2009-10-14 12:37:52 +00:00
Marc Weber 2db48fc660 skype url changed
patch provided by Russell O'Connor

svn path=/nixpkgs/trunk/; revision=17796
2009-10-14 03:13:44 +00:00
Lluís Batlle i Rossell bcc742adc1 Changing the freemind wrapper, so it doesn't clear the environment at freemind running.
It did annoy loosing LANG, and XAUTH things, which use to work fine in other programs.
I checked, and it works for me, seeing no segfault as it was written.

svn path=/nixpkgs/trunk/; revision=17795
2009-10-13 21:45:30 +00:00
Sander van der Burg 131c5f7e33 Added libXfixes to the rpath of VBoxClient, so that the shared host/guest clipboard will work
svn path=/nixpkgs/trunk/; revision=17789
2009-10-13 21:19:07 +00:00
Sander van der Burg 6351c10581 Moved vboxclient item to autostart
svn path=/nixpkgs/trunk/; revision=17782
2009-10-13 15:04:43 +00:00
Sander van der Burg 6cee2a18b3 Copy virtualbox HAL FDI file, so that the mouse cursor follows the host OS' cursor
svn path=/nixpkgs/trunk/; revision=17780
2009-10-13 14:29:38 +00:00
Sander van der Burg fef3041a74 Added VirtualBox guest additions package. Currently only builds on i686-linux
svn path=/nixpkgs/trunk/; revision=17778
2009-10-13 13:32:00 +00:00
Lluís Batlle i Rossell 7e3bcbd4c2 Made the small vim (attribute 'vim') have --enable-multibyte. Not that a luxurious
features, in these times of utf-8, and at the end our ncurses has multibyte.

svn path=/nixpkgs/trunk/; revision=17757
2009-10-12 14:29:07 +00:00
Lluís Batlle i Rossell 331d7185f2 Adding vnstat. Unless using "vnstat -l", it wants some directories in /var, where
it collects information.

svn path=/nixpkgs/trunk/; revision=17753
2009-10-12 11:08:52 +00:00
Lluís Batlle i Rossell 71fab59b62 Adding iptraf 3.0.0 (the last iptraf I found, last updated in 2005)
It runs without complains if you "mkdir -p /var/run/iptraf /var/local/iptraf"

svn path=/nixpkgs/trunk/; revision=17752
2009-10-12 10:52:47 +00:00
Andres Löh 1a1a661f4b Version bump for darcs.
svn path=/nixpkgs/trunk/; revision=17729
2009-10-08 14:07:13 +00:00
Sander van der Burg 0f20924465 - Upgraded VirtualBox to 3.0.8
- Fixed location of the VirtualBox icon
- Removed qt3 as dependency of VirtualBox since it's obsolete since 3.0.x


svn path=/nixpkgs/trunk/; revision=17725
2009-10-08 12:57:05 +00:00
Rob Vermaas dc242687b2 updated pgadmin to 1.10.0
svn path=/nixpkgs/trunk/; revision=17713
2009-10-08 09:26:47 +00:00
Lluís Batlle i Rossell 1ebd86987c Updating googleearth.
I had to use a newer patchelf (0.5), otherwise patchelf (0.4) died with an error at
setting the rpath for a lib.
("virtual address overrun" or something like that)

I still don't know of any stable url for a given version, so we will have this working
until they change the package file again updating.

svn path=/nixpkgs/trunk/; revision=17680
2009-10-06 17:37:39 +00:00
Michael Raskin 7469c3da48 move to fetchgit as github tarballs are unpredictable
svn path=/nixpkgs/trunk/; revision=17662
2009-10-06 05:58:56 +00:00
Lluís Batlle i Rossell 92dbfb5b9d Marking comical as maintained by me, and let hydra build it.
svn path=/nixpkgs/trunk/; revision=17652
2009-10-05 21:01:50 +00:00