Vladimír Čunát 4495d06a7f Merge branch 'master' into staging ... Conflicts (simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/top-level/all-packages.nix		2015-02-04 22:00:07 +01:00
..
arduino	Revert "arduino: new package"	2015-02-04 13:49:27 +01:00
compilers	llvm-3.5: Don't try to use libc++ on linux	2015-02-04 11:30:25 -05:00
coq-modules
eclipse
guile-modules
haskell-modules	haskell-gtkglext: drop obsolete override	2015-02-04 14:53:58 +01:00
interpreters	bundix: fix checksum	2015-02-04 19:44:19 +03:00
libraries	Merge branch 'master' into staging	2015-02-04 22:00:07 +01:00
lisp-modules
lua-modules
misc
mobile	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
ocaml-modules	ocaml-zed: update from 1.3 to 1.4	2015-02-02 15:43:42 +01:00
perl-modules
pharo
pure-modules/pure-gsl
python-modules	Adds a new package: cherrytree - A hierarchical note taking application	2015-01-31 02:17:00 +01:00
qtcreator
r-modules
ruby-modules
tools	Merge pull request #6110 from edwtjo/ihaskell-ng-wrapper	2015-02-04 20:43:15 +01:00
web