Sebastien Braun bbf96d898b git: Use asciidoctor instead of asciidoc for manpages ... Asciidoc is severely outdated and is replaced by asciidoctor. Eliminating asciidoc gets rid of a python2 dependency, see https://github.com/NixOS/nixpkgs/issues/101964		2020-10-30 10:48:33 +01:00
..
applications	git: Use asciidoctor instead of asciidoc for manpages	2020-10-30 10:48:33 +01:00
build-support	Merge branch 'master' into staging-next	2020-10-28 18:48:18 +01:00
common-updater
data	Merge branch 'master' into staging-next	2020-10-28 18:48:18 +01:00
desktops	Merge branch master into staging to fix eval error	2020-10-28 03:03:27 +01:00
development	Merge pull request #102059 from SuperSandro2000/pango-darwin	2020-10-30 03:48:04 +01:00
games	Merge pull request #101859 from andir/steam-desktop	2020-10-27 12:33:24 -04:00
misc	Merge branch 'staging-next' into staging	2020-10-28 18:48:56 +01:00
os-specific	libtapi: add homepage and description, use pname	2020-10-29 14:05:46 -07:00
pkgs-lib
servers	Merge branch 'staging-next' into staging	2020-10-28 18:48:56 +01:00
shells	Merge branch 'master' into staging-next	2020-10-28 18:48:18 +01:00
stdenv	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
test	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
tools	Merge branch 'staging-next' into staging	2020-10-28 18:48:56 +01:00
top-level	Merge branch 'staging-next' into staging	2020-10-28 18:48:56 +01:00