Commit graph

6268 commits

Author SHA1 Message Date
Yury G. Kudryashov 313a029f16 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
2012-02-19 11:16:24 +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
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 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 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
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
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
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