Alexander Foremny d987fedd43 Merge remote-tracking branch 'upstream/master' into haskell-snap ... Conflicts: pkgs/development/libraries/haskell/comonad-transformers/default.nix pkgs/development/libraries/haskell/semigroupoids/default.nix pkgs/top-level/haskell-packages.nix		2012-07-26 12:27:59 +02:00
..
compilers	ghc-head: bump snapshot version	2012-07-18 11:02:00 +02:00
eclipse
guile-modules
interpreters	php: Update to 5.3.15	2012-07-23 13:46:50 -04:00
libraries	Merge remote-tracking branch 'upstream/master' into haskell-snap	2012-07-26 12:27:59 +02:00
misc
ocaml-modules	Update OCaml sqlite3	2012-06-01 09:42:29 +00:00
perl-modules
python-modules	pyqt: Adding a new url; the old does not work anymore.	2012-07-02 21:00:09 +02:00
ruby-modules
tools	Add npm2nix	2012-07-25 18:11:57 -04:00
web	Add empty node-packages.nix using build-node-package.nix from npm2nix.	2012-07-25 17:46:21 -04:00