Merge branch 'master' into core-updates

gnu: cmake: Update patch to work with new system.

* gnu/packages/patches/cmake-fix-tests.patch: Update to work with -p1.
* gnu/packages/cmake.scm (cmake): Drop patch flag -p0.

Merge branch 'master' into core-updates

Conflicts:
	Makefile.am
	gnu/packages/base.scm

gnu: Add cmake.

* gnu/packages/cmake.scm: New file.
* gnu/packages/patches/cmake-fix-tests.patch: New file.
* Makefile.am: Add them.