Commit Graph

15272 Commits

Author SHA1 Message Date
Nicolas Pierron
3e6f39239d Add game freeciv.
svn path=/nixpkgs/trunk/; revision=28711
2011-08-20 14:30:16 +00:00
Nicolas Pierron
1738fca385 Add Thunderbird 5.0.
svn path=/nixpkgs/trunk/; revision=28710
2011-08-20 14:30:09 +00:00
Nicolas Pierron
9e53a20f50 Replace fetchgit default builder by a wrapper around nix-prefect-git.
svn path=/nixpkgs/trunk/; revision=28709
2011-08-20 14:29:57 +00:00
David Guibert
4b3530f55d apply aufs patch to other kernels.
svn path=/nixpkgs/trunk/; revision=28708
2011-08-20 07:55:53 +00:00
David Guibert
db3eb9de85 utrace: fix urls.
But it still does not apply to recent 2.6.32 kernels.

svn path=/nixpkgs/trunk/; revision=28707
2011-08-20 06:47:13 +00:00
David Guibert
3ee47aac2a add aufs2.1 patch to 2.6.36 kernel not only 2.6.36 for nanonote
svn path=/nixpkgs/trunk/; revision=28706
2011-08-20 06:47:08 +00:00
David Guibert
22ee5aba7a aufs for 2.6.36/39 and 3.0
svn path=/nixpkgs/trunk/; revision=28705
2011-08-20 06:39:29 +00:00
David Guibert
b541948dee kernel 2.6.32.44 -> .45
svn path=/nixpkgs/trunk/; revision=28704
2011-08-20 06:39:23 +00:00
David Guibert
93874e90b6 surf: build only on linux platforms
svn path=/nixpkgs/trunk/; revision=28703
2011-08-20 05:24:19 +00:00
Peter Simons
bea0f3fba5 haskell-AspectAG: updated to version 0.3.4
svn path=/nixpkgs/trunk/; revision=28701
2011-08-19 19:59:18 +00:00
Yury G. Kudryashov
b815a9ea40 Pass individual packages in kde-4.7
E.g., use
{ ..., marble, ... } : marble
instead of
{ ..., kdeedu, ... } : kdeedu.marble

svn path=/nixpkgs/trunk/; revision=28694
2011-08-19 15:42:58 +00:00
Yury G. Kudryashov
365cb2d262 kde-4.7: let nix-env and hydra find all modules
List of changes:
 * All individual packages moved to the top-level kde47 namespace.
 * Utility functions moved back to kde-package/default.nix

nix-env will not find kde-4.7 modules unless you add something like
'kde4 = pkgs.recurseIntoAttrs pkgs.kde47;' to your packageOverrides.

This is done because kde-4.7.0 on NixOS is not ready yet.

svn path=/nixpkgs/trunk/; revision=28693
2011-08-19 15:37:12 +00:00
Eelco Dolstra
c64b8dac12 * DBIx::Class and related updates.
svn path=/nixpkgs/trunk/; revision=28689
2011-08-19 15:12:25 +00:00
Peter Simons
3753505a5a haskell-mkcabal: dropped obsolete package; use "cabal init" instead
svn path=/nixpkgs/trunk/; revision=28686
2011-08-19 13:10:54 +00:00
Shea Levy
af702547cd Use pkgs instead of recursive attributes
svn path=/nixpkgs/trunk/; revision=28679
2011-08-19 12:13:48 +00:00
Peter Simons
3a885c86c7 haskell-warp: updated to version 0.4.3.1
svn path=/nixpkgs/trunk/; revision=28678
2011-08-19 11:22:30 +00:00
Peter Simons
b46e8c70ef haskell-mime-mail: updated to version 0.3.0.3
svn path=/nixpkgs/trunk/; revision=28677
2011-08-19 11:22:26 +00:00
Peter Simons
1d02dfe8d8 haskell-css-text: updated to version 0.1.0.1
svn path=/nixpkgs/trunk/; revision=28676
2011-08-19 11:22:22 +00:00
Peter Simons
3aa17de5eb haskell-cookie: updated to version 0.3.0.1
svn path=/nixpkgs/trunk/; revision=28675
2011-08-19 11:22:17 +00:00
Yury G. Kudryashov
d67ed200d2 Upgrade kipi-plugins to 1.9.0
svn path=/nixpkgs/trunk/; revision=28674
2011-08-19 09:27:44 +00:00
Rob Vermaas
e6e11e4b04 added concatImapStrings function
svn path=/nixpkgs/trunk/; revision=28673
2011-08-19 02:42:34 +00:00
Rob Vermaas
25fd505136 update ec2-ami-tools hash
svn path=/nixpkgs/trunk/; revision=28672
2011-08-19 02:41:23 +00:00
Rob Vermaas
ddd5cb7d29 update ec2-api-tools hash
svn path=/nixpkgs/trunk/; revision=28671
2011-08-19 02:40:51 +00:00
Yury G. Kudryashov
131e982556 Pull from pkgs, not rec
svn path=/nixpkgs/trunk/; revision=28669
2011-08-18 22:41:57 +00:00
Michael Raskin
ed43dce21c Reverting update: strange things refuse to build with new util-linux
svn path=/nixpkgs/trunk/; revision=28668
2011-08-18 19:50:18 +00:00
Michael Raskin
e0c0d79a4d Update util-linux-ng
svn path=/nixpkgs/trunk/; revision=28667
2011-08-18 19:35:24 +00:00
Michael Raskin
87e5c7e6fb Enable options useful for lxc - linux containers. Changing only 3.0/3.1
svn path=/nixpkgs/trunk/; revision=28666
2011-08-18 16:10:50 +00:00
Michael Raskin
eb92b14435 Update Linux Containers userspace tools
svn path=/nixpkgs/trunk/; revision=28665
2011-08-18 15:01:53 +00:00
Michael Raskin
d518c0e630 OK, OK, --prefix for evince
svn path=/nixpkgs/trunk/; revision=28662
2011-08-18 13:05:24 +00:00
Yury G. Kudryashov
f7a51ce2ac Fix udisks udev rules
svn path=/nixpkgs/trunk/; revision=28658
2011-08-18 12:53:07 +00:00
Yury G. Kudryashov
3df650fa23 xf86-input-wacom-0.11.1, fix name
Also remove broken 10-wacom.rules

svn path=/nixpkgs/trunk/; revision=28657
2011-08-18 12:52:57 +00:00
Yury G. Kudryashov
0466e94091 Add polkit-kde-agent
Move pinentry and polkit-gnome to tools/security.

svn path=/nixpkgs/trunk/; revision=28656
2011-08-18 12:52:50 +00:00
Yury G. Kudryashov
0b669505c2 linphone-3.4.3
svn path=/nixpkgs/trunk/; revision=28655
2011-08-18 12:52:41 +00:00
Yury G. Kudryashov
25461a3939 kde-runtime-4.7: don't use ntrack as it causes kded4 to consume 100% CPU
svn path=/nixpkgs/trunk/; revision=28654
2011-08-18 12:52:35 +00:00
Yury G. Kudryashov
c6458b5269 Do not pass kdebase to kget as buildInput
svn path=/nixpkgs/trunk/; revision=28653
2011-08-18 12:52:29 +00:00
Yury G. Kudryashov
385ae7d2c4 Let cups-pdf-filter use cups.src
svn path=/nixpkgs/trunk/; revision=28652
2011-08-18 12:52:22 +00:00
Michael Raskin
e33a0c0a85 fix evince
svn path=/nixpkgs/trunk/; revision=28651
2011-08-18 09:07:31 +00:00
Shea Levy
739b5aae63 linux-3.0.nix: Bump to 3.0.3. Not sure what happened to 3.0.2...
svn path=/nixpkgs/trunk/; revision=28650
2011-08-17 22:48:14 +00:00
Michael Raskin
4dc86642ef Update Redstore
svn path=/nixpkgs/trunk/; revision=28649
2011-08-17 22:22:06 +00:00
Shea Levy
7593d8fdb8 blcr: Use the modDirVersion attribute to access the module dir
svn path=/nixpkgs/trunk/; revision=28648
2011-08-17 22:06:59 +00:00
Marco Maggesi
8db5491040 Ooops, over-simplified
svn path=/nixpkgs/trunk/; revision=28647
2011-08-17 16:52:38 +00:00
Marco Maggesi
6c7f80ad83 Simplify expression for BLCR (again)
svn path=/nixpkgs/trunk/; revision=28646
2011-08-17 16:32:20 +00:00
Marco Maggesi
b7b6d4e480 Symplify expression for BLCR
svn path=/nixpkgs/trunk/; revision=28645
2011-08-17 16:22:20 +00:00
Peter Simons
46c0976c0a dropped empty bnfc directory
svn path=/nixpkgs/trunk/; revision=28644
2011-08-17 15:05:48 +00:00
Marco Maggesi
93829bfe47 Update BLCR to version 0.8.3
svn path=/nixpkgs/trunk/; revision=28642
2011-08-17 14:25:56 +00:00
Michael Raskin
4234447eac Making Firefox 6.0 low-priority until it is fixed
svn path=/nixpkgs/trunk/; revision=28640
2011-08-17 12:46:20 +00:00
Peter Simons
9faf54888d haskell-graphviz: updated to version 2999.12.0.3
svn path=/nixpkgs/trunk/; revision=28639
2011-08-17 10:39:37 +00:00
Peter Simons
01d9831f4b pkgs/misc/misc.nix: removed the warning I added earlier
What I did was to add two versions of the same package into the same
collection, i.e. ghc-7.0.4 and ghc-7.2.1. I was surprised to see the
build succeed, because there are file collisions between these two. So I
(wrongly) assumed that the collection function was to blame, but in fact
this is a "feature" of nix-env. Apparently, file collision detection
doesn't take place when the user installs two versions of the same
package simultaneously. File collisions are detected only between
different packages!

For example, the command

  nix-env -i ghc-7.0.4 ghc-7.2.1-wrapper

is going to fail, but

  nix-env -i ghc-7.0.4-wrapper ghc-7.2.1-wrapper

is going to succeed. Maybe I just didn't read the documentation
thoroughly enough, but this behavior sure is unexpected to me.

svn path=/nixpkgs/trunk/; revision=28638
2011-08-16 23:42:29 +00:00
Peter Simons
1cff2d41aa Fixed build of haskell-CouchDB. This change obsoletes the requirement
for json 0.3.6, which has subsequently been removed from the database.

svn path=/nixpkgs/trunk/; revision=28637
2011-08-16 23:32:16 +00:00
Peter Simons
f167461d97 haskell-uniplate: updated to version 1.6.2
svn path=/nixpkgs/trunk/; revision=28636
2011-08-16 23:24:12 +00:00