Vladimír Čunát 46ea770b2b Revert "python: Move catch_conflicts.py into subdirectory (#23600)" (#24528) ... This reverts commit 76213d102c.		2017-04-01 12:20:31 +02:00
..
arduino
beam-modules
bower-modules/generic
compilers	ponyc: 0.11.4 -> 0.12.2	2017-03-31 08:17:21 +02:00
coq-modules
dotnet-modules/patches
eclipse/ecj
em-modules/generic
go-modules
guile-modules
haskell-modules	haskellPackages.tailfile-hinotify: Disable test suite	2017-03-31 11:15:17 +02:00
idris-modules
interpreters	Revert "python: Move catch_conflicts.py into subdirectory (#23600)" (#24528)	2017-04-01 12:20:31 +02:00
java-modules
libraries	Merge branch 'staging'	2017-04-01 10:58:20 +02:00
lisp-modules	quicklispPackages, lispPackages: make all system-loads pass with precompilation	2017-04-01 08:08: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.sedlex: fix on OCaml 4.04	2017-04-01 09:06:57 +02:00
perl-modules	perlPackages.OpenGL: 0.6703 -> 0.70	2017-03-24 19:15:20 +01:00
pharo
pure-modules
python-modules	pycairo: fix build with Python 3.6	2017-04-01 09:58:01 +02:00
qtcreator	Remove bbenoist from maintainers	2017-03-23 03:03:04 +01:00
r-modules
ruby-modules
tools	boomerang: mark as broken	2017-03-30 16:23:33 +02:00
web	Regenerate NPM expressions with node2nix 1.2.0	2017-03-31 20:51:14 +02:00