Vladimír Čunát 2090aa4f65 Merge: fixup a bad merge ... For details see: https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916		2017-04-14 19:11:17 +02:00
..
arduino
beam-modules
bower-modules/generic
compilers	Merge pull request #24889 from formaltech/halvm-bump	2017-04-14 12:58:46 -04:00
coq-modules
dotnet-modules/patches
eclipse/ecj
em-modules/generic
go-modules	go builder: use removeReferencesTo	2017-03-29 00:35:01 +02:00
guile-modules
haskell-modules	Merge pull request #24889 from formaltech/halvm-bump	2017-04-14 12:58:46 -04:00
idris-modules
interpreters	octaveHg: add package	2017-04-09 21:54:14 +10:00
java-modules	treewide: use boolToString function	2017-04-11 18:18:53 +02:00
libraries	Merge: fixup a bad merge	2017-04-14 19:11:17 +02:00
lisp-modules	lispPackage.iolib: missed one system	2017-04-10 10:09:22 +02:00
lua-modules
misc
mobile	Get rid of all with { inherit... } and just used let inherit...	2017-03-30 03:05:05 -04:00
node-packages	Regenerate NPM expressions with node2nix 1.2.0	2017-03-31 20:51:14 +02:00
ocaml-modules	ocamlPackages.lwt: 2.6.0 -> 2.7.1	2017-04-14 13:59:55 +00:00
perl-modules	perlPackages.OpenGL: 0.6703 -> 0.70	2017-03-24 19:15:20 +01:00
pharo	Merge pull request #24595 from lukego/pharo-no-pic	2017-04-04 12:01:27 +02:00
pure-modules	purePackages.octave: Use octaveHg	2017-04-09 21:54:39 +10:00
python-modules	Merge: fixup a bad merge	2017-04-14 19:11:17 +02:00
qtcreator	Remove bbenoist from maintainers	2017-03-23 03:03:04 +01:00
r-modules
ruby-modules	ruby-modules: check tzinfo version	2017-04-11 10:44:54 +02:00
tools	Merge: fixup a bad merge	2017-04-14 19:11:17 +02:00
web	Regenerate NPM expressions with node2nix 1.2.0	2017-03-31 20:51:14 +02:00