Robert Schütz d9252ffa69 cfdg: use ffmpeg instead of ffmpeg_3		2021-05-17 11:40:22 +02:00
..
applications	Merge pull request #123227 from erictapen/imagemagick-6.9.12-12	2021-05-16 22:27:55 +02:00
build-support	Merge master into staging-next	2021-05-13 18:32:50 +00:00
common-updater
data	marwaita: 9.1 -> 9.2.1	2021-05-15 19:19:06 -03:00
desktops	Merge master into staging-next	2021-05-16 01:00:58 +00:00
development	go_2-dev: 2021-03-22 -> 2021-04-13	2021-05-17 06:15:35 +10:00
games	frotz: fix darwin build	2021-05-15 14:18:41 +02:00
misc	Merge master into staging-next	2021-05-16 18:32:41 +00:00
os-specific	Merge pull request #122987 from alyssais/nixos-rebuild-aarch64	2021-05-16 22:00:39 +02:00
pkgs-lib
servers	Merge pull request #122458 from serokell/team-serokell	2021-05-16 22:37:50 +02:00
shells	Merge branch 'master' into staging-next	2021-05-14 22:27:34 +02:00
stdenv
test
tools	cfdg: use ffmpeg instead of ffmpeg_3	2021-05-17 11:40:22 +02:00
top-level	Merge pull request #122068 from NixOS/staging-next	2021-05-16 12:25:50 -07:00