Alexander Foremny bd0903b90b Merge remote-tracking branch 'bbenoist/phpfix' into php ...

Conflicts:
	pkgs/development/interpreters/php/5.3.nix

2013-02-22 09:33:06 +01:00

..

applications

haskell-darcs: update to version 2.8.4

2013-02-09 18:24:50 +01:00

build-support

fetchurl: Don't wait too long for the hashed mirrors

2013-02-06 15:15:28 +01:00

data

Get rid of the "sf" alias for "sourceforge"

2013-01-14 12:00:32 +01:00

desktops

e17: Update libs to 1.7.5, enlightenment to 0.17.1.

2013-02-10 21:23:45 +04:00

development

Merge remote-tracking branch 'bbenoist/phpfix' into php

2013-02-22 09:33:06 +01:00

games

Merge pull request #243 from RSzibele/minetest-0.4.4

2013-02-10 03:08:40 -08:00

lib

types.nix: Add a ‘lines’ type

2013-02-11 15:32:24 +01:00

misc

add winetricks, modified by vcunat@gmail.com

2013-02-10 16:20:24 +01:00

os-specific

linux: Update to 3.2.38

2013-02-11 15:34:30 +01:00

servers

petidomo: update to version 4.3

2013-02-11 14:38:02 +01:00

shells

bash-completion: update to current git HEAD at 2.0-95-gd08b9f2

2013-01-30 12:25:11 +01:00

stdenv

lib.licenses.proprietary is definitely unfree

2013-01-27 18:36:54 -05:00

test

…

tools

nixUnstable: Update to 1.4pre3056_79a3ba7

2013-02-11 15:27:18 +01:00

top-level

haskell-HTTP: update to version 4000.2.8

2013-02-11 11:16:36 +01:00