davidak c5a51a7859 Merge pull request #120462 from NinjaTrappeur/nin-fix-nsjail ... nsjail: fix bison link error		2021-04-26 13:36:37 +02:00
..
applications	Merge pull request #120701 from fufexan/openboard	2021-04-26 12:58:39 +02:00
build-support	Merge master into staging-next	2021-04-19 18:11:51 +00:00
common-updater	common-updater-scripts: Support attribute lookup in flake	2021-04-24 04:52:48 +02:00
data	Merge pull request #116365 from omasanori/sage-9.3	2021-04-25 21:17:32 +00:00
desktops	Merge branch 'master' into staging-next	2021-04-25 02:50:48 +02:00
development	ffmpegthumbnailer: use ffmpeg instead of ffmpeg_3 (#120611)	2021-04-26 10:00:50 +02:00
games	soldat-unstable: run hooks for build and install phase	2021-04-25 14:11:16 +02:00
misc	Merge pull request #119977 from malob/vimplugins-add-overrides	2021-04-26 06:43:48 +02:00
os-specific	linuxPackages.usbip: clarify license	2021-04-26 00:15:44 +02:00
pkgs-lib
servers	Merge pull request #120587 from Mephistophiles/new_packages/simple-http-server	2021-04-26 12:26:44 +02:00
shells	fishplugins.forgit: init "unstable-2021-04-09"	2021-04-26 20:22:40 +09:00
stdenv	Merge master into staging-next	2021-04-22 06:05:51 +00:00
test	tests.vim: init (moved from vim-utils.nix) (#119467)	2021-04-21 12:55:05 +02:00
tools	Merge pull request #120462 from NinjaTrappeur/nin-fix-nsjail	2021-04-26 13:36:37 +02:00
top-level	Merge pull request #120701 from fufexan/openboard	2021-04-26 12:58:39 +02:00