Commit Graph

6602 Commits

Author SHA1 Message Date
Peter Simons
c96d4bd72e and yet it moves: gravity/physics game
Demo and commercial version are supported.

This nix expression shows some of the techniques used to package
closed-source binaries.

Committed on behalf of Mathijs Kwik.

svn path=/nixpkgs/trunk/; revision=32408
2012-02-19 21:36:54 +00:00
Eelco Dolstra
ea82288eec * Remove the unused graphviz/2.24.nix file. Also remove the unused
attribute graphviz_2_24 (which was actually referring to Graphviz
  2.0).

svn path=/nixpkgs/trunk/; revision=32406
2012-02-19 17:54:37 +00:00
Yury G. Kudryashov
50a24846ac Pass libpng-1.2 to widelands
svn path=/nixpkgs/branches/libpng15/; revision=32405
2012-02-19 17:39:37 +00:00
Eelco Dolstra
0922e0fb71 * Remove ocaml 3.11.1. It doesn't build anymore and isn't used anywhere.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32403
2012-02-19 17:12:37 +00:00
Eelco Dolstra
a50d32e4db * Fix oprofile.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32402
2012-02-19 17:03:38 +00:00
Peter Simons
cecff49b34 Moved the cabal build driver function from development/libraries/haskell/cabal to build-support/cabal.
This change also resolves the "cabal" vs. "Cabal" ambiguity on file systems
that don't distinguish case.

svn path=/nixpkgs/trunk/; revision=32401
2012-02-19 17:03:35 +00:00
Lluís Batlle i Rossell
3b02e6f70d Updating super tux kart to 0.7.3. I also add the library irrlicht, the specific
version needed for super tux kart.


svn path=/nixpkgs/trunk/; revision=32399
2012-02-19 13:15:50 +00:00
Yury G. Kudryashov
313a029f16 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
2012-02-19 11:16:24 +00:00
Yury G. Kudryashov
5c6a3faf4e Merge ^/nixpkgs/trunk
svn tried to change libpng/default.nix version, I've changed libpng/12.nix
version manually.

svn path=/nixpkgs/branches/libpng15/; revision=32395
2012-02-19 11:06:00 +00:00
Lluís Batlle i Rossell
d77cfce6d3 Adding bullet. Patch by Alexander Foremny.
svn path=/nixpkgs/trunk/; revision=32393
2012-02-19 10:51:04 +00:00
Eelco Dolstra
81fa68da99 svn path=/nixpkgs/branches/stdenv-updates/; revision=32386 2012-02-18 17:45:10 +00:00
Yury G. Kudryashov
024c247807 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32382
2012-02-18 16:26:34 +00:00
Eelco Dolstra
eae4c3afab * Get rid of some old kernels that no longer compile.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32378
2012-02-17 23:47:00 +00:00
Eelco Dolstra
0811db080e * Move all glibc versions to development/libraries/glibc.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32373
2012-02-17 22:02:37 +00:00
Shea Levy
609b5589bc rubygems will always conflict with ruby's 'gem' command, but if it's installed it should take precedence
svn path=/nixpkgs/trunk/; revision=32372
2012-02-17 21:51:06 +00:00
Eelco Dolstra
6c2de318ad * Move all gcc versions to development/compilers/gcc.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32371
2012-02-17 21:47:08 +00:00
Ludovic Courtès
a5d55a9514 Fix typo in `all-packages.nix'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32368
2012-02-17 21:24:03 +00:00
Ludovic Courtès
d4742ad714 GNU libc 2.14: Fix cross-GNU builds.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32367
2012-02-17 20:37:31 +00:00
Yury G. Kudryashov
14a5b4991c svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32360
2012-02-17 17:44:20 +00:00
Yury G. Kudryashov
e446dee4c3 Backport r32353 from stdenv-udpates
* Get rid of Qt 4.6.  It doesn't compile with GCC 4.6.  There was only
  one application still using it (Caneda), but upgrading it allowed it
  to build with Qt 4.7.

Eelco, could you please fix the date in caneda version?

svn path=/nixpkgs/trunk/; revision=32359
2012-02-17 17:40:58 +00:00
Eelco Dolstra
31ebc5d950 * Get rid of Qt 4.6. It doesn't compile with GCC 4.6. There was only
one application still using it (Caneda), but upgrading it allowed it
  to build with Qt 4.7.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32353
2012-02-17 14:34:42 +00:00
Eelco Dolstra
b23126fcc3 * Include the kernel version in kernel-specific packages so that they
can be distinguished in nix-env -qa output.

svn path=/nixpkgs/trunk/; revision=32352
2012-02-17 14:32:28 +00:00
Yury G. Kudryashov
79d0d410cb svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
2012-02-17 13:43:31 +00:00
Yury G. Kudryashov
ed8caa2c7f svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32347
2012-02-17 13:10:05 +00:00
Yury G. Kudryashov
afb26b6aed vigra-1.8.0
svn path=/nixpkgs/trunk/; revision=32346
2012-02-17 13:03:41 +00:00
Peter Simons
dbf98824a5 all-packages.nix: fixed linuxPackages.kqemu attribute that pointed nowhere
We have two expressions for kqemu, but I wasn't sure which one to use here, so
I just picked the newer one. Could someone who knows about these matters please
check whether that was the right choice? I don't use the qemu kernel module
myself.

svn path=/nixpkgs/trunk/; revision=32342
2012-02-17 10:39:02 +00:00
Eelco Dolstra
a3da139c73 * Remove ext3cow, it's dead.
svn path=/nixpkgs/trunk/; revision=32340
2012-02-16 19:30:41 +00:00
Yury G. Kudryashov
ee75764bdb svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32338
2012-02-16 18:46:10 +00:00
Eelco Dolstra
148612239c * Added openresolv, a program for managing /etc/resolv.conf.
svn path=/nixpkgs/trunk/; revision=32337
2012-02-16 18:40:05 +00:00
Yury G. Kudryashov
f8926aa0d7 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32335
2012-02-16 18:18:34 +00:00
Eelco Dolstra
9da1dd6c90 * dnsmasq updated to 2.59.
svn path=/nixpkgs/trunk/; revision=32334
2012-02-16 18:03:12 +00:00
Yury G. Kudryashov
e5027e5b36 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Peter Simons
b7e432214b haskell-packages.nix: improved handling of 'Cabal'
Most packages use the Cabal library only as a build tool, and as such it is a
dependency of the cabal.nix builder -- not of the package that's being built
with that builder.

svn path=/nixpkgs/trunk/; revision=32326
2012-02-16 14:05:01 +00:00
Yury G. Kudryashov
7b3d0a54f3 Pass libpng12 to libgdiplus
svn path=/nixpkgs/branches/libpng15/; revision=32323
2012-02-16 11:50:33 +00:00
Yury G. Kudryashov
070874c5f1 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32321
2012-02-16 11:23:36 +00:00
Peter Simons
ca1912036b cppcheck: added version 1.53
svn path=/nixpkgs/trunk/; revision=32302
2012-02-15 16:07:45 +00:00
Lluís Batlle i Rossell
e0cfa58706 Updating the cifs utils (I think even the hash did not match for 4.5),
and adding some CIFS support to the sheevaplug kernel.

Patch by Rickard Nilsson.


svn path=/nixpkgs/trunk/; revision=32298
2012-02-15 11:08:38 +00:00
Peter Simons
9882d962d1 haskell-alternative-io: added version 0.0.0
svn path=/nixpkgs/trunk/; revision=32294
2012-02-15 10:39:09 +00:00
Peter Simons
3256e7f5c2 haskell-nixos-types: removed obsolete package
svn path=/nixpkgs/trunk/; revision=32290
2012-02-14 16:59:01 +00:00
Peter Simons
adc9bf0510 haskell-packages.nix: removed obsolete 'aeson-native' and 'blaze-textual-native'
svn path=/nixpkgs/trunk/; revision=32289
2012-02-14 16:58:58 +00:00
Peter Simons
89a958e4d0 haskell-packages.nix: allow packages to be built with a version of 'Cabal' other than the one shipped with the compiler
svn path=/nixpkgs/trunk/; revision=32288
2012-02-14 16:58:56 +00:00
Peter Simons
6e3f66185d haskell-packages.nix: allow packages to be built with a version of 'filepath' other than the one shipped with the compiler
svn path=/nixpkgs/trunk/; revision=32287
2012-02-14 16:58:53 +00:00
Peter Simons
3c63b41aa4 haskell-tar: added version 0.4.0.0
svn path=/nixpkgs/trunk/; revision=32277
2012-02-14 16:58:27 +00:00
Peter Simons
f1abe7d195 haskell-network: updated 2.3.x version to 2.3.0.11
svn path=/nixpkgs/trunk/; revision=32276
2012-02-14 16:58:24 +00:00
Yury G. Kudryashov
c81f618a34 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32273
2012-02-14 14:33:10 +00:00
Yury G. Kudryashov
96c20f97b7 unzip: fix typo in meta
svn path=/nixpkgs/trunk/; revision=32272
2012-02-14 14:29:25 +00:00
Peter Simons
02eaa57b56 merge latest changes from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32270
2012-02-14 13:47:27 +00:00
Lluís Batlle i Rossell
af1b08ac32 Updating firefox to 10.0.1. I'll let hydra build it.
svn path=/nixpkgs/trunk/; revision=32266
2012-02-13 21:04:39 +00:00
Yury G. Kudryashov
f7886ac78b svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32265
2012-02-13 19:47:36 +00:00
Yury G. Kudryashov
19dde94ddc Add calligra suite
KOffice, rebranded. Let hydra build it.

svn path=/nixpkgs/trunk/; revision=32264
2012-02-13 19:34:42 +00:00
Peter Simons
d53d97ad5e haskell-HaRe: updated to version 0.6.0.2
svn path=/nixpkgs/trunk/; revision=32238
2012-02-13 09:01:46 +00:00
Yury G. Kudryashov
fc21cca549 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32231
2012-02-12 09:33:54 +00:00
Lluís Batlle i Rossell
c2e5c08d72 Adding the game Bits&Bots
svn path=/nixpkgs/trunk/; revision=32227
2012-02-11 14:33:27 +00:00
Lluís Batlle i Rossell
1ad1d987e3 Adding stunt rally.
svn path=/nixpkgs/trunk/; revision=32217
2012-02-10 20:24:13 +00:00
Peter Simons
a2d2fa31a6 haskell-persistent: updated to version 0.8.0
svn path=/nixpkgs/trunk/; revision=32179
2012-02-10 11:32:50 +00:00
Peter Simons
78d758d93f haskell-yesod-routes: added version 0.0.1
svn path=/nixpkgs/trunk/; revision=32178
2012-02-10 11:32:48 +00:00
Peter Simons
cd306852ad haskell-crypto-conduit: added version 0.1.3.1
svn path=/nixpkgs/trunk/; revision=32177
2012-02-10 11:32:45 +00:00
Peter Simons
eb9badcd21 haskell-attempt: added version 0.4.0
svn path=/nixpkgs/trunk/; revision=32176
2012-02-10 11:32:40 +00:00
Peter Simons
cf686eaa50 haskell-failure: added version 0.2.0
svn path=/nixpkgs/trunk/; revision=32175
2012-02-10 11:32:35 +00:00
Yury G. Kudryashov
5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Yury G. Kudryashov
c84eb70b51 Latest exosip and linphone
svn path=/nixpkgs/trunk/; revision=32172
2012-02-10 10:13:48 +00:00
Yury G. Kudryashov
3217e1c5c3 djview-4.8, fix build with qt-4.8
svn path=/nixpkgs/trunk/; revision=32171
2012-02-10 10:13:44 +00:00
Yury G. Kudryashov
f9c551a41f hugin-2011.4.0
svn path=/nixpkgs/trunk/; revision=32170
2012-02-10 10:13:39 +00:00
Yury G. Kudryashov
f8d0599756 Add tclap (required for new hugin)
svn path=/nixpkgs/trunk/; revision=32169
2012-02-10 10:13:34 +00:00
Peter Simons
2d48075c4a haskell-packages.nix: disable the obsolete 'HaRe' tool
svn path=/nixpkgs/trunk/; revision=32165
2012-02-09 14:53:07 +00:00
Peter Simons
792bbd3522 haskell-packages.nix: disable the obsolete 'frown' tool
svn path=/nixpkgs/trunk/; revision=32164
2012-02-09 14:53:05 +00:00
Peter Simons
bfd1783a06 haskell-packages.nix: fixed obsolete reference to json_0_5 attribute
svn path=/nixpkgs/trunk/; revision=32163
2012-02-09 14:41:36 +00:00
Peter Simons
24ff52e62e haskell-json: dropped obsolete version 0.4.4
svn path=/nixpkgs/trunk/; revision=32161
2012-02-09 14:38:01 +00:00
Peter Simons
0df0d9ad9c Ebnf2ps: the package is now available from Hackage
svn path=/nixpkgs/trunk/; revision=32147
2012-02-08 22:07:42 +00:00
Lluís Batlle i Rossell
3782f740a0 Adding libwebp
svn path=/nixpkgs/trunk/; revision=32146
2012-02-08 21:37:20 +00:00
Eelco Dolstra
ff1bfcaefb * Added fuse-zip, a FUSE filesystem for accessing zip files.
svn path=/nixpkgs/trunk/; revision=32143
2012-02-08 15:45:26 +00:00
Yury G. Kudryashov
912637f33a Enable/disable libreoffice build in nixpkgs.config, not in tree.
I've tried to use override instead of getConfig but failed because exception is
thrown before the function is called with force = true.

svn path=/nixpkgs/trunk/; revision=32131
2012-02-07 21:03:25 +00:00
Yury G. Kudryashov
043000cf35 Fix eval
svn path=/nixpkgs/trunk/; revision=32130
2012-02-07 21:03:20 +00:00
Yury G. Kudryashov
a8dba7888b Move gtkLibs3x to top-level namespace, gtk+-3.2.3
Cherry-pick /nixpkgs/branches/glib-2.30@32044

svn path=/nixpkgs/trunk/; revision=32129
2012-02-07 21:03:16 +00:00
Florian Friesdorf
df12f0bd01 emacs js2-mode
svn path=/nixpkgs/trunk/; revision=32122
2012-02-07 17:40:02 +00:00
Florian Friesdorf
58bd562e28 python-matplotlib-1.1.0
svn path=/nixpkgs/trunk/; revision=32120
2012-02-07 17:39:56 +00:00
Florian Friesdorf
4e3afe1b8d emacs mode calfw-1.3
svn path=/nixpkgs/trunk/; revision=32118
2012-02-07 17:39:51 +00:00
Peter Simons
29869899a8 ikiwiki: updated to version 3.20120202
svn path=/nixpkgs/trunk/; revision=32116
2012-02-07 14:01:05 +00:00
Peter Simons
f57a6512b8 perl-packages.nix: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=32115
2012-02-07 14:01:03 +00:00
Peter Simons
c9201bdf53 YAML-LibYAML: added version 0.38
svn path=/nixpkgs/trunk/; revision=32114
2012-02-07 14:01:00 +00:00
Peter Simons
a2df0e09ff haskell-zlib: added version 0.5.3.3
svn path=/nixpkgs/trunk/; revision=32101
2012-02-07 10:34:28 +00:00
Peter Simons
6704a7379b haskell-test-framework: dropped version 0.4.2.2
Pandoc updated to 0.5.

svn path=/nixpkgs/trunk/; revision=32100
2012-02-07 10:34:25 +00:00
Yury G. Kudryashov
c615cbae70 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32099
2012-02-07 09:38:20 +00:00
Michael Raskin
b340f86ba2 Low priority for ff11b
svn path=/nixpkgs/trunk/; revision=32095
2012-02-07 08:57:42 +00:00
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Peter Simons
796f0ad5bc i7z: better cpu frequency/turbo boost checker for intel core i{3,5,7}
svn path=/nixpkgs/trunk/; revision=32082
2012-02-06 19:09:04 +00:00
Peter Simons
4bfbdda332 frandom: very fast random number generator kernel module
nixos support via services.frandom.enable

svn path=/nixpkgs/trunk/; revision=32078
2012-02-06 19:08:52 +00:00
Peter Simons
bb5f77cfaa haskell-pandoc: updated to version 1.9.0.3
svn path=/nixpkgs/trunk/; revision=32074
2012-02-06 18:28:19 +00:00
Peter Simons
14e803ff8a haskell-test-framework: added version 0.4.2.2 (required by pandoc)
svn path=/nixpkgs/trunk/; revision=32072
2012-02-06 18:28:12 +00:00
Peter Simons
c682f95d63 haskell-temporary: added version 1.1.2.3
svn path=/nixpkgs/trunk/; revision=32056
2012-02-06 14:27:30 +00:00
Peter Simons
12dfa773aa haskell-haskell-src: 7.4.1 build was fixed by happy update
svn path=/nixpkgs/trunk/; revision=32055
2012-02-06 14:27:27 +00:00
Peter Simons
269b4776ce haskell: added OpenGL 5.0.0 and GLUT 2.3.0.0
svn path=/nixpkgs/trunk/; revision=32054
2012-02-06 14:27:24 +00:00
Peter Simons
20f8c35e07 haskell-happy: added version 1.18.9
svn path=/nixpkgs/trunk/; revision=32052
2012-02-06 14:27:18 +00:00
Michael Raskin
8bae3c51ff Add Firefox 11beta
svn path=/nixpkgs/trunk/; revision=32048
2012-02-06 08:28:24 +00:00
Alexander Tsamutali
109068c605 applications/misc/goldendict: New nixpkg.
svn path=/nixpkgs/trunk/; revision=32045
2012-02-05 21:02:27 +00:00
Arie Middelkoop
2d7fe30288 Improved the expression for intel microcode.
svn path=/nixpkgs/trunk/; revision=32042
2012-02-05 20:44:19 +00:00
Yury G. Kudryashov
c81e27f1f7 Move gtkLibs to top-level namespace
Earlier there was a strict correspondence between versions of gtkLibs.* but now
upstream moves to gtk-3.x, and there is no simple rule anymore. Thus it is
easier to override particular libs on a case-by-case basis than using gtkLibs2x.

svn path=/nixpkgs/trunk/; revision=32040
2012-02-05 18:29:42 +00:00
Yury G. Kudryashov
ba50fa3ad2 Whitespace
svn path=/nixpkgs/trunk/; revision=32038
2012-02-05 09:26:11 +00:00
Arie Middelkoop
3f1054b1ec Added 'bumblebee', a package that facilitates NVidia Optimus graphics with X11.
Note: it relies heavily on 'virtualgl'. This also makes the approach taken
by bumblebee not very effective.
So, this package is actually mainly useful for shutting down your card so that
it does not consume power/produce heat.

See the comments in bumblebee/default.nix

svn path=/nixpkgs/trunk/; revision=32036
2012-02-05 00:51:35 +00:00
Ludovic Courtès
d15738aca5 GnuTLS: Get Hydra to build the Guile-less variants.
svn path=/nixpkgs/trunk/; revision=32034
2012-02-04 23:21:33 +00:00
Peter Simons
282449afe8 analog: added version 6.0
svn path=/nixpkgs/trunk/; revision=32029
2012-02-04 10:32:07 +00:00
Peter Simons
b69d6bf7e0 Moved all LaTeX expressions into tools/typesetting hierarchy.
svn path=/nixpkgs/trunk/; revision=32028
2012-02-04 09:31:07 +00:00
Peter Simons
dbafd99a0a Moved python debugger into development/tools hierarchy.
svn path=/nixpkgs/trunk/; revision=32027
2012-02-04 09:30:53 +00:00
Yury G. Kudryashov
a810d44d81 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32024
2012-02-03 21:33:28 +00:00
Peter Simons
2286dd1f51 haskell-packages.nix: updated configurations for older GHC versions to prefer a more modern DeepSeq
svn path=/nixpkgs/trunk/; revision=32023
2012-02-03 21:06:28 +00:00
Peter Simons
74e822d76a haskell-packages.nix: GHC 7.4.1 should use the latest version of regexPosix
svn path=/nixpkgs/trunk/; revision=32014
2012-02-03 21:00:13 +00:00
Peter Simons
69d6b66571 haskell-packages.nix: the latest regexPosix must use a matching regexBase in order to compile with older versions of GHC, i.e. 6.10.4
svn path=/nixpkgs/trunk/; revision=32013
2012-02-03 21:00:09 +00:00
Peter Simons
0861eb5a3d haskell-packages.nix: updated 'haskellPlatformArgs_future' configuration to reflect the current state of affairs for GHC 7.4.1
* DeepSeq has been removed because it's now a core package.
 * XHTML and network have been updated to the latest version.
 * The comments that state whether a package builds or not have been updated.

svn path=/nixpkgs/trunk/; revision=32009
2012-02-03 19:06:50 +00:00
Peter Simons
83c6e41b15 haskell-xhtml: added version 3000.2.0.5
svn path=/nixpkgs/trunk/; revision=32008
2012-02-03 19:06:47 +00:00
Peter Simons
dd28867e4f haskell-network: added version 2.3.0.10
svn path=/nixpkgs/trunk/; revision=32007
2012-02-03 19:06:44 +00:00
Peter Simons
351627cb88 haskell-extensible-exceptions: added version 0.1.1.4
svn path=/nixpkgs/trunk/; revision=32006
2012-02-03 19:06:41 +00:00
Peter Simons
49ca209cd2 haskell-deepseq: added version 1.3.0.0
svn path=/nixpkgs/trunk/; revision=32005
2012-02-03 19:06:38 +00:00
Peter Simons
8cba75ac34 haskell-ieee754: added version 0.7.3
svn path=/nixpkgs/trunk/; revision=32004
2012-02-03 19:06:35 +00:00
Peter Simons
4aac439f00 redis: added version 2.4.7
Patch submitted by Phil Hagelberg <technomancy@gmail.com>.

svn path=/nixpkgs/trunk/; revision=31992
2012-02-03 13:12:07 +00:00
Andres Löh
f2d6ca5d02 Added haskell-{bitarray,containers-deepseq,gd}.
svn path=/nixpkgs/trunk/; revision=31991
2012-02-03 12:15:00 +00:00
Andres Löh
b66db5ca13 Add ghc-7.4.1. Remove Hydra building for the 7.2.* series.
svn path=/nixpkgs/trunk/; revision=31989
2012-02-02 21:08:30 +00:00
Yury G. Kudryashov
df037ddafd svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31987
2012-02-02 20:36:11 +00:00
Peter Simons
798890b819 haskell-zlib: drop version 0.5.3.2 again; it's causing lots of trouble
This change affects only GHC 7.2 or later.

svn path=/nixpkgs/trunk/; revision=31985
2012-02-02 17:03:01 +00:00
Eelco Dolstra
9d9e33b98d * Added Firefox 10.0. P.S. it seems that Firefox 10 no longer needs
--enable-official-branding to get a browser that calls itself
  "Firefox".  But I'll leave the flag in for the moment.
* Removed Firefox 8.0.

svn path=/nixpkgs/trunk/; revision=31984
2012-02-02 15:44:22 +00:00
Peter Simons
bd2c29d553 haskell-persistent-sqlite: added version 0.6.2.1
svn path=/nixpkgs/trunk/; revision=31983
2012-02-02 14:54:56 +00:00
Peter Simons
e11c942238 haskell-yesod-default: added version 0.5.0
svn path=/nixpkgs/trunk/; revision=31982
2012-02-02 14:54:53 +00:00
Eelco Dolstra
7b5db94b5f * Updated Adobe Reader to 9.4.7.
svn path=/nixpkgs/trunk/; revision=31978
2012-02-02 12:19:17 +00:00
Peter Simons
e3e09ea617 haskell-packages.nix: disabled hledger-vty and hledger-chart
These packages don't build with current versions of hledger-lib. I'll ask
upstream about an update.

svn path=/nixpkgs/trunk/; revision=31975
2012-02-02 10:38:08 +00:00
Peter Simons
8c1822d2d8 haskell-socks: added version 0.4.0
svn path=/nixpkgs/trunk/; revision=31967
2012-02-02 10:37:48 +00:00
Peter Simons
d7b739d9a5 haskell-cmdargs: deleted obsolete 0.8 version
svn path=/nixpkgs/trunk/; revision=31966
2012-02-02 10:37:45 +00:00
Yury G. Kudryashov
2b3fb5a824 Merge two nix exprs for links2, upgrade to 2.5
svn path=/nixpkgs/trunk/; revision=31962
2012-02-01 22:33:35 +00:00
Yury G. Kudryashov
75262bcbed zip, unzip: add NLS support
svn path=/nixpkgs/trunk/; revision=31961
2012-02-01 22:32:16 +00:00
Yury G. Kudryashov
89de1150d5 Add libnatspec
svn path=/nixpkgs/trunk/; revision=31960
2012-02-01 22:32:12 +00:00
Arie Middelkoop
cc145f2ae9 Update of skype expression: make the use of pulse audio optional based on the configuration setting for pulse audio (off by default).
Removing pulse audio from the build inputs when it is not used prevents the bug of Skype taking 100% cpu from showing up.
This demonstrates nicely nix' features: in other distributions the recomended solution was to remove read permission from the
pulse audio libs.

svn path=/nixpkgs/trunk/; revision=31959
2012-02-01 22:09:35 +00:00
Rob Vermaas
37b404816a add cowsay
svn path=/nixpkgs/trunk/; revision=31936
2012-01-30 19:05:24 +00:00
Peter Simons
c5ecd1752c hardlink: initial version
Hardlink consolidates duplicate files in a directory hierarchy with hardlinks,
similar to "nix-store --optimise".

IHMO, this program should be run by the default builder after $out has been set
up, to remove redundancy in the generated closures.

svn path=/nixpkgs/trunk/; revision=31934
2012-01-30 11:40:20 +00:00
Peter Simons
9d693c2e4e haskell-cmdargs: added version 0.9.2
svn path=/nixpkgs/trunk/; revision=31929
2012-01-30 10:52:04 +00:00
Peter Simons
588da3fbf3 haskell-packages.nix: cosmetic
svn path=/nixpkgs/trunk/; revision=31928
2012-01-30 10:52:01 +00:00
Ludovic Courtès
010edf825c Add pthreads-w32.
svn path=/nixpkgs/trunk/; revision=31927
2012-01-30 09:53:45 +00:00
Alexander Tsamutali
55e74d5e9a games/oilrush: New nixpkg.
svn path=/nixpkgs/trunk/; revision=31925
2012-01-29 22:44:49 +00:00
Peter Simons
5792ce967f haskell-multiarg: added version 0.1.0.0
svn path=/nixpkgs/trunk/; revision=31915
2012-01-29 16:23:57 +00:00
Peter Simons
1bc0a60bf8 haskell-explicit-exception: added version 0.1.6
svn path=/nixpkgs/trunk/; revision=31914
2012-01-29 16:23:53 +00:00
Yury G. Kudryashov
5ec7aa7e71 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31911
2012-01-28 19:32:28 +00:00
Yury G. Kudryashov
71c28d0e33 Use meta.platforms
svn path=/nixpkgs/trunk/; revision=31909
2012-01-28 14:39:56 +00:00
Peter Simons
12e953b944 gmp: updated (unused) version 5.0.1 to 5.0.3
svn path=/nixpkgs/trunk/; revision=31908
2012-01-28 14:37:53 +00:00
Yury G. Kudryashov
9d67ff2a48 Remove glib-1.x and its reverse dependencies
Nobody told me that he uses generator or xmms, so I'm removing this old stuff.

svn path=/nixpkgs/trunk/; revision=31907
2012-01-28 13:06:07 +00:00
Yury G. Kudryashov
4b36b6132f Introduce libiconvOrNull and libiconvOrGlibc
One can use these attrs instead of custom 'if ... then libiconv else null'.
This way we can maintain the correct 'if ... then' check in one place.

NB: I don't know what is the correct condition, so I use stdenv.isLinux. Feel
free to fix this.

svn path=/nixpkgs/trunk/; revision=31906
2012-01-28 12:44:42 +00:00
Yury G. Kudryashov
491316794c svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31905
2012-01-28 12:29:35 +00:00
Peter Simons
7d9442e2c3 Removed obsolete comment.
svn path=/nixpkgs/trunk/; revision=31904
2012-01-28 10:20:57 +00:00
Peter Simons
37d2e2e917 gmp: renamed nix files to conform with coding guidelines
svn path=/nixpkgs/trunk/; revision=31903
2012-01-28 10:20:50 +00:00
Lluís Batlle i Rossell
415b2bb145 Adding cppnetlib 0.9.2. The last I found in their github.
svn path=/nixpkgs/trunk/; revision=31901
2012-01-27 20:40:44 +00:00
Peter Simons
47c3e4b2a3 haskell-zlib: added version 0.5.3.2
This version is disabled for all versions of GHC older than 7.2, because
it won't build. Upstream has been notified.

svn path=/nixpkgs/trunk/; revision=31894
2012-01-27 20:31:03 +00:00
Peter Simons
bbe935774d haskell-GLFW: added version 0.5.0.1
svn path=/nixpkgs/trunk/; revision=31893
2012-01-27 20:31:00 +00:00
Yury G. Kudryashov
7055c35293 Pass libpng12 to imlib
svn path=/nixpkgs/branches/libpng15/; revision=31892
2012-01-27 20:06:42 +00:00
Yury G. Kudryashov
e9e0418145 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31891
2012-01-27 18:57:35 +00:00
Yury G. Kudryashov
ed92080b8d icewm-1.3.7
svn path=/nixpkgs/trunk/; revision=31890
2012-01-27 18:56:31 +00:00
Yury G. Kudryashov
83d4b462fe More 'libpng = libpng12'
svn path=/nixpkgs/branches/libpng15/; revision=31889
2012-01-27 17:55:41 +00:00
Yury G. Kudryashov
e155073b2c svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31888
2012-01-27 17:49:20 +00:00
Yury G. Kudryashov
b31c67e24d svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31887
2012-01-27 16:43:39 +00:00
Yury G. Kudryashov
5408f303bd Pass libpng12 to webkit
svn path=/nixpkgs/branches/libpng15/; revision=31884
2012-01-27 15:12:59 +00:00
Lluís Batlle i Rossell
29ca4d272f Updating gdb. I did not update the 'bleeding edge' thing though. That should be
better named to "one git checkout" instead of bleeding edge.


svn path=/nixpkgs/trunk/; revision=31883
2012-01-27 15:11:17 +00:00
Yury G. Kudryashov
38b10c30a1 Pass libpng12 to exult
svn path=/nixpkgs/branches/libpng15/; revision=31879
2012-01-27 11:57:20 +00:00
Yury G. Kudryashov
3256c40575 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31878
2012-01-27 11:48:58 +00:00
Arie Middelkoop
c4fdb28b80 Stable kernel 3.2.2 released today.
svn path=/nixpkgs/trunk/; revision=31874
2012-01-26 23:25:39 +00:00
Michael Raskin
51634c2137 Adding OpenSCAD - a 3D geometry interpreter
svn path=/nixpkgs/trunk/; revision=31869
2012-01-26 19:01:38 +00:00
Michael Raskin
53bcb2094f Adding CGAL: Computational Geometry Algorithms Library
svn path=/nixpkgs/trunk/; revision=31868
2012-01-26 18:28:53 +00:00
Yury G. Kudryashov
5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Peter Simons
a5d419ea5a haskell-resource-pool: added version 0.2.1.0
svn path=/nixpkgs/trunk/; revision=31858
2012-01-26 14:20:17 +00:00
Peter Simons
b968c011c6 haskell-pool-conduit: added version 0.0.0
svn path=/nixpkgs/trunk/; revision=31857
2012-01-26 14:20:14 +00:00
Peter Simons
4752d7201c haskell-ghc-mod: don't hard-code a specific version of emacsPackages into the expression itself
Instead, one of the available version is chosen in haskell-packages.nix, when
the expression is instantiated.

Also updated the meta section.

svn path=/nixpkgs/trunk/; revision=31856
2012-01-26 14:20:11 +00:00
Peter Simons
adc8828c96 development/tools/parsing/ebnf2ps: added initial version 1.0.8
svn path=/nixpkgs/trunk/; revision=31855
2012-01-26 14:20:06 +00:00
Sander van der Burg
b54d8fc58d Updated ejabberd to version 2.1.10
svn path=/nixpkgs/trunk/; revision=31854
2012-01-26 13:57:57 +00:00
Michael Raskin
b9916f0fd9 Add K3D 3D editor
svn path=/nixpkgs/trunk/; revision=31850
2012-01-26 13:12:36 +00:00
Yury G. Kudryashov
2ced89b7f1 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31846
2012-01-26 08:45:19 +00:00
Yury G. Kudryashov
eb59b98c26 vlc-1.1.13
svn path=/nixpkgs/trunk/; revision=31843
2012-01-26 08:36:18 +00:00
Arie Middelkoop
62e9429908 Added the 'bbswitch' module, which is a more conventient module for powering off/on nvidia graphics cards than possible via the acpi_call module.
svn path=/nixpkgs/trunk/; revision=31840
2012-01-26 01:02:22 +00:00
Lluís Batlle i Rossell
06548b79e9 Adding what I have for today of libreoffice. It still does not build.
svn path=/nixpkgs/trunk/; revision=31839
2012-01-25 23:04:34 +00:00
Peter Simons
db98fa936b astyle: added initial version 2.02.1
svn path=/nixpkgs/trunk/; revision=31835
2012-01-25 13:52:18 +00:00
Yury G. Kudryashov
390f8aa954 Pass libpng12 to tetex
svn path=/nixpkgs/branches/libpng15/; revision=31831
2012-01-24 22:22:10 +00:00
Arie Middelkoop
f9fabb4626 added kwooty: a binary newsreader (kde).
svn path=/nixpkgs/trunk/; revision=31829
2012-01-24 22:09:17 +00:00
Peter Simons
ea9708ca01 haskell-mwc-random: added version 0.11.0.0
svn path=/nixpkgs/trunk/; revision=31807
2012-01-24 15:06:00 +00:00
Peter Simons
5f7e961d15 haskell-HsOpenSSL: added version 0.10.1.2
svn path=/nixpkgs/trunk/; revision=31806
2012-01-24 15:05:57 +00:00
Peter Simons
9e5c06adc9 haskell-language-javascript: updated to version 0.4.6
svn path=/nixpkgs/trunk/; revision=31805
2012-01-24 15:05:54 +00:00
Peter Simons
76cbc8ade8 haskell-text: added version 0.11.1.13
svn path=/nixpkgs/trunk/; revision=31804
2012-01-24 15:05:51 +00:00
Ludovic Courtès
b479c4b172 GCC 4.5.1: Add `gcc45_debug'.
svn path=/nixpkgs/trunk/; revision=31803
2012-01-24 14:56:41 +00:00
Karn Kallio
39206f5b44 Get psi to compile with kde47 and kde48.
svn path=/nixpkgs/trunk/; revision=31799
2012-01-24 00:00:34 +00:00
Karn Kallio
05bbc5edd5 ProofGeneral documentation does not build without cm-super fonts.
svn path=/nixpkgs/trunk/; revision=31797
2012-01-23 19:03:41 +00:00
Andres Löh
bbc726c86a Adding haskell-DSH and dependencies.
svn path=/nixpkgs/trunk/; revision=31794
2012-01-23 16:22:34 +00:00
Florian Friesdorf
5c05e3f866 emacs-24 alsaLib and imagemagickBig
svn path=/nixpkgs/trunk/; revision=31788
2012-01-23 00:55:48 +00:00
Peter Simons
cf287936ac ledger: renamed 2.6.3 version's nix file for consistency
svn path=/nixpkgs/trunk/; revision=31780
2012-01-21 19:25:41 +00:00
Peter Simons
40656ea5d1 mercurial: remove obsolete 'getConfig' mechanism to enable/disable GUI in favor of override
svn path=/nixpkgs/trunk/; revision=31778
2012-01-21 19:08:58 +00:00
Peter Simons
3c733ba49f all-packages.nix: provide mercurialFull package that comes with GUI front-end
This version preferred in user profiles, but not by packages that refer
to mercurial by attribute name.

svn path=/nixpkgs/trunk/; revision=31777
2012-01-21 19:08:56 +00:00
Peter Simons
a118bc809e all-packages.nix: removed comment which I believe to be obsolete
svn path=/nixpkgs/trunk/; revision=31776
2012-01-21 19:08:52 +00:00
Peter Simons
58b19bd365 all-packages.nix: removed notmuchGit attribute to fix "nix-env -u \*"
The corresponding expression is missing.

svn path=/nixpkgs/trunk/; revision=31774
2012-01-21 18:55:22 +00:00
Florian Friesdorf
364f1ce3f7 notmuch as emacsPackage and top-level without emacs support
svn path=/nixpkgs/trunk/; revision=31768
2012-01-21 18:29:14 +00:00
Florian Friesdorf
57733bae5d remove emacsSnapshot in favour of emacs24
svn path=/nixpkgs/trunk/; revision=31764
2012-01-21 18:29:02 +00:00
Florian Friesdorf
0d2d1dd139 emacs-24.0.92
svn path=/nixpkgs/trunk/; revision=31763
2012-01-21 18:28:57 +00:00
Lluís Batlle i Rossell
a4c35d0393 I made the use of ccacheWrapper somewhat easier.
svn path=/nixpkgs/trunk/; revision=31756
2012-01-21 11:22:13 +00:00
Lluís Batlle i Rossell
8ea631310b Making the ccacheWrapper a bit nicer. More flexible, specifically.
svn path=/nixpkgs/trunk/; revision=31753
2012-01-21 01:29:06 +00:00
Lluís Batlle i Rossell
e6c1aa2005 Fixing the kernel configuration for Fuloong2F. Specially with VGA_CONSOLE enabled,
it will not boot.

svn path=/nixpkgs/trunk/; revision=31750
2012-01-21 00:34:38 +00:00
Lluís Batlle i Rossell
09fee60ee2 Fixing a typo. And letting stdenvCross be prioritary to the global override.
svn path=/nixpkgs/trunk/; revision=31748
2012-01-21 00:26:50 +00:00
Lluís Batlle i Rossell
2f2ce81046 Modifying the all-packages stdenv changer, so it allows having a global stdenv
wrapper.

This will fail for crossStdenv, but it allows a wrapper that uses ccache for
example. That's so described in all-packages.nix around 'ccache'.


svn path=/nixpkgs/trunk/; revision=31747
2012-01-21 00:25:30 +00:00
Eelco Dolstra
bafc4ff59d * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31739
2012-01-20 15:29:04 +00:00
Andres Löh
dd83243b8c Make statistics and criterion compile with ghc-6.12.3.
svn path=/nixpkgs/trunk/; revision=31733
2012-01-20 10:54:09 +00:00
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Eelco Dolstra
2ebf8df601 * Apply the latest Gentoo patches to Grub 1.
svn path=/nixpkgs/trunk/; revision=31720
2012-01-19 21:08:33 +00:00
Ludovic Courtès
723e46b6a7 GRUB 0.97: Use an old Automake.
svn path=/nixpkgs/trunk/; revision=31719
2012-01-19 21:07:02 +00:00
Yury G. Kudryashov
a525fdb18d svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31718
2012-01-19 21:00:43 +00:00
Peter Simons
b94fef3cba all-packages.nix: added texLiveFull attribute, which is a working TexLive installation with all supported packages enabled
svn path=/nixpkgs/trunk/; revision=31717
2012-01-19 20:45:17 +00:00
Yury G. Kudryashov
d0c8b530e9 leiningen: added package version 1.6.2
svn path=/nixpkgs/trunk/; revision=31716
2012-01-19 20:34:59 +00:00
Rob Vermaas
087af1bfe7 add gwt 2.4.0, patch provided by TermNL
svn path=/nixpkgs/trunk/; revision=31711
2012-01-19 19:31:25 +00:00
Peter Simons
13e5cf2efb haskell-vault: added version 0.1.0.0
svn path=/nixpkgs/trunk/; revision=31683
2012-01-19 14:44:33 +00:00
Ludovic Courtès
652712b77a udisks: Autoreconf properly.
svn path=/nixpkgs/trunk/; revision=31679
2012-01-19 09:23:24 +00:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Peter Simons
1e4a7842d2 rsync: optional feature (disabled by default) to sync devices
I use this feature for doing snapshot backups, which is way faster
than copying a huge files tree.

The patch is semi-official, rsync-patches is maintained by rsync
upstream itself.
The patch doesn't affect any behaviour, it only adds 1 option
so it shouldn't affect you if you don't use it.

svn path=/nixpkgs/trunk/; revision=31659
2012-01-18 20:38:24 +00:00
Peter Simons
8985708131 mongodb: new package (nosql database) - nixos integration available
svn path=/nixpkgs/trunk/; revision=31655
2012-01-18 20:32:41 +00:00
Peter Simons
e58052514b youtube-dl: new package (download clips from youtube)
svn path=/nixpkgs/trunk/; revision=31654
2012-01-18 20:32:37 +00:00
Peter Simons
02392785c5 ghc-mod: new package (emacs haskell-mode extension)
svn path=/nixpkgs/trunk/; revision=31653
2012-01-18 20:32:34 +00:00
Peter Simons
3eca1b395f jruby: upgraded to latest version, fixed java dependency
svn path=/nixpkgs/trunk/; revision=31648
2012-01-18 20:32:20 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Eelco Dolstra
03fb0e59ef * Fix GHC. The bootstrap binaries depend on libgmp.so.3, which is
provided by GMP 4 but not GMP 5.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31639
2012-01-18 18:43:34 +00:00
Sander van der Burg
45add982ae Bumped JSON to 2.53 and JSON-XS to 2.32. The older versions doesn't seem to be located on these sites anymore
svn path=/nixpkgs/trunk/; revision=31634
2012-01-18 16:19:25 +00:00
Eelco Dolstra
48ee2523da * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31633
2012-01-18 15:53:12 +00:00
Alexander Tsamutali
87441a72be perl-packages.nix: Added Sort-Versions.
svn path=/nixpkgs/trunk/; revision=31631
2012-01-18 15:14:42 +00:00
Arie Middelkoop
ef07990836 Update of the 'thunderbird' package to 9.0.1.
Note: this update simplified the nix expression, as some of the problems mentioned in
the original expression do not seem present anymore.

Also note: the original expression did not compile in combination with the 3.1 kernel. 

svn path=/nixpkgs/trunk/; revision=31615
2012-01-17 22:43:26 +00:00
Eelco Dolstra
be1805b4fb * Make Xfce 4.8 the default. Will remove 4.6 later.
svn path=/nixpkgs/trunk/; revision=31613
2012-01-17 19:15:50 +00:00
Eelco Dolstra
dc9830111b * Added wkhtmltopdf.
svn path=/nixpkgs/trunk/; revision=31604
2012-01-17 11:04:14 +00:00
Peter Simons
0e224241bf logstalgica: added version 1.0.3
svn path=/nixpkgs/trunk/; revision=31590
2012-01-16 11:34:00 +00:00
Peter Simons
4907bb6cf5 haskell-math-functions: added version 0.1.1.0
svn path=/nixpkgs/trunk/; revision=31580
2012-01-16 11:33:34 +00:00
Arie Middelkoop
c87285c255 Updated the coccinelle package to the latest release (1.0.0-RC9).
Added additional ocaml modules which are needed for coccinelle.

svn path=/nixpkgs/trunk/; revision=31579
2012-01-16 10:20:13 +00:00
Andres Löh
57d26cdd8e Adding recurseIntoAttrs for ghc-HEAD (for the ghc-7.4.1 rc phase).
svn path=/nixpkgs/trunk/; revision=31577
2012-01-16 09:55:03 +00:00
Peter Simons
3c8a798411 gource: added meta information and moved the package into version-management category
svn path=/nixpkgs/trunk/; revision=31570
2012-01-15 11:44:02 +00:00
Yury G. Kudryashov
13c81f6c79 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31568
2012-01-14 21:40:24 +00:00
Yury G. Kudryashov
0c79434ccb svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
2012-01-14 21:34:37 +00:00
Peter Simons
ef343ed3ab subversion: add sasl support
svn path=/nixpkgs/trunk/; revision=31530
2012-01-14 11:41:06 +00:00
Arie Middelkoop
32327df918 Removed the now obsolete firmware-linux-free package.
svn path=/nixpkgs/trunk/; revision=31528
2012-01-14 09:31:12 +00:00
Eelco Dolstra
e3796d59a6 * Mark chrome as low priority so that the chrome wrapper gets
installed.

svn path=/nixpkgs/trunk/; revision=31521
2012-01-13 13:43:15 +00:00
Peter Simons
dd90ec0d92 wxGTK-2.x: enable support for media control
svn path=/nixpkgs/trunk/; revision=31516
2012-01-13 10:32:02 +00:00
Peter Simons
d7985d419f pkgs/development/libraries/wxGTK-2.9: renamed Nix files for consistency
svn path=/nixpkgs/trunk/; revision=31513
2012-01-13 10:31:52 +00:00
Lluís Batlle i Rossell
4238637b40 Adding GNU archimedes.
svn path=/nixpkgs/trunk/; revision=31505
2012-01-12 19:23:47 +00:00
Lluís Batlle i Rossell
72aa6f5ffc Adding centerim.
svn path=/nixpkgs/trunk/; revision=31503
2012-01-12 18:55:08 +00:00
Arie Middelkoop
0fa0da35ef Added firmware-linux-nonfree and directly also the free variant.
Todo for later: take the files from the various .deb files instead of the source distribution.
This version already improves upon my previous implementation, hence I commit it.

svn path=/nixpkgs/trunk/; revision=31501
2012-01-12 17:16:11 +00:00
Eelco Dolstra
d62848cd2c * eval-release.nix: force nix-instantiate to include nested attribute
sets.

svn path=/nixpkgs/trunk/; revision=31500
2012-01-12 16:59:58 +00:00
Arie Middelkoop
0a2ad94a0e Fixed rtl8192cfw firmware package.
Also, added a package that fetches all firmware from dwmw2's repo on kernel.org.
Specific firmware can then simply copy the driver out of this repo. Perhaps it
would actually be useful to write some abstraction for that.

Anyway, I'm not sure if fetching the git repo is a good idea to start with. The
repo does not have tags, so I'm forced to either take the HEAD or a particular
commit (chose the last option). However, this is likely to need ongoing
maintenance.

svn path=/nixpkgs/trunk/; revision=31492
2012-01-12 10:17:29 +00:00
Peter Simons
25b5e5e5dd pkgs/top-level/all-packages.nix: build texLive with ruby18
The latest version of Ruby can't interpret the "epspdf.rb" script.

svn path=/nixpkgs/trunk/; revision=31483
2012-01-11 18:52:43 +00:00
Peter Simons
061fe164be Added linux rtl8168e-2 firmware.
svn path=/nixpkgs/trunk/; revision=31475
2012-01-10 23:23:15 +00:00
Yury G. Kudryashov
9e269f7e5e svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31452
2012-01-09 10:30:13 +00:00
Yury G. Kudryashov
ff5134f8b0 Add lirc
svn path=/nixpkgs/trunk/; revision=31450
2012-01-09 10:25:49 +00:00
Yury G. Kudryashov
c80ed42cf1 Add GNU vcdimager
svn path=/nixpkgs/trunk/; revision=31449
2012-01-09 10:25:42 +00:00
Yury G. Kudryashov
365e05f7ce svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31448
2012-01-08 23:33:18 +00:00
Yury G. Kudryashov
c403364c06 xmoto-0.5.9+libpng-1.5 patch
svn path=/nixpkgs/trunk/; revision=31447
2012-01-08 23:31:31 +00:00
Cillian de Roiste
d9d74208b5 Adding dvswitch: a digital video mixer intended for interactive live mixing of several incoming DV video streams, typically used for recording conferences
svn path=/nixpkgs/trunk/; revision=31446
2012-01-08 23:27:45 +00:00
Yury G. Kudryashov
e275cb515c Pass libpng12 to qt-4.6
svn path=/nixpkgs/branches/libpng15/; revision=31444
2012-01-08 21:26:12 +00:00
Yury G. Kudryashov
de82ba69f8 kde4.basket works. Remove kde3.kbasket
svn path=/nixpkgs/trunk/; revision=31442
2012-01-08 20:57:55 +00:00
Yury G. Kudryashov
2ebcb95219 Restore libpng-1.2.x
svn path=/nixpkgs/branches/libpng15/; revision=31440
2012-01-08 19:50:06 +00:00
Yury G. Kudryashov
a398e2a401 Add skrooge
svn path=/nixpkgs/trunk/; revision=31438
2012-01-08 19:29:28 +00:00
Yury G. Kudryashov
7e66541ce8 Add bunch of kmymoney-4.6.1 dependencies
svn path=/nixpkgs/trunk/; revision=31436
2012-01-08 19:29:07 +00:00
Yury G. Kudryashov
9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
Ludovic Courtès
bfd6c7fa3e GNU Automake 1.11.x: Disable tests on FreeBSD.
svn path=/nixpkgs/trunk/; revision=31433
2012-01-08 15:41:17 +00:00
Peter Simons
65715f2e98 all-packages.nix: let 'python3' refer to the latest version, python 3.2
svn path=/nixpkgs/trunk/; revision=31432
2012-01-08 14:43:21 +00:00
Peter Simons
2c7ac76079 unclutter: X cursor management tool
Unclutter hides your X mouse cursor when you do not need it, to prevent
it from getting in the way. You have only to move the mouse to restore
the mouse cursor. Unclutter is very usefull in tiling wm's where you do
not need the mouse often.

Just run it from your .bash_profile like that:

	unclutter -idle 1 &

svn path=/nixpkgs/trunk/; revision=31431
2012-01-08 14:01:17 +00:00
Michael Raskin
47288a2224 Stop using ESound for space-orbit
svn path=/nixpkgs/trunk/; revision=31429
2012-01-07 21:59:16 +00:00
Yury G. Kudryashov
a7f52f0fd0 xxdiff-4.0 beta (Qt4-based)
svn path=/nixpkgs/trunk/; revision=31422
2012-01-07 20:23:35 +00:00
Yury G. Kudryashov
cd6824cb9f -kde3.kuickshow, +kde4.kuickshow
svn path=/nixpkgs/trunk/; revision=31407
2012-01-07 17:06:57 +00:00
Yury G. Kudryashov
7e320a7043 State qt version (3/4) in packages, not in all-packages.nix
svn path=/nixpkgs/trunk/; revision=31406
2012-01-07 17:06:49 +00:00
Yury G. Kudryashov
b81dda6f0a phonon-backend-vlc: use callPackage
svn path=/nixpkgs/trunk/; revision=31402
2012-01-07 15:31:27 +00:00
Alexander Tsamutali
69c91f30ce applications/virtualization/qemu: Added 0.15.nix
svn path=/nixpkgs/trunk/; revision=31401
2012-01-07 15:06:49 +00:00
Karn Kallio
53d6a7b1ba Openoffice.org does not build with libwpd 0.9.
svn path=/nixpkgs/trunk/; revision=31396
2012-01-07 13:19:06 +00:00
Yury G. Kudryashov
1401241864 qrencode-3.2.0
Remove builderDefs magic, add meta

Cherry-pick r31382 from branches/libpng15

svn path=/nixpkgs/trunk/; revision=31385
2012-01-06 23:05:11 +00:00
Yury G. Kudryashov
cfc9de7311 KDE SC 4.8 RC2
(Semi-)automatic updates

svn path=/nixpkgs/trunk/; revision=31384
2012-01-06 23:03:43 +00:00
Lluís Batlle i Rossell
11f55d273b I found that instantiating xbursttools brought to the openssl evaluation
throwing an exception about an undefined platform.openssl.system.

That was introduced by r31330, which made openssl for the build system to
evaluate the platform.openssl.system, that should only be needed for the host
system.

I also revert supplying openssl.system for xbursttools.


svn path=/nixpkgs/trunk/; revision=31379
2012-01-06 21:31:29 +00:00
Lluís Batlle i Rossell
01c5028c7c Updating xburst-tools (blind commit, I did not try to build them)
svn path=/nixpkgs/trunk/; revision=31377
2012-01-06 21:06:22 +00:00
Yury G. Kudryashov
6df3e4e928 Add cantarell-fonts, part of GNOME-3
svn path=/nixpkgs/trunk/; revision=31375
2012-01-06 20:10:23 +00:00
Yury G. Kudryashov
9d03e96caa Add itstool
svn path=/nixpkgs/trunk/; revision=31372
2012-01-06 20:09:39 +00:00
Yury G. Kudryashov
cee470de5a Remove gtk+-2.16
svn path=/nixpkgs/trunk/; revision=31370
2012-01-06 19:02:07 +00:00
Yury G. Kudryashov
206d17c17f Remove wxGTK-2.6
svn path=/nixpkgs/trunk/; revision=31369
2012-01-06 19:01:56 +00:00
Yury G. Kudryashov
d7049d1c08 Add gnome3.gtk2
svn path=/nixpkgs/trunk/; revision=31368
2012-01-06 18:54:10 +00:00
Cillian de Roiste
9686b7def6 Adding a single expression to provide all ralink firmware, if there are no objections this could replace all the rt* firmware expressions
svn path=/nixpkgs/trunk/; revision=31365
2012-01-06 18:42:39 +00:00
Yury G. Kudryashov
ac911fce68 Fix XaraLX, add debian-patches.sh
svn path=/nixpkgs/trunk/; revision=31358
2012-01-06 18:13:11 +00:00
Yury G. Kudryashov
5a4b9fc92b gtk-2.x: use atk-2.2.x
svn path=/nixpkgs/trunk/; revision=31357
2012-01-06 18:13:00 +00:00
Lluís Batlle i Rossell
cae619da08 Updating elfutils/perf to cross-build. I tested this for the nanonote.
I add newt, checking that it cross-builds too.

I update perf to have newt support, and now it's also finding python, whatever
that means. I've not tested if 'python' as buildInputs is enough.


svn path=/nixpkgs/trunk/; revision=31353
2012-01-06 16:45:14 +00:00
Ludovic Courtès
81b3aecaec release-cross: Add OpenSSL for cross-GNU builds.
svn path=/nixpkgs/trunk/; revision=31349
2012-01-06 14:07:08 +00:00
Peter Simons
d88a86d8ee haskell-unix-compat: updated to version 0.3.0.1
svn path=/nixpkgs/trunk/; revision=31347
2012-01-06 13:30:08 +00:00
Peter Simons
671455b8be haskell-maude: updated to version 0.3.0
svn path=/nixpkgs/trunk/; revision=31345
2012-01-06 13:30:02 +00:00
Yury G. Kudryashov
900c6e18cd svn merge ^/nixpkgs/trunk
Conflicts: openssl, libplist

svn path=/nixpkgs/branches/stdenv-updates/; revision=31337
2012-01-06 01:07:45 +00:00
Yury G. Kudryashov
5a0de50cf5 Add kde4.basket
svn path=/nixpkgs/trunk/; revision=31334
2012-01-06 00:55:30 +00:00
Yury G. Kudryashov
c22e6aadc5 Add mobile-broadband-provider-info
svn path=/nixpkgs/trunk/; revision=31328
2012-01-05 23:25:28 +00:00
Yury G. Kudryashov
d15e2f70d9 Add swig-2.x
svn path=/nixpkgs/trunk/; revision=31320
2012-01-05 23:15:24 +00:00
Lluís Batlle i Rossell
4c814dd003 Adding linux 'perf' tool.
svn path=/nixpkgs/trunk/; revision=31319
2012-01-05 21:24:51 +00:00
Yury G. Kudryashov
72f2477f80 Use ocaml-3.12.1 by default
ocaml-3.11.1 is broken in stdenv, so I made this change in stdenv without
waiting for maintainer. Feel free to revert if you have a better solution.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31314
2012-01-05 17:06:15 +00:00
Florian Friesdorf
68db88bbf8 wip: privateer
svn path=/nixpkgs/trunk/; revision=31305
2012-01-04 23:05:51 +00:00
Lluís Batlle i Rossell
b1ba53e50d Adding vimprobable2. Patch by Alexander Forenmy.
svn path=/nixpkgs/trunk/; revision=31303
2012-01-04 22:12:43 +00:00
Peter Simons
660701471c Dropped obsolete versions of haskell-primitive and haskell-vector.
svn path=/nixpkgs/trunk/; revision=31285
2012-01-04 17:48:40 +00:00
Peter Simons
aac6654ed5 haskell-vector: updated to version 0.9.1
svn path=/nixpkgs/trunk/; revision=31283
2012-01-04 17:48:32 +00:00
Yury G. Kudryashov
394fd28e4e svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31280
2012-01-04 15:22:16 +00:00
Yury G. Kudryashov
3ca6582874 ppp-2.4.5, a few patches
svn path=/nixpkgs/trunk/; revision=31279
2012-01-04 15:10:27 +00:00
Eelco Dolstra
0348f11e22 * DBD::SQLite updated to 1.35.
svn path=/nixpkgs/trunk/; revision=31277
2012-01-04 14:23:41 +00:00
Lluís Batlle i Rossell
25db5f1a9d Adding libgdiplus for mono, and making mono reference it.
svn path=/nixpkgs/trunk/; revision=31276
2012-01-04 13:55:54 +00:00
Yury G. Kudryashov
3d61c49b42 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31268
2012-01-04 09:54:17 +00:00
Lluís Batlle i Rossell
8fadcd285a Adding icoutils
svn path=/nixpkgs/trunk/; revision=31265
2012-01-04 09:42:38 +00:00
Lluís Batlle i Rossell
b15381fcf6 Adding pngtoico.
svn path=/nixpkgs/trunk/; revision=31264
2012-01-04 09:29:52 +00:00
Yury G. Kudryashov
b3709689db Add modemmanager
svn path=/nixpkgs/trunk/; revision=31263
2012-01-04 09:05:22 +00:00
Florian Friesdorf
30752215cd linux_3_2_powertop
svn path=/nixpkgs/trunk/; revision=31257
2012-01-03 22:25:38 +00:00
Lluís Batlle i Rossell
d028c7e00d Adding a preliminary package for librecad. It fails to install still.
svn path=/nixpkgs/trunk/; revision=31255
2012-01-03 21:14:14 +00:00
Yury G. Kudryashov
2bca92e32d Merge trunk
Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
2012-01-03 17:25:24 +00:00
Yury G. Kudryashov
a988b581a0 Add libkvkontakte
svn path=/nixpkgs/trunk/; revision=31240
2012-01-03 16:15:22 +00:00
Eelco Dolstra
ab13fb0c34 * Firefox updated to 9.0.1.
svn path=/nixpkgs/trunk/; revision=31236
2012-01-03 15:18:03 +00:00
Lluís Batlle i Rossell
22e91e721e Removing references to openssl 1.0.0e
svn path=/nixpkgs/trunk/; revision=31234
2012-01-03 14:32:41 +00:00
Florian Friesdorf
9e050a9226 iwlwifi-5150-ucode: add Intel 5150 wireless firmware package
Author:    Sergey Mironov <ierton@gmail.com>

svn path=/nixpkgs/trunk/; revision=31232
2012-01-03 14:14:58 +00:00
Yury G. Kudryashov
3af2d4a89e Add kde4.networkmanagement
You still need to start NetworkManager daemon manually to use this widget

svn path=/nixpkgs/trunk/; revision=31229
2012-01-03 13:39:09 +00:00
Yury G. Kudryashov
e785aae6e8 Fix most packages depending on fltk
I failed to build cinepaint

svn path=/nixpkgs/trunk/; revision=31224
2012-01-03 10:32:56 +00:00
Yury G. Kudryashov
046ddeb32a fltk-1.3.0
svn path=/nixpkgs/trunk/; revision=31223
2012-01-03 10:02:33 +00:00
Yury G. Kudryashov
995d3d3e03 tulip-3.6.1
svn path=/nixpkgs/trunk/; revision=31216
2012-01-02 18:36:04 +00:00
Peter Simons
e195f5b358 monad-control: use consistent naming scheme for all supported versions
svn path=/nixpkgs/trunk/; revision=31211
2012-01-02 14:51:23 +00:00
Yury G. Kudryashov
08761e83fc Merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +00:00
Lluís Batlle i Rossell
7d4e6bbec9 Adding task warrior unstable.
svn path=/nixpkgs/trunk/; revision=31151
2011-12-29 22:27:32 +00:00
Lluís Batlle i Rossell
99e6a23f03 Adding task warrior, stable.
svn path=/nixpkgs/trunk/; revision=31150
2011-12-29 22:14:08 +00:00
Peter Simons
de1a6e09d7 haskell-path-pieces: added version 0.1.0
haskell-attoparsec-conduit: added version 0.0.0
haskell-blaze-builder-conduit: added version 0.0.0
haskell-conduit: added version 0.0.0.1
haskell-http-conduit: added version 1.0.0
haskell-lifted-base: added version 0.1.0.2
haskell-xml-conduit: added version 0.5.0
haskell-zlib-conduit: added version 0.0.0

svn path=/nixpkgs/trunk/; revision=31141
2011-12-29 16:42:08 +00:00
Lluís Batlle i Rossell
58af7eb6bf Adding smbldap-tools. And some CPAN packages as bonus.
svn path=/nixpkgs/trunk/; revision=31118
2011-12-27 21:35:50 +00:00
Lluís Batlle i Rossell
9c87cccee9 Adding cgroups to the sheevaplug kernel.
svn path=/nixpkgs/trunk/; revision=31114
2011-12-27 19:33:36 +00:00
Peter Simons
481a96b2ed haskell-shakespeare-i18n: added version 0.0.0
svn path=/nixpkgs/trunk/; revision=31087
2011-12-26 15:35:48 +00:00
Peter Simons
5aacd74bf8 haskell-wai-logger: added version 0.1.1
svn path=/nixpkgs/trunk/; revision=31086
2011-12-26 15:35:42 +00:00
Peter Simons
2d972e96ad haskell-fast-logger: added version 0.0.1
svn path=/nixpkgs/trunk/; revision=31085
2011-12-26 15:35:37 +00:00
Peter Simons
e4f3dcda83 haskell-byteorder: added version 1.0.3
svn path=/nixpkgs/trunk/; revision=31084
2011-12-26 15:35:33 +00:00
Peter Simons
70b696e83e haskell-HTTP: added version 4000.2.2
svn path=/nixpkgs/trunk/; revision=31083
2011-12-26 15:35:30 +00:00
Lluís Batlle i Rossell
331d4d13da Trying to make digikam build with boost 1.47 (http://trac.macports.org/ticket/32524),
as it fails with 1.48.


svn path=/nixpkgs/trunk/; revision=31082
2011-12-26 10:13:55 +00:00
Peter Simons
46084dbc3c haskell-repr: added version 0.4.1.2
svn path=/nixpkgs/trunk/; revision=31070
2011-12-25 16:06:17 +00:00
Peter Simons
6a9bbeac0f haskell-string-combinators: added version 0.6.0.2
svn path=/nixpkgs/trunk/; revision=31069
2011-12-25 16:06:11 +00:00
Peter Simons
658f4ae7e2 haskell-dstring: added version 0.4.0.3
svn path=/nixpkgs/trunk/; revision=31068
2011-12-25 16:06:00 +00:00
Yury G. Kudryashov
f77741e018 merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
2011-12-25 05:47:23 +00:00
Andres Löh
8af094c99f Updated ghc HEAD snapshot to ghc-7.4.1-rc1.
svn path=/nixpkgs/trunk/; revision=31066
2011-12-25 00:12:52 +00:00
Yury G. Kudryashov
f806eca299 Actually upgrade ntfs-3g
ntfsprogs collection is now part of ntfs-3g

svn path=/nixpkgs/trunk/; revision=31065
2011-12-24 22:28:00 +00:00
Yury G. Kudryashov
6b5dff3bb9 Qt-4.8.0
Hardcode paths to many dlopen()ed libraries. This should fix:
* Print dialog fails to find CUPS;
* flashplugin.
Add optional support for GTK style. Disabled by default.

svn path=/nixpkgs/trunk/; revision=31064
2011-12-24 21:52:08 +00:00
Peter Simons
0ea5780f75 haskell-text: updated use of 0.11.1.11 to 0.11.1.12
svn path=/nixpkgs/trunk/; revision=31061
2011-12-24 18:57:39 +00:00
Peter Simons
986f3c193d pkgs/top-level/haskell-packages.nix: removed inconsistent 'text' specifications in haskell platform expressions
These changes were introduced unintentionally a while ago.

svn path=/nixpkgs/trunk/; revision=31057
2011-12-23 23:34:21 +00:00
Peter Simons
e4a2d3ff6d haskell-text: updated version 0.11.1.10 to 0.11.1.11
svn path=/nixpkgs/trunk/; revision=31049
2011-12-23 11:57:45 +00:00
Peter Simons
30afcc3af3 pkgs/top-level/haskell-packages.nix: updated comment about the current HP default version
svn path=/nixpkgs/trunk/; revision=31041
2011-12-22 12:22:52 +00:00
Peter Simons
8854fa0da5 haskell-parallel: updated use of version 3.2.0.0 to 3.2.0.2
svn path=/nixpkgs/trunk/; revision=31030
2011-12-22 12:18:42 +00:00
Peter Simons
53f4402059 haskell-text: updated use of version 0.11.1.9 to 0.11.1.10
svn path=/nixpkgs/trunk/; revision=31029
2011-12-22 12:18:38 +00:00
Russell O'Connor
83452ba0ab adding two versions of metaocaml
svn path=/nixpkgs/trunk/; revision=31026
2011-12-21 21:51:35 +00:00
Eelco Dolstra
e1a96b2b88 * Add cpufrequtils to the channel.
svn path=/nixpkgs/trunk/; revision=31017
2011-12-21 16:24:40 +00:00
Peter Simons
3f4358a02a haskell-multirec: dropped obsolete version 0.5.1
svn path=/nixpkgs/trunk/; revision=30999
2011-12-21 10:48:57 +00:00
Eelco Dolstra
ed2a67d6d6 * Doh.
svn path=/nixpkgs/trunk/; revision=30998
2011-12-21 10:29:19 +00:00
Peter Simons
331519b7e6 all-packages.nix: append "with-cxx" to the name of gmpxx to ensure that "nix-env -i gmp" prefers this expression
svn path=/nixpkgs/trunk/; revision=30995
2011-12-21 09:28:17 +00:00
Eelco Dolstra
63c643d072 * Firefox 9.0.
svn path=/nixpkgs/trunk/; revision=30985
2011-12-20 14:51:26 +00:00
Shea Levy
d54677f9c4 Try to fix the tarball
Not sure if this will work, just tried the obvious fix.

svn path=/nixpkgs/trunk/; revision=30974
2011-12-20 02:51:37 +00:00
Shea Levy
ec305ac161 clang builds on darwin now
Also, get rid of the clang bootstrap, there's no need for it

svn path=/nixpkgs/trunk/; revision=30973
2011-12-19 23:58:57 +00:00
Lluís Batlle i Rossell
121a926167 Updating Google Protocol Buffers, and removing an old version because
I think it is unreferenced.


svn path=/nixpkgs/trunk/; revision=30969
2011-12-19 16:03:55 +00:00
Peter Simons
c4e802e22d haskell-QuickCheck: added version 2.4.2
svn path=/nixpkgs/trunk/; revision=30961
2011-12-19 13:27:38 +00:00
Peter Simons
4c05021dcb haskell-QuickCheck: dropped obsolete version 2.1.0.3
svn path=/nixpkgs/trunk/; revision=30960
2011-12-19 13:27:35 +00:00
Peter Simons
22bbe11e65 haskell-multirec: updated to version 0.7
svn path=/nixpkgs/trunk/; revision=30959
2011-12-19 13:27:32 +00:00
Shea Levy
006d8dcdc1 clang-3.0
This required moving to the cmake build for llvm in order to build clang
separately from llvm.

svn path=/nixpkgs/trunk/; revision=30956
2011-12-19 12:48:09 +00:00
Shea Levy
0a93e74174 Add beret game
svn path=/nixpkgs/trunk/; revision=30954
2011-12-19 02:13:38 +00:00
Andres Löh
ffa89c82fd Trying to fix the build of darcs for ghc-7.0.4.
svn path=/nixpkgs/trunk/; revision=30952
2011-12-18 11:26:46 +00:00
Andres Löh
e20ab8d9b3 Added Haskell Platform 2011.4.0.0.
svn path=/nixpkgs/trunk/; revision=30951
2011-12-18 10:22:48 +00:00